From 063d3685e1d68698593b2e39013c94129906278e Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 11:24:40 +0000
Subject: [PATCH 001/400] Show carb suggestions from OpenAPS

---
 .../main/assets/OpenAPSSMB/determine-basal.js |  2 +
 .../plugins/aps/loop/APSResult.java           | 39 ++++++++-
 .../plugins/aps/loop/LoopPlugin.java          | 83 ++++++++++++-------
 .../openAPSSMB/DetermineBasalResultSMB.java   | 10 ++-
 app/src/main/res/values/strings.xml           |  9 ++
 app/src/main/res/xml/pref_openapssmb.xml      | 19 +++++
 6 files changed, 127 insertions(+), 35 deletions(-)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index c2db0f270b..11a66df891 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -862,8 +862,10 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     console.error("naive_eventualBG:",naive_eventualBG,"bgUndershoot:",bgUndershoot,"zeroTempDuration:",zeroTempDuration,"zeroTempEffect:",zeroTempEffect,"carbsReq:",carbsReq);
     if ( carbsReq >= profile.carbsReqThreshold && minutesAboveThreshold <= 45 ) {
         rT.carbsReq = carbsReq;
+        rT.carbsReqWithin = minutesAboveThreshold;
         rT.reason += carbsReq + " add'l carbs req w/in " + minutesAboveThreshold + "m; ";
     }
+
     // don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted
     if (bg < threshold && iob_data.iob < -profile.current_basal*20/60 && minDelta > 0 && minDelta > expectedDelta) {
         rT.reason += "IOB "+iob_data.iob+" < " + round(-profile.current_basal*20/60,2);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 0c91d0723c..27ebb5dd84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -62,6 +62,9 @@ public class APSResult {
     public double smb = 0d; // super micro bolus in units
     public long deliverAt = 0;
 
+    public int carbsReq = 0;
+    public int carbsReqWithin = 0;
+
     public Constraint<Double> inputConstraints;
 
     public Constraint<Double> rateConstraint;
@@ -98,6 +101,10 @@ public class APSResult {
         return this;
     }
 
+    public String getCarbsRequiredText() {
+        return String.format(resourceHelper.gs(R.string.carbsreq), carbsReq, carbsReqWithin);
+    }
+
     @Override
     public String toString() {
         final PumpInterface pump = activePluginProvider.getActivePump();
@@ -121,11 +128,20 @@ public class APSResult {
             if (smb != 0)
                 ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U\n");
 
+            if (isCarbsRequired()) {
+                ret += getCarbsRequiredText()+"\n";
+            }
+
             // reason
             ret += resourceHelper.gs(R.string.reason) + ": " + reason;
             return ret;
-        } else
-            return resourceHelper.gs(R.string.nochangerequested);
+        }
+
+        if (isCarbsRequired()) {
+            return getCarbsRequiredText();
+        }
+
+        return resourceHelper.gs(R.string.nochangerequested);
     }
 
     public Spanned toSpanned() {
@@ -150,11 +166,20 @@ public class APSResult {
             if (smb != 0)
                 ret += ("<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U<br>");
 
+            if (isCarbsRequired()) {
+                ret += getCarbsRequiredText()+"<br>";
+            }
+
             // reason
             ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
             return Html.fromHtml(ret);
-        } else
-            return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
+        }
+
+        if (isCarbsRequired()) {
+            return Html.fromHtml(getCarbsRequiredText());
+        }
+
+        return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
     }
 
     public APSResult newAndClone(HasAndroidInjector injector) {
@@ -183,6 +208,8 @@ public class APSResult {
         newResult.smbConstraint = smbConstraint;
         newResult.percent = percent;
         newResult.usePercent = usePercent;
+        newResult.carbsReq = carbsReq;
+        newResult.carbsReqWithin = carbsReqWithin;
     }
 
 
@@ -297,6 +324,10 @@ public class APSResult {
         return latest;
     }
 
+    public boolean isCarbsRequired() {
+        return carbsReq > 0;
+    }
+
     public boolean isChangeRequested() {
         Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
         // closed loop mode: handle change at driver level
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 40ba607cd1..c386ce6f0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -405,6 +405,24 @@ public class LoopPlugin extends PluginBase {
             Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
 
             if (closedLoopEnabled.value()) {
+
+                if (allowNotification) {
+                    if (resultAfterConstraints.isCarbsRequired()) {
+                        NotificationCompat.Builder builder =
+                                new NotificationCompat.Builder(MainApp.instance().getApplicationContext(), CHANNEL_ID);
+                        builder.setSmallIcon(R.drawable.notif_icon)
+                                .setContentTitle(MainApp.gs(R.string.carbssuggestion))
+                                .setContentText(resultAfterConstraints.getCarbsRequiredText())
+                                .setAutoCancel(true)
+                                .setPriority(Notification.PRIORITY_MAX)
+                                .setCategory(Notification.CATEGORY_ALARM)
+                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
+                        presentSuggestion(builder);
+                    } else {
+                        dismissSuggestion();
+                    }
+                }
+
                 if (resultAfterConstraints.isChangeRequested()
                         && !commandQueue.bolusInQueue()
                         && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
@@ -463,36 +481,9 @@ public class LoopPlugin extends PluginBase {
                     if (sp.getBoolean("wearcontrol", false)) {
                         builder.setLocalOnly(true);
                     }
-
-                    // Creates an explicit intent for an Activity in your app
-                    Intent resultIntent = new Intent(context, MainActivity.class);
-
-                    // The stack builder object will contain an artificial back stack for the
-                    // started Activity.
-                    // This ensures that navigating backward from the Activity leads out of
-                    // your application to the Home screen.
-                    TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-                    stackBuilder.addParentStack(MainActivity.class);
-                    // Adds the Intent that starts the Activity to the top of the stack
-                    stackBuilder.addNextIntent(resultIntent);
-                    PendingIntent resultPendingIntent =
-                            stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-                    builder.setContentIntent(resultPendingIntent);
-                    builder.setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
-                    NotificationManager mNotificationManager =
-                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                    // mId allows you to update the notification later on.
-                    mNotificationManager.notify(Constants.notificationID, builder.build());
-                    rxBus.send(new EventNewOpenLoopNotification());
-
-                    // Send to Wear
-                    actionStringHandler.get().handleInitiate("changeRequest");
+                    presentSuggestion(builder);
                 } else if (allowNotification) {
-                    // dismiss notifications
-                    NotificationManager notificationManager =
-                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                    notificationManager.cancel(Constants.notificationID);
-                    actionStringHandler.get().handleInitiate("cancelChangeRequest");
+                    dismissSuggestion();
                 }
             }
 
@@ -502,6 +493,40 @@ public class LoopPlugin extends PluginBase {
         }
     }
 
+    private void presentSuggestion(NotificationCompat.Builder builder) {
+        // Creates an explicit intent for an Activity in your app
+        Intent resultIntent = new Intent(context, MainActivity.class);
+
+        // The stack builder object will contain an artificial back stack for the
+        // started Activity.
+        // This ensures that navigating backward from the Activity leads out of
+        // your application to the Home screen.
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+        stackBuilder.addParentStack(MainActivity.class);
+        // Adds the Intent that starts the Activity to the top of the stack
+        stackBuilder.addNextIntent(resultIntent);
+        PendingIntent resultPendingIntent =
+                stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(resultPendingIntent);
+        builder.setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
+        NotificationManager mNotificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        // mId allows you to update the notification later on.
+        mNotificationManager.notify(Constants.notificationID, builder.build());
+        rxBus.send(new EventNewOpenLoopNotification());
+
+        // Send to Wear
+        actionStringHandler.get().handleInitiate("changeRequest");
+    }
+
+    private void dismissSuggestion() {
+        // dismiss notifications
+        NotificationManager notificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(Constants.notificationID);
+        actionStringHandler.get().handleInitiate("cancelChangeRequest");
+    }
+
     public void acceptChangeRequest() {
         Profile profile = profileFunction.getProfile();
         final LoopPlugin lp = this;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index dae170d5d9..746737ec0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -4,10 +4,11 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class DetermineBasalResultSMB extends APSResult {
 
@@ -33,7 +34,12 @@ public class DetermineBasalResultSMB extends APSResult {
             if (result.has("eventualBG")) eventualBG = result.getDouble("eventualBG");
             if (result.has("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
-            //if (result.has("carbsReq")) carbsReq = result.getDouble("carbsReq");
+
+            if (SP.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
+                if (result.has("carbsReq") && result.getInt("carbsReq") >= SP.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0))
+                    carbsReq = result.getInt("carbsReq");
+                if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
+            }
 
             if (result.has("rate") && result.has("duration")) {
                 tempBasalRequested = true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f15a23d70..d9d0e04ab3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,6 +194,8 @@
     <string name="enableloop">Enable loop</string>
 
     <string name="openloop_newsuggestion">New suggestion available</string>
+    <string name="carbssuggestion">Carbs Suggestion</string>
+    <string name="unsupportedclientver">Unsupported version of NSClient</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
     <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
@@ -279,6 +281,7 @@
     <string name="percent">Percent</string>
     <string name="absolute">Absolute</string>
     <string name="canceltemp">Cancel temp basal</string>
+    <string name="carbsreq">"%dg Additional Carbs Required Within %d Minutes</string>
     <string name="smscommunicator">SMS Communicator</string>
     <string name="waitingforpumpresult">Waiting for result</string>
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
@@ -714,10 +717,16 @@
     <string name="smb_shortname">SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
+    <string name="key_smb_enable_carbs_suggestions" translatable="false">key_smb_enable_carbs_suggestions</string>
+    <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">key_smb_enable_carbs_suggestions_threshold</string>
     <string name="enableuam">Enable UAM</string>
     <string name="enablesmb">Enable SMB</string>
+    <string name="enablecarbssuggestions">Enable Carbs Suggestions</string>
+    <string name="enable_carbs_suggestions_threshold">Minimum Carbs Required For Suggestion</string>
+    <string name="enable_carbs_suggestions_threshold_summary">Minimum grams of carbs to display a carbs suggestion alert. Carbs suggestions below this number will not trigger a notification.</string>
     <string name="enablesmb_summary">Use Super Micro Boluses instead of temp basal for faster action</string>
     <string name="enableuam_summary">Detection of Unannounced meals</string>
+    <string name="enablecarbssuggestions_summary">Enable carbs suggestions when BG is predicted to go below threshold</string>
     <string name="key_insulin_oref_peak" translatable="false">insulin_oref_peak</string>
     <string name="insulin_oref_peak">IOB Curve Peak Time</string>
     <string name="insulin_peak_time">Peak Time [min]</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 0cecf93c73..b020a0a9b1 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -103,6 +103,25 @@
             android:summary="@string/low_temptarget_lowers_sensitivity_summary"
             android:title="@string/low_temptarget_lowers_sensitivity_title" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_smb_enable_carbs_suggestions"
+            android:summary="@string/enablecarbssuggestions_summary"
+            android:title="@string/enablecarbssuggestions" />
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="0"
+            android:dialogMessage="@string/enable_carbs_suggestions_threshold_summary"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="@string/key_smb_enable_carbs_suggestions_threshold"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:title="@string/enable_carbs_suggestions_threshold"
+            validate:maxNumber="20"
+            validate:minNumber="0"
+            validate:testType="numericRange" />
+
         <androidx.preference.PreferenceScreen
             android:key="absorption_smb_advanced"
             android:title="@string/advancedsettings_title">

From b1097880f4db42e93c47a3fe67a73b94f21bccf0 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 18:46:14 +0000
Subject: [PATCH 002/400] Add carbs required to overview. Add notification with
 option to ignore carbs suggestions for 5, 15 or 30min

---
 app/src/main/AndroidManifest.xml              |  3 ++
 .../dependencyInjection/ReceiversModule.kt    |  3 ++
 .../aps/loop/CarbSuggestionReceiver.java      | 20 ++++++++
 .../plugins/aps/loop/LoopPlugin.java          | 51 ++++++++++++++++---
 .../general/overview/OverviewFragment.java    | 14 +++++
 app/src/main/res/layout/overview_fragment.xml | 12 +++++
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7dae93317c..8e8c96b965 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -113,6 +113,9 @@
         <!-- Receiver keepalive, scheduled every 30 min -->
         <receiver android:name=".receivers.KeepAliveReceiver" />
 
+        <!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
+        <receiver android:name=".plugins.aps.loop.CarbSuggestionReceiver"></receiver>
+
         <!-- Auto start -->
         <receiver
             android:name=".receivers.AutoStartReceiver"
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
index 30e372fd74..f22bf454ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.aps.loop.CarbSuggestionReceiver
 import info.nightscout.androidaps.receivers.KeepAliveReceiver
 
 @Module
@@ -9,4 +10,6 @@ import info.nightscout.androidaps.receivers.KeepAliveReceiver
 abstract class ReceiversModule {
 
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
+    @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
new file mode 100644
index 0000000000..fe0b9b3ef4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.aps.loop;
+
+import android.content.Context;
+import android.content.Intent;
+
+import javax.inject.Inject;
+
+import dagger.android.DaggerBroadcastReceiver;
+
+public class CarbSuggestionReceiver extends DaggerBroadcastReceiver {
+
+    @Inject LoopPlugin loopPlugin;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+        int duartion = intent.getIntExtra("ignoreDuration", 5);
+        loopPlugin.disableCarbSuggestions(duartion);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index c386ce6f0a..eecb0d3e25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -98,6 +98,8 @@ public class LoopPlugin extends PluginBase {
     private boolean isSuperBolus;
     private boolean isDisconnected;
 
+    private long carbsSuggestionsSuspendedUntil = 0;
+
     public class LastRun {
         public APSResult request = null;
         public APSResult constraintsProcessed = null;
@@ -407,17 +409,49 @@ public class LoopPlugin extends PluginBase {
             if (closedLoopEnabled.value()) {
 
                 if (allowNotification) {
-                    if (resultAfterConstraints.isCarbsRequired()) {
-                        NotificationCompat.Builder builder =
-                                new NotificationCompat.Builder(MainApp.instance().getApplicationContext(), CHANNEL_ID);
+                    if (resultAfterConstraints.isCarbsRequired() && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
+
+                        Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction5m.putExtra("ignoreDuration",5);
+                        PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context,1, intentAction5m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore5m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 5m", pendingIntent5m);
+
+                        Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction15m.putExtra("ignoreDuration",15);
+                        PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context,1, intentAction15m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore15m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 15m", pendingIntent15m);
+
+                        Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction30m.putExtra("ignoreDuration",30);
+                        PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context,1, intentAction30m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore30m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 30m", pendingIntent30m);
+
+                        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
                         builder.setSmallIcon(R.drawable.notif_icon)
-                                .setContentTitle(MainApp.gs(R.string.carbssuggestion))
+                                .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
                                 .setContentText(resultAfterConstraints.getCarbsRequiredText())
                                 .setAutoCancel(true)
                                 .setPriority(Notification.PRIORITY_MAX)
                                 .setCategory(Notification.CATEGORY_ALARM)
-                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
-                        presentSuggestion(builder);
+                                .addAction(actionIgnore5m)
+                                .addAction(actionIgnore15m)
+                                .addAction(actionIgnore30m)
+                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                                .setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
+
+                        NotificationManager mNotificationManager =
+                                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                        // mId allows you to update the notification later on.
+                        mNotificationManager.notify(Constants.notificationID, builder.build());
+                        rxBus.send(new EventNewOpenLoopNotification());
+
+                        // Send to Wear
+                        actionStringHandler.get().handleInitiate("changeRequest");
+
                     } else {
                         dismissSuggestion();
                     }
@@ -493,6 +527,11 @@ public class LoopPlugin extends PluginBase {
         }
     }
 
+    public void disableCarbSuggestions(int duartionMinutes) {
+        carbsSuggestionsSuspendedUntil = System.currentTimeMillis() + (duartionMinutes*60*1000);
+        dismissSuggestion();
+    }
+
     private void presentSuggestion(NotificationCompat.Builder builder) {
         // Creates an explicit intent for an Activity in your app
         Intent resultIntent = new Intent(context, MainActivity.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 0a21468800..d8b98f8e37 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -165,6 +165,7 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
     TextView activeProfileView;
     TextView iobView;
     TextView cobView;
+    TextView cobRequiredView;
     TextView apsModeView;
     TextView tempTargetView;
     TextView pumpStatusView;
@@ -277,6 +278,8 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
 
         iobView = (TextView) view.findViewById(R.id.overview_iob);
         cobView = (TextView) view.findViewById(R.id.overview_cob);
+        cobRequiredView = (TextView) view.findViewById(R.id.overview_cob_required);
+
         apsModeView = (TextView) view.findViewById(R.id.overview_apsmode);
         tempTargetView = (TextView) view.findViewById(R.id.overview_temptarget);
 
@@ -1331,6 +1334,17 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
             cobView.setText(cobText);
         }
 
+        if (cobRequiredView != null) {
+            if (loopPlugin.lastRun != null && loopPlugin.lastRun.constraintsProcessed != null
+                    && loopPlugin.lastRun.constraintsProcessed.carbsReq > 0) {
+                cobRequiredView.setVisibility(View.VISIBLE);
+                String carbsRequiredString = String.format(resourceHelper.gs(R.string.overview_carbs_required), loopPlugin.lastRun.constraintsProcessed.carbsReq, loopPlugin.lastRun.constraintsProcessed.carbsReqWithin);
+                cobRequiredView.setText(carbsRequiredString);
+            } else {
+                cobRequiredView.setVisibility(View.GONE);
+            }
+        }
+
         if (statuslightsLayout != null)
             if (sp.getBoolean(R.string.key_show_statuslights, false)) {
                 if (sp.getBoolean(R.string.key_show_statuslights_extended, false)) {
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 467c8c171a..70e1255275 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -266,6 +266,18 @@
                     app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
                     app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
 
+                <TextView
+                    android:id="@+id/overview_cob_required"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob_required"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/cobAlert"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob" />
+
                 <!-- right side basal -->
                 <TextView
                     android:id="@+id/overview_basebasal_label"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9d0e04ab3..63d9a21638 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1710,5 +1710,7 @@
     <string name="loop_smbexecution_time_label">SMB execution time</string>
     <string name="loop_tbrrequest_time_label">Temp basal request time</string>
     <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
+    <string name="cob_required">(20g needed in 45min)</string>
+    <string name="overview_carbs_required">(%dg needed in %dmin)</string>
 
 </resources>

From 72a3e825e3a0f52f252f5aca41f2208ab44e0258 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 18:59:39 +0000
Subject: [PATCH 003/400] Move carbs_suggestions_threshold to LoopPlugin so
 that non-critical carbs still show on overview (but no system notification)

---
 .../nightscout/androidaps/plugins/aps/loop/LoopPlugin.java    | 4 +++-
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.java       | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index eecb0d3e25..d245bdd816 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -409,7 +409,9 @@ public class LoopPlugin extends PluginBase {
             if (closedLoopEnabled.value()) {
 
                 if (allowNotification) {
-                    if (resultAfterConstraints.isCarbsRequired() && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
+                    if (resultAfterConstraints.isCarbsRequired()
+                            && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0)
+                            && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
 
                         Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
                         intentAction5m.putExtra("ignoreDuration",5);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index 746737ec0f..0c0c5e17ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -36,8 +36,7 @@ public class DetermineBasalResultSMB extends APSResult {
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
 
             if (SP.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
-                if (result.has("carbsReq") && result.getInt("carbsReq") >= SP.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0))
-                    carbsReq = result.getInt("carbsReq");
+                if (result.has("carbsReq")) carbsReq = result.getInt("carbsReq");
                 if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
             }
 

From 7b0bc81c476d9ff7a8253ab844fb6cea091bfdbe Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 24 Mar 2020 09:01:10 +0100
Subject: [PATCH 004/400] Upgrade RS encryption library

---
 .gitignore                                    |   1 -
 app/build.gradle                              |  26 -
 .../plugins/pump/danaRS/DanaRSPlugin.java     |   4 +-
 .../pump/danaRS/comm/DanaRS_Packet.java       |   5 +-
 ...RS_Packet_APS_Basal_Set_Temporary_Basal.kt |   4 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |   4 +-
 .../DanaRS_Packet_APS_Set_Event_History.kt    |   4 +-
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |   4 +-
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |   4 +-
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |   4 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |   4 +-
 .../DanaRS_Packet_Basal_Set_Basal_Rate.kt     |   4 +-
 ...Packet_Basal_Set_Cancel_Temporary_Basal.kt |   4 +-
 ...aRS_Packet_Basal_Set_Profile_Basal_Rate.kt |   4 +-
 .../DanaRS_Packet_Basal_Set_Profile_Number.kt |   4 +-
 .../DanaRS_Packet_Basal_Set_Suspend_Off.kt    |   4 +-
 .../DanaRS_Packet_Basal_Set_Suspend_On.kt     |   4 +-
 ...DanaRS_Packet_Basal_Set_Temporary_Basal.kt |   4 +-
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |   4 +-
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |   4 +-
 ...acket_Bolus_Get_Calculation_Information.kt |   4 +-
 ...et_Carbohydrate_Calculation_Information.kt |   4 +-
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |   4 +-
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |   4 +-
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |   4 +-
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |   4 +-
 .../DanaRS_Packet_Bolus_Get_Initial_Bolus.kt  |   4 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |   4 +-
 .../DanaRS_Packet_Bolus_Set_Bolus_Option.kt   |   4 +-
 .../DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt   |   4 +-
 .../DanaRS_Packet_Bolus_Set_Dual_Bolus.kt     |   4 +-
 .../DanaRS_Packet_Bolus_Set_Extended_Bolus.kt |   4 +-
 ..._Packet_Bolus_Set_Extended_Bolus_Cancel.kt |   4 +-
 .../DanaRS_Packet_Bolus_Set_Initial_Bolus.kt  |   4 +-
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |   4 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |   4 +-
 .../comm/DanaRS_Packet_Etc_Keep_Connection.kt |   4 +-
 .../DanaRS_Packet_Etc_Set_History_Save.kt     |   4 +-
 .../DanaRS_Packet_General_Delivery_Status.kt  |   4 +-
 ...aRS_Packet_General_Get_More_Information.kt |   4 +-
 .../DanaRS_Packet_General_Get_Password.kt     |   4 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |   4 +-
 ...Packet_General_Get_Shipping_Information.kt |   4 +-
 ...Packet_General_Get_Today_Delivery_Total.kt |   4 +-
 ...acket_General_Get_User_Time_Change_Flag.kt |   4 +-
 ...cket_General_Initial_Screen_Information.kt |   6 +-
 ..._Packet_General_Set_History_Upload_Mode.kt |   4 +-
 ...General_Set_User_Time_Change_Flag_Clear.kt |   7 +-
 .../comm/DanaRS_Packet_History_Alarm.kt       |   4 +-
 .../comm/DanaRS_Packet_History_All_History.kt |   4 +-
 .../comm/DanaRS_Packet_History_Basal.kt       |   4 +-
 .../DanaRS_Packet_History_Blood_Glucose.kt    |   4 +-
 .../comm/DanaRS_Packet_History_Bolus.kt       |   4 +-
 .../DanaRS_Packet_History_Carbohydrate.kt     |   4 +-
 .../comm/DanaRS_Packet_History_Daily.kt       |   4 +-
 .../comm/DanaRS_Packet_History_Prime.kt       |   4 +-
 .../comm/DanaRS_Packet_History_Refill.kt      |   4 +-
 .../comm/DanaRS_Packet_History_Suspend.kt     |   4 +-
 .../comm/DanaRS_Packet_History_Temporary.kt   |   4 +-
 .../danaRS/comm/DanaRS_Packet_Notify_Alarm.kt |   6 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |   6 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |   6 +-
 ...DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt |   6 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |   4 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |   4 +-
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     |   4 +-
 .../DanaRS_Packet_Option_Set_User_Option.kt   |   4 +-
 .../comm/DanaRS_Packet_Review_Bolus_Avg.kt    |   4 +-
 .../danaRS/encryption/BleEncryption.java}     |  62 +-
 .../plugins/pump/danaRS/services/BLEComm.java | 681 ------------------
 .../plugins/pump/danaRS/services/BLEComm.kt   | 556 ++++++++++++++
 .../pump/danaRS/services/DanaRSService.java   |  14 +-
 .../jniLibs/arm64-v8a/libBleEncryption.so     | Bin 0 -> 22680 bytes
 .../jniLibs/armeabi-v7a/libBleEncryption.so   | Bin 0 -> 26448 bytes
 app/src/main/jniLibs/x86/libBleEncryption.so  | Bin 0 -> 22296 bytes
 .../main/jniLibs/x86_64/libBleEncryption.so   | Bin 0 -> 22944 bytes
 .../danaRS/comm/DanaRSMessageHashTableTest.kt |   4 +-
 77 files changed, 745 insertions(+), 877 deletions(-)
 rename app/src/main/java/{com/cozmo/danar/util/BleCommandUtil.java => info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java} (76%)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
 create mode 100644 app/src/main/jniLibs/arm64-v8a/libBleEncryption.so
 create mode 100644 app/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
 create mode 100644 app/src/main/jniLibs/x86/libBleEncryption.so
 create mode 100644 app/src/main/jniLibs/x86_64/libBleEncryption.so

diff --git a/.gitignore b/.gitignore
index c7ed9df2f5..961dd40194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 build/
 .idea/*
 !.idea/codeStyles/
-app/src/main/jniLibs
 full/
 debug/
 release/
diff --git a/app/build.gradle b/app/build.gradle
index adc28fb221..73524734ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -340,30 +340,6 @@ dependencies {
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 
-
-task downloadZipFile(type: Download) {
-    src 'https://github.com/MilosKozak/danars-support-lib/archive/master.zip'
-    dest new File(buildDir, 'danars.zip')
-}
-
-task downloadAndUnzipFile(dependsOn: downloadZipFile, type: Copy) {
-    from zipTree(downloadZipFile.dest)
-    def outputDir = file("${buildDir}/unpacked/dist")
-    into outputDir
-}
-
-
-task copyLibs(dependsOn: downloadAndUnzipFile, type: Copy) {
-    def src = file("${buildDir}/unpacked/dist/danars-support-lib-master")
-    def target = file("src/main/jniLibs/")
-
-    from src
-    into target
-}
-
-task full_clean(type: Delete) {
-    delete file("src/main/jniLibs")
-}
 /*
 // Run 'adb' shell command to clear application data of main app for 'debug' variant
 task clearMainAppData(type: Exec) {
@@ -395,8 +371,6 @@ tasks.whenTaskAdded { task ->
     }
 }
 */
-clean.dependsOn full_clean
-preBuild.dependsOn copyLibs
 
 printf('--------------\n')
 printf('isMaster: %s\n', isMaster().toString())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 13c41933f5..b9d4af7497 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -195,9 +195,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     public void connect(String from) {
         getAapsLogger().debug(LTag.PUMP, "RS connect from: " + from);
         if (danaRSService != null && !mDeviceAddress.equals("") && !mDeviceName.equals("")) {
-            final Object o = new Object();
-
-            danaRSService.connect(from, mDeviceAddress, o);
+            danaRSService.connect(from, mDeviceAddress);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 0e77d7588b..9bb70720fb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -3,9 +3,8 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import com.cozmo.danar.util.BleCommandUtil;
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
@@ -21,7 +20,7 @@ public class DanaRS_Packet {
 
     private boolean received;
     public boolean failed;
-    protected int type = BleCommandUtil.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
+    protected int type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
     protected int opCode;
 
     public DanaRS_Packet() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
index d223641bba..89a2c3fac3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -14,7 +14,7 @@ class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
     var error = 0
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__APS_SET_TEMPORARY_BASAL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__APS_SET_TEMPORARY_BASAL
         aapsLogger.debug(LTag.PUMPCOMM, "New message: percent: $percent")
 
         if (percent < 0) percent = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 08b4502daa..27b88c1380 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.ExtendedBolus
@@ -36,7 +36,7 @@ open class DanaRS_Packet_APS_History_Events(
     private var sec = 0
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS
         val cal = GregorianCalendar()
         if (from > DateUtil.now()) {
             aapsLogger.debug(LTag.PUMPCOMM, "Asked to load from the future")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
index 266554d3be..861854d77b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -16,7 +16,7 @@ class DanaRS_Packet_APS_Set_Event_History(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
         if ((packetType == DanaRPump.CARBS || packetType == DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + DateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index aa0a74e97c..8cdbbe2d65 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -20,7 +20,7 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting basal rates")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
index 54793b555d..9b0de5603c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -13,7 +13,7 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting basal rates for profile $profileNumber")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
index c37242b740..bdd586e948 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Get_Profile_Number(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting active profile")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index fdc5c16480..bb5f0d8d98 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -13,7 +13,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting temporary basal status")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
index ea5dd4ee29..28d7b6b693 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Set_Basal_Rate(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_BASAL_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_BASAL_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
index 1d67a20a89..c30b938002 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL
         aapsLogger.debug(LTag.PUMPCOMM, "Canceling temp basal")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
index a65746f8e8..189a704e0c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates for profile $profileNumber")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
index b61c046682..2056889532 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Basal_Set_Profile_Number(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER
         aapsLogger.debug(LTag.PUMPCOMM, "Setting profile number $profileNumber")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
index 85e2f70456..eff81eb0bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Basal_Set_Suspend_Off(
     ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF
         aapsLogger.debug(LTag.PUMPCOMM, "Turning off suspend")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
index c603549d91..e3a3f9d228 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Basal_Set_Suspend_On(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON
         aapsLogger.debug(LTag.PUMPCOMM, "Turning on suspend")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
index cde564fbc0..f4318fb0b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -11,7 +11,7 @@ open class DanaRS_Packet_Basal_Set_Temporary_Basal(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL
         aapsLogger.debug(LTag.PUMPCOMM, "Setting temporary basal of $temporaryBasalRatio% for $temporaryBasalDuration hours")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index 36512ccec1..8918094938 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -20,7 +20,7 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index b157ad9978..d981da5033 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index 7dacd08599..6c19045a2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -12,7 +12,7 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
index ba69221673..c1bd0aeb40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
index 2fbe624322..97d40dd0af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Dual_Bolus(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
index 3cd50febdb..9d96debe56 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
index c48b08150b..ef24b5cec1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
index 44bcaea4c6..cd16a68bb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
index 5b3fe17f1f..50f5864e81 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Bolus_Get_Initial_Bolus(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index e6c8121506..395d90b6ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -13,7 +13,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
index 34f3967351..21d9b39d56 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -29,7 +29,7 @@ class DanaRS_Packet_Bolus_Set_Bolus_Option(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION
         aapsLogger.debug(LTag.PUMPCOMM, "Setting bolus options")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
index e31a770db7..137c1633b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -23,7 +23,7 @@ class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
index d0fef47f82..919039319b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -13,7 +13,7 @@ class DanaRS_Packet_Bolus_Set_Dual_Bolus(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "Dual bolus start : $amount U extended: $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
index 620a4722ab..222152c2a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -12,7 +12,7 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start : $extendedAmount U halfhours: $extendedBolusDurationInHalfHours")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
index 8596219ba4..868dd5f7b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL
         aapsLogger.debug(LTag.PUMPCOMM, "Cancel extended bolus")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
index fb1154c43f..eecd43c6ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -13,7 +13,7 @@ class DanaRS_Packet_Bolus_Set_Initial_Bolus(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index ce9aaf9e1b..ef14999e22 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -17,7 +17,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START
         // Speed 0 => 12 sec/U, 1 => 30 sec/U, 2 => 60 sec/U
         // HARDCODED LIMIT - if there is one that could be created
         amount = constraintChecker.applyBolusConstraints(Constraint(amount)).value()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index f84becafc5..462d639a0c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -18,7 +18,7 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
     }
 
     override fun handleMessage(data: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
index dd29887ef0..1038881c2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Etc_Keep_Connection(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
index 99fe5da588..ae1fac6bff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -19,7 +19,7 @@ class DanaRS_Packet_Etc_Set_History_Save(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
index 524b8e13c8..21937923fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_General_Delivery_Status(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
index b8e7e6bb53..875b91f397 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -13,7 +13,7 @@ class DanaRS_Packet_General_Get_More_Information(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
index 5a1358c38b..58cdf77ae9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_Password(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index 7c6f2fab5c..bf3338b52f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -18,7 +18,7 @@ class DanaRS_Packet_General_Get_Pump_Check(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index 00ebd4118a..6bf3296af1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -12,7 +12,7 @@ class DanaRS_Packet_General_Get_Shipping_Information(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
index 31310e3d08..fe9c676ca9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_Today_Delivery_Total(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
index 99c0cc2879..45e68600d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_General_Get_User_Time_Change_Flag(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index fab00aca3d..574791a005 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,8 +11,8 @@ class DanaRS_Packet_General_Initial_Screen_Information(
 ) : DanaRS_Packet() {
 
     init {
-        type = BleCommandUtil.DANAR_PACKET__TYPE_RESPONSE
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
+        type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
index b6b884f27d..e26e13e6f0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Set_History_Upload_Mode(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE
         aapsLogger.debug(LTag.PUMPCOMM, "New message: mode: $mode")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
index 132141b808..969f226fb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
@@ -1,18 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.logging.L.isEnabled
 import info.nightscout.androidaps.logging.LTag
-import org.slf4j.LoggerFactory
 
 class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
     private val aapsLogger: AAPSLogger
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
     override fun handleMessage(data: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
index 9b0c7ef4c6..bcf3ffc1df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALARM
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALARM
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
index a8010b2127..2b42507888 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_All_History(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
index 0ac22574d5..09173ed5c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Basal @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BASAL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BASAL
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
index 6ebbeaed53..7f07e71680 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
index 47996fc8c6..d6f8b51707 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
index 1084434962..ed3b49a8d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
index 93e974728d..645cab8272 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Daily @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DAILY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DAILY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
index 0306e6f129..da209b0a8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Prime @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__PRIME
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__PRIME
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
index 672c5e2cc4..8b470a0170 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Refill @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__REFILL
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__REFILL
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
index 9868cd10a4..2e5ad23dd9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
index b185748495..5689ca82c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -12,7 +12,7 @@ class DanaRS_Packet_History_Temporary(
 ) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
index 5cc82d93a5..7650ff3704 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -13,8 +13,8 @@ class DanaRS_Packet_Notify_Alarm(
 ) : DanaRS_Packet() {
 
     init {
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__ALARM
+        type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_NOTIFY__ALARM
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index 246f2c7fe5..03d884933b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -18,8 +18,8 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 ) : DanaRS_Packet() {
 
     init {
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_COMPLETE
+        type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_COMPLETE
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index 9705c53669..a63bad6f23 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -19,8 +19,8 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
 
     init {
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_RATE_DISPLAY
+        type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_RATE_DISPLAY
     }
 
     override fun handleMessage(data: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
index ad5fdbdef6..f15582f3d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,8 +9,8 @@ class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
 ) : DanaRS_Packet() {
 
     init {
-        type = BleCommandUtil.DANAR_PACKET__TYPE_NOTIFY
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_NOTIFY__MISSED_BOLUS_ALARM
+        type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_NOTIFY__MISSED_BOLUS_ALARM
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 2b18603d11..b582a0b492 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -13,7 +13,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting pump time")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
index 07694f6380..a012b1302b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -11,7 +11,7 @@ class DanaRS_Packet_Option_Get_User_Option(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
         aapsLogger.debug(LTag.PUMPCOMM, "Requesting user settings")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
index ec1a44c789..54a38af3de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.DateUtil
@@ -14,7 +14,7 @@ class DanaRS_Packet_Option_Set_Pump_Time(
     var error = 0
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME
         aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + DateUtil.dateAndTimeString(time))
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
index 2ca965fc60..d266bf765b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -12,7 +12,7 @@ class DanaRS_Packet_Option_Set_User_Option(
 
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
         aapsLogger.debug(LTag.PUMPCOMM, "Setting user settings")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
index c99a56a2b8..ee953d8581 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
@@ -9,7 +9,7 @@ class DanaRS_Packet_Review_Bolus_Avg(
 ) : DanaRS_Packet() {
 
     init {
-        opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
diff --git a/app/src/main/java/com/cozmo/danar/util/BleCommandUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
similarity index 76%
rename from app/src/main/java/com/cozmo/danar/util/BleCommandUtil.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
index a417b379e8..edd36f583e 100644
--- a/app/src/main/java/com/cozmo/danar/util/BleCommandUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
@@ -1,10 +1,18 @@
-package com.cozmo.danar.util;
+package info.nightscout.androidaps.plugins.pump.danaRS.encryption;
 
 import android.content.Context;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class BleEncryption {
+    private Context context;
+
+    @Inject BleEncryption(Context context) {
+        this.context = context;
+    }
 
-public class BleCommandUtil {
     public static final int DANAR_PACKET__TYPE_ENCRYPTION_REQUEST = 0x01;
     public static final int DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE = 0x02;
     public static final int DANAR_PACKET__TYPE_COMMAND = 0xA1;
@@ -12,10 +20,13 @@ public class BleCommandUtil {
     public static final int DANAR_PACKET__TYPE_NOTIFY = 0xC3;
 
     public static final int DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK = 0x00;
+    public static final int DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION = 0x01;
     public static final int DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY = 0xD0;
     public static final int DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST = 0xD1;
     public static final int DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN = 0xD2;
-    public static final int DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION = 0x01;
+    // Easy Mode
+    public static final int DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK = 0xF3;
+    public static final int DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK = 0xF4;
 
     public static final int DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_COMPLETE = 0x01;
     public static final int DANAR_PACKET__OPCODE_NOTIFY__DELIVERY_RATE_DISPLAY = 0x02;
@@ -86,35 +97,50 @@ public class BleCommandUtil {
     public static final int DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS = 0xC2;
     public static final int DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY = 0xC3;
 
+    // Easy Mode
+    public static final int DANAR_PACKET__OPCODE_OPTION__GET_EASY_MENU_OPTION = 0x74;
+    public static final int DANAR_PACKET__OPCODE_OPTION__SET_EASY_MENU_OPTION = 0x75;
+
     public static final int DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE = 0xE0;
     public static final int DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION = 0xFF;
 
     static {
-        System.loadLibrary("BleCommandUtil");
+        System.loadLibrary("BleEncryption");
     }
 
-    private static native byte[] getEncryptedPacketJni(Object context, int opcode, byte[] bytes, String deviceName);
+    private static native byte[] encryptPacketJni(Object context, int opcode, byte[] bytes, String deviceName);
 
-    private static native byte[] getDecryptedPacketJni(Object context, byte[] bytes);
+    private static native byte[] decryptPacketJni(Object context, byte[] bytes);
 
-    // ---------------------------------------------------------
+    private static native void setPairingKeysJni(byte[] pairingKey, byte[] randomPairingKey, byte randomSyncKey);
 
-    private static BleCommandUtil mInstance = null;
+    private static native void setEnhancedEncryptionJni(boolean isSecurityVersion);
 
-    public static BleCommandUtil getInstance() {
-        if (mInstance == null) {
-            mInstance = new BleCommandUtil();
-        }
-        return mInstance;
-    }
+    private static native byte[] encryptSecondLevelPacketJni(Object context, byte[] bytes);
 
-    // ---------------------------------------------------------
+    private static native byte[] decryptSecondLevelPacketJni(Object context, byte[] bytes);
 
     public byte[] getEncryptedPacket(int opcode, byte[] bytes, String deviceName) {
-        return getEncryptedPacketJni(MainApp.instance().getApplicationContext(), opcode, bytes, deviceName);
+        return encryptPacketJni(context, opcode, bytes, deviceName);
     }
 
     public byte[] getDecryptedPacket(byte[] bytes) {
-        return getDecryptedPacketJni(MainApp.instance().getApplicationContext(), bytes);
+        return decryptPacketJni(context, bytes);
+    }
+
+    public void setPairingKeys(byte[] pairingKey, byte[] randomPairingKey, byte randomSyncKey) {
+        setPairingKeysJni(pairingKey, randomPairingKey, randomSyncKey);
+    }
+
+    public void setEnhancedEncryption(boolean isSecureVersion) {
+        setEnhancedEncryptionJni(isSecureVersion);
+    }
+
+    public byte[] encryptSecondLevelPacket(byte[] bytes) {
+        return encryptSecondLevelPacketJni(context, bytes);
+    }
+
+    public byte[] ecryptSecondLevelPacket(byte[] bytes) {
+        return decryptSecondLevelPacketJni(context, bytes);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
deleted file mode 100644
index 75ceba52ee..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.java
+++ /dev/null
@@ -1,681 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.services;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothGatt;
-import android.bluetooth.BluetoothGattCallback;
-import android.bluetooth.BluetoothGattCharacteristic;
-import android.bluetooth.BluetoothGattService;
-import android.bluetooth.BluetoothManager;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-
-import com.cozmo.danar.util.BleCommandUtil;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ScheduledFuture;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by mike on 23.09.2017.
- */
-
-public class BLEComm {
-    private Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
-
-    private final long WRITE_DELAY_MILLIS = 50;
-
-    private String UART_READ_UUID = "0000fff1-0000-1000-8000-00805f9b34fb";
-    private String UART_WRITE_UUID = "0000fff2-0000-1000-8000-00805f9b34fb";
-
-    private final byte PACKET_START_BYTE = (byte) 0xA5;
-    private final byte PACKET_END_BYTE = (byte) 0x5A;
-    private Context context;
-    private DanaRPump danaRPump;
-    private DanaRSMessageHashTable danaRSMessageHashTable;
-
-    public BLEComm(Context context, DanaRSMessageHashTable danaRSMessageHashTable, DanaRPump danaRPump) {
-        this.context = context;
-        this.danaRPump = danaRPump;
-        this.danaRSMessageHashTable = danaRSMessageHashTable;
-        initialize();
-    }
-
-    private ScheduledFuture<?> scheduledDisconnection = null;
-
-    private DanaRS_Packet processsedMessage = null;
-    private final ArrayList<byte[]> mSendQueue = new ArrayList<>();
-
-    private BluetoothManager mBluetoothManager = null;
-    private BluetoothAdapter mBluetoothAdapter = null;
-    private String mBluetoothDeviceName = null;
-    private BluetoothGatt mBluetoothGatt = null;
-
-    protected boolean isConnected = false;
-    protected boolean isConnecting = false;
-
-    private BluetoothGattCharacteristic UART_Read;
-    private BluetoothGattCharacteristic UART_Write;
-
-    private boolean initialize() {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("Initializing BLEComm.");
-
-        if (mBluetoothManager == null) {
-            mBluetoothManager = ((BluetoothManager) MainApp.instance().getApplicationContext().getSystemService(Context.BLUETOOTH_SERVICE));
-            if (mBluetoothManager == null) {
-                log.error("Unable to initialize BluetoothManager.");
-                return false;
-            }
-        }
-
-        mBluetoothAdapter = mBluetoothManager.getAdapter();
-        if (mBluetoothAdapter == null) {
-            log.error("Unable to obtain a BluetoothAdapter.");
-            return false;
-        }
-
-        return true;
-    }
-
-    public boolean isConnected() {
-        return isConnected;
-    }
-
-    public boolean isConnecting() {
-        return isConnecting;
-    }
-
-    public boolean connect(String from, String address, Object confirmConnect) {
-        BluetoothManager tBluetoothManager = ((BluetoothManager) MainApp.instance().getApplicationContext().getSystemService(Context.BLUETOOTH_SERVICE));
-        if (tBluetoothManager == null) {
-            return false;
-        }
-
-        BluetoothAdapter tBluetoothAdapter = tBluetoothManager.getAdapter();
-        if (tBluetoothAdapter == null) {
-            return false;
-        }
-
-        if (mBluetoothAdapter == null) {
-            if (!initialize()) {
-                return false;
-            }
-        }
-
-        if (address == null) {
-            log.error("unspecified address.");
-            return false;
-        }
-
-        isConnecting = true;
-
-        BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address);
-        if (device == null) {
-            log.error("Device not found.  Unable to connect from: " + from);
-            return false;
-        }
-
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("Trying to create a new connection from: " + from);
-        mBluetoothDeviceName = device.getName();
-        mBluetoothGatt = device.connectGatt(context, false, mGattCallback);
-        setCharacteristicNotification(getUARTReadBTGattChar(), true);
-        return true;
-    }
-
-    public void stopConnecting() {
-        isConnecting = false;
-    }
-
-    public synchronized void disconnect(String from) {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("disconnect from: " + from);
-
-        // cancel previous scheduled disconnection to prevent closing upcomming connection
-        if (scheduledDisconnection != null)
-            scheduledDisconnection.cancel(false);
-        scheduledDisconnection = null;
-
-        if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-            log.error("disconnect not possible: (mBluetoothAdapter == null) " + (mBluetoothAdapter == null));
-            log.error("disconnect not possible: (mBluetoothGatt == null) " + (mBluetoothGatt == null));
-            return;
-        }
-        setCharacteristicNotification(getUARTReadBTGattChar(), false);
-        mBluetoothGatt.disconnect();
-        isConnected = false;
-        SystemClock.sleep(2000);
-    }
-
-    public synchronized void close() {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("BluetoothAdapter close");
-        if (mBluetoothGatt == null) {
-            return;
-        }
-
-        mBluetoothGatt.close();
-        mBluetoothGatt = null;
-    }
-
-
-    private String getConnectDeviceName() {
-        return mBluetoothDeviceName;
-    }
-
-    private final BluetoothGattCallback mGattCallback = new BluetoothGattCallback() {
-        public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
-            onConnectionStateChangeSynchronized(gatt, status, newState); // call it synchronized
-        }
-
-        public void onServicesDiscovered(BluetoothGatt gatt, int status) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("onServicesDiscovered");
-            if (status == BluetoothGatt.GATT_SUCCESS) {
-                findCharacteristic();
-            }
-            SendPumpCheck();
-            // 1st message sent to pump after connect
-        }
-
-        public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("onCharacteristicRead" + (characteristic != null ? ":" + DanaRS_Packet.toHexString(characteristic.getValue()) : ""));
-            addToReadBuffer(characteristic.getValue());
-            readDataParsing();
-        }
-
-        public void onCharacteristicChanged(BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("onCharacteristicChanged" + (characteristic != null ? ":" + DanaRS_Packet.toHexString(characteristic.getValue()) : ""));
-            addToReadBuffer(characteristic.getValue());
-            new Thread(() -> readDataParsing()).start();
-        }
-
-        public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("onCharacteristicWrite" + (characteristic != null ? ":" + DanaRS_Packet.toHexString(characteristic.getValue()) : ""));
-            new Thread(() -> {
-                synchronized (mSendQueue) {
-                    // after message sent, check if there is the rest of the message waiting and send it
-                    if (mSendQueue.size() > 0) {
-                        byte[] bytes = mSendQueue.get(0);
-                        mSendQueue.remove(0);
-                        writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-                    }
-                }
-            }).start();
-        }
-    };
-
-    private synchronized void setCharacteristicNotification(BluetoothGattCharacteristic characteristic, boolean enabled) {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("setCharacteristicNotification");
-        if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-            log.error("BluetoothAdapter not initialized_ERROR");
-            isConnecting = false;
-            isConnected = false;
-            return;
-        }
-        mBluetoothGatt.setCharacteristicNotification(characteristic, enabled);
-    }
-
-    public synchronized void readCharacteristic(BluetoothGattCharacteristic characteristic) {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("readCharacteristic");
-        if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-            log.error("BluetoothAdapter not initialized_ERROR");
-            isConnecting = false;
-            isConnected = false;
-            return;
-        }
-        mBluetoothGatt.readCharacteristic(characteristic);
-    }
-
-    private synchronized void writeCharacteristic_NO_RESPONSE(final BluetoothGattCharacteristic characteristic, final byte[] data) {
-        new Thread(() -> {
-            SystemClock.sleep(WRITE_DELAY_MILLIS);
-
-            if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-                log.error("BluetoothAdapter not initialized_ERROR");
-                isConnecting = false;
-                isConnected = false;
-                return;
-            }
-
-            characteristic.setValue(data);
-            characteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE);
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data));
-            mBluetoothGatt.writeCharacteristic(characteristic);
-        }).start();
-    }
-
-    private BluetoothGattCharacteristic getUARTReadBTGattChar() {
-        if (UART_Read == null) {
-            UART_Read = new BluetoothGattCharacteristic(UUID.fromString(UART_READ_UUID), BluetoothGattCharacteristic.PROPERTY_READ | BluetoothGattCharacteristic.PROPERTY_NOTIFY, 0);
-        }
-        return UART_Read;
-    }
-
-    private BluetoothGattCharacteristic getUARTWriteBTGattChar() {
-        if (UART_Write == null) {
-            UART_Write = new BluetoothGattCharacteristic(UUID.fromString(UART_WRITE_UUID), BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE, 0);
-        }
-        return UART_Write;
-    }
-
-    private List<BluetoothGattService> getSupportedGattServices() {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("getSupportedGattServices");
-        if ((mBluetoothAdapter == null) || (mBluetoothGatt == null)) {
-            log.error("BluetoothAdapter not initialized_ERROR");
-            isConnecting = false;
-            isConnected = false;
-            return null;
-        }
-
-        return mBluetoothGatt.getServices();
-    }
-
-    private void findCharacteristic() {
-        List<BluetoothGattService> gattServices = getSupportedGattServices();
-
-        if (gattServices == null) {
-            return;
-        }
-        String uuid;
-
-        for (BluetoothGattService gattService : gattServices) {
-            List<BluetoothGattCharacteristic> gattCharacteristics = gattService.getCharacteristics();
-            for (BluetoothGattCharacteristic gattCharacteristic : gattCharacteristics) {
-                uuid = gattCharacteristic.getUuid().toString();
-                if (UART_READ_UUID.equals(uuid)) {
-                    UART_Read = gattCharacteristic;
-                    setCharacteristicNotification(UART_Read, true);
-                }
-                if (UART_WRITE_UUID.equals(uuid)) {
-                    UART_Write = gattCharacteristic;
-                }
-            }
-        }
-    }
-
-    private synchronized void onConnectionStateChangeSynchronized(BluetoothGatt gatt, int status, int newState) {
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug("onConnectionStateChange");
-
-        if (newState == BluetoothProfile.STATE_CONNECTED) {
-            mBluetoothGatt.discoverServices();
-        } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
-            close();
-            isConnected = false;
-            isConnecting = false;
-            RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED));
-            if (L.isEnabled(L.PUMPBTCOMM))
-                log.debug("Device was disconnected " + gatt.getDevice().getName());//Device was disconnected
-        }
-    }
-
-    private final byte[] readBuffer = new byte[1024];
-    private int bufferLength = 0;
-
-    private void addToReadBuffer(byte[] buffer) {
-        //log.debug("addToReadBuffer " + DanaRS_Packet.toHexString(buffer));
-        if (buffer == null || buffer.length == 0) {
-            return;
-        }
-        synchronized (readBuffer) {
-            // Append incomming data to input buffer
-            System.arraycopy(buffer, 0, readBuffer, bufferLength, buffer.length);
-            bufferLength += buffer.length;
-        }
-    }
-
-    private void readDataParsing() {
-        boolean startSignatureFound = false, packetIsValid = false;
-        boolean isProcessing;
-
-        isProcessing = true;
-
-        while (isProcessing) {
-            int length = 0;
-            byte[] inputBuffer = null;
-            synchronized (readBuffer) {
-                // Find packet start [A5 A5]
-                if (bufferLength >= 6) {
-                    for (int idxStartByte = 0; idxStartByte < bufferLength - 2; idxStartByte++) {
-                        if ((readBuffer[idxStartByte] == PACKET_START_BYTE) && (readBuffer[idxStartByte + 1] == PACKET_START_BYTE)) {
-                            if (idxStartByte > 0) {
-                                // if buffer doesn't start with signature remove the leading trash
-                                if (L.isEnabled(L.PUMPBTCOMM))
-                                    log.debug("Shifting the input buffer by " + idxStartByte + " bytes");
-                                System.arraycopy(readBuffer, idxStartByte, readBuffer, 0, bufferLength - idxStartByte);
-                                bufferLength -= idxStartByte;
-                            }
-                            startSignatureFound = true;
-                            break;
-                        }
-                    }
-                }
-                // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A
-                //           ^---- LEN -----^
-                // total packet length 2 + 1 + readBuffer[2] + 2 + 2
-                if (startSignatureFound) {
-                    length = readBuffer[2];
-                    // test if there is enough data loaded
-                    if (length + 7 > bufferLength)
-                        return;
-                    // Verify packed end [5A 5A]
-                    if ((readBuffer[length + 5] == PACKET_END_BYTE) && (readBuffer[length + 6] == PACKET_END_BYTE)) {
-                        packetIsValid = true;
-                    }
-                }
-                if (packetIsValid) {
-                    inputBuffer = new byte[length + 7];
-                    // copy packet to input buffer
-                    System.arraycopy(readBuffer, 0, inputBuffer, 0, length + 7);
-                    // Cut off the message from readBuffer
-                    try {
-                        System.arraycopy(readBuffer, length + 7, readBuffer, 0, bufferLength - (length + 7));
-                    } catch (Exception e) {
-                        log.error("length: " + length + "bufferLength: " + bufferLength);
-                        throw e;
-                    }
-                    bufferLength -= (length + 7);
-                    // now we have encrypted packet in inputBuffer
-                }
-            }
-            if (packetIsValid) {
-                try {
-                    // decrypt the packet
-                    inputBuffer = BleCommandUtil.getInstance().getDecryptedPacket(inputBuffer);
-
-                    if (inputBuffer == null) {
-                        log.error("Null decryptedInputBuffer");
-                        return;
-                    }
-
-                    switch (inputBuffer[0]) {
-                        // initial handshake packet
-                        case (byte) BleCommandUtil.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE:
-                            switch (inputBuffer[1]) {
-                                // 1st packet
-                                case (byte) BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK:
-                                    if (inputBuffer.length == 4 && inputBuffer[2] == 'O' && inputBuffer[3] == 'K') {
-                                        if (L.isEnabled(L.PUMPBTCOMM))
-                                            log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                        // Grab pairing key from preferences if exists
-                                        String pairingKey = SP.getString(MainApp.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, null);
-                                        if (L.isEnabled(L.PUMPBTCOMM))
-                                            log.debug("Using stored pairing key: " + pairingKey);
-                                        if (pairingKey != null) {
-                                            byte[] encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey);
-                                            byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null);
-                                            if (L.isEnabled(L.PUMPBTCOMM))
-                                                log.debug(">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes));
-                                            writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-                                        } else {
-                                            // Stored pairing key does not exists, request pairing
-                                            SendPairingRequest();
-                                        }
-
-                                    } else if (inputBuffer.length == 6 && inputBuffer[2] == 'P' && inputBuffer[3] == 'U' && inputBuffer[4] == 'M' && inputBuffer[5] == 'P') {
-                                        if (L.isEnabled(L.PUMPBTCOMM))
-                                            log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                        mSendQueue.clear();
-                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumperror)));
-                                        NSUpload.uploadError(MainApp.gs(R.string.pumperror));
-                                        Notification n = new Notification(Notification.PUMPERROR, MainApp.gs(R.string.pumperror), Notification.URGENT);
-                                        RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
-                                    } else if (inputBuffer.length == 6 && inputBuffer[2] == 'B' && inputBuffer[3] == 'U' && inputBuffer[4] == 'S' && inputBuffer[5] == 'Y') {
-                                        if (L.isEnabled(L.PUMPBTCOMM))
-                                            log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                        mSendQueue.clear();
-                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.pumpbusy)));
-                                    } else {
-                                        // ERROR in response, wrong serial number
-                                        if (L.isEnabled(L.PUMPBTCOMM))
-                                            log.debug("<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                        mSendQueue.clear();
-                                        RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, MainApp.gs(R.string.connectionerror)));
-                                        SP.remove(MainApp.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName);
-                                        Notification n = new Notification(Notification.WRONGSERIALNUMBER, MainApp.gs(R.string.wrongpassword), Notification.URGENT);
-                                        RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
-                                    }
-                                    break;
-                                // 2nd packet, pairing key
-                                case (byte) BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY:
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                    if (inputBuffer[2] == (byte) 0x00) {
-                                        // Paring is not requested, sending time info
-                                        SendTimeInfo();
-                                    } else {
-                                        // Pairing on pump is requested
-                                        SendPairingRequest();
-                                    }
-                                    break;
-                                case (byte) BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST:
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(inputBuffer));
-                                    if (inputBuffer[2] != (byte) 0x00) {
-                                        disconnect("passkey request failed");
-                                    }
-                                    break;
-                                // Paring response, OK button on pump pressed
-                                case (byte) BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN:
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(inputBuffer));
-                                    // Paring is successfull, sending time info
-                                    RxBus.Companion.getINSTANCE().send(new EventDanaRSPairingSuccess());
-                                    SendTimeInfo();
-                                    byte[] pairingKey = {inputBuffer[2], inputBuffer[3]};
-                                    // store pairing key to preferences
-                                    SP.putString(MainApp.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey));
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey));
-                                    break;
-                                // time and user password information. last packet in handshake
-                                case (byte) BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION:
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("<<<<< " + "ENCRYPTION__TIME_INFORMATION " + /*message.getMessageName() + " " + */ DanaRS_Packet.toHexString(inputBuffer));
-                                    int size = inputBuffer.length;
-                                    int pass = ((inputBuffer[size - 1] & 0x000000FF) << 8) + ((inputBuffer[size - 2] & 0x000000FF));
-                                    pass = pass ^ 3463;
-                                    danaRPump.setRsPassword(Integer.toHexString(pass));
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("Pump user password: " + Integer.toHexString(pass));
-
-                                    RxBus.Companion.getINSTANCE().send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED));
-                                    isConnected = true;
-                                    isConnecting = false;
-                                    if (L.isEnabled(L.PUMPBTCOMM))
-                                        log.debug("RS connected and status read");
-                                    break;
-                            }
-                            break;
-                        // common data packet
-                        default:
-                            DanaRS_Packet message;
-                            // Retrieve message code from received buffer and last message sent
-                            int originalCommand = processsedMessage != null ? processsedMessage.getCommand() : 0xFFFF;
-                            int receivedCommand = DanaRS_Packet.getCommand(inputBuffer);
-                            if (originalCommand == receivedCommand) {
-                                // it's response to last message
-                                message = processsedMessage;
-                            } else {
-                                // it's not response to last message, create new instance
-                                message = danaRSMessageHashTable.findMessage(receivedCommand);
-                            }
-                            if (message != null) {
-                                if (L.isEnabled(L.PUMPBTCOMM))
-                                    log.debug("<<<<< " + message.getFriendlyName() + " " + DanaRS_Packet.toHexString(inputBuffer));
-                                // process received data
-                                message.handleMessage(inputBuffer);
-                                message.setReceived();
-                                synchronized (message) {
-                                    // notify to sendMessage
-                                    message.notify();
-                                }
-                            } else {
-                                log.error("Unknown message received " + DanaRS_Packet.toHexString(inputBuffer));
-                            }
-                            break;
-                    }
-                } catch (Exception e) {
-                    log.error("Unhandled exception", e);
-                }
-                startSignatureFound = false;
-                packetIsValid = false;
-                if (bufferLength < 6) {
-                    // stop the loop
-                    isProcessing = false;
-                }
-            } else {
-                // stop the loop
-                isProcessing = false;
-            }
-        }
-    }
-
-    public void sendMessage(DanaRS_Packet message) {
-        processsedMessage = message;
-        if (message == null)
-            return;
-
-        byte[] command = {(byte) message.getType(), (byte) message.getOpCode()};
-        byte[] params = message.getRequestParams();
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + message.getFriendlyName() + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params));
-        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(message.getOpCode(), params, null);
-        // If there is another message not completely sent, add to queue only
-        if (mSendQueue.size() > 0) {
-            // Split to parts per 20 bytes max
-            for (; ; ) {
-                if (bytes.length > 20) {
-                    byte[] addBytes = new byte[20];
-                    System.arraycopy(bytes, 0, addBytes, 0, addBytes.length);
-                    byte[] reBytes = new byte[bytes.length - addBytes.length];
-                    System.arraycopy(bytes, addBytes.length, reBytes, 0, reBytes.length);
-                    bytes = reBytes;
-                    synchronized (mSendQueue) {
-                        mSendQueue.add(addBytes);
-                    }
-                } else {
-                    synchronized (mSendQueue) {
-                        mSendQueue.add(bytes);
-                    }
-                    break;
-                }
-            }
-
-        } else {
-            if (bytes.length > 20) {
-                // Cut first 20 bytes
-                byte[] sendBytes = new byte[20];
-                System.arraycopy(bytes, 0, sendBytes, 0, sendBytes.length);
-                byte[] reBytes = new byte[bytes.length - sendBytes.length];
-                System.arraycopy(bytes, sendBytes.length, reBytes, 0, reBytes.length);
-                bytes = reBytes;
-                // and send
-                writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), sendBytes);
-                // The rest split to parts per 20 bytes max
-                for (; ; ) {
-                    if (bytes.length > 20) {
-                        byte[] addBytes = new byte[20];
-                        System.arraycopy(bytes, 0, addBytes, 0, addBytes.length);
-                        reBytes = new byte[bytes.length - addBytes.length];
-                        System.arraycopy(bytes, addBytes.length, reBytes, 0, reBytes.length);
-                        bytes = reBytes;
-                        synchronized (mSendQueue) {
-                            mSendQueue.add(addBytes);
-                        }
-                    } else {
-                        synchronized (mSendQueue) {
-                            mSendQueue.add(bytes);
-                        }
-                        break;
-                    }
-                }
-            } else {
-                writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-            }
-        }
-        // The rest from queue is send from onCharasteristicWrite (after sending 1st part)
-        synchronized (message) {
-            try {
-                message.wait(5000);
-            } catch (InterruptedException e) {
-                log.error("sendMessage InterruptedException", e);
-                log.error("Unhandled exception", e);
-            }
-        }
-
-        //SystemClock.sleep(200);
-        if (!message.isReceived()) {
-            log.warn("Reply not received " + message.getFriendlyName());
-            message.handleMessageNotReceived();
-        }
-    }
-
-    private void SendPairingRequest() {
-        // Start activity which is waiting 20sec
-        // On pump pairing request is displayed and is waiting for conformation
-        Intent i = new Intent();
-        i.setClass(MainApp.instance(), PairingHelperActivity.class);
-        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        MainApp.instance().startActivity(i);
-
-        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null);
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes));
-        writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-    }
-
-    private void SendPumpCheck() {
-        // 1st message sent to pump after connect
-        String devicename = getConnectDeviceName();
-        if (devicename == null || devicename.equals("")) {
-            Notification n = new Notification(Notification.DEVICENOTPAIRED, MainApp.gs(R.string.pairfirst), Notification.URGENT);
-            RxBus.Companion.getINSTANCE().send(new EventNewNotification(n));
-            return;
-        }
-        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, devicename);
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes));
-        writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-    }
-
-    private void SendTimeInfo() {
-        byte[] bytes = BleCommandUtil.getInstance().getEncryptedPacket(BleCommandUtil.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null);
-        if (L.isEnabled(L.PUMPBTCOMM))
-            log.debug(">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes));
-        writeCharacteristic_NO_RESPONSE(getUARTWriteBTGattChar(), bytes);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
new file mode 100644
index 0000000000..b079d5c241
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -0,0 +1,556 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.services
+
+import android.bluetooth.*
+import android.content.Context
+import android.content.Intent
+import android.os.SystemClock
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import okhttp3.internal.notify
+import okhttp3.internal.waitMillis
+import java.util.*
+import java.util.concurrent.ScheduledFuture
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BLEComm @Inject internal constructor(
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val rxBus: RxBusWrapper,
+    private val sp: SP,
+    private val danaRSMessageHashTable: DanaRSMessageHashTable,
+    private val danaRPump: DanaRPump,
+    private val bleEncryption: BleEncryption
+) {
+
+    companion object {
+        private const val WRITE_DELAY_MILLIS: Long = 50
+        private const val UART_READ_UUID = "0000fff1-0000-1000-8000-00805f9b34fb"
+        private const val UART_WRITE_UUID = "0000fff2-0000-1000-8000-00805f9b34fb"
+
+        private const val PACKET_START_BYTE = 0xA5.toByte()
+        private const val PACKET_END_BYTE = 0x5A.toByte()
+    }
+
+    private var scheduledDisconnection: ScheduledFuture<*>? = null
+    private var processedMessage: DanaRS_Packet? = null
+    private val mSendQueue = ArrayList<ByteArray>()
+    private var mBluetoothManager: BluetoothManager? = null
+    private var mBluetoothAdapter: BluetoothAdapter? = null
+    private var connectDeviceName: String? = null
+    private var mBluetoothGatt: BluetoothGatt? = null
+
+    var isConnected = false
+    var isConnecting = false
+    private var uartRead: BluetoothGattCharacteristic? = null
+    private var uartWrite: BluetoothGattCharacteristic? = null
+
+    init {
+        initialize()
+    }
+
+    private fun initialize(): Boolean {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing BLEComm.")
+        if (mBluetoothManager == null) {
+            mBluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            if (mBluetoothManager == null) {
+                aapsLogger.error("Unable to initialize BluetoothManager.")
+                return false
+            }
+        }
+        mBluetoothAdapter = mBluetoothManager?.adapter
+        if (mBluetoothAdapter == null) {
+            aapsLogger.error("Unable to obtain a BluetoothAdapter.")
+            return false
+        }
+        return true
+    }
+
+    fun connect(from: String, address: String?): Boolean {
+        // test existing BT device
+        val tBluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?
+            ?: return false
+        tBluetoothManager.adapter ?: return false
+
+        if (address == null) {
+            aapsLogger.error("unspecified address.")
+            return false
+        }
+
+        if (mBluetoothAdapter == null) {
+            if (!initialize()) {
+                return false
+            }
+        }
+        isConnecting = true
+        val device = mBluetoothAdapter?.getRemoteDevice(address)
+        if (device == null) {
+            aapsLogger.error("Device not found.  Unable to connect from: $from")
+            return false
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Trying to create a new connection from: $from")
+        connectDeviceName = device.name
+        mBluetoothGatt = device.connectGatt(context, false, mGattCallback)
+        setCharacteristicNotification(uartReadBTGattChar, true)
+        return true
+    }
+
+    fun stopConnecting() {
+        isConnecting = false
+    }
+
+    @Synchronized
+    fun disconnect(from: String) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
+
+        // cancel previous scheduled disconnection to prevent closing upcoming connection
+        scheduledDisconnection?.cancel(false)
+        scheduledDisconnection = null
+
+        if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+            aapsLogger.error("disconnect not possible: (mBluetoothAdapter == null) " + (mBluetoothAdapter == null))
+            aapsLogger.error("disconnect not possible: (mBluetoothGatt == null) " + (mBluetoothGatt == null))
+            return
+        }
+        setCharacteristicNotification(uartReadBTGattChar, false)
+        mBluetoothGatt?.disconnect()
+        isConnected = false
+        SystemClock.sleep(2000)
+    }
+
+    @Synchronized fun close() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
+        mBluetoothGatt?.close()
+        mBluetoothGatt = null
+    }
+
+    private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
+        override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
+            onConnectionStateChangeSynchronized(gatt, newState) // call it synchronized
+        }
+
+        override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onServicesDiscovered")
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                findCharacteristic()
+            }
+            sendPumpCheck()
+            // 1st message sent to pump after connect
+        }
+
+        override fun onCharacteristicRead(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicRead: " + DanaRS_Packet.toHexString(characteristic.value))
+            addToReadBuffer(characteristic.value)
+            readDataParsing()
+        }
+
+        override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicChanged: " + DanaRS_Packet.toHexString(characteristic.value))
+            addToReadBuffer(characteristic.value)
+            Thread(Runnable { readDataParsing() }).start()
+        }
+
+        override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicWrite: " + DanaRS_Packet.toHexString(characteristic.value))
+            Thread(Runnable {
+                synchronized(mSendQueue) {
+                    // after message sent, check if there is the rest of the message waiting and send it
+                    if (mSendQueue.size > 0) {
+                        val bytes = mSendQueue[0]
+                        mSendQueue.removeAt(0)
+                        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                    }
+                }
+            }).start()
+        }
+    }
+
+    @Synchronized
+    private fun setCharacteristicNotification(characteristic: BluetoothGattCharacteristic?, enabled: Boolean) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "setCharacteristicNotification")
+        if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+            aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+            isConnecting = false
+            isConnected = false
+            return
+        }
+        mBluetoothGatt!!.setCharacteristicNotification(characteristic, enabled)
+    }
+
+    @Synchronized
+    private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
+        Thread(Runnable {
+            SystemClock.sleep(WRITE_DELAY_MILLIS)
+            if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+                isConnecting = false
+                isConnected = false
+                return@Runnable
+            }
+            characteristic.value = data
+            characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
+            aapsLogger.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data))
+            mBluetoothGatt!!.writeCharacteristic(characteristic)
+        }).start()
+    }
+
+    private val uartReadBTGattChar: BluetoothGattCharacteristic
+        get() = uartRead
+            ?: BluetoothGattCharacteristic(UUID.fromString(UART_READ_UUID), BluetoothGattCharacteristic.PROPERTY_READ or BluetoothGattCharacteristic.PROPERTY_NOTIFY, 0).also { uartRead = it }
+
+    private val uartWriteBTGattChar: BluetoothGattCharacteristic
+        get() = uartWrite
+            ?: BluetoothGattCharacteristic(UUID.fromString(UART_WRITE_UUID), BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE, 0).also { uartWrite = it }
+
+    private fun getSupportedGattServices(): List<BluetoothGattService>? {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "getSupportedGattServices")
+            if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+                isConnecting = false
+                isConnected = false
+                return null
+            }
+            return mBluetoothGatt?.services
+        }
+
+    private fun findCharacteristic() {
+        val gattServices = getSupportedGattServices() ?: return
+        var uuid: String
+        for (gattService in gattServices) {
+            val gattCharacteristics = gattService.characteristics
+            for (gattCharacteristic in gattCharacteristics) {
+                uuid = gattCharacteristic.uuid.toString()
+                if (UART_READ_UUID == uuid) {
+                    uartRead = gattCharacteristic
+                    setCharacteristicNotification(uartRead, true)
+                }
+                if (UART_WRITE_UUID == uuid) {
+                    uartWrite = gattCharacteristic
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    private fun onConnectionStateChangeSynchronized(gatt: BluetoothGatt, newState: Int) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "onConnectionStateChange")
+        if (newState == BluetoothProfile.STATE_CONNECTED) {
+            gatt.discoverServices()
+        } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
+            close()
+            isConnected = false
+            isConnecting = false
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Device was disconnected " + gatt.device.name) //Device was disconnected
+        }
+    }
+
+    private val readBuffer = ByteArray(1024)
+    private var bufferLength = 0
+
+    private fun addToReadBuffer(buffer: ByteArray) {
+        //log.debug("addToReadBuffer " + DanaRS_Packet.toHexString(buffer));
+        if (buffer.isEmpty()) {
+            return
+        }
+        synchronized(readBuffer) {
+            // Append incoming data to input buffer
+            System.arraycopy(buffer, 0, readBuffer, bufferLength, buffer.size)
+            bufferLength += buffer.size
+        }
+    }
+
+    private fun readDataParsing() {
+        var startSignatureFound = false
+        var packetIsValid = false
+        var isProcessing: Boolean
+        isProcessing = true
+        var inputBuffer: ByteArray? = null
+
+        while (isProcessing) {
+            var length = 0
+            synchronized(readBuffer) {
+
+                // Find packet start [A5 A5]
+                if (bufferLength >= 6) {
+                    for (idxStartByte in 0 until bufferLength - 2) {
+                        if (readBuffer[idxStartByte] == PACKET_START_BYTE && readBuffer[idxStartByte + 1] == PACKET_START_BYTE) {
+                            if (idxStartByte > 0) {
+                                // if buffer doesn't start with signature remove the leading trash
+                                aapsLogger.debug(LTag.PUMPBTCOMM, "Shifting the input buffer by $idxStartByte bytes")
+                                System.arraycopy(readBuffer, idxStartByte, readBuffer, 0, bufferLength - idxStartByte)
+                                bufferLength -= idxStartByte
+                            }
+                            startSignatureFound = true
+                            break
+                        }
+                    }
+                }
+                // A5 A5 LEN TYPE CODE PARAMS CHECKSUM1 CHECKSUM2 5A 5A
+                //           ^---- LEN -----^
+                // total packet length 2 + 1 + readBuffer[2] + 2 + 2
+                if (startSignatureFound) {
+                    length = readBuffer[2].toInt()
+                    // test if there is enough data loaded
+                    if (length + 7 > bufferLength) return
+                    // Verify packed end [5A 5A]
+                    if (readBuffer[length + 5] == PACKET_END_BYTE && readBuffer[length + 6] == PACKET_END_BYTE) {
+                        packetIsValid = true
+                    }
+                }
+                if (packetIsValid) {
+                    inputBuffer = ByteArray(length + 7)
+                    // copy packet to input buffer
+                    System.arraycopy(readBuffer, 0, inputBuffer, 0, length + 7)
+                    // Cut off the message from readBuffer
+                    try {
+                        System.arraycopy(readBuffer, length + 7, readBuffer, 0, bufferLength - (length + 7))
+                    } catch (e: Exception) {
+                        aapsLogger.error("length: " + length + "bufferLength: " + bufferLength)
+                        throw e
+                    }
+                    bufferLength -= length + 7
+                    // now we have encrypted packet in inputBuffer
+                }
+            }
+            if (packetIsValid) {
+                try {
+                    // decrypt the packet
+                    bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
+                        when (decryptedBuffer[0]) {
+                            BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte() -> when (decryptedBuffer[1]) {
+                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()       -> if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    // Grab pairing key from preferences if exists
+                                    val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, "")
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
+                                    if (pairingKey.isNotEmpty()) {
+                                        val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
+                                        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
+                                        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                    } else {
+                                        // Stored pairing key does not exists, request pairing
+                                        sendPairingRequest()
+                                    }
+                                } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    mSendQueue.clear()
+                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
+                                    NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
+                                    val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
+                                    rxBus.send(EventNewNotification(n))
+                                } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'S'.toByte() && decryptedBuffer[5] == 'Y'.toByte()) {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    mSendQueue.clear()
+                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
+                                } else {
+                                    // ERROR in response, wrong serial number
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    mSendQueue.clear()
+                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
+                                    sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName)
+                                    val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
+                                    rxBus.send(EventNewNotification(n))
+                                }
+
+                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()    -> {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    if (decryptedBuffer[2] == 0x00.toByte()) {
+                                        // Paring is not requested, sending time info
+                                        sendTimeInfo()
+                                    } else {
+                                        // Pairing on pump is requested
+                                        sendPairingRequest()
+                                    }
+                                }
+
+                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()  -> {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    if (decryptedBuffer[2] != 0x00.toByte()) {
+                                        disconnect("passkey request failed")
+                                    }
+                                }
+
+                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()   -> {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    // Paring is successful, sending time info
+                                    rxBus.send(EventDanaRSPairingSuccess())
+                                    sendTimeInfo()
+                                    val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
+                                    // store pairing key to preferences
+                                    sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
+                                }
+
+                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte() -> {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " +  /*message.getMessageName() + " " + */DanaRS_Packet.toHexString(decryptedBuffer))
+                                    val size = decryptedBuffer.size
+                                    var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
+                                    pass = pass xor 3463
+                                    danaRPump.rsPassword = Integer.toHexString(pass)
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
+                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+                                    isConnected = true
+                                    isConnecting = false
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
+                                }
+                            }
+
+                            else                                                          -> {
+                                // Retrieve message code from received buffer and last message sent
+                                val originalCommand = processedMessage?.command ?: 0xFFFF
+                                val receivedCommand = DanaRS_Packet.getCommand(decryptedBuffer)
+                                val message: DanaRS_Packet? = if (originalCommand == receivedCommand) {
+                                    // it's response to last message
+                                    processedMessage
+                                } else {
+                                    // it's not response to last message, create new instance
+                                    danaRSMessageHashTable.findMessage(receivedCommand)
+                                }
+                                if (message != null) {
+                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                    // process received data
+                                    message.handleMessage(decryptedBuffer)
+                                    message.setReceived()
+                                    synchronized(message) {
+                                        // notify to sendMessage
+                                        message.notify()
+                                    }
+                                } else {
+                                    aapsLogger.error("Unknown message received " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                }
+                            }
+                        }
+                    } ?: throw IllegalStateException("Null decryptedInputBuffer")
+                } catch (e: Exception) {
+                    aapsLogger.error("Unhandled exception", e)
+                }
+                startSignatureFound = false
+                packetIsValid = false
+                if (bufferLength < 6) {
+                    // stop the loop
+                    isProcessing = false
+                }
+            } else {
+                // stop the loop
+                isProcessing = false
+            }
+        }
+    }
+
+    fun sendMessage(message: DanaRS_Packet?) {
+        processedMessage = message
+        if (message == null) return
+        val command = byteArrayOf(message.type.toByte(), message.opCode.toByte())
+        val params = message.requestParams
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
+        var bytes = bleEncryption.getEncryptedPacket(message.opCode, params, null)
+        // If there is another message not completely sent, add to queue only
+        if (mSendQueue.size > 0) {
+            // Split to parts per 20 bytes max
+            while (true) {
+                if (bytes.size > 20) {
+                    val addBytes = ByteArray(20)
+                    System.arraycopy(bytes, 0, addBytes, 0, addBytes.size)
+                    val reBytes = ByteArray(bytes.size - addBytes.size)
+                    System.arraycopy(bytes, addBytes.size, reBytes, 0, reBytes.size)
+                    bytes = reBytes
+                    synchronized(mSendQueue) { mSendQueue.add(addBytes) }
+                } else {
+                    synchronized(mSendQueue) { mSendQueue.add(bytes) }
+                    break
+                }
+            }
+        } else {
+            if (bytes.size > 20) {
+                // Cut first 20 bytes
+                val sendBytes = ByteArray(20)
+                System.arraycopy(bytes, 0, sendBytes, 0, sendBytes.size)
+                var reBytes = ByteArray(bytes.size - sendBytes.size)
+                System.arraycopy(bytes, sendBytes.size, reBytes, 0, reBytes.size)
+                bytes = reBytes
+                // and send
+                writeCharacteristicNoResponse(uartWriteBTGattChar, sendBytes)
+                // The rest split to parts per 20 bytes max
+                while (true) {
+                    if (bytes.size > 20) {
+                        val addBytes = ByteArray(20)
+                        System.arraycopy(bytes, 0, addBytes, 0, addBytes.size)
+                        reBytes = ByteArray(bytes.size - addBytes.size)
+                        System.arraycopy(bytes, addBytes.size, reBytes, 0, reBytes.size)
+                        bytes = reBytes
+                        synchronized(mSendQueue) { mSendQueue.add(addBytes) }
+                    } else {
+                        synchronized(mSendQueue) { mSendQueue.add(bytes) }
+                        break
+                    }
+                }
+            } else {
+                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+            }
+        }
+        // The rest from queue is send from onCharacteristicWrite (after sending 1st part)
+        synchronized(message) {
+            try {
+                message.waitMillis(5000)
+            } catch (e: InterruptedException) {
+                aapsLogger.error("sendMessage InterruptedException", e)
+            }
+        }
+
+        //SystemClock.sleep(200);
+        if (!message.isReceived) {
+            aapsLogger.warn(LTag.PUMPBTCOMM, "Reply not received " + message.friendlyName)
+            message.handleMessageNotReceived()
+        }
+    }
+
+    private fun sendPairingRequest() {
+        // Start activity which is waiting 20sec
+        // On pump pairing request is displayed and is waiting for conformation
+        val i = Intent()
+        i.setClass(context, PairingHelperActivity::class.java)
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        context.startActivity(i)
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    private fun sendPumpCheck() {
+        // 1st message sent to pump after connect
+        val deviceName = connectDeviceName
+        if (deviceName == null || deviceName == "") {
+            val n = Notification(Notification.DEVICENOTPAIRED, resourceHelper.gs(R.string.pairfirst), Notification.URGENT)
+            rxBus.send(EventNewNotification(n))
+            return
+        }
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, deviceName)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    private fun sendTimeInfo() {
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index df12f7b0c3..cb6484bafd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -101,10 +101,11 @@ public class DanaRSService extends DaggerService {
     @Inject ActivePluginProvider activePlugin;
     @Inject ConstraintChecker constraintChecker;
     @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
+    @Inject BLEComm bleComm;
+    @Inject FabricPrivacy fabricPrivacy;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
-    private BLEComm bleComm;
 
     private IBinder mBinder = new LocalBinder();
 
@@ -116,14 +117,13 @@ public class DanaRSService extends DaggerService {
     @Override
     public void onCreate() {
         super.onCreate();
-        bleComm = new BLEComm(this, danaRSMessageHashTable, danaRPump);
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     aapsLogger.debug(LTag.PUMPCOMM, "EventAppExit received");
                     stopSelf();
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
     }
 
@@ -134,15 +134,15 @@ public class DanaRSService extends DaggerService {
     }
 
     public boolean isConnected() {
-        return bleComm.isConnected;
+        return bleComm.isConnected();
     }
 
     public boolean isConnecting() {
-        return bleComm.isConnecting;
+        return bleComm.isConnecting();
     }
 
-    public boolean connect(String from, String address, Object confirmConnect) {
-        return bleComm.connect(from, address, confirmConnect);
+    public boolean connect(String from, String address) {
+        return bleComm.connect(from, address);
     }
 
     public void stopConnecting() {
diff --git a/app/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/app/src/main/jniLibs/arm64-v8a/libBleEncryption.so
new file mode 100644
index 0000000000000000000000000000000000000000..641efb745b5c23483796bfc031ce1cf7bf1ae240
GIT binary patch
literal 22680
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
Vwv4x}p*<-0|D=J@t>ly7{{xbIe60Wg

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/app/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
new file mode 100644
index 0000000000000000000000000000000000000000..560c7a890510c5a429c6fd95ae2192a192035533
GIT binary patch
literal 26448
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
F{|{vETmS$7

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86/libBleEncryption.so b/app/src/main/jniLibs/x86/libBleEncryption.so
new file mode 100644
index 0000000000000000000000000000000000000000..59487f74cfe4019219eac6aebcc9ba7f73088e1e
GIT binary patch
literal 22296
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
av;dCt)O<{Q5!#H3Lx8)|Bno9_@_zsdW-nm?

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86_64/libBleEncryption.so b/app/src/main/jniLibs/x86_64/libBleEncryption.so
new file mode 100644
index 0000000000000000000000000000000000000000..53a606a968419ea3772d592a71db7972cfec4a85
GIT binary patch
literal 22944
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

literal 0
HcmV?d00001

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index 34f7c64def..7896cbc234 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import com.cozmo.danar.util.BleCommandUtil
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
@@ -31,6 +31,6 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
         val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage)
         val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
-        Assert.assertEquals(BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
+        Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
 }
\ No newline at end of file

From b872b82cd9f6b5c181f4cab46eaa025c131fce45 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 24 Mar 2020 18:17:28 +0100
Subject: [PATCH 005/400] kt, share some MDT code

---
 .../plugins/pump/common/ble/BlePreCheck.kt    |  88 +++++++
 .../dialog/RileyLinkBLEScanActivity.java      |  59 +----
 .../pump/common/utils/LocationHelper.java     |  70 ------
 .../plugins/pump/danaRS/DanaRSPlugin.java     |  24 +-
 .../danaRS/activities/BLEScanActivity.java    | 217 ------------------
 .../pump/danaRS/activities/BLEScanActivity.kt | 172 ++++++++++++++
 .../activities/PairingHelperActivity.kt       |   2 +
 .../plugins/pump/danaRS/services/BLEComm.kt   |  84 +++----
 .../service/RileyLinkMedtronicService.java    |   9 +-
 9 files changed, 326 insertions(+), 399 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/LocationHelper.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
new file mode 100644
index 0000000000..2d623902bb
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
@@ -0,0 +1,88 @@
+package info.nightscout.androidaps.plugins.pump.common.ble
+
+import android.Manifest
+import android.bluetooth.BluetoothAdapter
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import android.provider.Settings
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.OKDialog.showConfirmation
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BlePreCheck @Inject constructor(
+    val resourceHelper: ResourceHelper
+) {
+
+    companion object {
+        private const val PERMISSION_REQUEST_COARSE_LOCATION = 30241 // arbitrary.
+    }
+
+    fun prerequisitesCheck(activity: AppCompatActivity): Boolean {
+        if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
+            OKDialog.show(activity, resourceHelper.gs(R.string.app_name), resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
+            return false
+        } else {
+            // Use this check to determine whether BLE is supported on the device. Then
+            // you can selectively disable BLE-related features.
+            if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                // your code that requires permission
+                ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION), PERMISSION_REQUEST_COARSE_LOCATION)
+            }
+
+            val bluetoothAdapter = BluetoothAdapter.getDefaultAdapter()
+            // Ensures Bluetooth is available on the device and it is enabled. If not,
+            // displays a dialog requesting user permission to enable Bluetooth.
+            if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled) {
+                OKDialog.show(activity, resourceHelper.gs(R.string.app_name), resourceHelper.gs(R.string.rileylink_scanner_ble_not_enabled))
+                return false
+            } else {
+                // Will request that GPS be enabled for devices running Marshmallow or newer.
+                if (!isLocationEnabled(activity)) {
+                    requestLocation(activity)
+                    return false
+                }
+            }
+        }
+        return true
+    }
+
+    /**
+     * Determine if GPS is currently enabled.
+     *
+     *
+     * On Android 6 (Marshmallow), location needs to be enabled for Bluetooth discovery to work.
+     *
+     * @param context The current app context.
+     * @return true if location is enabled, false otherwise.
+     */
+    private fun isLocationEnabled(context: Context): Boolean {
+        val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) ||
+            locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+    }
+
+    /**
+     * Prompt the user to enable GPS location if it isn't already on.
+     *
+     * @param activity The currently visible activity.
+     */
+    private fun requestLocation(activity: AppCompatActivity) {
+        if (isLocationEnabled(activity)) {
+            return
+        }
+
+        // Shamelessly borrowed from http://stackoverflow.com/a/10311877/868533
+        showConfirmation(activity, resourceHelper.gs(R.string.location_not_found_title), resourceHelper.gs(R.string.location_not_found_message), Runnable {
+            activity.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
index e292808ded..7695344183 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.common.dialog;
 
-import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.BluetoothLeScanner;
@@ -10,7 +9,6 @@ import android.bluetooth.le.ScanResult;
 import android.bluetooth.le.ScanSettings;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ParcelUuid;
@@ -26,13 +24,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,10 +40,10 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
-import info.nightscout.androidaps.plugins.pump.common.utils.LocationHelper;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -60,9 +57,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
     @Inject SP sp;
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
-
-    private static final int PERMISSION_REQUEST_COARSE_LOCATION = 30241; // arbitrary.
-    private static final int REQUEST_ENABLE_BT = 30242; // arbitrary
+    @Inject BlePreCheck blePrecheck;
 
     private static String TAG = "RileyLinkBLEScanActivity";
 
@@ -156,36 +151,13 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
 
 
     public void prepareForScanning() {
-        // https://developer.android.com/training/permissions/requesting.html
-        // http://developer.radiusnetworks.com/2015/09/29/is-your-beacon-app-ready-for-android-6.html
-        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-            Toast.makeText(this, R.string.rileylink_scanner_ble_not_supported, Toast.LENGTH_SHORT).show();
-        } else {
-            // Use this check to determine whether BLE is supported on the device. Then
-            // you can selectively disable BLE-related features.
-            if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                // your code that requires permission
-                ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION},
-                        PERMISSION_REQUEST_COARSE_LOCATION);
-            }
+        boolean checkOK = blePrecheck.prerequisitesCheck(this);
 
-            // Ensures Bluetooth is available on the device and it is enabled. If not,
-            // displays a dialog requesting user permission to enable Bluetooth.
-            if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
-                Toast.makeText(this, R.string.rileylink_scanner_ble_not_enabled, Toast.LENGTH_SHORT).show();
-            } else {
-
-                // Will request that GPS be enabled for devices running Marshmallow or newer.
-                if (!LocationHelper.isLocationEnabled(this)) {
-                    LocationHelper.requestLocationForBluetooth(this);
-                }
-
-                mLEScanner = mBluetoothAdapter.getBluetoothLeScanner();
-                settings = new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
-                filters = Arrays.asList(new ScanFilter.Builder().setServiceUuid(
-                        ParcelUuid.fromString(GattAttributes.SERVICE_RADIO)).build());
-
-            }
+        if (checkOK) {
+            mLEScanner = mBluetoothAdapter.getBluetoothLeScanner();
+            settings = new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
+            filters = Collections.singletonList(new ScanFilter.Builder().setServiceUuid(
+                    ParcelUuid.fromString(GattAttributes.SERVICE_RADIO)).build());
         }
 
         // disable currently selected RL, so that we can discover it
@@ -193,19 +165,6 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
     }
 
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_ENABLE_BT) {
-            if (resultCode == RESULT_OK) {
-                // User allowed Bluetooth to turn on
-            } else if (resultCode == RESULT_CANCELED) {
-                // Error, or user said "NO"
-                finish();
-            }
-        }
-    }
-
     private ScanCallback mScanCallback2 = new ScanCallback() {
 
         @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/LocationHelper.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/LocationHelper.java
deleted file mode 100644
index 065f0ec4d6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/LocationHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common.utils;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.location.LocationManager;
-
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.utils.OKDialog;
-
-/**
- * Helper for checking if location services are enabled on the device.
- */
-public class LocationHelper {
-
-    /**
-     * Determine if GPS is currently enabled.
-     * <p>
-     * On Android 6 (Marshmallow), location needs to be enabled for Bluetooth discovery to work.
-     *
-     * @param context The current app context.
-     * @return true if location is enabled, false otherwise.
-     */
-    public static boolean isLocationEnabled(Context context) {
-        LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
-
-        return (locationManager != null && //
-                (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) || //
-                        locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)));
-
-        // return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-    }
-
-
-    /**
-     * Prompt the user to enable GPS location if it isn't already on.
-     *
-     * @param parent The currently visible activity.
-     */
-    public static void requestLocation(final Activity parent) {
-        if (LocationHelper.isLocationEnabled(parent)) {
-            return;
-        }
-
-        // Shamelessly borrowed from http://stackoverflow.com/a/10311877/868533
-        OKDialog.showConfirmation(parent, MainApp.gs(R.string.location_not_found_title), MainApp.gs(R.string.location_not_found_message), () -> {
-            parent.startActivity(new Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS));
-        });
-    }
-
-
-    /**
-     * Prompt the user to enable GPS location on devices that need it for Bluetooth discovery.
-     * <p>
-     * Android 6 (Marshmallow) needs GPS enabled for Bluetooth discovery to work.
-     *
-     * @param activity The currently visible activity.
-     */
-    public static void requestLocationForBluetooth(Activity activity) {
-        // Location needs to be enabled for Bluetooth discovery on Marshmallow.
-        LocationHelper.requestLocation(activity);
-    }
-
-    // public static Boolean locationPermission(ActivityWithMenu act) {
-    // return ActivityCompat.checkSelfPermission(act, Manifest.permission.ACCESS_FINE_LOCATION) ==
-    // PackageManager.PERMISSION_GRANTED;
-    // }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index b9d4af7497..3e865cb0e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -61,6 +61,7 @@ import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.T;
+import info.nightscout.androidaps.utils.ToastUtils;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 import io.reactivex.disposables.CompositeDisposable;
@@ -77,16 +78,16 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     private final TreatmentsPlugin treatmentsPlugin;
     private final SP sp;
     private final RxBusWrapper rxBus;
-    private final CommandQueueProvider commandQueue;
     private final DanaRPump danaRPump;
     private final DetailedBolusInfoStorage detailedBolusInfoStorage;
+    private final FabricPrivacy fabricPrivacy;
 
-    private static DanaRSService danaRSService;
+    private DanaRSService danaRSService;
 
-    private static String mDeviceAddress = "";
-    public static String mDeviceName = "";
+    private String mDeviceAddress = "";
+    public String mDeviceName = "";
 
-    public static PumpDescription pumpDescription = new PumpDescription();
+    public PumpDescription pumpDescription = new PumpDescription();
 
     // Bolus & history handling
     public int bolusStartErrorCode; // from start message
@@ -112,7 +113,8 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
             SP sp,
             CommandQueueProvider commandQueue,
             DanaRPump danaRPump,
-            DetailedBolusInfoStorage detailedBolusInfoStorage
+            DetailedBolusInfoStorage detailedBolusInfoStorage,
+            FabricPrivacy fabricPrivacy
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.PUMP)
@@ -130,9 +132,9 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         this.profileFunction = profileFunction;
         this.treatmentsPlugin = treatmentsPlugin;
         this.sp = sp;
-        this.commandQueue = commandQueue;
         this.danaRPump = danaRPump;
         this.detailedBolusInfoStorage = detailedBolusInfoStorage;
+        this.fabricPrivacy = fabricPrivacy;
 
         pumpDescription.setPumpDescription(PumpType.DanaRS);
     }
@@ -153,12 +155,12 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventDanaRSDeviceChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> loadAddress(), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> loadAddress(), fabricPrivacy::logException)
         );
         loadAddress(); // load device name
         super.onStart();
@@ -195,7 +197,9 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     public void connect(String from) {
         getAapsLogger().debug(LTag.PUMP, "RS connect from: " + from);
         if (danaRSService != null && !mDeviceAddress.equals("") && !mDeviceName.equals("")) {
-            danaRSService.connect(from, mDeviceAddress);
+            boolean success = danaRSService.connect(from, mDeviceAddress);
+            if (!success)
+                ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported));
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
deleted file mode 100644
index 89f794259e..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.activities;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.le.BluetoothLeScanner;
-import android.bluetooth.le.ScanCallback;
-import android.bluetooth.le.ScanResult;
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
-import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
-import info.nightscout.androidaps.utils.SP;
-
-public class BLEScanActivity extends NoSplashAppCompatActivity {
-    private ListAdapter mListAdapter = null;
-    private ArrayList<BluetoothDeviceItem> mDevices = new ArrayList<>();
-
-    private BluetoothLeScanner mBluetoothLeScanner = null;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.danars_blescanner_activity);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-
-        mListAdapter = new ListAdapter();
-
-        ListView listView = findViewById(R.id.danars_blescanner_listview);
-        listView.setEmptyView(findViewById(R.id.danars_blescanner_nodevice));
-        listView.setAdapter(mListAdapter);
-
-        mListAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-        if (mBluetoothAdapter != null) {
-            if (!mBluetoothAdapter.isEnabled()) mBluetoothAdapter.enable();
-            mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
-
-            if (mBluetoothLeScanner == null) {
-                mBluetoothAdapter.enable();
-                mBluetoothLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
-            }
-            startScan();
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        stopScan();
-    }
-
-    private void startScan() {
-        if (mBluetoothLeScanner != null)
-            mBluetoothLeScanner.startScan(mBleScanCallback);
-    }
-
-    private void stopScan() {
-        if (mBluetoothLeScanner != null)
-            mBluetoothLeScanner.stopScan(mBleScanCallback);
-    }
-
-    private void addBleDevice(BluetoothDevice device) {
-        if (device == null || device.getName() == null || device.getName().equals("")) {
-            return;
-        }
-        BluetoothDeviceItem item = new BluetoothDeviceItem(device);
-        if (!isSNCheck(device.getName()) || mDevices.contains(item)) {
-            return;
-        }
-
-        mDevices.add(item);
-        new Handler().post(() -> mListAdapter.notifyDataSetChanged());
-    }
-
-    private ScanCallback mBleScanCallback = new ScanCallback() {
-        @Override
-        public void onScanResult(int callbackType, ScanResult result) {
-            addBleDevice(result.getDevice());
-        }
-    };
-
-    class ListAdapter extends BaseAdapter {
-
-        @Override
-        public int getCount() {
-            return mDevices.size();
-        }
-
-        @Override
-        public BluetoothDeviceItem getItem(int i) {
-            return mDevices.get(i);
-        }
-
-        @Override
-        public long getItemId(int i) {
-            return 0;
-        }
-
-        @Override
-        public View getView(int i, View convertView, ViewGroup parent) {
-            View v = convertView;
-            ViewHolder holder;
-
-            if (v == null) {
-                v = View.inflate(getApplicationContext(), R.layout.danars_blescanner_item, null);
-                holder = new ViewHolder(v);
-                v.setTag(holder);
-            } else {
-                holder = (ViewHolder) v.getTag();
-            }
-
-            BluetoothDeviceItem item = getItem(i);
-            holder.setData(item);
-            return v;
-        }
-
-        private class ViewHolder implements View.OnClickListener {
-            private BluetoothDeviceItem item = null;
-
-            private TextView mName;
-            private TextView mAddress;
-
-            ViewHolder(View v) {
-                mName = v.findViewById(R.id.ble_name);
-                mAddress = v.findViewById(R.id.ble_address);
-
-                v.setOnClickListener(ViewHolder.this);
-            }
-
-            @Override
-            public void onClick(View v) {
-                SP.putString(R.string.key_danars_address, item.device.getAddress());
-                SP.putString(R.string.key_danars_name, mName.getText().toString());
-                item.device.createBond();
-                RxBus.Companion.getINSTANCE().send(new EventDanaRSDeviceChange());
-                finish();
-            }
-
-            public void setData(BluetoothDeviceItem data) {
-                if (data != null) {
-                    try {
-                        String tTitle = data.device.getName();
-                        if (tTitle == null || tTitle.equals("")) {
-                            tTitle = "(unknown)";
-                        } else if (tTitle.length() > 10) {
-                            tTitle = tTitle.substring(0, 10);
-                        }
-                        mName.setText(tTitle);
-
-                        mAddress.setText(data.device.getAddress());
-
-                        item = data;
-                    } catch (Exception ignored) {
-                    }
-                }
-            }
-        }
-    }
-
-    //
-    private class BluetoothDeviceItem {
-        private BluetoothDevice device;
-
-        BluetoothDeviceItem(BluetoothDevice device) {
-            super();
-            this.device = device;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (device == null || !(o instanceof BluetoothDeviceItem)) {
-                return false;
-            }
-            BluetoothDeviceItem checkItem = (BluetoothDeviceItem) o;
-            if (checkItem.device == null) {
-                return false;
-            }
-            return stringEquals(device.getAddress(), checkItem.device.getAddress());
-        }
-
-        boolean stringEquals(String arg1, String arg2) {
-            try {
-                return arg1.equals(arg2);
-            } catch (Exception e) {
-                return false;
-            }
-        }
-    }
-
-    public static boolean isSNCheck(String sn) {
-        String regex = "^([a-zA-Z]{3})([0-9]{5})([a-zA-Z]{2})$";
-        Pattern p = Pattern.compile(regex);
-        Matcher m = p.matcher(sn);
-
-        return m.matches();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
new file mode 100644
index 0000000000..d51dc5ab05
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
@@ -0,0 +1,172 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.activities
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.le.BluetoothLeScanner
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanResult
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.os.Handler
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.TextView
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import kotlinx.android.synthetic.main.danars_blescanner_activity.*
+import java.util.*
+import java.util.regex.Pattern
+import javax.inject.Inject
+
+class BLEScanActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var blePreCheck: BlePreCheck
+
+    private var listAdapter: ListAdapter? = null
+    private val devices = ArrayList<BluetoothDeviceItem>()
+    private var bluetoothLeScanner: BluetoothLeScanner? = null
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.danars_blescanner_activity)
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+
+        blePreCheck.prerequisitesCheck(this)
+
+        listAdapter = ListAdapter()
+        danars_blescanner_listview.emptyView = findViewById(R.id.danars_blescanner_nodevice)
+        danars_blescanner_listview.adapter = listAdapter
+        listAdapter?.notifyDataSetChanged()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        BluetoothAdapter.getDefaultAdapter()?.let { bluetoothAdapter ->
+            if (!bluetoothAdapter.isEnabled) bluetoothAdapter.enable()
+            bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+            startScan()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopScan()
+    }
+
+    private fun startScan() {
+        if (bluetoothLeScanner != null) bluetoothLeScanner!!.startScan(mBleScanCallback)
+    }
+
+    private fun stopScan() {
+        if (bluetoothLeScanner != null) bluetoothLeScanner!!.stopScan(mBleScanCallback)
+    }
+
+    private fun addBleDevice(device: BluetoothDevice?) {
+        if (device == null || device.name == null || device.name == "") {
+            return
+        }
+        val item = BluetoothDeviceItem(device)
+        if (!isSNCheck(device.name) || devices.contains(item)) {
+            return
+        }
+        devices.add(item)
+        Handler().post { listAdapter!!.notifyDataSetChanged() }
+    }
+
+    private val mBleScanCallback: ScanCallback = object : ScanCallback() {
+        override fun onScanResult(callbackType: Int, result: ScanResult) {
+            addBleDevice(result.device)
+        }
+    }
+
+    internal inner class ListAdapter : BaseAdapter() {
+        override fun getCount(): Int = devices.size
+        override fun getItem(i: Int): BluetoothDeviceItem = devices[i]
+        override fun getItemId(i: Int): Long = 0
+
+        override fun getView(i: Int, convertView: View?, parent: ViewGroup?): View {
+            var v = convertView
+            val holder: ViewHolder
+            if (v == null) {
+                v = View.inflate(applicationContext, R.layout.danars_blescanner_item, null)
+                holder = ViewHolder(v)
+                v.tag = holder
+            } else {
+                // reuse view if already exists
+                holder = v.tag as ViewHolder
+            }
+            val item = getItem(i)
+            holder.setData(item)
+            return v!!
+        }
+
+        private inner class ViewHolder internal constructor(v: View) : View.OnClickListener {
+            private lateinit var item: BluetoothDeviceItem
+            private val name: TextView = v.findViewById(R.id.ble_name)
+            private val address: TextView = v.findViewById(R.id.ble_address)
+
+            init {
+                v.setOnClickListener(this@ViewHolder)
+            }
+
+            override fun onClick(v: View) {
+                sp.putString(R.string.key_danars_address, item.device.address)
+                sp.putString(R.string.key_danars_name, name.text.toString())
+                item.device.createBond()
+                rxBus.send(EventDanaRSDeviceChange())
+                finish()
+            }
+
+            fun setData(data: BluetoothDeviceItem) {
+                var tTitle = data.device.name
+                if (tTitle == null || tTitle == "") {
+                    tTitle = "(unknown)"
+                } else if (tTitle.length > 10) {
+                    tTitle = tTitle.substring(0, 10)
+                }
+                name.text = tTitle
+                address.text = data.device.address
+                item = data
+            }
+
+        }
+    }
+
+    //
+    inner class BluetoothDeviceItem internal constructor(val device: BluetoothDevice) {
+
+        override fun equals(other: Any?): Boolean {
+            if (other !is BluetoothDeviceItem) {
+                return false
+            }
+            return stringEquals(device.address, other.device.address)
+        }
+
+        private fun stringEquals(arg1: String, arg2: String): Boolean {
+            return try {
+                arg1 == arg2
+            } catch (e: Exception) {
+                false
+            }
+        }
+
+        override fun hashCode(): Int = device.hashCode()
+    }
+
+    private fun isSNCheck(sn: String?): Boolean {
+        val regex = "^([a-zA-Z]{3})([0-9]{5})([a-zA-Z]{2})$"
+        val p = Pattern.compile(regex)
+        val m = p.matcher(sn)
+        return m.matches()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
index ba73e1b368..03d31c10a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
@@ -1,11 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.activities
 
+import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.dialogs.PairingProgressDialog
 
 class PairingHelperActivity : NoSplashAppCompatActivity() {
+    @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         PairingProgressDialog()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index b079d5c241..1260573c34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -37,6 +37,7 @@ class BLEComm @Inject internal constructor(
     private val sp: SP,
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
     private val danaRPump: DanaRPump,
+    private val danaRSPlugin: DanaRSPlugin,
     private val bleEncryption: BleEncryption
 ) {
 
@@ -52,66 +53,51 @@ class BLEComm @Inject internal constructor(
     private var scheduledDisconnection: ScheduledFuture<*>? = null
     private var processedMessage: DanaRS_Packet? = null
     private val mSendQueue = ArrayList<ByteArray>()
-    private var mBluetoothManager: BluetoothManager? = null
-    private var mBluetoothAdapter: BluetoothAdapter? = null
+    private var bluetoothManager: BluetoothManager? = null
+    private var bluetoothAdapter: BluetoothAdapter? = null
     private var connectDeviceName: String? = null
-    private var mBluetoothGatt: BluetoothGatt? = null
+    private var bluetoothGatt: BluetoothGatt? = null
 
     var isConnected = false
     var isConnecting = false
     private var uartRead: BluetoothGattCharacteristic? = null
     private var uartWrite: BluetoothGattCharacteristic? = null
 
-    init {
-        initialize()
-    }
-
-    private fun initialize(): Boolean {
+    @Synchronized
+    fun connect(from: String, address: String?): Boolean {
         aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing BLEComm.")
-        if (mBluetoothManager == null) {
-            mBluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
-            if (mBluetoothManager == null) {
+        if (bluetoothManager == null) {
+            bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            if (bluetoothManager == null) {
                 aapsLogger.error("Unable to initialize BluetoothManager.")
                 return false
             }
         }
-        mBluetoothAdapter = mBluetoothManager?.adapter
-        if (mBluetoothAdapter == null) {
+        bluetoothAdapter = bluetoothManager?.adapter
+        if (bluetoothAdapter == null) {
             aapsLogger.error("Unable to obtain a BluetoothAdapter.")
             return false
         }
-        return true
-    }
-
-    fun connect(from: String, address: String?): Boolean {
-        // test existing BT device
-        val tBluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?
-            ?: return false
-        tBluetoothManager.adapter ?: return false
 
         if (address == null) {
             aapsLogger.error("unspecified address.")
             return false
         }
 
-        if (mBluetoothAdapter == null) {
-            if (!initialize()) {
-                return false
-            }
-        }
         isConnecting = true
-        val device = mBluetoothAdapter?.getRemoteDevice(address)
+        val device = bluetoothAdapter?.getRemoteDevice(address)
         if (device == null) {
             aapsLogger.error("Device not found.  Unable to connect from: $from")
             return false
         }
         aapsLogger.debug(LTag.PUMPBTCOMM, "Trying to create a new connection from: $from")
         connectDeviceName = device.name
-        mBluetoothGatt = device.connectGatt(context, false, mGattCallback)
+        bluetoothGatt = device.connectGatt(context, false, mGattCallback)
         setCharacteristicNotification(uartReadBTGattChar, true)
         return true
     }
 
+    @Synchronized
     fun stopConnecting() {
         isConnecting = false
     }
@@ -124,21 +110,21 @@ class BLEComm @Inject internal constructor(
         scheduledDisconnection?.cancel(false)
         scheduledDisconnection = null
 
-        if (mBluetoothAdapter == null || mBluetoothGatt == null) {
-            aapsLogger.error("disconnect not possible: (mBluetoothAdapter == null) " + (mBluetoothAdapter == null))
-            aapsLogger.error("disconnect not possible: (mBluetoothGatt == null) " + (mBluetoothGatt == null))
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("disconnect not possible: (mBluetoothAdapter == null) " + (bluetoothAdapter == null))
+            aapsLogger.error("disconnect not possible: (mBluetoothGatt == null) " + (bluetoothGatt == null))
             return
         }
         setCharacteristicNotification(uartReadBTGattChar, false)
-        mBluetoothGatt?.disconnect()
+        bluetoothGatt?.disconnect()
         isConnected = false
         SystemClock.sleep(2000)
     }
 
     @Synchronized fun close() {
         aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
-        mBluetoothGatt?.close()
-        mBluetoothGatt = null
+        bluetoothGatt?.close()
+        bluetoothGatt = null
     }
 
     private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
@@ -185,20 +171,20 @@ class BLEComm @Inject internal constructor(
     @Synchronized
     private fun setCharacteristicNotification(characteristic: BluetoothGattCharacteristic?, enabled: Boolean) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "setCharacteristicNotification")
-        if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
             aapsLogger.error("BluetoothAdapter not initialized_ERROR")
             isConnecting = false
             isConnected = false
             return
         }
-        mBluetoothGatt!!.setCharacteristicNotification(characteristic, enabled)
+        bluetoothGatt!!.setCharacteristicNotification(characteristic, enabled)
     }
 
     @Synchronized
     private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
         Thread(Runnable {
             SystemClock.sleep(WRITE_DELAY_MILLIS)
-            if (mBluetoothAdapter == null || mBluetoothGatt == null) {
+            if (bluetoothAdapter == null || bluetoothGatt == null) {
                 aapsLogger.error("BluetoothAdapter not initialized_ERROR")
                 isConnecting = false
                 isConnected = false
@@ -207,7 +193,7 @@ class BLEComm @Inject internal constructor(
             characteristic.value = data
             characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
             aapsLogger.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data))
-            mBluetoothGatt!!.writeCharacteristic(characteristic)
+            bluetoothGatt!!.writeCharacteristic(characteristic)
         }).start()
     }
 
@@ -220,15 +206,15 @@ class BLEComm @Inject internal constructor(
             ?: BluetoothGattCharacteristic(UUID.fromString(UART_WRITE_UUID), BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE, 0).also { uartWrite = it }
 
     private fun getSupportedGattServices(): List<BluetoothGattService>? {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "getSupportedGattServices")
-            if (mBluetoothAdapter == null || mBluetoothGatt == null) {
-                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
-                isConnecting = false
-                isConnected = false
-                return null
-            }
-            return mBluetoothGatt?.services
+        aapsLogger.debug(LTag.PUMPBTCOMM, "getSupportedGattServices")
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+            isConnecting = false
+            isConnected = false
+            return null
         }
+        return bluetoothGatt?.services
+    }
 
     private fun findCharacteristic() {
         val gattServices = getSupportedGattServices() ?: return
@@ -339,7 +325,7 @@ class BLEComm @Inject internal constructor(
                                 BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()       -> if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
                                     aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
                                     // Grab pairing key from preferences if exists
-                                    val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, "")
+                                    val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
                                     aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
                                     if (pairingKey.isNotEmpty()) {
                                         val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
@@ -366,7 +352,7 @@ class BLEComm @Inject internal constructor(
                                     aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
                                     mSendQueue.clear()
                                     rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
-                                    sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName)
+                                    sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
                                     val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
                                     rxBus.send(EventNewNotification(n))
                                 }
@@ -396,7 +382,7 @@ class BLEComm @Inject internal constructor(
                                     sendTimeInfo()
                                     val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
                                     // store pairing key to preferences
-                                    sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + DanaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
+                                    sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
                                     aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
                                 }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index 84beb5871d..17f7b03a17 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -53,9 +53,6 @@ public class RileyLinkMedtronicService extends RileyLinkService {
     public RileyLinkMedtronicService() {
         super();
         instance = this;
-        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly constructed");
-        MedtronicUtil.setMedtronicService(this);
-        pumpStatus = (MedtronicPumpStatus) medtronicPumpPlugin.getPumpStatusData();
     }
 
 
@@ -68,6 +65,12 @@ public class RileyLinkMedtronicService extends RileyLinkService {
         return instance.medtronicCommunicationManager;
     }
 
+    @Override public void onCreate() {
+        super.onCreate();
+        aapsLogger.debug(LTag.PUMPCOMM, "RileyLinkMedtronicService newly created");
+        MedtronicUtil.setMedtronicService(this);
+        pumpStatus = (MedtronicPumpStatus) medtronicPumpPlugin.getPumpStatusData();
+    }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {

From d1d49a8db23c5ccf80f710ca27f0b9a63b84d9f9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 24 Mar 2020 21:00:43 +0100
Subject: [PATCH 006/400] improve PairingProgressDialog

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../dependencyInjection/FragmentsModule.kt    |  2 +
 .../activities/PairingHelperActivity.kt       | 18 +++-
 .../danaRS/dialogs/PairingProgressDialog.java | 91 +++++++++++--------
 4 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index caf37d462d..01df007470 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -81,7 +81,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".plugins.pump.danaRS.activities.PairingHelperActivity" />
+        <activity
+            android:name=".plugins.pump.danaRS.activities.PairingHelperActivity"
+            android:launchMode="singleTask" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
         <activity android:name=".activities.StatsActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index dbd9cdf424..361521ca10 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
+import info.nightscout.androidaps.plugins.pump.danaRS.dialogs.PairingProgressDialog
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
@@ -83,6 +84,7 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
 
+    @ContributesAndroidInjector abstract fun contributesPairingProgressDialog(): PairingProgressDialog
     @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
     @ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
     @ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
index 03d31c10a2..5a2ab565ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
@@ -1,18 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.activities
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.dialogs.PairingProgressDialog
 
 class PairingHelperActivity : NoSplashAppCompatActivity() {
+    var dialog: PairingProgressDialog? = null
+
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        PairingProgressDialog()
+        dialog = PairingProgressDialog()
             .setHelperActivity(this)
-            .show(supportFragmentManager, "PairingProgress")
+        dialog?.show(supportFragmentManager, "PairingProgress")
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        dialog = null
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        dialog?.resetToNewPairing()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
index 9518dac337..dcf17dc355 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
@@ -14,19 +14,25 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import androidx.fragment.app.DialogFragment;
+import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
+import dagger.android.support.DaggerDialogFragment;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity;
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 
-public class PairingProgressDialog extends DialogFragment {
+public class PairingProgressDialog extends DaggerDialogFragment {
+
+    @Inject ResourceHelper resourceHelper;
+    @Inject RxBusWrapper rxBus;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private TextView statusView;
@@ -36,41 +42,21 @@ public class PairingProgressDialog extends DialogFragment {
 
     private static boolean pairingEnded = false;
 
-    private static Handler sHandler;
-    private static HandlerThread sHandlerThread;
+    private static Handler handler;
+    private static HandlerThread handlerThread;
+
+    private static Runnable runnable;
 
     public PairingProgressDialog() {
         super();
         // Required empty public constructor
-        if (sHandlerThread == null) {
-            sHandlerThread = new HandlerThread(PairingProgressDialog.class.getSimpleName());
-            sHandlerThread.start();
-            sHandler = new Handler(sHandlerThread.getLooper());
+        if (handlerThread == null) {
+            handlerThread = new HandlerThread(PairingProgressDialog.class.getSimpleName());
+            handlerThread.start();
+            handler = new Handler(handlerThread.getLooper());
         }
-    }
 
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.danars_pairingprogressdialog, container, false);
-
-        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-        setCancelable(false);
-        getDialog().setCanceledOnTouchOutside(false);
-
-        statusView = view.findViewById(R.id.danars_pairingprogress_status);
-        progressBar = view.findViewById(R.id.danars_pairingprogress_progressbar);
-        button = view.findViewById(R.id.ok);
-
-        progressBar.setMax(100);
-        progressBar.setProgress(0);
-        statusView.setText(MainApp.gs(R.string.waitingforpairing));
-        button.setVisibility(View.GONE);
-        button.setOnClickListener(v -> dismiss());
-
-        sHandler.post(() -> {
+        runnable = () -> {
             for (int i = 0; i < 20; i++) {
                 if (pairingEnded) {
                     Activity activity = getActivity();
@@ -102,17 +88,36 @@ public class PairingProgressDialog extends DialogFragment {
                     button.setVisibility(View.VISIBLE);
                 });
             }
-        });
+        };
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.danars_pairingprogressdialog, container, false);
+
+        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
+        setCancelable(false);
+        getDialog().setCanceledOnTouchOutside(false);
+
+        statusView = view.findViewById(R.id.danars_pairingprogress_status);
+        progressBar = view.findViewById(R.id.danars_pairingprogress_progressbar);
+        button = view.findViewById(R.id.ok);
+
+       setViews();
+
         return view;
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        disposable.add(RxBus.Companion.getINSTANCE()
+        disposable.add(rxBus
                 .toObservable(EventDanaRSPairingSuccess.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> pairingEnded = true, exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> pairingEnded = true, fabricPrivacy::logException)
         );
         if (pairingEnded) dismiss();
         getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -132,6 +137,20 @@ public class PairingProgressDialog extends DialogFragment {
         disposable.clear();
     }
 
+    private void setViews() {
+        progressBar.setMax(100);
+        progressBar.setProgress(0);
+        statusView.setText(resourceHelper.gs(R.string.waitingforpairing));
+        button.setVisibility(View.GONE);
+        button.setOnClickListener(v -> dismiss());
+        handler.post(runnable);
+    }
+
+    public void resetToNewPairing() {
+        handler.removeCallbacks(runnable);
+        setViews();
+    }
+
     public PairingProgressDialog setHelperActivity(PairingHelperActivity activity) {
         this.helperActivity = activity;
         return this;

From 5ce8b998d9f2530cbcb74abe92df6a16264295f8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 26 Mar 2020 20:25:20 +0100
Subject: [PATCH 007/400] RS v3 encryption

---
 app/src/main/AndroidManifest.xml              |   2 +
 .../dependencyInjection/ActivitiesModule.kt   |   2 +
 .../pump/danaR/AbstractDanaRPlugin.java       |  30 +-
 .../plugins/pump/danaR/DanaRFragment.kt       |  22 ++
 .../plugins/pump/danaRS/DanaRSPlugin.java     |   7 +
 .../danaRS/activities/EnterPinActivity.kt     |  99 ++++++
 .../danaRS/comm/DanaRSMessageHashTable.kt     |   2 +-
 ...cket_General_Initial_Screen_Information.kt |   1 -
 .../danaRS/comm/DanaRS_Packet_Notify_Alarm.kt |  14 +-
 .../pump/danaRS/encryption/BleEncryption.java |   2 +-
 .../plugins/pump/danaRS/services/BLEComm.kt   | 310 +++++++++++++-----
 .../extensions/HexByteArrayConversion.kt      |  32 ++
 .../textValidator/DefaultEditTextValidator.kt |  23 +-
 .../ValidatingEditTextPreference.kt           |   3 +-
 .../res/layout/danars_enter_pin_activity.xml  |  90 +++++
 app/src/main/res/values/strings.xml           |  12 +
 app/src/main/res/values/validator.xml         |   4 +
 .../comm/DanaRS_Packet_Notify_AlarmTest.kt    |   2 +-
 18 files changed, 549 insertions(+), 108 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
 create mode 100644 app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
 create mode 100644 app/src/main/res/layout/danars_enter_pin_activity.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 01df007470..c89a41390a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,6 +84,8 @@
         <activity
             android:name=".plugins.pump.danaRS.activities.PairingHelperActivity"
             android:launchMode="singleTask" />
+        <activity android:name=".plugins.pump.danaRS.activities.EnterPinActivity"
+            android:launchMode="singleTask" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
         <activity android:name=".activities.StatsActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index e7411ad56b..57c8aea06e 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyL
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
@@ -28,6 +29,7 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
     @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
     @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
     @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index b448990575..6de5376b89 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -15,6 +15,8 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.events.EventConfigBuilderChange;
+import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
@@ -42,6 +44,8 @@ import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by mike on 28.01.2018.
@@ -50,6 +54,8 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 public abstract class AbstractDanaRPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
     protected AbstractDanaRExecutionService sExecutionService;
 
+    protected CompositeDisposable disposable = new CompositeDisposable();
+
     protected boolean useExtendedBoluses = false;
 
     protected PumpDescription pumpDescription = new PumpDescription();
@@ -86,6 +92,28 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         this.sp = sp;
     }
 
+    @Override protected void onStart() {
+        super.onStart();
+        disposable.add(rxBus
+                .toObservable(EventConfigBuilderChange.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> danaRPump.setLastConnection(0))
+        );
+        disposable.add(rxBus
+                .toObservable(EventPreferenceChange.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> {
+                    if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name))
+                        danaRPump.setLastConnection(0);
+                })
+        );
+    }
+
+    @Override protected void onStop() {
+        super.onStop();
+        disposable.clear();
+    }
+
     @Override
     public boolean isSuspended() {
         return danaRPump.getPumpSuspended();
@@ -488,6 +516,4 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     public void timeDateOrTimeZoneChanged() {
 
     }
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index 2e7104c9e1..e9e001ced0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.TDDStatsActivity
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -24,13 +25,16 @@ import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActi
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
 import info.nightscout.androidaps.utils.SetWarnColor
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.extensions.plusAssign
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.danar_fragment.*
@@ -43,8 +47,10 @@ class DanaRFragment : DaggerFragment() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -93,12 +99,28 @@ class DanaRFragment : DaggerFragment() {
             danaRPump.lastConnection = 0
             commandQueue.readStatus("Clicked connect to pump", null)
         }
+        if (danaRSPlugin.isEnabled())
+            danar_btconnection.setOnLongClickListener {
+                activity?.let {
+                    OKDialog.showConfirmation(it, resourceHelper.gs(R.string.resetpairing), Runnable {
+                        sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
+                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
+                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
+                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
+                    })
+                }
+                true
+            }
     }
 
     @Synchronized
     override fun onResume() {
         super.onResume()
         loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        disposable += rxBus
+            .toObservable(EventInitializationChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
         disposable += rxBus
             .toObservable(EventDanaRNewStatus::class.java)
             .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 3e865cb0e4..759b473d75 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -27,6 +27,7 @@ import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
@@ -157,6 +158,11 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
                 .observeOn(Schedulers.io())
                 .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
         );
+        disposable.add(rxBus
+                .toObservable(EventConfigBuilderChange.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> danaRPump.setLastConnection(0))
+        );
         disposable.add(rxBus
                 .toObservable(EventDanaRSDeviceChange.class)
                 .observeOn(Schedulers.io())
@@ -191,6 +197,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     private void loadAddress() {
         mDeviceAddress = sp.getString(R.string.key_danars_address, "");
         mDeviceName = sp.getString(R.string.key_danars_name, "");
+        danaRPump.setLastConnection(0);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
new file mode 100644
index 0000000000..524dfc9976
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
@@ -0,0 +1,99 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.activities
+
+import android.os.Bundle
+import android.util.Base64
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.services.BLEComm
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.OKDialog
+import info.nightscout.androidaps.utils.extensions.hexStringToByteArray
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import info.nightscout.androidaps.utils.textValidator.DefaultEditTextValidator
+import info.nightscout.androidaps.utils.textValidator.EditTextValidator
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.danars_enter_pin_activity.*
+import kotlinx.android.synthetic.main.okcancel.*
+import javax.inject.Inject
+import kotlin.experimental.xor
+
+class EnterPinActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var sp: SP
+    @Inject lateinit var bleComm: BLEComm
+
+    private val disposable = CompositeDisposable()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.danars_enter_pin_activity)
+
+        val p1 = DefaultEditTextValidator(rs_v3_pin1, this)
+            .setTestErrorString(resourceHelper.gs(R.string.error_mustbe12hexadidits), this)
+            .setCustomRegexp(resourceHelper.gs(R.string.twelvehexanumber), this)
+            .setTestType(EditTextValidator.TEST_REGEXP, this)
+        val p2 = DefaultEditTextValidator(rs_v3_pin2, this)
+            .setTestErrorString(resourceHelper.gs(R.string.error_mustbe8hexadidits), this)
+            .setCustomRegexp(resourceHelper.gs(R.string.eighthexanumber), this)
+            .setTestType(EditTextValidator.TEST_REGEXP, this)
+
+        ok.setOnClickListener {
+            if (p1.testValidity(false) && p2.testValidity(false)) {
+                val result = checkPairingCheckSum(
+                    rs_v3_pin1.text.toString().hexStringToByteArray(),
+                    rs_v3_pin2.text.toString().substring(0..5).hexStringToByteArray(),
+                    rs_v3_pin2.text.toString().substring(6..7).hexStringToByteArray())
+                if (result) {
+                    bleComm.finishV3Pairing()
+                    finish()
+                }
+                else OKDialog.show(this, resourceHelper.gs(R.string.error), resourceHelper.gs(R.string.danar_invalidinput))
+            }
+        }
+        cancel.setOnClickListener { finish() }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        disposable.add(rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ if (it.status == EventPumpStatusChanged.Status.DISCONNECTED) finish() }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    private fun checkPairingCheckSum(pairingKey: ByteArray, randomPairingKey: ByteArray, checksum: ByteArray): Boolean {
+
+        // pairingKey ByteArray(6)
+        // randomPairingKey ByteArray(3)
+        // checksum ByteArray(1)
+
+        var pairingKeyCheckSum: Byte = 0
+        for (i in pairingKey.indices)
+            pairingKeyCheckSum = pairingKeyCheckSum xor pairingKey[i]
+
+        sp.putString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(pairingKey, Base64.DEFAULT))
+
+        for (i in randomPairingKey.indices)
+            pairingKeyCheckSum = pairingKeyCheckSum xor randomPairingKey[i]
+
+        sp.putString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, Base64.encodeToString(randomPairingKey, Base64.DEFAULT))
+
+        return checksum[0] == pairingKeyCheckSum
+    }
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index c589bbe633..224ecd9ae5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -69,7 +69,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_General_Delivery_Status(aapsLogger))
         put(DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump))
         put(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper))
+        put(DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper, rxBus))
         put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
         put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
         put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index 574791a005..03471e7408 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -11,7 +11,6 @@ class DanaRS_Packet_General_Initial_Screen_Information(
 ) : DanaRS_Packet() {
 
     init {
-        type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
index 7650ff3704..f461c65f3c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -4,12 +4,16 @@ import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class DanaRS_Packet_Notify_Alarm(
     private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper
+    private val resourceHelper: ResourceHelper,
+    private val rxBus: RxBusWrapper
 ) : DanaRS_Packet() {
 
     init {
@@ -29,11 +33,11 @@ class DanaRS_Packet_Notify_Alarm(
             0x03       ->  // Occlusion
                 errorString = resourceHelper.gs(R.string.occlusion)
             0x04       ->  // LOW BATTERY
-                errorString = resourceHelper.gs(R.string.lowbattery)
+                errorString = resourceHelper.gs(R.string.pumpshutdown)
             0x05       ->  // Shutdown
                 errorString = resourceHelper.gs(R.string.lowbattery)
             0x06       ->  // Basal Compare
-                errorString = "BasalCompare ????"
+                errorString = resourceHelper.gs(R.string.basalcompare)
             0x09       ->  // Empty Reservoir
                 errorString = resourceHelper.gs(R.string.emptyreservoir)
             0x07, 0xFF ->  // Blood sugar measurement alert
@@ -41,7 +45,7 @@ class DanaRS_Packet_Notify_Alarm(
             0x08, 0xFE ->  // Remaining insulin level
                 errorString = resourceHelper.gs(R.string.remaininsulinalert)
             0xFD       ->  // Blood sugar check miss alarm
-                errorString = "Blood sugar check miss alarm ???"
+                errorString = resourceHelper.gs(R.string.missedbolus)
         }
         // No error no need to upload anything
         if (errorString == "") {
@@ -49,6 +53,8 @@ class DanaRS_Packet_Notify_Alarm(
             aapsLogger.debug(LTag.PUMPCOMM, "Error detected: $errorString")
             return
         }
+        val notification = Notification(Notification.USERMESSAGE, errorString, Notification.URGENT)
+        rxBus.send(EventNewNotification(notification))
         NSUpload.uploadError(errorString)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
index edd36f583e..b4fea5d8be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
@@ -140,7 +140,7 @@ public class BleEncryption {
         return encryptSecondLevelPacketJni(context, bytes);
     }
 
-    public byte[] ecryptSecondLevelPacket(byte[] bytes) {
+    public byte[] decryptSecondLevelPacket(byte[] bytes) {
         return decryptSecondLevelPacketJni(context, bytes);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 1260573c34..1e6a5f1642 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -4,6 +4,7 @@ import android.bluetooth.*
 import android.content.Context
 import android.content.Intent
 import android.os.SystemClock
+import android.util.Base64
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -14,11 +15,13 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
+import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import okhttp3.internal.notify
@@ -58,8 +61,17 @@ class BLEComm @Inject internal constructor(
     private var connectDeviceName: String? = null
     private var bluetoothGatt: BluetoothGatt? = null
 
+    private var v3Encryption: Boolean = false
+        set(newValue) {
+            bleEncryption.setEnhancedEncryption(newValue)
+            field = newValue
+        }
+    private var isEasyMode: Boolean = false
+    private var isUnitUD: Boolean = false
+
     var isConnected = false
     var isConnecting = false
+    private var encryptedDataRead = false
     private var uartRead: BluetoothGattCharacteristic? = null
     private var uartWrite: BluetoothGattCharacteristic? = null
 
@@ -106,6 +118,14 @@ class BLEComm @Inject internal constructor(
     fun disconnect(from: String) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
+        if (!encryptedDataRead) {
+            // there was no response from pump after started encryption
+            // assume pairing keys are invalid
+            sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
+            sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
+            sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
+            ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
+        }
         // cancel previous scheduled disconnection to prevent closing upcoming connection
         scheduledDisconnection?.cancel(false)
         scheduledDisconnection = null
@@ -118,6 +138,7 @@ class BLEComm @Inject internal constructor(
         setCharacteristicNotification(uartReadBTGattChar, false)
         bluetoothGatt?.disconnect()
         isConnected = false
+        encryptedDataRead = false
         SystemClock.sleep(2000)
     }
 
@@ -142,19 +163,20 @@ class BLEComm @Inject internal constructor(
         }
 
         override fun onCharacteristicRead(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicRead: " + DanaRS_Packet.toHexString(characteristic.value))
-            addToReadBuffer(characteristic.value)
-            readDataParsing()
+            // for v3 after initial handshake it's encrypted - useless
+            // aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicRead: " + DanaRS_Packet.toHexString(characteristic.value))
+            readDataParsing(characteristic.value)
         }
 
         override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicChanged: " + DanaRS_Packet.toHexString(characteristic.value))
-            addToReadBuffer(characteristic.value)
-            Thread(Runnable { readDataParsing() }).start()
+            // for v3 after initial handshake it's encrypted - useless
+            // aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicChanged: " + DanaRS_Packet.toHexString(characteristic.value))
+            readDataParsing(characteristic.value)
         }
 
         override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
-            aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicWrite: " + DanaRS_Packet.toHexString(characteristic.value))
+            // for v3 after initial handshake it's encrypted - useless
+            // aapsLogger.debug(LTag.PUMPBTCOMM, "onCharacteristicWrite: " + DanaRS_Packet.toHexString(characteristic.value))
             Thread(Runnable {
                 synchronized(mSendQueue) {
                     // after message sent, check if there is the rest of the message waiting and send it
@@ -175,9 +197,10 @@ class BLEComm @Inject internal constructor(
             aapsLogger.error("BluetoothAdapter not initialized_ERROR")
             isConnecting = false
             isConnected = false
+            encryptedDataRead = false
             return
         }
-        bluetoothGatt!!.setCharacteristicNotification(characteristic, enabled)
+        bluetoothGatt?.setCharacteristicNotification(characteristic, enabled)
     }
 
     @Synchronized
@@ -188,13 +211,15 @@ class BLEComm @Inject internal constructor(
                 aapsLogger.error("BluetoothAdapter not initialized_ERROR")
                 isConnecting = false
                 isConnected = false
+                encryptedDataRead = false
                 return@Runnable
             }
             characteristic.value = data
             characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
-            aapsLogger.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data))
-            bluetoothGatt!!.writeCharacteristic(characteristic)
+            //aapsLogger.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data))
+            bluetoothGatt?.writeCharacteristic(characteristic)
         }).start()
+        waitMillis(50)
     }
 
     private val uartReadBTGattChar: BluetoothGattCharacteristic
@@ -211,6 +236,7 @@ class BLEComm @Inject internal constructor(
             aapsLogger.error("BluetoothAdapter not initialized_ERROR")
             isConnecting = false
             isConnected = false
+            encryptedDataRead = false
             return null
         }
         return bluetoothGatt?.services
@@ -243,6 +269,8 @@ class BLEComm @Inject internal constructor(
             close()
             isConnected = false
             isConnecting = false
+            v3Encryption = false
+            encryptedDataRead = false
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
             aapsLogger.debug(LTag.PUMPBTCOMM, "Device was disconnected " + gatt.device.name) //Device was disconnected
         }
@@ -263,13 +291,20 @@ class BLEComm @Inject internal constructor(
         }
     }
 
-    private fun readDataParsing() {
+    private fun readDataParsing(receviedData: ByteArray) {
+        //aapsLogger.debug(LTag.PUMPBTCOMM, "readDataParsing")
         var startSignatureFound = false
         var packetIsValid = false
         var isProcessing: Boolean
         isProcessing = true
         var inputBuffer: ByteArray? = null
 
+        // decrypt 2nd level after successful connection
+        val incomingBuffer = if (v3Encryption && isConnected)
+            bleEncryption.decryptSecondLevelPacket(receviedData).also { encryptedDataRead = true }
+        else receviedData
+        addToReadBuffer(incomingBuffer)
+
         while (isProcessing) {
             var length = 0
             synchronized(readBuffer) {
@@ -321,85 +356,163 @@ class BLEComm @Inject internal constructor(
                     // decrypt the packet
                     bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
                         when (decryptedBuffer[0]) {
-                            BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte() -> when (decryptedBuffer[1]) {
-                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()       -> if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    // Grab pairing key from preferences if exists
-                                    val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
-                                    if (pairingKey.isNotEmpty()) {
-                                        val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
-                                        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
-                                        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                    } else {
-                                        // Stored pairing key does not exists, request pairing
-                                        sendPairingRequest()
-                                    }
-                                } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    mSendQueue.clear()
-                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
-                                    NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
-                                    val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
-                                    rxBus.send(EventNewNotification(n))
-                                } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'S'.toByte() && decryptedBuffer[5] == 'Y'.toByte()) {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    mSendQueue.clear()
-                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
-                                } else {
-                                    // ERROR in response, wrong serial number
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    mSendQueue.clear()
-                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
-                                    sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
-                                    val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
-                                    rxBus.send(EventNewNotification(n))
-                                }
+                            BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte() ->
+                                when (decryptedBuffer[1]) {
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()         ->
+                                        if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                            v3Encryption = false
+                                            // Grab pairing key from preferences if exists
+                                            val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
+                                            if (pairingKey.isNotEmpty()) {
+                                                val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
+                                                val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
+                                                aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
+                                                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                            } else {
+                                                // Stored pairing key does not exists, request pairing
+                                                sendPairingRequest()
+                                            }
+                                        } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+                                            // v3 2nd layer encryption
+                                            v3Encryption = true
+                                            val model = decryptedBuffer[5]
+                                            // val protocol = decryptedBuffer[7]
+                                            if (model == 0x05.toByte()) {
+                                                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                                // Dana RS Pump
+                                                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+                                                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+                                                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+                                                    val randomSyncKey = String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1])
+                                                    sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, randomSyncKey)
+                                                    val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
+                                                    val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
+                                                    var tRandomSyncKey: Byte = 0
+                                                    if (randomSyncKey.isNotEmpty()) {
+                                                        tRandomSyncKey = randomSyncKey.toInt(16).toByte()
+                                                    }
+                                                    bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
+                                                    sendV3PairingInformation(0)
+                                                } else {
+                                                    sendV3PairingInformation(1)
+                                                }
+                                            } else if (model == 0x06.toByte()) {
+                                                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                                // Dana RS Easy
+                                                val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
+                                                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                            }
+                                        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                            mSendQueue.clear()
+                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
+                                            NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
+                                            val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
+                                            rxBus.send(EventNewNotification(n))
+                                        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'S'.toByte() && decryptedBuffer[5] == 'Y'.toByte()) {
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                            mSendQueue.clear()
+                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
+                                        } else {
+                                            // ERROR in response, wrong serial number
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                            mSendQueue.clear()
+                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
+                                            sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
+                                            val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
+                                            rxBus.send(EventNewNotification(n))
+                                        }
 
-                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()    -> {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    if (decryptedBuffer[2] == 0x00.toByte()) {
-                                        // Paring is not requested, sending time info
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte()   -> {
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " +  /*message.getMessageName() + " " + */DanaRS_Packet.toHexString(decryptedBuffer))
+                                        if (v3Encryption) {
+                                            // decryptedBuffer[2] : 0x00 OK  0x01 Error, No pairing
+                                            if (decryptedBuffer[2] == 0x00.toByte()) {
+                                                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+                                                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+                                                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+                                                    // expecting successful connect
+                                                    isConnected = true
+                                                    isConnecting = false
+                                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Connect !!")
+                                                } else {
+                                                    context.startActivity(Intent(context, EnterPinActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
+                                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Request pairing keys !!")
+                                                }
+                                            } else {
+                                                sendV3PairingInformation(1)
+                                            }
+
+                                        } else {
+                                            val size = decryptedBuffer.size
+                                            var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
+                                            pass = pass xor 3463
+                                            danaRPump.rsPassword = Integer.toHexString(pass)
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
+                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+                                            isConnected = true
+                                            isConnecting = false
+                                            aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
+                                        }
+                                    }
+
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()      -> {
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                        if (decryptedBuffer[2] == 0x00.toByte()) {
+                                            // Paring is not requested, sending time info
+                                            sendTimeInfo()
+                                        } else {
+                                            // Pairing on pump is requested
+                                            sendPairingRequest()
+                                        }
+                                    }
+
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()    -> {
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                        if (decryptedBuffer[2] != 0x00.toByte()) {
+                                            disconnect("passkey request failed")
+                                        }
+                                    }
+
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()     -> {
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
+                                        // Paring is successful, sending time info
+                                        rxBus.send(EventDanaRSPairingSuccess())
                                         sendTimeInfo()
-                                    } else {
-                                        // Pairing on pump is requested
-                                        sendPairingRequest()
+                                        val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
+                                        // store pairing key to preferences
+                                        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
+                                        aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
+                                    }
+
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK.toByte()     -> {
+                                        if (decryptedBuffer[2] == 0x05.toByte()) {
+                                            // not easy mode, request time info
+                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
+                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                        } else {
+                                            // easy mode
+                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
+                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                        }
+                                    }
+
+                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK.toByte() -> {
+                                        isEasyMode = decryptedBuffer[2] == 0x01.toByte()
+                                        isUnitUD = decryptedBuffer[3] == 0x01.toByte()
+
+                                        // request time information
+                                        if (v3Encryption) {
+                                            sendV3PairingInformation(1)
+                                        } else {
+                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
+                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+                                        }
                                     }
                                 }
 
-                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()  -> {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    if (decryptedBuffer[2] != 0x00.toByte()) {
-                                        disconnect("passkey request failed")
-                                    }
-                                }
-
-                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()   -> {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    // Paring is successful, sending time info
-                                    rxBus.send(EventDanaRSPairingSuccess())
-                                    sendTimeInfo()
-                                    val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
-                                    // store pairing key to preferences
-                                    sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
-                                }
-
-                                BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte() -> {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " +  /*message.getMessageName() + " " + */DanaRS_Packet.toHexString(decryptedBuffer))
-                                    val size = decryptedBuffer.size
-                                    var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
-                                    pass = pass xor 3463
-                                    danaRPump.rsPassword = Integer.toHexString(pass)
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
-                                    rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
-                                    isConnected = true
-                                    isConnecting = false
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
-                                }
-                            }
-
                             else                                                          -> {
                                 // Retrieve message code from received buffer and last message sent
                                 val originalCommand = processedMessage?.command ?: 0xFFFF
@@ -449,6 +562,8 @@ class BLEComm @Inject internal constructor(
         val params = message.requestParams
         aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
         var bytes = bleEncryption.getEncryptedPacket(message.opCode, params, null)
+        if (v3Encryption)
+            bytes = bleEncryption.encryptSecondLevelPacket(bytes)
         // If there is another message not completely sent, add to queue only
         if (mSendQueue.size > 0) {
             // Split to parts per 20 bytes max
@@ -509,13 +624,30 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    fun finishV3Pairing() {
+        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+        if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+            val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
+            val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
+            val tRandomSyncKey: Byte = 0
+            bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
+            sendV3PairingInformation(0)
+        }
+    }
+
+    // 0x00 Start encryption, 0x01 Request pairing
+    private fun sendV3PairingInformation(requestNewPairing: Int) {
+        val params = byteArrayOf(requestNewPairing.toByte())
+        val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
     private fun sendPairingRequest() {
         // Start activity which is waiting 20sec
         // On pump pairing request is displayed and is waiting for conformation
-        val i = Intent()
-        i.setClass(context, PairingHelperActivity::class.java)
-        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        context.startActivity(i)
+        context.startActivity(Intent(context, PairingHelperActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
         val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null)
         aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes))
         writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
new file mode 100644
index 0000000000..9852ecbbf4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.utils.extensions
+
+private val HEX_CHARS = "0123456789ABCDEF".toCharArray()
+
+fun ByteArray.toHex() : String{
+    val result = StringBuffer()
+
+    forEach {
+        val octet = it.toInt()
+        val firstIndex = (octet and 0xF0).ushr(4)
+        val secondIndex = octet and 0x0F
+        result.append(HEX_CHARS[firstIndex])
+        result.append(HEX_CHARS[secondIndex])
+    }
+
+    return result.toString()
+}
+
+fun String.hexStringToByteArray() : ByteArray {
+
+    val result = ByteArray(length / 2)
+
+    for (i in 0 until length step 2) {
+        val firstIndex = HEX_CHARS.indexOf(this[i]);
+        val secondIndex = HEX_CHARS.indexOf(this[i + 1]);
+
+        val octet = firstIndex.shl(4).or(secondIndex)
+        result.set(i.shr(1), octet.toByte())
+    }
+
+    return result
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
index 4c15100edd..21146a9a72 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
@@ -15,6 +15,9 @@ class DefaultEditTextValidator : EditTextValidator {
     protected var testErrorString: String? = null
     protected var emptyAllowed = false
     protected lateinit var editTextView: EditText
+    private var tw: TextWatcher? = null
+    private var defaultEmptyErrorString: String? = null
+
     protected var testType: Int
     protected var classType: String? = null
     protected var customRegexp: String? = null
@@ -26,8 +29,6 @@ class DefaultEditTextValidator : EditTextValidator {
     protected var maxNumber = 0
     protected var floatminNumber = 0f
     protected var floatmaxNumber = 0f
-    private var tw: TextWatcher? = null
-    private var defaultEmptyErrorString: String? = null
 
     @Suppress("unused")
     constructor(editTextView: EditText, context: Context) {
@@ -167,44 +168,50 @@ class DefaultEditTextValidator : EditTextValidator {
     }
 
     @Suppress("unused")
-    fun setClassType(classType: String?, testErrorString: String?, context: Context) {
+    fun setClassType(classType: String?, testErrorString: String?, context: Context)  : DefaultEditTextValidator{
         testType = EditTextValidator.TEST_CUSTOM
         this.classType = classType
         this.testErrorString = testErrorString
         resetValidators(context)
+        return this
     }
 
     @Suppress("unused")
-    fun setCustomRegexp(customRegexp: String?, context: Context) {
+    fun setCustomRegexp(customRegexp: String?, context: Context) : DefaultEditTextValidator {
         testType = EditTextValidator.TEST_REGEXP
         this.customRegexp = customRegexp
         resetValidators(context)
+        return this
     }
 
     @Suppress("unused")
-    fun setEmptyAllowed(emptyAllowed: Boolean, context: Context) {
+    fun setEmptyAllowed(emptyAllowed: Boolean, context: Context) : DefaultEditTextValidator {
         this.emptyAllowed = emptyAllowed
         resetValidators(context)
+        return this
     }
 
-    fun setEmptyErrorString(emptyErrorString: String?) {
+    fun setEmptyErrorString(emptyErrorString: String?) : DefaultEditTextValidator {
         emptyErrorStringActual = if (!TextUtils.isEmpty(emptyErrorString)) {
             emptyErrorString
         } else {
             defaultEmptyErrorString
         }
+        return this
     }
 
     @Suppress("unused")
-    fun setTestErrorString(testErrorString: String?, context: Context) {
+    fun setTestErrorString(testErrorString: String?, context: Context) : DefaultEditTextValidator {
         this.testErrorString = testErrorString
         resetValidators(context)
+        return this
     }
 
     @Suppress("unused")
-    fun setTestType(testType: Int, context: Context) {
+    fun setTestType(testType: Int, context: Context) : DefaultEditTextValidator {
         this.testType = testType
         resetValidators(context)
+        return this
     }
 
     override fun testValidity(): Boolean {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
index 190a3bea73..0d605c17e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.utils.textValidator
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import androidx.core.content.res.TypedArrayUtils
@@ -22,7 +23,7 @@ class ValidatingEditTextPreference(ctx: Context, attrs: AttributeSet, defStyleAt
     constructor(ctx: Context, attrs: AttributeSet, defStyle: Int)
         : this(ctx, attrs, defStyle, 0)
 
-    constructor(ctx: Context, attrs: AttributeSet)
+    @SuppressLint("RestrictedApi") constructor(ctx: Context, attrs: AttributeSet)
         : this(ctx, attrs, TypedArrayUtils.getAttr(ctx, R.attr.editTextPreferenceStyle,
         R.attr.editTextPreferenceStyle))
 
diff --git a/app/src/main/res/layout/danars_enter_pin_activity.xml b/app/src/main/res/layout/danars_enter_pin_activity.xml
new file mode 100644
index 0000000000..0a232b6cc1
--- /dev/null
+++ b/app/src/main/res/layout/danars_enter_pin_activity.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".plugins.pump.danaRS.activities.EnterPinActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/pairing"
+            android:src="@drawable/ic_bluetooth_white_48dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/pairing"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:gravity="center_horizontal"
+        android:labelFor="@+id/rs_v3_pin1"
+        android:text="@string/num1pin"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+    <EditText
+        android:id="@+id/rs_v3_pin1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints="@string/pin1"
+        android:digits="0123456789ABCDEF"
+        android:gravity="center_horizontal"
+        android:inputType="textCapCharacters"
+        android:text=""
+        android:textSize="25sp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:gravity="center_horizontal"
+        android:labelFor="@+id/rs_v3_pin2"
+        android:text="@string/num2pin"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+
+    <EditText
+        android:id="@+id/rs_v3_pin2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:autofillHints="@string/pin2"
+        android:digits="0123456789ABCDEF"
+        android:gravity="center_horizontal"
+        android:inputType="textCapCharacters"
+        android:text=""
+        android:textSize="25sp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="20dp"
+        android:gravity="center_horizontal"
+        android:text="@string/press_ok_on_the_pump"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large" />
+
+    <include layout="@layout/okcancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c6bcfbe4d..3ac901f44f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -417,6 +417,7 @@
     <string name="open_settings_on_wear">Open Settings on Wear</string>
     <string name="pumperror">Pump Error</string>
     <string name="lowbattery">Low Battery</string>
+    <string name="basalcompare">Delivering less than preset basal rate</string>
     <string name="pumpshutdown">Pump Shutdown</string>
     <string name="batterydischarged">Pump Battery Discharged</string>
     <string name="danarkoreanpump">DanaR Korean</string>
@@ -731,12 +732,16 @@
     <string name="pairingtimedout">Pairing timed out</string>
     <string name="pairing">Pairing</string>
     <string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
+    <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>
+    <string name="key_danars_v3_pairingkey" translatable="false">danars_v3_pairing_key_</string>
+    <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
     <string name="key_danars_address" translatable="false">danars_address</string>
     <string name="key_danars_name" translatable="false">danars_name</string>
     <string name="danars_nodeviceavailable">No device found so far</string>
     <string name="emptyreservoir">Empty reservoir</string>
     <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
     <string name="remaininsulinalert">Remaining insulin level</string>
+    <string name="missedbolus">Missed bolus</string>
     <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
     <string name="selectedpump">Selected pump</string>
@@ -1736,4 +1741,11 @@
     <string name="smscommunicator_otp_install_info">On each follower phone install Authenticator app that support RFC 6238 TOTP tokens. Popular free apps are:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_provisioning_warning">DO NOT SHARE this code online!\nUse it only to setup Authenticator App on follower phones.</string>
     <string name="smscommunicator_otp_reset_warning">By reseting authenticator you make all already provisioned authenticators invalid. You will need to set up them again!</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Press OK on the pump\nand enter 2 displayed numbers\nKeep display on pump ON by pressing minus button until you finish entering code.</string>
+    <string name="num1pin">1: (12 digits)</string>
+    <string name="num2pin">2: (8 digits)</string>
+    <string name="resetpairing">Reset pairing information?</string>
+    <string name="invalidpairing">Invalid pairing information. Requesting new pairing</string>
 </resources>
diff --git a/app/src/main/res/values/validator.xml b/app/src/main/res/values/validator.xml
index 15c40b743c..aef7116a48 100644
--- a/app/src/main/res/values/validator.xml
+++ b/app/src/main/res/values/validator.xml
@@ -16,9 +16,13 @@
     <string name="error_date_not_valid">Format not valid</string>
     <string name="error_mustbe4digitnumber">Must be 4 digit number</string>
     <string name="error_mustbe6digitnumber">Must be 6 digit number</string>
+    <string name="error_mustbe12hexadidits">Must be 12 characters of ABCDEF0123456789</string>
+    <string name="error_mustbe8hexadidits">Must be 8 characters of ABCDEF0123456789</string>
     <string name="error_not_a_minimum_length">Not a minimum length</string>
     <string name="error_pin_not_valid">Pin should be 3 to 6 digits, not same or in series</string>
 
     <string name="fourdigitnumber" translatable="false">^\\d{4}</string>
+    <string name="twelvehexanumber" translatable="false">^[A-F0-9]{12}$</string>
+    <string name="eighthexanumber" translatable="false">^[A-F0-9]{8}$</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
index 8aba3da2ba..58e0b738db 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
@@ -14,7 +14,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_Notify_AlarmTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper)
+        val packet = DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper, rxBus)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding

From 75cd9bccdcef9aa5bcb5c1f66a8817f5c29886e3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 27 Mar 2020 21:48:42 +0100
Subject: [PATCH 008/400] switch pumps properly

---
 .../plugins/pump/danaR/AbstractDanaRPlugin.java           | 4 +++-
 .../androidaps/plugins/pump/danaR/DanaRFragment.kt        | 2 +-
 .../androidaps/plugins/pump/danaRS/DanaRSPlugin.java      | 8 +++++---
 .../androidaps/plugins/pump/danaRS/services/BLEComm.kt    | 6 +++++-
 .../java/info/nightscout/androidaps/queue/CommandQueue.kt | 2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 6de5376b89..1982a0e7be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -103,8 +103,10 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name))
+                    if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name)) {
                         danaRPump.setLastConnection(0);
+                        danaRPump.setLastSettingsRead(0);
+                        getCommandQueue().readStatus("DeviceChanged", null);                    }
                 })
         );
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index e9e001ced0..7f9eb34c7f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -171,7 +171,7 @@ class DanaRFragment : DaggerFragment() {
 
     // GUI functions
     @Synchronized
-    internal fun updateGUI() {
+    fun updateGUI() {
         if (danar_dailyunits == null) return
         val pump = danaRPump
         val plugin: PumpInterface = activePlugin.activePump
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 759b473d75..7dcc0c29ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -166,9 +166,9 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         disposable.add(rxBus
                 .toObservable(EventDanaRSDeviceChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> loadAddress(), fabricPrivacy::logException)
+                .subscribe(event -> changePump(), fabricPrivacy::logException)
         );
-        loadAddress(); // load device name
+        changePump(); // load device name
         super.onStart();
     }
 
@@ -194,10 +194,12 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         }
     };
 
-    private void loadAddress() {
+    public void changePump() {
         mDeviceAddress = sp.getString(R.string.key_danars_address, "");
         mDeviceName = sp.getString(R.string.key_danars_name, "");
         danaRPump.setLastConnection(0);
+        danaRPump.setLastSettingsRead(0);
+        getCommandQueue().readStatus("DeviceChanged", null);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 1e6a5f1642..2f537e7d87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -96,6 +96,9 @@ class BLEComm @Inject internal constructor(
             return false
         }
 
+        isConnected = false
+        v3Encryption = false
+        encryptedDataRead = false
         isConnecting = true
         val device = bluetoothAdapter?.getRemoteDevice(address)
         if (device == null) {
@@ -118,13 +121,14 @@ class BLEComm @Inject internal constructor(
     fun disconnect(from: String) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
-        if (!encryptedDataRead) {
+        if (!encryptedDataRead && v3Encryption) {
             // there was no response from pump after started encryption
             // assume pairing keys are invalid
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
             ToastUtils.showToastInUiThread(context, R.string.invalidpairing)
+            danaRSPlugin.changePump()
         }
         // cancel previous scheduled disconnection to prevent closing upcoming connection
         scheduledDisconnection?.cancel(false)
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
index fd93f772aa..20a11124d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -374,12 +374,14 @@ class CommandQueue @Inject constructor(
             callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
             return false
         }
+        /* this is breaking setting of profile at all if not engineering mode
         if (!buildHelper.isEngineeringModeOrRelease()) {
             val notification = Notification(Notification.NOT_ENG_MODE_OR_RELEASE, resourceHelper.gs(R.string.not_eng_mode_or_release), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
             callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(resourceHelper.gs(R.string.not_eng_mode_or_release)))?.run()
             return false
         }
+        */
         // Compare with pump limits
         val basalValues = profile.basalValues
         for (basalValue in basalValues) {

From 5e50ca8793d45c986201315297c37b19f54449d1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 28 Mar 2020 20:55:28 +0100
Subject: [PATCH 009/400] Improved switching between Dana pumps, code cleanup

---
 .../pump/danaR/AbstractDanaRPlugin.java       |   8 +-
 .../plugins/pump/danaR/DanaRFragment.kt       |   6 +-
 .../plugins/pump/danaR/DanaRPump.kt           |  26 +-
 .../plugins/pump/danaR/comm/MsgCheckValue.kt  |   6 +-
 .../danaR/services/DanaRExecutionService.java |   3 +-
 .../pump/danaRKorean/comm/MsgCheckValue_k.kt  |   6 +-
 .../services/DanaRKoreanExecutionService.java |   3 +-
 .../plugins/pump/danaRS/DanaRSPlugin.java     |   5 +-
 .../danaRS/comm/DanaRSMessageHashTable.kt     |   3 +
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |   6 +-
 ...aRS_Packet_General_Get_Shipping_Version.kt |  28 +
 ...cket_General_Initial_Screen_Information.kt |  10 +-
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |  27 +
 .../pump/danaRS/encryption/BleEncryption.java |   4 +
 .../plugins/pump/danaRS/services/BLEComm.kt   | 494 ++++++++++--------
 .../pump/danaRS/services/DanaRSService.java   |   4 +-
 .../pump/danaRv2/comm/MsgCheckValue_v2.kt     |  10 +-
 .../services/DanaRv2ExecutionService.java     |   5 +-
 .../interfaces/ConstraintsCheckerTest.kt      |   2 +-
 .../pump/danaR/comm/MsgCheckValueTest.kt      |   2 +-
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |   3 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |   3 +-
 ...Packet_General_Get_Shipping_VerisonTest.kt |  20 +
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |   3 +-
 ...RS_Packet_Review_Get_Pump_Dec_RatioTest.kt |  22 +
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt |   2 +-
 26 files changed, 434 insertions(+), 277 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 1982a0e7be..cb8740bbcf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -97,16 +97,16 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         disposable.add(rxBus
                 .toObservable(EventConfigBuilderChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> danaRPump.setLastConnection(0))
+                .subscribe(event -> danaRPump.reset())
         );
         disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name)) {
-                        danaRPump.setLastConnection(0);
-                        danaRPump.setLastSettingsRead(0);
-                        getCommandQueue().readStatus("DeviceChanged", null);                    }
+                        danaRPump.reset();
+                        getCommandQueue().readStatus("DeviceChanged", null);
+                    }
                 })
         );
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index 7f9eb34c7f..6cace72c5f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -210,8 +210,8 @@ class DanaRFragment : DaggerFragment() {
         danar_battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         SetWarnColor.setColorInverse(danar_battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
         danar_iob.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
-        if (pump.model != 0 || pump.protocol != 0 || pump.productCode != 0) {
-            danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.model, pump.protocol, pump.productCode)
+        if (pump.btModel != 0 || pump.protocol != 0 || pump.productCode != 0) {
+            danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.btModel, pump.protocol, pump.productCode)
         } else {
             @Suppress("SetTextI18n")
             danar_firmware.text = "OLD"
@@ -229,7 +229,7 @@ class DanaRFragment : DaggerFragment() {
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
         val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
-        if (isKorean || danar_firmware.text === "OLD" || pump.model == 3) {
+        if (isKorean || danar_firmware.text === "OLD" || pump.btModel == 3) {
             danar_user_options.visibility = View.GONE
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index 0621fd80ad..eb5bb627fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -26,6 +26,20 @@ class DanaRPump @Inject constructor(
     private val injector: HasAndroidInjector
 ) {
 
+    enum class ErrorState(val code: Int) {
+        NONE(0x00),
+        SUSPENDED(0x01),
+        DAILYMAX(0x02),
+        BOLUSBLOCK(0x04),
+        ORDERDELIVERING(0x08),
+        NOPRIME(0x10);
+
+        companion object {
+            private val map = values().associateBy(ErrorState::code)
+            operator fun get(value: Int) = map[value]
+        }
+    }
+
     var lastConnection: Long = 0
     var lastSettingsRead: Long = 0
 
@@ -33,12 +47,14 @@ class DanaRPump @Inject constructor(
     var serialNumber = ""
     var shippingDate: Long = 0
     var shippingCountry = ""
-    var isNewPump = true
-    var password = -1
+    var bleModel = "" // RS v3:  like BPN-1.0.1
+    var isNewPump = true // R only , providing model info
+    var password = -1 // R, RSv1
     var pumpTime: Long = 0
-    var model = 0
+    var btModel = 0
     var protocol = 0
     var productCode = 0
+    var errorState: ErrorState = ErrorState.NONE
     var isConfigUD = false
     var isExtendedBolusEnabled = false
     var isEasyModeEnabled = false
@@ -49,6 +65,7 @@ class DanaRPump @Inject constructor(
     var dailyTotalUnits = 0.0
     var dailyTotalBolusUnits = 0.0 // RS only
     var dailyTotalBasalUnits = 0.0 // RS only
+    var decRatio = 0 // RS v3: [%] for pump IOB calculation
     var maxDailyTotalUnits = 0
     var bolusStep = 0.1
     var basalStep = 0.1
@@ -207,6 +224,7 @@ class DanaRPump @Inject constructor(
     fun reset() {
         aapsLogger.debug(LTag.PUMP, "DanaRPump reset")
         lastConnection = 0
+        lastSettingsRead = 0
     }
 
     companion object {
@@ -234,6 +252,8 @@ class DanaRPump @Inject constructor(
         const val PROFILECHANGE = 13
         const val CARBS = 14
         const val PRIMECANNULA = 15
+
+        // Dana R btModel
         const val DOMESTIC_MODEL = 0x01
         const val EXPORT_MODEL = 0x03
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
index abb6c34d8d..3cc8701a38 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
@@ -19,14 +19,14 @@ class MsgCheckValue(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.btModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.model != DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.btModel != DanaRPump.EXPORT_MODEL) {
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index b71ed5abea..4178bd3d57 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -225,8 +225,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.setLastConnection(0);
-                    danaRPump.setLastSettingsRead(0);
+                    danaRPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
index 16ae6967a2..412d13cf3d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
@@ -21,14 +21,14 @@ class MsgCheckValue_k(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.btModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.model != DanaRPump.DOMESTIC_MODEL) {
+        if (danaRPump.btModel != DanaRPump.DOMESTIC_MODEL) {
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index f695448820..d40583e9db 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -212,8 +212,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.setLastConnection(0);
-                    danaRPump.setLastSettingsRead(0);
+                    danaRPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 7dcc0c29ff..35f1e81a21 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -161,7 +161,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         disposable.add(rxBus
                 .toObservable(EventConfigBuilderChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> danaRPump.setLastConnection(0))
+                .subscribe(event -> danaRPump.reset())
         );
         disposable.add(rxBus
                 .toObservable(EventDanaRSDeviceChange.class)
@@ -197,8 +197,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     public void changePump() {
         mDeviceAddress = sp.getString(R.string.key_danars_address, "");
         mDeviceName = sp.getString(R.string.key_danars_name, "");
-        danaRPump.setLastConnection(0);
-        danaRPump.setLastSettingsRead(0);
+        danaRPump.reset();
         getCommandQueue().readStatus("DeviceChanged", null);
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index 224ecd9ae5..2f3b8b170a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -101,5 +101,8 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
         put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, 0))
         put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
+        // v3
+        put(DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Review_Get_Pump_Dec_Ratio(aapsLogger, danaRPump))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index bf3338b52f..5646c6f370 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -8,6 +7,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class DanaRS_Packet_General_Get_Pump_Check(
@@ -30,14 +30,14 @@ class DanaRS_Packet_General_Get_Pump_Check(
             failed = false
         var dataIndex = DATA_START
         var dataSize = 1
-        danaRPump.model = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaRPump.btModel = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         danaRPump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         danaRPump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
         if (danaRPump.productCode < 2) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
new file mode 100644
index 0000000000..9d3d83fbf4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import java.nio.charset.Charset
+
+class DanaRS_Packet_General_Get_Shipping_Version(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        danaRPump.bleModel = data.copyOfRange(DATA_START, data.size).toString(Charset.forName("US-ASCII"))
+        failed = false
+        aapsLogger.debug(LTag.PUMPCOMM, "BLE Model: " + danaRPump.bleModel)
+    }
+
+    override fun getFriendlyName(): String {
+        return "GENERAL__GET_SHIPPING_VERSION"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index 03471e7408..0510c28271 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_General_Initial_Screen_Information(
     private val aapsLogger: AAPSLogger,
@@ -51,6 +51,14 @@ class DanaRS_Packet_General_Initial_Screen_Information(
         dataIndex += dataSize
         dataSize = 2
         danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        if (data.size >= 18) {
+            //protocol 10+
+            dataIndex += dataSize
+            dataSize = 1
+            danaRPump.errorState = DanaRPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
+                ?: DanaRPump.ErrorState.NONE
+            aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaRPump.errorState.name)
+        }
         aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
         aapsLogger.debug(LTag.PUMPCOMM, "Temp basal in progress: " + danaRPump.isTempBasalInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "Extended in progress: " + danaRPump.isExtendedInProgress)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
new file mode 100644
index 0000000000..23d903de0b
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+
+class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
+    private val aapsLogger: AAPSLogger,
+    private val danaRPump: DanaRPump
+) : DanaRS_Packet() {
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        danaRPump.decRatio = intFromBuff(data, 0, 1) * 5
+        failed = false
+        aapsLogger.debug(LTag.PUMPCOMM, "Dec ratio: ${danaRPump.decRatio}%")
+    }
+
+    override fun getFriendlyName(): String {
+        return "REVIEW__GET_PUMP_DEC_RATIO"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
index b4fea5d8be..425a5a87a2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
@@ -97,6 +97,10 @@ public class BleEncryption {
     public static final int DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS = 0xC2;
     public static final int DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY = 0xC3;
 
+    // v3 specific
+    public static final int DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO = 0x80;
+    public static final int DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION = 0x81;
+
     // Easy Mode
     public static final int DANAR_PACKET__OPCODE_OPTION__GET_EASY_MENU_OPTION = 0x74;
     public static final int DANAR_PACKET__OPCODE_OPTION__SET_EASY_MENU_OPTION = 0x75;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 2f537e7d87..9145cb6559 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -162,7 +162,7 @@ class BLEComm @Inject internal constructor(
             if (status == BluetoothGatt.GATT_SUCCESS) {
                 findCharacteristic()
             }
-            sendPumpCheck()
+            sendConnect()
             // 1st message sent to pump after connect
         }
 
@@ -295,7 +295,7 @@ class BLEComm @Inject internal constructor(
         }
     }
 
-    private fun readDataParsing(receviedData: ByteArray) {
+    private fun readDataParsing(receivedData: ByteArray) {
         //aapsLogger.debug(LTag.PUMPBTCOMM, "readDataParsing")
         var startSignatureFound = false
         var packetIsValid = false
@@ -305,8 +305,8 @@ class BLEComm @Inject internal constructor(
 
         // decrypt 2nd level after successful connection
         val incomingBuffer = if (v3Encryption && isConnected)
-            bleEncryption.decryptSecondLevelPacket(receviedData).also { encryptedDataRead = true }
-        else receviedData
+            bleEncryption.decryptSecondLevelPacket(receivedData).also { encryptedDataRead = true }
+        else receivedData
         addToReadBuffer(incomingBuffer)
 
         while (isProcessing) {
@@ -356,196 +356,42 @@ class BLEComm @Inject internal constructor(
                 }
             }
             if (packetIsValid) {
-                try {
-                    // decrypt the packet
-                    bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
-                        when (decryptedBuffer[0]) {
-                            BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte() ->
-                                when (decryptedBuffer[1]) {
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()         ->
-                                        if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                            v3Encryption = false
-                                            // Grab pairing key from preferences if exists
-                                            val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
-                                            if (pairingKey.isNotEmpty()) {
-                                                val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
-                                                val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
-                                                aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
-                                                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                            } else {
-                                                // Stored pairing key does not exists, request pairing
-                                                sendPairingRequest()
-                                            }
-                                        } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
-                                            // v3 2nd layer encryption
-                                            v3Encryption = true
-                                            val model = decryptedBuffer[5]
-                                            // val protocol = decryptedBuffer[7]
-                                            if (model == 0x05.toByte()) {
-                                                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                                // Dana RS Pump
-                                                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-                                                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
-                                                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
-                                                    val randomSyncKey = String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1])
-                                                    sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, randomSyncKey)
-                                                    val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
-                                                    val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
-                                                    var tRandomSyncKey: Byte = 0
-                                                    if (randomSyncKey.isNotEmpty()) {
-                                                        tRandomSyncKey = randomSyncKey.toInt(16).toByte()
-                                                    }
-                                                    bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
-                                                    sendV3PairingInformation(0)
-                                                } else {
-                                                    sendV3PairingInformation(1)
-                                                }
-                                            } else if (model == 0x06.toByte()) {
-                                                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                                // Dana RS Easy
-                                                val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
-                                                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                            }
-                                        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                            mSendQueue.clear()
-                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
-                                            NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
-                                            val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
-                                            rxBus.send(EventNewNotification(n))
-                                        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'S'.toByte() && decryptedBuffer[5] == 'Y'.toByte()) {
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                            mSendQueue.clear()
-                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
-                                        } else {
-                                            // ERROR in response, wrong serial number
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                            mSendQueue.clear()
-                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
-                                            sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
-                                            val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
-                                            rxBus.send(EventNewNotification(n))
-                                        }
+                // decrypt the packet
+                bleEncryption.getDecryptedPacket(inputBuffer)?.let { decryptedBuffer ->
+                    if (decryptedBuffer[0] == BleEncryption.DANAR_PACKET__TYPE_ENCRYPTION_RESPONSE.toByte()) {
+                        when (decryptedBuffer[1]) {
+                            // 1st packet exchange
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK.toByte()         ->
+                                processConnectResponse(decryptedBuffer)
 
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte()   -> {
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " +  /*message.getMessageName() + " " + */DanaRS_Packet.toHexString(decryptedBuffer))
-                                        if (v3Encryption) {
-                                            // decryptedBuffer[2] : 0x00 OK  0x01 Error, No pairing
-                                            if (decryptedBuffer[2] == 0x00.toByte()) {
-                                                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-                                                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
-                                                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
-                                                    // expecting successful connect
-                                                    isConnected = true
-                                                    isConnecting = false
-                                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Connect !!")
-                                                } else {
-                                                    context.startActivity(Intent(context, EnterPinActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
-                                                    aapsLogger.debug(LTag.PUMPBTCOMM, "Request pairing keys !!")
-                                                }
-                                            } else {
-                                                sendV3PairingInformation(1)
-                                            }
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION.toByte()   ->
+                                processEncryptionResponse(decryptedBuffer)
 
-                                        } else {
-                                            val size = decryptedBuffer.size
-                                            var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
-                                            pass = pass xor 3463
-                                            danaRPump.rsPassword = Integer.toHexString(pass)
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
-                                            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
-                                            isConnected = true
-                                            isConnecting = false
-                                            aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
-                                        }
-                                    }
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()      ->
+                                processPasskeyCheck(decryptedBuffer)
 
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY.toByte()      -> {
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                        if (decryptedBuffer[2] == 0x00.toByte()) {
-                                            // Paring is not requested, sending time info
-                                            sendTimeInfo()
-                                        } else {
-                                            // Pairing on pump is requested
-                                            sendPairingRequest()
-                                        }
-                                    }
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()    ->
+                                processPairingRequest(decryptedBuffer)
 
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST.toByte()    -> {
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                        if (decryptedBuffer[2] != 0x00.toByte()) {
-                                            disconnect("passkey request failed")
-                                        }
-                                    }
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()     ->
+                                processPairingRequest2(decryptedBuffer)
 
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_RETURN.toByte()     -> {
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                        // Paring is successful, sending time info
-                                        rxBus.send(EventDanaRSPairingSuccess())
-                                        sendTimeInfo()
-                                        val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
-                                        // store pairing key to preferences
-                                        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
-                                        aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
-                                    }
-
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK.toByte()     -> {
-                                        if (decryptedBuffer[2] == 0x05.toByte()) {
-                                            // not easy mode, request time info
-                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
-                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                        } else {
-                                            // easy mode
-                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
-                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                        }
-                                    }
-
-                                    BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK.toByte() -> {
-                                        isEasyMode = decryptedBuffer[2] == 0x01.toByte()
-                                        isUnitUD = decryptedBuffer[3] == 0x01.toByte()
-
-                                        // request time information
-                                        if (v3Encryption) {
-                                            sendV3PairingInformation(1)
-                                        } else {
-                                            val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
-                                            writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-                                        }
-                                    }
-                                }
-
-                            else                                                          -> {
-                                // Retrieve message code from received buffer and last message sent
-                                val originalCommand = processedMessage?.command ?: 0xFFFF
-                                val receivedCommand = DanaRS_Packet.getCommand(decryptedBuffer)
-                                val message: DanaRS_Packet? = if (originalCommand == receivedCommand) {
-                                    // it's response to last message
-                                    processedMessage
-                                } else {
-                                    // it's not response to last message, create new instance
-                                    danaRSMessageHashTable.findMessage(receivedCommand)
-                                }
-                                if (message != null) {
-                                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                    // process received data
-                                    message.handleMessage(decryptedBuffer)
-                                    message.setReceived()
-                                    synchronized(message) {
-                                        // notify to sendMessage
-                                        message.notify()
-                                    }
-                                } else {
-                                    aapsLogger.error("Unknown message received " + DanaRS_Packet.toHexString(decryptedBuffer))
-                                }
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_PUMP_CHECK.toByte()     -> {
+                                // not easy mode, request time info
+                                if (decryptedBuffer[2] == 0x05.toByte()) sendTimeInfo()
+                                // easy mode
+                                else sendEasyMenuCheck()
                             }
+
+                            BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK.toByte() ->
+                                processEasyMenuCheck(decryptedBuffer)
                         }
-                    } ?: throw IllegalStateException("Null decryptedInputBuffer")
-                } catch (e: Exception) {
-                    aapsLogger.error("Unhandled exception", e)
-                }
+
+                    } else {
+                        // Retrieve message code from received buffer and last message sent
+                        processMessage(decryptedBuffer)
+                    }
+                } ?: throw IllegalStateException("Null decryptedInputBuffer")
                 startSignatureFound = false
                 packetIsValid = false
                 if (bufferLength < 6) {
@@ -559,6 +405,216 @@ class BLEComm @Inject internal constructor(
         }
     }
 
+    // 1st packet v1 v3 message sent to pump after connect
+    private fun sendConnect() {
+        val deviceName = connectDeviceName
+        if (deviceName == null || deviceName == "") {
+            val n = Notification(Notification.DEVICENOTPAIRED, resourceHelper.gs(R.string.pairfirst), Notification.URGENT)
+            rxBus.send(EventNewNotification(n))
+            return
+        }
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, deviceName)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    // 1st packet response
+    private fun processConnectResponse(decryptedBuffer: ByteArray) {
+        // response OK v1
+        if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            v3Encryption = false
+            // Grab pairing key from preferences if exists
+            val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
+            if (pairingKey.isNotEmpty()) {
+                sendPasskeyCheck(pairingKey)
+            } else {
+                // Stored pairing key does not exists, request pairing
+                sendPairingRequest()
+            }
+            // response OK v3
+        } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
+            // v3 2nd layer encryption
+            v3Encryption = true
+            val model = decryptedBuffer[5]
+            // val protocol = decryptedBuffer[7]
+            if (model == 0x05.toByte()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                // Dana RS Pump
+                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+                    val randomSyncKey = String.format("%02x", decryptedBuffer[decryptedBuffer.size - 1])
+                    sp.putString(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName, randomSyncKey)
+                    val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
+                    val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
+                    var tRandomSyncKey: Byte = 0
+                    if (randomSyncKey.isNotEmpty()) {
+                        tRandomSyncKey = randomSyncKey.toInt(16).toByte()
+                    }
+                    bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
+                    sendV3PairingInformation(0)
+                } else {
+                    sendV3PairingInformation(1)
+                }
+            } else if (model == 0x06.toByte()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK V3 EASY (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+                // Dana RS Easy
+                val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
+                writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+            }
+            // response PUMP : error status
+        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            mSendQueue.clear()
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
+            NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
+            val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
+            rxBus.send(EventNewNotification(n))
+            // response BUSY: error status
+        } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'S'.toByte() && decryptedBuffer[5] == 'Y'.toByte()) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            mSendQueue.clear()
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumpbusy)))
+        } else {
+            // ERROR in response, wrong serial number
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            mSendQueue.clear()
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.connectionerror)))
+            sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
+            val n = Notification(Notification.WRONGSERIALNUMBER, resourceHelper.gs(R.string.wrongpassword), Notification.URGENT)
+            rxBus.send(EventNewNotification(n))
+        }
+    }
+
+    // 2nd packet v1 check passkey
+    private fun sendPasskeyCheck(pairingKey: String) {
+        val encodedPairingKey = DanaRS_Packet.hexToBytes(pairingKey)
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__CHECK_PASSKEY, encodedPairingKey, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    // 2nd packet v1 response
+    private fun processPasskeyCheck(decryptedBuffer: ByteArray) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__CHECK_PASSKEY" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+        // Paring is not requested, sending time info
+        if (decryptedBuffer[2] == 0x00.toByte()) sendTimeInfo()
+        // Pairing on pump is requested
+        else sendPairingRequest()
+    }
+
+    // 2nd packet v3
+    // 0x00 Start encryption, 0x01 Request pairing
+    private fun sendV3PairingInformation(requestNewPairing: Int) {
+        val params = byteArrayOf(requestNewPairing.toByte())
+        val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    // 2nd packet response
+    private fun processEncryptionResponse(decryptedBuffer: ByteArray) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__TIME_INFORMATION " +  /*message.getMessageName() + " " + */DanaRS_Packet.toHexString(decryptedBuffer))
+        if (v3Encryption) {
+            // decryptedBuffer[2] : 0x00 OK  0x01 Error, No pairing
+            if (decryptedBuffer[2] == 0x00.toByte()) {
+                val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+                val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+                if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+                    // expecting successful connect
+                    isConnected = true
+                    isConnecting = false
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "Connect !!")
+                } else {
+                    context.startActivity(Intent(context, EnterPinActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "Request pairing keys !!")
+                }
+            } else {
+                sendV3PairingInformation(1)
+            }
+
+        } else {
+            val size = decryptedBuffer.size
+            var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
+            pass = pass xor 3463
+            danaRPump.rsPassword = Integer.toHexString(pass)
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+            isConnected = true
+            isConnecting = false
+            aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
+        }
+    }
+
+    // 3rd packet v1 existing pairing
+    private fun sendTimeInfo() {
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    //2nd or 3rd packet v1 pairing doesn't exist
+    private fun sendPairingRequest() {
+        // Start activity which is waiting 20sec
+        // On pump pairing request is displayed and is waiting for conformation
+        context.startActivity(Intent(context, PairingHelperActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
+        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null)
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes))
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    // 3rd packet v3 : only after entering PIN codes
+    fun finishV3Pairing() {
+        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
+        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
+        if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
+            val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
+            val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
+            val tRandomSyncKey: Byte = 0
+            bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
+            sendV3PairingInformation(0)
+        } else throw java.lang.IllegalStateException("This should not be reached")
+    }
+
+    // 2nd or 3rd packet v1 response
+    private fun processPairingRequest(decryptedBuffer: ByteArray) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_REQUEST " + DanaRS_Packet.toHexString(decryptedBuffer))
+        if (decryptedBuffer[2] != 0x00.toByte()) {
+            disconnect("passkey request failed")
+        }
+    }
+
+    // 2nd or 3rd packet v1 response
+    private fun processPairingRequest2(decryptedBuffer: ByteArray) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PASSKEY_RETURN " + DanaRS_Packet.toHexString(decryptedBuffer))
+        // Paring is successful, sending time info
+        rxBus.send(EventDanaRSPairingSuccess())
+        sendTimeInfo()
+        val pairingKey = byteArrayOf(decryptedBuffer[2], decryptedBuffer[3])
+        // store pairing key to preferences
+        sp.putString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, DanaRS_Packet.bytesToHex(pairingKey))
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Got pairing key: " + DanaRS_Packet.bytesToHex(pairingKey))
+    }
+
+    // 3rd packet Easy menu pump
+    private fun sendEasyMenuCheck() {
+        val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+    }
+
+    // 3rd packet Easy menu response
+    private fun processEasyMenuCheck(decryptedBuffer: ByteArray) {
+        isEasyMode = decryptedBuffer[2] == 0x01.toByte()
+        isUnitUD = decryptedBuffer[3] == 0x01.toByte()
+
+        // request time information
+        if (v3Encryption) sendV3PairingInformation(1)
+        else sendTimeInfo()
+    }
+
+    // the rest of packets
     fun sendMessage(message: DanaRS_Packet?) {
         processedMessage = message
         if (message == null) return
@@ -628,51 +684,27 @@ class BLEComm @Inject internal constructor(
         }
     }
 
-    fun finishV3Pairing() {
-        val randomPairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName, "")
-        val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName, "")
-        if (randomPairingKey.isNotEmpty() && pairingKey.isNotEmpty()) {
-            val tPairingKey = Base64.decode(pairingKey, Base64.DEFAULT)
-            val tRandomPairingKey = Base64.decode(randomPairingKey, Base64.DEFAULT)
-            val tRandomSyncKey: Byte = 0
-            bleEncryption.setPairingKeys(tPairingKey, tRandomPairingKey, tRandomSyncKey)
-            sendV3PairingInformation(0)
+    // process common packet response
+    private fun processMessage(decryptedBuffer: ByteArray) {
+        val originalCommand = processedMessage?.command ?: 0xFFFF
+        val receivedCommand = DanaRS_Packet.getCommand(decryptedBuffer)
+        val message: DanaRS_Packet? = if (originalCommand == receivedCommand) {
+            // it's response to last message
+            processedMessage
+        } else {
+            // it's not response to last message, create new instance
+            danaRSMessageHashTable.findMessage(receivedCommand)
         }
+        if (message != null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.friendlyName + " " + DanaRS_Packet.toHexString(decryptedBuffer))
+            // process received data
+            message.handleMessage(decryptedBuffer)
+            message.setReceived()
+            synchronized(message) {
+                // notify to sendMessage
+                message.notify()
+            }
+        } else aapsLogger.error("Unknown message received " + DanaRS_Packet.toHexString(decryptedBuffer))
     }
 
-    // 0x00 Start encryption, 0x01 Request pairing
-    private fun sendV3PairingInformation(requestNewPairing: Int) {
-        val params = byteArrayOf(requestNewPairing.toByte())
-        val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, params, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
-        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-    }
-
-    private fun sendPairingRequest() {
-        // Start activity which is waiting 20sec
-        // On pump pairing request is displayed and is waiting for conformation
-        context.startActivity(Intent(context, PairingHelperActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
-        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PASSKEY_REQUEST, null, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PASSKEY_REQUEST" + " " + DanaRS_Packet.toHexString(bytes))
-        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-    }
-
-    private fun sendPumpCheck() {
-        // 1st message sent to pump after connect
-        val deviceName = connectDeviceName
-        if (deviceName == null || deviceName == "") {
-            val n = Notification(Notification.DEVICENOTPAIRED, resourceHelper.gs(R.string.pairfirst), Notification.URGENT)
-            rxBus.send(EventNewNotification(n))
-            return
-        }
-        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__PUMP_CHECK, null, deviceName)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__PUMP_CHECK (0x00)" + " " + DanaRS_Packet.toHexString(bytes))
-        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-    }
-
-    private fun sendTimeInfo() {
-        val bytes = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__TIME_INFORMATION, null, null)
-        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + "ENCRYPTION__TIME_INFORMATION" + " " + DanaRS_Packet.toHexString(bytes))
-        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index cb6484bafd..4affd0d7c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -189,7 +189,7 @@ public class DanaRSService extends DaggerService {
             if (danaRPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
-                danaRPump.setLastConnection(0);
+                danaRPump.reset();
                 rxBus.send(new EventDanaRNewStatus());
                 rxBus.send(new EventInitializationChanged());
                 return;
@@ -221,7 +221,7 @@ public class DanaRSService extends DaggerService {
                     context.startActivity(i);
 
                     //deinitialize pump
-                    danaRPump.setLastConnection(0);
+                    danaRPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
index d680490a15..87628c0d1a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
@@ -38,11 +38,11 @@ class MsgCheckValue_v2(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.model = intFromBuff(bytes, 0, 1)
+        danaRPump.btModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.model != DanaRPump.EXPORT_MODEL) {
-            danaRPump.lastConnection = 0
+        if (danaRPump.btModel != DanaRPump.EXPORT_MODEL) {
+            danaRPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRPlugin.disconnect("Wrong Model")
@@ -59,7 +59,7 @@ class MsgCheckValue_v2(
             return
         }
         if (danaRPump.protocol != 2) {
-            danaRPump.lastConnection = 0
+            danaRPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRKoreanPlugin.disconnect("Wrong Model")
@@ -74,7 +74,7 @@ class MsgCheckValue_v2(
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.model))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index 76f3083385..cb45d18bbd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -230,8 +230,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             if (danaRPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
-                danaRPump.setLastConnection(0);
-                danaRPump.setLastSettingsRead(0);
+                danaRPump.reset();
                 rxBus.send(new EventDanaRNewStatus());
                 rxBus.send(new EventInitializationChanged());
                 return;
@@ -250,7 +249,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     context.startActivity(i);
 
                     //deinitialize pump
-                    danaRPump.setLastConnection(0);
+                    danaRPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 763cd748cc..545b8fc119 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -115,7 +115,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp)
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index ec3588fbe7..b9d959c631 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -20,6 +20,6 @@ class MsgCheckValueTest : DanaRTestBase() {
         val array = ByteArray(100)
         putByteToArray(array, 0, DanaRPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.model)
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.btModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index a9a13dbc90..89e4bd5fad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -13,7 +13,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -66,6 +65,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 420b0a73d8..7b5b94522f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -47,7 +46,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
new file mode 100644
index 0000000000..f962560115
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class DanaRS_Packet_General_Get_Shipping_VerisonTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump)
+        // test message decoding
+        val ver = byteArrayOf((-78).toByte(), (-127).toByte(), (66).toByte(), (80).toByte(), (78).toByte(), (45).toByte(), (51).toByte(), (46).toByte(), (48).toByte(), (46).toByte(), (48).toByte())
+        packet.handleMessage(ver)
+        Assert.assertFalse(packet.failed)
+        Assert.assertEquals("BPN-3.0.0", danaRPump.bleModel)
+        Assert.assertEquals("GENERAL__GET_SHIPPING_VERSION", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 06f69cadbd..3d46558207 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import org.junit.Assert
 import org.junit.Before
@@ -66,7 +65,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
         danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
new file mode 100644
index 0000000000..4bd5bbbd1a
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest()
+class DanaRS_Packet_Review_Get_Pump_Dec_RatioTest : DanaRSTestBase() {
+
+    @Test fun runTest() {
+        val packet = DanaRS_Packet_Review_Get_Pump_Dec_Ratio(aapsLogger, danaRPump)
+
+        val array = ByteArray(100)
+        putByteToArray(array, 0, 4.toByte())
+        packet.handleMessage(array)
+        Assert.assertEquals(20, danaRPump.decRatio)
+        Assert.assertEquals("REVIEW__GET_PUMP_DEC_RATIO", packet.friendlyName)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index 71a361e8c5..77bf756890 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -33,6 +33,6 @@ class MsgCheckValue_v2Test : DanaRTestBase() {
         val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.model)
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.btModel)
     }
 }
\ No newline at end of file

From a85ec262d32a7b491b92ce20b86c60a1f64a752c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 28 Mar 2020 22:40:56 +0100
Subject: [PATCH 010/400] Display Dana model

---
 .../plugins/pump/danaR/DanaRFragment.kt         |  9 ++-------
 .../androidaps/plugins/pump/danaR/DanaRPump.kt  | 17 ++++++++++++++++-
 .../plugins/pump/danaR/comm/MsgCheckValue.kt    |  6 +++---
 .../pump/danaRKorean/comm/MsgCheckValue_k.kt    |  6 +++---
 .../DanaRS_Packet_General_Get_Pump_Check.kt     |  4 ++--
 .../pump/danaRv2/comm/MsgCheckValue_v2.kt       |  6 +++---
 app/src/main/res/values/strings.xml             |  2 +-
 .../pump/danaR/comm/MsgCheckValueTest.kt        |  2 +-
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt   |  2 +-
 9 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index 6cace72c5f..fcc84f1314 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -210,12 +210,7 @@ class DanaRFragment : DaggerFragment() {
         danar_battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         SetWarnColor.setColorInverse(danar_battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
         danar_iob.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
-        if (pump.btModel != 0 || pump.protocol != 0 || pump.productCode != 0) {
-            danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.btModel, pump.protocol, pump.productCode)
-        } else {
-            @Suppress("SetTextI18n")
-            danar_firmware.text = "OLD"
-        }
+        danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
         danar_basalstep.text = pump.basalStep.toString()
         danar_bolusstep.text = pump.bolusStep.toString()
         danar_serialnumber.text = pump.serialNumber
@@ -229,7 +224,7 @@ class DanaRFragment : DaggerFragment() {
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
         val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
-        if (isKorean || danar_firmware.text === "OLD" || pump.btModel == 3) {
+        if (isKorean || pump.hwModel == 0 || pump.hwModel == 3) {
             danar_user_options.visibility = View.GONE
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index eb5bb627fc..213efac04d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -51,7 +51,7 @@ class DanaRPump @Inject constructor(
     var isNewPump = true // R only , providing model info
     var password = -1 // R, RSv1
     var pumpTime: Long = 0
-    var btModel = 0
+    var hwModel = 0
     var protocol = 0
     var productCode = 0
     var errorState: ErrorState = ErrorState.NONE
@@ -227,6 +227,21 @@ class DanaRPump @Inject constructor(
         lastSettingsRead = 0
     }
 
+    fun modelFriendlyName(): String =
+        when (hwModel) {
+            0x01 -> "DanaR Korean"
+            0x03 ->
+                if (protocol == 0x00) "DanaR old"
+                else if (protocol == 0x02) "DanaR v2"
+                else "DanaR" // 0x01 and 0x03 known
+            0x05 ->
+                if (protocol < 10) "DanaRS"
+                else "DanaRS v3"
+            0x06 -> "DanaRS Korean"
+            0x07 -> "Dana-i"
+            else -> "Unknown Dana pump"
+        }
+
     companion object {
         const val UNITS_MGDL = 0
         const val UNITS_MMOL = 1
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
index 3cc8701a38..f573ef0475 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
@@ -19,14 +19,14 @@ class MsgCheckValue(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.btModel = intFromBuff(bytes, 0, 1)
+        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.btModel != DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
index 412d13cf3d..1742c4b1dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
@@ -21,14 +21,14 @@ class MsgCheckValue_k(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.btModel = intFromBuff(bytes, 0, 1)
+        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.btModel != DanaRPump.DOMESTIC_MODEL) {
+        if (danaRPump.hwModel != DanaRPump.DOMESTIC_MODEL) {
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index 5646c6f370..be57043e89 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -30,14 +30,14 @@ class DanaRS_Packet_General_Get_Pump_Check(
             failed = false
         var dataIndex = DATA_START
         var dataSize = 1
-        danaRPump.btModel = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaRPump.hwModel = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         danaRPump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         danaRPump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
         if (danaRPump.productCode < 2) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
index 87628c0d1a..7d0b2b5e53 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
@@ -38,10 +38,10 @@ class MsgCheckValue_v2(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.btModel = intFromBuff(bytes, 0, 1)
+        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.btModel != DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
             danaRPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
@@ -74,7 +74,7 @@ class MsgCheckValue_v2(
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.btModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
         aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
         aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3ac901f44f..86b7c02cbc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -485,7 +485,7 @@
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
     <string name="advancedsettings_title">Advanced Settings</string>
     <string name="key_advancedsettings" translatable="false">key_advancedsettings</string>
-    <string name="danar_model">Model: %1$02X Protocol: %2$02X Code: %3$02X</string>
+    <string name="danar_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
     <string name="profile">Profile</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3 This is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4 This is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index b9d959c631..2b5058241d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -20,6 +20,6 @@ class MsgCheckValueTest : DanaRTestBase() {
         val array = ByteArray(100)
         putByteToArray(array, 0, DanaRPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.btModel)
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index 77bf756890..4bd8ad6e57 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -33,6 +33,6 @@ class MsgCheckValue_v2Test : DanaRTestBase() {
         val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.btModel)
+        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
     }
 }
\ No newline at end of file

From df03a8a2c014b025d0d1236780bc627f2b5ec064 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 29 Mar 2020 11:40:57 +0200
Subject: [PATCH 011/400] DanaRSPlugin, DanaRSService -> kt, allign with R code

---
 .../interfaces/PumpDescription.java           |   5 +
 .../smsCommunicator/SmsCommunicatorPlugin.kt  |   2 +-
 .../plugins/pump/danaR/DanaRPlugin.java       |   2 +-
 .../plugins/pump/danaR/DanaRPump.kt           |   8 +-
 .../plugins/pump/danaR/comm/MsgBolusStart.kt  |   3 +-
 .../pump/danaR/comm/MsgBolusStartWithSpeed.kt |   3 +-
 .../pump/danaRKorean/DanaRKoreanPlugin.java   |   2 +-
 .../plugins/pump/danaRS/DanaRSPlugin.java     | 843 ------------------
 .../plugins/pump/danaRS/DanaRSPlugin.kt       | 658 ++++++++++++++
 .../danaRS/comm/DanaRSMessageHashTable.kt     |  11 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  11 +-
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |  12 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |  12 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |  14 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |  14 +-
 .../plugins/pump/danaRS/services/BLEComm.kt   |   3 +-
 .../pump/danaRS/services/DanaRSService.java   | 565 ------------
 .../pump/danaRS/services/DanaRSService.kt     | 462 ++++++++++
 .../plugins/pump/danaRv2/DanaRv2Plugin.java   |   2 +-
 .../danaRS/comm/DanaRSMessageHashTableTest.kt |   7 +-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |   5 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |   2 +-
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |   7 +-
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |   9 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |   4 +-
 25 files changed, 1187 insertions(+), 1479 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
index e4a02883e8..65e735e53a 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
@@ -15,6 +15,11 @@ public class PumpDescription {
         resetSettings();
     }
 
+   public PumpDescription (PumpType pumpType) {
+        this();
+        setPumpDescription(pumpType);
+    }
+
     public static final int NONE = 0;
     public static final int PERCENT = 0x01;
     public static final int ABSOLUTE = 0x02;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 78a0bf0ffc..7019a2a65d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -709,7 +709,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 return
             }
-            time = midnight + T.secs(seconds.toLong()).msecs()
+            time = midnight + T.secs(seconds.toLong()).msecs() // TODO: this is wrong during leap day
         }
         grams = constraintChecker.applyCarbsConstraints(Constraint(grams)).value()
         if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index 3c6ce84c42..91fa4207b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -165,7 +165,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index 213efac04d..b9a5509b54 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -141,15 +141,15 @@ class DanaRPump @Inject constructor(
         return if (units == UNITS_MGDL) Constants.MGDL else Constants.MMOL
     }
 
-    // DanaR,Rv2,RK specific flags
-    // last start bolus erroCode
-    var messageStartErrorCode: Int = 0
-    var historyDoneReceived: Boolean = false
+    var bolusStartErrorCode: Int = 0 // last start bolus erroCode
+    var historyDoneReceived: Boolean = false // true when last history message is received
     var bolusingTreatment: Treatment? = null // actually delivered treatment
     var bolusAmountToBeDelivered = 0.0 // amount to be delivered
     var bolusProgressLastTimeStamp: Long = 0 // timestamp of last bolus progress message
     var bolusStopped = false // bolus finished
     var bolusStopForced = false // bolus forced to stop by user
+    var bolusDone = false // success end
+    var lastEventTimeLoaded: Long = 0 // timestamp of last received event
 
     fun createConvertedProfile(): ProfileStore? {
         pumpProfiles?.let {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
index 695c3f1ec0..320d8b85d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
@@ -4,7 +4,6 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 
 class MsgBolusStart(
@@ -31,6 +30,6 @@ class MsgBolusStart(
             failed = false
             aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
         }
-        danaRPump.messageStartErrorCode = errorCode
+        danaRPump.bolusStartErrorCode = errorCode
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
index 3ea3eed8f1..2925172735 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
@@ -4,7 +4,6 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 
 class MsgBolusStartWithSpeed(
@@ -33,6 +32,6 @@ class MsgBolusStartWithSpeed(
             failed = false
             aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
         }
-        danaRPump.messageStartErrorCode = errorCode
+        danaRPump.bolusStartErrorCode = errorCode
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 809cf77e6f..4ae99b25e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -168,7 +168,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
+                result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
deleted file mode 100644
index 35f1e81a21..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ /dev/null
@@ -1,843 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-
-import androidx.annotation.NonNull;
-import androidx.preference.Preference;
-
-import org.jetbrains.annotations.NotNull;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.DetailedBolusInfo;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.db.ExtendedBolus;
-import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventConfigBuilderChange;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.Constraint;
-import info.nightscout.androidaps.interfaces.ConstraintsInterface;
-import info.nightscout.androidaps.interfaces.DanaRInterface;
-import info.nightscout.androidaps.interfaces.PluginDescription;
-import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.interfaces.PumpPluginBase;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
-import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
-import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
-import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DecimalFormatter;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.Round;
-import info.nightscout.androidaps.utils.T;
-import info.nightscout.androidaps.utils.ToastUtils;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-@Singleton
-public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-    private final Context context;
-    private final ResourceHelper resourceHelper;
-    private final ConstraintChecker constraintChecker;
-    private final ProfileFunction profileFunction;
-    private final TreatmentsPlugin treatmentsPlugin;
-    private final SP sp;
-    private final RxBusWrapper rxBus;
-    private final DanaRPump danaRPump;
-    private final DetailedBolusInfoStorage detailedBolusInfoStorage;
-    private final FabricPrivacy fabricPrivacy;
-
-    private DanaRSService danaRSService;
-
-    private String mDeviceAddress = "";
-    public String mDeviceName = "";
-
-    public PumpDescription pumpDescription = new PumpDescription();
-
-    // Bolus & history handling
-    public int bolusStartErrorCode; // from start message
-    public Treatment bolusingTreatment; // actually delivered treatment
-    public double bolusAmountToBeDelivered = 0.0; // amount to be delivered
-    public boolean bolusStopped = false; // bolus finished
-    public boolean bolusStopForced = false; // bolus forced to stop by user
-    public boolean bolusDone = false; // success end
-    public long bolusProgressLastTimeStamp = 0; // timestamp of last bolus progress message
-    public boolean apsHistoryDone = false; // true when last history message is received
-    public long lastEventTimeLoaded = 0; // timestamp of last received event
-
-    @Inject
-    public DanaRSPlugin(
-            HasAndroidInjector injector,
-            AAPSLogger aapsLogger,
-            RxBusWrapper rxBus,
-            Context context,
-            ResourceHelper resourceHelper,
-            ConstraintChecker constraintChecker,
-            ProfileFunction profileFunction,
-            TreatmentsPlugin treatmentsPlugin,
-            SP sp,
-            CommandQueueProvider commandQueue,
-            DanaRPump danaRPump,
-            DetailedBolusInfoStorage detailedBolusInfoStorage,
-            FabricPrivacy fabricPrivacy
-    ) {
-        super(new PluginDescription()
-                        .mainType(PluginType.PUMP)
-                        .fragmentClass(DanaRFragment.class.getName())
-                        .pluginName(R.string.danarspump)
-                        .shortName(R.string.danarspump_shortname)
-                        .preferencesId(R.xml.pref_danars)
-                        .description(R.string.description_pump_dana_rs),
-                injector, aapsLogger, resourceHelper, commandQueue
-        );
-        this.context = context;
-        this.rxBus = rxBus;
-        this.resourceHelper = resourceHelper;
-        this.constraintChecker = constraintChecker;
-        this.profileFunction = profileFunction;
-        this.treatmentsPlugin = treatmentsPlugin;
-        this.sp = sp;
-        this.danaRPump = danaRPump;
-        this.detailedBolusInfoStorage = detailedBolusInfoStorage;
-        this.fabricPrivacy = fabricPrivacy;
-
-        pumpDescription.setPumpDescription(PumpType.DanaRS);
-    }
-
-    @Override
-    public void updatePreferenceSummary(@NotNull Preference pref) {
-        super.updatePreferenceSummary(pref);
-
-        if (pref.getKey().equals(resourceHelper.gs(R.string.key_danars_name)))
-            pref.setSummary(sp.getString(R.string.key_danars_name, ""));
-    }
-
-    @Override
-    protected void onStart() {
-        Intent intent = new Intent(context, DanaRSService.class);
-        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-
-        disposable.add(rxBus
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
-        );
-        disposable.add(rxBus
-                .toObservable(EventConfigBuilderChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> danaRPump.reset())
-        );
-        disposable.add(rxBus
-                .toObservable(EventDanaRSDeviceChange.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> changePump(), fabricPrivacy::logException)
-        );
-        changePump(); // load device name
-        super.onStart();
-    }
-
-    @Override
-    protected void onStop() {
-        context.unbindService(mConnection);
-
-        disposable.clear();
-        super.onStop();
-    }
-
-    private ServiceConnection mConnection = new ServiceConnection() {
-
-        public void onServiceDisconnected(ComponentName name) {
-            getAapsLogger().debug(LTag.PUMP, "Service is disconnected");
-            danaRSService = null;
-        }
-
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            getAapsLogger().debug(LTag.PUMP, "Service is connected");
-            DanaRSService.LocalBinder mLocalBinder = (DanaRSService.LocalBinder) service;
-            danaRSService = mLocalBinder.getServiceInstance();
-        }
-    };
-
-    public void changePump() {
-        mDeviceAddress = sp.getString(R.string.key_danars_address, "");
-        mDeviceName = sp.getString(R.string.key_danars_name, "");
-        danaRPump.reset();
-        getCommandQueue().readStatus("DeviceChanged", null);
-    }
-
-    @Override
-    public void connect(String from) {
-        getAapsLogger().debug(LTag.PUMP, "RS connect from: " + from);
-        if (danaRSService != null && !mDeviceAddress.equals("") && !mDeviceName.equals("")) {
-            boolean success = danaRSService.connect(from, mDeviceAddress);
-            if (!success)
-                ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported));
-        }
-    }
-
-    @Override
-    public boolean isConnected() {
-        return danaRSService != null && danaRSService.isConnected();
-    }
-
-    @Override
-    public boolean isConnecting() {
-        return danaRSService != null && danaRSService.isConnecting();
-    }
-
-    @Override
-    public boolean isHandshakeInProgress() {
-        return false;
-    }
-
-    @Override
-    public void finishHandshaking() {
-    }
-
-    @Override
-    public void disconnect(String from) {
-        getAapsLogger().debug(LTag.PUMP, "RS disconnect from: " + from);
-        if (danaRSService != null) danaRSService.disconnect(from);
-    }
-
-    @Override
-    public void stopConnecting() {
-        if (danaRSService != null) danaRSService.stopConnecting();
-    }
-
-    @Override
-    public void getPumpStatus() {
-        if (danaRSService != null) {
-            danaRSService.getPumpStatus();
-            pumpDescription.basalStep = danaRPump.getBasalStep();
-            pumpDescription.bolusStep = danaRPump.getBolusStep();
-        }
-    }
-
-    // DanaR interface
-
-    @Override
-    public PumpEnactResult loadHistory(byte type) {
-        return danaRSService.loadHistory(type);
-    }
-
-    @Override
-    public PumpEnactResult loadEvents() {
-        return danaRSService.loadEvents();
-    }
-
-    @Override
-    public PumpEnactResult setUserOptions() {
-        return danaRSService.setUserSettings();
-    }
-
-    // Constraints interface
-
-    @NonNull
-    @Override
-    public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
-        absoluteRate.setIfSmaller(getAapsLogger(), danaRPump.getMaxBasal(), resourceHelper.gs(R.string.limitingbasalratio, danaRPump.getMaxBasal(), resourceHelper.gs(R.string.pumplimit)), this);
-        return absoluteRate;
-    }
-
-    @NonNull
-    @Override
-    public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, @NonNull Profile profile) {
-        percentRate.setIfGreater(getAapsLogger(), 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this);
-        percentRate.setIfSmaller(getAapsLogger(), getPumpDescription().maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, getPumpDescription().maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this);
-
-        return percentRate;
-    }
-
-
-    @NonNull
-    @Override
-    public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(getAapsLogger(), danaRPump.getMaxBolus(), resourceHelper.gs(R.string.limitingbolus, danaRPump.getMaxBolus(), resourceHelper.gs(R.string.pumplimit)), this);
-        return insulin;
-    }
-
-    @NonNull
-    @Override
-    public Constraint<Double> applyExtendedBolusConstraints(@NonNull Constraint<Double> insulin) {
-        return applyBolusConstraints(insulin);
-    }
-
-    // Pump interface
-
-    @Override
-    public boolean isInitialized() {
-        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0;
-    }
-
-    @Override
-    public boolean isSuspended() {
-        return danaRPump.getPumpSuspended();
-    }
-
-    @Override
-    public boolean isBusy() {
-        if (danaRSService == null) return false;
-        return danaRSService.isConnected() || danaRSService.isConnecting();
-    }
-
-    @NonNull @Override
-    public PumpEnactResult setNewBasalProfile(Profile profile) {
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-
-        if (danaRSService == null) {
-            getAapsLogger().error("setNewBasalProfile sExecutionService is null");
-            result.comment = "setNewBasalProfile sExecutionService is null";
-            return result;
-        }
-        if (!isInitialized()) {
-            getAapsLogger().error("setNewBasalProfile not initialized");
-            Notification notification = new Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT);
-            rxBus.send(new EventNewNotification(notification));
-            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet);
-            return result;
-        } else {
-            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-        }
-        if (!danaRSService.updateBasalsInPump(profile)) {
-            Notification notification = new Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT);
-            rxBus.send(new EventNewNotification(notification));
-            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile);
-            return result;
-        } else {
-            rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED));
-            rxBus.send(new EventDismissNotification(Notification.FAILED_UDPATE_PROFILE));
-            Notification notification = new Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60);
-            rxBus.send(new EventNewNotification(notification));
-            result.success = true;
-            result.enacted = true;
-            result.comment = "OK";
-            return result;
-        }
-    }
-
-    @Override
-    public boolean isThisProfileSet(Profile profile) {
-        if (!isInitialized())
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (danaRPump.getPumpProfiles() == null)
-            return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = danaRPump.getBasal48Enable() ? 48 : 24;
-        int basalIncrement = danaRPump.getBasal48Enable() ? 30 * 60 : 60 * 60;
-        for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = danaRPump.getPumpProfiles()[danaRPump.getActiveProfile()][h];
-            Double profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement);
-            if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
-                getAapsLogger().debug(LTag.PUMP, "Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public long lastDataTime() {
-        return danaRPump.getLastConnection();
-    }
-
-    @Override
-    public double getBaseBasalRate() {
-        return danaRPump.getCurrentBasal();
-    }
-
-    @Override
-    public double getReservoirLevel() {
-        return danaRPump.getReservoirRemainingUnits();
-    }
-
-    @Override
-    public int getBatteryLevel() {
-        return danaRPump.getBatteryRemaining();
-    }
-
-    @NonNull @Override
-    public synchronized PumpEnactResult deliverTreatment(DetailedBolusInfo detailedBolusInfo) {
-        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(new Constraint<>(detailedBolusInfo.insulin)).value();
-        if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
-            int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
-            int speed = 12;
-            switch (preferencesSpeed) {
-                case 0:
-                    speed = 12;
-                    break;
-                case 1:
-                    speed = 30;
-                    break;
-                case 2:
-                    speed = 60;
-                    break;
-            }
-            // RS stores end time for bolus, we need to adjust time
-            // default delivery speed is 12 sec/U
-            detailedBolusInfo.date = DateUtil.now() + (long) (speed * detailedBolusInfo.insulin * 1000);
-            // clean carbs to prevent counting them as twice because they will picked up as another record
-            // I don't think it's necessary to copy DetailedBolusInfo right now for carbs records
-            double carbs = detailedBolusInfo.carbs;
-            detailedBolusInfo.carbs = 0;
-            int carbTime = detailedBolusInfo.carbTime;
-            if (carbTime == 0) carbTime--; // better set 1 min back to prevents clash with insulin
-            detailedBolusInfo.carbTime = 0;
-
-            detailedBolusInfoStorage.add(detailedBolusInfo); // will be picked up on reading history
-
-            Treatment t = new Treatment();
-            t.isSMB = detailedBolusInfo.isSMB;
-            boolean connectionOK = false;
-            if (detailedBolusInfo.insulin > 0 || carbs > 0)
-                connectionOK = danaRSService.bolus(detailedBolusInfo.insulin, (int) carbs, DateUtil.now() + T.mins(carbTime).msecs(), t);
-            PumpEnactResult result = new PumpEnactResult(getInjector());
-            result.success = connectionOK && Math.abs(detailedBolusInfo.insulin - t.insulin) < pumpDescription.bolusStep;
-            result.bolusDelivered = t.insulin;
-            result.carbsDelivered = detailedBolusInfo.carbs;
-            if (!result.success) {
-                String error = "" + bolusStartErrorCode;
-                switch (bolusStartErrorCode) {
-                    // 4 reported as max bolus violation. Check later
-                    case 0x10:
-                        error = resourceHelper.gs(R.string.maxbolusviolation);
-                        break;
-                    case 0x20:
-                        error = resourceHelper.gs(R.string.commanderror);
-                        break;
-                    case 0x40:
-                        error = resourceHelper.gs(R.string.speederror);
-                        break;
-                    case 0x80:
-                        error = resourceHelper.gs(R.string.insulinlimitviolation);
-                        break;
-                }
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error);
-            } else
-                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            getAapsLogger().debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
-            return result;
-        } else {
-            PumpEnactResult result = new PumpEnactResult(getInjector());
-            result.success = false;
-            result.bolusDelivered = 0d;
-            result.carbsDelivered = 0d;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
-            getAapsLogger().error("deliverTreatment: Invalid input");
-            return result;
-        }
-    }
-
-    @Override
-    public void stopBolusDelivering() {
-        if (danaRSService == null) {
-            getAapsLogger().error("stopBolusDelivering sExecutionService is null");
-            return;
-        }
-        danaRSService.bolusStop();
-    }
-
-    // This is called from APS
-    @NonNull @Override
-    public synchronized PumpEnactResult setTempBasalAbsolute(Double absoluteRate, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        // Recheck pump status if older than 30 min
-
-        //This should not be needed while using queue because connection should be done before calling this
-        //if (pump.lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis()) {
-        //    connect("setTempBasalAbsolute old data");
-        //}
-
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-
-        absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
-
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
-        final boolean doLowTemp = absoluteRate < getBaseBasalRate();
-        final boolean doHighTemp = absoluteRate > getBaseBasalRate();
-
-        if (doTempOff) {
-            // If temp in progress
-            if (treatmentsPlugin.isTempBasalInProgress()) {
-                getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
-                return cancelTempBasal(false);
-            }
-            result.success = true;
-            result.enacted = false;
-            result.percent = 100;
-            result.isPercent = true;
-            result.isTempCancel = true;
-            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK");
-            return result;
-        }
-
-        if (doLowTemp || doHighTemp) {
-            Integer percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
-            if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
-            else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
-            if (percentRate > 500) // Special high temp 500/15min
-                percentRate = 500;
-            // Check if some temp is already in progress
-            TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
-            if (activeTemp != null) {
-                getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: currently running: " + activeTemp.toString());
-                // Correct basal already set ?
-                if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
-                    if (!enforceNew) {
-                        result.success = true;
-                        result.percent = percentRate;
-                        result.enacted = false;
-                        result.duration = activeTemp.getPlannedRemainingMinutes();
-                        result.isPercent = true;
-                        result.isTempCancel = false;
-                        getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)");
-                        return result;
-                    }
-                }
-            }
-            // Convert duration from minutes to hours
-            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal " + percentRate + "% for " + durationInMinutes + " mins (doLowTemp || doHighTemp)");
-            if (percentRate == 0 && durationInMinutes > 30) {
-                result = setTempBasalPercent(percentRate, durationInMinutes, profile, enforceNew);
-            } else {
-                // use special APS temp basal call ... 100+/15min .... 100-/30min
-                result = setHighTempBasalPercent(percentRate);
-            }
-            if (!result.success) {
-                getAapsLogger().error("setTempBasalAbsolute: Failed to set hightemp basal");
-                return result;
-            }
-            getAapsLogger().debug(LTag.PUMP, "setTempBasalAbsolute: hightemp basal set ok");
-            return result;
-        }
-        // We should never end here
-        getAapsLogger().error("setTempBasalAbsolute: Internal error");
-        result.success = false;
-        result.comment = "Internal error";
-        return result;
-    }
-
-    @NonNull @Override
-    public synchronized PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = danaRPump;
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-        percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
-        if (percent < 0) {
-            result.isTempCancel = false;
-            result.enacted = false;
-            result.success = false;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
-            getAapsLogger().error("setTempBasalPercent: Invalid input");
-            return result;
-        }
-        if (percent > getPumpDescription().maxTempPercent)
-            percent = getPumpDescription().maxTempPercent;
-        long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(now);
-        if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
-            result.enacted = false;
-            result.success = true;
-            result.isTempCancel = false;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            result.duration = pump.getTempBasalRemainingMin();
-            result.percent = pump.getTempBasalPercent();
-            result.isPercent = true;
-            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: Correct value already set");
-            return result;
-        }
-        boolean connectionOK;
-        if (durationInMinutes == 15 || durationInMinutes == 30) {
-            connectionOK = danaRSService.tempBasalShortDuration(percent, durationInMinutes);
-        } else {
-            int durationInHours = Math.max(durationInMinutes / 60, 1);
-            connectionOK = danaRSService.tempBasal(percent, durationInHours);
-        }
-        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.getTempBasalRemainingMin();
-            result.percent = pump.getTempBasalPercent();
-            result.isPercent = true;
-            getAapsLogger().debug(LTag.PUMP, "setTempBasalPercent: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror);
-        getAapsLogger().error("setTempBasalPercent: Failed to set temp basal");
-        return result;
-    }
-
-    private synchronized PumpEnactResult setHighTempBasalPercent(Integer percent) {
-        DanaRPump pump = danaRPump;
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-        boolean connectionOK = danaRSService.highTempBasal(percent);
-        if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.getTempBasalRemainingMin();
-            result.percent = pump.getTempBasalPercent();
-            result.isPercent = true;
-            getAapsLogger().debug(LTag.PUMP, "setHighTempBasalPercent: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
-        getAapsLogger().error("setHighTempBasalPercent: Failed to set temp basal");
-        return result;
-    }
-
-    @NonNull @Override
-    public synchronized PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        DanaRPump pump = danaRPump;
-        insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
-        // needs to be rounded
-        int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
-        insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = false;
-            result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            result.duration = pump.getExtendedBolusRemainingMinutes();
-            result.absolute = pump.getExtendedBolusAbsoluteRate();
-            result.isPercent = false;
-            result.isTempCancel = false;
-            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + pump.getExtendedBolusAmount() + " Asked: " + insulin);
-            return result;
-        }
-        boolean connectionOK = danaRSService.extendedBolus(insulin, durationInHalfHours);
-        if (connectionOK && pump.isExtendedInProgress() && Math.abs(pump.getExtendedBolusAbsoluteRate() - insulin) < getPumpDescription().extendedBolusStep) {
-            result.enacted = true;
-            result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            result.isTempCancel = false;
-            result.duration = pump.getExtendedBolusRemainingMinutes();
-            result.absolute = pump.getExtendedBolusAbsoluteRate();
-            result.bolusDelivered = pump.getExtendedBolusAmount();
-            result.isPercent = false;
-            getAapsLogger().debug(LTag.PUMP, "setExtendedBolus: OK");
-            return result;
-        }
-        result.enacted = false;
-        result.success = false;
-        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
-        getAapsLogger().error("setExtendedBolus: Failed to extended bolus");
-        return result;
-    }
-
-    @NonNull @Override
-    public synchronized PumpEnactResult cancelTempBasal(boolean force) {
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
-        if (runningTB != null) {
-            danaRSService.tempBasalStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!danaRPump.isTempBasalInProgress()) {
-            result.success = true;
-            result.isTempCancel = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            getAapsLogger().debug(LTag.PUMP, "cancelRealTempBasal: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
-            result.isTempCancel = true;
-            getAapsLogger().error("cancelRealTempBasal: Failed to cancel temp basal");
-            return result;
-        }
-    }
-
-    @NonNull @Override
-    public synchronized PumpEnactResult cancelExtendedBolus() {
-        PumpEnactResult result = new PumpEnactResult(getInjector());
-        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (runningEB != null) {
-            danaRSService.extendedBolusStop();
-            result.enacted = true;
-            result.isTempCancel = true;
-        }
-        if (!danaRPump.isExtendedInProgress()) {
-            result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
-            getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");
-            return result;
-        } else {
-            result.success = false;
-            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly);
-            getAapsLogger().error("cancelExtendedBolus: Failed to cancel extended bolus");
-            return result;
-        }
-    }
-
-    @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
-        DanaRPump pump = danaRPump;
-        long now = System.currentTimeMillis();
-        if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return new JSONObject();
-        }
-        JSONObject pumpjson = new JSONObject();
-        JSONObject battery = new JSONObject();
-        JSONObject status = new JSONObject();
-        JSONObject extended = new JSONObject();
-        try {
-            battery.put("percent", pump.getBatteryRemaining());
-            status.put("status", pump.getPumpSuspended() ? "suspended" : "normal");
-            status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
-            if (pump.getLastBolusTime() != 0) {
-                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.getLastBolusTime()));
-                extended.put("LastBolusAmount", pump.getLastBolusAmount());
-            }
-            TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
-            if (tb != null) {
-                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
-                extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
-            }
-            ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
-            if (eb != null) {
-                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
-                extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
-            }
-            extended.put("BaseBasalRate", getBaseBasalRate());
-            try {
-                extended.put("ActiveProfile", profileFunction.getProfileName());
-            } catch (Exception e) {
-                getAapsLogger().error("Unhandled exception", e);
-            }
-
-            pumpjson.put("battery", battery);
-            pumpjson.put("status", status);
-            pumpjson.put("extended", extended);
-            pumpjson.put("reservoir", (int) pump.getReservoirRemainingUnits());
-            pumpjson.put("clock", DateUtil.toISOString(now));
-        } catch (JSONException e) {
-            getAapsLogger().error("Unhandled exception", e);
-        }
-        return pumpjson;
-    }
-
-    @NonNull @Override
-    public ManufacturerType manufacturer() {
-        return ManufacturerType.Sooil;
-    }
-
-    @NonNull @Override
-    public PumpType model() {
-        return PumpType.DanaRS;
-    }
-
-    @NonNull @Override
-    public String serialNumber() {
-        return danaRPump.getSerialNumber();
-    }
-
-    @NonNull @Override
-    public PumpDescription getPumpDescription() {
-        return pumpDescription;
-    }
-
-    @NonNull @Override
-    public String shortStatus(boolean veryShort) {
-        DanaRPump pump = danaRPump;
-        String ret = "";
-        if (pump.getLastConnection() != 0) {
-            long agoMsec = System.currentTimeMillis() - pump.getLastConnection();
-            int agoMin = (int) (agoMsec / 60d / 1000d);
-            ret += "LastConn: " + agoMin + " minago\n";
-        }
-        if (pump.getLastBolusTime() != 0) {
-            ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.getLastBolusAmount()) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.getLastBolusTime()) + "\n";
-        }
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis());
-        if (activeTemp != null) {
-            ret += "Temp: " + activeTemp.toStringFull() + "\n";
-        }
-        ExtendedBolus activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
-        if (activeExtendedBolus != null) {
-            ret += "Extended: " + activeExtendedBolus.toString() + "\n";
-        }
-        if (!veryShort) {
-            ret += "TDD: " + DecimalFormatter.to0Decimal(pump.getDailyTotalUnits()) + " / " + pump.getMaxDailyTotalUnits() + " U\n";
-        }
-        ret += "Reserv: " + DecimalFormatter.to0Decimal(pump.getReservoirRemainingUnits()) + "U\n";
-        ret += "Batt: " + pump.getBatteryRemaining() + "\n";
-        return ret;
-    }
-
-    @Override
-    public boolean isFakingTempsByExtendedBoluses() {
-        return false;
-    }
-
-    @NonNull @Override
-    public PumpEnactResult loadTDDs() {
-        return loadHistory(RecordTypes.RECORD_TYPE_DAILY);
-    }
-
-    @Override
-    public List<CustomAction> getCustomActions() {
-        return null;
-    }
-
-    @Override
-    public void executeCustomAction(CustomActionType customActionType) {
-
-    }
-
-    @Override
-    public boolean canHandleDST() {
-        return false;
-    }
-
-    @Override
-    public void timeDateOrTimeZoneChanged() {
-
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
new file mode 100644
index 0000000000..fdfb55ca5a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
@@ -0,0 +1,658 @@
+package info.nightscout.androidaps.plugins.pump.danaRS
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.text.format.DateFormat
+import androidx.preference.Preference
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.BuildConfig
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.common.ManufacturerType
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
+import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
+import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.abs
+import kotlin.math.max
+
+@Singleton
+class DanaRSPlugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    resourceHelper: ResourceHelper,
+    private val constraintChecker: ConstraintChecker,
+    private val profileFunction: ProfileFunction,
+    private val treatmentsPlugin: TreatmentsPlugin,
+    private val sp: SP,
+    commandQueue: CommandQueueProvider,
+    private val danaRPump: DanaRPump,
+    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    private val fabricPrivacy: FabricPrivacy
+) : PumpPluginBase(PluginDescription()
+    .mainType(PluginType.PUMP)
+    .fragmentClass(DanaRFragment::class.java.name)
+    .pluginName(R.string.danarspump)
+    .shortName(R.string.danarspump_shortname)
+    .preferencesId(R.xml.pref_danars)
+    .description(R.string.description_pump_dana_rs),
+    injector, aapsLogger, resourceHelper, commandQueue
+), PumpInterface, DanaRInterface, ConstraintsInterface {
+
+    private val disposable = CompositeDisposable()
+    private var danaRSService: DanaRSService? = null
+    private var mDeviceAddress = ""
+    var mDeviceName = ""
+    private var pumpDesc = PumpDescription(PumpType.DanaRS)
+
+    override fun updatePreferenceSummary(pref: Preference) {
+        super.updatePreferenceSummary(pref)
+        if (pref.key == resourceHelper.gs(R.string.key_danars_name)) pref.summary = sp.getString(R.string.key_danars_name, "")
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val intent = Intent(context, DanaRSService::class.java)
+        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ context.unbindService(mConnection) }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventConfigBuilderChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe { danaRPump.reset() }
+        )
+        disposable.add(rxBus
+            .toObservable(EventDanaRSDeviceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ changePump() }) { fabricPrivacy.logException(it) }
+        )
+        changePump() // load device name
+    }
+
+    override fun onStop() {
+        context.unbindService(mConnection)
+        disposable.clear()
+        super.onStop()
+    }
+
+    private val mConnection: ServiceConnection = object : ServiceConnection {
+        override fun onServiceDisconnected(name: ComponentName) {
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected")
+            danaRSService = null
+        }
+
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            aapsLogger.debug(LTag.PUMP, "Service is connected")
+            val mLocalBinder = service as DanaRSService.LocalBinder
+            danaRSService = mLocalBinder.serviceInstance
+        }
+    }
+
+    fun changePump() {
+        mDeviceAddress = sp.getString(R.string.key_danars_address, "")
+        mDeviceName = sp.getString(R.string.key_danars_name, "")
+        danaRPump.reset()
+        commandQueue.readStatus("DeviceChanged", null)
+    }
+
+    override fun connect(from: String) {
+        aapsLogger.debug(LTag.PUMP, "RS connect from: $from")
+        if (danaRSService != null && mDeviceAddress != "" && mDeviceName != "") {
+            val success = danaRSService?.connect(from, mDeviceAddress) ?: false
+            if (!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
+        }
+    }
+
+    override fun isConnected(): Boolean {
+        return danaRSService?.isConnected ?: false
+    }
+
+    override fun isConnecting(): Boolean {
+        return danaRSService?.isConnecting ?: false
+    }
+
+    override fun isHandshakeInProgress(): Boolean {
+        return false
+    }
+
+    override fun finishHandshaking() {}
+    override fun disconnect(from: String) {
+        aapsLogger.debug(LTag.PUMP, "RS disconnect from: $from")
+        danaRSService?.disconnect(from)
+    }
+
+    override fun stopConnecting() {
+        danaRSService?.stopConnecting()
+    }
+
+    override fun getPumpStatus() {
+        danaRSService?.readPumpStatus()
+        pumpDesc.basalStep = danaRPump.basalStep
+        pumpDesc.bolusStep = danaRPump.bolusStep
+    }
+
+    // DanaR interface
+    override fun loadHistory(type: Byte): PumpEnactResult {
+        return danaRSService?.loadHistory(type) ?:  PumpEnactResult(injector).success(false)
+    }
+
+    override fun loadEvents(): PumpEnactResult {
+        return danaRSService?.loadEvents() ?:  PumpEnactResult(injector).success(false)
+    }
+
+    override fun setUserOptions(): PumpEnactResult {
+        return danaRSService?.setUserSettings() ?:  PumpEnactResult(injector).success(false)
+    }
+
+    // Constraints interface
+    override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
+        absoluteRate.setIfSmaller(aapsLogger, danaRPump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, danaRPump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        return absoluteRate
+    }
+
+    override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
+        percentRate.setIfGreater(aapsLogger, 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this)
+        return percentRate
+    }
+
+    override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        insulin.setIfSmaller(aapsLogger, danaRPump.maxBolus, resourceHelper.gs(R.string.limitingbolus, danaRPump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        return insulin
+    }
+
+    override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        return applyBolusConstraints(insulin)
+    }
+
+    // Pump interface
+    override fun isInitialized(): Boolean {
+        return danaRPump.lastConnection > 0 && danaRPump.maxBasal > 0
+    }
+
+    override fun isSuspended(): Boolean {
+        return danaRPump.pumpSuspended
+    }
+
+    override fun isBusy(): Boolean {
+        return danaRSService?.isConnected ?: false || danaRSService?.isConnecting ?: false
+    }
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (!isInitialized) {
+            aapsLogger.error("setNewBasalProfile not initialized")
+            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet)
+            return result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+        }
+        return if (danaRSService?.updateBasalsInPump(profile) != true) {
+            val notification = Notification(Notification.FAILED_UDPATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile)
+            result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+            rxBus.send(EventDismissNotification(Notification.FAILED_UDPATE_PROFILE))
+            val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            rxBus.send(EventNewNotification(notification))
+            result.success = true
+            result.enacted = true
+            result.comment = "OK"
+            result
+        }
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        if (!isInitialized) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        if (danaRPump.pumpProfiles == null) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        val basalValues = if (danaRPump.basal48Enable) 48 else 24
+        val basalIncrement = if (danaRPump.basal48Enable) 30 * 60 else 60 * 60
+        for (h in 0 until basalValues) {
+            val pumpValue = danaRPump.pumpProfiles!![danaRPump.activeProfile][h]
+            val profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement)
+            if (abs(pumpValue - profileValue) > pumpDescription.basalStep) {
+                aapsLogger.debug(LTag.PUMP, "Diff found. Hour: $h Pump: $pumpValue Profile: $profileValue")
+                return false
+            }
+        }
+        return true
+    }
+
+    override fun lastDataTime(): Long {
+        return danaRPump.lastConnection
+    }
+
+    override fun getBaseBasalRate(): Double {
+        return danaRPump.currentBasal
+    }
+
+    override fun getReservoirLevel(): Double {
+        return danaRPump.reservoirRemainingUnits
+    }
+
+    override fun getBatteryLevel(): Int {
+        return danaRPump.batteryRemaining
+    }
+
+    @Synchronized
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        return if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
+            val preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0)
+            var speed = 12
+            when (preferencesSpeed) {
+                0 -> speed = 12
+                1 -> speed = 30
+                2 -> speed = 60
+            }
+            // RS stores end time for bolus, we need to adjust time
+            // default delivery speed is 12 sec/U
+            detailedBolusInfo.date = DateUtil.now() + (speed * detailedBolusInfo.insulin * 1000).toLong()
+            // clean carbs to prevent counting them as twice because they will picked up as another record
+            // I don't think it's necessary to copy DetailedBolusInfo right now for carbs records
+            val carbs = detailedBolusInfo.carbs
+            detailedBolusInfo.carbs = 0.0
+            var carbTime = detailedBolusInfo.carbTime
+            if (carbTime == 0) carbTime-- // better set 1 min back to prevents clash with insulin
+            detailedBolusInfo.carbTime = 0
+            detailedBolusInfoStorage.add(detailedBolusInfo) // will be picked up on reading history
+            val t = Treatment()
+            t.isSMB = detailedBolusInfo.isSMB
+            var connectionOK = false
+            if (detailedBolusInfo.insulin > 0 || carbs > 0) connectionOK = danaRSService?.bolus(detailedBolusInfo.insulin, carbs.toInt(), DateUtil.now() + T.mins(carbTime.toLong()).msecs(), t) ?: false
+            val result = PumpEnactResult(injector)
+            result.success = connectionOK && abs(detailedBolusInfo.insulin - t.insulin) < pumpDesc.bolusStep
+            result.bolusDelivered = t.insulin
+            result.carbsDelivered = detailedBolusInfo.carbs
+            if (!result.success) {
+                var error = "" + danaRPump.bolusStartErrorCode
+                when (danaRPump.bolusStartErrorCode) {
+                    0x10 -> error = resourceHelper.gs(R.string.maxbolusviolation)
+                    0x20 -> error = resourceHelper.gs(R.string.commanderror)
+                    0x40 -> error = resourceHelper.gs(R.string.speederror)
+                    0x80 -> error = resourceHelper.gs(R.string.insulinlimitviolation)
+                }
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error)
+            } else result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
+            result
+        } else {
+            val result = PumpEnactResult(injector)
+            result.success = false
+            result.bolusDelivered = 0.0
+            result.carbsDelivered = 0.0
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput)
+            aapsLogger.error("deliverTreatment: Invalid input")
+            result
+        }
+    }
+
+    override fun stopBolusDelivering() {
+        danaRSService?.bolusStop()
+    }
+
+    // This is called from APS
+    @Synchronized
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+        var result = PumpEnactResult(injector)
+        val absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
+        val doLowTemp = absoluteAfterConstrain < baseBasalRate
+        val doHighTemp = absoluteAfterConstrain > baseBasalRate
+        if (doTempOff) {
+            // If temp in progress
+            if (treatmentsPlugin.isTempBasalInProgress) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)")
+                return cancelTempBasal(false)
+            }
+            result.success = true
+            result.enacted = false
+            result.percent = 100
+            result.isPercent = true
+            result.isTempCancel = true
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK")
+            return result
+        }
+        if (doLowTemp || doHighTemp) {
+            var percentRate = java.lang.Double.valueOf(absoluteAfterConstrain / baseBasalRate * 100).toInt()
+            percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
+            if (percentRate > 500) // Special high temp 500/15min
+                percentRate = 500
+            // Check if some temp is already in progress
+            val activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
+            if (activeTemp != null) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running: $activeTemp")
+                // Correct basal already set ?
+                if (activeTemp.percentRate == percentRate && activeTemp.plannedRemainingMinutes > 4) {
+                    if (!enforceNew) {
+                        result.success = true
+                        result.percent = percentRate
+                        result.enacted = false
+                        result.duration = activeTemp.plannedRemainingMinutes
+                        result.isPercent = true
+                        result.isTempCancel = false
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)")
+                        return result
+                    }
+                }
+            }
+            // Convert duration from minutes to hours
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal $percentRate% for $durationInMinutes mins (doLowTemp || doHighTemp)")
+            result = if (percentRate == 0 && durationInMinutes > 30) {
+                setTempBasalPercent(percentRate, durationInMinutes, profile, enforceNew)
+            } else {
+                // use special APS temp basal call ... 100+/15min .... 100-/30min
+                setHighTempBasalPercent(percentRate)
+            }
+            if (!result.success) {
+                aapsLogger.error("setTempBasalAbsolute: Failed to set hightemp basal")
+                return result
+            }
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: hightemp basal set ok")
+            return result
+        }
+        // We should never end here
+        aapsLogger.error("setTempBasalAbsolute: Internal error")
+        result.success = false
+        result.comment = "Internal error"
+        return result
+    }
+
+    @Synchronized
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
+        val pump = danaRPump
+        val result = PumpEnactResult(injector)
+        var percentAfterConstraint = constraintChecker.applyBasalPercentConstraints(Constraint(percent), profile).value()
+        if (percentAfterConstraint < 0) {
+            result.isTempCancel = false
+            result.enacted = false
+            result.success = false
+            result.comment = resourceHelper.gs(R.string.danar_invalidinput)
+            aapsLogger.error("setTempBasalPercent: Invalid input")
+            return result
+        }
+        if (percentAfterConstraint > pumpDescription.maxTempPercent) percentAfterConstraint = pumpDescription.maxTempPercent
+        val now = System.currentTimeMillis()
+        val activeTemp = treatmentsPlugin.getTempBasalFromHistory(now)
+        if (activeTemp != null && activeTemp.percentRate == percentAfterConstraint && activeTemp.plannedRemainingMinutes > 4 && !enforceNew) {
+            result.enacted = false
+            result.success = true
+            result.isTempCancel = false
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.duration = pump.tempBasalRemainingMin
+            result.percent = pump.tempBasalPercent
+            result.isPercent = true
+            aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set")
+            return result
+        }
+        val connectionOK: Boolean
+        connectionOK = if (durationInMinutes == 15 || durationInMinutes == 30) {
+            danaRSService?.tempBasalShortDuration(percentAfterConstraint, durationInMinutes) ?: false
+        } else {
+            val durationInHours = max(durationInMinutes / 60, 1)
+            danaRSService?.tempBasal(percentAfterConstraint, durationInHours) ?: false
+        }
+        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percentAfterConstraint) {
+            result.enacted = true
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.isTempCancel = false
+            result.duration = pump.tempBasalRemainingMin
+            result.percent = pump.tempBasalPercent
+            result.isPercent = true
+            aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: OK")
+            return result
+        }
+        result.enacted = false
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
+        aapsLogger.error("setTempBasalPercent: Failed to set temp basal")
+        return result
+    }
+
+    @Synchronized private fun setHighTempBasalPercent(percent: Int): PumpEnactResult {
+        val pump = danaRPump
+        val result = PumpEnactResult(injector)
+        val connectionOK = danaRSService?.highTempBasal(percent) ?: false
+        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+            result.enacted = true
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.isTempCancel = false
+            result.duration = pump.tempBasalRemainingMin
+            result.percent = pump.tempBasalPercent
+            result.isPercent = true
+            aapsLogger.debug(LTag.PUMP, "setHighTempBasalPercent: OK")
+            return result
+        }
+        result.enacted = false
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
+        aapsLogger.error("setHighTempBasalPercent: Failed to set temp basal")
+        return result
+    }
+
+    @Synchronized
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        val pump = danaRPump
+        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        // needs to be rounded
+        val durationInHalfHours = max(durationInMinutes / 30, 1)
+        insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
+        val result = PumpEnactResult(injector)
+        val runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        if (runningEB != null && abs(runningEB.insulin - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+            result.enacted = false
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.duration = pump.extendedBolusRemainingMinutes
+            result.absolute = pump.extendedBolusAbsoluteRate
+            result.isPercent = false
+            result.isTempCancel = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
+            return result
+        }
+        val connectionOK = danaRSService?.extendedBolus(insulinAfterConstraint, durationInHalfHours) ?: false
+        if (connectionOK && pump.isExtendedInProgress && abs(pump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+            result.enacted = true
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.isTempCancel = false
+            result.duration = pump.extendedBolusRemainingMinutes
+            result.absolute = pump.extendedBolusAbsoluteRate
+            result.bolusDelivered = pump.extendedBolusAmount
+            result.isPercent = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: OK")
+            return result
+        }
+        result.enacted = false
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
+        aapsLogger.error("setExtendedBolus: Failed to extended bolus")
+        return result
+    }
+
+    @Synchronized
+    override fun cancelTempBasal(force: Boolean): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        val runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
+        if (runningTB != null) {
+            danaRSService?.tempBasalStop()
+            result.enacted = true
+            result.isTempCancel = true
+        }
+        return if (!danaRPump.isTempBasalInProgress) {
+            result.success = true
+            result.isTempCancel = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
+            result
+        } else {
+            result.success = false
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
+            result.isTempCancel = true
+            aapsLogger.error("cancelRealTempBasal: Failed to cancel temp basal")
+            result
+        }
+    }
+
+    @Synchronized override fun cancelExtendedBolus(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        val runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        if (runningEB != null) {
+            danaRSService?.extendedBolusStop()
+            result.enacted = true
+            result.isTempCancel = true
+        }
+        return if (!danaRPump.isExtendedInProgress) {
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
+            result
+        } else {
+            result.success = false
+            result.comment = resourceHelper.gs(R.string.danar_valuenotsetproperly)
+            aapsLogger.error("cancelExtendedBolus: Failed to cancel extended bolus")
+            result
+        }
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String): JSONObject {
+        val pump = danaRPump
+        val now = System.currentTimeMillis()
+        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+            return JSONObject()
+        }
+        val pumpJson = JSONObject()
+        val battery = JSONObject()
+        val status = JSONObject()
+        val extended = JSONObject()
+        try {
+            battery.put("percent", pump.batteryRemaining)
+            status.put("status", if (pump.pumpSuspended) "suspended" else "normal")
+            status.put("timestamp", DateUtil.toISOString(pump.lastConnection))
+            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
+            if (pump.lastBolusTime != 0L) {
+                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.lastBolusTime))
+                extended.put("LastBolusAmount", pump.lastBolusAmount)
+            }
+            val tb = treatmentsPlugin.getTempBasalFromHistory(now)
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile))
+                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date))
+                extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
+            }
+            val eb = treatmentsPlugin.getExtendedBolusFromHistory(now)
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate())
+                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date))
+                extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
+            }
+            extended.put("BaseBasalRate", baseBasalRate)
+            try {
+                extended.put("ActiveProfile", profileFunction.getProfileName())
+            } catch (e: Exception) {
+                aapsLogger.error("Unhandled exception", e)
+            }
+            pumpJson.put("battery", battery)
+            pumpJson.put("status", status)
+            pumpJson.put("extended", extended)
+            pumpJson.put("reservoir", pump.reservoirRemainingUnits.toInt())
+            pumpJson.put("clock", DateUtil.toISOString(now))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return pumpJson
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return ManufacturerType.Sooil
+    }
+
+    override fun model(): PumpType {
+        return PumpType.DanaRS
+    }
+
+    override fun serialNumber(): String {
+        return danaRPump.serialNumber
+    }
+
+    override fun getPumpDescription(): PumpDescription {
+        return pumpDesc
+    }
+
+    override fun shortStatus(veryShort: Boolean): String {
+        val pump = danaRPump
+        var ret = ""
+        if (pump.lastConnection != 0L) {
+            val agoMillis = System.currentTimeMillis() - pump.lastConnection
+            val agoMin = (agoMillis / 60.0 / 1000.0).toInt()
+            ret += "LastConn: $agoMin minago\n"
+        }
+        if (pump.lastBolusTime != 0L)
+            ret += "LastBolus: ${DecimalFormatter.to2Decimal(pump.lastBolusAmount)}U @${DateFormat.format("HH:mm", pump.lastBolusTime)}"
+
+        val activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis())
+        if (activeTemp != null)
+            ret += "Temp: ${activeTemp.toStringFull()}"
+
+        val activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        if (activeExtendedBolus != null)
+            ret += "Extended: $activeExtendedBolus\n"
+
+        if (!veryShort) {
+            ret += "TDD: ${DecimalFormatter.to0Decimal(pump.dailyTotalUnits)} / ${pump.maxDailyTotalUnits} U"
+        }
+        ret += "Reserv: ${DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits)} U"
+        ret += "Batt: ${pump.batteryRemaining}"
+        return ret
+    }
+
+    override fun isFakingTempsByExtendedBoluses(): Boolean = false
+    override fun loadTDDs(): PumpEnactResult = loadHistory(RecordTypes.RECORD_TYPE_DAILY)
+    override fun getCustomActions(): List<CustomAction>? = null
+    override fun executeCustomAction(customActionType: CustomActionType) {}
+    override fun canHandleDST(): Boolean = false
+    override fun timeDateOrTimeZoneChanged() {}
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index 2f3b8b170a..4f3d86c51d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -18,7 +18,6 @@ class DanaRSMessageHashTable @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     danaRPump: DanaRPump,
-    danaRSPlugin: DanaRSPlugin,
     activePlugin: ActivePluginProvider,
     constraintChecker: ConstraintChecker,
     detailedBolusInfoStorage: DetailedBolusInfoStorage
@@ -62,16 +61,16 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger))
         put(DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger))
         put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump))
         put(DanaRS_Packet_Etc_Keep_Connection(aapsLogger))
         put(DanaRS_Packet_Etc_Set_History_Save(aapsLogger))
         put(DanaRS_Packet_General_Delivery_Status(aapsLogger))
         put(DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump))
         put(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
         put(DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper, rxBus))
-        put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
-        put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
+        put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRPump))
+        put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRPump))
         put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger))
         put(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
         put(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
@@ -99,7 +98,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
         // APS
         put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
-        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, 0))
+        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, 0))
         put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
         // v3
         put(DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 27b88c1380..97700ba30e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.ExtendedBolus
@@ -13,7 +12,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -23,7 +22,7 @@ open class DanaRS_Packet_APS_History_Events(
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
     private val activePlugin: ActivePluginProvider,
-    private val danaRSPlugin: DanaRSPlugin,
+    private val danaRPump: DanaRPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private var from: Long
 ) : DanaRS_Packet() {
@@ -50,7 +49,7 @@ open class DanaRS_Packet_APS_History_Events(
         min = cal[Calendar.MINUTE]
         sec = cal[Calendar.SECOND]
         aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(cal.timeInMillis))
-        danaRSPlugin.apsHistoryDone = false
+        danaRPump.historyDoneReceived = false
     }
 
     override fun getRequestParams(): ByteArray {
@@ -68,7 +67,7 @@ open class DanaRS_Packet_APS_History_Events(
         val recordCode = intFromBuff(data, 0, 1).toByte()
         // Last record
         if (recordCode == 0xFF.toByte()) {
-            danaRSPlugin.apsHistoryDone = true
+            danaRPump.historyDoneReceived = true
             aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
             return
         }
@@ -191,7 +190,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "UNKNOWN " + DateUtil.timeString(datetime)
             }
         }
-        if (datetime > danaRSPlugin.lastEventTimeLoaded) danaRSPlugin.lastEventTimeLoaded = datetime
+        if (datetime > danaRPump.lastEventTimeLoaded) danaRPump.lastEventTimeLoaded = datetime
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index ef14999e22..d9dc8f0d95 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -1,15 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     private val aapsLogger: AAPSLogger,
-    private val danaRSPlugin: DanaRSPlugin,
+    private val danaRPump: DanaRPump,
     constraintChecker: ConstraintChecker,
     private var amount: Double = 0.0,
     private var speed: Int = 0
@@ -34,12 +34,12 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     }
 
     override fun handleMessage(data: ByteArray) {
-        danaRSPlugin.bolusStartErrorCode = intFromBuff(data, 0, 1)
-        if (danaRSPlugin.bolusStartErrorCode == 0) {
+        danaRPump.bolusStartErrorCode = intFromBuff(data, 0, 1)
+        if (danaRPump.bolusStartErrorCode == 0) {
             failed = false
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
         } else {
-            aapsLogger.error("Result Error: ${danaRSPlugin.bolusStartErrorCode}")
+            aapsLogger.error("Result Error: ${danaRPump.bolusStartErrorCode}")
             failed = true
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index 462d639a0c..c5c1ace3b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -1,19 +1,19 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRSPlugin: DanaRSPlugin
+    private val danaRPump: DanaRPump
 ) : DanaRS_Packet() {
 
 
@@ -31,10 +31,10 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
             failed = true
         }
         val bolusingEvent = EventOverviewBolusProgress
-        danaRSPlugin.bolusStopped = true
-        if (!danaRSPlugin.bolusStopForced) {
+        danaRPump.bolusStopped = true
+        if (!danaRPump.bolusStopForced) {
             // delivery ended without user intervention
-            danaRSPlugin.bolusingTreatment.insulin = danaRSPlugin.bolusAmountToBeDelivered
+            danaRPump.bolusingTreatment?.insulin = danaRPump.bolusAmountToBeDelivered
             bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
             bolusingEvent.percent = 100
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index 03d884933b..c4e5d5a06d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
@@ -14,7 +14,7 @@ class DanaRS_Packet_Notify_Delivery_Complete(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRSPlugin: DanaRSPlugin
+    private val danaRPump: DanaRPump
 ) : DanaRS_Packet() {
 
     init {
@@ -25,12 +25,12 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 
     override fun handleMessage(data: ByteArray) {
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
-        danaRSPlugin.bolusingTreatment.insulin = deliveredInsulin
+        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
-        bolusingEvent.t = danaRSPlugin.bolusingTreatment
-        bolusingEvent.percent = min((deliveredInsulin / danaRSPlugin.bolusAmountToBeDelivered * 100).toInt(), 100)
-        danaRSPlugin.bolusDone = true
+        bolusingEvent.t = danaRPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
+        danaRPump.bolusDone = true
         rxBus.send(bolusingEvent)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin: $deliveredInsulin")
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index a63bad6f23..0a256ed088 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
@@ -14,7 +14,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRSPlugin: DanaRSPlugin
+    private val danaRPump: DanaRPump
 ) : DanaRS_Packet() {
 
 
@@ -25,12 +25,12 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
     override fun handleMessage(data: ByteArray) {
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
-        danaRSPlugin.bolusProgressLastTimeStamp = System.currentTimeMillis()
-        danaRSPlugin.bolusingTreatment.insulin = deliveredInsulin
+        danaRPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
+        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
-        bolusingEvent.t = danaRSPlugin.bolusingTreatment
-        bolusingEvent.percent = min((deliveredInsulin / danaRSPlugin.bolusAmountToBeDelivered * 100).toInt(), 100)
+        bolusingEvent.t = danaRPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         failed = bolusingEvent.percent < 100
         rxBus.send(bolusingEvent)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 9145cb6559..e691156d0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -615,9 +615,8 @@ class BLEComm @Inject internal constructor(
     }
 
     // the rest of packets
-    fun sendMessage(message: DanaRS_Packet?) {
+    fun sendMessage(message: DanaRS_Packet) {
         processedMessage = message
-        if (message == null) return
         val command = byteArrayOf(message.type.toByte(), message.opCode.toByte())
         val params = message.requestParams
         aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + " " + DanaRS_Packet.toHexString(command) + " " + DanaRS_Packet.toHexString(params))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
deleted file mode 100644
index 4affd0d7c1..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.services;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.IBinder;
-import android.os.SystemClock;
-
-import javax.inject.Inject;
-
-import dagger.android.DaggerService;
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.activities.ErrorHelperActivity;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.events.EventAppExit;
-import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
-import info.nightscout.androidaps.events.EventPumpStatusChanged;
-import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.interfaces.CommandQueueProvider;
-import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
-import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_History_Events;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Set_Event_History;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Basal_Rate;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Profile_Number;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Get_Temporary_Basal_State;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Profile_Basal_Rate;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Profile_Number;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Basal_Set_Temporary_Basal;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Bolus_Option;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_CIR_CF_Array;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Calculation_Information;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Extended_Bolus_State;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Get_Step_Bolus_Information;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Start;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Bolus_Set_Step_Bolus_Stop;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Pump_Check;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Shipping_Information;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Initial_Screen_Information;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Set_History_Upload_Mode;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Alarm;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Basal;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Blood_Glucose;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Bolus;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Carbohydrate;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Daily;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Prime;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Refill;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History_Suspend;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_Pump_Time;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_User_Option;
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_Pump_Time;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
-import info.nightscout.androidaps.queue.Callback;
-import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.T;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
-
-public class DanaRSService extends DaggerService {
-    @Inject HasAndroidInjector injector;
-    @Inject AAPSLogger aapsLogger;
-    @Inject RxBusWrapper rxBus;
-    @Inject SP sp;
-    @Inject ResourceHelper resourceHelper;
-    @Inject ProfileFunction profileFunction;
-    @Inject CommandQueueProvider commandQueue;
-    @Inject Context context;
-    @Inject DanaRSPlugin danaRSPlugin;
-    @Inject DanaRPump danaRPump;
-    @Inject DanaRSMessageHashTable danaRSMessageHashTable;
-    @Inject ActivePluginProvider activePlugin;
-    @Inject ConstraintChecker constraintChecker;
-    @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
-    @Inject BLEComm bleComm;
-    @Inject FabricPrivacy fabricPrivacy;
-
-    private CompositeDisposable disposable = new CompositeDisposable();
-
-
-    private IBinder mBinder = new LocalBinder();
-
-    private Treatment bolusingTreatment = null;
-
-    private long lastHistoryFetched = 0;
-    private long lastApproachingDailyLimit = 0;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        disposable.add(rxBus
-                .toObservable(EventAppExit.class)
-                .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    aapsLogger.debug(LTag.PUMPCOMM, "EventAppExit received");
-                    stopSelf();
-                }, fabricPrivacy::logException)
-        );
-    }
-
-    @Override
-    public void onDestroy() {
-        disposable.clear();
-        super.onDestroy();
-    }
-
-    public boolean isConnected() {
-        return bleComm.isConnected();
-    }
-
-    public boolean isConnecting() {
-        return bleComm.isConnecting();
-    }
-
-    public boolean connect(String from, String address) {
-        return bleComm.connect(from, address);
-    }
-
-    public void stopConnecting() {
-        bleComm.stopConnecting();
-    }
-
-    public void disconnect(String from) {
-        bleComm.disconnect(from);
-    }
-
-    @SuppressWarnings("unused")
-    public void sendMessage(DanaRS_Packet message) {
-        bleComm.sendMessage(message);
-    }
-
-    public void getPumpStatus() {
-        try {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-
-            bleComm.sendMessage(new DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump));
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus, bolusStep, maxBolus
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
-
-            danaRPump.setLastConnection(System.currentTimeMillis());
-
-            Profile profile = profileFunction.getProfile();
-            PumpInterface pump = activePlugin.getActivePump();
-            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)); // basal profile, basalStep, maxBasal
-                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
-                    rxBus.send(new EventProfileNeedsUpdate());
-                }
-            }
-
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
-
-            long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
-            if (danaRPump.getPumpTime() == 0) {
-                // initial handshake was not successfull
-                // deinitialize pump
-                danaRPump.reset();
-                rxBus.send(new EventDanaRNewStatus());
-                rxBus.send(new EventInitializationChanged());
-                return;
-            }
-            long now = System.currentTimeMillis();
-            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)); // serial no
-                bleComm.sendMessage(new DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)); // firmware
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump));
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)); // isExtendedEnabled
-                bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)); // basal profile, basalStep, maxBasal
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)); // target
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump));
-                bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)); // Getting user options
-                danaRPump.setLastSettingsRead(now);
-            }
-
-            aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds");
-            if (Math.abs(timeDiff) > 3) {
-                if (Math.abs(timeDiff) > 60 * 60 * 1.5) {
-                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds - large difference");
-                    //If time-diff is very large, warn user until we can synchronize history readings properly
-                    Intent i = new Intent(context, ErrorHelperActivity.class);
-                    i.putExtra("soundid", R.raw.error);
-                    i.putExtra("status", resourceHelper.gs(R.string.largetimediff));
-                    i.putExtra("title", resourceHelper.gs(R.string.largetimedifftitle));
-                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    context.startActivity(i);
-
-                    //deinitialize pump
-                    danaRPump.reset();
-                    rxBus.send(new EventDanaRNewStatus());
-                    rxBus.send(new EventInitializationChanged());
-                    return;
-                } else {
-                    if (danaRPump.getProtocol() >= 6) {
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now()));
-                    } else {
-                        waitForWholeMinute(); // Dana can set only whole minute
-                        // add 10sec to be sure we are over minute (will be cutted off anyway)
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now() + T.secs(10).msecs()));
-                    }
-                    bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
-                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
-                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds");
-                }
-            }
-
-            loadEvents();
-
-            rxBus.send(new EventDanaRNewStatus());
-            rxBus.send(new EventInitializationChanged());
-            //NSUpload.uploadDeviceStatus();
-            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
-                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
-                if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
-                    Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
-                    rxBus.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
-                    lastApproachingDailyLimit = System.currentTimeMillis();
-                }
-            }
-        } catch (Exception e) {
-            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception", e);
-        }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump status loaded");
-    }
-
-    public PumpEnactResult loadEvents() {
-
-        if (!danaRSPlugin.isInitialized()) {
-            PumpEnactResult result = new PumpEnactResult(injector).success(false);
-            result.comment = "pump not initialized";
-            return result;
-        }
-
-        SystemClock.sleep(1000);
-
-        DanaRS_Packet_APS_History_Events msg;
-        if (lastHistoryFetched == 0) {
-            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, 0);
-            aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history");
-        } else {
-            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, lastHistoryFetched);
-            aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
-        }
-        bleComm.sendMessage(msg);
-        while (!danaRSPlugin.apsHistoryDone && bleComm.isConnected()) {
-            SystemClock.sleep(100);
-        }
-        if (danaRSPlugin.lastEventTimeLoaded != 0)
-            lastHistoryFetched = danaRSPlugin.lastEventTimeLoaded - T.mins(1).msecs();
-        else
-            lastHistoryFetched = 0;
-        aapsLogger.debug(LTag.PUMPCOMM, "Events loaded");
-        danaRPump.setLastConnection(System.currentTimeMillis());
-        return new PumpEnactResult(injector).success(true);
-    }
-
-
-    public PumpEnactResult setUserSettings() {
-        bleComm.sendMessage(new DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump));
-        return new PumpEnactResult(injector).success(true);
-    }
-
-
-    public boolean bolus(final double insulin, int carbs, long carbtime, Treatment t) {
-        if (!isConnected()) return false;
-        if (BolusProgressDialog.stopPressed) return false;
-
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
-        bolusingTreatment = t;
-        final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
-        danaRSPlugin.bolusingTreatment = t;
-        danaRSPlugin.bolusAmountToBeDelivered = insulin;
-        danaRSPlugin.bolusStopped = false;
-        danaRSPlugin.bolusStopForced = false;
-        danaRSPlugin.bolusProgressLastTimeStamp = DateUtil.now();
-
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Start start = new DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker, insulin, preferencesSpeed);
-        if (carbs > 0) {
-//            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbtime, carbs); ####
-//            bleComm.sendMessage(msg);
-            DanaRS_Packet_APS_Set_Event_History msgSetHistoryEntry_v2 = new DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, carbtime, carbs, 0);
-            bleComm.sendMessage(msgSetHistoryEntry_v2);
-            lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
-        }
-
-        final long bolusStart = System.currentTimeMillis();
-        if (insulin > 0) {
-            if (!danaRSPlugin.bolusStopped) {
-                bleComm.sendMessage(start);
-            } else {
-                t.insulin = 0d;
-                return false;
-            }
-
-            while (!danaRSPlugin.bolusStopped && !start.failed && !danaRSPlugin.bolusDone) {
-                SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - danaRSPlugin.bolusProgressLastTimeStamp) > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
-                    danaRSPlugin.bolusStopped = true;
-                    danaRSPlugin.bolusStopForced = true;
-                    aapsLogger.debug(LTag.PUMPCOMM, "Communication stopped");
-                }
-            }
-        }
-
-        final EventOverviewBolusProgress bolusingEvent = EventOverviewBolusProgress.INSTANCE;
-        bolusingEvent.setT(t);
-        bolusingEvent.setPercent(99);
-
-        bolusingTreatment = null;
-        int speed = 12;
-        switch (preferencesSpeed) {
-            case 0:
-                speed = 12;
-                break;
-            case 1:
-                speed = 30;
-                break;
-            case 2:
-                speed = 60;
-                break;
-        }
-        long bolusDurationInMSec = (long) (insulin * speed * 1000);
-        long expectedEnd = bolusStart + bolusDurationInMSec + 2000;
-        while (System.currentTimeMillis() < expectedEnd) {
-            long waitTime = expectedEnd - System.currentTimeMillis();
-            bolusingEvent.setStatus(String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000));
-            rxBus.send(bolusingEvent);
-            SystemClock.sleep(1000);
-        }
-        // do not call loadEvents() directly, reconnection may be needed
-        commandQueue.loadEvents(new Callback() {
-            @Override
-            public void run() {
-                // reread bolus status
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus
-                bolusingEvent.setPercent(100);
-                rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
-            }
-        });
-        return !start.failed;
-    }
-
-    public void bolusStop() {
-        aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + (bolusingTreatment == null ? "" : bolusingTreatment.insulin));
-        DanaRS_Packet_Bolus_Set_Step_Bolus_Stop stop = new DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin);
-        danaRSPlugin.bolusStopForced = true;
-        if (isConnected()) {
-            bleComm.sendMessage(stop);
-            while (!danaRSPlugin.bolusStopped) {
-                bleComm.sendMessage(stop);
-                SystemClock.sleep(200);
-            }
-        } else {
-            danaRSPlugin.bolusStopped = true;
-        }
-    }
-
-    public boolean tempBasal(Integer percent, int durationInHours) {
-        if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
-            SystemClock.sleep(500);
-        }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, percent, durationInHours));
-        SystemClock.sleep(200);
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean highTempBasal(Integer percent) {
-        if (danaRPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
-            SystemClock.sleep(500);
-        }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean tempBasalShortDuration(Integer percent, int durationInMinutes) {
-        if (durationInMinutes != 15 && durationInMinutes != 30) {
-            aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param");
-            return false;
-        }
-
-        if (danaRPump.isTempBasalInProgress()) {
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
-            SystemClock.sleep(500);
-        }
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean tempBasalStop() {
-        if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean extendedBolus(Double insulin, int durationInHalfHours) {
-        if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, insulin, durationInHalfHours));
-        SystemClock.sleep(200);
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean extendedBolusStop() {
-        if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger));
-        bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
-        loadEvents();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public boolean updateBasalsInPump(Profile profile) {
-        if (!isConnected()) return false;
-        rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
-        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
-        DanaRS_Packet_Basal_Set_Profile_Basal_Rate msgSet = new DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, basal);
-        bleComm.sendMessage(msgSet);
-        DanaRS_Packet_Basal_Set_Profile_Number msgActivate = new DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 0);
-        bleComm.sendMessage(msgActivate);
-        danaRPump.setLastSettingsRead(0); // force read full settings
-        getPumpStatus();
-        rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
-        return true;
-    }
-
-    public PumpEnactResult loadHistory(byte type) {
-        PumpEnactResult result = new PumpEnactResult(injector);
-        if (!isConnected()) return result;
-        DanaRS_Packet_History_ msg = null;
-        switch (type) {
-            case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new DanaRS_Packet_History_Alarm(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_PRIME:
-                msg = new DanaRS_Packet_History_Prime(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new DanaRS_Packet_History_Basal(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new DanaRS_Packet_History_Bolus(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new DanaRS_Packet_History_Daily(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new DanaRS_Packet_History_Refill(aapsLogger, rxBus);
-                break;
-            case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new DanaRS_Packet_History_Suspend(aapsLogger, rxBus);
-                break;
-        }
-        if (msg != null) {
-            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1));
-            SystemClock.sleep(200);
-            bleComm.sendMessage(msg);
-            while (!msg.getDone() && isConnected()) {
-                SystemClock.sleep(100);
-            }
-            SystemClock.sleep(200);
-            bleComm.sendMessage(new DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 0));
-        }
-        result.success = true;
-        result.comment = "OK";
-        return result;
-    }
-
-
-    public class LocalBinder extends Binder {
-        public DanaRSService getServiceInstance() {
-            return DanaRSService.this;
-        }
-
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mBinder;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        return START_STICKY;
-    }
-
-    void waitForWholeMinute() {
-        while (true) {
-            long time = DateUtil.now();
-            long timeToWholeMinute = (60000 - time % 60000);
-            if (timeToWholeMinute > 59800 || timeToWholeMinute < 300)
-                break;
-            rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (int) (timeToWholeMinute / 1000))));
-            SystemClock.sleep(Math.min(timeToWholeMinute, 100));
-        }
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
new file mode 100644
index 0000000000..1497904916
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
@@ -0,0 +1,462 @@
+package info.nightscout.androidaps.plugins.pump.danaRS.services
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import android.os.SystemClock
+import dagger.android.DaggerService
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventProfileNeedsUpdate
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
+import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
+import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.*
+import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.min
+
+class DanaRSService : DaggerService() {
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var context: Context
+    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRSMessageHashTable: DanaRSMessageHashTable
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var bleComm: BLEComm
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+
+    private val disposable = CompositeDisposable()
+    private val mBinder: IBinder = LocalBinder()
+    private var bolusingTreatment: Treatment? = null
+    private var lastHistoryFetched: Long = 0
+    private var lastApproachingDailyLimit: Long = 0
+
+    override fun onCreate() {
+        super.onCreate()
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ stopSelf() }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    override fun onDestroy() {
+        disposable.clear()
+        super.onDestroy()
+    }
+
+    val isConnected: Boolean
+        get() = bleComm.isConnected
+
+    val isConnecting: Boolean
+        get() = bleComm.isConnecting
+
+    fun connect(from: String, address: String): Boolean {
+        return bleComm.connect(from, address)
+    }
+
+    fun stopConnecting() {
+        bleComm.stopConnecting()
+    }
+
+    fun disconnect(from: String) {
+        bleComm.disconnect(from)
+    }
+
+    fun sendMessage(message: DanaRS_Packet) {
+        bleComm.sendMessage(message)
+    }
+
+    fun readPumpStatus() {
+        try {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
+            sendMessage(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)))
+            sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+            sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)) // last bolus, bolusStep, maxBolus
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)))
+            sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+            danaRPump.lastConnection = System.currentTimeMillis()
+            val profile = profileFunction.getProfile()
+            val pump = activePlugin.activePump
+            if (profile != null && abs(danaRPump.currentBasal - profile.basal) >= pump.pumpDescription.basalStep) {
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)) // basal profile, basalStep, maxBasal
+                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(EventProfileNeedsUpdate())
+                }
+            }
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
+            sendMessage(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+            var timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
+            if (danaRPump.pumpTime == 0L) {
+                // initial handshake was not successful
+                // de-initialize pump
+                danaRPump.reset()
+                rxBus.send(EventDanaRNewStatus())
+                rxBus.send(EventInitializationChanged())
+                return
+            }
+            val now = System.currentTimeMillis()
+            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)) // serial no
+                sendMessage(DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)) // firmware
+                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump))
+                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)) // isExtendedEnabled
+                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)) // basal profile, basalStep, maxBasal
+                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)) // target
+                sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump))
+                sendMessage(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)) // Getting user options
+                danaRPump.lastSettingsRead = now
+            }
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+            if (abs(timeDiff) > 3) {
+                if (abs(timeDiff) > 60 * 60 * 1.5) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
+                    //If time-diff is very large, warn user until we can synchronize history readings properly
+                    val i = Intent(context, ErrorHelperActivity::class.java)
+                    i.putExtra("soundid", R.raw.error)
+                    i.putExtra("status", resourceHelper.gs(R.string.largetimediff))
+                    i.putExtra("title", resourceHelper.gs(R.string.largetimedifftitle))
+                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(i)
+
+                    //de-initialize pump
+                    danaRPump.reset()
+                    rxBus.send(EventDanaRNewStatus())
+                    rxBus.send(EventInitializationChanged())
+                    return
+                } else {
+                    if (danaRPump.protocol >= 6) {
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now()))
+                    } else {
+                        waitForWholeMinute() // Dana can set only whole minute
+                        // add 10sec to be sure we are over minute (will be cut off anyway)
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now() + T.secs(10).msecs()))
+                    }
+                    sendMessage(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+                }
+            }
+            loadEvents()
+            rxBus.send(EventDanaRNewStatus())
+            rxBus.send(EventInitializationChanged())
+            //NSUpload.uploadDeviceStatus();
+            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits)
+                if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
+                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
+                    rxBus.send(EventNewNotification(reportFail))
+                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U")
+                    lastApproachingDailyLimit = System.currentTimeMillis()
+                }
+            }
+        } catch (e: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception", e)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump status loaded")
+    }
+
+    fun loadEvents(): PumpEnactResult {
+        if (!danaRSPlugin.isInitialized) {
+            val result = PumpEnactResult(injector).success(false)
+            result.comment = "pump not initialized"
+            return result
+        }
+        SystemClock.sleep(1000)
+        val msg: DanaRS_Packet_APS_History_Events
+        if (lastHistoryFetched == 0L) {
+            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, 0)
+            aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history")
+        } else {
+            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, lastHistoryFetched)
+            aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched))
+        }
+        sendMessage(msg)
+        while (!danaRPump.historyDoneReceived && bleComm.isConnected) {
+            SystemClock.sleep(100)
+        }
+        lastHistoryFetched = if (danaRPump.lastEventTimeLoaded != 0L) danaRPump.lastEventTimeLoaded - T.mins(1).msecs() else 0
+        aapsLogger.debug(LTag.PUMPCOMM, "Events loaded")
+        danaRPump.lastConnection = System.currentTimeMillis()
+        return PumpEnactResult(injector).success(true)
+    }
+
+    fun setUserSettings(): PumpEnactResult {
+        sendMessage(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
+        return PumpEnactResult(injector).success(true)
+    }
+
+    fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: Treatment): Boolean {
+        if (!isConnected) return false
+        if (BolusProgressDialog.stopPressed) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
+        bolusingTreatment = t
+        val preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0)
+        danaRPump.bolusingTreatment = t
+        danaRPump.bolusAmountToBeDelivered = insulin
+        danaRPump.bolusStopped = false
+        danaRPump.bolusStopForced = false
+        danaRPump.bolusProgressLastTimeStamp = DateUtil.now()
+        val start = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker, insulin, preferencesSpeed)
+        if (carbs > 0) {
+//            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
+//            sendMessage(msg);
+            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, carbTime, carbs, 0)
+            sendMessage(msgSetHistoryEntryV2)
+            lastHistoryFetched = min(lastHistoryFetched, carbTime - T.mins(1).msecs())
+        }
+        val bolusStart = System.currentTimeMillis()
+        if (insulin > 0) {
+            if (!danaRPump.bolusStopped) {
+                sendMessage(start)
+            } else {
+                t.insulin = 0.0
+                return false
+            }
+            while (!danaRPump.bolusStopped && !start.failed && !danaRPump.bolusDone) {
+                SystemClock.sleep(100)
+                if (System.currentTimeMillis() - danaRPump.bolusProgressLastTimeStamp > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
+                    danaRPump.bolusStopped = true
+                    danaRPump.bolusStopForced = true
+                    aapsLogger.debug(LTag.PUMPCOMM, "Communication stopped")
+                }
+            }
+        }
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.t = t
+        bolusingEvent.percent = 99
+        bolusingTreatment = null
+        var speed = 12
+        when (preferencesSpeed) {
+            0 -> speed = 12
+            1 -> speed = 30
+            2 -> speed = 60
+        }
+        val bolusDurationInMSec = (insulin * speed * 1000).toLong()
+        val expectedEnd = bolusStart + bolusDurationInMSec + 2000
+        while (System.currentTimeMillis() < expectedEnd) {
+            val waitTime = expectedEnd - System.currentTimeMillis()
+            bolusingEvent.status = String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), waitTime / 1000)
+            rxBus.send(bolusingEvent)
+            SystemClock.sleep(1000)
+        }
+        // do not call loadEvents() directly, reconnection may be needed
+        commandQueue.loadEvents(object : Callback() {
+            override fun run() {
+                // reread bolus status
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+                sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)) // last bolus
+                bolusingEvent.percent = 100
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
+            }
+        })
+        return !start.failed
+    }
+
+    fun bolusStop() {
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (bolusingTreatment == null) "" else bolusingTreatment?.insulin)
+        val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump)
+        danaRPump.bolusStopForced = true
+        if (isConnected) {
+            sendMessage(stop)
+            while (!danaRPump.bolusStopped) {
+                sendMessage(stop)
+                SystemClock.sleep(200)
+            }
+        } else {
+            danaRPump.bolusStopped = true
+        }
+    }
+
+    fun tempBasal(percent: Int, durationInHours: Int): Boolean {
+        if (!isConnected) return false
+        if (danaRPump.isTempBasalInProgress) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        sendMessage(DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, percent, durationInHours))
+        SystemClock.sleep(200)
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun highTempBasal(percent: Int): Boolean {
+        if (danaRPump.isTempBasalInProgress) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun tempBasalShortDuration(percent: Int, durationInMinutes: Int): Boolean {
+        if (durationInMinutes != 15 && durationInMinutes != 30) {
+            aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param")
+            return false
+        }
+        if (danaRPump.isTempBasalInProgress) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun tempBasalStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+        sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun extendedBolus(insulin: Double, durationInHalfHours: Int): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
+        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, insulin, durationInHalfHours))
+        SystemClock.sleep(200)
+        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun extendedBolusStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
+        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger))
+        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+        loadEvents()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun updateBasalsInPump(profile: Profile): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
+        val basal = danaRPump.buildDanaRProfileRecord(profile)
+        val msgSet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, basal)
+        sendMessage(msgSet)
+        val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 0)
+        sendMessage(msgActivate)
+        danaRPump.lastSettingsRead = 0 // force read full settings
+        readPumpStatus()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun loadHistory(type: Byte): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (!isConnected) return result
+        var msg: DanaRS_Packet_History_? = null
+        when (type) {
+            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(aapsLogger, rxBus)
+        }
+        if (msg != null) {
+            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1))
+            SystemClock.sleep(200)
+            sendMessage(msg)
+            while (!msg.done && isConnected) {
+                SystemClock.sleep(100)
+            }
+            SystemClock.sleep(200)
+            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 0))
+        }
+        result.success = true
+        result.comment = "OK"
+        return result
+    }
+
+    inner class LocalBinder : Binder() {
+        val serviceInstance: DanaRSService
+            get() = this@DanaRSService
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return mBinder
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        return Service.START_STICKY
+    }
+
+    private fun waitForWholeMinute() {
+        while (true) {
+            val time = DateUtil.now()
+            val timeToWholeMinute = 60000 - time % 60000
+            if (timeToWholeMinute > 59800 || timeToWholeMinute < 300) break
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.waitingfortimesynchronization, (timeToWholeMinute / 1000).toInt())))
+            SystemClock.sleep(min(timeToWholeMinute, 100))
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index e783d13d78..46785fb900 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -188,7 +188,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getMessageStartErrorCode());
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index 7896cbc234..0ebefe9403 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -16,10 +16,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, DanaRSPlugin::class)
 class DanaRSMessageHashTableTest : DanaRSTestBase() {
 
-    @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
@@ -28,7 +27,7 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
-        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage)
+        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin, constraintChecker, detailedBolusInfoStorage)
         val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 1072c72e09..2b88f1c450 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -14,17 +14,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class, DetailedBolusInfoStorage::class)
+@PrepareForTest(RxBusWrapper::class, DetailedBolusInfoStorage::class, DanaRSPlugin::class)
 class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
     @Test fun runTest() {
         val now = DateUtil.now()
 
-        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, now)
+        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, now)
         // test getRequestedParams
         val returnedValues = testPacket.requestParams
         val expectedValues = getCalender(now)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 7b5b94522f..9420b1f7b6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -31,7 +31,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
     private lateinit var danaRSPlugin: DanaRSPlugin
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRSPlugin, constraintChecker)
+        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index d4854c12cd..70276dc23b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -18,13 +18,12 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
+@PrepareForTest(RxBusWrapper::class, DanaRSPlugin::class)
 class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
 
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var danaRSPlugin: DanaRSPlugin
 
     private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
@@ -40,8 +39,8 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
 
-        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
-        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
+        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump)
         // test message decoding
         testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, testPacket.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index a7246493e6..b3c3317e4d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -19,11 +19,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(RxBusWrapper::class)
+@PrepareForTest(RxBusWrapper::class, DanaRSPlugin::class)
 class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
 
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
-    @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var activePlugin: ActivePluginProvider
 
@@ -41,13 +40,13 @@ class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
 
-        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
-        val packet = DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
+        val packet = DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRPump)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(17, 0.toByte()))
-        Assert.assertEquals(true, danaRSPlugin.bolusDone)
+        Assert.assertEquals(true, danaRPump.bolusDone)
         Assert.assertEquals("NOTIFY__DELIVERY_COMPLETE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 3d46558207..4bacb5673d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -50,7 +50,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
         // val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(1.0, Treatment(treatmentInjector))
-        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin)
+        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRPump)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
@@ -66,6 +66,6 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
     @Before
     fun mock() {
         danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
-        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
+        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
     }
 }
\ No newline at end of file

From 0fa627372550b869c734c32a0d522ca7c3bdc47c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 29 Mar 2020 21:21:01 +0200
Subject: [PATCH 012/400] replace deprecated calls

---
 .../plugins/pump/danaR/comm/MsgHistoryAll.kt  |  4 +-
 .../pump/danaR/comm/MsgSettingPumpTime.kt     |  9 ++--
 ...Packet_Bolus_Get_Step_Bolus_Information.kt | 36 +++++-----------
 ...aRS_Packet_General_Get_More_Information.kt | 40 ++++++------------
 .../danaRS/comm/DanaRS_Packet_History_.kt     | 31 +++++++-------
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     | 11 +++--
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     | 18 ++++----
 .../comm/MsgSetAPSTempBasalStart_v2.kt        |  1 +
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt | 29 +++++++++----
 ...Packet_General_Get_More_InformationTest.kt | 36 +++++++++++-----
 .../comm/DanaRS_Packet_History_AlarmTest.kt   | 41 +++++++++++++++++--
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt | 21 +++++-----
 .../DanaRS_Packet_Option_Set_Pump_TimeTest.kt | 13 +++---
 13 files changed, 163 insertions(+), 127 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
index 8c50099756..6d1d4a2bc4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -25,8 +25,8 @@ open class MsgHistoryAll(
         val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
         val dailyBasal = intFromBuff(bytes, 4, 2) * 0.01
         val dailyBolus = intFromBuff(bytes, 6, 2) * 0.01
-        val paramByte5 = intFromBuff(bytes, 4, 1).toByte()
-        val paramByte6 = intFromBuff(bytes, 5, 1).toByte()
+        //val paramByte5 = intFromBuff(bytes, 4, 1).toByte()
+        //val paramByte6 = intFromBuff(bytes, 5, 1).toByte()
         val paramByte7 = intFromBuff(bytes, 6, 1).toByte()
         val paramByte8 = intFromBuff(bytes, 7, 1).toByte()
         val value = intFromBuff(bytes, 8, 2).toDouble()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
index df356ca744..07b3825b84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
@@ -4,6 +4,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
+import org.joda.time.DateTime
 import java.util.*
 
 class MsgSettingPumpTime(
@@ -17,14 +18,14 @@ class MsgSettingPumpTime(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        val time = Date(
-            100 + intFromBuff(bytes, 5, 1),
-            intFromBuff(bytes, 4, 1) - 1,
+        val time = DateTime(
+            2000 + intFromBuff(bytes, 5, 1),
+            intFromBuff(bytes, 4, 1),
             intFromBuff(bytes, 3, 1),
             intFromBuff(bytes, 2, 1),
             intFromBuff(bytes, 1, 1),
             intFromBuff(bytes, 0, 1)
-        ).time
+        ).millis
         aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time) + " Phone time: " + Date())
         danaRPump.pumpTime = time
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index 395d90b6ae..dca14ce099 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -5,6 +5,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
+import org.joda.time.DateTime
 import java.util.*
 
 class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
@@ -18,32 +19,15 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     }
 
     override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val bolusType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.initialBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        val lbt = Date() // it doesn't provide day only hour+min, workaround: expecting today
-        dataIndex += dataSize
-        dataSize = 1
-        lbt.hours = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        lbt.minutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        danaRPump.lastBolusTime = lbt.time
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 1
-        danaRPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        val error = intFromBuff(data, 0, 1)
+        val bolusType = intFromBuff(data, 1, 1)
+        danaRPump.initialBolusAmount = intFromBuff(data, 2, 2) / 100.0
+        val hours = intFromBuff(data, 4, 1)
+        val minutes = intFromBuff(data, 5, 1)
+        danaRPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        danaRPump.lastBolusAmount = intFromBuff(data, 6, 2) / 100.0
+        danaRPump.maxBolus = intFromBuff(data, 8, 2) / 100.0
+        danaRPump.bolusStep = intFromBuff(data, 10, 1) / 100.0
         failed = error != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
         aapsLogger.debug(LTag.PUMPCOMM, "BolusType: $bolusType")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
index 875b91f397..eb7d617d3b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
-import java.util.*
+import org.joda.time.DateTime
 
 class DanaRS_Packet_General_Get_More_Information(
     private val aapsLogger: AAPSLogger,
@@ -22,37 +22,21 @@ class DanaRS_Packet_General_Get_More_Information(
             failed = true
             return
         }
-        var dataIndex = DATA_START
-        var dataSize = 2
-        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        dataIndex += dataSize
-        dataSize = 1
-        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.extendedBolusRemainingMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        //val remainRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        val lastBolusTime = Date() // it doesn't provide day only hour+min, workaround: expecting today
-        dataIndex += dataSize
-        dataSize = 1
-        lastBolusTime.hours = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        lastBolusTime.minutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 2
-        danaRPump.lastBolusAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        danaRPump.iob = intFromBuff(data, 0, 2) / 100.0
+        danaRPump.dailyTotalUnits = intFromBuff(data, 2, 2) / 100.0
+        danaRPump.isExtendedInProgress = intFromBuff(data, 4, 1) == 0x01
+        danaRPump.extendedBolusRemainingMinutes = intFromBuff(data, 5, 2)
+        // val remainRate = intFromBuff(data, 7, 2) / 100.0
+        val hours = intFromBuff(data, 9, 1)
+        val minutes = intFromBuff(data, 10, 1)
+        danaRPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        danaRPump.lastBolusAmount = intFromBuff(data, 11, 2) / 100.0
         // On DanaRS DailyUnits can't be more than 160
         if (danaRPump.dailyTotalUnits > 160) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits.toString() + " U")
         aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: " + danaRPump.isExtendedInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: " + danaRPump.extendedBolusRemainingMinutes)
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeAndSecondsString(lastBolusTime.time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeAndSecondsString(danaRPump.lastBolusTime))
         aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
index e8da961028..4273f6ca0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.utils.DateUtil
+import org.joda.time.DateTime
 import java.util.*
 
 abstract class DanaRS_Packet_History_(
@@ -25,6 +26,7 @@ abstract class DanaRS_Packet_History_(
 
     var done = false
     var totalCount = 0
+    val danaRHistoryRecord = DanaRHistoryRecord()
 
     init {
         val cal = GregorianCalendar()
@@ -79,14 +81,13 @@ abstract class DanaRS_Packet_History_(
             val historySecond = byteArrayToInt(getBytes(data, DATA_START + 6, 1))
             val paramByte7 = historySecond.toByte()
             val dailyBolus: Double = ((data[DATA_START + 6].toInt() and 0xFF shl 8) + (data[DATA_START + 7].toInt() and 0xFF)) * 0.01
-            val date = Date(100 + historyYear, historyMonth - 1, historyDay)
-            val datetime = Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute)
-            val datetimewihtsec = Date(100 + historyYear, historyMonth - 1, historyDay, historyHour, historyMinute, historySecond)
+            val date = DateTime(2000 + historyYear, historyMonth, historyDay, 0, 0)
+            val datetime = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute)
+            val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
             val historyCode = byteArrayToInt(getBytes(data, DATA_START + 7, 1))
             val paramByte8 = historyCode.toByte()
             val value: Int = (data[DATA_START + 8].toInt() and 0xFF shl 8) + (data[DATA_START + 9].toInt() and 0xFF)
-            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + DateUtil.dateAndTimeString(datetimewihtsec) + " Code: " + historyCode + " Value: " + value)
-            val danaRHistoryRecord = DanaRHistoryRecord()
+            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + DateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
             danaRHistoryRecord.setBytes(data)
             // danaRHistoryRecord.recordCode is different from DanaR codes
 // set in switch for every type
@@ -94,7 +95,7 @@ abstract class DanaRS_Packet_History_(
             when (recordCode) {
                 0x02 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BOLUS
-                    danaRHistoryRecord.recordDate = datetime.time
+                    danaRHistoryRecord.recordDate = datetime.millis
                     when (0xF0 and paramByte8.toInt()) {
                         0xA0 -> {
                             danaRHistoryRecord.bolusType = "DS"
@@ -125,7 +126,7 @@ abstract class DanaRS_Packet_History_(
                 0x03 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_DAILY
                     messageType += "dailyinsulin"
-                    danaRHistoryRecord.recordDate = date.time
+                    danaRHistoryRecord.recordDate = date.millis
                     danaRHistoryRecord.recordDailyBasal = dailyBasal
                     danaRHistoryRecord.recordDailyBolus = dailyBolus
                 }
@@ -133,49 +134,49 @@ abstract class DanaRS_Packet_History_(
                 0x04 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_PRIME
                     messageType += "prime"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x05 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_REFILL
                     messageType += "refill"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x0b -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BASALHOUR
                     messageType += "basal hour"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x99 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_TEMP_BASAL
                     messageType += "tb"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x06 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_GLUCOSE
                     messageType += "glucose"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
                 }
 
                 0x07 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_CARBO
                     messageType += "carbo"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
                 }
 
                 0x0a -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_ALARM
                     messageType += "alarm"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strAlarm = "None"
                     when (paramByte8.toInt()) {
                         67 -> strAlarm = "Check"
@@ -190,7 +191,7 @@ abstract class DanaRS_Packet_History_(
                 0x09 -> {
                     danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_SUSPEND
                     messageType += "suspend"
-                    danaRHistoryRecord.recordDate = datetimewihtsec.time
+                    danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strRecordValue = "Off"
                     if (paramByte8.toInt() == 79) strRecordValue = "On"
                     danaRHistoryRecord.stringRecordValue = strRecordValue
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index b582a0b492..4db309afe0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
-import java.util.*
+import org.joda.time.DateTime
 
 class DanaRS_Packet_Option_Get_Pump_Time(
     private val aapsLogger: AAPSLogger,
@@ -36,10 +36,9 @@ class DanaRS_Packet_Option_Get_Pump_Time(
         dataIndex += dataSize
         dataSize = 1
         val sec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        val time = Date(100 + year, month - 1, day, hour, min, sec)
-        danaRPump.pumpTime = time.time
-        failed = year == month && month == day && day == hour && hour == min && min == sec && sec == 1
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + DateUtil.dateAndTimeString(time))
+        val time = DateTime(2000 + year, month, day, hour, min, sec)
+        danaRPump.pumpTime = time.millis
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + DateUtil.dateAndTimeString(time.millis))
     }
 
     override fun handleMessageNotReceived() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
index 54a38af3de..73cf49c6df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -1,10 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
-import java.util.*
+import org.joda.time.DateTime
 
 class DanaRS_Packet_Option_Set_Pump_Time(
     private val aapsLogger: AAPSLogger,
@@ -19,14 +19,14 @@ class DanaRS_Packet_Option_Set_Pump_Time(
     }
 
     override fun getRequestParams(): ByteArray {
-        val date = Date(time)
+        val date = DateTime(time)
         val request = ByteArray(6)
-        request[0] = (date.year - 100 and 0xff).toByte()
-        request[1] = (date.month + 1 and 0xff).toByte()
-        request[2] = (date.date and 0xff).toByte()
-        request[3] = (date.hours and 0xff).toByte()
-        request[4] = (date.minutes and 0xff).toByte()
-        request[5] = (date.seconds and 0xff).toByte()
+        request[0] = (date.year - 2000 and 0xff).toByte()
+        request[1] = (date.monthOfYear and 0xff).toByte()
+        request[2] = (date.dayOfMonth and 0xff).toByte()
+        request[3] = (date.hourOfDay and 0xff).toByte()
+        request[4] = (date.minuteOfHour and 0xff).toByte()
+        request[5] = (date.secondOfMinute and 0xff).toByte()
         return request
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 95d2b56b77..2ff8c669ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -4,6 +4,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
+@Suppress("UNUSED_PARAMETER")
 class MsgSetAPSTempBasalStart_v2(
     private val aapsLogger: AAPSLogger,
     private var percent: Int,
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index 86239a8ea1..c3ac9a12d6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -5,6 +5,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
 
 @RunWith(PowerMockRunner::class)
 @PrepareForTest()
@@ -12,14 +13,26 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        val valueRequested: Int = (1 and 0x000000FF shl 8) + (1 and 0x000000FF)
-        Assert.assertEquals(valueRequested / 100.0, danaRPump.lastBolusAmount, 0.0)
-        Assert.assertEquals(true, packet.failed)
+
+        val array = createArray(13, 0.toByte()) // 11 + 2
+        putByteToArray(array, 0, 2) // error 2
+        putByteToArray(array, 1, 3) // bolus type 3
+        putIntToArray(array, 2, 600) // initial bolus amount 6
+        putByteToArray(array, 4, 13) // 13h
+        putByteToArray(array, 5, 20) // 20min
+        putIntToArray(array, 6, 1250) // last bolus amount 12.5
+        putIntToArray(array, 8, 2500) // max bolus 25
+        putByteToArray(array, 10, 100) // bolus step 1
+
+        packet.handleMessage(array)
+        Assert.assertTrue(packet.failed)
+        Assert.assertEquals(6.0, danaRPump.initialBolusAmount, 0.01)
+        val lastBolus = Date(danaRPump.lastBolusTime)
+        Assert.assertEquals(13, lastBolus.hours)
+        Assert.assertEquals(20, lastBolus.minutes)
+        Assert.assertEquals(12.5, danaRPump.lastBolusAmount, 0.01)
+        Assert.assertEquals(25.0, danaRPump.maxBolus, 0.01)
+        Assert.assertEquals(1.0, danaRPump.bolusStep, 0.01)
         Assert.assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index 327aa1c8a6..12ff721a2b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -3,25 +3,39 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(13, 0.toByte()))
-        Assert.assertEquals(true, packet.failed)
+
+        packet.handleMessage(createArray(14, 0.toByte()))
+        Assert.assertTrue(packet.failed)
+
         packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
-        packet.handleMessage(createArray(15, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(15, 161.toByte()))
-        Assert.assertEquals(true, packet.failed)
+        val array = createArray(15, 0.toByte()) // 13 + 2
+        putIntToArray(array, 0, 600) // iob 6
+        putIntToArray(array, 2, 1250) // daily units 12.5
+        putByteToArray(array, 4, 1) // is extended in progress
+        putIntToArray(array, 5, 150) // extended remaining minutes 150
+        putByteToArray(array, 9, 15) // hours 15
+        putByteToArray(array, 10, 25) // minutes 25
+        putIntToArray(array, 11, 170) // last bolus manout 1.70
+
+        packet.handleMessage(array)
+        Assert.assertFalse(packet.failed)
+        Assert.assertEquals(6.0, danaRPump.iob, 0.01)
+        Assert.assertEquals(12.5, danaRPump.dailyTotalUnits, 0.01)
+        Assert.assertTrue(danaRPump.isExtendedInProgress)
+        Assert.assertEquals(150, danaRPump.extendedBolusRemainingMinutes)
+        val lastBolus = Date(danaRPump.lastBolusTime)
+        Assert.assertEquals(15, lastBolus.hours)
+        Assert.assertEquals(25, lastBolus.minutes)
+        Assert.assertEquals(1.7, danaRPump.lastBolusAmount, 0.01)
+
         Assert.assertEquals("REVIEW__GET_MORE_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
index 743d3f66e7..bc10832af9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -1,17 +1,52 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.db.DatabaseHelper
+import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import org.junit.Assert
+import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
+@PrepareForTest(MainApp::class)
 class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
 
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, System.currentTimeMillis())
+    @Mock lateinit var databaseHelper: DatabaseHelper
+
+    @Before
+    fun mock() {
+        PowerMockito.mockStatic(MainApp::class.java)
+        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
+    }
+
+    @Test
+    fun runTest() {
+        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, 0)
+
+        val array = createArray(12, 0.toByte()) // 10 + 2
+        putByteToArray(array, 0, 0x0A) // record code alarm
+        putByteToArray(array, 1, 19) // year 2019
+        putByteToArray(array, 2, 2) // month february
+        putByteToArray(array, 3, 4) // day 4
+        putByteToArray(array, 4, 20) // hour 20
+        putByteToArray(array, 5, 11) // min 11
+        putByteToArray(array, 6, 35) // second 35
+        putByteToArray(array, 7, 79) // occlusion
+        putByteToArray(array, 8, 1) // value
+        putByteToArray(array, 9, 100) // value
+
+        packet.handleMessage(array)
+        Assert.assertEquals(RecordTypes.RECORD_TYPE_ALARM, packet.danaRHistoryRecord.recordCode)
+        Assert.assertEquals(Date(119, 1, 4, 20, 11, 35).time, packet.danaRHistoryRecord.recordDate)
+        Assert.assertEquals("Occlusion", packet.danaRHistoryRecord.recordAlarm)
+        Assert.assertEquals(3.56, packet.danaRHistoryRecord.recordValue, 0.01)
         Assert.assertEquals("REVIEW__ALARM", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 8f74812e9e..2ac915644f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -1,25 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import org.joda.time.DateTime
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump)
-        // test params
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(8, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        // this should fail
-        packet.handleMessage(createArray(8, 1.toByte()))
-        Assert.assertEquals(true, packet.failed)
+        val array = createArray(8, 0.toByte()) // 6 + 2
+        putByteToArray(array, 0, 19) // year 2019
+        putByteToArray(array, 1, 2) // month february
+        putByteToArray(array, 2, 4) // day 4
+        putByteToArray(array, 3, 20) // hour 20
+        putByteToArray(array, 4, 11) // min 11
+        putByteToArray(array, 5, 35) // second 35
+
+        packet.handleMessage(array)
+        Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaRPump.pumpTime)
         Assert.assertEquals("OPTION__GET_PUMP_TIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
index 5fd034e5b6..bf34d76510 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -1,22 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Option_Set_Pump_TimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now())
+        val date = Date()
+        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, date.time)
         // test params
         val params = packet.requestParams
-        Assert.assertEquals((Date().date and 0xff).toByte(), params[2])
+        Assert.assertEquals((date.year  - 100 and 0xff).toByte(), params[0]) // 2019 -> 19
+        Assert.assertEquals((date.month + 1 and 0xff).toByte(), params[1])
+        Assert.assertEquals((date.date and 0xff).toByte(), params[2])
+        Assert.assertEquals((date.hours and 0xff).toByte(), params[3])
+        Assert.assertEquals((date.minutes and 0xff).toByte(), params[4])
+        Assert.assertEquals((date.seconds and 0xff).toByte(), params[5])
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)

From 8d3ad42ff762e0112d69dd9a6dd7062402507090 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 30 Mar 2020 21:14:56 +0200
Subject: [PATCH 013/400] Better detect failed encryption

---
 .../plugins/pump/danaRS/services/BLEComm.kt         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index e691156d0d..8e5937238d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -19,6 +19,8 @@ import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivit
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Etc_Keep_Connection
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Pump_Check
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.utils.ToastUtils
@@ -72,6 +74,7 @@ class BLEComm @Inject internal constructor(
     var isConnected = false
     var isConnecting = false
     private var encryptedDataRead = false
+    private var encryptedCommandSent = false
     private var uartRead: BluetoothGattCharacteristic? = null
     private var uartWrite: BluetoothGattCharacteristic? = null
 
@@ -99,6 +102,7 @@ class BLEComm @Inject internal constructor(
         isConnected = false
         v3Encryption = false
         encryptedDataRead = false
+        encryptedCommandSent = false
         isConnecting = true
         val device = bluetoothAdapter?.getRemoteDevice(address)
         if (device == null) {
@@ -121,7 +125,7 @@ class BLEComm @Inject internal constructor(
     fun disconnect(from: String) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
 
-        if (!encryptedDataRead && v3Encryption) {
+        if (!encryptedDataRead && encryptedCommandSent && v3Encryption) {
             // there was no response from pump after started encryption
             // assume pairing keys are invalid
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
@@ -143,6 +147,7 @@ class BLEComm @Inject internal constructor(
         bluetoothGatt?.disconnect()
         isConnected = false
         encryptedDataRead = false
+        encryptedCommandSent = false
         SystemClock.sleep(2000)
     }
 
@@ -202,6 +207,7 @@ class BLEComm @Inject internal constructor(
             isConnecting = false
             isConnected = false
             encryptedDataRead = false
+            encryptedCommandSent = false
             return
         }
         bluetoothGatt?.setCharacteristicNotification(characteristic, enabled)
@@ -216,6 +222,7 @@ class BLEComm @Inject internal constructor(
                 isConnecting = false
                 isConnected = false
                 encryptedDataRead = false
+                encryptedCommandSent = false
                 return@Runnable
             }
             characteristic.value = data
@@ -241,6 +248,7 @@ class BLEComm @Inject internal constructor(
             isConnecting = false
             isConnected = false
             encryptedDataRead = false
+            encryptedCommandSent = false
             return null
         }
         return bluetoothGatt?.services
@@ -275,6 +283,7 @@ class BLEComm @Inject internal constructor(
             isConnecting = false
             v3Encryption = false
             encryptedDataRead = false
+            encryptedCommandSent = false
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
             aapsLogger.debug(LTag.PUMPBTCOMM, "Device was disconnected " + gatt.device.name) //Device was disconnected
         }
@@ -527,6 +536,7 @@ class BLEComm @Inject internal constructor(
                     isConnected = true
                     isConnecting = false
                     aapsLogger.debug(LTag.PUMPBTCOMM, "Connect !!")
+                    // Send one message to confirm communication
                 } else {
                     context.startActivity(Intent(context, EnterPinActivity::class.java).also { it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) })
                     aapsLogger.debug(LTag.PUMPBTCOMM, "Request pairing keys !!")
@@ -616,6 +626,7 @@ class BLEComm @Inject internal constructor(
 
     // the rest of packets
     fun sendMessage(message: DanaRS_Packet) {
+        encryptedCommandSent = true
         processedMessage = message
         val command = byteArrayOf(message.type.toByte(), message.opCode.toByte())
         val params = message.requestParams

From 58fe62c45afca477eb3c7f0faaf1ad4b16de53fe Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Apr 2020 21:46:30 +0200
Subject: [PATCH 014/400] concurrency extension

---
 .../plugins/pump/danaRS/services/BLEComm.kt   |  8 ++---
 .../nightscout/androidaps/utils/CryptoUtil.kt | 33 +------------------
 .../utils/extensions/Concurrency.kt           | 22 +++++++++++++
 3 files changed, 26 insertions(+), 37 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 8e5937238d..e46aff33d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -19,15 +19,13 @@ import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivit
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Etc_Keep_Connection
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_General_Get_Pump_Check
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.extensions.notify
+import info.nightscout.androidaps.utils.extensions.waitMillis
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import okhttp3.internal.notify
-import okhttp3.internal.waitMillis
 import java.util.*
 import java.util.concurrent.ScheduledFuture
 import javax.inject.Inject
@@ -230,7 +228,7 @@ class BLEComm @Inject internal constructor(
             //aapsLogger.debug("writeCharacteristic:" + DanaRS_Packet.toHexString(data))
             bluetoothGatt?.writeCharacteristic(characteristic)
         }).start()
-        waitMillis(50)
+        SystemClock.sleep(50)
     }
 
     private val uartReadBTGattChar: BluetoothGattCharacteristic
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt b/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
index 745f4449ee..ad271e7344 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/CryptoUtil.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.utils
 
+import info.nightscout.androidaps.utils.extensions.toHex
 import org.spongycastle.util.encoders.Base64
 import java.nio.ByteBuffer
 import java.security.MessageDigest
@@ -13,38 +14,6 @@ import javax.crypto.spec.GCMParameterSpec
 import javax.crypto.spec.PBEKeySpec
 import javax.crypto.spec.SecretKeySpec
 
-private val HEX_CHARS = "0123456789abcdef"
-private val HEX_CHARS_ARRAY = "0123456789abcdef".toCharArray()
-
-fun String.hexStringToByteArray() : ByteArray {
-
-    val upperCased = this.toLowerCase()
-    val result = ByteArray(length / 2)
-    for (i in 0 until length step 2) {
-        val firstIndex = HEX_CHARS.indexOf(upperCased[i]);
-        val secondIndex = HEX_CHARS.indexOf(upperCased[i + 1]);
-
-        val octet = firstIndex.shl(4).or(secondIndex)
-        result.set(i.shr(1), octet.toByte())
-    }
-
-    return result
-}
-
-fun ByteArray.toHex() : String{
-    val result = StringBuffer()
-
-    forEach {
-        val octet = it.toInt()
-        val firstIndex = (octet and 0xF0).ushr(4)
-        val secondIndex = octet and 0x0F
-        result.append(HEX_CHARS_ARRAY[firstIndex])
-        result.append(HEX_CHARS_ARRAY[secondIndex])
-    }
-
-    return result.toString()
-}
-
 object CryptoUtil {
 
     private const val IV_LENGTH_BYTE = 12
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt
new file mode 100644
index 0000000000..b958a0ea24
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.utils.extensions
+
+
+@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "NOTHING_TO_INLINE")
+inline fun Any.wait() = (this as Object).wait()
+
+/**
+ * Lock and wait a duration in milliseconds and nanos.
+ * Unlike [java.lang.Object.wait] this interprets 0 as "don't wait" instead of "wait forever".
+ */
+@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
+fun Any.waitMillis(timeout: Long, nanos: Int = 0) {
+    if (timeout > 0L || nanos > 0) {
+        (this as Object).wait(timeout, nanos)
+    }
+}
+
+@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "NOTHING_TO_INLINE")
+inline fun Any.notify() = (this as Object).notify()
+
+@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "NOTHING_TO_INLINE")
+inline fun Any.notifyAll() = (this as Object).notifyAll()

From 0d89262dfabf49716d4607aff9d58550bcb9ef10 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 6 Apr 2020 10:35:00 +0200
Subject: [PATCH 015/400] fix SmsPluginCommunicatorTest

---
 .../general/smsCommunicator/SmsCommunicatorPluginTest.kt        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index d5b7ddd5f5..2ce83f0164 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
@@ -156,6 +157,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
         `when`(virtualPumpPlugin.shortStatus(ArgumentMatchers.anyBoolean())).thenReturn("Virtual Pump")
         `when`(virtualPumpPlugin.isSuspended).thenReturn(false)
+        `when`(virtualPumpPlugin.pumpDescription).thenReturn(PumpDescription())
 
         `when`(treatmentsPlugin.lastCalculationTreatments).thenReturn(IobTotal(0))
         `when`(treatmentsPlugin.lastCalculationTempBasals).thenReturn(IobTotal(0))

From f595560baadeafacc93f25b15882ebbfc6e99996 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 19 Apr 2020 12:57:08 +0200
Subject: [PATCH 016/400] RS insulin and canula change logging

---
 .../androidaps/dialogs/FillDialog.kt          | 48 ++++++++++---------
 .../danaRS/comm/DanaRSMessageHashTable.kt     |  7 +--
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  8 ++++
 .../pump/danaRS/services/DanaRSService.kt     |  4 +-
 .../plugins/treatments/TreatmentsPlugin.java  |  2 +-
 app/src/main/res/values/strings.xml           |  6 +++
 app/src/main/res/xml/pref_danars.xml          | 12 +++++
 .../danaRS/comm/DanaRSMessageHashTableTest.kt |  2 +-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |  2 +-
 9 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index df1664b68a..3fbdc7112c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -25,6 +25,7 @@ import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import kotlinx.android.synthetic.main.dialog_fill.*
 import kotlinx.android.synthetic.main.notes.*
 import kotlinx.android.synthetic.main.okcancel.*
@@ -121,12 +122,12 @@ class FillDialog : DialogFragmentWithDate() {
                     }
                     if (siteChange) {
                         aapsLogger.debug("USER ENTRY: SITE CHANGE")
-                        generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes)
+                        generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes, resourceHelper, sp)
                     }
                     if (insulinChange) {
                         // add a second for case of both checked
                         aapsLogger.debug("USER ENTRY: INSULIN CHANGE")
-                        generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes)
+                        generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes, resourceHelper, sp)
                     }
                 }, null)
             }
@@ -160,27 +161,28 @@ class FillDialog : DialogFragmentWithDate() {
         })
     }
 
-    private fun generateCareportalEvent(eventType: String, time: Long, notes: String) {
-        val careportalEvent = CareportalEvent()
-        careportalEvent.source = Source.USER
-        careportalEvent.date = time
-        careportalEvent.json = generateJson(eventType, time, notes).toString()
-        careportalEvent.eventType = eventType
-        MainApp.getDbHelper().createOrUpdate(careportalEvent)
-        NSUpload.uploadEvent(eventType, time, notes)
-    }
-
-    private fun generateJson(careportalEvent: String, time: Long, notes: String): JSONObject {
-        val data = JSONObject()
-        try {
-            data.put("eventType", careportalEvent)
-            data.put("created_at", DateUtil.toISOString(time))
-            data.put("mills", time)
-            data.put("enteredBy", sp.getString("careportal_enteredby", resourceHelper.gs(R.string.app_name)))
-            if (notes.isNotEmpty()) data.put("notes", notes)
-        } catch (ignored: JSONException) {
+    companion object {
+        fun generateCareportalEvent(eventType: String, time: Long, notes: String, resourceHelper: ResourceHelper, sp: SP) {
+            val careportalEvent = CareportalEvent()
+            careportalEvent.source = Source.USER
+            careportalEvent.date = time
+            careportalEvent.json = generateJson(eventType, time, notes, resourceHelper, sp).toString()
+            careportalEvent.eventType = eventType
+            MainApp.getDbHelper().createOrUpdate(careportalEvent)
+            NSUpload.uploadEvent(eventType, time, notes)
         }
-        return data
-    }
 
+        private fun generateJson(careportalEvent: String, time: Long, notes: String, resourceHelper: ResourceHelper, sp: SP): JSONObject {
+            val data = JSONObject()
+            try {
+                data.put("eventType", careportalEvent)
+                data.put("created_at", DateUtil.toISOString(time))
+                data.put("mills", time)
+                data.put("enteredBy", sp.getString("careportal_enteredby", resourceHelper.gs(R.string.app_name)))
+                if (notes.isNotEmpty()) data.put("notes", notes)
+            } catch (ignored: JSONException) {
+            }
+            return data
+        }
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index 4f3d86c51d..c158cce9a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -6,8 +6,8 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -20,7 +20,8 @@ class DanaRSMessageHashTable @Inject constructor(
     danaRPump: DanaRPump,
     activePlugin: ActivePluginProvider,
     constraintChecker: ConstraintChecker,
-    detailedBolusInfoStorage: DetailedBolusInfoStorage
+    detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    sp: SP
 ) {
 
     var messages: HashMap<Int, DanaRS_Packet> = HashMap()
@@ -98,7 +99,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
         // APS
         put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
-        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, 0))
+        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, 0))
         put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
         // v3
         put(DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 97700ba30e..1ee7086bd8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -2,9 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.dialogs.FillDialog
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -15,6 +17,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
 
 open class DanaRS_Packet_APS_History_Events(
@@ -24,6 +27,7 @@ open class DanaRS_Packet_APS_History_Events(
     private val activePlugin: ActivePluginProvider,
     private val danaRPump: DanaRPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    private val sp: SP,
     private var from: Long
 ) : DanaRS_Packet() {
 
@@ -156,11 +160,15 @@ open class DanaRS_Packet_APS_History_Events(
 
             DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
+                    FillDialog.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump), resourceHelper, sp)
                 status = "REFILL " + DateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
+                    FillDialog.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump), resourceHelper, sp)
                 status = "PRIME " + DateUtil.timeString(datetime)
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
index 1497904916..3cdb8f3857 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
@@ -211,10 +211,10 @@ class DanaRSService : DaggerService() {
         SystemClock.sleep(1000)
         val msg: DanaRS_Packet_APS_History_Events
         if (lastHistoryFetched == 0L) {
-            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, 0)
+            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, 0)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history")
         } else {
-            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, lastHistoryFetched)
+            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, lastHistoryFetched)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched))
         }
         sendMessage(msg)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 9704d82f43..910c4d1cfb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -288,7 +288,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
 
     /**
      * Returns all Treatments after specified timestamp. Also returns invalid entries (required to
-     * map "Fill Canulla" entries to history (and not to add double bolus for it)
+     * map "Fill Canula" entries to history (and not to add double bolus for it)
      *
      * @param fromTimestamp
      * @return
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 019338b92c..6f0d1e46e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1815,4 +1815,10 @@
     <string name="overview_show_predictions">Predictions</string>
     <string name="overview_show_deviationslope">Deviation slope</string>
     <string name="key_graphconfig" translatable="false">graphconfig</string>
+    <string name="key_rs_loginsulinchange" translatable="false">rs_loginsulinchange</string>
+    <string name="rs_loginsulinchange_title">Log reservoir change</string>
+    <string name="rs_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
+    <string name="key_rs_logcanulachange" translatable="false">rs_logcanulachange</string>
+    <string name="rs_logcanulachange_title">Log canula change</string>
+    <string name="rs_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_danars.xml b/app/src/main/res/xml/pref_danars.xml
index 2bd7446a61..baf7bc4405 100644
--- a/app/src/main/res/xml/pref_danars.xml
+++ b/app/src/main/res/xml/pref_danars.xml
@@ -35,6 +35,18 @@
             android:key="@string/key_danars_bolusspeed"
             android:title="@string/bolusspeed" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_rs_loginsulinchange"
+            android:summary="@string/rs_loginsulinchange_summary"
+            android:title="@string/rs_loginsulinchange_title" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_rs_logcanulachange"
+            android:summary="@string/rs_logcanulachange_summary"
+            android:title="@string/rs_logcanulachange_title" />
+
         <androidx.preference.PreferenceScreen
             android:key="absorption_danars_advanced"
             android:title="@string/advancedsettings_title">
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index 0ebefe9403..1db5d5ffc1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -27,7 +27,7 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
-        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin, constraintChecker, detailedBolusInfoStorage)
+        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin, constraintChecker, detailedBolusInfoStorage, sp)
         val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 2b88f1c450..51d31a907d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -23,7 +23,7 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
     @Test fun runTest() {
         val now = DateUtil.now()
 
-        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, now)
+        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, now)
         // test getRequestedParams
         val returnedValues = testPacket.requestParams
         val expectedValues = getCalender(now)

From e526ad4617bf50a08f957f44d22b996e27a593d5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 20 Apr 2020 21:28:29 +0200
Subject: [PATCH 017/400] model string

---
 .../plugins/pump/danaR/DanaRFragment.kt       | 38 +++++++++----------
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index d747301ec0..83c7077825 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -178,7 +178,7 @@ class DanaRFragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
-            danar_lastconnection.text = DateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            danar_lastconnection?.text = DateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
             SetWarnColor.setColor(danar_lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
@@ -186,46 +186,46 @@ class DanaRFragment : DaggerFragment() {
             val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
-                danar_lastbolus.text = DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+                danar_lastbolus?.text = DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
             else
-                danar_lastbolus.text = ""
+                danar_lastbolus?.text = ""
         }
 
-        danar_dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
+        danar_dailyunits?.text = resourceHelper.gs(R.string.reservoirvalue, pump.dailyTotalUnits, pump.maxDailyTotalUnits)
         SetWarnColor.setColor(danar_dailyunits, pump.dailyTotalUnits, pump.maxDailyTotalUnits * 0.75, pump.maxDailyTotalUnits * 0.9)
-        danar_basabasalrate.text = "( " + (pump.activeProfile + 1) + " )  " + resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+        danar_basabasalrate?.text = "( " + (pump.activeProfile + 1) + " )  " + resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
         // DanaRPlugin, DanaRKoreanPlugin
         if (activePlugin.activePump.isFakingTempsByExtendedBoluses == true) {
-            danar_tempbasal.text = activePlugin.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+            danar_tempbasal?.text = activePlugin.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
                 ?: ""
         } else {
             // v2 plugin
-            danar_tempbasal.text = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
+            danar_tempbasal?.text = activePlugin.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())?.toStringFull()
                 ?: ""
         }
-        danar_extendedbolus.text = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())?.toString()
+        danar_extendedbolus?.text = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())?.toString()
             ?: ""
-        danar_reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
+        danar_reservoir?.text = resourceHelper.gs(R.string.reservoirvalue, pump.reservoirRemainingUnits, 300)
         SetWarnColor.setColorInverse(danar_reservoir, pump.reservoirRemainingUnits, 50.0, 20.0)
-        danar_battery.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
+        danar_battery?.text = "{fa-battery-" + pump.batteryRemaining / 25 + "}"
         SetWarnColor.setColorInverse(danar_battery, pump.batteryRemaining.toDouble(), 51.0, 26.0)
-        danar_iob.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
-        danar_firmware.text = resourceHelper.gs(R.string.danar_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
-        danar_basalstep.text = pump.basalStep.toString()
-        danar_bolusstep.text = pump.bolusStep.toString()
-        danar_serialnumber.text = pump.serialNumber
+        danar_iob?.text = resourceHelper.gs(R.string.formatinsulinunits, pump.iob)
+        danar_firmware?.text = resourceHelper.gs(R.string.dana_model, pump.modelFriendlyName(), pump.hwModel, pump.protocol, pump.productCode)
+        danar_basalstep?.text = pump.basalStep.toString()
+        danar_bolusstep?.text = pump.bolusStep.toString()
+        danar_serialnumber?.text = pump.serialNumber
         val status = commandQueue.spannedStatus()
         if (status.toString() == "") {
-            danar_queue.visibility = View.GONE
+            danar_queue?.visibility = View.GONE
         } else {
-            danar_queue.visibility = View.VISIBLE
-            danar_queue.text = status
+            danar_queue?.visibility = View.VISIBLE
+            danar_queue?.text = status
         }
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
         val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
         if (isKorean || pump.hwModel == 0 || pump.hwModel == 3) {
-            danar_user_options.visibility = View.GONE
+            danar_user_options?.visibility = View.GONE
         }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f65f79867..9b3e148dc9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -529,7 +529,7 @@
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
     <string name="advancedsettings_title">Advanced Settings</string>
     <string name="key_advancedsettings" translatable="false">key_advancedsettings</string>
-    <string name="danar_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
     <string name="profile">Profile</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3 This is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4 This is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>

From c84e7ec326b18de8bdff4f870206e1ccc114896e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Apr 2020 23:23:39 +0200
Subject: [PATCH 018/400] fix tests

---
 .../utils/extensions/HexByteArrayConversion.kt           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt b/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
index 9852ecbbf4..7492135983 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.utils.extensions
 
-private val HEX_CHARS = "0123456789ABCDEF".toCharArray()
+import java.util.*
+
+private val HEX_CHARS = "0123456789abcdef".toCharArray()
 
 fun ByteArray.toHex() : String{
     val result = StringBuffer()
@@ -20,9 +22,10 @@ fun String.hexStringToByteArray() : ByteArray {
 
     val result = ByteArray(length / 2)
 
+    val lowerCased = this.toLowerCase(Locale.getDefault())
     for (i in 0 until length step 2) {
-        val firstIndex = HEX_CHARS.indexOf(this[i]);
-        val secondIndex = HEX_CHARS.indexOf(this[i + 1]);
+        val firstIndex = HEX_CHARS.indexOf(lowerCased[i]);
+        val secondIndex = HEX_CHARS.indexOf(lowerCased[i + 1]);
 
         val octet = firstIndex.shl(4).or(secondIndex)
         result.set(i.shr(1), octet.toByte())

From b42304d836f8ad5ca57b1dbeb344f1c5fd271e3e Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:09:46 +1200
Subject: [PATCH 019/400] Add skip Neutral Temps preference

---
 .../plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java  | 2 +-
 app/src/main/res/values/strings.xml                         | 3 +++
 app/src/main/res/xml/pref_openapssmb.xml                    | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 4d3a0db704..796eb9ef4e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -265,7 +265,7 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
         mProfile.put("maxCOB", SMBDefaults.maxCOB);
-        mProfile.put("skip_neutral_temps", SMBDefaults.skip_neutral_temps);
+        mProfile.put("skip_neutral_temps", sp.getBoolean(R.string.key_skip_neutral_temps,SMBDefaults.skip_neutral_temps));
         // min_5m_carbimpact is not used within SMB determinebasal
         //if (mealData.usedMinCarbsImpact > 0) {
         //    mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0f6821b69..3560471abf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -956,6 +956,9 @@
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
     <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
     <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
+    <string name="key_skip_neutral_temps" translatable="false">skip_neutral_temps</string>
+    <string name="skip_neutral_temps_title">Skip neutral temp basals</string>
+    <string name="skip_neutral_temps_summary">If enabled, sets basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
     <string name="enablesmbalways">Enable SMB always</string>
     <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
     <string name="enablesmbaftercarbs">Enable SMB after carbs</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 859a75a82b..09c6ff1221 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -73,6 +73,12 @@
             android:summary="@string/enablesmbaftercarbs_summary"
             android:title="@string/enablesmbaftercarbs" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_skip_neutral_temps"
+            android:summary="@string/skip_neutral_temps_summary"
+            android:title="@string/skip_neutral_temps_title" />
+
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="3"
             android:digits="0123456789"

From 2e89e410d99ff4e2ae9c821c6c9992df5217aefe Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 27 Apr 2020 20:33:41 +1200
Subject: [PATCH 020/400] clarify definition

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3560471abf..c4c96fb42a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -958,7 +958,7 @@
     <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
     <string name="key_skip_neutral_temps" translatable="false">skip_neutral_temps</string>
     <string name="skip_neutral_temps_title">Skip neutral temp basals</string>
-    <string name="skip_neutral_temps_summary">If enabled, sets basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
+    <string name="skip_neutral_temps_summary">If enabled, it skips setting basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
     <string name="enablesmbalways">Enable SMB always</string>
     <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
     <string name="enablesmbaftercarbs">Enable SMB after carbs</string>

From a5108ca4c4cce2913eb4a57c0d75ccc401217c24 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 29 Apr 2020 23:27:48 +0200
Subject: [PATCH 021/400] RS injection refactor

---
 .../dependencyInjection/AppModule.kt          |   2 +-
 .../dependencyInjection/DanaRSCommModule.kt   |  79 +++++++++
 .../danaRS/comm/DanaRSMessageHashTable.kt     | 154 ++++++++----------
 .../pump/danaRS/comm/DanaRS_Packet.java       |  26 ++-
 ...RS_Packet_APS_Basal_Set_Temporary_Basal.kt |   8 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  20 +--
 .../DanaRS_Packet_APS_Set_Event_History.kt    |   8 +-
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |  18 +-
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |  14 +-
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |  12 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |  12 +-
 .../DanaRS_Packet_Basal_Set_Basal_Rate.kt     |   8 +-
 ...Packet_Basal_Set_Cancel_Temporary_Basal.kt |   8 +-
 ...aRS_Packet_Basal_Set_Profile_Basal_Rate.kt |   8 +-
 .../DanaRS_Packet_Basal_Set_Profile_Number.kt |   8 +-
 .../DanaRS_Packet_Basal_Set_Suspend_Off.kt    |   8 +-
 .../DanaRS_Packet_Basal_Set_Suspend_On.kt     |   8 +-
 ...DanaRS_Packet_Basal_Set_Temporary_Basal.kt |   8 +-
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |  15 +-
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |  12 +-
 ...acket_Bolus_Get_Calculation_Information.kt |  11 +-
 ...et_Carbohydrate_Calculation_Information.kt |  12 +-
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |  12 +-
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |  12 +-
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |  12 +-
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |  12 +-
 .../DanaRS_Packet_Bolus_Get_Initial_Bolus.kt  |   8 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |  13 +-
 .../DanaRS_Packet_Bolus_Set_Bolus_Option.kt   |   8 +-
 .../DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt   |   8 +-
 .../DanaRS_Packet_Bolus_Set_Dual_Bolus.kt     |   9 +-
 .../DanaRS_Packet_Bolus_Set_Extended_Bolus.kt |   9 +-
 ..._Packet_Bolus_Set_Extended_Bolus_Cancel.kt |   8 +-
 .../DanaRS_Packet_Bolus_Set_Initial_Bolus.kt  |   8 +-
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |  11 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |  13 +-
 .../comm/DanaRS_Packet_Etc_Keep_Connection.kt |   8 +-
 .../DanaRS_Packet_Etc_Set_History_Save.kt     |   9 +-
 .../DanaRS_Packet_General_Delivery_Status.kt  |   8 +-
 ...aRS_Packet_General_Get_More_Information.kt |  10 +-
 .../DanaRS_Packet_General_Get_Password.kt     |  12 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |  14 +-
 ...Packet_General_Get_Shipping_Information.kt |  12 +-
 ...aRS_Packet_General_Get_Shipping_Version.kt |  10 +-
 ...Packet_General_Get_Today_Delivery_Total.kt |  12 +-
 ...acket_General_Get_User_Time_Change_Flag.kt |   8 +-
 ...cket_General_Initial_Screen_Information.kt |  10 +-
 ..._Packet_General_Set_History_Upload_Mode.kt |   8 +-
 ...General_Set_User_Time_Change_Flag_Clear.kt |   9 +-
 .../danaRS/comm/DanaRS_Packet_History_.kt     |  10 +-
 .../comm/DanaRS_Packet_History_Alarm.kt       |  10 +-
 .../comm/DanaRS_Packet_History_All_History.kt |  10 +-
 .../comm/DanaRS_Packet_History_Basal.kt       |  10 +-
 .../DanaRS_Packet_History_Blood_Glucose.kt    |  10 +-
 .../comm/DanaRS_Packet_History_Bolus.kt       |  10 +-
 .../DanaRS_Packet_History_Carbohydrate.kt     |  10 +-
 .../comm/DanaRS_Packet_History_Daily.kt       |  10 +-
 .../comm/DanaRS_Packet_History_Prime.kt       |  10 +-
 .../comm/DanaRS_Packet_History_Refill.kt      |  10 +-
 .../comm/DanaRS_Packet_History_Suspend.kt     |   6 +-
 .../comm/DanaRS_Packet_History_Temporary.kt   |  10 +-
 .../danaRS/comm/DanaRS_Packet_Notify_Alarm.kt |  14 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |  14 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |  13 +-
 ...DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt |   8 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |  10 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |  12 +-
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     |   6 +-
 .../DanaRS_Packet_Option_Set_User_Option.kt   |  11 +-
 .../comm/DanaRS_Packet_Review_Bolus_Avg.kt    |   8 +-
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |  10 +-
 .../plugins/pump/danaRS/services/BLEComm.kt   |   4 +-
 .../pump/danaRS/services/DanaRSService.kt     | 104 ++++++------
 .../danaRS/comm/DanaRSMessageHashTableTest.kt |  26 ++-
 ...acket_APS_Basal_Set_Temporary_BasalTest.kt |  22 ++-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |  20 ++-
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |  18 +-
 .../DanaRS_Packet_Basal_Get_Basal_RateTest.kt |  14 +-
 ...Packet_Basal_Get_Profile_Basal_RateTest.kt |  23 ++-
 ...aRS_Packet_Basal_Get_Profile_NumberTest.kt |  13 +-
 ...ket_Basal_Get_Temporary_Basal_StateTest.kt |  13 +-
 .../DanaRS_Packet_Basal_Set_Basal_RateTest.kt |  12 +-
 ...et_Basal_Set_Cancel_Temporary_BasalTest.kt |  12 +-
 ...Packet_Basal_Set_Profile_Basal_RateTest.kt |  12 +-
 ...aRS_Packet_Basal_Set_Profile_NumberTest.kt |  12 +-
 ...DanaRS_Packet_Basal_Set_Suspend_OffTest.kt |  12 +-
 .../DanaRS_Packet_Basal_Set_Suspend_OnTest.kt |  12 +-
 ...RS_Packet_Basal_Set_Temporary_BasalTest.kt |  13 +-
 ...anaRS_Packet_Bolus_Get_Bolus_OptionTest.kt |  15 +-
 ...anaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt |  15 +-
 ...t_Bolus_Get_Calculation_InformationTest.kt |  13 +-
 ...arbohydrate_Calculation_InformationTest.kt |  13 +-
 .../DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt |  15 +-
 ...aRS_Packet_Bolus_Get_Extended_BolusTest.kt |  13 +-
 ...cket_Bolus_Get_Extended_Bolus_StateTest.kt |  13 +-
 ...olus_Get_Extended_Menu_Option_StateTest.kt |  15 +-
 ...naRS_Packet_Bolus_Get_Initial_BolusTest.kt |  14 +-
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt |  13 +-
 ...anaRS_Packet_Bolus_Set_Bolus_OptionTest.kt |  14 +-
 ...anaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt |  14 +-
 .../DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt |  14 +-
 ...aRS_Packet_Bolus_Set_Extended_BolusTest.kt |  14 +-
 ...ket_Bolus_Set_Extended_Bolus_CancelTest.kt |  14 +-
 ...naRS_Packet_Bolus_Set_Initial_BolusTest.kt |  14 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |  13 +-
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |  14 +-
 .../DanaRS_Packet_Etc_Keep_ConnectionTest.kt  |  14 +-
 .../DanaRS_Packet_Etc_Set_History_SaveTest.kt |  12 +-
 ...naRS_Packet_General_Delivery_StatusTest.kt |  12 +-
 ...Packet_General_Get_More_InformationTest.kt |  15 +-
 .../DanaRS_Packet_General_Get_PasswordTest.kt |  17 +-
 ...anaRS_Packet_General_Get_Pump_CheckTest.kt |  17 +-
 ...et_General_Get_Shipping_InformationTest.kt |  15 +-
 ...Packet_General_Get_Shipping_VerisonTest.kt |  13 +-
 ...et_General_Get_Today_Delivery_TotalTest.kt |  17 +-
 ...t_General_Get_User_Time_Change_FlagTest.kt |  16 +-
 ..._General_Initial_Screen_InformationTest.kt |  17 +-
 ...ket_General_Set_History_Upload_ModeTest.kt |  14 +-
 ...ral_Set_User_Time_Change_Flag_ClearTest.kt |  14 +-
 .../comm/DanaRS_Packet_History_AlarmTest.kt   |  13 +-
 .../DanaRS_Packet_History_All_HistoryTest.kt  |  15 +-
 .../comm/DanaRS_Packet_History_BasalTest.kt   |  15 +-
 ...DanaRS_Packet_History_Blood_GlucoseTest.kt |  15 +-
 .../comm/DanaRS_Packet_History_BolusTest.kt   |  15 +-
 .../DanaRS_Packet_History_CarbohydrateTest.kt |  15 +-
 .../comm/DanaRS_Packet_History_DailyTest.kt   |  15 +-
 .../comm/DanaRS_Packet_History_PrimeTest.kt   |  15 +-
 .../comm/DanaRS_Packet_History_RefillTest.kt  |  15 +-
 .../comm/DanaRS_Packet_History_SuspendTest.kt |  15 +-
 .../DanaRS_Packet_History_TemporaryTest.kt    |  15 +-
 .../comm/DanaRS_Packet_Notify_AlarmTest.kt    |  14 +-
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |  14 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |  14 +-
 ...RS_Packet_Notify_Missed_Bolus_AlarmTest.kt |  14 +-
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt |  13 +-
 ...anaRS_Packet_Option_Get_User_OptionTest.kt |  15 +-
 .../DanaRS_Packet_Option_Set_Pump_TimeTest.kt |  14 +-
 ...anaRS_Packet_Option_Set_User_OptionTest.kt |  15 +-
 .../DanaRS_Packet_Review_Bolus_AvgTest.kt     |  12 +-
 ...RS_Packet_Review_Get_Pump_Dec_RatioTest.kt |  15 +-
 140 files changed, 1396 insertions(+), 646 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 6d334aa3d4..44fdc075f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -74,7 +74,7 @@ import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 import javax.inject.Singleton
 
-@Module(includes = [AppModule.AppBindings::class, PluginsModule::class])
+@Module(includes = [AppModule.AppBindings::class, PluginsModule::class, DanaRSCommModule::class])
 open class AppModule {
 
     @Provides
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
new file mode 100644
index 0000000000..fa915f8246
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
@@ -0,0 +1,79 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.*
+
+@Module
+@Suppress("unused")
+abstract class DanaRSCommModule {
+
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet(): DanaRS_Packet
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(): DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Basal_Rate(): DanaRS_Packet_Basal_Get_Basal_Rate
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Profile_Basal_Rate(): DanaRS_Packet_Basal_Get_Profile_Basal_Rate
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Profile_Number(): DanaRS_Packet_Basal_Get_Profile_Number
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Basal_Rate(): DanaRS_Packet_Basal_Set_Basal_Rate
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Profile_Basal_Rate(): DanaRS_Packet_Basal_Set_Profile_Basal_Rate
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Profile_Number(): DanaRS_Packet_Basal_Set_Profile_Number
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Suspend_Off(): DanaRS_Packet_Basal_Set_Suspend_Off
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Suspend_On(): DanaRS_Packet_Basal_Set_Suspend_On
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Set_Temporary_Basal(): DanaRS_Packet_Basal_Set_Temporary_Basal
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Basal_Get_Temporary_Basal_State(): DanaRS_Packet_Basal_Get_Temporary_Basal_State
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Bolus_Option(): DanaRS_Packet_Bolus_Get_Bolus_Option
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Initial_Bolus(): DanaRS_Packet_Bolus_Get_Initial_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Calculation_Information(): DanaRS_Packet_Bolus_Get_Calculation_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(): DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_CIR_CF_Array(): DanaRS_Packet_Bolus_Get_CIR_CF_Array
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Dual_Bolus(): DanaRS_Packet_Bolus_Get_Dual_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus(): DanaRS_Packet_Bolus_Get_Extended_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus_State(): DanaRS_Packet_Bolus_Get_Extended_Bolus_State
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(): DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Step_Bolus_Information(): DanaRS_Packet_Bolus_Get_Step_Bolus_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Bolus_Option(): DanaRS_Packet_Bolus_Set_Bolus_Option
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Initial_Bolus(): DanaRS_Packet_Bolus_Set_Initial_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_CIR_CF_Array(): DanaRS_Packet_Bolus_Set_CIR_CF_Array
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Dual_Bolus(): DanaRS_Packet_Bolus_Set_Dual_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus(): DanaRS_Packet_Bolus_Set_Extended_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(): DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Step_Bolus_Start(): DanaRS_Packet_Bolus_Set_Step_Bolus_Start
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Step_Bolus_Stop(): DanaRS_Packet_Bolus_Set_Step_Bolus_Stop
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Etc_Keep_Connection(): DanaRS_Packet_Etc_Keep_Connection
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Etc_Set_History_Save(): DanaRS_Packet_Etc_Set_History_Save
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Delivery_Status(): DanaRS_Packet_General_Delivery_Status
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Password(): DanaRS_Packet_General_Get_Password
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Initial_Screen_Information(): DanaRS_Packet_General_Initial_Screen_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Alarm(): DanaRS_Packet_Notify_Alarm
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Delivery_Complete(): DanaRS_Packet_Notify_Delivery_Complete
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Delivery_Rate_Display(): DanaRS_Packet_Notify_Delivery_Rate_Display
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Notify_Missed_Bolus_Alarm(): DanaRS_Packet_Notify_Missed_Bolus_Alarm
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_Pump_Time(): DanaRS_Packet_Option_Get_Pump_Time
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_User_Option(): DanaRS_Packet_Option_Get_User_Option
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_Pump_Time(): DanaRS_Packet_Option_Set_Pump_Time
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_User_Option(): DanaRS_Packet_Option_Set_User_Option
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_(): DanaRS_Packet_History_
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Alarm(): DanaRS_Packet_History_Alarm
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_All_History(): DanaRS_Packet_History_All_History
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Basal(): DanaRS_Packet_History_Basal
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Blood_Glucose(): DanaRS_Packet_History_Blood_Glucose
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Bolus(): DanaRS_Packet_History_Bolus
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Review_Bolus_Avg(): DanaRS_Packet_Review_Bolus_Avg
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Carbohydrate(): DanaRS_Packet_History_Carbohydrate
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Daily(): DanaRS_Packet_History_Daily
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_More_Information(): DanaRS_Packet_General_Get_More_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Pump_Check(): DanaRS_Packet_General_Get_Pump_Check
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Shipping_Information(): DanaRS_Packet_General_Get_Shipping_Information
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Today_Delivery_Total(): DanaRS_Packet_General_Get_Today_Delivery_Total
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_User_Time_Change_Flag(): DanaRS_Packet_General_Get_User_Time_Change_Flag
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Prime(): DanaRS_Packet_History_Prime
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Refill(): DanaRS_Packet_History_Refill
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Set_History_Upload_Mode(): DanaRS_Packet_General_Set_History_Upload_Mode
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(): DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Suspend(): DanaRS_Packet_History_Suspend
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_History_Temporary(): DanaRS_Packet_History_Temporary
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_Basal_Set_Temporary_Basal(): DanaRS_Packet_APS_Basal_Set_Temporary_Basal
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_History_Events(): DanaRS_Packet_APS_History_Events
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_Set_Event_History(): DanaRS_Packet_APS_Set_Event_History
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Shipping_Version(): DanaRS_Packet_General_Get_Shipping_Version
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Review_Get_Pump_Dec_Ratio(): DanaRS_Packet_Review_Get_Pump_Dec_Ratio
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index cb6cbcee17..fea80dc506 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -1,29 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class DanaRSMessageHashTable @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    danaRPump: DanaRPump,
-    activePlugin: ActivePluginProvider,
-    constraintChecker: ConstraintChecker,
-    detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    sp: SP,
-    injector: HasAndroidInjector
+    val injector: HasAndroidInjector
 ) {
 
     var messages: HashMap<Int, DanaRS_Packet> = HashMap()
@@ -33,78 +17,78 @@ class DanaRSMessageHashTable @Inject constructor(
     }
 
     fun findMessage(command: Int): DanaRS_Packet {
-        return messages[command] ?: DanaRS_Packet()
+        return messages[command] ?: DanaRS_Packet(injector)
     }
 
     init {
-        put(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
-        put(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump))
-        put(DanaRS_Packet_Basal_Get_Profile_Basal_Rate(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Basal_Set_Basal_Rate(aapsLogger, arrayOf()))
-        put(DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, arrayOf()))
-        put(DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger))
-        put(DanaRS_Packet_Basal_Set_Suspend_Off(aapsLogger))
-        put(DanaRS_Packet_Basal_Set_Suspend_On(aapsLogger))
-        put(DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger))
-        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger))
-        put(DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Dual_Bolus(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker))
-        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump))
-        put(DanaRS_Packet_Etc_Keep_Connection(aapsLogger))
-        put(DanaRS_Packet_Etc_Set_History_Save(aapsLogger))
-        put(DanaRS_Packet_General_Delivery_Status(aapsLogger))
-        put(DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump))
-        put(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper, rxBus))
-        put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRPump))
-        put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRPump))
-        put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger))
-        put(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger))
-        put(DanaRS_Packet_Option_Set_User_Option(aapsLogger, danaRPump))
-        //put(new DanaRS_Packet_History_());
-        put(DanaRS_Packet_History_Alarm(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_All_History(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Basal(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Bolus(aapsLogger, rxBus))
-        put(DanaRS_Packet_Review_Bolus_Avg(aapsLogger))
-        put(DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Daily(aapsLogger, rxBus))
-        put(DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper))
-        put(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump))
-        put(DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump))
-        put(DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger))
-        put(DanaRS_Packet_History_Prime(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Refill(aapsLogger, rxBus))
-        put(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger))
-        put(DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(aapsLogger))
-        put(DanaRS_Packet_History_Suspend(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
+        put(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
+        put(DanaRS_Packet_Basal_Get_Basal_Rate(injector))
+        put(DanaRS_Packet_Basal_Get_Profile_Basal_Rate(injector))
+        put(DanaRS_Packet_Basal_Get_Profile_Number(injector))
+        put(DanaRS_Packet_Basal_Set_Basal_Rate(injector, arrayOf()))
+        put(DanaRS_Packet_Basal_Set_Profile_Basal_Rate(injector, 0, arrayOf()))
+        put(DanaRS_Packet_Basal_Set_Profile_Number(injector))
+        put(DanaRS_Packet_Basal_Set_Suspend_Off(injector))
+        put(DanaRS_Packet_Basal_Set_Suspend_On(injector))
+        put(DanaRS_Packet_Basal_Set_Temporary_Basal(injector))
+        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
+        put(DanaRS_Packet_Bolus_Get_Bolus_Option(injector))
+        put(DanaRS_Packet_Bolus_Get_Initial_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Get_Calculation_Information(injector))
+        put(DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(injector))
+        put(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
+        put(DanaRS_Packet_Bolus_Get_Dual_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Get_Extended_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
+        put(DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(injector))
+        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector))
+        put(DanaRS_Packet_Bolus_Set_Bolus_Option(injector))
+        put(DanaRS_Packet_Bolus_Set_Initial_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(injector))
+        put(DanaRS_Packet_Bolus_Set_Dual_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Set_Extended_Bolus(injector))
+        put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(injector))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Start(injector))
+        put(DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector))
+        put(DanaRS_Packet_Etc_Keep_Connection(injector))
+        put(DanaRS_Packet_Etc_Set_History_Save(injector))
+        put(DanaRS_Packet_General_Delivery_Status(injector))
+        put(DanaRS_Packet_General_Get_Password(injector))
+        put(DanaRS_Packet_General_Initial_Screen_Information(injector))
+        put(DanaRS_Packet_Notify_Alarm(injector))
+        put(DanaRS_Packet_Notify_Delivery_Complete(injector))
+        put(DanaRS_Packet_Notify_Delivery_Rate_Display(injector))
+        put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(injector))
+        put(DanaRS_Packet_Option_Get_Pump_Time(injector))
+        put(DanaRS_Packet_Option_Get_User_Option(injector))
+        put(DanaRS_Packet_Option_Set_Pump_Time(injector))
+        put(DanaRS_Packet_Option_Set_User_Option(injector))
+        //put(new DanaRS_Packet_History_(injector));
+        put(DanaRS_Packet_History_Alarm(injector))
+        put(DanaRS_Packet_History_All_History(injector))
+        put(DanaRS_Packet_History_Basal(injector))
+        put(DanaRS_Packet_History_Blood_Glucose(injector))
+        put(DanaRS_Packet_History_Bolus(injector))
+        put(DanaRS_Packet_Review_Bolus_Avg(injector))
+        put(DanaRS_Packet_History_Carbohydrate(injector))
+        put(DanaRS_Packet_History_Daily(injector))
+        put(DanaRS_Packet_General_Get_More_Information(injector))
+        put(DanaRS_Packet_General_Get_Pump_Check(injector))
+        put(DanaRS_Packet_General_Get_Shipping_Information(injector))
+        put(DanaRS_Packet_General_Get_Today_Delivery_Total(injector))
+        put(DanaRS_Packet_General_Get_User_Time_Change_Flag(injector))
+        put(DanaRS_Packet_History_Prime(injector))
+        put(DanaRS_Packet_History_Refill(injector))
+        put(DanaRS_Packet_General_Set_History_Upload_Mode(injector))
+        put(DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(injector))
+        put(DanaRS_Packet_History_Suspend(injector))
+        put(DanaRS_Packet_History_Temporary(injector))
         // APS
-        put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
-        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, injector, 0))
-        put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
+        put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, 0))
+        put(DanaRS_Packet_APS_History_Events(injector, 0))
+        put(DanaRS_Packet_APS_Set_Event_History(injector, 0, 0, 0, 0))
         // v3
-        put(DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Review_Get_Pump_Dec_Ratio(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Get_Shipping_Version(injector))
+        put(DanaRS_Packet_Review_Get_Pump_Dec_Ratio(injector))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 9bb70720fb..275ba6f145 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -3,16 +3,26 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption;
+
 import org.slf4j.Logger;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 public class DanaRS_Packet {
-    private static final Logger log = StacktraceLoggerWrapper.getLogger(DanaRS_Packet.class);
+
+    @Inject AAPSLogger aapsLogger;
+
+    protected HasAndroidInjector injector;
 
     protected static final int TYPE_START = 0;
     protected static final int OPCODE_START = 1;
@@ -23,9 +33,11 @@ public class DanaRS_Packet {
     protected int type = BleEncryption.DANAR_PACKET__TYPE_RESPONSE; // most of the messages, should be changed for others
     protected int opCode;
 
-    public DanaRS_Packet() {
+    public DanaRS_Packet(HasAndroidInjector injector) {
         received = false;
         failed = false;
+        this.injector = injector;
+        injector.androidInjector().inject(this);
     }
 
     public void setReceived() {
@@ -54,7 +66,7 @@ public class DanaRS_Packet {
 
     // STATIC FUNCTIONS
 
-    public static int getCommand(byte[] data) {
+    public int getCommand(byte[] data) {
         int type = byteArrayToInt(getBytes(data, TYPE_START, 1));
         int opCode = byteArrayToInt(getBytes(data, OPCODE_START, 1));
         return ((type & 0xFF) << 8) + (opCode & 0xFF);
@@ -70,7 +82,7 @@ public class DanaRS_Packet {
         return "UNKNOWN_PACKET";
     }
 
-    protected static byte[] getBytes(byte[] data, int srcStart, int srcLength) {
+    protected byte[] getBytes(byte[] data, int srcStart, int srcLength) {
         try {
             byte[] ret = new byte[srcLength];
 
@@ -78,7 +90,7 @@ public class DanaRS_Packet {
 
             return ret;
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error(LTag.PUMPBTCOMM, "Unhandled exception", e);
         }
         return null;
     }
@@ -148,7 +160,7 @@ public class DanaRS_Packet {
         return new String(strbuff, StandardCharsets.UTF_8);
     }
 
-    public static long dateFromBuff(byte[] buff, int offset) {
+    public long dateFromBuff(byte[] buff, int offset) {
         return
                 new Date(
                         100 + byteArrayToInt(getBytes(buff, offset, 1)),
@@ -159,7 +171,7 @@ public class DanaRS_Packet {
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
 
-    public static String asciiStringFromBuff(byte[] buff, int offset, int length) {
+    public String asciiStringFromBuff(byte[] buff, int offset, int length) {
         byte[] strbuff = new byte[length];
         System.arraycopy(buff, offset, strbuff, 0, length);
         for (int pos = 0; pos < length; pos++)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
index 89a2c3fac3..bfcfeac676 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var percent: Int
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     var temporaryBasalRatio = 0
     var temporaryBasalDuration = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 5ca6eac5a2..14da2a9b8e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.dialogs.FillDialog
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -20,18 +19,19 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
+import javax.inject.Inject
 
 open class DanaRS_Packet_APS_History_Events(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val activePlugin: ActivePluginProvider,
-    private val danaRPump: DanaRPump,
-    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    private val sp: SP,
-    private val injector: HasAndroidInjector,
+    injector: HasAndroidInjector,
     private var from: Long
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var sp: SP
 
     private var year = 0
     private var month = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
index 861854d77b..7f6c1e342f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -1,19 +1,19 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import java.util.*
 
 class DanaRS_Packet_APS_Set_Event_History(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var packetType: Int,
     private var time: Long,
     private var param1: Int,
     private var param2: Int
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index 8cdbbe2d65..b25bc2c587 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -1,23 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
+import javax.inject.Inject
 
 class DanaRS_Packet_Basal_Get_Basal_Rate(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
@@ -31,7 +33,7 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
         dataIndex += dataSize
         dataSize = 1
         danaRPump.basalStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         var i = 0
         val size = 24
         while (i < size) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
index 9b0de5603c..bbac168239 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -1,16 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import java.util.*
+import javax.inject.Inject
 
 open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    injector: HasAndroidInjector,
     private val profileNumber: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
@@ -26,7 +28,7 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 2
-        danaRPump.pumpProfiles = Array(4) {Array(48) {0.0} }
+        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         var i = 0
         val size = 24
         while (i < size) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
index bdd586e948..c973a5aa11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Basal_Get_Profile_Number(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index bb5f0d8d98..709438d8df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -1,16 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
+import javax.inject.Inject
 import kotlin.math.ceil
 
 class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
index 28d7b6b693..f16bc7c0cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Basal_Rate(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var profileBasalRate: Array<Double>
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
index c30b938002..c7fa4c3536 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__CANCEL_TEMPORARY_BASAL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
index 189a704e0c..ddf0adba78 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var profileNumber: Int,
     private var profileBasalRate: Array<Double>
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_BASAL_RATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
index 2056889532..7c0994196b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Profile_Number(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var profileNumber: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_PROFILE_NUMBER
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
index eff81eb0bb..3608ee30ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Suspend_Off(
-    private val aapsLogger: AAPSLogger
-    ) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_OFF
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
index e3a3f9d228..df5bee1aac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Suspend_On(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_SUSPEND_ON
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
index f4318fb0b3..cbd91aa051 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 open class DanaRS_Packet_Basal_Set_Temporary_Basal(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var temporaryBasalRatio: Int = 0,
     private var temporaryBasalDuration: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index 8918094938..432f0792dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -1,23 +1,24 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Bolus_Option(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
-) : DanaRS_Packet() {
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index d981da5033..4af5c48fac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index 6c19045a2f..8f618bce4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Calculation_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
index c1bd0aeb40..ad7a5de3b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
index 97d40dd0af..8334d04028 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Dual_Bolus(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
index 9d96debe56..4795b08482 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Bolus(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
index ef24b5cec1..ecf337987e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
index cd16a68bb7..001107cfa2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
index 50f5864e81..c301490a9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Get_Initial_Bolus(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_RATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index dca14ce099..6a90788340 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -1,17 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
-import java.util.*
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
index 21d9b39d56..ebf19f1459 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Bolus_Option(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var extendedBolusOptionOnOff: Int = 0,
     private var bolusCalculationOption: Int = 0,
     private var missedBolusConfig: Int = 0,
@@ -26,7 +26,7 @@ class DanaRS_Packet_Bolus_Set_Bolus_Option(
     private var missedBolus04EndHour: Int = 0,
     private var missedBolus04EndMin: Int = 0
 
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
index 137c1633b6..cf2bfa44d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var cir01: Int = 0,
     private var cir02: Int = 0,
     private var cir03: Int = 0,
@@ -20,7 +20,7 @@ class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
     private var cf05: Int = 0,
     private var cf06: Int = 0,
     private var cf07: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
index 919039319b..d9c18cb839 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
@@ -1,16 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Dual_Bolus(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var amount: Double = 0.0,
     private var extendedAmount: Double = 0.0,
     private var extendedBolusDurationInHalfHours: Int = 0
-) : DanaRS_Packet() {
-
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_DUAL_BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
index 222152c2a8..095f9f5080 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
@@ -1,15 +1,14 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Extended_Bolus(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var extendedAmount: Double = 0.0,
     private var extendedBolusDurationInHalfHours: Int = 0
-) : DanaRS_Packet() {
-
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
index 868dd5f7b6..4b36940aaf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_EXTENDED_BOLUS_CANCEL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
index eecd43c6ca..0229c9434c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
@@ -1,16 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Initial_Bolus(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var bolusRate01: Int = 0,
     private var bolusRate02: Int = 0,
     private var bolusRate03: Int = 0,
     private var bolusRate04: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_RATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index d9dc8f0d95..9dfc6016c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -1,20 +1,21 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
-    constraintChecker: ConstraintChecker,
+    injector: HasAndroidInjector,
     private var amount: Double = 0.0,
     private var speed: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var constraintChecker: ConstraintChecker
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_START
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index c5c1ace3b4..cf42e445ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -1,21 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 
 open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
index 1038881c2e..89ae76b68e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Etc_Keep_Connection(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
index ae1fac6bff..2859aa8496 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Etc_Set_History_Save(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var historyType: Int = 0,
     private var historyYear: Int = 0,
     private var historyMonth: Int = 0,
@@ -15,8 +15,7 @@ class DanaRS_Packet_Etc_Set_History_Save(
     private var historySecond: Int = 0,
     private var historyCode: Int = 0,
     private var historyValue: Int = 0
-) : DanaRS_Packet() {
-
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
index 21937923fc..eb71b50be1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_General_Delivery_Status(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DELIVERY_STATUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
index eb7d617d3b..2d0dee2c53 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -1,16 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_More_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
index 58cdf77ae9..dcbbb54136 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Password(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index be57043e89..dc942cdfe9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
@@ -9,13 +9,15 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Pump_Check(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index 6bf3296af1..99eed59d76 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -1,15 +1,17 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Shipping_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
index 9d3d83fbf4..e13912f666 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
@@ -1,15 +1,17 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import java.nio.charset.Charset
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Shipping_Version(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
index fe9c676ca9..2075528d8a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Today_Delivery_Total(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
index 45e68600d7..6ff8fa6231 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_General_Get_User_Time_Change_Flag(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_USER_TIME_CHANGE_FLAG
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index 0510c28271..586577be09 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_General_Initial_Screen_Information(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
index e26e13e6f0..969dd36c87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_General_Set_History_Upload_Mode(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var mode: Int = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_HISTORY_UPLOAD_MODE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
index 969f226fb0..4190545f99 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
@@ -1,17 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SET_USER_TIME_CHANGE_FLAG_CLEAR
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
+
     override fun handleMessage(data: ByteArray) {
         val result = intFromBuff(data, 0, 1)
         if (result == 0) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
index 4273f6ca0d..00b00a0fc0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
@@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DanaRHistoryRecord
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
@@ -10,12 +10,14 @@ import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
 import java.util.*
+import javax.inject.Inject
 
 abstract class DanaRS_Packet_History_(
-    protected val aapsLogger: AAPSLogger,
-    protected val rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     protected val from: Long
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
 
     protected var year = 0
     protected var month = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
index bcf3ffc1df..eef5b0bac1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALARM
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
index 2b42507888..298d0005c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_All_History(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
index 09173ed5c1..afd2469f64 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Basal @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BASAL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
index 7f07e71680..eda50d6749 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
index d6f8b51707..6970681afb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
index ed3b49a8d7..2ddeae6a9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
index 645cab8272..4ce5d88af5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Daily @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__DAILY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
index da209b0a8a..93dd90576f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Prime @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__PRIME
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
index 8b470a0170..adeff980df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Refill @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__REFILL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
index 2e5ad23dd9..614b728971 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
@@ -1,15 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 
 class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
index 5689ca82c5..045457a699 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_History_Temporary(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
+    injector: HasAndroidInjector,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(injector, from) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
index f461c65f3c..de92b18367 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -1,20 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 
 class DanaRS_Packet_Notify_Alarm(
-    private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
-    private val rxBus: RxBusWrapper
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index c4e5d5a06d..fd059dfe57 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -1,21 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 import kotlin.math.min
 
 class DanaRS_Packet_Notify_Delivery_Complete(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index 0a256ed088..27d6c011a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -1,22 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
 import kotlin.math.min
 
 class DanaRS_Packet_Notify_Delivery_Rate_Display(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
index f15582f3d0..afe2599866 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 4db309afe0..e6bca23320 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -1,16 +1,18 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
+import javax.inject.Inject
 
 class DanaRS_Packet_Option_Get_Pump_Time(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
index a012b1302b..6e44cdace8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Option_Get_User_Option(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
index 73cf49c6df..d6bb703beb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -1,15 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
 
 class DanaRS_Packet_Option_Set_Pump_Time(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var time: Long = 0
-) : DanaRS_Packet() {
+) : DanaRS_Packet(injector) {
 
     var error = 0
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
index d266bf765b..01ca99c2e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -1,15 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Option_Set_User_Option(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
index ee953d8581..04751087eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 
 class DanaRS_Packet_Review_Bolus_Avg(
-    private val aapsLogger: AAPSLogger
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__BOLUS_AVG
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
index 23d903de0b..182f58c3fe 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
@@ -1,14 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import javax.inject.Inject
 
 class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
-    private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-) : DanaRS_Packet() {
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index e46aff33d7..255a86d1f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.SystemClock
 import android.util.Base64
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -33,6 +34,7 @@ import javax.inject.Singleton
 
 @Singleton
 class BLEComm @Inject internal constructor(
+    private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val context: Context,
@@ -695,7 +697,7 @@ class BLEComm @Inject internal constructor(
     // process common packet response
     private fun processMessage(decryptedBuffer: ByteArray) {
         val originalCommand = processedMessage?.command ?: 0xFFFF
-        val receivedCommand = DanaRS_Packet.getCommand(decryptedBuffer)
+        val receivedCommand = DanaRS_Packet(injector).getCommand(decryptedBuffer)
         val message: DanaRS_Packet? = if (originalCommand == receivedCommand) {
             // it's response to last message
             processedMessage
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
index 3d8a5c6a40..9c2e37214e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
@@ -112,25 +112,25 @@ class DanaRSService : DaggerService() {
     fun readPumpStatus() {
         try {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
-            sendMessage(DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump))
+            sendMessage(DanaRS_Packet_General_Initial_Screen_Information(injector))
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)))
-            sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+            sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
-            sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)) // last bolus, bolusStep, maxBolus
+            sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector)) // last bolus, bolusStep, maxBolus
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)))
-            sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+            sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
             danaRPump.lastConnection = System.currentTimeMillis()
             val profile = profileFunction.getProfile()
             val pump = activePlugin.activePump
             if (profile != null && abs(danaRPump.currentBasal - profile.basal) >= pump.pumpDescription.basalStep) {
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
-                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)) // basal profile, basalStep, maxBasal
+                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(EventProfileNeedsUpdate())
                 }
             }
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
-            sendMessage(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+            sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
             var timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
             if (danaRPump.pumpTime == 0L) {
                 // initial handshake was not successful
@@ -143,14 +143,14 @@ class DanaRSService : DaggerService() {
             val now = System.currentTimeMillis()
             if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
-                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)) // serial no
-                sendMessage(DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)) // firmware
-                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump))
-                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)) // isExtendedEnabled
-                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)) // basal profile, basalStep, maxBasal
-                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)) // target
-                sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump))
-                sendMessage(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)) // Getting user options
+                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
+                sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
+                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
+                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
+                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
+                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
+                sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
+                sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
                 danaRPump.lastSettingsRead = now
             }
             aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
@@ -172,13 +172,13 @@ class DanaRSService : DaggerService() {
                     return
                 } else {
                     if (danaRPump.protocol >= 6) {
-                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now()))
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now()))
                     } else {
                         waitForWholeMinute() // Dana can set only whole minute
                         // add 10sec to be sure we are over minute (will be cut off anyway)
-                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now() + T.secs(10).msecs()))
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now() + T.secs(10).msecs()))
                     }
-                    sendMessage(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+                    sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
                     timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
                 }
@@ -211,10 +211,10 @@ class DanaRSService : DaggerService() {
         SystemClock.sleep(1000)
         val msg: DanaRS_Packet_APS_History_Events
         if (lastHistoryFetched == 0L) {
-            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, injector, 0)
+            msg = DanaRS_Packet_APS_History_Events(injector, 0)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history")
         } else {
-            msg = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, injector, lastHistoryFetched)
+            msg = DanaRS_Packet_APS_History_Events(injector, lastHistoryFetched)
             aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched))
         }
         sendMessage(msg)
@@ -228,7 +228,7 @@ class DanaRSService : DaggerService() {
     }
 
     fun setUserSettings(): PumpEnactResult {
-        sendMessage(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_Option_Get_User_Option(injector))
         return PumpEnactResult(injector).success(true)
     }
 
@@ -243,11 +243,11 @@ class DanaRSService : DaggerService() {
         danaRPump.bolusStopped = false
         danaRPump.bolusStopForced = false
         danaRPump.bolusProgressLastTimeStamp = DateUtil.now()
-        val start = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker, insulin, preferencesSpeed)
+        val start = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(injector, insulin, preferencesSpeed)
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, DanaRPump.CARBS, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             lastHistoryFetched = min(lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
@@ -291,7 +291,7 @@ class DanaRSService : DaggerService() {
             override fun run() {
                 // reread bolus status
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
-                sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)) // last bolus
+                sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector)) // last bolus
                 bolusingEvent.percent = 100
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
             }
@@ -301,7 +301,7 @@ class DanaRSService : DaggerService() {
 
     fun bolusStop() {
         aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (bolusingTreatment == null) "" else bolusingTreatment?.insulin)
-        val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump)
+        val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector)
         danaRPump.bolusStopForced = true
         if (isConnected) {
             sendMessage(stop)
@@ -318,13 +318,13 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return false
         if (danaRPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        sendMessage(DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, percent, durationInHours))
+        sendMessage(DanaRS_Packet_Basal_Set_Temporary_Basal(injector, percent, durationInHours))
         SystemClock.sleep(200)
-        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -333,12 +333,12 @@ class DanaRSService : DaggerService() {
     fun highTempBasal(percent: Int): Boolean {
         if (danaRPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent))
-        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, percent))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -351,12 +351,12 @@ class DanaRSService : DaggerService() {
         }
         if (danaRPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
+            sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
         }
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
-        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent))
-        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(injector, percent))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -365,8 +365,8 @@ class DanaRSService : DaggerService() {
     fun tempBasalStop(): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
-        sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger))
-        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
+        sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -375,9 +375,9 @@ class DanaRSService : DaggerService() {
     fun extendedBolus(insulin: Double, durationInHalfHours: Int): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
-        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, insulin, durationInHalfHours))
+        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus(injector, insulin, durationInHalfHours))
         SystemClock.sleep(200)
-        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -386,8 +386,8 @@ class DanaRSService : DaggerService() {
     fun extendedBolusStop(): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
-        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger))
-        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
+        sendMessage(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(injector))
+        sendMessage(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
         loadEvents()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true
@@ -397,9 +397,9 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
         val basal = danaRPump.buildDanaRProfileRecord(profile)
-        val msgSet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 0, basal)
+        val msgSet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(injector, 0, basal)
         sendMessage(msgSet)
-        val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 0)
+        val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(injector, 0)
         sendMessage(msgActivate)
         danaRPump.lastSettingsRead = 0 // force read full settings
         readPumpStatus()
@@ -412,25 +412,25 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return result
         var msg: DanaRS_Packet_History_? = null
         when (type) {
-            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(aapsLogger, rxBus)
-            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(aapsLogger, rxBus)
+            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(injector)
+            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(injector)
+            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(injector)
+            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(injector)
+            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(injector)
+            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(injector)
+            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(injector)
+            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(injector)
+            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(injector)
         }
         if (msg != null) {
-            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1))
+            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(injector, 1))
             SystemClock.sleep(200)
             sendMessage(msg)
             while (!msg.done && isConnected) {
                 SystemClock.sleep(100)
             }
             SystemClock.sleep(200)
-            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 0))
+            sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(injector, 0))
         }
         result.success = true
         result.comment = "OK"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index c5ed222313..d50ee1ba25 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -1,11 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import org.junit.Assert
 import org.junit.Test
@@ -16,19 +17,36 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, DanaRSPlugin::class)
+@PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
 class DanaRSMessageHashTableTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet) {
+                it.aapsLogger = aapsLogger
+            }
+            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+                it.constraintChecker = constraintChecker
+            }
+            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+                it.danaRPump = danaRPump
+            }
+            if (it is DanaRS_Packet_APS_History_Events) {
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
-        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin, constraintChecker, detailedBolusInfoStorage, sp, injector)
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
+        val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
+        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
index 835a56be84..8672867161 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,30 +12,38 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_APS_Basal_Set_Temporary_Basal) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
 
         // under 100% should last 30 min
-        var packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0)
+        var packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 0)
         Assert.assertEquals(0, packet.temporaryBasalRatio)
         Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
         //constructor with param
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 10)
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 10)
         Assert.assertEquals(10, packet.temporaryBasalRatio)
         Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
         // over 100% should last 15 min
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 150)
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 150)
         Assert.assertEquals(150, packet.temporaryBasalRatio)
         Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
         // test low hard limit
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, -1)
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, -1)
         Assert.assertEquals(0, packet.temporaryBasalRatio)
         Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM30MIN, packet.temporaryBasalDuration)
         // test high hard limit
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 550)
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 550)
         Assert.assertEquals(500, packet.temporaryBasalRatio)
         Assert.assertEquals(DanaRS_Packet_APS_Basal_Set_Temporary_Basal.PARAM15MIN, packet.temporaryBasalDuration)
         // test message generation
-        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 260)
+        packet = DanaRS_Packet_APS_Basal_Set_Temporary_Basal(packetInjector, 260)
         val generatedCode = packet.requestParams
         Assert.assertEquals(3, generatedCode.size.toLong())
         Assert.assertEquals(4.toByte(), generatedCode[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 49871ade89..97c7fbe1a5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -20,10 +22,24 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_APS_History_Events) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePlugin
+                it.danaRPump = danaRPump
+                it.detailedBolusInfoStorage = detailedBolusInfoStorage
+                it.sp = sp
+            }
+        }
+    }
+
     @Test fun runTest() {
         val now = DateUtil.now()
 
-        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRPump, detailedBolusInfoStorage, sp, injector, now)
+        val testPacket = DanaRS_Packet_APS_History_Events(packetInjector, now)
         // test getRequestedParams
         val returnedValues = testPacket.requestParams
         val expectedValues = getCalender(now)
@@ -45,7 +61,7 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
         Assert.assertEquals("APS_HISTORY_EVENTS", testPacket.friendlyName)
     }
 
-    fun getCalender(from: Long): ByteArray {
+    private fun getCalender(from: Long): ByteArray {
         val cal = GregorianCalendar()
         if (from != 0L) cal.timeInMillis = from else cal[2000, 0, 1, 0, 0] = 0
         val ret = ByteArray(6)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index 33e343ee08..b252c07830 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
@@ -12,21 +14,29 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_APS_Set_Event_History) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() { // test for negative carbs
         val now = DateUtil.now()
-        var historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, -1, 0)
+        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, -1, 0)
         var testparams = historyTest.requestParams
         Assert.assertEquals(0.toByte(), testparams[8])
         // 5g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         // 150g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 150, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 150, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(150.toByte(), testparams[8])
         // test message generation
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         Assert.assertEquals(11, testparams.size)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
index 2c5b7ffec1..aa79c64b03 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
@@ -11,9 +13,19 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(RxBusWrapper::class)
 class DanaRS_Packet_Basal_Get_Basal_RateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Get_Basal_Rate) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
+        }
+    }
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Basal_Rate(aapsLogger, rxBus, resourceHelper, danaRPump)
+        val packet = DanaRS_Packet_Basal_Get_Basal_Rate(packetInjector)
         // test message decoding
         // rate is 0.01
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
index 59e6356f16..7cc2d5cb5c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
@@ -1,23 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Basal_Get_Profile_Basal_RateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Get_Profile_Basal_Rate) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val testPacket = DanaRS_Packet_Basal_Get_Profile_Basal_Rate(aapsLogger, danaRPump, 1)
+        val testPacket = DanaRS_Packet_Basal_Get_Profile_Basal_Rate(packetInjector, 1)
         // test if pumpProfile array is set right
-        val basal01 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 1.toByte()), 2, 2)) / 100.0
-        val basal05 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 5.toByte()), 2, 2)) / 100.0
-        val basal12 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 12.toByte()), 2, 2)) / 100.0
+        val basal01 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 1.toByte()), 2, 2)) / 100.0
+        val basal05 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 5.toByte()), 2, 2)) / 100.0
+        val basal12 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 12.toByte()), 2, 2)) / 100.0
         // basal rate > 1U/hr
-        val basal120 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet.getBytes(createArray(50, 120.toByte()), 2, 2)) / 100.0
+        val basal120 = DanaRS_Packet.byteArrayToInt(DanaRS_Packet(packetInjector).getBytes(createArray(50, 120.toByte()), 2, 2)) / 100.0
         val params = testPacket.requestParams
         assertEquals(1.toByte(), params[0])
         testPacket.handleMessage(createArray(50, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
index f8468573cd..458370fdc5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Get_Profile_NumberTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Get_Profile_Number) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Basal_Get_Profile_Number(packetInjector)
 
         val array = ByteArray(100)
         putByteToArray(array, 0, 1.toByte())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
index f8e3472c8e..115dba03b0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Get_Temporary_Basal_State) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(packetInjector)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1.toByte())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
index d4e2b2de06..58d89e6220 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,9 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Basal_RateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Basal_Rate) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
         // test message decoding
-        val packet = DanaRS_Packet_Basal_Set_Basal_Rate(aapsLogger, createArray(24, 5.0))
+        val packet = DanaRS_Packet_Basal_Set_Basal_Rate(packetInjector, createArray(24, 5.0))
         val requested = packet.requestParams
         var lookingFor = (5 * 100 and 0xff).toByte()
         Assert.assertEquals(lookingFor, requested[24])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
index 4c127cf437..a48dc769eb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger)
+        val packet = DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(packetInjector)
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
index d2d918726f..035387ac85 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Profile_Basal_RateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Profile_Basal_Rate) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(aapsLogger, 1, createArray(24, 1.0))
+        val packet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(packetInjector, 1, createArray(24, 1.0))
         // test params
         val testparams = packet.requestParams
         // is profile 1
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
index 8b15bf2863..a39c2efde9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Profile_NumberTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Profile_Number) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Profile_Number(aapsLogger, 1)
+        val packet = DanaRS_Packet_Basal_Set_Profile_Number(packetInjector, 1)
         // test params
         val testparams = packet.requestParams
         // is profile 1
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
index aa6d5832ad..50ce4c0c35 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Suspend_OffTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Suspend_Off) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Suspend_Off(aapsLogger)
+        val packet = DanaRS_Packet_Basal_Set_Suspend_Off(packetInjector)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
index cb12a85d1d..3665cd96b1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Basal_Set_Suspend_OnTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Suspend_On) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Set_Suspend_On(aapsLogger)
+        val packet = DanaRS_Packet_Basal_Set_Suspend_On(packetInjector)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
index d15dff5c39..6fccfdcb81 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -7,11 +9,18 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Basal_Set_Temporary_BasalTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Basal_Set_Temporary_Basal) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val testPacket = DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, 50, 20)
+        val testPacket = DanaRS_Packet_Basal_Set_Temporary_Basal(packetInjector, 50, 20)
         // params
         val params = testPacket.requestParams
         // is ratio 50
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
index 1b83b1df86..ac17776c70 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
@@ -11,8 +13,19 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(RxBusWrapper::class)
 class DanaRS_Packet_Bolus_Get_Bolus_OptionTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Bolus_Option) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Bolus_Option(packetInjector)
         // test message decoding
         //if dataArray is 1 pump.isExtendedBolusEnabled should be true
         packet.handleMessage(createArray(21, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
index 19f9fc5fbd..997014a92b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -1,18 +1,27 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_CIR_CF_Array) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_CIR_CF_Array(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_CIR_CF_Array(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
index 4a805821b1..f09c01657f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Calculation_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Calculation_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Calculation_Information(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(24, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
index b344cf3ade..effd2fa235 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(24, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
index 315ac6f045..19ade4619b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Dual_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Dual_Bolus) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Dual_Bolus(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Dual_Bolus(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
index a62d960cdc..3d54ad98bc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Extended_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
index c950a2b8e7..1e2af1ae1e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus_State) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Bolus_State(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
index 4dab05c2cf..c489cc6677 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
index c9f2529bb7..6976effbdb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Initial_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Initial_Bolus) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger)
+        val packet = DanaRS_Packet_Bolus_Get_Initial_Bolus(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index c3ac9a12d6..254862a8db 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,8 +13,17 @@ import java.util.*
 @PrepareForTest()
 class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Get_Step_Bolus_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(packetInjector)
 
         val array = createArray(13, 0.toByte()) // 11 + 2
         putByteToArray(array, 0, 2) // error 2
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
index b79f14552b..b4bfc7018a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_Bolus_OptionTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Bolus_Option) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        val packet = DanaRS_Packet_Bolus_Set_Bolus_Option(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
index df29bd2439..b749f9fb99 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_CIR_CF_Array) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        val packet = DanaRS_Packet_Bolus_Set_CIR_CF_Array(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
index 0e60b237d7..2aeba32298 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_Dual_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Dual_Bolus) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Dual_Bolus(aapsLogger, 0.0, 0.0, 1)
+        val packet = DanaRS_Packet_Bolus_Set_Dual_Bolus(packetInjector, 0.0, 0.0, 1)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
index 173a87b423..55f3620850 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_Extended_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Extended_Bolus) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus(aapsLogger, 1.0, 1)
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus(packetInjector, 1.0, 1)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(100.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
index adf2ec11f2..2f0615f9c2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(aapsLogger)
+        val packet = DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
index 29513ced1a..1fb3c6928d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Bolus_Set_Initial_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Initial_Bolus) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger, 0, 0, 0, 100)
+        val packet = DanaRS_Packet_Bolus_Set_Initial_Bolus(packetInjector, 0, 0, 0, 100)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 7b740531a0..d4b53cffcd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -6,7 +6,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import org.junit.Assert
@@ -29,8 +28,18 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     private lateinit var danaRSPlugin: DanaRSPlugin
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+                it.constraintChecker = constraintChecker
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(aapsLogger, danaRPump, constraintChecker)
+        val packet = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(packetInjector)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(0.toByte(), testparams[0])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index 8b0f24ff32..2605b0ba72 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -4,10 +4,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.utils.DefaultValueHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -23,8 +21,14 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
 
     @Mock lateinit var activePlugin: ActivePluginProvider
 
-    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+    private val packetInjector = HasAndroidInjector {
         AndroidInjector {
+            if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Stop) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
                 it.resourceHelper = resourceHelper
@@ -37,8 +41,8 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
 
-        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
-        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(aapsLogger, rxBus, resourceHelper, danaRPump)
+        danaRPump.bolusingTreatment = Treatment(packetInjector)
+        val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(packetInjector)
         // test message decoding
         testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, testPacket.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
index e1b90f30da..1a8b2e6fbc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Etc_Keep_ConnectionTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Etc_Keep_Connection) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Etc_Keep_Connection(aapsLogger)
+        val packet = DanaRS_Packet_Etc_Keep_Connection(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
index a089eafd9a..cb82f0b277 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Etc_Set_History_SaveTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Etc_Set_History_Save) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Etc_Set_History_Save(aapsLogger, 0, 0, 0, 0, 0, 0, 0, 0, 2)
+        val packet = DanaRS_Packet_Etc_Set_History_Save(packetInjector, 0, 0, 0, 0, 0, 0, 0, 0, 2)
         // test params
         val testparams = packet.requestParams
         Assert.assertEquals(2.toByte(), testparams[8])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
index fd32e3ca30..6515062bb0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_General_Delivery_StatusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Delivery_Status) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Delivery_Status(aapsLogger)
+        val packet = DanaRS_Packet_General_Delivery_Status(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(15, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index 12ff721a2b..d3f96c2e11 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,13 +11,22 @@ import java.util.*
 @RunWith(PowerMockRunner::class)
 class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_More_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_More_Information(packetInjector)
 
         packet.handleMessage(createArray(14, 0.toByte()))
         Assert.assertTrue(packet.failed)
 
-        packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_More_Information(packetInjector)
         val array = createArray(15, 0.toByte()) // 13 + 2
         putIntToArray(array, 0, 600) // iob 6
         putIntToArray(array, 2, 1250) // daily units 12.5
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
index 88f3ac3496..eac2fc9127 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
@@ -1,23 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Get_PasswordTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_Password) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_Password(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Password(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_Password(packetInjector)
         packet.handleMessage(createArray(15, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_PASSWORD", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
index 5248c2b699..ed6a23541f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
@@ -11,14 +13,25 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(RxBusWrapper::class)
 class DanaRS_Packet_General_Get_Pump_CheckTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_Pump_Check) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)
+        var packet = DanaRS_Packet_General_Get_Pump_Check(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)
+        packet = DanaRS_Packet_General_Get_Pump_Check(packetInjector)
         packet.handleMessage(createArray(15, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_PUMP_CHECK", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index 3de89db27b..d8c4e0fe66 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -8,15 +10,24 @@ import org.powermock.modules.junit4.PowerMockRunner
 @RunWith(PowerMockRunner::class)
 class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_Shipping_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
-        packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
index f962560115..7aef230f52 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -8,8 +10,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @RunWith(PowerMockRunner::class)
 class DanaRS_Packet_General_Get_Shipping_VerisonTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_Shipping_Version) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Get_Shipping_Version(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_General_Get_Shipping_Version(packetInjector)
         // test message decoding
         val ver = byteArrayOf((-78).toByte(), (-127).toByte(), (66).toByte(), (80).toByte(), (78).toByte(), (45).toByte(), (51).toByte(), (46).toByte(), (48).toByte(), (46).toByte(), (48).toByte())
         packet.handleMessage(ver)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
index 1e89db2771..8c2092a425 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
@@ -1,23 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Get_Today_Delivery_TotalTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_Today_Delivery_Total) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_Today_Delivery_Total(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_Today_Delivery_Total(packetInjector)
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(15, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
index 18f89e1096..2dc51fb3af 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
@@ -1,23 +1,31 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Get_User_Time_Change_FlagTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Get_User_Time_Change_Flag) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger)
+        var packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger)
+        packet = DanaRS_Packet_General_Get_User_Time_Change_Flag(packetInjector)
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_USER_TIME_CHANGE_FLAG", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
index 15e9f8e99b..9f878e0be1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
@@ -1,23 +1,32 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Initial_Screen_InformationTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Initial_Screen_Information) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Initial_Screen_Information(packetInjector)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Initial_Screen_Information(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Initial_Screen_Information(packetInjector)
         packet.handleMessage(createArray(17, 1.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals(true, danaRPump.pumpSuspended)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
index d918e9d682..b0e0867b4c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Set_History_Upload_ModeTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Set_History_Upload_Mode) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger, 1)
+        val packet = DanaRS_Packet_General_Set_History_Upload_Mode(packetInjector, 1)
         // test params
         Assert.assertEquals(1.toByte(), packet.requestParams[0])
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
index 45e472af3c..2ee55972da 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(aapsLogger)
+        val packet = DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
index bc10832af9..4ebf521537 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
@@ -26,9 +28,18 @@ class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
         `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
     }
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Alarm) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test
     fun runTest() {
-        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, 0)
+        val packet = DanaRS_Packet_History_Alarm(packetInjector, 0)
 
         val array = createArray(12, 0.toByte()) // 10 + 2
         putByteToArray(array, 0, 0x0A) // record code alarm
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
index 1f7dd00783..8730eaddec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_All_HistoryTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_All_History) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_All_History(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_All_History(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__ALL_HISTORY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
index 8451e90b0f..08910af3b0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_BasalTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Basal) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Basal(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Basal(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BASAL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
index 0442ea98b9..c6ad86d977 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_Blood_GlucoseTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Blood_Glucose) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Blood_Glucose(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BLOOD_GLUCOSE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
index badaa0aa10..0417bc22ae 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_BolusTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Bolus) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Bolus(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Bolus(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BOLUS", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
index 22a99fcc53..8efec691e0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_CarbohydrateTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Carbohydrate) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Carbohydrate(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__CARBOHYDRATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
index 91d4bea862..2a4bc6b533 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_DailyTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Daily) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Daily(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Daily(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__DAILY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
index 19c8d2ef4e..f56216ce4c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_PrimeTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Prime) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Prime(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Prime(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__PRIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
index 8b75ec344f..d83499bce4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_RefillTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Refill) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Refill(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Refill(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__REFILL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
index 66b06f4ed7..f02425c546 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_SuspendTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Suspend) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Suspend(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Suspend(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__SUSPEND", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
index a4e436a373..76dc831eed 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_History_TemporaryTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_History_Temporary) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Temporary(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Temporary(packetInjector, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__TEMPORARY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
index 58e0b738db..f10bb50efd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import org.junit.Assert
 import org.junit.Before
@@ -13,8 +15,18 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(NSUpload::class)
 class DanaRS_Packet_Notify_AlarmTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Notify_Alarm) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Notify_Alarm(aapsLogger, resourceHelper, rxBus)
+        val packet = DanaRS_Packet_Notify_Alarm(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index 83d9d06182..31c9bbe726 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -4,10 +4,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.utils.DefaultValueHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -25,8 +23,14 @@ class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
     @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var activePlugin: ActivePluginProvider
 
-    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+    private val packetInjector = HasAndroidInjector {
         AndroidInjector {
+            if (it is DanaRS_Packet_Notify_Delivery_Complete) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
                 it.resourceHelper = resourceHelper
@@ -39,8 +43,8 @@ class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
 
-        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
-        val packet = DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRPump)
+        danaRPump.bolusingTreatment = Treatment(packetInjector)
+        val packet = DanaRS_Packet_Notify_Delivery_Complete(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 69bf3789b1..03712fa1c0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -7,11 +7,9 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.utils.DefaultValueHelper
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -34,8 +32,14 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     private lateinit var danaRSPlugin: DanaRSPlugin
 
-    private var treatmentInjector: HasAndroidInjector = HasAndroidInjector {
+    private val packetInjector = HasAndroidInjector {
         AndroidInjector {
+            if (it is DanaRS_Packet_Notify_Delivery_Rate_Display) {
+                it.aapsLogger = aapsLogger
+                it.rxBus = rxBus
+                it.resourceHelper = resourceHelper
+                it.danaRPump = danaRPump
+            }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
                 it.resourceHelper = resourceHelper
@@ -48,7 +52,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.anyInt(), anyObject())).thenReturn("SomeString")
         // val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(1.0, Treatment(treatmentInjector))
-        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRPump)
+        val packet = DanaRS_Packet_Notify_Delivery_Rate_Display(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
@@ -64,6 +68,6 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
     @Before
     fun mock() {
         danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
-        danaRPump.bolusingTreatment = Treatment(treatmentInjector)
+        danaRPump.bolusingTreatment = Treatment(packetInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
index 9583c89d4e..9eae04dbec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
@@ -1,17 +1,25 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Notify_Missed_Bolus_AlarmTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Notify_Missed_Bolus_Alarm) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger)
+        val packet = DanaRS_Packet_Notify_Missed_Bolus_Alarm(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 2ac915644f..4d63163c4b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.joda.time.DateTime
 import org.junit.Assert
 import org.junit.Test
@@ -9,8 +11,17 @@ import org.powermock.modules.junit4.PowerMockRunner
 @RunWith(PowerMockRunner::class)
 class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Option_Get_Pump_Time) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Option_Get_Pump_Time(packetInjector)
         val array = createArray(8, 0.toByte()) // 6 + 2
         putByteToArray(array, 0, 19) // year 2019
         putByteToArray(array, 1, 2) // month february
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
index 32e3b051c6..4412f5b1fb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Option_Get_User_OptionTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Option_Get_User_Option) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Option_Get_User_Option(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
index bf34d76510..f2fd2ad61c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,12 +11,20 @@ import java.util.*
 @RunWith(PowerMockRunner::class)
 class DanaRS_Packet_Option_Set_Pump_TimeTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Option_Set_Pump_Time) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
         val date = Date()
-        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, date.time)
+        val packet = DanaRS_Packet_Option_Set_Pump_Time(packetInjector, date.time)
         // test params
         val params = packet.requestParams
-        Assert.assertEquals((date.year  - 100 and 0xff).toByte(), params[0]) // 2019 -> 19
+        Assert.assertEquals((date.year - 100 and 0xff).toByte(), params[0]) // 2019 -> 19
         Assert.assertEquals((date.month + 1 and 0xff).toByte(), params[1])
         Assert.assertEquals((date.date and 0xff).toByte(), params[2])
         Assert.assertEquals((date.hours and 0xff).toByte(), params[3])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
index 30d076e037..6f53976045 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Option_Set_User_OptionTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Option_Set_User_Option) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Set_User_Option(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Option_Set_User_Option(packetInjector)
         // test params
         val params = packet.requestParams
         Assert.assertEquals((danaRPump.lcdOnTimeSec and 0xff).toByte(), params[3])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
index ff5dc4ce80..2842e99c74 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -10,8 +12,16 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest()
 class DanaRS_Packet_Review_Bolus_AvgTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Review_Bolus_Avg) {
+                it.aapsLogger = aapsLogger
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Review_Bolus_Avg(aapsLogger)
+        val packet = DanaRS_Packet_Review_Bolus_Avg(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
index 4bd5bbbd1a..9c5a6f824c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
@@ -1,17 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest()
 class DanaRS_Packet_Review_Get_Pump_Dec_RatioTest : DanaRSTestBase() {
 
+    private val packetInjector = HasAndroidInjector {
+        AndroidInjector {
+            if (it is DanaRS_Packet_Review_Get_Pump_Dec_Ratio) {
+                it.aapsLogger = aapsLogger
+                it.danaRPump = danaRPump
+            }
+        }
+    }
+
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Review_Get_Pump_Dec_Ratio(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Review_Get_Pump_Dec_Ratio(packetInjector)
 
         val array = ByteArray(100)
         putByteToArray(array, 0, 4.toByte())

From bce3d3b6b9a1f7b628163d2b07dadddc3f116e74 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 2 May 2020 00:17:39 +0200
Subject: [PATCH 022/400] Verify RSv1 password

---
 .../dependencyInjection/AppComponent.kt       |  3 +-
 .../dependencyInjection/AppModule.kt          |  2 +-
 .../plugins/pump/danaR/DanaRPump.kt           |  6 +-
 .../plugins/pump/danaRS/DanaRSPlugin.kt       | 77 ++++++++++---------
 .../plugins/pump/danaRS/services/BLEComm.kt   | 21 +++--
 app/src/main/res/values/strings.xml           |  3 +-
 app/src/main/res/values/validator.xml         |  2 +
 app/src/main/res/xml/pref_danars.xml          | 21 ++---
 8 files changed, 76 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index 91153bd867..0bb89f83c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -67,7 +67,8 @@ import javax.inject.Singleton
         PreferencesModule::class,
         OverviewModule::class,
         DataClassesModule::class,
-        SMSModule::class
+        SMSModule::class,
+        DanaRSCommModule::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 48b599c488..871f88a503 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -74,7 +74,7 @@ import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 import javax.inject.Singleton
 
-@Module(includes = [AppModule.AppBindings::class, PluginsModule::class, DanaRSCommModule::class])
+@Module(includes = [AppModule.AppBindings::class, PluginsModule::class])
 open class AppModule {
 
     @Provides
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index b9a5509b54..8b50a1670a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -119,6 +119,7 @@ class DanaRPump @Inject constructor(
 
     // DanaRS specific
     var rsPassword = ""
+    var v3RSPump = false;
 
     // User settings
     var timeDisplayType = 0
@@ -219,7 +220,10 @@ class DanaRPump @Inject constructor(
     }
 
     val isPasswordOK: Boolean
-        get() = !(password != -1 && password != sp.getInt(R.string.key_danar_password, -1))
+        get() = password == sp.getInt(R.string.key_danar_password, -2)
+
+    val isRSPasswordOK: Boolean
+        get() = rsPassword.equals(sp.getString(R.string.key_danars_password, ""), ignoreCase = true)
 
     fun reset() {
         aapsLogger.debug(LTag.PUMP, "DanaRPump reset")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
index 53062a3c93..7bed59fdfa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
@@ -81,7 +81,15 @@ class DanaRSPlugin @Inject constructor(
 
     override fun updatePreferenceSummary(pref: Preference) {
         super.updatePreferenceSummary(pref)
-        if (pref.key == resourceHelper.gs(R.string.key_danars_name)) pref.summary = sp.getString(R.string.key_danars_name, "")
+
+        if (pref.key == resourceHelper.gs(R.string.key_danars_name)) {
+            val value = sp.getStringOrNull(R.string.key_danars_name, null)
+            pref.summary = value
+                ?: resourceHelper.gs(R.string.rileylink_error_address_not_set_short)
+        }
+        if (pref.key == resourceHelper.gs(R.string.key_danars_password)) {
+            if (danaRPump.v3RSPump) pref
+        }
     }
 
     override fun onStart() {
@@ -204,7 +212,7 @@ class DanaRSPlugin @Inject constructor(
 
     // Pump interface
     override fun isInitialized(): Boolean {
-        return danaRPump.lastConnection > 0 && danaRPump.maxBasal > 0
+        return danaRPump.lastConnection > 0 && danaRPump.maxBasal > 0 && danaRPump.isRSPasswordOK
     }
 
     override fun isSuspended(): Boolean {
@@ -402,7 +410,6 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized
     override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean): PumpEnactResult {
-        val pump = danaRPump
         val result = PumpEnactResult(injector)
         var percentAfterConstraint = constraintChecker.applyBasalPercentConstraints(Constraint(percent), profile).value()
         if (percentAfterConstraint < 0) {
@@ -421,8 +428,8 @@ class DanaRSPlugin @Inject constructor(
             result.success = true
             result.isTempCancel = false
             result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
-            result.duration = pump.tempBasalRemainingMin
-            result.percent = pump.tempBasalPercent
+            result.duration = danaRPump.tempBasalRemainingMin
+            result.percent = danaRPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set")
             return result
@@ -435,13 +442,13 @@ class DanaRSPlugin @Inject constructor(
             val durationInHours = max(durationInMinutes / 60, 1)
             danaRSService?.tempBasal(percentAfterConstraint, durationInHours) ?: false
         }
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percentAfterConstraint) {
+        if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percentAfterConstraint) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
             result.isTempCancel = false
-            result.duration = pump.tempBasalRemainingMin
-            result.percent = pump.tempBasalPercent
+            result.duration = danaRPump.tempBasalRemainingMin
+            result.percent = danaRPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: OK")
             return result
@@ -454,16 +461,15 @@ class DanaRSPlugin @Inject constructor(
     }
 
     @Synchronized private fun setHighTempBasalPercent(percent: Int): PumpEnactResult {
-        val pump = danaRPump
         val result = PumpEnactResult(injector)
         val connectionOK = danaRSService?.highTempBasal(percent) ?: false
-        if (connectionOK && pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percent) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
             result.isTempCancel = false
-            result.duration = pump.tempBasalRemainingMin
-            result.percent = pump.tempBasalPercent
+            result.duration = danaRPump.tempBasalRemainingMin
+            result.percent = danaRPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setHighTempBasalPercent: OK")
             return result
@@ -477,7 +483,6 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized
     override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
-        val pump = danaRPump
         var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
         // needs to be rounded
         val durationInHalfHours = max(durationInMinutes / 30, 1)
@@ -488,23 +493,23 @@ class DanaRSPlugin @Inject constructor(
             result.enacted = false
             result.success = true
             result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
-            result.duration = pump.extendedBolusRemainingMinutes
-            result.absolute = pump.extendedBolusAbsoluteRate
+            result.duration = danaRPump.extendedBolusRemainingMinutes
+            result.absolute = danaRPump.extendedBolusAbsoluteRate
             result.isPercent = false
             result.isTempCancel = false
-            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + pump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + danaRPump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
             return result
         }
         val connectionOK = danaRSService?.extendedBolus(insulinAfterConstraint, durationInHalfHours)
             ?: false
-        if (connectionOK && pump.isExtendedInProgress && abs(pump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+        if (connectionOK && danaRPump.isExtendedInProgress && abs(danaRPump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
             result.isTempCancel = false
-            result.duration = pump.extendedBolusRemainingMinutes
-            result.absolute = pump.extendedBolusAbsoluteRate
-            result.bolusDelivered = pump.extendedBolusAmount
+            result.duration = danaRPump.extendedBolusRemainingMinutes
+            result.absolute = danaRPump.extendedBolusAbsoluteRate
+            result.bolusDelivered = danaRPump.extendedBolusAmount
             result.isPercent = false
             aapsLogger.debug(LTag.PUMP, "setExtendedBolus: OK")
             return result
@@ -562,9 +567,8 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun getJSONStatus(profile: Profile, profileName: String): JSONObject {
-        val pump = danaRPump
         val now = System.currentTimeMillis()
-        if (pump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (danaRPump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return JSONObject()
         }
         val pumpJson = JSONObject()
@@ -572,13 +576,13 @@ class DanaRSPlugin @Inject constructor(
         val status = JSONObject()
         val extended = JSONObject()
         try {
-            battery.put("percent", pump.batteryRemaining)
-            status.put("status", if (pump.pumpSuspended) "suspended" else "normal")
-            status.put("timestamp", DateUtil.toISOString(pump.lastConnection))
+            battery.put("percent", danaRPump.batteryRemaining)
+            status.put("status", if (danaRPump.pumpSuspended) "suspended" else "normal")
+            status.put("timestamp", DateUtil.toISOString(danaRPump.lastConnection))
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
-            if (pump.lastBolusTime != 0L) {
-                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.lastBolusTime))
-                extended.put("LastBolusAmount", pump.lastBolusAmount)
+            if (danaRPump.lastBolusTime != 0L) {
+                extended.put("LastBolus", DateUtil.dateAndTimeString(danaRPump.lastBolusTime))
+                extended.put("LastBolusAmount", danaRPump.lastBolusAmount)
             }
             val tb = treatmentsPlugin.getTempBasalFromHistory(now)
             if (tb != null) {
@@ -601,7 +605,7 @@ class DanaRSPlugin @Inject constructor(
             pumpJson.put("battery", battery)
             pumpJson.put("status", status)
             pumpJson.put("extended", extended)
-            pumpJson.put("reservoir", pump.reservoirRemainingUnits.toInt())
+            pumpJson.put("reservoir", danaRPump.reservoirRemainingUnits.toInt())
             pumpJson.put("clock", DateUtil.toISOString(now))
         } catch (e: JSONException) {
             aapsLogger.error("Unhandled exception", e)
@@ -626,15 +630,14 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun shortStatus(veryShort: Boolean): String {
-        val pump = danaRPump
         var ret = ""
-        if (pump.lastConnection != 0L) {
-            val agoMillis = System.currentTimeMillis() - pump.lastConnection
+        if (danaRPump.lastConnection != 0L) {
+            val agoMillis = System.currentTimeMillis() - danaRPump.lastConnection
             val agoMin = (agoMillis / 60.0 / 1000.0).toInt()
             ret += "LastConn: $agoMin minago\n"
         }
-        if (pump.lastBolusTime != 0L)
-            ret += "LastBolus: ${DecimalFormatter.to2Decimal(pump.lastBolusAmount)}U @${DateFormat.format("HH:mm", pump.lastBolusTime)}"
+        if (danaRPump.lastBolusTime != 0L)
+            ret += "LastBolus: ${DecimalFormatter.to2Decimal(danaRPump.lastBolusAmount)}U @${DateFormat.format("HH:mm", danaRPump.lastBolusTime)}"
 
         val activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis())
         if (activeTemp != null)
@@ -645,10 +648,10 @@ class DanaRSPlugin @Inject constructor(
             ret += "Extended: $activeExtendedBolus\n"
 
         if (!veryShort) {
-            ret += "TDD: ${DecimalFormatter.to0Decimal(pump.dailyTotalUnits)} / ${pump.maxDailyTotalUnits} U"
+            ret += "TDD: ${DecimalFormatter.to0Decimal(danaRPump.dailyTotalUnits)} / ${danaRPump.maxDailyTotalUnits} U"
         }
-        ret += "Reserv: ${DecimalFormatter.to0Decimal(pump.reservoirRemainingUnits)} U"
-        ret += "Batt: ${pump.batteryRemaining}"
+        ret += "Reserv: ${DecimalFormatter.to0Decimal(danaRPump.reservoirRemainingUnits)} U"
+        ret += "Batt: ${danaRPump.batteryRemaining}"
         return ret
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index 255a86d1f3..c3a60805d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -22,6 +23,7 @@ import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTabl
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.extensions.notify
 import info.nightscout.androidaps.utils.extensions.waitMillis
@@ -67,6 +69,7 @@ class BLEComm @Inject internal constructor(
         set(newValue) {
             bleEncryption.setEnhancedEncryption(newValue)
             field = newValue
+            danaRPump.v3RSPump = newValue
         }
     private var isEasyMode: Boolean = false
     private var isUnitUD: Boolean = false
@@ -550,11 +553,19 @@ class BLEComm @Inject internal constructor(
             var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
             pass = pass xor 3463
             danaRPump.rsPassword = Integer.toHexString(pass)
-            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + Integer.toHexString(pass))
-            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
-            isConnected = true
-            isConnecting = false
-            aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaRPump.rsPassword)
+            if (!danaRPump.isRSPasswordOK) {
+                aapsLogger.error(LTag.PUMPBTCOMM, "Wrong pump password")
+                rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)))
+                disconnect("WrongPassword")
+                SystemClock.sleep(T.mins(1).msecs())
+            } else {
+                rxBus.send(EventDismissNotification(Notification.WRONG_PUMP_PASSWORD))
+                rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+                isConnected = true
+                isConnecting = false
+                aapsLogger.debug(LTag.PUMPBTCOMM, "RS connected and status read")
+            }
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2fbd5522ea..315b0e66a7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -379,6 +379,7 @@
     <string name="danar_history_refill">Refill</string>
     <string name="danar_history_syspend">Suspend</string>
     <string name="danar_history_connectingfor">Connecting for %1$d s</string>
+    <string name="danars_password_title">Pump password (v1 only)</string>
     <string name="danar_password_title">Pump password</string>
     <string name="wrongpumppassword">Wrong pump password!</string>
     <string name="pumpbusy">Pump is busy</string>
@@ -805,7 +806,6 @@
     <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
     <string name="selectedpump">Selected pump</string>
-    <string name="pairpump">Pair new pump</string>
     <string name="bolusspeed">Bolus speed</string>
     <string name="key_danars_bolusspeed" translatable="false">danars_bolusspeed</string>
     <string name="danar_setbasalstep001">Set basal step to 0.01 U/h</string>
@@ -1844,4 +1844,5 @@
     <string name="key_statuslights_copy_ns" translatable="false">statuslights_copy_ns</string>
     <string name="copyexistingvalues">Copy NS settings (if exists)?</string>
     <string name="key_statuslights_overview_advanced" translatable="false">statuslights_overview_advanced</string>
+    <string name="key_danars_password">danars_password</string>
 </resources>
diff --git a/app/src/main/res/values/validator.xml b/app/src/main/res/values/validator.xml
index aef7116a48..4de9c5fab1 100644
--- a/app/src/main/res/values/validator.xml
+++ b/app/src/main/res/values/validator.xml
@@ -18,11 +18,13 @@
     <string name="error_mustbe6digitnumber">Must be 6 digit number</string>
     <string name="error_mustbe12hexadidits">Must be 12 characters of ABCDEF0123456789</string>
     <string name="error_mustbe8hexadidits">Must be 8 characters of ABCDEF0123456789</string>
+    <string name="error_mustbe4hexadidits">Must be 4 characters of ABCDEF0123456789</string>
     <string name="error_not_a_minimum_length">Not a minimum length</string>
     <string name="error_pin_not_valid">Pin should be 3 to 6 digits, not same or in series</string>
 
     <string name="fourdigitnumber" translatable="false">^\\d{4}</string>
     <string name="twelvehexanumber" translatable="false">^[A-F0-9]{12}$</string>
     <string name="eighthexanumber" translatable="false">^[A-F0-9]{8}$</string>
+    <string name="fourhexanumber" translatable="false">^[A-F0-9]{4}$</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_danars.xml b/app/src/main/res/xml/pref_danars.xml
index baf7bc4405..1e35b65ee9 100644
--- a/app/src/main/res/xml/pref_danars.xml
+++ b/app/src/main/res/xml/pref_danars.xml
@@ -8,24 +8,19 @@
         app:initialExpandedChildrenCount="0">
 
         <Preference
-            android:key="blescannner"
-            android:title="@string/pairpump">
+            android:key="@string/key_danars_name"
+            android:summary=""
+            android:title="@string/selectedpump">
             <intent android:action="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
         </Preference>
 
-        <EditTextPreference
-            android:key="@string/key_danars_name"
-            android:persistent="false"
-            android:selectable="false"
-            android:summary=""
-            android:title="@string/selectedpump" />
-
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:inputType="numberPassword"
-            android:key="@string/key_danar_password"
-            android:title="@string/danar_password_title"
-            validate:customRegexp="@string/fourdigitnumber"
-            validate:testErrorString="@string/error_mustbe4digitnumber"
+            android:digits="0123456789ABCDEF"
+            android:key="@string/key_danars_password"
+            android:title="@string/danars_password_title"
+            validate:customRegexp="@string/fourhexanumber"
+            validate:testErrorString="@string/error_mustbe4hexadidits"
             validate:testType="regexp" />
 
         <ListPreference

From 0e2de9d140b38b0dbafd71143148c81881ddb76a Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 17:06:10 +1200
Subject: [PATCH 023/400] Convert to Kotlin

---
 .../aps/loop/CarbSuggestionReceiver.java      | 20 -------------------
 .../aps/loop/CarbSuggestionReceiver.kt        | 15 ++++++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
deleted file mode 100644
index fe0b9b3ef4..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package info.nightscout.androidaps.plugins.aps.loop;
-
-import android.content.Context;
-import android.content.Intent;
-
-import javax.inject.Inject;
-
-import dagger.android.DaggerBroadcastReceiver;
-
-public class CarbSuggestionReceiver extends DaggerBroadcastReceiver {
-
-    @Inject LoopPlugin loopPlugin;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        super.onReceive(context, intent);
-        int duartion = intent.getIntExtra("ignoreDuration", 5);
-        loopPlugin.disableCarbSuggestions(duartion);
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.kt
new file mode 100644
index 0000000000..5382184d15
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps.plugins.aps.loop
+
+import android.content.Context
+import android.content.Intent
+import dagger.android.DaggerBroadcastReceiver
+import javax.inject.Inject
+
+class CarbSuggestionReceiver : DaggerBroadcastReceiver() {
+    @Inject lateinit var loopPlugin: LoopPlugin
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        val duration = intent.getIntExtra("ignoreDuration", 5)
+        loopPlugin.disableCarbSuggestions(duration)
+    }
+}
\ No newline at end of file

From ad39aabeb3d40dad23ea700aaf51112cdfa885ed Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 17:23:51 +1200
Subject: [PATCH 024/400] Refactor messages used for carbs required

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8aba55479d..08df1c35b6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -782,8 +782,6 @@
     <string name="enableuam">Enable UAM</string>
     <string name="enablesmb">Enable SMB</string>
     <string name="enablecarbssuggestions">Enable Carbs Suggestions</string>
-    <string name="enable_carbs_suggestions_threshold">Minimum Carbs Required For Suggestion</string>
-    <string name="enable_carbs_suggestions_threshold_summary">Minimum grams of carbs to display a carbs suggestion alert. Carbs suggestions below this number will not trigger a notification.</string>
     <string name="enablesmb_summary">Use Super Micro Boluses instead of temp basal for faster action</string>
     <string name="enableuam_summary">Detection of Unannounced meals</string>
     <string name="enablecarbssuggestions_summary">Enable carbs suggestions when BG is predicted to go below threshold</string>
@@ -891,8 +889,8 @@
     <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
     <string name="uamsmbmaxminutes_summary">Max minutes of basal to limit SMB to for UAM</string>
     <string name="key_carbsReqThreshold" translatable="false">carbsReqThreshold</string>
-    <string name="carbsReqThreshold">Carb suggestion threshold</string>
-    <string name="carbsReqThreshold_summary">When Carbs are suggested, how many carbs will prompt a notification</string>
+    <string name="carbsReqThreshold">Minimum Carbs Required For Suggestion</string>
+    <string name="carbsReqThreshold_summary">Minimum grams of carbs to display a carbs suggestion alert. Carbs suggestions below this number will not trigger a notification.</string>
     <string name="unsupportedfirmware">Unsupported pump firmware</string>
     <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>

From e1e81ed3e43d724010bfd51eb6d79a90f1c53b0b Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 17:24:25 +1200
Subject: [PATCH 025/400] Use Summary text

---
 app/src/main/res/xml/pref_openapssmb.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index bee0d054d9..12846b91ec 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -152,6 +152,7 @@
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:key="@string/key_carbsReqThreshold"
             android:title="@string/carbsReqThreshold"
+            android:summary="@string/carbsReqThreshold_summary"
             android:defaultValue="1"
             android:dialogMessage="@string/carbsReqThreshold_summary"
             android:digits="0123456789"

From b1b6a1b6afad2160fa9bc8ead77c60271712b763 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 18:04:51 +1200
Subject: [PATCH 026/400] Further refractor and use shared preferences

---
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index 0c0c5e17ed..f84f312329 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -3,14 +3,17 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import javax.inject.Inject;
+
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class DetermineBasalResultSMB extends APSResult {
+    @Inject SP sp;
 
     private double eventualBG;
     private double snoozeBG;
@@ -35,7 +38,7 @@ public class DetermineBasalResultSMB extends APSResult {
             if (result.has("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
 
-            if (SP.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
+            if (sp.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
                 if (result.has("carbsReq")) carbsReq = result.getInt("carbsReq");
                 if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
             }

From 017b6187b5ec92d5e46e4d5ff6153040bf6f029f Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 23:09:48 +1200
Subject: [PATCH 027/400] Patch determine basal

---
 app/src/main/assets/OpenAPSSMB/determine-basal.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index 00a9c1d0a2..18181d25de 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -897,7 +897,8 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     // if not in LGS mode, cancel temps before the top of the hour to reduce beeping/vibration
     // console.error(profile.skip_neutral_temps, rT.deliverAt.getMinutes());
-    if ( profile.skip_neutral_temps && rT.deliverAt.getMinutes() >= 55 ) {
+    //patch determine basal so skip_neutral_temps works as expected
+    if ( !profile.skip_neutral_temps && rT.deliverAt.getMinutes() >= 55 ) {
         rT.reason += "; Canceling temp at " + rT.deliverAt.getMinutes() + "m past the hour. ";
         return tempBasalFunctions.setTempBasal(0, 0, profile, rT, currenttemp);
     }

From 39d011a4ccdf099286772c1b9b9864efdd88f4f3 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 23:10:46 +1200
Subject: [PATCH 028/400] Move to Medtronic driver

---
 app/src/main/res/xml/pref_medtronic.xml  | 6 ++++++
 app/src/main/res/xml/pref_openapssmb.xml | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/xml/pref_medtronic.xml b/app/src/main/res/xml/pref_medtronic.xml
index fd9a84ab64..c5f4562e1d 100644
--- a/app/src/main/res/xml/pref_medtronic.xml
+++ b/app/src/main/res/xml/pref_medtronic.xml
@@ -98,6 +98,12 @@
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
         </Preference>
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_skip_neutral_temps"
+            android:summary="@string/skip_neutral_temps_summary"
+            android:title="@string/skip_neutral_temps_title" />
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 09c6ff1221..859a75a82b 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -73,12 +73,6 @@
             android:summary="@string/enablesmbaftercarbs_summary"
             android:title="@string/enablesmbaftercarbs" />
 
-        <SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/key_skip_neutral_temps"
-            android:summary="@string/skip_neutral_temps_summary"
-            android:title="@string/skip_neutral_temps_title" />
-
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="3"
             android:digits="0123456789"

From 1598d0c45e7fa9baa07ac269380b975bf01eecbe Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 3 May 2020 23:11:29 +1200
Subject: [PATCH 029/400] Use different defaults if using Medtronic Pump

---
 .../aps/openAPSSMB/DetermineBasalAdapterSMBJS.java   | 12 ++++++++++--
 .../plugins/aps/openAPSSMB/SMBDefaults.java          |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 796eb9ef4e..16949fcb4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -26,10 +26,12 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback;
+import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
@@ -237,7 +239,9 @@ public class DetermineBasalAdapterSMBJS {
     ) throws JSONException {
 
         String units = profile.getUnits();
-        Double pumpbolusstep = activePluginProvider.getActivePump().getPumpDescription().bolusStep;
+        PumpInterface pump = activePluginProvider.getActivePump();
+        ManufacturerType manufacturer = pump.manufacturer();
+        Double pumpbolusstep = pump.getPumpDescription().bolusStep;
         mProfile = new JSONObject();
 
         mProfile.put("max_iob", maxIob);
@@ -265,7 +269,11 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
         mProfile.put("maxCOB", SMBDefaults.maxCOB);
-        mProfile.put("skip_neutral_temps", sp.getBoolean(R.string.key_skip_neutral_temps,SMBDefaults.skip_neutral_temps));
+        if (!manufacturer.name().equals("Medtronic")) {
+            mProfile.put("skip_neutral_temps",SMBDefaults.skip_neutral_temps);
+        } else {
+            mProfile.put("skip_neutral_temps", sp.getBoolean(R.string.key_skip_neutral_temps, SMBDefaults.skip_neutral_temps_medtronic));
+        }
         // min_5m_carbimpact is not used within SMB determinebasal
         //if (mealData.usedMinCarbsImpact > 0) {
         //    mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
index 5f2216b5ae..42eacdbce6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
@@ -38,6 +38,7 @@ public class SMBDefaults {
     // Essentially, this just limits AMA/SMB as a safety cap against excessive COB entry)
     public final static int maxCOB = 120;
     public final static boolean skip_neutral_temps = true; // ***** default false in oref1 ***** if true, don't set neutral temps
+    public final static boolean skip_neutral_temps_medtronic = false;//if using a medtronic pump default to false so the pump doesnt beep on the hour
     // unsuspend_if_no_temp:false // if true, pump will un-suspend after a zero temp finishes
     // bolussnooze_dia_divisor:2 // bolus snooze decays after 1/2 of DIA
     public final static double min_5m_carbimpact = 8d; // mg/dL per 5m (8 mg/dL/5m corresponds to 24g/hr at a CSF of 4 mg/dL/g (x/5*60/4))

From 3c60b0ff73d090c43650801d84125a69db3d0b62 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 4 May 2020 01:41:09 +1200
Subject: [PATCH 030/400] Remove not needed entry and fix keys

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08df1c35b6..82dd0ab796 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -195,7 +195,6 @@
     <string name="lgs">LGS</string>
     <string name="openloop_newsuggestion">New suggestion available</string>
     <string name="carbssuggestion">Carbs Suggestion</string>
-    <string name="unsupportedclientver">Unsupported version of NSClient</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
     <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
@@ -777,8 +776,8 @@
     <string name="smb_shortname">SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
-    <string name="key_smb_enable_carbs_suggestions" translatable="false">key_smb_enable_carbs_suggestions</string>
-    <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">key_smb_enable_carbs_suggestions_threshold</string>
+    <string name="key_smb_enable_carbs_suggestions" translatable="false">smb_enable_carbs_suggestions</string>
+    <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">smb_enable_carbs_suggestions_threshold</string>
     <string name="enableuam">Enable UAM</string>
     <string name="enablesmb">Enable SMB</string>
     <string name="enablecarbssuggestions">Enable Carbs Suggestions</string>

From a5f384f07fee1a80a31cb649180f2a3a17ea4d42 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 3 May 2020 16:10:48 +0200
Subject: [PATCH 031/400] forgotten code

---
 .../nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
index 7bed59fdfa..2960bebf8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
@@ -87,9 +87,6 @@ class DanaRSPlugin @Inject constructor(
             pref.summary = value
                 ?: resourceHelper.gs(R.string.rileylink_error_address_not_set_short)
         }
-        if (pref.key == resourceHelper.gs(R.string.key_danars_password)) {
-            if (danaRPump.v3RSPump) pref
-        }
     }
 
     override fun onStart() {

From abb950512289038b9b97bbc05f2db60ccee21881 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Sun, 3 May 2020 18:52:26 +0200
Subject: [PATCH 032/400] Insight: Disable vibration on bolus for firmware
 version 3

---
 .../insight/app_layer/remote_control/DeliverBolusMessage.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
index f1b4c3f6de..e15c01cfae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
@@ -22,7 +22,7 @@ public class DeliverBolusMessage extends AppLayerMessage {
     @Override
     protected ByteBuf getData() {
         ByteBuf byteBuf = new ByteBuf(22);
-        byteBuf.putUInt16LE(805);
+        byteBuf.putUInt16LE(31);
         byteBuf.putUInt16LE(BolusTypeIDs.IDS.getID(bolusType));
         byteBuf.putUInt16LE(31);
         byteBuf.putUInt16LE(0);

From 591cef11e522e215ca2a745ec1e0e60cf6d5780e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 3 May 2020 19:48:48 +0200
Subject: [PATCH 033/400] 2.6.1.3

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 38457916a4..cce6b64992 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.1.2"
+        version "2.6.1.3"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From 1c075c526eac2a38e8f764e00e8049526eabffe4 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Mon, 4 May 2020 17:36:37 +0200
Subject: [PATCH 034/400] 2.6.1.4

---
 app/build.gradle                                                | 2 +-
 .../insight/app_layer/remote_control/DeliverBolusMessage.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cce6b64992..893f13632c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,7 +109,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.1.3"
+        version "2.6.1.4"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
index e15c01cfae..e0d0f2461a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
@@ -22,7 +22,7 @@ public class DeliverBolusMessage extends AppLayerMessage {
     @Override
     protected ByteBuf getData() {
         ByteBuf byteBuf = new ByteBuf(22);
-        byteBuf.putUInt16LE(31);
+        byteBuf.putUInt16LE(252);
         byteBuf.putUInt16LE(BolusTypeIDs.IDS.getID(bolusType));
         byteBuf.putUInt16LE(31);
         byteBuf.putUInt16LE(0);

From ad472beb4abbde281ab0222d2ee2d077bedcfe8b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 6 May 2020 01:27:38 +0200
Subject: [PATCH 035/400] danars di start

---
 app/build.gradle                              |  1 +
 .../dependencyInjection/ActivitiesModule.kt   |  4 --
 .../dependencyInjection/AppComponent.kt       |  4 +-
 .../general/maintenance/ImportExportPrefs.kt  |  4 +-
 .../res/layout/danars_blescanner_item.xml     | 33 ---------
 app/src/main/res/values/strings.xml           |  6 --
 danars/.gitignore                             |  1 +
 danars/build.gradle                           | 71 +++++++++++++++++++
 danars/consumer-rules.pro                     |  0
 danars/proguard-rules.pro                     | 21 ++++++
 danars/src/main/AndroidManifest.xml           |  6 ++
 .../DanaRSActivitiesModule.kt                 | 14 ++++
 .../pump/danaRS/activities/BLEScanActivity.kt |  2 +-
 .../activities/PairingHelperActivity.kt       |  0
 .../danaRS/dialogs/PairingProgressDialog.java |  8 +--
 .../danaRS/events/EventDanaRSDeviceChange.kt  |  0
 .../events/EventDanaRSPairingSuccess.kt       |  0
 .../res/layout/danars_blescanner_activity.xml |  6 +-
 .../res/layout/danars_blescanner_item.xml     | 27 +++++++
 .../layout/danars_pairingprogressdialog.xml   |  0
 danars/src/main/res/values/strings.xml        | 14 ++++
 settings.gradle                               |  2 +-
 22 files changed, 169 insertions(+), 55 deletions(-)
 delete mode 100644 app/src/main/res/layout/danars_blescanner_item.xml
 create mode 100644 danars/.gitignore
 create mode 100644 danars/build.gradle
 create mode 100644 danars/consumer-rules.pro
 create mode 100644 danars/proguard-rules.pro
 create mode 100644 danars/src/main/AndroidManifest.xml
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt (99%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java (94%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt (100%)
 rename {app => danars}/src/main/res/layout/danars_blescanner_activity.xml (88%)
 create mode 100644 danars/src/main/res/layout/danars_blescanner_item.xml
 rename {app => danars}/src/main/res/layout/danars_pairingprogressdialog.xml (100%)
 create mode 100644 danars/src/main/res/values/strings.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8a404945f3..e3a302680b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -243,6 +243,7 @@ dependencies {
     wearApp project(':wear')
 
     implementation project(':core')
+    implementation project(':danars')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 1afa263919..f4b6e9a27a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -13,9 +13,7 @@ import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanAct
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
@@ -26,7 +24,6 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 @Suppress("unused")
 abstract class ActivitiesModule {
 
-    @ContributesAndroidInjector abstract fun contributesBLEScanActivity(): BLEScanActivity
     @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
     @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
     @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
@@ -39,7 +36,6 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
     @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity
     @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
-    @ContributesAndroidInjector abstract fun contributesPairingHelperActivity(): PairingHelperActivity
     @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index f5b4139053..67feb4b4bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -6,6 +6,7 @@ import dagger.android.AndroidInjectionModule
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.dependencyInjection.CoreModule
+import info.nightscout.androidaps.danars.dependencyInjection.DanaRSActivitiesModule
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.ProfileStore
 import info.nightscout.androidaps.data.PumpEnactResult
@@ -71,7 +72,8 @@ import javax.inject.Singleton
         DataClassesModule::class,
         SMSModule::class,
         UIModule::class,
-        DanaRSCommModule::class
+        DanaRSCommModule::class,
+        DanaRSActivitiesModule::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index b859a1dee5..4d9021bb71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -217,7 +217,7 @@ class ImportExportPrefs @Inject constructor(
 
     fun importSharedPreferences(fragment: Fragment) {
         fragment.activity?.let { fragmentAct ->
-            val callForPrefFile = fragmentAct.prepareCall(PrefsFileContract()) {
+            val callForPrefFile = fragmentAct.registerForActivityResult(PrefsFileContract()) {
                 it?.let {
                     importSharedPreferences(fragmentAct, it)
                 }
@@ -227,7 +227,7 @@ class ImportExportPrefs @Inject constructor(
     }
 
     fun importSharedPreferences(activity: FragmentActivity) {
-        val callForPrefFile = activity.prepareCall(PrefsFileContract()) {
+        val callForPrefFile = activity.registerForActivityResult(PrefsFileContract()) {
             it?.let {
                 importSharedPreferences(activity, it)
             }
diff --git a/app/src/main/res/layout/danars_blescanner_item.xml b/app/src/main/res/layout/danars_blescanner_item.xml
deleted file mode 100644
index 2c620b532f..0000000000
--- a/app/src/main/res/layout/danars_blescanner_item.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:layout_marginLeft="15.67dp"
-        android:layout_marginRight="15.67dp" >
-
-        <TextView
-            android:id="@+id/ble_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/ble_address"
-            android:textColor="#ffffff"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/ble_address"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="6.5dp"
-            android:textColor="#FF00A0E9"
-            android:textSize="20sp" />
-    </RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc4f698551..a27829b954 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -798,17 +798,11 @@
     <string name="activate_profile">Activate profile</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
-    <string name="waitingforpairing">Waiting for pairing on pump</string>
-    <string name="pairingok">Pairing OK</string>
-    <string name="pairingtimedout">Pairing timed out</string>
     <string name="pairing">Pairing</string>
     <string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
     <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>
     <string name="key_danars_v3_pairingkey" translatable="false">danars_v3_pairing_key_</string>
     <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
-    <string name="key_danars_address" translatable="false">danars_address</string>
-    <string name="key_danars_name" translatable="false">danars_name</string>
-    <string name="danars_nodeviceavailable">No device found so far</string>
     <string name="emptyreservoir">Empty reservoir</string>
     <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
     <string name="remaininsulinalert">Remaining insulin level</string>
diff --git a/danars/.gitignore b/danars/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/danars/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/danars/build.gradle b/danars/build.gradle
new file mode 100644
index 0000000000..96753367b4
--- /dev/null
+++ b/danars/build.gradle
@@ -0,0 +1,71 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation project(':core')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.activity:activity:${activityVersion}"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    //RxBus
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
+
diff --git a/danars/consumer-rules.pro b/danars/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/danars/proguard-rules.pro b/danars/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/danars/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/danars/src/main/AndroidManifest.xml b/danars/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..128d47771d
--- /dev/null
+++ b/danars/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.danars" >
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+</manifest>
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
new file mode 100644
index 0000000000..269fa7a131
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
@@ -0,0 +1,14 @@
+package info.nightscout.androidaps.danars.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity
+import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
+
+@Module
+@Suppress("unused")
+abstract class DanaRSActivitiesModule {
+
+    @ContributesAndroidInjector abstract fun contributesBLEScanActivity(): BLEScanActivity
+    @ContributesAndroidInjector abstract fun contributesPairingHelperActivity(): PairingHelperActivity
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
index d51dc5ab05..79024ca402 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
@@ -13,8 +13,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.TextView
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
index dcf17dc355..48a567c840 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
@@ -17,7 +17,7 @@ import android.widget.TextView;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerDialogFragment;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.danars.R;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity;
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
@@ -63,7 +63,7 @@ public class PairingProgressDialog extends DaggerDialogFragment {
                     if (activity != null) {
                         activity.runOnUiThread(() -> {
                             progressBar.setProgress(100);
-                            statusView.setText(R.string.pairingok);
+                            statusView.setText(R.string.danars_pairingok);
                             try {
                                 Thread.sleep(1000);
                             } catch (InterruptedException ignored) {
@@ -84,7 +84,7 @@ public class PairingProgressDialog extends DaggerDialogFragment {
             if (activity != null) {
                 activity.runOnUiThread(() -> {
                     progressBar.setProgress(100);
-                    statusView.setText(R.string.pairingtimedout);
+                    statusView.setText(R.string.danars_pairingtimedout);
                     button.setVisibility(View.VISIBLE);
                 });
             }
@@ -140,7 +140,7 @@ public class PairingProgressDialog extends DaggerDialogFragment {
     private void setViews() {
         progressBar.setMax(100);
         progressBar.setProgress(0);
-        statusView.setText(resourceHelper.gs(R.string.waitingforpairing));
+        statusView.setText(resourceHelper.gs(R.string.danars_waitingforpairing));
         button.setVisibility(View.GONE);
         button.setOnClickListener(v -> dismiss());
         handler.post(runnable);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt
diff --git a/app/src/main/res/layout/danars_blescanner_activity.xml b/danars/src/main/res/layout/danars_blescanner_activity.xml
similarity index 88%
rename from app/src/main/res/layout/danars_blescanner_activity.xml
rename to danars/src/main/res/layout/danars_blescanner_activity.xml
index 654f8c1fb6..fe9e25879c 100644
--- a/app/src/main/res/layout/danars_blescanner_activity.xml
+++ b/danars/src/main/res/layout/danars_blescanner_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.pump.danaRS.activities.BLEScanActivity">
+    tools:context="info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/pairing"
+            android:contentDescription="@string/danars_pairing"
             android:src="@drawable/ic_bluetooth_white_48dp" />
 
         <TextView
@@ -27,7 +27,7 @@
             android:layout_gravity="center"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:text="@string/pairing"
+            android:text="@string/danars_pairing"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/danars/src/main/res/layout/danars_blescanner_item.xml b/danars/src/main/res/layout/danars_blescanner_item.xml
new file mode 100644
index 0000000000..9a39302163
--- /dev/null
+++ b/danars/src/main/res/layout/danars_blescanner_item.xml
@@ -0,0 +1,27 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="52dp"
+    android:layout_marginLeft="15.67dp"
+    android:layout_marginRight="15.67dp">
+
+    <TextView
+        android:id="@+id/ble_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@+id/ble_address"
+        android:textColor="#ffffff"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/ble_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="6.5dp"
+        android:textColor="#FF00A0E9"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/danars_pairingprogressdialog.xml b/danars/src/main/res/layout/danars_pairingprogressdialog.xml
similarity index 100%
rename from app/src/main/res/layout/danars_pairingprogressdialog.xml
rename to danars/src/main/res/layout/danars_pairingprogressdialog.xml
diff --git a/danars/src/main/res/values/strings.xml b/danars/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..f3f951e035
--- /dev/null
+++ b/danars/src/main/res/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="key_danars_address" translatable="false">danars_address</string>
+    <string name="key_danars_name" translatable="false">danars_name</string>
+
+    <string name="danars_pairing">Pairing</string>
+    <string name="danars_nodeviceavailable">No device found so far</string>
+    <string name="danars_pairingok">Pairing OK</string>
+    <string name="danars_pairingtimedout">Pairing timed out</string>
+    <string name="danars_waitingforpairing">Waiting for pairing on pump</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+
+</resources>
diff --git a/settings.gradle b/settings.gradle
index f7c8a5fc0a..cd2caae7bd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':wear', ':core'
\ No newline at end of file
+include ':app', ':wear', ':core', ':danars'

From 5527c3d70d069c49d1d8452a805e723d0fe983fb Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Thu, 7 May 2020 01:04:29 +0100
Subject: [PATCH 036/400] - remove omnipod as option from config builder

---
 .../androidaps/activities/MyPreferenceFragment.kt           | 2 --
 .../androidaps/dependencyInjection/ActivitiesModule.kt      | 2 --
 .../androidaps/dependencyInjection/AppComponent.kt          | 3 +--
 .../androidaps/dependencyInjection/PluginsModule.kt         | 6 ------
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 91af0ca115..d2057f3c19 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -79,7 +79,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var localInsightPlugin: LocalInsightPlugin
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
-    @Inject lateinit var omnipodPumpPlugin: OmnipodPumpPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
@@ -175,7 +174,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, Config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, Config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(omnipodPumpPlugin, rootKey, Config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey, !Config.NSCLIENT)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(nsClientPlugin, rootKey)
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 3c4add198a..93cac53038 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -50,7 +50,5 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
     @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
     @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
-    @ContributesAndroidInjector abstract fun contributesPodManagementActivity(): PodManagementActivity
-    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): PodHistoryActivity
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index bba9b15298..1bb1595863 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -69,8 +69,7 @@ import javax.inject.Singleton
         PreferencesModule::class,
         OverviewModule::class,
         DataClassesModule::class,
-        SMSModule::class,
-        OmnipodModule::class
+        SMSModule::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index c790f58c32..6b726528f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -352,12 +352,6 @@ abstract class PluginsModule {
     @IntKey(480)
     abstract fun bindConfigBuilderPlugin(plugin: ConfigBuilderPlugin): PluginBase
 
-    @Binds
-    @PumpDriver
-    @IntoMap
-    @IntKey(490)
-    abstract fun bindOmnipodPumpPlugin(plugin: OmnipodPumpPlugin): PluginBase
-
     @Qualifier
     annotation class AllConfigs
 

From 24112eb43749b274c90bfb077a7ae5a8864b8745 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 7 May 2020 08:29:03 +0200
Subject: [PATCH 037/400] Temp Basal icon switched

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 4a6455e41c..021c3729e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -667,7 +667,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
             ?: resourceHelper.gc(R.color.defaulttextcolor))
-        overview_basebasal_icon.setImageResource(if (activeTemp != null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
+        overview_basebasal_icon.setImageResource(if (activeTemp == null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())

From 120c526b802652be601c03f3db634ed75843562c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 7 May 2020 09:54:36 +0200
Subject: [PATCH 038/400] move to core

---
 app/build.gradle                              |   3 +-
 .../nightscout/androidaps/RealPumpTest.kt     |   4 +-
 .../info/nightscout/androidaps/Config.java    |  15 ---
 .../java/info/nightscout/androidaps/Config.kt |  15 +++
 .../nightscout/androidaps/MainActivity.kt     |   5 +-
 .../info/nightscout/androidaps/MainApp.java   |  13 ++-
 .../activities/MyPreferenceFragment.kt        |  26 +++--
 .../androidaps/activities/StatsActivity.kt    |   4 +-
 .../androidaps/activities/SurveyActivity.kt   |   5 +-
 .../activities/TDDStatsActivity.java          |   2 +-
 .../androidaps/db/DatabaseHelper.java         |  54 ++++++++-
 .../dependencyInjection/APSModule.kt          |   2 +-
 .../dependencyInjection/AppComponent.kt       |  42 -------
 .../dependencyInjection/AppModule.kt          |  20 ++--
 .../dependencyInjection/DataClassesModule.kt  |   5 +-
 .../dependencyInjection/OverviewModule.kt     |   8 --
 .../dependencyInjection/PluginsModule.kt      |   4 -
 .../dependencyInjection/UIModule.kt           |  10 --
 .../androidaps/dialogs/CalibrationDialog.kt   |   2 +-
 .../androidaps/dialogs/CarbsDialog.kt         |   2 +-
 .../androidaps/dialogs/CareDialog.kt          |   2 +-
 .../dialogs/DialogFragmentWithDate.kt         |   5 +-
 .../androidaps/dialogs/InsulinDialog.kt       |   2 +-
 .../androidaps/dialogs/ProfileSwitchDialog.kt |   2 +-
 .../androidaps/dialogs/TempBasalDialog.kt     |   2 +-
 .../androidaps/dialogs/TempTargetDialog.kt    |   2 +-
 .../androidaps/dialogs/WizardDialog.kt        |   2 +-
 .../androidaps/dialogs/WizardInfoDialog.kt    |   2 +-
 .../androidaps/events/EventTreatmentChange.kt |   2 +-
 .../historyBrowser/HistoryBrowseActivity.kt   |   2 +-
 .../IobCobStaticCalculatorPlugin.kt           |   2 +-
 .../plugins/aps/loop/LoopPlugin.java          |   2 +-
 .../DetermineBasalAdapterAMAJS.java           |   2 +-
 .../aps/openAPSAMA/OpenAPSAMAPlugin.java      |   4 +-
 .../DetermineBasalAdapterSMBJS.java           |   2 +-
 .../aps/openAPSSMB/OpenAPSSMBPlugin.java      |   4 +-
 .../plugins/configBuilder/PluginStore.kt      |   5 +-
 .../objectives/ObjectivesPlugin.kt            |   7 +-
 .../activities/ObjectivesExamDialog.kt        |   3 +-
 .../constraints/safety/SafetyPlugin.java      |   7 +-
 .../general/actions/ActionsFragment.kt        |   7 +-
 .../plugins/general/actions/ActionsPlugin.kt  |   7 +-
 .../general/automation/AutomationPlugin.kt    |   6 +-
 .../automation/actions/ActionNotification.kt  |   1 -
 .../automation/actions/ActionProfileSwitch.kt |   2 +-
 .../general/automation/elements/InputBg.kt    |   2 +-
 .../automation/elements/InputDateTime.kt      |   5 +-
 .../general/automation/elements/InputTime.kt  |   6 +-
 .../automation/elements/InputTimeRange.kt     |  10 +-
 .../general/automation/triggers/Trigger.kt    |   2 +-
 .../triggers/TriggerRecurringTime.kt          |  10 +-
 .../automation/triggers/TriggerTempTarget.kt  |   1 -
 .../automation/triggers/TriggerTimeRange.kt   |   8 +-
 .../automation/triggers/TriggerWifiSsid.kt    |   1 -
 .../general/careportal/CareportalPlugin.kt    |   7 +-
 .../Dialogs/NewNSTreatmentDialog.java         |  11 +-
 .../dataBroadcaster/DataBroadcastPlugin.kt    |  17 ++-
 .../general/maintenance/MaintenancePlugin.kt  |   6 +-
 .../general/nsclient/NSClientPlugin.java      |  10 +-
 .../plugins/general/nsclient/NSUpload.java    |   4 +-
 .../general/nsclient/data/NSSettingsStatus.kt |   5 +-
 .../nsclient/services/NSClientService.java    |   7 +-
 .../general/overview/OverviewFragment.kt      |  18 +--
 .../plugins/general/overview/OverviewMenus.kt |  11 +-
 .../general/overview/StatusLightHandler.kt    |   7 +-
 .../activities/QuickWizardListActivity.kt     |   5 +-
 .../overview/dialogs/EditQuickWizardDialog.kt |   5 +-
 .../events/EventOverviewBolusProgress.kt      |   2 +-
 .../general/overview/graphData/GraphData.kt   |   2 +-
 .../notifications/NotificationStore.kt        |   5 +-
 .../PersistentNotificationPlugin.kt           |  12 +-
 .../SmsCommunicatorFragment.kt                |   7 +-
 .../smsCommunicator/SmsCommunicatorPlugin.kt  |  10 +-
 .../general/tidepool/comm/UploadChunk.kt      |   2 +-
 .../general/tidepool/elements/BasalElement.kt |   2 +-
 .../general/tidepool/elements/BolusElement.kt |   2 +-
 .../tidepool/elements/WizardElement.kt        |   2 +-
 .../general/wear/ActionStringHandler.kt       |  18 +--
 .../wearintegration/WatchUpdaterService.java  |   7 +-
 .../xdripStatusline/StatusLinePlugin.kt       |   2 +-
 .../plugins/insulin/ActivityGraph.java        |   2 +-
 .../plugins/insulin/InsulinOrefBasePlugin.kt  |   4 +-
 .../insulin/InsulinOrefFreePeakPlugin.kt      |   2 +-
 .../insulin/InsulinOrefRapidActingPlugin.kt   |   2 +-
 .../InsulinOrefUltraRapidActingPlugin.kt      |   2 +-
 .../IobCobCalculatorPlugin.java               |   9 +-
 .../iobCobCalculator/IobCobOref1Thread.java   |  11 +-
 .../iob/iobCobCalculator/IobCobThread.java    |  11 +-
 .../profile/local/LocalProfilePlugin.kt       |  57 +++++----
 .../plugins/profile/ns/NSProfileFragment.kt   |   2 +-
 .../plugins/profile/ns/NSProfilePlugin.kt     |  11 +-
 .../plugins/pump/combo/ComboPlugin.java       |   4 +-
 .../pump/common/PumpPluginAbstract.java       |   3 +-
 .../plugins/pump/common/data/PumpStatus.java  |   2 +-
 .../common/defs/PumpHistoryEntryGroup.java    |   1 +
 .../plugins/pump/danaR/DanaRFragment.kt       |   5 +-
 .../plugins/pump/danaR/DanaRPlugin.java       |   2 +-
 .../plugins/pump/danaR/DanaRPump.kt           |   4 +-
 .../danaR/activities/DanaRHistoryActivity.kt  |   2 +-
 .../plugins/pump/danaR/comm/MsgBolusStart.kt  |   1 -
 .../pump/danaR/comm/MsgBolusStartWithSpeed.kt |   1 -
 .../AbstractDanaRExecutionService.java        |   3 +-
 .../danaR/services/DanaRExecutionService.java |  11 +-
 .../pump/danaRKorean/DanaRKoreanPlugin.java   |   2 +-
 .../services/DanaRKoreanExecutionService.java |  11 +-
 .../plugins/pump/danaRS/DanaRSPlugin.java     |   4 +-
 .../danaRS/comm/DanaRSMessageHashTable.kt     |   6 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  33 +++---
 .../pump/danaRS/services/DanaRSService.java   |   9 +-
 .../plugins/pump/danaRv2/DanaRv2Plugin.java   |   2 +-
 .../pump/danaRv2/comm/MessageHashTableRv2.kt  |   6 +-
 .../pump/danaRv2/comm/MsgHistoryEvents_v2.kt  |  31 ++---
 .../services/DanaRv2ExecutionService.java     |  14 +--
 .../pump/insight/LocalInsightFragment.java    |   3 +-
 .../pump/insight/LocalInsightPlugin.java      |   9 +-
 .../medtronic/data/MedtronicHistoryData.java  |   3 +-
 .../omnipod/dialogs/PodManagementActivity.kt  |   2 +-
 .../wizard/initpod/InitActionFragment.java    |   3 -
 .../dialogs/wizard/initpod/InitPodTask.java   |   3 +-
 .../pump/virtual/VirtualPumpFragment.kt       |   2 +-
 .../plugins/pump/virtual/VirtualPumpPlugin.kt |   9 +-
 .../sensitivity/AbstractSensitivityPlugin.kt  |   4 +-
 .../sensitivity/SensitivityAAPSPlugin.java    |   7 +-
 .../sensitivity/SensitivityOref1Plugin.java   |  74 ++++++------
 .../SensitivityWeightedAveragePlugin.java     |   8 +-
 .../plugins/source/BGSourceFragment.kt        |   7 +-
 .../plugins/treatments/TreatmentService.java  |   1 +
 .../plugins/treatments/TreatmentsPlugin.java  |   5 +-
 .../fragments/TreatmentsBolusFragment.kt      |   4 +-
 .../TreatmentsExtendedBolusesFragment.kt      |   3 +-
 .../TreatmentsTempTargetFragment.java         |   5 +-
 .../TreatmentsTemporaryBasalsFragment.kt      |   2 +-
 .../androidaps/queue/CommandQueue.kt          |   3 +-
 .../androidaps/receivers/KeepAliveReceiver.kt |   8 +-
 .../androidaps/setupwizard/SWDefinition.kt    |  13 ++-
 .../elements/SWEditNumberWithUnits.kt         |   2 +-
 .../androidaps/skins/SkinButtonsOn.kt         |   6 +-
 .../androidaps/skins/SkinClassic.kt           |   6 +-
 .../androidaps/utils/LocalAlertUtils.kt       |   7 +-
 .../androidaps/utils/XdripCalibrations.kt     |   2 +-
 .../utils/buildHelper/BuildHelper.kt          |   6 +-
 .../utils/resources/IconsProvider.kt          |  10 +-
 .../nightscout/androidaps/utils/stats/TIR.kt  |   2 +-
 .../androidaps/utils/stats/TddCalculator.kt   |  10 +-
 .../androidaps/utils/stats/TirCalculator.kt   |   7 +-
 .../androidaps/utils/wizard/BolusWizard.kt    |   2 +-
 .../utils/wizard/QuickWizardEntry.kt          |   2 +-
 app/src/main/res/values-nl-rNL/strings.xml    |   1 -
 app/src/main/res/values/colors.xml            |  11 --
 app/src/main/res/values/strings.xml           |  83 --------------
 .../info/nightscout/androidaps/TestBase.kt    |   5 -
 .../androidaps/TestBaseWithProfile.kt         |   8 +-
 .../androidaps/data/QuickWizardTest.kt        |   3 +-
 .../nightscout/androidaps/db/BgReadingTest.kt |   3 +-
 .../interfaces/ConstraintsCheckerTest.kt      |   2 -
 .../plugins/aps/loop/LoopPluginTest.kt        |   2 +-
 .../automation/actions/ActionsTestBase.kt     |   5 -
 .../triggers/TriggerAutosensValueTest.kt      |   2 +-
 .../automation/triggers/TriggerBgTest.kt      |   2 +-
 .../automation/triggers/TriggerDeltaTest.kt   |   2 +-
 .../automation/triggers/TriggerTestBase.kt    |   1 -
 .../SmsCommunicatorPluginTest.kt              |   2 -
 .../insulin/InsulinOrefBasePluginTest.kt      |   4 +-
 .../insulin/InsulinOrefFreePeakPluginTest.kt  |   3 +-
 .../InsulinOrefRapidActingPluginTest.kt       |   2 +-
 .../InsulinOrefUltraRapidActingPluginTest.kt  |   2 +-
 .../IobCobCalculatorPluginTest.kt             |   3 +-
 .../plugins/pump/combo/ComboPluginTest.kt     |   3 +-
 .../plugins/pump/danaR/DanaRPluginTest.kt     |   1 -
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  |   2 +-
 .../pump/danaR/comm/MsgBolusProgressTest.kt   |   2 +-
 .../pump/danaR/comm/MsgBolusStopTest.kt       |   4 +-
 .../pump/danaRKorean/DanaRKoreanPluginTest.kt |   1 -
 .../comm/MessageHashTableRKoreanTest.kt       |   1 -
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |   2 -
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |   2 -
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |   4 +-
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |   4 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |   5 +-
 .../plugins/pump/danaRv2/DanaRv2PluginTest.kt |   1 -
 .../pump/virtual/VirtualPumpPluginUTest.kt    |   3 +-
 .../androidaps/queue/CommandQueueTest.kt      |   4 -
 .../utils/wizard/BolusWizardTest.kt           |   3 +-
 build.gradle                                  |   1 +
 core/build.gradle                             |  10 ++
 .../info/nightscout/androidaps/Constants.java |   3 +
 .../androidaps/data/DetailedBolusInfo.java    |   0
 .../nightscout/androidaps/data/Intervals.java |   0
 .../info/nightscout/androidaps/data/Iob.java  |   0
 .../nightscout/androidaps/data/IobTotal.java  |   0
 .../nightscout/androidaps/data/MealData.java  |   0
 .../data/NonOverlappingIntervals.java         |   0
 .../androidaps/data/OverlappingIntervals.java |   0
 .../nightscout/androidaps/data/Profile.java   |  16 +--
 .../androidaps/data/ProfileIntervals.java     |   0
 .../androidaps/data/PumpEnactResult.java      |   2 +-
 .../data/defaultProfile/DefaultProfile.kt     |   0
 .../nightscout/androidaps/db/BgReading.java   |  20 ++--
 .../androidaps/db/CareportalEvent.java        |  13 +--
 .../androidaps/db/DanaRHistoryRecord.java     |   4 +-
 .../androidaps/db/DbObjectBase.java           |   0
 .../nightscout/androidaps/db/DbRequest.java   |   2 +-
 .../androidaps/db/ExtendedBolus.java          |  10 +-
 .../nightscout/androidaps/db/ICallback.java   |   0
 .../androidaps/db/ProfileSwitch.java          |  16 ++-
 .../info/nightscout/androidaps/db/Source.java |   0
 .../androidaps/db/StaticInjector.kt           |  28 +++++
 .../info/nightscout/androidaps/db/TDD.java    |  11 +-
 .../nightscout/androidaps/db/TempTarget.java  |   7 +-
 .../androidaps/db/TemporaryBasal.java         |  19 ++-
 .../nightscout/androidaps/db}/Treatment.java  |  11 +-
 .../androidaps/interfaces/APSInterface.java   |   1 +
 .../interfaces/ActivePluginProvider.java      |   0
 .../interfaces/BgSourceInterface.java         |   0
 .../interfaces/CommandQueueProvider.kt        |   0
 .../androidaps/interfaces/ConfigInterface.kt  |   9 ++
 .../androidaps/interfaces/Constraint.java     |   0
 .../interfaces/ConstraintsInterface.kt        |   0
 .../interfaces/DatabaseHelperInterface.kt     |   8 ++
 .../interfaces/InsulinInterface.java          |   2 +-
 .../androidaps/interfaces/Interval.java       |   0
 .../interfaces/IobCobCalculatorInterface.java |  11 ++
 .../androidaps/interfaces/PluginBase.kt       |   0
 .../interfaces/PluginDescription.java         |   0
 .../androidaps/interfaces/PluginType.java     |   0
 .../androidaps/interfaces}/ProfileFunction.kt |   4 +-
 .../interfaces/ProfileInterface.java          |   2 -
 .../androidaps/interfaces}/ProfileStore.kt    |   3 +-
 .../interfaces/PumpDescription.java           |   0
 .../androidaps/interfaces/PumpInterface.java  |   3 -
 .../androidaps/interfaces/PumpPluginBase.kt   |   0
 .../interfaces/SensitivityInterface.java      |   3 +-
 .../interfaces/TreatmentsInterface.java       |  23 +++-
 .../plugins/aps/loop/APSResult.java           |   8 +-
 .../plugins/aps/openAPSSMB/SMBDefaults.java   |   0
 .../plugins/common/ManufacturerType.java      |   0
 .../configBuilder/ConstraintChecker.kt        |   0
 .../ProfileFunctionImplementation.kt          |   7 +-
 .../general/actions/defs/CustomAction.kt      |   2 +-
 .../general/actions/defs/CustomActionType.kt  |   0
 .../plugins/general/nsclient/data/NSMbg.java  |   0
 .../plugins/general/nsclient/data/NSSgv.java  |   0
 .../DataPointWithLabelInterface.java          |   0
 .../PointsWithLabelGraphSeries.java           |  21 ++--
 .../overview/graphExtensions/Scale.java       |   0
 .../iob/iobCobCalculator/AutosensResult.java  |   0
 .../iobCobCalculator/data}/AutosensData.java  |  31 +++--
 .../pump/common/data/DoseSettings.java        |   0
 .../pump/common/defs/DoseStepSize.java        |   0
 .../pump/common/defs/PumpCapability.java      |   0
 .../pump/common/defs/PumpDriverState.java     |   0
 .../pump/common/defs/PumpStatusType.java      |   0
 .../pump/common/defs/PumpTempBasalType.java   |   0
 .../plugins/pump/common/defs/PumpType.java    |   8 +-
 .../nightscout/androidaps/queue/Callback.java |   0
 .../androidaps/queue/commands/Command.kt      |   2 +-
 .../nightscout/androidaps/utils/DateUtil.java |  53 ++++++---
 .../androidaps/utils/DecimalFormatter.java    |   0
 .../androidaps/utils/DefaultValueHelper.kt    |   4 +-
 .../nightscout/androidaps/utils/JsonHelper.kt |   0
 .../nightscout/androidaps/utils/Round.java    |   0
 .../androidaps/utils/TimeChangeType.java      |   0
 .../nightscout/androidaps/utils/Translator.kt |   2 +-
 .../drawable/icon_actions_profileswitch.png   | Bin
 core/src/main/res/values/colors.xml           |  21 +++-
 core/src/main/res/values/strings.xml          | 108 ++++++++++++++++++
 266 files changed, 924 insertions(+), 839 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/Config.java
 create mode 100644 app/src/main/java/info/nightscout/androidaps/Config.kt
 rename {app => core}/src/main/java/info/nightscout/androidaps/Constants.java (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/Intervals.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/Iob.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/IobTotal.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/MealData.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/Profile.java (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java (99%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/BgReading.java (93%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java (96%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java (95%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/DbObjectBase.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/DbRequest.java (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/ICallback.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java (94%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/Source.java (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/TDD.java (78%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/TempTarget.java (95%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java (97%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/treatments => core/src/main/java/info/nightscout/androidaps/db}/Treatment.java (95%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java (99%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/ConfigInterface.kt
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java (90%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/Interval.java (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PluginType.java (100%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/configBuilder => core/src/main/java/info/nightscout/androidaps/interfaces}/ProfileFunction.kt (85%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java (81%)
 rename {app/src/main/java/info/nightscout/androidaps/data => core/src/main/java/info/nightscout/androidaps/interfaces}/ProfileStore.kt (96%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java (60%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java (94%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt (95%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt (91%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java (96%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java (100%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator => core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data}/AutosensData.java (87%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/queue/Callback.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/DateUtil.java (90%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/Round.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/TimeChangeType.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/Translator.kt (98%)
 rename {app => core}/src/main/res/drawable/icon_actions_profileswitch.png (100%)

diff --git a/app/build.gradle b/app/build.gradle
index fa13e0eea0..20c70ab9b6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,6 @@ jacoco {
 }
 
 ext {
-    ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
     retrofit2Version = '2.8.1'
@@ -265,6 +264,7 @@ dependencies {
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
@@ -280,7 +280,6 @@ dependencies {
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
     implementation(name: "com.atech-software.android.library.wizardpager-1.1.1", ext: "aar")
 
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
index a327989975..9158c5f119 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
@@ -8,11 +8,10 @@ import androidx.test.rule.GrantPermissionRule
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
@@ -30,7 +29,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.slf4j.LoggerFactory
 import javax.inject.Inject
 
 @LargeTest
diff --git a/app/src/main/java/info/nightscout/androidaps/Config.java b/app/src/main/java/info/nightscout/androidaps/Config.java
deleted file mode 100644
index bb967cdeb6..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/Config.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package info.nightscout.androidaps;
-
-/**
- * Created by mike on 07.06.2016.
- */
-public class Config {
-    public static int SUPPORTEDNSVERSION = 1002; // 0.10.00
-
-    public static final boolean APS = BuildConfig.FLAVOR.equals("full");
-
-    public static final boolean NSCLIENT = BuildConfig.FLAVOR.equals("nsclient") || BuildConfig.FLAVOR.equals("nsclient2");
-    public static final boolean PUMPCONTROL = BuildConfig.FLAVOR.equals("pumpcontrol");
-
-    public static final boolean PUMPDRIVERS = BuildConfig.FLAVOR.equals("full") || BuildConfig.FLAVOR.equals("pumpcontrol");
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/Config.kt b/app/src/main/java/info/nightscout/androidaps/Config.kt
new file mode 100644
index 0000000000..c5edf0c438
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/Config.kt
@@ -0,0 +1,15 @@
+package info.nightscout.androidaps
+
+import info.nightscout.androidaps.interfaces.ConfigInterface
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class Config @Inject constructor(): ConfigInterface{
+
+    override val SUPPORTEDNSVERSION = 1002 // 0.10.00
+    override val APS = BuildConfig.FLAVOR == "full"
+    override val NSCLIENT = BuildConfig.FLAVOR == "nsclient" || BuildConfig.FLAVOR == "nsclient2"
+    override val PUMPCONTROL = BuildConfig.FLAVOR == "pumpcontrol"
+    override val PUMPDRIVERS = BuildConfig.FLAVOR == "full" || BuildConfig.FLAVOR == "pumpcontrol"
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 4e58a1f21f..c78aaedaf5 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -85,6 +85,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var iconsProvider: IconsProvider
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
+    @Inject lateinit var config: Config
 
     private lateinit var actionBarDrawerToggle: ActionBarDrawerToggle
     private var pluginPreferencesMenuItem: MenuItem? = null
@@ -137,7 +138,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         }
         androidPermission.notifyForStoragePermission(this)
         androidPermission.notifyForBatteryOptimizationPermission(this)
-        if (Config.PUMPDRIVERS) {
+        if (config.PUMPDRIVERS) {
             androidPermission.notifyForLocationPermissions(this)
             androidPermission.notifyForSMSPermissions(this, smsCommunicatorPlugin)
             androidPermission.notifyForSystemWindowPermissions(this)
@@ -352,7 +353,7 @@ class MainActivity : NoSplashAppCompatActivity() {
         val hashes: List<String> = signatureVerifierPlugin.shortHashes()
         if (hashes.isNotEmpty()) fabricPrivacy.firebaseAnalytics.setUserProperty("Hash", hashes[0])
         activePlugin.activePump.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Pump", it::class.java.simpleName) }
-        if (!Config.NSCLIENT && !Config.PUMPCONTROL)
+        if (!config.NSCLIENT && !config.PUMPCONTROL)
             activePlugin.activeAPS.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Aps", it::class.java.simpleName) }
         activePlugin.activeBgSource.let { fabricPrivacy.firebaseAnalytics.setUserProperty("BgSource", it::class.java.simpleName) }
         fabricPrivacy.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 66acee4016..85d8f83ed7 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -14,14 +14,19 @@ import com.j256.ormlite.android.apptools.OpenHelperManager;
 
 import net.danlew.android.joda.JodaTimeAndroid;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjector;
 import dagger.android.DaggerApplication;
+import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.DatabaseHelper;
+import info.nightscout.androidaps.db.StaticInjector;
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -40,7 +45,7 @@ import info.nightscout.androidaps.utils.ActivityMonitor;
 import info.nightscout.androidaps.utils.LocaleHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-public class MainApp extends DaggerApplication {
+public class MainApp extends DaggerApplication implements DatabaseHelperInterface {
 
     static MainApp sInstance;
     private static Resources sResources;
@@ -57,6 +62,8 @@ public class MainApp extends DaggerApplication {
     @Inject KeepAliveReceiver.KeepAliveManager keepAliveManager;
     @Inject List<PluginBase> plugins;
 
+    @Inject StaticInjector staticInjector; // TODO remove , fake only to initialize
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -166,4 +173,8 @@ public class MainApp extends DaggerApplication {
         keepAliveManager.cancelAlarm(this);
         super.onTerminate();
     }
+
+    @NotNull @Override public List<BgReading> getAllBgreadingsDataFromTime(long mills, boolean ascending) {
+        return getDbHelper().getAllBgreadingsDataFromTime(mills, ascending);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 78147d4108..f7872853f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
@@ -66,6 +66,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var sp: SP
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var pluginStore: PluginStore
+    @Inject lateinit var config: Config
 
     @Inject lateinit var automationPlugin: AutomationPlugin
     @Inject lateinit var danaRPlugin: DanaRPlugin
@@ -100,6 +101,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var passwordCheck: PasswordCheck
     @Inject lateinit var nsSettingStatus: NSSettingsStatus
 
+    // TODO why?
     @Inject lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     override fun androidInjector(): AndroidInjector<Any> = androidInjector
@@ -160,20 +162,20 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(careportalPlugin, rootKey)
-            addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, Config.APS)
-            addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, Config.APS)
-            addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, Config.APS)
+            addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, config.APS)
+            addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, config.APS)
+            addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, config.APS)
             addPreferencesFromResourceIfEnabled(sensitivityAAPSPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(sensitivityWeightedAveragePlugin, rootKey)
             addPreferencesFromResourceIfEnabled(sensitivityOref1Plugin, rootKey)
-            addPreferencesFromResourceIfEnabled(danaRPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(danaRKoreanPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(danaRv2Plugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(danaRSPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, Config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey, !Config.NSCLIENT)
+            addPreferencesFromResourceIfEnabled(danaRPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRKoreanPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRv2Plugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(danaRSPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey, !config.NSCLIENT)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(nsClientPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(tidepoolPlugin, rootKey)
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
index 6ea91d443a..d53f06e67c 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.activities
 import android.os.Bundle
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.utils.ActivityMonitor
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import info.nightscout.androidaps.utils.stats.TirCalculator
@@ -15,12 +16,13 @@ class StatsActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var tirCalculator: TirCalculator
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activityMonitor: ActivityMonitor
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_stats)
 
-        stats_tdds.text = tddCalculator.stats()
+        stats_tdds.text = tddCalculator.stats(dateUtil)
         stats_tir.text = tirCalculator.stats()
         stats_activity.text = activityMonitor.stats()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index 2a5e8bcecd..8797bcfe70 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.InstanceId
@@ -31,6 +31,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activityMonitor: ActivityMonitor
     @Inject lateinit var defaultProfile: DefaultProfile
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -42,7 +43,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
         val profileList = profileStore?.getProfileList() ?: return
         survey_spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, profileList)
 
-        survey_tdds.text = tddCalculator.stats()
+        survey_tdds.text = tddCalculator.stats(dateUtil)
         survey_tir.text = tirCalculator.stats()
         survey_activity.text = activityMonitor.stats()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index ae337b8e59..1cf80ed1ca 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -39,7 +39,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 5759429d69..abc6df92c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -33,7 +33,7 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventNewBG;
@@ -50,8 +50,6 @@ import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
@@ -62,6 +60,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.db.PodHistory;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.PercentageSplitter;
+import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
@@ -83,7 +82,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public static final String DATABASE_DANARHISTORY = "DanaRHistory";
     public static final String DATABASE_DBREQUESTS = "DBRequests";
     public static final String DATABASE_CAREPORTALEVENTS = "CareportalEvents";
-    public static final String DATABASE_PROFILESWITCHES = "ProfileSwitches";
     public static final String DATABASE_TDDS = "TDDs";
     public static final String DATABASE_INSIGHT_HISTORY_OFFSETS = "InsightHistoryOffsets";
     public static final String DATABASE_INSIGHT_BOLUS_IDS = "InsightBolusIDs";
@@ -1903,4 +1901,52 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return new ArrayList<>();
     }
 
+
+    // Copied from xDrip+
+    String calculateDirection(BgReading bgReading) {
+        // Rework to get bgreaings from internal DB and calculate on that base
+
+        List<BgReading> bgReadingsList = MainApp.getDbHelper().getAllBgreadingsDataFromTime(bgReading.date - T.mins(10).msecs(), false);
+        if (bgReadingsList == null || bgReadingsList.size() < 2)
+            return "NONE";
+        BgReading current = bgReadingsList.get(1);
+        BgReading previous = bgReadingsList.get(0);
+
+        if (bgReadingsList.get(1).date < bgReadingsList.get(0).date) {
+            current = bgReadingsList.get(0);
+            previous = bgReadingsList.get(1);
+        }
+
+        double slope;
+
+        // Avoid division by 0
+        if (current.date == previous.date)
+            slope = 0;
+        else
+            slope = (previous.value - current.value) / (previous.date - current.date);
+
+//        aapsLogger.error(LTag.GLUCOSE, "Slope is :" + slope + " delta " + (previous.value - current.value) + " date difference " + (current.date - previous.date));
+
+        double slope_by_minute = slope * 60000;
+        String arrow = "NONE";
+
+        if (slope_by_minute <= (-3.5)) {
+            arrow = "DoubleDown";
+        } else if (slope_by_minute <= (-2)) {
+            arrow = "SingleDown";
+        } else if (slope_by_minute <= (-1)) {
+            arrow = "FortyFiveDown";
+        } else if (slope_by_minute <= (1)) {
+            arrow = "Flat";
+        } else if (slope_by_minute <= (2)) {
+            arrow = "FortyFiveUp";
+        } else if (slope_by_minute <= (3.5)) {
+            arrow = "SingleUp";
+        } else if (slope_by_minute <= (40)) {
+            arrow = "DoubleUp";
+        }
+//        aapsLogger.error(LTag.GLUCOSE, "Direction set to: " + arrow);
+        return arrow;
+    }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
index d3fef14166..7315329ab2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalAdapterAM
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index a836da500e..1dec3bf9bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -6,48 +6,6 @@ import dagger.android.AndroidInjectionModule
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.dependencyInjection.CoreModule
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
-import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.ProfileSwitch
-import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
-import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
-import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
-import info.nightscout.androidaps.plugins.general.automation.actions.*
-import info.nightscout.androidaps.plugins.general.automation.elements.*
-import info.nightscout.androidaps.plugins.general.automation.triggers.*
-import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
-import info.nightscout.androidaps.plugins.general.smsCommunicator.AuthRequest
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
-import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.queue.CommandQueue
-import info.nightscout.androidaps.queue.commands.*
-import info.nightscout.androidaps.setupwizard.SWEventListener
-import info.nightscout.androidaps.setupwizard.SWScreen
-import info.nightscout.androidaps.setupwizard.elements.*
-import info.nightscout.androidaps.utils.wizard.BolusWizard
-import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 import javax.inject.Singleton
 
 @Singleton
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 944fe3615f..e405ab91fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -8,13 +8,11 @@ import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -37,17 +35,18 @@ open class AppModule {
     }
 
     @Provides
-    fun providesPlugins(@PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
+    fun providesPlugins(configInterface: ConfigInterface,
+                        @PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
                         @PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.NSClient nsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>)
         : List<@JvmSuppressWildcards PluginBase> {
         val plugins = allConfigs.toMutableMap()
-        if (Config.PUMPDRIVERS) plugins += pumpDrivers.get()
-        if (Config.APS) plugins += aps.get()
-        if (!Config.NSCLIENT) plugins += notNsClient.get()
-        if (Config.NSCLIENT) plugins += nsClient.get()
+        if (configInterface.PUMPDRIVERS) plugins += pumpDrivers.get()
+        if (configInterface.APS) plugins += aps.get()
+        if (!configInterface.NSCLIENT) plugins += notNsClient.get()
+        if (configInterface.NSCLIENT) plugins += nsClient.get()
         return plugins.toList().sortedBy { it.first }.map { it.second }
     }
 
@@ -62,8 +61,11 @@ open class AppModule {
 
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
+        @Binds fun bindDatabaseHelperInterface(mainApp: MainApp): DatabaseHelperInterface
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
         @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
+        @Binds fun configInterfaceProvider(config: Config): ConfigInterface
+        @Binds fun treatmentInterfaceProvider(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
 
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
index 99ffb12f25..536454413c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
@@ -3,14 +3,14 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
@@ -23,6 +23,7 @@ abstract class DataClassesModule {
     @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus
     @ContributesAndroidInjector abstract fun profileStoreInjector(): ProfileStore
 
+    // TODO move to Core
     @ContributesAndroidInjector abstract fun bgReadingInjector(): BgReading
     @ContributesAndroidInjector abstract fun treatmentInjector(): Treatment
     @ContributesAndroidInjector abstract fun profileSwitchInjector(): ProfileSwitch
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt
index d022d3a726..196e5b1203 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/OverviewModule.kt
@@ -2,16 +2,8 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
 
 @Module
 @Suppress("unused")
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 2861829d7f..e7b1903389 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -1,13 +1,9 @@
 package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Binds
-import dagger.Lazy
 import dagger.Module
-import dagger.Provides
 import dagger.multibindings.IntKey
 import dagger.multibindings.IntoMap
-import dagger.multibindings.IntoSet
-import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/UIModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/UIModule.kt
index 50abc0b69a..193b46957a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/UIModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/UIModule.kt
@@ -2,16 +2,6 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.aps.loop.APSResult
-import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
-import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
-import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
-import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
-import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
 import info.nightscout.androidaps.skins.SkinListPreference
 
 @Module
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
index ff1b401b0d..10c10b27f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
@@ -9,7 +9,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index caba26346f..73effb19d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TempTarget
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index e561cb0890..8a07e111b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.DateUtil
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
index 081589f526..73921c0067 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/DialogFragmentWithDate.kt
@@ -24,6 +24,7 @@ import javax.inject.Inject
 abstract class DialogFragmentWithDate : DaggerDialogFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var sp: SP
+    @Inject lateinit var dateUtil: DateUtil
 
     var eventTime = DateUtil.now()
     var eventTimeChanged = false
@@ -57,7 +58,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
         eventTime = savedInstanceState?.getLong("eventTime") ?: DateUtil.now()
         eventTimeChanged = savedInstanceState?.getBoolean("eventTimeChanged") ?: false
         overview_eventdate?.text = DateUtil.dateString(eventTime)
-        overview_eventtime?.text = DateUtil.timeString(eventTime)
+        overview_eventtime?.text = dateUtil.timeString(eventTime)
 
         // create an OnDateSetListener
         val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
@@ -92,7 +93,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() {
             cal.set(Calendar.SECOND, seconds++) // randomize seconds to prevent creating record of the same time, if user choose time manually
             eventTime = cal.timeInMillis
             eventTimeChanged = true
-            overview_eventtime?.text = DateUtil.timeString(eventTime)
+            overview_eventtime?.text = dateUtil.timeString(eventTime)
         }
 
         overview_eventtime?.setOnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index 333de055ca..e4fa54e2f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -21,7 +21,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 45491761d7..10be190380 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -9,7 +9,7 @@ import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index bcba2ae87b..3e6a2c374e 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index ba114c9b21..95ca3c0723 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TempTarget
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index cc3c6c7a98..23ddfcabd1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
index 2c25836f8d..2bac82dbc6 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardInfoDialog.kt
@@ -9,7 +9,7 @@ import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.kt b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.kt
index 9cbc9d1563..679b62ee30 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.kt
@@ -1,5 +1,5 @@
 package info.nightscout.androidaps.events
 
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 
 class EventTreatmentChange(val treatment: Treatment?) : EventLoop()
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index 0b260e9470..ab8cae8666 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -18,7 +18,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
index 87276a50a9..8334ce9567 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 93fcef0f0b..c5c723731c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -53,7 +53,7 @@ import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
index 50a6c6e018..c6b5afbdeb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -32,7 +32,7 @@ import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
index 42003d1b13..0cb082f368 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.java
@@ -27,8 +27,8 @@ import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 4d3a0db704..6b5f5363b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -31,7 +31,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index 878d260bca..6da05d9075 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -30,8 +30,8 @@ import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui;
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateResultGui;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
index 35ba1db642..5166248e7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
@@ -9,7 +9,8 @@ import javax.inject.Singleton
 
 @Singleton
 class PluginStore @Inject constructor(
-    val aapsLogger: AAPSLogger
+    private val aapsLogger: AAPSLogger,
+    private val config: Config
 ) : ActivePluginProvider {
 
     lateinit var plugins: List<@JvmSuppressWildcards PluginBase>
@@ -68,7 +69,7 @@ class PluginStore @Inject constructor(
         var pluginsInCategory: ArrayList<PluginBase>?
 
         // PluginType.APS
-        if (!Config.NSCLIENT && !Config.PUMPCONTROL) {
+        if (!config.NSCLIENT && !config.PUMPCONTROL) {
             pluginsInCategory = getSpecificPluginsList(PluginType.APS)
             activeAPS = getTheOneEnabledInArray(pluginsInCategory, PluginType.APS) as APSInterface?
             if (activeAPS == null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
index 209a74f44a..cc57908438 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPlugin.kt
@@ -24,13 +24,14 @@ class ObjectivesPlugin @Inject constructor(
     aapsLogger: AAPSLogger,
     resourceHelper: ResourceHelper,
     private val activePlugin: ActivePluginProvider,
-    private val sp: SP
+    private val sp: SP,
+    private val config: Config
 
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.CONSTRAINTS)
     .fragmentClass(ObjectivesFragment::class.qualifiedName)
-    .alwaysEnabled(Config.APS)
-    .showInList(Config.APS)
+    .alwaysEnabled(config.APS)
+    .showInList(config.APS)
     .pluginName(R.string.objectives)
     .shortName(R.string.objectives_shortname)
     .description(R.string.description_objectives),
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
index 2ea9743cee..e44135eb45 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt
@@ -21,6 +21,7 @@ import javax.inject.Inject
 class ObjectivesExamDialog : DaggerDialogFragment() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var dateUtil: DateUtil
 
     companion object {
         var objective: Objective? = null
@@ -76,7 +77,7 @@ class ObjectivesExamDialog : DaggerDialogFragment() {
                 objectives_exam_hints.addView(h.generate(context))
             }
             // Disabled to
-            objectives_exam_disabledto.text = resourceHelper.gs(R.string.answerdisabledto, DateUtil.timeString(task.disabledTo))
+            objectives_exam_disabledto.text = resourceHelper.gs(R.string.answerdisabledto, dateUtil.timeString(task.disabledTo))
             objectives_exam_disabledto.visibility = if (task.isEnabledAnswer) View.GONE else View.VISIBLE
             // Buttons
             objectives_exam_verify.isEnabled = !task.answered && task.isEnabledAnswer
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
index ab325f1f0c..b6f25325f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java
@@ -47,6 +47,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
     private HardLimits hardLimits;
     private BuildHelper buildHelper;
     private TreatmentsPlugin treatmentsPlugin;
+    private Config config;
 
     @Inject
     public SafetyPlugin(
@@ -62,7 +63,8 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
             ActivePluginProvider activePlugin,
             HardLimits hardLimits,
             BuildHelper buildHelper,
-            TreatmentsPlugin treatmentsPlugin
+            TreatmentsPlugin treatmentsPlugin,
+            Config config
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.CONSTRAINTS)
@@ -83,6 +85,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
         this.hardLimits = hardLimits;
         this.buildHelper = buildHelper;
         this.treatmentsPlugin = treatmentsPlugin;
+        this.config = config;
     }
 
     /**
@@ -159,7 +162,7 @@ public class SafetyPlugin extends PluginBase implements ConstraintsInterface {
 
         absoluteRate.setIfGreater(getAapsLogger(), 0d, String.format(getResourceHelper().gs(R.string.limitingbasalratio), 0d, getResourceHelper().gs(R.string.itmustbepositivevalue)), this);
 
-        if (Config.APS) {
+        if (config.getAPS()) {
             double maxBasal = sp.getDouble(R.string.key_openapsma_max_basal, 1d);
             if (maxBasal < profile.getMaxDailyBasal()) {
                 maxBasal = profile.getMaxDailyBasal();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 6a324d74cc..e6077e6e26 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.queue.Callback
@@ -54,6 +54,7 @@ class ActionsFragment : DaggerFragment() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var protectionCheck: ProtectionCheck
+    @Inject lateinit var config: Config
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -239,7 +240,7 @@ class ActionsFragment : DaggerFragment() {
             if (!pump.pumpDescription.isRefillingCapable || !pump.isInitialized || pump.isSuspended) View.GONE
             else View.VISIBLE
 
-        actions_temptarget?.visibility = Config.APS.toVisibility()
+        actions_temptarget?.visibility = config.APS.toVisibility()
         actions_tddstats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
         statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, careportal_pbage, null)
         checkPumpCustomActions()
@@ -247,7 +248,7 @@ class ActionsFragment : DaggerFragment() {
 
     private fun checkPumpCustomActions() {
         val activePump = activePlugin.activePump
-        val customActions = activePump.customActions ?: return
+        val customActions = activePump.customActions
         removePumpCustomActions()
 
         for (customAction in customActions) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
index 91125a9e1e..ff3927da71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsPlugin.kt
@@ -15,12 +15,13 @@ import javax.inject.Singleton
 class ActionsPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper
+    resourceHelper: ResourceHelper,
+    config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(ActionsFragment::class.qualifiedName)
-    .enableByDefault(Config.APS || Config.PUMPCONTROL)
-    .visibleByDefault(Config.APS || Config.PUMPCONTROL)
+    .enableByDefault(config.APS || config.PUMPCONTROL)
+    .visibleByDefault(config.APS || config.PUMPCONTROL)
     .pluginName(R.string.actions)
     .shortName(R.string.actions_shortname)
     .description(R.string.description_actions),
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index 9a1c4d5c3a..b4f9ec425e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -37,7 +37,6 @@ import io.reactivex.schedulers.Schedulers
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.ArrayList
@@ -52,7 +51,8 @@ class AutomationPlugin @Inject constructor(
     private val loopPlugin: LoopPlugin,
     private val rxBus: RxBusWrapper,
     private val constraintChecker: ConstraintChecker,
-    aapsLogger: AAPSLogger
+    aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(AutomationFragment::class.qualifiedName)
@@ -197,7 +197,7 @@ class AutomationPlugin @Inject constructor(
                     action.doAction(object : Callback() {
                         override fun run() {
                             val sb = StringBuilder()
-                            sb.append(DateUtil.timeString(DateUtil.now()))
+                            sb.append(dateUtil.timeString(DateUtil.now()))
                             sb.append(" ")
                             sb.append(if (result.success) "☺" else "▼")
                             sb.append(" <b>")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
index 76152b8861..7a730585c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithE
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
-import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationUserMessage
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.JsonHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
index 3e6406fac0..a46796b59d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.elements.InputProfileName
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
index c7ee4a5d6a..f81ef07bb8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
@@ -4,7 +4,7 @@ import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.NumberPicker
 import java.text.DecimalFormat
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
index f61d1d5719..2c92fcb75f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDateTime.kt
@@ -18,6 +18,7 @@ import javax.inject.Inject
 class InputDateTime(injector: HasAndroidInjector) : Element(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var context: Context
+    @Inject lateinit var dateUtil: DateUtil
 
     var value: Long = DateUtil.now()
 
@@ -30,7 +31,7 @@ class InputDateTime(injector: HasAndroidInjector) : Element(injector) {
         val dateButton = TextView(root.context)
         val timeButton = TextView(root.context)
         dateButton.text = DateUtil.dateString(value)
-        timeButton.text = DateUtil.timeString(value)
+        timeButton.text = dateUtil.timeString(value)
 
         // create an OnDateSetListener
         val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
@@ -63,7 +64,7 @@ class InputDateTime(injector: HasAndroidInjector) : Element(injector) {
             cal.set(Calendar.MINUTE, minute)
             cal.set(Calendar.SECOND, 0) // randomize seconds to prevent creating record of the same time, if user choose time manually
             value = cal.timeInMillis
-            timeButton.text = DateUtil.timeString(value)
+            timeButton.text = dateUtil.timeString(value)
         }
 
         timeButton.setOnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
index 01a7854e35..bd0622b29b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTime.kt
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -20,17 +19,18 @@ import javax.inject.Inject
 class InputTime(injector: HasAndroidInjector) : Element(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var context: Context
+    @Inject lateinit var dateUtil: DateUtil
 
     var value: Int = getMinSinceMidnight(DateUtil.now())
 
     override fun addToLayout(root: LinearLayout) {
         val label = TextView(root.context)
         val startButton = TextView(root.context)
-        startButton.text = DateUtil.timeString(toMills(value))
+        startButton.text = dateUtil.timeString(toMills(value))
 
         val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
             value = 60 * hour + minute
-            startButton.text = DateUtil.timeString(toMills(value))
+            startButton.text = dateUtil.timeString(toMills(value))
         }
 
         startButton.setOnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
index 4775990d16..f8d0a369dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTimeRange.kt
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -20,6 +19,7 @@ import javax.inject.Inject
 class InputTimeRange(injector: HasAndroidInjector) : Element(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var context: Context
+    @Inject lateinit var dateUtil: DateUtil
 
     var start: Int = getMinSinceMidnight(DateUtil.now())
     var end: Int = getMinSinceMidnight(DateUtil.now())
@@ -28,13 +28,13 @@ class InputTimeRange(injector: HasAndroidInjector) : Element(injector) {
         val label = TextView(root.context)
         val startButton = TextView(root.context)
         val endButton = TextView(root.context)
-        startButton.text = DateUtil.timeString(toMills(start))
+        startButton.text = dateUtil.timeString(toMills(start))
         @Suppress("SetTextI18n")
-        endButton.text = resourceHelper.gs(R.string.and) + "      " + DateUtil.timeString(toMills(end))
+        endButton.text = resourceHelper.gs(R.string.and) + "      " + dateUtil.timeString(toMills(end))
 
         val startTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
             start = 60 * hour + minute
-            startButton.text = DateUtil.timeString(toMills(start))
+            startButton.text = dateUtil.timeString(toMills(start))
         }
 
         startButton.setOnClickListener {
@@ -51,7 +51,7 @@ class InputTimeRange(injector: HasAndroidInjector) : Element(injector) {
 
         val endTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute ->
             end = 60 * hour + minute
-            endButton.text = DateUtil.timeString(toMills(end))
+            endButton.text = dateUtil.timeString(toMills(end))
         }
 
         endButton.setOnClickListener {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
index 3890deb60d..357e4b462d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTriggerDialog
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerChanged
 import info.nightscout.androidaps.plugins.general.automation.events.EventTriggerClone
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
index 8982a12669..08343a3c94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
@@ -13,11 +13,13 @@ import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabe
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
 import java.util.*
+import javax.inject.Inject
 
 class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
+    @Inject lateinit var dateUtil: DateUtil
+
     val days = InputWeekDay(injector)
     val time = InputTime(injector)
 
@@ -27,9 +29,9 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
             System.arraycopy(triggerRecurringTime.days.weekdays, 0, days.weekdays, 0, triggerRecurringTime.days.weekdays.size)
     }
 
-    fun time(minutes:Int): TriggerRecurringTime {
+    fun time(minutes: Int): TriggerRecurringTime {
         time.value = minutes
-        return  this
+        return this
     }
 
     override fun shouldRun(): Boolean {
@@ -85,7 +87,7 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
             sb.append(resourceHelper.gs(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(i)).shortName))
         }
         sb.append(" ")
-        sb.append(DateUtil.timeString(toMills(time.value)))
+        sb.append(dateUtil.timeString(toMills(time.value)))
         return if (counter == 0) resourceHelper.gs(R.string.never) else sb.toString()
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
index 015cfce079..26aa0c81b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
@@ -5,7 +5,6 @@ import com.google.common.base.Optional
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.automation.elements.ComparatorExists
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
index 2c565fa733..08f54025bb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
@@ -12,12 +12,14 @@ import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabe
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper.safeGetInt
 import info.nightscout.androidaps.utils.MidnightTime
-import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
+import javax.inject.Inject
 
 // Trigger for time range ( from 10:00AM till 13:00PM )
 class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
 
+    @Inject lateinit var dateUtil: DateUtil
+    
     // in minutes since midnight 60 means 1AM
     var range = InputTimeRange(injector)
 
@@ -31,7 +33,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
         range.end = triggerTimeRange.range.end
     }
 
-    fun period(start: Int, end:Int) : TriggerTimeRange {
+    fun period(start: Int, end: Int): TriggerTimeRange {
         this.range.start = start
         this.range.end = end
         return this
@@ -70,7 +72,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.time_range
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.timerange_value, DateUtil.timeString(toMills(range.start)), DateUtil.timeString(toMills(range.end)))
+        resourceHelper.gs(R.string.timerange_value, dateUtil.timeString(toMills(range.start)), dateUtil.timeString(toMills(range.end)))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
index cef73c1339..49aeec14ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.general.automation.elements.InputStrin
 import info.nightscout.androidaps.plugins.general.automation.elements.LabelWithElement
 import info.nightscout.androidaps.plugins.general.automation.elements.LayoutBuilder
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
-import info.nightscout.androidaps.receivers.NetworkChangeReceiver
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
 import info.nightscout.androidaps.utils.JsonHelper
 import org.json.JSONObject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
index e3328aefc9..897f28b0ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
@@ -15,14 +15,15 @@ import javax.inject.Singleton
 class CareportalPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper
+    resourceHelper: ResourceHelper,
+    config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(CareportalFragment::class.java.name)
     .pluginName(R.string.careportal)
     .shortName(R.string.careportal_shortname)
-    .visibleByDefault(Config.NSCLIENT)
-    .enableByDefault(Config.NSCLIENT)
+    .visibleByDefault(config.NSCLIENT)
+    .enableByDefault(config.NSCLIENT)
     .description(R.string.description_careportal),
     aapsLogger, resourceHelper, injector
 )
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 0c7dd11e83..8cbb16a8dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -44,14 +44,14 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
@@ -61,9 +61,9 @@ import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.NumberPicker;
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
 import info.nightscout.androidaps.utils.SafeParse;
 import info.nightscout.androidaps.utils.Translator;
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -79,6 +79,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
     @Inject TreatmentsPlugin treatmentsPlugin;
     @Inject HardLimits hardLimits;
     @Inject Translator translator;
+    @Inject DateUtil dateUtil;
 
     private static OptionsToShow options;
     private static @StringRes int event;
@@ -168,7 +169,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
         dateButton = view.findViewById(R.id.careportal_newnstreatment_eventdate);
         timeButton = view.findViewById(R.id.careportal_newnstreatment_eventtime);
         dateButton.setText(DateUtil.dateString(eventTime));
-        timeButton.setText(DateUtil.timeString(eventTime));
+        timeButton.setText(dateUtil.timeString(eventTime));
         dateButton.setOnClickListener(this);
         timeButton.setOnClickListener(this);
 
@@ -484,7 +485,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
         eventTime.setHours(hourOfDay);
         eventTime.setMinutes(minute);
         eventTime.setSeconds(this.seconds++); // randomize seconds to prevent creating record of the same time, if user choose time manually
-        timeButton.setText(DateUtil.timeString(eventTime));
+        timeButton.setText(dateUtil.timeString(eventTime));
         updateBGforDateTime();
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
index 63a32edc41..28d2b378b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt
@@ -14,16 +14,12 @@ import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventNewBasalProfile
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.events.EventTreatmentChange
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.events.EventOpenAPSUpdateGui
+import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
@@ -53,8 +49,9 @@ class DataBroadcastPlugin @Inject constructor(
     private val nsDeviceStatus: NSDeviceStatus,
     private val loopPlugin: LoopPlugin,
     private val activePlugin: ActivePluginProvider,
-    private var receiverStatusStore: ReceiverStatusStore
-
+    private var receiverStatusStore: ReceiverStatusStore,
+    private val config: Config,
+    private val databaseHelper: DatabaseHelperInterface
 
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
@@ -131,7 +128,7 @@ class DataBroadcastPlugin @Inject constructor(
         bundle.putDouble("glucoseMgdl", lastBG.value)   // last BG in mgdl
         bundle.putLong("glucoseTimeStamp", lastBG.date) // timestamp
         bundle.putString("units", profileFunction.getUnits()) // units used in AAPS "mg/dl" or "mmol"
-        bundle.putString("slopeArrow", lastBG.directionToSymbol()) // direction arrow as string
+        bundle.putString("slopeArrow", lastBG.directionToSymbol(databaseHelper)) // direction arrow as string
         bundle.putDouble("deltaMgdl", glucoseStatus.delta) // bg delta in mgdl
         bundle.putDouble("avgDeltaMgdl", glucoseStatus.avgdelta) // average bg delta
         bundle.putDouble("high", defaultValueHelper.determineHighLine()) // predefined top value of in range (green area)
@@ -158,7 +155,7 @@ class DataBroadcastPlugin @Inject constructor(
         bundle.putInt("phoneBattery", receiverStatusStore.batteryLevel)
         bundle.putInt("rigBattery", nsDeviceStatus.uploaderStatus.replace("%", "").trim { it <= ' ' }.toInt())
 
-        if (Config.APS && loopPlugin.lastRun?.lastTBREnact != 0L) { //we are AndroidAPS
+        if (config.APS && loopPlugin.lastRun?.lastTBREnact != 0L) { //we are AndroidAPS
             bundle.putLong("suggestedTimeStamp", loopPlugin.lastRun?.lastAPSRun ?: -1L)
             bundle.putString("suggested", loopPlugin.lastRun?.request?.json().toString())
             if (loopPlugin.lastRun?.tbrSetByPump != null && loopPlugin.lastRun?.tbrSetByPump?.enacted == true) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
index 4a3e5e83ab..9377b58992 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
@@ -18,7 +18,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
 import java.io.*
 import java.util.*
 import java.util.zip.ZipEntry
@@ -34,7 +33,8 @@ class MaintenancePlugin @Inject constructor(
     private val sp: SP,
     private val nsSettingsStatus: NSSettingsStatus,
     aapsLogger: AAPSLogger,
-    private val buildHelper: BuildHelper
+    private val buildHelper: BuildHelper,
+    private val config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(MaintenanceFragment::class.java.name)
@@ -171,7 +171,7 @@ class MaintenancePlugin @Inject constructor(
         builder.append("you have to do it manually)" + System.lineSeparator())
         builder.append("-------------------------------------------------------" + System.lineSeparator())
         builder.append(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION + System.lineSeparator())
-        if (Config.NSCLIENT) builder.append("NSCLIENT" + System.lineSeparator())
+        if (config.NSCLIENT) builder.append("NSCLIENT" + System.lineSeparator())
         builder.append("Build: " + BuildConfig.BUILDVERSION + System.lineSeparator())
         builder.append("Remote: " + BuildConfig.REMOTE + System.lineSeparator())
         builder.append("Flavor: " + BuildConfig.FLAVOR + BuildConfig.BUILD_TYPE + System.lineSeparator())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index 51f394860a..da77936384 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -11,7 +11,6 @@ import android.text.Html;
 import android.text.Spanned;
 
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -58,6 +57,7 @@ public class NSClientPlugin extends PluginBase {
     private final ResourceHelper resourceHelper;
     private final Context context;
     private final SP sp;
+    private final Config config;
 
     public Handler handler;
 
@@ -81,7 +81,8 @@ public class NSClientPlugin extends PluginBase {
             ResourceHelper resourceHelper,
             Context context,
             SP sp,
-            NsClientReceiverDelegate nsClientReceiverDelegate
+            NsClientReceiverDelegate nsClientReceiverDelegate,
+            Config config
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.GENERAL)
@@ -99,8 +100,9 @@ public class NSClientPlugin extends PluginBase {
         this.context = context;
         this.sp = sp;
         this.nsClientReceiverDelegate = nsClientReceiverDelegate;
+        this.config = config;
 
-        if (Config.NSCLIENT) {
+        if (config.getNSCLIENT()) {
             getPluginDescription().alwaysEnabled(true).visibleByDefault(true);
         }
         if (handler == null) {
@@ -184,7 +186,7 @@ public class NSClientPlugin extends PluginBase {
     public void preprocessPreferences(@NotNull PreferenceFragmentCompat preferenceFragment) {
         super.preprocessPreferences(preferenceFragment);
 
-        if (Config.NSCLIENT) {
+        if (config.getNSCLIENT()) {
             preferenceFragment.findPreference(resourceHelper.gs(R.string.key_statuslights_overview_advanced));
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 75f1c9b30c..48a2b31b35 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -25,7 +25,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DbRequest;
@@ -40,7 +40,7 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.utils.DateUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
index 8319c143b1..d0441cccfa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
@@ -115,7 +115,8 @@ class NSSettingsStatus @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val rxBus: RxBusWrapper,
     private val defaultValueHelper: DefaultValueHelper,
-    private val sp: SP
+    private val sp: SP,
+    private val config: Config
 ) {
 
     var nightscoutVersionName = ""
@@ -126,7 +127,7 @@ class NSSettingsStatus @Inject constructor(
     fun handleNewData(nightscoutVersionName: String, nightscoutVersionCode: Int, status: JSONObject) {
         this.nightscoutVersionName = nightscoutVersionName
         aapsLogger.debug(LTag.NSCLIENT, "Got versions: Nightscout: $nightscoutVersionName")
-        if (nightscoutVersionCode < Config.SUPPORTEDNSVERSION) {
+        if (nightscoutVersionCode < config.SUPPORTEDNSVERSION) {
             val notification = Notification(Notification.OLD_NS, resourceHelper.gs(R.string.unsupportednsversion), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 9c76a6e16b..54de04db85 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -20,7 +20,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.net.URISyntaxException;
 import java.sql.SQLException;
@@ -31,11 +30,10 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
@@ -91,6 +89,7 @@ public class NSClientService extends DaggerService {
     @Inject SP sp;
     @Inject NSClientPlugin nsClientPlugin;
     @Inject BuildHelper buildHelper;
+    @Inject Config config;
 
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -557,7 +556,7 @@ public class NSClientService extends DaggerService {
                             nsSettingsStatus.setData(status);
 
                             if (!status.has("versionNum")) {
-                                if (status.getInt("versionNum") < Config.SUPPORTEDNSVERSION) {
+                                if (status.getInt("versionNum") < config.getSUPPORTEDNSVERSION()) {
                                     rxBus.send(new EventNSClientNewLog("ERROR", "Unsupported Nightscout version !!!!"));
                                 }
                             } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 4a6455e41c..2a462fb44a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -36,14 +36,15 @@ import info.nightscout.androidaps.dialogs.WizardDialog
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
@@ -134,6 +135,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var overviewMenus: OverviewMenus
     @Inject lateinit var skinProvider: SkinProvider
+    @Inject lateinit var config: Config
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     private val disposable = CompositeDisposable()
 
@@ -510,7 +514,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     fun updateGUI(from: String) {
         aapsLogger.debug("UpdateGUI from $from")
 
-        overview_time?.text = DateUtil.timeString(Date())
+        overview_time?.text = dateUtil.timeString(Date())
 
         if (!profileFunction.isProfileValid("Overview")) {
             overview_pumpstatus?.setText(R.string.noprofileset)
@@ -541,7 +545,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             overview_bg?.text = lastBG.valueToUnitsToString(units)
             overview_bg?.setTextColor(color)
-            overview_arrow?.text = lastBG.directionToSymbol()
+            overview_arrow?.text = lastBG.directionToSymbol(databaseHelper)
             overview_arrow?.setTextColor(color)
 
             val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
@@ -570,7 +574,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val closedLoopEnabled = constraintChecker.isClosedLoopAllowed()
 
         // open loop mode
-        if (Config.APS && pump.pumpDescription.isTempBasalCapable) {
+        if (config.APS && pump.pumpDescription.isTempBasalCapable) {
             overview_apsmode?.visibility = View.VISIBLE
             when {
                 loopPlugin.isEnabled() && loopPlugin.isSuperBolus                       -> {
@@ -719,7 +723,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
 
         // Status lights
-        overview_statuslights?.visibility = (sp.getBoolean(R.string.key_show_statuslights, true) || Config.NSCLIENT).toVisibility()
+        overview_statuslights?.visibility = (sp.getBoolean(R.string.key_show_statuslights, true) || config.NSCLIENT).toVisibility()
         statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, careportal_reservoirlevel, careportal_sensorage, careportal_pbage, careportal_batterylevel)
 
         // cob
@@ -732,7 +736,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_cob?.text = cobText
 
         val lastRun = loopPlugin.lastRun
-        val predictionsAvailable = if (Config.APS) lastRun?.request?.hasPredictions == true else Config.NSCLIENT
+        val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
 
         // pump status from ns
         overview_pump?.text = nsDeviceStatus.pumpStatus
@@ -771,7 +775,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 val toTime: Long
                 val fromTime: Long
                 val endTime: Long
-                val apsResult = if (Config.APS) lastRun?.constraintsProcessed else NSDeviceStatus.getAPSResult(injector)
+                val apsResult = if (config.APS) lastRun?.constraintsProcessed else NSDeviceStatus.getAPSResult(injector)
                 if (predictionsAvailable && apsResult != null && overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal]) {
                     var predHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
                     predHours = min(2, predHours)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index a6ad002aa9..69c6f84cb2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -15,7 +15,6 @@ import androidx.annotation.StringRes
 import androidx.appcompat.widget.PopupMenu
 import androidx.fragment.app.FragmentManager
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
@@ -34,7 +33,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
@@ -42,7 +41,6 @@ import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import java.lang.reflect.Type
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -59,7 +57,8 @@ class OverviewMenus @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val commandQueue: CommandQueueProvider,
     private val configBuilderPlugin: ConfigBuilderPlugin,
-    private val loopPlugin: LoopPlugin
+    private val loopPlugin: LoopPlugin,
+    private val config: Config
 ) {
 
     enum class CharType(@StringRes val nameId: Int, @ColorRes val colorId: Int, val primary: Boolean, val secondary: Boolean) {
@@ -117,8 +116,8 @@ class OverviewMenus @Inject constructor(
 
         chartButton.setOnClickListener { v: View ->
             val predictionsAvailable: Boolean = when {
-                Config.APS      -> loopPlugin.lastRun?.request?.hasPredictions ?: false
-                Config.NSCLIENT -> true
+                config.APS      -> loopPlugin.lastRun?.request?.hasPredictions ?: false
+                config.NSCLIENT -> true
                 else            -> false
             }
             val popup = PopupMenu(v.context, v)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
index b05e1cb015..8a95e34e1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/StatusLightHandler.kt
@@ -20,7 +20,8 @@ class StatusLightHandler @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val sp: SP,
     private val activePlugin: ActivePluginProvider,
-    private val warnColors: WarnColors
+    private val warnColors: WarnColors,
+    private val config: Config
 ) {
 
     /**
@@ -32,9 +33,9 @@ class StatusLightHandler @Inject constructor(
         handleAge(careportal_insulinage, CareportalEvent.INSULINCHANGE, R.string.key_statuslights_iage_warning, 72.0, R.string.key_statuslights_iage_critical, 144.0)
         handleAge(careportal_sensorage, CareportalEvent.SENSORCHANGE, R.string.key_statuslights_sage_warning, 216.0, R.string.key_statuslights_sage_critical, 240.0)
         handleAge(careportal_pbage, CareportalEvent.PUMPBATTERYCHANGE, R.string.key_statuslights_bage_warning, 216.0, R.string.key_statuslights_bage_critical, 240.0)
-        if (!Config.NSCLIENT)
+        if (!config.NSCLIENT)
             handleLevel(careportal_reservoirlevel, R.string.key_statuslights_res_critical, 10.0, R.string.key_statuslights_res_warning, 80.0, pump.reservoirLevel, "U")
-        if (!Config.NSCLIENT && pump.model() != PumpType.AccuChekCombo)
+        if (!config.NSCLIENT && pump.model() != PumpType.AccuChekCombo)
             handleLevel(careportal_batterylevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
index 505ec3e943..6510b7505f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@@ -29,6 +29,7 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var quickWizard: QuickWizard
+    @Inject lateinit var dateUtil: DateUtil
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -39,8 +40,8 @@ class QuickWizardListActivity : NoSplashAppCompatActivity() {
         }
 
         override fun onBindViewHolder(holder: QuickWizardEntryViewHolder, position: Int) {
-            holder.from.text = DateUtil.timeString(quickWizard[position].validFromDate())
-            holder.to.text = DateUtil.timeString(quickWizard[position].validToDate())
+            holder.from.text = dateUtil.timeString(quickWizard[position].validFromDate())
+            holder.to.text = dateUtil.timeString(quickWizard[position].validToDate())
             holder.buttonText.text = quickWizard[position].buttonText()
             holder.carbs.text = resourceHelper.gs(R.string.format_carbs, quickWizard[position].carbs())
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
index d2531c77c5..188ce707db 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
@@ -27,6 +27,7 @@ class EditQuickWizardDialog : DaggerDialogFragment() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var quickWizard: QuickWizard
+    @Inject lateinit var dateUtil: DateUtil
 
     var position = -1
 
@@ -77,13 +78,13 @@ class EditQuickWizardDialog : DaggerDialogFragment() {
         var pos = 0
         var t = 0
         while (t < 24 * 60 * 60) {
-            timeList.add(DateUtil.timeString(DateUtil.toDate(t)))
+            timeList.add(dateUtil.timeString(DateUtil.toDate(t)))
             if (entry.validFrom() == t) posFrom = pos
             if (entry.validTo() == t) posTo = pos
             pos++
             t += 15 * 60
         }
-        timeList.add(DateUtil.timeString(DateUtil.toDate(24 * 60 * 60 - 60)))
+        timeList.add(dateUtil.timeString(DateUtil.toDate(24 * 60 * 60 - 60)))
 
         val adapter = context?.let { context -> ArrayAdapter(context, R.layout.spinner_centered, timeList) }
         overview_editquickwizard_from_spinner.adapter = adapter
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
index 52b62790da..fe43913333 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.general.overview.events
 
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.events.Event
 
 object EventOverviewBolusProgress : Event() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
index 54d34533f3..02ccf1480f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -21,7 +21,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin.LastRun
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
index b07e9756e9..f467cc1fce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationStore.kt
@@ -38,7 +38,8 @@ class NotificationStore @Inject constructor(
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
     private val context: Context,
-    private val iconsProvider: IconsProvider
+    private val iconsProvider: IconsProvider,
+    private val dateUtil: DateUtil
 ) {
 
     var store: MutableList<Notification> = ArrayList()
@@ -192,7 +193,7 @@ class NotificationStore @Inject constructor(
             if (notification.buttonText != 0) holder.dismiss.setText(notification.buttonText)
             else holder.dismiss.setText(R.string.snooze)
             @Suppress("SetTextI18n")
-            holder.text.text = DateUtil.timeString(notification.date) + " " + notification.text
+            holder.text.text = dateUtil.timeString(notification.date) + " " + notification.text
             when (notification.level) {
                 Notification.URGENT       -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationUrgent))
                 Notification.NORMAL       -> holder.cv.setBackgroundColor(resourceHelper.gc(R.color.notificationNormal))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index c1a203a343..e8d32ed386 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -14,14 +14,11 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.events.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
@@ -47,7 +44,8 @@ class PersistentNotificationPlugin @Inject constructor(
     private var rxBus: RxBusWrapper,
     private var context: Context,
     private var notificationHolder: NotificationHolder,
-    private val iconsProvider: IconsProvider
+    private val iconsProvider: IconsProvider,
+    private val databaseHelper: DatabaseHelperInterface
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .neverVisible(true)
@@ -147,7 +145,7 @@ class PersistentNotificationPlugin @Inject constructor(
                 if (glucoseStatus != null) {
                     line1 += ("  Δ" + Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
                         + " avgΔ" + Profile.toSignedUnitsString(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units))
-                    line1_aa += "  " + lastBG.directionToSymbol()
+                    line1_aa += "  " + lastBG.directionToSymbol(databaseHelper)
                 } else {
                     line1 += " " +
                         resourceHelper.gs(R.string.old_data) +
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
index 94dd9965f8..49a1778a7e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt
@@ -23,6 +23,7 @@ class SmsCommunicatorFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy : FabricPrivacy
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
+    @Inject lateinit var dateUtil: DateUtil
 
     private val disposable = CompositeDisposable()
 
@@ -61,15 +62,15 @@ class SmsCommunicatorFragment : DaggerFragment() {
             val sms = smsCommunicatorPlugin.messages[x]
             when {
                 sms.ignored  -> {
-                    logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + "░ " + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                    logText += dateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + "░ " + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
 
                 sms.received -> {
-                    logText += DateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                    logText += dateUtil.timeString(sms.date) + " &lt;&lt;&lt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
 
                 sms.sent     -> {
-                    logText += DateUtil.timeString(sms.date) + " &gt;&gt;&gt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
+                    logText += dateUtil.timeString(sms.date) + " &gt;&gt;&gt; " + (if (sms.processed) "● " else "○ ") + sms.phoneNumber + " <b>" + sms.text + "</b><br>"
                 }
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index c8a6bc8601..7aa94f1dcc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
@@ -61,7 +61,9 @@ class SmsCommunicatorPlugin @Inject constructor(
     private val loopPlugin: LoopPlugin,
     private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
     private val xdripCalibrations: XdripCalibrations,
-    private var otp: OneTimePassword
+    private var otp: OneTimePassword,
+    private val config: Config,
+    private val dateUtil: DateUtil
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(SmsCommunicatorFragment::class.java.name)
@@ -612,7 +614,7 @@ class SmsCommunicatorPlugin @Inject constructor(
                             override fun run() {
                                 if (result.success) {
                                     var replyText = String.format(resourceHelper.gs(R.string.smscommunicator_extendedset), aDouble, duration)
-                                    if (Config.APS) replyText += "\n" + resourceHelper.gs(R.string.loopsuspended)
+                                    if (config.APS) replyText += "\n" + resourceHelper.gs(R.string.loopsuspended)
                                     replyText += "\n" + activePlugin.activePump.shortStatus(true)
                                     sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText))
                                 } else {
@@ -713,7 +715,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         if (grams == 0) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
         else {
             val passCode = generatePasscode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode), grams, DateUtil.timeString(time), passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_carbsreplywithcode), grams, dateUtil.timeString(time), passCode)
             receivedSms.processed = true
             messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction(grams, time) {
                 override fun run() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
index 9c5bfb9aad..8ad1bdd0bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.tidepool.elements.*
 import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolStatus
 import info.nightscout.androidaps.plugins.general.tidepool.utils.GsonInstance
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
index 4297e24420..50e07a4096 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BasalElement.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.general.tidepool.elements
 
 import com.google.gson.annotations.Expose
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import java.util.*
 
 class BasalElement(tbr: TemporaryBasal, private val profileFunction: ProfileFunction)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BolusElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BolusElement.kt
index 3d8dcbe964..f437018994 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BolusElement.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/BolusElement.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.tidepool.elements
 
 import com.google.gson.annotations.Expose
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import java.util.*
 
 class BolusElement(treatment: Treatment)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/WizardElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/WizardElement.kt
index d7641862fe..87aba24d1c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/WizardElement.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/WizardElement.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.general.tidepool.elements
 
 import com.google.gson.annotations.Expose
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import java.util.*
 
 class WizardElement(treatment: Treatment)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index f1c58029d1..8aed0f5288 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
@@ -67,7 +67,9 @@ class ActionStringHandler @Inject constructor(
     private val danaRSPlugin: DanaRSPlugin,
     private val danaRPump: DanaRPump,
     private val hardLimits: HardLimits,
-    private val carbsGenerator: CarbsGenerator
+    private val carbsGenerator: CarbsGenerator,
+    private val dateUtil: DateUtil,
+    private val config: Config
 ) {
 
     private val TIMEOUT = 65 * 1000
@@ -278,7 +280,7 @@ class ActionStringHandler @Inject constructor(
             val starttimestamp = System.currentTimeMillis() + starttime * 60 * 1000
             val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(Constraint(carbs)).value()
             rMessage += resourceHelper.gs(R.string.carbs) + ": " + carbsAfterConstraints + "g"
-            rMessage += "\n" + resourceHelper.gs(R.string.time) + ": " + DateUtil.timeString(starttimestamp)
+            rMessage += "\n" + resourceHelper.gs(R.string.time) + ": " + dateUtil.timeString(starttimestamp)
             rMessage += "\n" + resourceHelper.gs(R.string.duration) + ": " + duration + "h"
             if (carbsAfterConstraints - carbs != 0) {
                 rMessage += "\n" + resourceHelper.gs(R.string.constraintapllied)
@@ -409,8 +411,8 @@ class ActionStringHandler @Inject constructor(
                 ret += "APS: " + (aps as PluginBase).name
                 val lastRun = loopPlugin.lastRun
                 if (lastRun != null) {
-                    ret += "\nLast Run: " + DateUtil.timeString(lastRun.lastAPSRun)
-                    if (lastRun.lastTBREnact != 0L) ret += "\nLast Enact: " + DateUtil.timeString(lastRun.lastTBREnact)
+                    ret += "\nLast Run: " + dateUtil.timeString(lastRun.lastAPSRun)
+                    if (lastRun.lastTBREnact != 0L) ret += "\nLast Enact: " + dateUtil.timeString(lastRun.lastTBREnact)
                 }
             } else {
                 ret += "LOOP DISABLED\n"
@@ -422,7 +424,7 @@ class ActionStringHandler @Inject constructor(
     private val targetsStatus: String
         get() {
             var ret = ""
-            if (!Config.APS) {
+            if (!config.APS) {
                 return "Targets only apply in APS mode!"
             }
             val profile = profileFunction.getProfile() ?: return "No profile set :("
@@ -430,7 +432,7 @@ class ActionStringHandler @Inject constructor(
             val tempTarget = activePlugin.activeTreatments.tempTargetFromHistory
             if (tempTarget != null) {
                 ret += "Temp Target: " + Profile.toTargetRangeString(tempTarget.low, tempTarget.low, Constants.MGDL, profileFunction.getUnits())
-                ret += "\nuntil: " + DateUtil.timeString(tempTarget.originalEnd())
+                ret += "\nuntil: " + dateUtil.timeString(tempTarget.originalEnd())
                 ret += "\n\n"
             }
             ret += "DEFAULT RANGE: "
@@ -442,7 +444,7 @@ class ActionStringHandler @Inject constructor(
     private val oAPSResultStatus: String
         get() {
             var ret = ""
-            if (!Config.APS)
+            if (!config.APS)
                 return "Only apply in APS mode!"
             val usedAPS = activePlugin.activeAPS
             val result = usedAPS.lastAPSResult ?: return "Last result not available!"
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index b60dd1f1fd..e0a0657826 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -42,13 +42,13 @@ import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSDeviceStatus;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.general.wear.WearPlugin;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -72,6 +72,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     @Inject public TreatmentsPlugin treatmentsPlugin;
     @Inject public ActionStringHandler actionStringHandler;
     @Inject ReceiverStatusStore receiverStatusStore;
+    @Inject Config config;
 
     public static final String ACTION_RESEND = WatchUpdaterService.class.getName().concat(".Resend");
     public static final String ACTION_OPEN_SETTINGS = WatchUpdaterService.class.getName().concat(".OpenSettings");
@@ -712,7 +713,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
             long openApsStatus;
             //OpenAPS status
-            if (Config.APS) {
+            if (config.getAPS()) {
                 //we are AndroidAPS
                 openApsStatus = loopPlugin.lastRun != null && loopPlugin.lastRun.lastTBREnact != 0 ? loopPlugin.lastRun.lastTBREnact : -1;
             } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
index 79a8dd486b..067c444eaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.utils.DecimalFormatter
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/ActivityGraph.java b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/ActivityGraph.java
index fd8564cf73..cb8dabdde5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/ActivityGraph.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/ActivityGraph.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
index e5a92588c3..935fad3ccb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePlugin.kt
@@ -9,10 +9,10 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
index 1ae2869b6e..f1804cbd43 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPlugin.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
index 634ad2df5d..770e7f1f91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPlugin.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
index e2048d7a65..60f07c3203 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPlugin.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index c35e3797dc..fe5ac90449 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -30,18 +30,20 @@ import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventNewBasalProfile;
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -55,7 +57,7 @@ import io.reactivex.schedulers.Schedulers;
 import static info.nightscout.androidaps.utils.DateUtil.now;
 
 @Singleton
-public class IobCobCalculatorPlugin extends PluginBase {
+public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculatorInterface {
     private final HasAndroidInjector injector;
     private final SP sp;
     private final RxBusWrapper rxBus;
@@ -681,6 +683,7 @@ public class IobCobCalculatorPlugin extends PluginBase {
         }
     }
 
+    @Override
     public String lastDataTime() {
         if (autosensDataTable.size() > 0)
             return DateUtil.dateAndTimeString(autosensDataTable.valueAt(autosensDataTable.size() - 1).time);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index 9478b9ed73..b1762e3722 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -26,14 +26,15 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -240,7 +241,8 @@ public class IobCobOref1Thread extends Thread {
                     List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
-                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment));
+                        boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();
+                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment, isAAPSOrWeighted));
                         autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentCarbTreatment.carbs) + "g]";
                     }
 
@@ -277,7 +279,8 @@ public class IobCobOref1Thread extends Thread {
                         autosensData.uam = previous.uam;
                     }
 
-                    autosensData.removeOldCarbs(bgTime);
+                    boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();
+                    autosensData.removeOldCarbs(bgTime, isAAPSOrWeighted);
                     autosensData.cob += autosensData.carbsFromBolus;
                     autosensData.mealCarbs += autosensData.carbsFromBolus;
                     autosensData.deviation = deviation;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index 48b9c2eb0a..d9ceb47dfc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -24,14 +24,15 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -237,7 +238,8 @@ public class IobCobThread extends Thread {
                     List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
-                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment));
+                        boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();
+                        autosensData.activeCarbsList.add(autosensData.new CarbsInPast(recentCarbTreatment, isAAPSOrWeighted));
                         autosensData.pastSensitivity += "[" + DecimalFormatter.to0Decimal(recentCarbTreatment.carbs) + "g]";
                     }
 
@@ -268,7 +270,8 @@ public class IobCobThread extends Thread {
                         autosensData.substractAbosorbedCarbs();
                         autosensData.usedMinCarbsImpact = totalMinCarbsImpact;
                     }
-                    autosensData.removeOldCarbs(bgTime);
+                    boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();
+                    autosensData.removeOldCarbs(bgTime, isAAPSOrWeighted);
                     autosensData.cob += autosensData.carbsFromBolus;
                     autosensData.deviation = deviation;
                     autosensData.bgi = bgi;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index 456c46a5da..8d2761cfa3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.events.EventProfileStoreChanged
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
@@ -14,7 +14,7 @@ import info.nightscout.androidaps.interfaces.ProfileInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
@@ -53,11 +53,6 @@ class LocalProfilePlugin @Inject constructor(
 
     private val defaultArray = "[{\"time\":\"00:00\",\"timeAsSeconds\":0,\"value\":0}]"
 
-    companion object {
-        @JvmStatic
-        val LOCAL_PROFILE = "LocalProfile"
-    }
-
     override fun onStart() {
         super.onStart()
         loadSettings()
@@ -122,7 +117,7 @@ class LocalProfilePlugin @Inject constructor(
     fun storeSettings(activity: Activity? = null) {
         for (i in 0 until numOfProfiles) {
             profiles[i].run {
-                val LOCAL_PROFILE_NUMBERED = LOCAL_PROFILE + "_" + i + "_"
+                val LOCAL_PROFILE_NUMBERED = Constants.LOCAL_PROFILE + "_" + i + "_"
                 sp.putString(LOCAL_PROFILE_NUMBERED + "name", name!!)
                 sp.putBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", mgdl)
                 sp.putDouble(LOCAL_PROFILE_NUMBERED + "dia", dia)
@@ -133,7 +128,7 @@ class LocalProfilePlugin @Inject constructor(
                 sp.putString(LOCAL_PROFILE_NUMBERED + "targethigh", targetHigh.toString())
             }
         }
-        sp.putInt(LOCAL_PROFILE + "_profiles", numOfProfiles)
+        sp.putInt(Constants.LOCAL_PROFILE + "_profiles", numOfProfiles)
 
         createAndStoreConvertedProfile()
         isEdited = false
@@ -154,20 +149,20 @@ class LocalProfilePlugin @Inject constructor(
 
     @Synchronized
     fun loadSettings() {
-        if (sp.contains(LOCAL_PROFILE + "mgdl")) {
+        if (sp.contains(Constants.LOCAL_PROFILE + "mgdl")) {
             doConversion()
             return
         }
 
-        numOfProfiles = sp.getInt(LOCAL_PROFILE + "_profiles", 0)
+        numOfProfiles = sp.getInt(Constants.LOCAL_PROFILE + "_profiles", 0)
         profiles.clear()
         numOfProfiles = max(numOfProfiles, 1) // create at least one default profile if none exists
 
         for (i in 0 until numOfProfiles) {
             val p = SingleProfile()
-            val LOCAL_PROFILE_NUMBERED = LOCAL_PROFILE + "_" + i + "_"
+            val LOCAL_PROFILE_NUMBERED = Constants.LOCAL_PROFILE + "_" + i + "_"
 
-            p.name = sp.getString(LOCAL_PROFILE_NUMBERED + "name", LOCAL_PROFILE + i)
+            p.name = sp.getString(LOCAL_PROFILE_NUMBERED + "name", Constants.LOCAL_PROFILE + i)
             if (isExistingName(p.name)) continue
             p.mgdl = sp.getBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", false)
             p.dia = sp.getDouble(LOCAL_PROFILE_NUMBERED + "dia", Constants.defaultDIA)
@@ -240,10 +235,10 @@ class LocalProfilePlugin @Inject constructor(
         aapsLogger.debug(LTag.PROFILE, "Loading stored settings")
         val p = SingleProfile()
 
-        p.mgdl = sp.getBoolean(LOCAL_PROFILE + "mgdl", profileFunction.getUnits() == Constants.MGDL)
-        p.dia = sp.getDouble(LOCAL_PROFILE + "dia", Constants.defaultDIA)
+        p.mgdl = sp.getBoolean(Constants.LOCAL_PROFILE + "mgdl", profileFunction.getUnits() == Constants.MGDL)
+        p.dia = sp.getDouble(Constants.LOCAL_PROFILE + "dia", Constants.defaultDIA)
         try {
-            p.ic = JSONArray(sp.getString(LOCAL_PROFILE + "ic", defaultArray))
+            p.ic = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "ic", defaultArray))
         } catch (e1: JSONException) {
             try {
                 p.ic = JSONArray(defaultArray)
@@ -252,7 +247,7 @@ class LocalProfilePlugin @Inject constructor(
         }
 
         try {
-            p.isf = JSONArray(sp.getString(LOCAL_PROFILE + "isf", defaultArray))
+            p.isf = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "isf", defaultArray))
         } catch (e1: JSONException) {
             try {
                 p.isf = JSONArray(defaultArray)
@@ -261,7 +256,7 @@ class LocalProfilePlugin @Inject constructor(
         }
 
         try {
-            p.basal = JSONArray(sp.getString(LOCAL_PROFILE + "basal", defaultArray))
+            p.basal = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "basal", defaultArray))
         } catch (e1: JSONException) {
             try {
                 p.basal = JSONArray(defaultArray)
@@ -270,7 +265,7 @@ class LocalProfilePlugin @Inject constructor(
         }
 
         try {
-            p.targetLow = JSONArray(sp.getString(LOCAL_PROFILE + "targetlow", defaultArray))
+            p.targetLow = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "targetlow", defaultArray))
         } catch (e1: JSONException) {
             try {
                 p.targetLow = JSONArray(defaultArray)
@@ -279,23 +274,23 @@ class LocalProfilePlugin @Inject constructor(
         }
 
         try {
-            p.targetHigh = JSONArray(sp.getString(LOCAL_PROFILE + "targethigh", defaultArray))
+            p.targetHigh = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "targethigh", defaultArray))
         } catch (e1: JSONException) {
             try {
                 p.targetHigh = JSONArray(defaultArray)
             } catch (ignored: JSONException) {
             }
         }
-        p.name = LOCAL_PROFILE
+        p.name = Constants.LOCAL_PROFILE
 
-        sp.remove(LOCAL_PROFILE + "mgdl")
-        sp.remove(LOCAL_PROFILE + "mmol")
-        sp.remove(LOCAL_PROFILE + "dia")
-        sp.remove(LOCAL_PROFILE + "ic")
-        sp.remove(LOCAL_PROFILE + "isf")
-        sp.remove(LOCAL_PROFILE + "basal")
-        sp.remove(LOCAL_PROFILE + "targetlow")
-        sp.remove(LOCAL_PROFILE + "targethigh")
+        sp.remove(Constants.LOCAL_PROFILE + "mgdl")
+        sp.remove(Constants.LOCAL_PROFILE + "mmol")
+        sp.remove(Constants.LOCAL_PROFILE + "dia")
+        sp.remove(Constants.LOCAL_PROFILE + "ic")
+        sp.remove(Constants.LOCAL_PROFILE + "isf")
+        sp.remove(Constants.LOCAL_PROFILE + "basal")
+        sp.remove(Constants.LOCAL_PROFILE + "targetlow")
+        sp.remove(Constants.LOCAL_PROFILE + "targethigh")
 
         currentProfileIndex = 0
         numOfProfiles = 1
@@ -352,13 +347,13 @@ class LocalProfilePlugin @Inject constructor(
     fun addNewProfile() {
         var free = 0
         for (i in 1..10000) {
-            if (rawProfile?.getSpecificProfile(LOCAL_PROFILE + i) == null) {
+            if (rawProfile?.getSpecificProfile(Constants.LOCAL_PROFILE + i) == null) {
                 free = i
                 break
             }
         }
         val p = SingleProfile()
-        p.name = LOCAL_PROFILE + free
+        p.name = Constants.LOCAL_PROFILE + free
         p.mgdl = profileFunction.getUnits() == Constants.MGDL
         p.dia = Constants.defaultDIA
         p.ic = JSONArray(defaultArray)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
index 87831d5352..119f2b41a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfileFragment.kt
@@ -9,7 +9,7 @@ import android.widget.ArrayAdapter
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.profile.ns.events.EventNSProfileUpdateGUI
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt
index a93cbaad01..31aa4a2df1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/ns/NSProfilePlugin.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.events.EventProfileStoreChanged
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
@@ -27,15 +27,16 @@ class NSProfilePlugin @Inject constructor(
     aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
-    private val sp: SP
+    private val sp: SP,
+    config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.PROFILE)
     .fragmentClass(NSProfileFragment::class.java.name)
     .pluginName(R.string.nsprofile)
     .shortName(R.string.profileviewer_shortname)
-    .alwaysEnabled(Config.NSCLIENT)
-    .alwaysVisible(Config.NSCLIENT)
-    .showInList(!Config.NSCLIENT)
+    .alwaysEnabled(config.NSCLIENT)
+    .alwaysVisible(config.NSCLIENT)
+    .showInList(!config.NSCLIENT)
     .description(R.string.description_profile_nightscout),
     aapsLogger, resourceHelper, injector
 ), ProfileInterface {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 0ec21a8014..ace9df0a97 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -44,7 +44,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -65,7 +65,7 @@ import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpH
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.PumpHistoryRequest;
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Tdd;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.InstanceId;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 126b017b5e..f4dd6a48df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -37,9 +37,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
index 34a3418902..3c51b484e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.data;
 
 import java.util.Date;
 
-import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpStatusType;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.utils.DateUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
index 48d1df3b9d..bbe96c41c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
@@ -6,6 +6,7 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 
+
 /**
  * This file was taken from GGC - GNU Gluco Control (ggc.sourceforge.net), application for diabetes
  * management and modified/extended for AAPS.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index 9a8477ae2d..3b4f84a4d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -46,6 +46,7 @@ class DanaRFragment : DaggerFragment() {
     @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var warnColors: WarnColors
+    @Inject lateinit var dateUtil: DateUtil
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -155,7 +156,7 @@ class DanaRFragment : DaggerFragment() {
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
             val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
-            danar_lastconnection.text = DateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            danar_lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
             warnColors.setColor(danar_lastconnection, agoMin.toDouble(), 16.0, 31.0)
         }
         if (pump.lastBolusTime != 0L) {
@@ -163,7 +164,7 @@ class DanaRFragment : DaggerFragment() {
             val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
             if (agoHours < 6)
             // max 6h back
-                danar_lastbolus.text = DateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+                danar_lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + DateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
             else
                 danar_lastbolus.text = ""
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index 3c6ce84c42..95fdc80829 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index 0621fd80ad..2f18df687e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -4,10 +4,10 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index 0daed24ddb..288e10ef9d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -21,7 +21,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
index 695c3f1ec0..e0e2df7a90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
@@ -4,7 +4,6 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 
 class MsgBolusStart(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
index 3ea3eed8f1..8080166af1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
@@ -4,7 +4,6 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 
 class MsgBolusStartWithSpeed(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index f93ce4a780..a72d813199 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -21,7 +21,6 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventBTChange;
-import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -41,7 +40,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistorySuspend;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.ToastUtils;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 832826cf52..510ba70578 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.services;
 
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -17,9 +15,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
@@ -29,7 +25,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -67,15 +63,12 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 
 public class DanaRExecutionService extends AbstractDanaRExecutionService {
     @Inject AAPSLogger aapsLogger;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 809cf77e6f..57d14c36b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -31,7 +31,7 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index 0d18b1ecef..96de7ad78d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.services;
 
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -16,9 +14,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
@@ -28,7 +24,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -59,14 +55,11 @@ import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTable
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 
 public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject AAPSLogger aapsLogger;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 2227c905a9..8d5b8093b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -41,7 +41,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
@@ -54,7 +54,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange;
 import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index 2edf5254b3..3e64372fc7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -23,7 +24,8 @@ class DanaRSMessageHashTable @Inject constructor(
     activePlugin: ActivePluginProvider,
     constraintChecker: ConstraintChecker,
     detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    injector: HasAndroidInjector
+    injector: HasAndroidInjector,
+    dateUtil: DateUtil
 ) {
 
     var messages: HashMap<Int, DanaRS_Packet> = HashMap()
@@ -101,7 +103,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
         // APS
         put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
-        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector,0))
+        put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, dateUtil, 0))
         put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 4681e68e92..a3b57d12ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -27,6 +27,7 @@ open class DanaRS_Packet_APS_History_Events(
     private val danaRSPlugin: DanaRSPlugin,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val injector: HasAndroidInjector,
+    private val dateUtil: DateUtil,
     private var from: Long
 ) : DanaRS_Packet() {
 
@@ -86,13 +87,13 @@ open class DanaRS_Packet_APS_History_Events(
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
-                status = "TEMPSTART " + DateUtil.timeString(datetime)
+                status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
-                status = "TEMPSTOP " + DateUtil.timeString(datetime)
+                status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTART     -> {
@@ -100,13 +101,13 @@ open class DanaRS_Packet_APS_History_Events(
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
-                status = "EXTENDEDSTART " + DateUtil.timeString(datetime)
+                status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
-                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime)
+                status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.BOLUS             -> {
@@ -118,7 +119,7 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "BOLUS " + DateUtil.timeString(datetime)
+                status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALBOLUS         -> {
@@ -130,7 +131,7 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALBOLUS " + DateUtil.timeString(datetime)
+                status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTART -> {
@@ -138,38 +139,38 @@ open class DanaRS_Packet_APS_History_Events(
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
-                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime)
+                status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
-                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime)
+                status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDON " + DateUtil.timeString(datetime)
+                status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDOFF " + DateUtil.timeString(datetime)
+                status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "REFILL " + DateUtil.timeString(datetime)
+                status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "PRIME " + DateUtil.timeString(datetime)
+                status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
-                status = "PROFILECHANGE " + DateUtil.timeString(datetime)
+                status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.CARBS             -> {
@@ -180,17 +181,17 @@ open class DanaRS_Packet_APS_History_Events(
                 emptyCarbsInfo.pumpId = datetime
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(emptyCarbsInfo, false)
                 aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
-                status = "CARBS " + DateUtil.timeString(datetime)
+                status = "CARBS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIMECANNULA      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "PRIMECANNULA " + DateUtil.timeString(datetime)
+                status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
             else                        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
-                status = "UNKNOWN " + DateUtil.timeString(datetime)
+                status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
         if (datetime > danaRSPlugin.lastEventTimeLoaded) danaRSPlugin.lastEventTimeLoaded = datetime
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index 3d7eb03e0a..5122f012f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -27,7 +27,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -75,7 +75,7 @@ import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_History
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_Pump_Time;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Get_User_Option;
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_Option_Set_Pump_Time;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -101,6 +101,7 @@ public class DanaRSService extends DaggerService {
     @Inject ActivePluginProvider activePlugin;
     @Inject ConstraintChecker constraintChecker;
     @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
+    @Inject DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -271,10 +272,10 @@ public class DanaRSService extends DaggerService {
 
         DanaRS_Packet_APS_History_Events msg;
         if (lastHistoryFetched == 0) {
-            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, 0);
+            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, dateUtil, 0);
             aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history");
         } else {
-            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, lastHistoryFetched);
+            msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, dateUtil, lastHistoryFetched);
             aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
         }
         bleComm.sendMessage(msg);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index e783d13d78..9a88ce28f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -29,7 +29,7 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
index 7fbb2f3258..f02062e05b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.*
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -34,7 +35,8 @@ class MessageHashTableRv2 @Inject constructor(
     activePlugin: ActivePluginProvider,
     detailedBolusInfoStorage: DetailedBolusInfoStorage,
     treatmentsPlugin: TreatmentsPlugin,
-    injector: HasAndroidInjector
+    injector: HasAndroidInjector,
+    dateUtil: DateUtil
 ) : MessageHashTableBase {
 
     var messages: HashMap<Int, MessageBase> = HashMap()
@@ -93,7 +95,7 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgStatusAPS_v2(aapsLogger, danaRPump))              // 0xE001 CMD_PUMPSTATUS_APS
         put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector))          // 0xE003 CMD_GET_HISTORY
+        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
         put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
index 0280b0a3e6..4f07a49ff9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -27,6 +27,7 @@ class MsgHistoryEvents_v2 constructor(
     val rxBus: RxBusWrapper,
     val treatmentsPlugin: TreatmentsPlugin,
     private val injector: HasAndroidInjector,
+    private val dateUtil: DateUtil,
     var from: Long = 0
 ) : MessageBase() {
 
@@ -78,13 +79,13 @@ class MsgHistoryEvents_v2 constructor(
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
-                status = "TEMPSTART " + DateUtil.timeString(datetime)
+                status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
                 treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
-                status = "TEMPSTOP " + DateUtil.timeString(datetime)
+                status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTART     -> {
@@ -92,13 +93,13 @@ class MsgHistoryEvents_v2 constructor(
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
-                status = "EXTENDEDSTART " + DateUtil.timeString(datetime)
+                status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
-                status = "EXTENDEDSTOP " + DateUtil.timeString(datetime)
+                status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.BOLUS             -> {
@@ -110,7 +111,7 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "BOLUS " + DateUtil.timeString(datetime)
+                status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALBOLUS         -> {
@@ -122,7 +123,7 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
-                status = "DUALBOLUS " + DateUtil.timeString(datetime)
+                status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTART -> {
@@ -130,38 +131,38 @@ class MsgHistoryEvents_v2 constructor(
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
-                status = "DUALEXTENDEDSTART " + DateUtil.timeString(datetime)
+                status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
-                status = "DUALEXTENDEDSTOP " + DateUtil.timeString(datetime)
+                status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDON " + DateUtil.timeString(datetime)
+                status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
-                status = "SUSPENDOFF " + DateUtil.timeString(datetime)
+                status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "REFILL " + DateUtil.timeString(datetime)
+                status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
-                status = "PRIME " + DateUtil.timeString(datetime)
+                status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
-                status = "PROFILECHANGE " + DateUtil.timeString(datetime)
+                status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.CARBS             -> {
@@ -172,12 +173,12 @@ class MsgHistoryEvents_v2 constructor(
                 emptyCarbsInfo.pumpId = datetime
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(emptyCarbsInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
-                status = "CARBS " + DateUtil.timeString(datetime)
+                status = "CARBS " + dateUtil.timeString(datetime)
             }
 
             else                        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
-                status = "UNKNOWN " + DateUtil.timeString(datetime)
+                status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
         if (datetime > danaRv2Plugin.lastEventTimeLoaded) danaRv2Plugin.lastEventTimeLoaded = datetime
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index 564b59e77f..ba2729c672 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -1,9 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.services;
 
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -19,9 +17,7 @@ import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
-import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventInitializationChanged;
-import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
@@ -32,7 +28,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -76,17 +72,14 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetAPSTempBasalSt
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetHistoryEntry_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusBolusExtended_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusTempBasal_v2;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 
 public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject HasAndroidInjector injector;
@@ -107,6 +100,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject TreatmentsPlugin treatmentsPlugin;
     @Inject ProfileFunction profileFunction;
     @Inject SP sp;
+    @Inject DateUtil dateUtil;
 
     private long lastHistoryFetched = 0;
 
@@ -455,7 +449,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, lastHistoryFetched);
+        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, dateUtil, lastHistoryFetched);
         aapsLogger.debug(LTag.PUMP, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 603e8aabb9..2c1c9b6e91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -44,6 +44,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject FabricPrivacy fabricPrivacy;
+    @Inject DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -237,7 +238,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
                 long lastConnection = localInsightPlugin.getConnectionService().getLastConnected();
                 if (lastConnection == 0) return;
                 int min = (int) ((System.currentTimeMillis() - lastConnection) / 60000);
-                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected), DateUtil.timeString(lastConnection)));
+                statusItems.add(getStatusItem(resourceHelper.gs(R.string.last_connected), dateUtil.timeString(lastConnection)));
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index b91823a24a..b147d01b10 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -53,7 +53,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
@@ -132,7 +132,7 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_erro
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.TimeChangeType;
@@ -208,7 +208,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             SP sp,
             CommandQueueProvider commandQueue,
             ProfileFunction profileFunction,
-            Context context
+            Context context,
+            Config config
     ) {
         super(new PluginDescription()
                         .pluginName(R.string.insight_local)
@@ -216,7 +217,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                         .mainType(PluginType.PUMP)
                         .description(R.string.description_pump_insight_local)
                         .fragmentClass(LocalInsightFragment.class.getName())
-                        .preferencesId(Config.APS ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol),
+                        .preferencesId(config.getAPS() ? R.xml.pref_insight_local_full : R.xml.pref_insight_local_pumpcontrol),
                 injector, aapsLogger, resourceHelper, commandQueue
 
         );
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 496f2af06b..d8f5c47b4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -35,7 +35,6 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder;
@@ -52,7 +51,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalProce
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentService;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
index c3a7bfeccd..826d28b7ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.SetupProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.defs.PodActionType
 import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.model.FullInitPodWizardModel
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
index 7cb106ca47..387daee11a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitActionFragment.java
@@ -24,11 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.inject.Inject;
-
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitReceiver;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
index 32f6eabac4..1ab711871c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/initpod/InitPodTask.java
@@ -1,12 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.initpod;
 
 import android.os.AsyncTask;
-import android.os.SystemClock;
 import android.view.View;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
index d534e51e2f..3ca7e671ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt
@@ -84,6 +84,6 @@ class VirtualPumpFragment : DaggerFragment() {
         val pumpType = virtualPumpPlugin.pumpType
 
         virtualpump_type?.text = pumpType?.description
-        virtualpump_type_def?.text = pumpType?.getFullDescription(resourceHelper.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals())
+        virtualpump_type_def?.text = pumpType?.getFullDescription(resourceHelper.gs(R.string.virtualpump_pump_def), pumpType.hasExtendedBasals(), resourceHelper)
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index 007d585408..9dbaea4025 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.common.ManufacturerType
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
@@ -51,14 +51,15 @@ class VirtualPumpPlugin @Inject constructor(
     private val sp: SP,
     private val profileFunction: ProfileFunction,
     private val treatmentsPlugin: TreatmentsPlugin,
-    commandQueue: CommandQueueProvider
+    commandQueue: CommandQueueProvider,
+    private val config: Config
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
     .fragmentClass(VirtualPumpFragment::class.java.name)
     .pluginName(R.string.virtualpump)
     .shortName(R.string.virtualpump_shortname)
     .preferencesId(R.xml.pref_virtualpump)
-    .neverVisible(Config.NSCLIENT)
+    .neverVisible(config.NSCLIENT)
     .description(R.string.description_pump_virtual)
     .setDefault(),
     injector, aapsLogger, resourceHelper, commandQueue
@@ -131,7 +132,7 @@ class VirtualPumpPlugin @Inject constructor(
     }
 
     override fun isFakingTempsByExtendedBoluses(): Boolean {
-        return Config.NSCLIENT && getFakingStatus()
+        return config.NSCLIENT && getFakingStatus()
     }
 
     override fun loadTDDs(): PumpEnactResult { //no result, could read DB in the future?
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
index 43e8b89a5d..ced1bcd888 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.plugins.sensitivity
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.SensitivityInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -25,7 +25,7 @@ abstract class AbstractSensitivityPlugin(
     val sp: SP
 ) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface {
 
-    abstract override fun detectSensitivity(plugin: IobCobCalculatorPlugin, fromTime: Long, toTime: Long): AutosensResult
+    abstract override fun detectSensitivity(plugin: IobCobCalculatorInterface, fromTime: Long, toTime: Long): AutosensResult
 
     fun fillResult(ratio: Double, carbsAbsorbed: Double, pastSensitivity: String,
                    ratioLimit: String, sensResult: String, deviationsArraySize: Int): AutosensResult {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index 090e980d9f..317a25bdf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -16,12 +16,13 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -60,7 +61,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
     }
 
     @NonNull @Override
-    public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
+    public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
         String age = sp.getString(R.string.key_age, "");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 8424a65a93..97fb1a68bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -15,14 +15,15 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -58,7 +59,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
     }
 
     @Override
-    public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
+    public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
         // todo this method is called from the IobCobCalculatorPlugin, which leads to a circular
         // dependency, this should be avoided
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
@@ -88,13 +89,13 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         //[0] = 8 hour
         //[1] = 24 hour
         //Deviationshour has DeviationsArray
-        List<ArrayList> deviationsHour = Arrays.asList(new ArrayList(),new ArrayList());
-        List<String> pastSensitivityArray = Arrays.asList("","");
-        List<String> sensResultArray = Arrays.asList("","");
-        List<Double> ratioArray = Arrays.asList(0d,0d);
-        List<Double> deviationCategory = Arrays.asList(96d,288d);
-        List<String> ratioLimitArray = Arrays.asList("","");
-        List<Double> hoursDetection = Arrays.asList(8d,24d);
+        List<ArrayList> deviationsHour = Arrays.asList(new ArrayList(), new ArrayList());
+        List<String> pastSensitivityArray = Arrays.asList("", "");
+        List<String> sensResultArray = Arrays.asList("", "");
+        List<Double> ratioArray = Arrays.asList(0d, 0d);
+        List<Double> deviationCategory = Arrays.asList(96d, 288d);
+        List<String> ratioLimitArray = Arrays.asList("", "");
+        List<Double> hoursDetection = Arrays.asList(8d, 24d);
 
 
         int index = 0;
@@ -113,7 +114,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             int hoursegment = 0;
             //hoursegment = 0 = 8 hour
             //hoursegment = 1 = 24 hour
-            while (hoursegment < deviationsHour.size()){
+            while (hoursegment < deviationsHour.size()) {
                 ArrayList deviationsArray = deviationsHour.get(hoursegment);
                 String pastSensitivity = pastSensitivityArray.get(hoursegment);
 
@@ -124,7 +125,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 }
 
                 // reset deviations after profile switch
-                if (ProfileSwitch.isEvent5minBack(getAapsLogger(),profileSwitches, autosensData.time, true)) {
+                if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
                     deviationsArray.clear();
                     pastSensitivity += "(PROFILESWITCH)";
                 }
@@ -143,7 +144,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 for (int i = 0; i < autosensData.extraDeviation.size(); i++)
                     deviationsArray.add(autosensData.extraDeviation.get(i));
 
-                if (deviationsArray.size() > deviationCategory.get(hoursegment)){
+                if (deviationsArray.size() > deviationCategory.get(hoursegment)) {
                     deviationsArray.remove(0);
                 }
 
@@ -155,11 +156,11 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 }
 
                 //Update the data back to the parent
-                deviationsHour.set(hoursegment,deviationsArray);
-                pastSensitivityArray.set(hoursegment,pastSensitivity);
+                deviationsHour.set(hoursegment, deviationsArray);
+                pastSensitivityArray.set(hoursegment, pastSensitivity);
                 hoursegment++;
-              }
-              index++;
+            }
+            index++;
         }
 
         // when we have less than 8h/24 worth of deviation data, add up to 90m of zero deviations
@@ -167,26 +168,27 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
 
         for (int i = 0; i < deviationsHour.size(); i++) {
             ArrayList deviations = deviationsHour.get(i);
-            getAapsLogger().debug(LTag.AUTOSENS,"Using most recent " + deviations.size() + " deviations");
+            getAapsLogger().debug(LTag.AUTOSENS, "Using most recent " + deviations.size() + " deviations");
             if (deviations.size() < deviationCategory.get(i)) {
                 int pad = (int) Math.round((1 - (double) deviations.size() / deviationCategory.get(i)) * 18);
-                    getAapsLogger().debug(LTag.AUTOSENS,"Adding " + pad + " more zero deviations");
-                for (int d = 0; d < pad; d++) { ;
+                getAapsLogger().debug(LTag.AUTOSENS, "Adding " + pad + " more zero deviations");
+                for (int d = 0; d < pad; d++) {
+                    ;
                     deviations.add(0d);
                 }
             }
             //Update the data back to the parent
-            deviationsHour.set(i,deviations);
+            deviationsHour.set(i, deviations);
 
         }
 
         int hourused = 0;
-        while (hourused < deviationsHour.size()){
+        while (hourused < deviationsHour.size()) {
             ArrayList deviationsArray = deviationsHour.get(hourused);
             String pastSensitivity = pastSensitivityArray.get(hourused);
             String sensResult = "(8 hours) ";
             String senstime = sensResult;
-            if (hourused == 1){
+            if (hourused == 1) {
                 senstime = "(24 hours) ";
                 sensResult = senstime;
             }
@@ -198,7 +200,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             double sens = profile.getIsfMgdl();
 
 
-            getAapsLogger().debug(LTag.AUTOSENS,"Records: " + index + "   " + pastSensitivity);
+            getAapsLogger().debug(LTag.AUTOSENS, "Records: " + index + "   " + pastSensitivity);
 
             Arrays.sort(deviations);
             double pSensitive = IobCobCalculatorPlugin.percentile(deviations, 0.50);
@@ -208,35 +210,35 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
 
             if (pSensitive < 0) { // sensitive
                 basalOff = pSensitive * (60 / 5) / Profile.toMgdl(sens, profile.getUnits());
-                sensResult+= "Excess insulin sensitivity detected";
+                sensResult += "Excess insulin sensitivity detected";
             } else if (pResistant > 0) { // resistant
                 basalOff = pResistant * (60 / 5) / Profile.toMgdl(sens, profile.getUnits());
-                sensResult+= "Excess insulin resistance detected";
+                sensResult += "Excess insulin resistance detected";
             } else {
-                sensResult+= "Sensitivity normal";
+                sensResult += "Sensitivity normal";
             }
 
-            getAapsLogger().debug(LTag.AUTOSENS,sensResult);
+            getAapsLogger().debug(LTag.AUTOSENS, sensResult);
 
             double ratio = 1 + (basalOff / profile.getMaxDailyBasal());
 
             //Update the data back to the parent
-            sensResultArray.set(hourused,sensResult);
-            ratioArray.set(hourused,ratio);
-            ratioLimitArray.set(hourused,ratioLimit);
+            sensResultArray.set(hourused, sensResult);
+            ratioArray.set(hourused, ratio);
+            ratioLimitArray.set(hourused, ratioLimit);
             hourused++;
         }
 
         int key = 1;
-        String comparison = " 8 h ratio " +ratioArray.get(0)+" vs 24h ratio "+ratioArray.get(1);
+        String comparison = " 8 h ratio " + ratioArray.get(0) + " vs 24h ratio " + ratioArray.get(1);
         //use 24 hour ratio by default
         //if the 8 hour ratio is less than the 24 hour ratio, the 8 hour ratio is used
-        if(ratioArray.get(0) < ratioArray.get(1)){
-          key = 0;
+        if (ratioArray.get(0) < ratioArray.get(1)) {
+            key = 0;
         }
-        String message = hoursDetection.get(key)+" of sensitivity used";
+        String message = hoursDetection.get(key) + " of sensitivity used";
         AutosensResult output = fillResult(ratioArray.get(key), current.cob, pastSensitivityArray.get(key), ratioLimitArray.get(key),
-                sensResultArray.get(key)+comparison, deviationsHour.get(key).size());
+                sensResultArray.get(key) + comparison, deviationsHour.get(key).size());
 
         getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
                 + DateUtil.dateAndTimeString(toTime) +
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
index 09a4a20838..d2128791d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
@@ -13,14 +13,14 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -57,7 +57,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
     }
 
     @Override
-    public AutosensResult detectSensitivity(IobCobCalculatorPlugin iobCobCalculatorPlugin, long fromTime, long toTime) {
+    public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
         String age = sp.getString(R.string.key_age, "");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
index f95b8b1a05..97b28f9dab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -12,8 +12,10 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.DatabaseHelper
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.plugins.source.BGSourceFragment.RecyclerViewAdapter.BgReadingsViewHolder
@@ -32,6 +34,7 @@ class BGSourceFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     private val disposable = CompositeDisposable()
     private val MILLS_TO_THE_PAST = T.hours(12).msecs()
@@ -83,7 +86,7 @@ class BGSourceFragment : DaggerFragment() {
             holder.invalid.visibility = if (!bgReading.isValid) View.VISIBLE else View.GONE
             holder.date.text = DateUtil.dateAndTimeString(bgReading.date)
             holder.value.text = bgReading.valueToUnitsToString(profileFunction.getUnits())
-            holder.direction.text = bgReading.directionToSymbol()
+            holder.direction.text = bgReading.directionToSymbol(databaseHelper)
             holder.remove.tag = bgReading
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index cd81621252..f43ece03d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -33,6 +33,7 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.ICallback;
 import info.nightscout.androidaps.db.Source;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventNsTreatment;
 import info.nightscout.androidaps.events.EventReloadTreatmentData;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 51c602bfd2..698db2c81f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -31,7 +31,8 @@ import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.OverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.ProfileIntervals;
-import info.nightscout.androidaps.data.ProfileStore;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.Source;
@@ -50,7 +51,7 @@ import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
index 7e130ceab9..673f9bdc23 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
@@ -14,12 +14,12 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.events.EventTreatmentChange
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.dialogs.WizardInfoDialog
 import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsBolusFragment.RecyclerViewAdapter.TreatmentsViewHolder
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
index 8ce87e6b5e..175fb81c97 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -40,6 +40,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -73,7 +74,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             } else {
                 @SuppressLint("SetTextI18n")
                 if (extendedBolus.isInProgress) holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date)
-                else holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date) + " - " + DateUtil.timeString(extendedBolus.end())
+                else holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date) + " - " + dateUtil.timeString(extendedBolus.end())
 
                 holder.duration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.durationInMinutes)
                 holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulin)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index 1d95d4306b..8e1e6fb663 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -23,7 +23,7 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
@@ -48,6 +48,7 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
     @Inject ProfileFunction profileFunction;
     @Inject ResourceHelper resourceHelper;
     @Inject FabricPrivacy fabricPrivacy;
+    @Inject DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -77,7 +78,7 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
             holder.ph.setVisibility(tempTarget.source == Source.PUMP ? View.VISIBLE : View.GONE);
             holder.ns.setVisibility(NSUpload.isIdValid(tempTarget._id) ? View.VISIBLE : View.GONE);
             if (!tempTarget.isEndingEvent()) {
-                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.date) + " - " + DateUtil.timeString(tempTarget.originalEnd()));
+                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.date) + " - " + dateUtil.timeString(tempTarget.originalEnd()));
                 holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.durationInMinutes) + " min");
                 holder.low.setText(tempTarget.lowValueToUnitsToString(units));
                 holder.high.setText(tempTarget.highValueToUnitsToString(units));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
index d863754d07..99764c73bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
index fd93f772aa..15f1eaa9f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -24,11 +24,12 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissBolusProgressIfRunning
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.queue.commands.*
 import info.nightscout.androidaps.queue.commands.Command.CommandType
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 2c99b1e4f1..4ca7055636 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.commands.Command
@@ -38,7 +38,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     @Inject lateinit var localAlertUtils: LocalAlertUtils
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
-
+    @Inject lateinit var config: Config
 
     companion object {
         private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
@@ -100,8 +100,8 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     // IOB displayed in NS
     private fun checkAPS() {
         var shouldUploadStatus = false
-        if (Config.NSCLIENT) return
-        if (Config.PUMPCONTROL) shouldUploadStatus = true
+        if (config.NSCLIENT) return
+        if (config.PUMPCONTROL) shouldUploadStatus = true
         else if (!loopPlugin.isEnabled() || iobCobCalculatorPlugin.actualBg() == null)
             shouldUploadStatus = true
         else if (DateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index 5fca6651da..c8e406881b 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
@@ -62,7 +62,8 @@ class SWDefinition @Inject constructor(
     private val protectionCheck: ProtectionCheck,
     private val importExportPrefs: ImportExportPrefs,
     private val androidPermission: AndroidPermission,
-    private val cryptoUtil: CryptoUtil
+    private val cryptoUtil: CryptoUtil,
+    private val config: Config
 ) {
 
     lateinit var activity: AppCompatActivity
@@ -339,7 +340,7 @@ class SWDefinition @Inject constructor(
                 }, null)
             })
             .visibility(SWValidator { (activePlugin.activeAPS as PluginBase).preferencesId > 0 }))
-        .visibility(SWValidator { Config.APS })
+        .visibility(SWValidator { config.APS })
     private val screenApsMode = SWScreen(injector, R.string.apsmode_title)
         .skippable(false)
         .add(SWRadioButton(injector)
@@ -364,7 +365,7 @@ class SWDefinition @Inject constructor(
             })
             .visibility(SWValidator { !loopPlugin.isEnabled(PluginType.LOOP) }))
         .validator(SWValidator { loopPlugin.isEnabled(PluginType.LOOP) })
-        .visibility(SWValidator { !loopPlugin.isEnabled(PluginType.LOOP) && Config.APS })
+        .visibility(SWValidator { !loopPlugin.isEnabled(PluginType.LOOP) && config.APS })
     private val screenSensitivity = SWScreen(injector, R.string.configbuilder_sensitivity)
         .skippable(false)
         .add(SWInfotext(injector)
@@ -395,7 +396,7 @@ class SWDefinition @Inject constructor(
         .add(SWFragment(injector, this)
             .add(ObjectivesFragment()))
         .validator(SWValidator { objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].isStarted })
-        .visibility(SWValidator { !objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].isStarted && Config.APS })
+        .visibility(SWValidator { !objectivesPlugin.objectives[ObjectivesPlugin.FIRST_OBJECTIVE].isStarted && config.APS })
 
     private fun swDefinitionFull() { // List all the screens here
         add(screenSetupWizard)
@@ -468,6 +469,6 @@ class SWDefinition @Inject constructor(
     }
 
     init {
-        if (Config.APS) swDefinitionFull() else if (Config.PUMPCONTROL) swDefinitionPumpControl() else if (Config.NSCLIENT) swDefinitionNSClient()
+        if (config.APS) swDefinitionFull() else if (config.PUMPCONTROL) swDefinitionPumpControl() else if (config.NSCLIENT) swDefinitionNSClient()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
index 80ed784fff..978455a4ae 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
@@ -9,7 +9,7 @@ import android.widget.TextView
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.setupwizard.SWNumberValidator
 import info.nightscout.androidaps.utils.NumberPicker
 import info.nightscout.androidaps.utils.SafeParse
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
index 3bc092dfc2..b2243d3336 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
@@ -6,14 +6,14 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SkinButtonsOn @Inject constructor() : SkinInterface {
+class SkinButtonsOn @Inject constructor(private val config: Config) : SkinInterface {
 
     override val description: Int get() = R.string.buttonson_desrciption
 
     override fun overviewLayout(isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean): Int =
         when {
-            Config.NSCLIENT && isTablet  -> R.layout.overview_fragment_nsclient_tablet
-            Config.NSCLIENT              -> R.layout.overview_fragment_nsclient
+            config.NSCLIENT && isTablet  -> R.layout.overview_fragment_nsclient_tablet
+            config.NSCLIENT              -> R.layout.overview_fragment_nsclient
             else                         -> R.layout.overview_fragment
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
index 15e69e9ad9..deef2440f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
@@ -6,14 +6,14 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SkinClassic @Inject constructor(): SkinInterface {
+class SkinClassic @Inject constructor(private val config: Config): SkinInterface {
 
     override val description: Int get() = R.string.classic_desrciption
 
     override fun overviewLayout(isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean): Int =
         when {
-            Config.NSCLIENT && isTablet  -> R.layout.overview_fragment_nsclient_tablet
-            Config.NSCLIENT              -> R.layout.overview_fragment_nsclient
+            config.NSCLIENT && isTablet  -> R.layout.overview_fragment_nsclient_tablet
+            config.NSCLIENT              -> R.layout.overview_fragment_nsclient
             isSmallHeight || isLandscape -> R.layout.overview_fragment_landscape
             else                         -> R.layout.overview_fragment
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
index 070c1b0c51..77a269712f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
@@ -29,7 +29,8 @@ class LocalAlertUtils @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val activePlugin: ActivePluginProvider,
     private val profileFunction: ProfileFunction,
-    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val config: Config
 ) {
 
     fun missedReadingsThreshold(): Long {
@@ -43,7 +44,7 @@ class LocalAlertUtils @Inject constructor(
     fun checkPumpUnreachableAlarm(lastConnection: Long, isStatusOutdated: Boolean, isDisconnected: Boolean) {
         val alarmTimeoutExpired = lastConnection + pumpUnreachableThreshold() < System.currentTimeMillis()
         val nextAlarmOccurrenceReached = sp.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis()
-        if (Config.APS && sp.getBoolean(resourceHelper.gs(R.string.key_enable_pump_unreachable_alert), true)
+        if (config.APS && sp.getBoolean(resourceHelper.gs(R.string.key_enable_pump_unreachable_alert), true)
             && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !isDisconnected) {
             aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + DateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
             val n = Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT)
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
index 9c32ccadef..af13dadb1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/XdripCalibrations.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.services.Intents
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
index f1cec2109f..a08f671512 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/buildHelper/BuildHelper.kt
@@ -8,7 +8,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class BuildHelper @Inject constructor() {
+class BuildHelper @Inject constructor(private val config: Config) {
 
     private var devBranch = false
     private var engineeringMode = false
@@ -22,10 +22,10 @@ class BuildHelper @Inject constructor() {
     }
 
     fun isEngineeringModeOrRelease(): Boolean =
-        if (!Config.APS) true else engineeringMode || !devBranch
+        if (!config.APS) true else engineeringMode || !devBranch
 
     fun isEngineeringMode(): Boolean =
-        if (!Config.APS) true else engineeringMode || !devBranch
+        if (!config.APS) true else engineeringMode || !devBranch
 
     fun isDev(): Boolean = devBranch
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProvider.kt b/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProvider.kt
index d707caaaa1..6bdeaa73a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProvider.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/resources/IconsProvider.kt
@@ -6,19 +6,19 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class IconsProvider @Inject constructor() {
+class IconsProvider @Inject constructor(private val config: Config) {
 
     fun getIcon(): Int =
         when {
-            Config.NSCLIENT    -> R.mipmap.ic_yellowowl
-            Config.PUMPCONTROL -> R.mipmap.ic_pumpcontrol
+            config.NSCLIENT    -> R.mipmap.ic_yellowowl
+            config.PUMPCONTROL -> R.mipmap.ic_pumpcontrol
             else               -> R.mipmap.ic_launcher
         }
 
     fun getNotificationIcon(): Int =
         when {
-            Config.NSCLIENT    -> R.drawable.ic_notif_nsclient
-            Config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
+            config.NSCLIENT    -> R.drawable.ic_notif_nsclient
+            config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
             else               -> R.drawable.ic_notif_aaps
         }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
index f6db77e09f..2b7806468e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TIR.kt
@@ -21,7 +21,7 @@ class TIR(val date: Long, val lowThreshold: Double, val highThreshold: Double) {
     fun inRangePct() = if (count > 0) (inRange.toDouble() / count * 100.0).roundToInt() else 0
     fun abovePct() = if (count > 0) (above.toDouble() / count * 100.0).roundToInt() else 0
 
-    fun toText(resourceHelper: ResourceHelper): String = resourceHelper.gs(R.string.tirformat, DateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
+    fun toText(resourceHelper: ResourceHelper, dateUtil: DateUtil): String = resourceHelper.gs(R.string.tirformat, dateUtil.dateStringShort(date), belowPct(), inRangePct(), abovePct())
 
     fun toText(resourceHelper: ResourceHelper, days: Int): String = resourceHelper.gs(R.string.tirformat, "%02d".format(days) + " " + resourceHelper.gs(R.string.days), belowPct(), inRangePct(), abovePct())
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 906516d5ea..6d4895f1f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -85,21 +85,21 @@ class TddCalculator @Inject constructor(
         return totalTdd
     }
 
-    fun stats(): Spanned {
+    fun stats(dateUtil: DateUtil): Spanned {
         val tdds = calculate(7)
         val averageTdd = averageTDD(tdds)
         return HtmlHelper.fromHtml(
             "<b>" + resourceHelper.gs(R.string.tdd) + ":</b><br>" +
-                toText(tdds) +
+                toText(tdds, dateUtil) +
                 "<b>" + resourceHelper.gs(R.string.average) + ":</b><br>" +
                 averageTdd.toText(resourceHelper, tdds.size())
         )
     }
 
-    private fun toText(tdds: LongSparseArray<TDD>): String {
+    private fun toText(tdds: LongSparseArray<TDD>, dateUtil: DateUtil): String {
         var t = ""
         for (i in 0 until tdds.size()) {
-            t += "${tdds.valueAt(i).toText(resourceHelper)}<br>"
+            t += "${tdds.valueAt(i).toText(resourceHelper, dateUtil)}<br>"
         }
         return t
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
index f1f13cbf0d..bbda132d80 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TirCalculator.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.MidnightTime
@@ -18,7 +18,8 @@ import javax.inject.Singleton
 @Singleton
 class TirCalculator @Inject constructor(
     private val resourceHelper: ResourceHelper,
-    private val profileFunction: ProfileFunction
+    private val profileFunction: ProfileFunction,
+    private val dateUtil: DateUtil
 ){
     fun calculate(days: Long, lowMgdl: Double, highMgdl: Double): LongSparseArray<TIR> {
         if (lowMgdl < 39) throw RuntimeException("Low below 39")
@@ -89,7 +90,7 @@ class TirCalculator @Inject constructor(
     fun toText(resourceHelper: ResourceHelper, tirs: LongSparseArray<TIR>): String {
         var t = ""
         for (i in 0 until tirs.size()) {
-            t += "${tirs.valueAt(i).toText(resourceHelper)}<br>"
+            t += "${tirs.valueAt(i).toText(resourceHelper, dateUtil)}<br>"
         }
         return t
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
index 8416eff715..fffa175e07 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.Callback
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
index f24f3d72f4..baf858dc14 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 1d91d77a7f..1b2d56b27f 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1153,7 +1153,6 @@
     <string name="recurringTime">Herhaal tijd</string>
     <string name="every">Elke</string>
     <string name="never">Nooit</string>
-    <string name="mins">%1$dmin</string>
     <string name="condition">Voorwaarde:</string>
     <string name="action">Actie:</string>
     <string name="iob_u">IOB [E]:</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index de49a0aee5..27adfdd924 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,21 +2,12 @@
 <resources>
     <color name="prediction">#ff00ff</color>
     <color name="basal">#00ffff</color>
-    <color name="iob">#1e88e5</color>
     <color name="iobPred">#00d2d2</color>
     <color name="bolus">#1ea3e5</color>
-    <color name="iobPredAS">#1ea3e5</color>
-    <color name="cob">#FFFB8C00</color>
-    <color name="carbs">#FFFB8C00</color>
-    <color name="uam">#c9bd60</color>
-    <color name="zt">#00d2d2</color>
     <color name="ratio">#FFFFFF</color>
     <color name="activity">#d3f166</color>
     <color name="devslopepos">#FFFFFF00</color>
     <color name="devslopeneg">#FFFF00FF</color>
-    <color name="inrange">#00FF00</color>
-    <color name="low">#FF0000</color>
-    <color name="high">#FFFF00</color>
     <color name="actionsConfirm">#FFFF00</color>
     <color name="listdelimiter">#505050</color>
     <color name="tabBgColorSelected">#FF33B5E5</color>
@@ -24,7 +15,6 @@
     <color name="cobAlert">#7484E2</color>
     <color name="inrangebackground">#2800FF00</color>
     <color name="basebasal">#C83F51B5</color>
-    <color name="tempbasal">#C803A9F4</color>
     <color name="graphgrid">#757575</color>
     <color name="colorLightGray">#d8d8d8</color>
     <color name="warning">#ff1a1a</color>
@@ -61,7 +51,6 @@
     <color name="colorScheduled">#de7550</color>
     <color name="colorActive">#25912e</color>
 
-    <color name="notificationAnnouncement">#FF8C00</color>
     <color name="notificationUrgent">#ff0400</color>
     <color name="notificationNormal">#ff5e55</color>
     <color name="notificationLow">#ff827c</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a3f9ff20a1..29a25862ef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,7 +100,6 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbs</string>
     <string name="treatments_wizard_correction_label">Corr</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Run now</string>
     <string name="vitualpump_label">VIRTUAL PUMP</string>
@@ -120,11 +119,7 @@
     <string name="result">Result</string>
     <string name="result_insulin_carbs">Result: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">No glucose data available</string>
-    <string name="nochangerequested">No change requested</string>
     <string name="openapsma_request_label">Request</string>
-    <string name="rate">Rate</string>
-    <string name="duration">Duration</string>
-    <string name="reason">Reason</string>
     <string name="glucose">Glucose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
@@ -150,7 +145,6 @@
     <string name="configbuilder_general">General</string>
     <string name="configbuilder_general_description">These are some general plugins you might find useful.</string>
     <string name="configbuilder_constraints_description">Which constraints are applied?</string>
-    <string name="days">days</string>
     <string name="constraints">Constraints</string>
 
     <string name="loop">Loop</string>
@@ -198,24 +192,6 @@
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus constraint applied</string>
     <string name="carbsconstraintapplied">Carbs constraint applied</string>
-    <string name="careportal_bgcheck">BG Check</string>
-    <string name="careportal_announcement">Announcement</string>
-    <string name="careportal_note">Note</string>
-    <string name="careportal_question">Question</string>
-    <string name="careportal_exercise">Exercise</string>
-    <string name="careportal_pumpsitechange">Pump Site Change</string>
-    <string name="careportal_cgmsensorinsert">CGM Sensor Insert</string>
-    <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
-    <string name="careportal_insulincartridgechange">Insulin Cartridge Change</string>
-    <string name="careportal_profileswitch">Profile switch</string>
-    <string name="careportal_snackbolus">Snack Bolus</string>
-    <string name="careportal_mealbolus">Meal Bolus</string>
-    <string name="careportal_correctionbolus">Correction Bolus</string>
-    <string name="careportal_combobolus">Combo Bolus</string>
-    <string name="careportal_tempbasalstart">Temp Basal Start</string>
-    <string name="careportal_tempbasalend">Temp Basal End</string>
-    <string name="careportal_carbscorrection">Carbs correction</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
 
     <string name="careportal_newnstreatment_eventtype">Event type</string>
     <string name="careportal_newnstreatment_other">Other</string>
@@ -321,19 +297,11 @@
     <string name="danar_iob_label">Pump IOB</string>
     <string name="danar_dailyunits">Daily units</string>
     <string name="pump_lastbolus_label">Last bolus</string>
-    <string name="hoursago">%1$.1fh ago</string>
     <string name="danar_invalidinput">Invalid input data</string>
     <string name="danar_valuenotsetproperly">Value not set properly</string>
     <string name="reloadprofile">Reload profile</string>
     <string name="danar_viewprofile">View profile</string>
-    <string name="enacted">Enacted</string>
-    <string name="comment">Comment</string>
-    <string name="success">Success</string>
-    <string name="percent">Percent</string>
-    <string name="absolute">Absolute</string>
-    <string name="canceltemp">Cancel temp basal</string>
     <string name="smscommunicator">SMS Communicator</string>
-    <string name="waitingforpumpresult">Waiting for result</string>
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">To deliver bolus %1$.2fU reply with code %2$s</string>
@@ -357,11 +325,6 @@
     <string name="smscommunicator_tt_canceled">Temp Target canceled successfully</string>
     <string name="bolusdelivering">Delivering %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Allow remote commands via SMS</string>
-    <string name="glucosetype_finger">Finger</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Temporary target</string>
-    <string name="careportal_temporarytargetcancel">Temporary target cancel</string>
     <string name="danarprofile">DanaR profile settings</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
@@ -402,7 +365,6 @@
     <string name="waitingforpump">Waiting for pump</string>
     <string name="overview_bolusprogress_goingtodeliver">Going to deliver %1$.2fU</string>
     <string name="youareonallowedlimit">You reached allowed limit</string>
-    <string name="noprofileselected">No profile selected</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
     <string name="smscommunicator_loopisdisabled">Loop is disabled</string>
@@ -486,7 +448,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Ongoing Notification</string>
     <string name="old_data">OLD DATA</string>
-    <string name="minago">%1$dm ago</string>
     <string name="sms_minago">%1$dmin ago</string>
     <string name="localprofile">Local Profile</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -595,8 +556,6 @@
     <string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string>
     <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
     <string name="key_danar_password" translatable="false">danar_password</string>
-    <string name="key_danar_useextended" translatable="false">danar_useextended</string>
-    <string name="key_danar_visualizeextendedaspercentage" translatable="false">danar_visualizeextendedaspercentage"</string>
     <string name="clearlog">Clear log</string>
     <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
     <string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string>
@@ -652,7 +611,6 @@
     <string name="key_ns_logappstartedevent" translatable="false">ns_logappstartedevent</string>
     <string name="restartingapp">Exiting application to apply settings.</string>
     <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulin</string>
     <string name="configbuilder_insulin_description">Which type of insulin are you using?</string>
     <string name="fastactinginsulin">Fast Acting Insulin</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -710,11 +668,9 @@
     <string name="careportal_sensorage_label">Sensor age</string>
     <string name="careportal_canulaage_label">Canula age</string>
     <string name="careportal_insulinage_label">Insulin age</string>
-    <string name="hours">hours</string>
     <string name="invalidprofile">Invalid profile !!!</string>
     <string name="doprofileswitch">Do Profile Switch</string>
     <string name="careportal_pbage_label">Pump battery age</string>
-    <string name="careportal_pumpbatterychange">Pump Battery Change</string>
     <string name="ns_alarmoptions">Alarm options</string>
     <string name="key_nsalarm_urgent_high" translatable="false">nsalarm_urgent_high</string>
     <string name="key_nsalarm_high" translatable="false">nsalarm_high</string>
@@ -746,8 +702,6 @@
     <string name="sensitivityoref1">Sensitivity Oref1</string>
     <string name="sensitivityaaps">Sensitivity AAPS</string>
     <string name="absorptionsettings_title">Absorption settings</string>
-    <string name="key_absorption_maxtime" translatable="false">absorption_maxtime</string>
-    <string name="key_absorption_cutoff" translatable="false">absorption_cutoff</string>
 
     <string name="absorption_maxtime_title">Meal max absorption time [h]</string>
     <string name="absorption_maxtime_summary">Time in hours where is expected all carbs from meal will be absorbed</string>
@@ -779,7 +733,6 @@
     <string name="careportal_pump_label">PUMP</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
     <string name="enableuam">Enable UAM</string>
@@ -826,12 +779,6 @@
     <string name="activity_target">activity target</string>
     <string name="hypo_duration">hypo duration</string>
     <string name="hypo_target">hypo target</string>
-    <string name="key_eatingsoon_duration" translatable="false">eatingsoon_duration</string>
-    <string name="key_eatingsoon_target" translatable="false">eatingsoon_target</string>
-    <string name="key_activity_duration" translatable="false">activity_duration</string>
-    <string name="key_activity_target" translatable="false">activity_target</string>
-    <string name="key_hypo_duration" translatable="false">hypo_duration</string>
-    <string name="key_hypo_target" translatable="false">hypo_target</string>
     <string name="danar_history_prime">Prime</string>
     <string name="gettingextendedbolusstatus">Getting extended bolus status</string>
     <string name="gettingbolusstatus">Getting bolus status</string>
@@ -841,12 +788,8 @@
     <string name="reuse">reuse</string>
     <string name="wearcontrol_title">Controls from Watch</string>
     <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
-    <string name="connectiontimedout">Connection timed out</string>
     <string name="food">Food</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
@@ -897,8 +840,6 @@
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ select 640g/Eversense data source</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Basal value replaced by minimal supported value: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Basal value replaced by maximum supported value: %1$s</string>
     <string name="overview_editquickwizard_usebg">BG calculation</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB calculation</string>
     <string name="overview_editquickwizard_usebasaliob">Basal IOB calculation</string>
@@ -916,8 +857,6 @@
     <string name="closedmodeenabled">Closed mode enabled</string>
     <string name="maxiobset">Maximal IOB set properly</string>
     <string name="hasbgdata">BG available from selected source</string>
-    <string name="basalprofilenotaligned">Basal values not aligned to hours: %1$s</string>
-    <string name="zerovalueinprofile">Invalid profile: %1$s</string>
     <string name="combo_programming_bolus">Programming pump for bolusing</string>
     <string name="combo_refresh">Refresh</string>
     <string name="combo_pump_state_label">State</string>
@@ -976,7 +915,6 @@
     <string name="enablesmbwithtemptarget_summary">Enable SMB when there is temp target active (eating soon, exercise)</string>
     <string name="enablesmbwithhightemptarget">Enable SMB with high temp targets</string>
     <string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise)</string>
-    <string name="let_temp_basal_run">Let temp basal run</string>
     <string name="mute">Mute</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Carbs</string>
@@ -1108,7 +1046,6 @@
     <string name="nav_setupwizard">Setup Wizard</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
-    <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
     <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
     <string name="firstinsulinincrement">First insulin increment</string>
     <string name="secondinsulinincrement">Second insulin increment</string>
@@ -1138,7 +1075,6 @@
     <string name="virtualpump_type">Virtual Pump Type</string>
     <string name="virtualpump_definition">Pump Definition</string>
     <string name="virtualpump_pump_def">Bolus: Step=%1$s\nExtended Bolus: [Step=%2$s, Duration=%3$smin-%4$sh]\nBasal: Step=%5$s\nTBR: %6$s (by %7$s), Duration=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Only discrete values no ranges are supported as granularity for basal/bolus in virtual pump.</string>
     <string name="ns_autobackfill_title">Autobackfill BG</string>
     <string name="wear_wizard_settings">Wizard Settings</string>
     <string translatable="false" name="key_wearwizard_bg">wearwizard_bg</string>
@@ -1255,7 +1191,6 @@
     <string name="commanderror">Command error</string>
     <string name="speederror">Speed error</string>
     <string name="insulinlimitviolation">Insulin limit violation</string>
-    <string name="key_loop_openmode_min_change" translatable="false">loop_openmode_min_change</string>
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
@@ -1350,7 +1285,6 @@
     <string name="isequalorgreater">is equal or greater than</string>
     <string name="isgreater">is greater than</string>
     <string name="isnotavailable">is not available</string>
-    <string name="unknown">unknown</string>
     <string name="glucoseisnotavailable">Glucose is not available</string>
     <string name="glucosecomparedmgdl">Glucose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucose %1$s %2$.1f %3$s</string>
@@ -1369,25 +1303,12 @@
     <string name="automation">Automation</string>
 
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="key_dexcom_lognssensorchange" translatable="false">dexcom_lognssensorchange</string>
     <string name="dexcom_lognssensorchange_title">Log sensor change to NS</string>
     <string name="dexcom_lognssensorchange_summary">Create event \"Sensor Change\" in NS automaticaly on sensor start</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
 
-    <string name="unit_second">second</string>
-    <string name="unit_minute">minute</string>
-    <string name="unit_hour">hour</string>
-    <string name="unit_day">day</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">seconds</string>
-    <string name="unit_minutes">minutes</string>
-    <string name="unit_hours">hours</string>
-    <string name="unit_days">days</string>
-    <string name="unit_weeks">weeks</string>
     <string name="key_tidepool_username" translatable="false">tidepool_username</string>
     <string name="key_tidepool_password" translatable="false">tidepool_password</string>
     <string name="key_tidepool_dev_servers" translatable="false">tidepool_dev_servers</string>
@@ -1705,7 +1626,6 @@
     <string name="profile_name">Profile name:</string>
     <string name="selected_profile">Selected:</string>
     <string name="unitsnosemicolon">Units</string>
-    <string name="key_units" translatable="false">units</string>
     <string name="doyouwantswitchprofile">Do you want to switch profile and discard changes made to current profile?</string>
     <string name="key_wizard_calculation_visible" translatable="false">wizard_calculation_visible</string>
     <string name="format_carbs">%1$dg</string>
@@ -1720,8 +1640,6 @@
     <string name="setupwizard_units_prompt">Select units you want to display values in</string>
     <string name="key_ns_uploadlocalprofile" translatable="false">ns_uploadlocalprofile</string>
     <string name="ns_ploadlocalprofile">Upload local profile changes to NS</string>
-    <string name="key_low_mark" translatable="false">low_mark</string>
-    <string name="key_high_mark" translatable="false">high_mark</string>
     <string name="key_wear_detailediob" translatable="false">wear_detailediob</string>
     <string name="key_wear_showbgi" translatable="false">wear_showbgi</string>
     <string name="dia_short">DIA</string>
@@ -1746,7 +1664,6 @@
     <string name="nav_survey">Survey</string>
     <string name="invalidage">Invalid age entry</string>
     <string name="invalidweight">Invalid weight entry</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Average</string>
     <string name="tdd">TDD</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBase.kt b/app/src/test/java/info/nightscout/androidaps/TestBase.kt
index 278a74d081..60022c99dd 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBase.kt
@@ -1,11 +1,6 @@
 package info.nightscout.androidaps
 
-import dagger.android.AndroidInjector
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
 import info.nightscout.androidaps.logging.AAPSLoggerTest
-import org.json.JSONObject
 import org.junit.Before
 import org.junit.Rule
 import org.mockito.Mockito
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 6272726ff1..188266fbb3 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -3,14 +3,12 @@ package info.nightscout.androidaps
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
index 69a166dc86..f79cfd7c43 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/data/QuickWizardTest.kt
@@ -3,9 +3,8 @@ package info.nightscout.androidaps.data
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.sharedPreferences.SP
diff --git a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
index 61494f7d8c..7e37b24660 100644
--- a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
@@ -5,9 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.L
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 7698cc6844..fda1b15ae5 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
@@ -26,7 +25,6 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.HardLimits
 import info.nightscout.androidaps.utils.Profiler
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
index 40495880a3..28fb3668da 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
@@ -12,7 +12,7 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
index 45e7f5c51d..5d56382e0b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
@@ -2,21 +2,16 @@ package info.nightscout.androidaps.plugins.general.automation.actions
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.mockito.Mock
 import org.powermock.core.classloader.annotations.PrepareForTest
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
index a91fcf6d06..27b042afa1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.triggers
 import com.google.common.base.Optional
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import org.json.JSONObject
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
index 61c1f869ba..f172acb741 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
@@ -4,7 +4,7 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
index 47422cd41f..ebf0a57fc1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
@@ -4,7 +4,7 @@ import com.google.common.base.Optional
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.elements.Comparator
 import info.nightscout.androidaps.plugins.general.automation.elements.InputDelta.DeltaType
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
index a886ef27c6..3cbaa271f2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -6,7 +6,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index aa3f522264..bf96b45765 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -16,7 +16,6 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.CobInfo
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
@@ -36,7 +35,6 @@ import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.anyDouble
 import org.mockito.invocation.InvocationOnMock
 import org.mockito.stubbing.Answer
 import org.powermock.api.mockito.PowerMockito
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
index d3eb07a25d..646681c1dd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefBasePluginTest.kt
@@ -6,9 +6,9 @@ import info.nightscout.androidaps.data.Iob
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.Companion.MIN_DIA
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
index e34407fcfe..8c65f3339f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefFreePeakPluginTest.kt
@@ -5,9 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert.assertEquals
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
index a7aea711c3..7f1ec85ae9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefRapidActingPluginTest.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert.assertEquals
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
index 7d02e4be21..16b5a6dbc3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/insulin/InsulinOrefUltraRapidActingPluginTest.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.InsulinInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert.assertEquals
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
index a21990f406..595c8215d7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
@@ -5,9 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
index 6b349711f0..46951f8730 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/combo/ComboPluginTest.kt
@@ -10,11 +10,10 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.combo.ruffyscripter.history.Bolus
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index 44ee4019c3..d3f14725af 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 5a9107ccb0..8392d74120 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index 7c10c200ce..b98ac3e378 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 3e813c1328..e64df1a055 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.treatments.Treatment
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
@@ -21,7 +21,7 @@ class MsgBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
-        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector {  } })
+        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
         val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump)
 
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index 5dd1c1a3b0..b4f61fd220 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index d3edf9690c..f72d6cde94 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInf
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index 6df25b94c7..3f5da64f27 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -10,10 +10,8 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 6c1f96cdc7..bcc56e2f92 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -6,10 +6,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index ac5b33158b..7c39d39cea 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -4,10 +4,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.db.Treatment
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index 790117afc2..c4b8d79ee3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -4,10 +4,8 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.db.Treatment
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 37a1197b4f..0f90812ed0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -7,12 +7,9 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.treatments.Treatment
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DefaultValueHelper
+import info.nightscout.androidaps.db.Treatment
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index dca4d1e3ad..23285e59e3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
index 7a8c732c62..db6d30ef59 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
@@ -5,9 +5,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.FabricPrivacy
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
index 5dd11ba4a0..f4ebe83fdd 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
@@ -9,17 +9,13 @@ import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
index e44b95c950..4bbe3736b5 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/wizard/BolusWizardTest.kt
@@ -11,11 +11,10 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
diff --git a/build.gradle b/build.gradle
index b340946773..fe6a38714e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         dagger_version = '2.27'
         coroutinesVersion = '1.3.5'
         activityVersion = '1.2.0-alpha04'
+        ormLiteVersion = "4.46"
     }
     repositories {
         google()
diff --git a/core/build.gradle b/core/build.gradle
index e81f23f7b6..bde94da837 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -65,6 +65,16 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation 'org.apache.commons:commons-lang3:3.10'
 
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    //DateUtil
+    implementation 'net.danlew:android.joda:2.10.6'
+
+    //db
+    implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
+    implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
+
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/java/info/nightscout/androidaps/Constants.java b/core/src/main/java/info/nightscout/androidaps/Constants.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/Constants.java
rename to core/src/main/java/info/nightscout/androidaps/Constants.java
index 38767ebfb9..f66342de7e 100644
--- a/app/src/main/java/info/nightscout/androidaps/Constants.java
+++ b/core/src/main/java/info/nightscout/androidaps/Constants.java
@@ -86,6 +86,9 @@ public class Constants {
     public static final double STATS_RANGE_LOW_MMOL = 3.9;
     public static final double STATS_RANGE_HIGH_MMOL = 10.0;
 
+    // Local profile
+    public static final String LOCAL_PROFILE = "LocalProfile";
+
 
     // One Time Password
 
diff --git a/app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java b/core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
rename to core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Intervals.java b/core/src/main/java/info/nightscout/androidaps/data/Intervals.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/Intervals.java
rename to core/src/main/java/info/nightscout/androidaps/data/Intervals.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Iob.java b/core/src/main/java/info/nightscout/androidaps/data/Iob.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/Iob.java
rename to core/src/main/java/info/nightscout/androidaps/data/Iob.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/core/src/main/java/info/nightscout/androidaps/data/IobTotal.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
rename to core/src/main/java/info/nightscout/androidaps/data/IobTotal.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/MealData.java b/core/src/main/java/info/nightscout/androidaps/data/MealData.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/MealData.java
rename to core/src/main/java/info/nightscout/androidaps/data/MealData.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java b/core/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java
rename to core/src/main/java/info/nightscout/androidaps/data/NonOverlappingIntervals.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java b/core/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java
rename to core/src/main/java/info/nightscout/androidaps/data/OverlappingIntervals.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/data/Profile.java
rename to core/src/main/java/info/nightscout/androidaps/data/Profile.java
index 0fcc0321c2..dc8e08b0df 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -13,22 +13,20 @@ import java.util.TimeZone;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.ConfigInterface;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
-import info.nightscout.androidaps.utils.MidnightTime;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -38,6 +36,7 @@ public class Profile {
     @Inject public ResourceHelper resourceHelper;
     @Inject public RxBusWrapper rxBus;
     @Inject public FabricPrivacy fabricPrivacy;
+    @Inject public ConfigInterface configInterface;
 
     private HasAndroidInjector injector;
 
@@ -62,11 +61,6 @@ public class Profile {
     protected boolean isValid;
     protected boolean isValidated;
 
-    // Default constructor for DB
-    public Profile() {
-        MainApp.instance().androidInjector().inject(this);
-    }
-
     protected Profile(HasAndroidInjector injector) {
         injector.androidInjector().inject(this);
         this.injector = injector;
@@ -253,7 +247,7 @@ public class Profile {
                 for (int index = 0; index < basal_v.size(); index++) {
                     long secondsFromMidnight = basal_v.keyAt(index);
                     if (notify && secondsFromMidnight % 3600 != 0) {
-                        if (Config.APS) {
+                        if (configInterface.getAPS()) {
                             Notification notification = new Notification(Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, resourceHelper.gs(R.string.basalprofilenotaligned, from), Notification.NORMAL);
                             rxBus.send(new EventNewNotification(notification));
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
rename to core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
diff --git a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
rename to core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
index 00cfb1e6bd..16c3707536 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
@@ -6,7 +6,7 @@ import org.json.JSONObject;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
diff --git a/app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
rename to core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/db/BgReading.java
rename to core/src/main/java/info/nightscout/androidaps/db/BgReading.java
index b15d92a851..f2b53b8738 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -13,11 +13,11 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
@@ -27,7 +27,7 @@ import info.nightscout.androidaps.utils.DefaultValueHelper;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_BGREADINGS)
+@DatabaseTable(tableName = "BgReadings")
 public class BgReading implements DataPointWithLabelInterface {
     @Inject public AAPSLogger aapsLogger;
     @Inject public DefaultValueHelper defaultValueHelper;
@@ -59,7 +59,7 @@ public class BgReading implements DataPointWithLabelInterface {
     public boolean isZTPrediction = false; // true when drawing predictions as bg points (ZT)
 
     public BgReading() {
-        MainApp.instance().androidInjector().inject(this);
+        StaticInjector.Companion.getInstance().androidInjector().inject(this);
     }
 
     public BgReading(HasAndroidInjector injector) {
@@ -86,10 +86,10 @@ public class BgReading implements DataPointWithLabelInterface {
         else return DecimalFormatter.to1Decimal(value * Constants.MGDL_TO_MMOLL);
     }
 
-    public String directionToSymbol() {
+    public String directionToSymbol(DatabaseHelperInterface databaseHelper) {
         String symbol = "";
         if (direction == null)
-            direction = calculateDirection();
+            direction = calculateDirection(databaseHelper);
 
         if (direction.compareTo("DoubleDown") == 0) {
             symbol = "\u21ca";
@@ -249,7 +249,7 @@ public class BgReading implements DataPointWithLabelInterface {
             return resourceHelper.gc(R.color.uam);
         if (isZTPrediction)
             return resourceHelper.gc(R.color.zt);
-        return R.color.mdtp_white;
+        return R.color.white;
     }
 
     private boolean isPrediction() {
@@ -258,10 +258,10 @@ public class BgReading implements DataPointWithLabelInterface {
 
 
     // Copied from xDrip+
-    String calculateDirection() {
+    String calculateDirection(DatabaseHelperInterface databasehelper) {
         // Rework to get bgreaings from internal DB and calculate on that base
 
-        List<BgReading> bgReadingsList = MainApp.getDbHelper().getAllBgreadingsDataFromTime(this.date - T.mins(10).msecs(), false);
+        List<BgReading> bgReadingsList = databasehelper.getAllBgreadingsDataFromTime(this.date - T.mins(10).msecs(), false);
         if (bgReadingsList == null || bgReadingsList.size() < 2)
             return "NONE";
         BgReading current = bgReadingsList.get(1);
diff --git a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
rename to core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index ea9e44e7fe..6f95917ace 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -9,10 +9,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -21,13 +17,12 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
@@ -36,7 +31,7 @@ import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.Translator;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_CAREPORTALEVENTS)
+@DatabaseTable(tableName = "CareportalEvents")
 public class CareportalEvent implements DataPointWithLabelInterface, Interval {
 
     @Inject ProfileFunction profileFunction;
@@ -84,7 +79,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
 
     @Deprecated
     public CareportalEvent() {
-        MainApp.instance().androidInjector().inject(this);
+        StaticInjector.Companion.getInstance().androidInjector().inject(this);
     }
 
     public CareportalEvent(HasAndroidInjector injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java b/core/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java
rename to core/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java
index 5c2e4f4985..2c161df1cc 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/DanaRHistoryRecord.java
@@ -3,9 +3,7 @@ package info.nightscout.androidaps.db;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import java.util.Date;
-
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_DANARHISTORY)
+@DatabaseTable(tableName = "DanaRHistory")
 public class DanaRHistoryRecord {
 
     @DatabaseField
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbObjectBase.java b/core/src/main/java/info/nightscout/androidaps/db/DbObjectBase.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/db/DbObjectBase.java
rename to core/src/main/java/info/nightscout/androidaps/db/DbObjectBase.java
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
rename to core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index 60da1d2bca..e280c5efbb 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.utils.DateUtil;
  * <p>
  * Allowed actions "dbAdd" || "dbUpdate" || "dbUpdateUnset" || "dbRemove"
  */
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_DBREQUESTS)
+@DatabaseTable(tableName = "DBRequests")
 public class DbRequest {
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
rename to core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 15dd969e09..49b223d9b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -17,18 +17,15 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.plugins.configBuilder.PluginStore;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.JsonHelper;
@@ -38,10 +35,11 @@ import info.nightscout.androidaps.utils.Round;
  * Created by mike on 21.05.2017.
  */
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_EXTENDEDBOLUSES)
+@DatabaseTable(tableName = "ExtendedBoluses")
 public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     @Inject ActivePluginProvider activePlugin;
+    @Inject DateUtil dateUtil;
 
     private HasAndroidInjector injector;
 
@@ -71,7 +69,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     @Deprecated
     public ExtendedBolus() {
-        injector = MainApp.instance();
+        injector = StaticInjector.Companion.getInstance();
         injector.androidInjector().inject(this);
     }
 
@@ -330,7 +328,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     public String toString() {
         return "E " + DecimalFormatter.to2Decimal(absoluteRate()) + "U/h @" +
-                DateUtil.timeString(date) +
+                dateUtil.timeString(date) +
                 " " + getRealDuration() + "/" + durationInMinutes + "min";
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ICallback.java b/core/src/main/java/info/nightscout/androidaps/db/ICallback.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/db/ICallback.java
rename to core/src/main/java/info/nightscout/androidaps/db/ICallback.java
diff --git a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
rename to core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index 06174c9c66..09b7d047ba 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -16,26 +16,24 @@ import java.util.Objects;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.Constants;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
+import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_PROFILESWITCHES)
+@DatabaseTable(tableName = "ProfileSwitches")
 public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
 
     @DatabaseField(id = true)
@@ -71,13 +69,13 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     private Profile profile = null;
 
     HasAndroidInjector injector;
-    @Inject public TreatmentsPlugin treatmentsPlugin;
+    @Inject public TreatmentsInterface treatmentsPlugin;
     @Inject public AAPSLogger aapsLogger;
     @Inject public RxBusWrapper rxBus;
     @Inject public ResourceHelper resourceHelper;
 
     public ProfileSwitch() {
-        this.injector = MainApp.instance();
+        this.injector = StaticInjector.Companion.getInstance();
         injector.androidInjector().inject(this);
     }
 
@@ -130,7 +128,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
      */
     public String getCustomizedName() {
         String name = profileName;
-        if (LocalProfilePlugin.Companion.getLOCAL_PROFILE().equals(name)) {
+        if (Constants.LOCAL_PROFILE.equals(name)) {
             name = DecimalFormatter.to2Decimal(getProfileObject().percentageBasalSum()) + "U ";
         }
         if (isCPP) {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/Source.java b/core/src/main/java/info/nightscout/androidaps/db/Source.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/db/Source.java
rename to core/src/main/java/info/nightscout/androidaps/db/Source.java
diff --git a/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt b/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
new file mode 100644
index 0000000000..65a31bd812
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.db
+
+import dagger.android.AndroidInjector
+import dagger.android.HasAndroidInjector
+import java.lang.IllegalStateException
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+@Deprecated("Only until DB is refactored")
+class StaticInjector @Inject constructor(
+    private val injector: HasAndroidInjector
+) : HasAndroidInjector {
+    companion object {
+        @Deprecated("Only until DB is refactored")
+        private var instance : StaticInjector? = null
+
+        fun getInstance() : StaticInjector {
+            if (instance == null) throw IllegalStateException("StaticInjector not initialized")
+            return instance!!
+        }
+    }
+
+    init {
+        instance = this
+    }
+    override fun androidInjector(): AndroidInjector<Any> = injector.androidInjector()
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TDD.java b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
similarity index 78%
rename from app/src/main/java/info/nightscout/androidaps/db/TDD.java
rename to core/src/main/java/info/nightscout/androidaps/db/TDD.java
index 8d6a2e2576..eba359f2ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -5,8 +5,7 @@ import com.j256.ormlite.table.DatabaseTable;
 
 import java.util.Locale;
 
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -15,7 +14,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
  */
 
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_TDDS)
+@DatabaseTable(tableName = "TDDs")
 public class TDD {
 
     @DatabaseField(id = true)
@@ -51,15 +50,15 @@ public class TDD {
     public String toString() {
         return "TDD [" +
                 "date=" + date +
-                "date(str)=" + DateTimeUtil.toStringFromTimeInMillis(date) +
+                "date(str)=" + DateUtil.dateAndTimeString(date) +
                 ", bolus=" + bolus +
                 ", basal=" + basal +
                 ", total=" + total +
                 ']';
     }
 
-    public String toText(ResourceHelper resourceHelper) {
-        return resourceHelper.gs(R.string.tddformat, DateUtil.dateStringShort(date), total, bolus, basal);
+    public String toText(ResourceHelper resourceHelper, DateUtil dateUtil) {
+        return resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(date), total, bolus, basal);
     }
 
     public String toText(ResourceHelper resourceHelper, int days) {
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
rename to core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index be7b76c554..cc9b7db990 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -4,23 +4,20 @@ import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Objects;
 
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPTARGETS)
+@DatabaseTable(tableName = "TempTargets")
 public class TempTarget implements Interval {
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
rename to core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index 937022196c..cf59c456d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -8,8 +8,7 @@ import java.util.Objects;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
@@ -17,9 +16,8 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
 import info.nightscout.androidaps.interfaces.Interval;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -28,13 +26,14 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
  * Created by mike on 21.05.2017.
  */
 
-@DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPORARYBASALS)
+@DatabaseTable(tableName = "TemporaryBasals")
 public class TemporaryBasal implements Interval, DbObjectBase {
 
     @Inject public AAPSLogger aapsLogger;
     @Inject public ProfileFunction profileFunction;
     @Inject public ActivePluginProvider activePlugin;
     @Inject public SP sp;
+    @Inject DateUtil dateUtil;
 
     private HasAndroidInjector injector;
 
@@ -68,7 +67,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
 
     @Deprecated
     public TemporaryBasal() {
-        injector = MainApp.instance();
+        injector = StaticInjector.Companion.getInstance();
         injector.androidInjector().inject(this);
     }
 
@@ -110,7 +109,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     }
 
     public TemporaryBasal(ExtendedBolus extendedBolus) {
-        injector = MainApp.instance();
+        injector = StaticInjector.Companion.getInstance();
         injector.androidInjector().inject(this);
         double basal = profileFunction.getProfile(extendedBolus.date).getBasal(extendedBolus.date);
         this.date = extendedBolus.date;
@@ -427,15 +426,15 @@ public class TemporaryBasal implements Interval, DbObjectBase {
             Double currentBasalRate = profile.getBasal();
             double rate = currentBasalRate + netExtendedRate;
             return getCalcuatedPercentageIfNeeded() + DecimalFormatter.to2Decimal(rate) + "U/h (" + DecimalFormatter.to2Decimal(netExtendedRate) + "E) @" +
-                    DateUtil.timeString(date) +
+                    dateUtil.timeString(date) +
                     " " + getRealDuration() + "/" + durationInMinutes + "'";
         } else if (isAbsolute) {
             return DecimalFormatter.to2Decimal(absoluteRate) + "U/h @" +
-                    DateUtil.timeString(date) +
+                    dateUtil.timeString(date) +
                     " " + getRealDuration() + "/" + durationInMinutes + "'";
         } else { // percent
             return percentRate + "% @" +
-                    DateUtil.timeString(date) +
+                    dateUtil.timeString(date) +
                     " " + getRealDuration() + "/" + durationInMinutes + "'";
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
rename to core/src/main/java/info/nightscout/androidaps/db/Treatment.java
index ee99412f77..0df0dd0efa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/Treatment.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.treatments;
+package info.nightscout.androidaps.db;
 
 import android.graphics.Color;
 
@@ -17,15 +17,12 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Iob;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.DbObjectBase;
-import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.InsulinInterface;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -74,7 +71,7 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
     public String boluscalc;
 
     public Treatment() {
-        MainApp.instance().androidInjector().inject(this); // TODO it will be removed by new database
+        StaticInjector.Companion.getInstance().androidInjector().inject(this); // TODO it will be removed by new database
     }
 
     public Treatment(HasAndroidInjector injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java
index 7d32e37ff0..5cbdddac9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/APSInterface.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.interfaces;
 
+
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 
 /**
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java b/core/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/ActivePluginProvider.java
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/BgSourceInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/CommandQueueProvider.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigInterface.kt
new file mode 100644
index 0000000000..b5071628b5
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigInterface.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.interfaces
+
+interface ConfigInterface {
+    val SUPPORTEDNSVERSION: Int
+    val APS: Boolean
+    val NSCLIENT: Boolean
+    val PUMPCONTROL: Boolean
+    val PUMPDRIVERS: Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
new file mode 100644
index 0000000000..fb6c30a2c3
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.db.BgReading
+
+@Deprecated("Remove with new DB")
+interface DatabaseHelperInterface {
+    fun getAllBgreadingsDataFromTime(mills : Long, ascending: Boolean): List<BgReading>
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
index 2ad36fb747..d5e8ab399d 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/InsulinInterface.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.interfaces;
 
 import info.nightscout.androidaps.data.Iob;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 
 /**
  * Created by mike on 17.04.2017.
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java b/core/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/Interval.java
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
new file mode 100644
index 0000000000..2d06449082
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.interfaces;
+
+import androidx.collection.LongSparseArray;
+
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
+
+public interface IobCobCalculatorInterface {
+    LongSparseArray<AutosensData> getAutosensDataTable();
+    String lastDataTime();
+    AutosensData getAutosensData(long toTime);
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PluginBase.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PluginDescription.java
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PluginType.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PluginType.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PluginType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
index e6adc728f5..64582a62d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunction.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileFunction.kt
@@ -1,7 +1,7 @@
-package info.nightscout.androidaps.plugins.configBuilder
+package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.db.ProfileSwitch
 
 interface ProfileFunction {
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java
index 5fb3b459b6..5af03b863f 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileInterface.java
@@ -2,8 +2,6 @@ package info.nightscout.androidaps.interfaces;
 
 import androidx.annotation.Nullable;
 
-import info.nightscout.androidaps.data.ProfileStore;
-
 /**
  * Created by mike on 14.06.2016.
  */
diff --git a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
index 751067a27a..5840dfabf0 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/ProfileStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
@@ -1,7 +1,8 @@
-package info.nightscout.androidaps.data
+package info.nightscout.androidaps.interfaces
 
 import androidx.collection.ArrayMap
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.utils.JsonHelper
 import org.json.JSONException
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index d85a383752..d5356af55d 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -5,8 +5,6 @@ import org.json.JSONObject;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -107,7 +105,6 @@ public interface PumpInterface {
 
     boolean canHandleDST();
 
-    @Nullable
     List<CustomAction> getCustomActions();
 
     void executeCustomAction(CustomActionType customActionType);
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
rename to core/src/main/java/info/nightscout/androidaps/interfaces/PumpPluginBase.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java
similarity index 60%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java
index 9d75382542..04503c5690 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/SensitivityInterface.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.interfaces;
 
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 
 /**
  * Created by mike on 24.06.2017.
@@ -12,6 +11,6 @@ public interface SensitivityInterface {
     double MIN_HOURS = 1;
     double MIN_HOURS_FULL_AUTOSENS = 4;
 
-    AutosensResult detectSensitivity(IobCobCalculatorPlugin plugin, long fromTime, long toTime);
+    AutosensResult detectSensitivity(IobCobCalculatorInterface plugin, long fromTime, long toTime);
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
index 98441f8a7d..8856f8a74e 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
@@ -7,15 +7,13 @@ import java.util.List;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Intervals;
 import info.nightscout.androidaps.data.IobTotal;
-import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.ProfileIntervals;
-import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.db.Treatment;
 
 /**
  * Created by mike on 14.06.2016.
@@ -23,31 +21,43 @@ import info.nightscout.androidaps.plugins.treatments.Treatment;
 public interface TreatmentsInterface {
 
     void updateTotalIOBTreatments();
+
     void updateTotalIOBTempBasals();
 
     IobTotal getLastCalculationTreatments();
+
     IobTotal getCalculationToTimeTreatments(long time);
+
     IobTotal getLastCalculationTempBasals();
+
     IobTotal getCalculationToTimeTempBasals(long time);
 
     List<Treatment> getTreatmentsFromHistory();
+
     List<Treatment> getCarbTreatments5MinBackFromHistory(long time);
+
     List<Treatment> getTreatmentsFromHistoryAfterTimestamp(long timestamp);
+
     long getLastBolusTime();
 
     // real basals (not faked by extended bolus)
     boolean isInHistoryRealTempBasalInProgress();
+
     TemporaryBasal getRealTempBasalFromHistory(long time);
 
     boolean addToHistoryTempBasal(TemporaryBasal tempBasal);
 
     // basal that can be faked by extended boluses
     boolean isTempBasalInProgress();
+
     TemporaryBasal getTempBasalFromHistory(long time);
+
     NonOverlappingIntervals<TemporaryBasal> getTemporaryBasalsFromHistory();
 
     boolean isInHistoryExtendedBoluslInProgress();
+
     ExtendedBolus getExtendedBolusFromHistory(long time);
+
     Intervals<ExtendedBolus> getExtendedBolusesFromHistory();
 
     boolean addToHistoryExtendedBolus(ExtendedBolus extendedBolus);
@@ -55,14 +65,21 @@ public interface TreatmentsInterface {
     boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo, boolean allowUpdate);
 
     TempTarget getTempTargetFromHistory();
+
     TempTarget getTempTargetFromHistory(long time);
+
     Intervals<TempTarget> getTempTargetsFromHistory();
+
     void addToHistoryTempTarget(TempTarget tempTarget);
 
     ProfileSwitch getProfileSwitchFromHistory(long time);
+
     ProfileIntervals<ProfileSwitch> getProfileSwitchesFromHistory();
+
     void addToHistoryProfileSwitch(ProfileSwitch profileSwitch);
+
     void doProfileSwitch(@NotNull final ProfileStore profileStore, @NotNull final String profileName, final int duration, final int percentage, final int timeShift, final long date);
+
     void doProfileSwitch(final int duration, final int percentage, final int timeShift);
 
     long oldestDataAvailable();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 5ca88bfac0..edec4da528 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -13,7 +13,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.BgReading;
@@ -22,11 +22,11 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -40,7 +40,7 @@ public class APSResult {
     @Inject ConstraintChecker constraintChecker;
     @Inject SP sp;
     @Inject ActivePluginProvider activePlugin;
-    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject TreatmentsInterface treatmentsPlugin;
     @Inject ProfileFunction profileFunction;
     @Inject ResourceHelper resourceHelper;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConstraintChecker.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index 3128ac766d..ed084120f4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -3,14 +3,14 @@ package info.nightscout.androidaps.plugins.configBuilder
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.data.ProfileStore
 import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.db.Source
+import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -87,7 +87,6 @@ class ProfileFunctionImplementation @Inject constructor(
         if (activeTreatments.profileSwitchesFromHistory.size() > 0) {
             val bundle = Bundle()
             bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_ID, "CatchedError")
-            bundle.putString(FirebaseAnalytics.Param.ITEM_CATEGORY, BuildConfig.BUILDVERSION)
             bundle.putString(FirebaseAnalytics.Param.START_DATE, time.toString())
             bundle.putString(FirebaseAnalytics.Param.ITEM_LIST_NAME, activeTreatments.profileSwitchesFromHistory.toString())
             fabricPrivacy.logCustom(bundle)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
index fe9af4a03e..b276bae9b1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.general.actions.defs
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 
 class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.icon_actions_profileswitch, var isEnabled: Boolean = true) {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomActionType.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSMbg.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSgv.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/DataPointWithLabelInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
index eb981e9329..8058a6eef6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/PointsWithLabelGraphSeries.java
@@ -39,10 +39,6 @@ import com.jjoe64.graphview.series.BaseSeries;
 
 import java.util.Iterator;
 
-import info.nightscout.androidaps.MainApp;
-
-// Added by Rumen for scalable text
-
 /**
  * Series that plots the data as points.
  * The points can be different shapes or a
@@ -53,10 +49,6 @@ import info.nightscout.androidaps.MainApp;
 public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> extends BaseSeries<E> {
     // Default spSize
     int spSize = 14;
-    // Convert the sp to pixels
-    Context context = MainApp.instance().getApplicationContext();
-    float scaledTextSize = spSize * context.getResources().getDisplayMetrics().scaledDensity;
-    float scaledPxSize = context.getResources().getDisplayMetrics().scaledDensity * 3f;
 
     /**
      * choose a predefined shape to render for
@@ -123,6 +115,9 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
      */
     @Override
     public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) {
+        // Convert the sp to pixels
+        float scaledTextSize = spSize * graphView.getContext().getResources().getDisplayMetrics().scaledDensity;
+        float scaledPxSize = graphView.getContext().getResources().getDisplayMetrics().scaledDensity * 3f;
         resetDataPoints();
 
         // get data
@@ -238,7 +233,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     drawArrows(points, canvas, mPaint);
                     if (value.getLabel() != null) {
-                        drawLabel45(endX, endY, value, canvas);
+                        drawLabel45(endX, endY, value, canvas, scaledPxSize, scaledTextSize);
                     }
                 } else if (value.getShape() == Shape.SMB) {
                     mPaint.setStrokeWidth(2);
@@ -287,21 +282,21 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
                     mPaint.setStrokeWidth(0);
                     canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
-                        drawLabel45(endX, endY, value, canvas);
+                        drawLabel45(endX, endY, value, canvas, scaledPxSize, scaledTextSize);
                     }
                 } else if (value.getShape() == Shape.ANNOUNCEMENT) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     mPaint.setStrokeWidth(0);
                     canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
-                        drawLabel45(endX, endY, value, canvas);
+                        drawLabel45(endX, endY, value, canvas, scaledPxSize, scaledTextSize);
                     }
                 } else if (value.getShape() == Shape.GENERAL) {
                     mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
                     mPaint.setStrokeWidth(0);
                     canvas.drawCircle(endX, endY, scaledPxSize, mPaint);
                     if (value.getLabel() != null) {
-                        drawLabel45(endX, endY, value, canvas);
+                        drawLabel45(endX, endY, value, canvas, scaledPxSize, scaledTextSize);
                     }
                 } else if (value.getShape() == Shape.EXERCISE) {
                     mPaint.setStrokeWidth(0);
@@ -385,7 +380,7 @@ public class PointsWithLabelGraphSeries<E extends DataPointWithLabelInterface> e
         canvas.restore();
     }
 
-    void drawLabel45(float endX, float endY, E value, Canvas canvas) {
+    void drawLabel45(float endX, float endY, E value, Canvas canvas, Float scaledPxSize, Float scaledTextSize) {
         if (value.getLabel().startsWith("~")) {
             float px = endX;
             float py = endY + scaledPxSize;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/Scale.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
index 6b3b4ef3de..9cd8c74f87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/AutosensData.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculator;
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator.data;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,18 +8,18 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults;
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.Scale;
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
-import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
-import info.nightscout.androidaps.plugins.treatments.Treatment;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -29,8 +29,7 @@ public class AutosensData implements DataPointWithLabelInterface {
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
     @Inject ResourceHelper resourceHelper;
-    @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
-    @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
+    @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
 
     public AutosensData(HasAndroidInjector injector) {
@@ -41,17 +40,17 @@ public class AutosensData implements DataPointWithLabelInterface {
         this.chartTime = chartTime;
     }
 
-    class CarbsInPast {
+    public class CarbsInPast {
         long time = 0L;
         double carbs = 0d;
-        double min5minCarbImpact = 0d;
+        public double min5minCarbImpact = 0d;
         double remaining = 0d;
 
-        CarbsInPast(Treatment t) {
+        public CarbsInPast(Treatment t, boolean isAAPSOrWeighted) {
             time = t.date;
             carbs = t.carbs;
             remaining = t.carbs;
-            if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
+            if (isAAPSOrWeighted) {
                 double maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
                 Profile profile = profileFunction.getProfile(t.date);
                 double sens = profile.getIsfMgdl(t.date);
@@ -82,8 +81,8 @@ public class AutosensData implements DataPointWithLabelInterface {
     public String pastSensitivity = "";
     public double deviation = 0d;
     public boolean validDeviation = false;
-    List<CarbsInPast> activeCarbsList = new ArrayList<>();
-    double absorbed = 0d;
+    public List<CarbsInPast> activeCarbsList = new ArrayList<>();
+    public double absorbed = 0d;
     public double carbsFromBolus = 0d;
     public double cob = 0;
     public double bgi = 0d;
@@ -122,9 +121,9 @@ public class AutosensData implements DataPointWithLabelInterface {
     }
 
     // remove carbs older than timeframe
-    public void removeOldCarbs(long toTime) {
+    public void removeOldCarbs(long toTime, boolean isAAPSOrWeighted) {
         double maxAbsorptionHours = Constants.DEFAULT_MAX_ABSORPTION_TIME;
-        if (sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled()) {
+        if (isAAPSOrWeighted) {
             maxAbsorptionHours = sp.getDouble(R.string.key_absorption_maxtime, Constants.DEFAULT_MAX_ABSORPTION_TIME);
         } else {
             maxAbsorptionHours = sp.getDouble(R.string.key_absorption_cutoff, Constants.DEFAULT_MAX_ABSORPTION_TIME);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/DoseSettings.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/DoseStepSize.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpTempBasalType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
index 3fff66fdf7..b52e1a1290 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
@@ -4,11 +4,11 @@ package info.nightscout.androidaps.plugins.pump.common.defs;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.pump.common.data.DoseSettings;
 import info.nightscout.androidaps.utils.Round;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 
 /**
@@ -362,14 +362,14 @@ public enum PumpType {
     }
 
 
-    public String getFullDescription(String i18nTemplate, boolean hasExtendedBasals) {
+    public String getFullDescription(String i18nTemplate, boolean hasExtendedBasals, ResourceHelper resourceHelper) {
 
         String unit = getPumpTempBasalType() == PumpTempBasalType.Percent ? "%" : "";
 
         DoseSettings eb = getExtendedBolusSettings();
         DoseSettings tbr = getTbrSettings();
 
-        String extendedNote = hasExtendedBasals ? MainApp.gs(R.string.virtualpump_pump_def_extended_note) : "";
+        String extendedNote = hasExtendedBasals ? resourceHelper.gs(R.string.virtualpump_pump_def_extended_note) : "";
 
         return String.format(i18nTemplate, //
                 getStep("" + getBolusSize(), getSpecialBolusSize()), //
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/Callback.java b/core/src/main/java/info/nightscout/androidaps/queue/Callback.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/queue/Callback.java
rename to core/src/main/java/info/nightscout/androidaps/queue/Callback.java
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt b/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
rename to core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
index eac1e6d103..ea6a8b9196 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
+++ b/core/src/main/java/info/nightscout/androidaps/queue/commands/Command.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.queue.commands
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
rename to core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index f058896f19..16fb3e2504 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.utils;
 
+import android.content.Context;
+
 import androidx.collection.LongSparseArray;
 
 import org.joda.time.DateTime;
@@ -26,15 +28,36 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
  * The Class DateUtil. A simple wrapper around SimpleDateFormat to ease the handling of iso date string &lt;-&gt; date obj
  * with TZ
  */
+
+@Singleton
 public class DateUtil {
+    private final Context context;
+    private final ResourceHelper resourceHelper;
+
+    @Deprecated
+    private static DateUtil instance;
+
+    @Inject
+    public DateUtil(Context context, ResourceHelper resourceHelper) {
+        this.context = context;
+        this.resourceHelper = resourceHelper;
+        instance = this;
+    }
+
+    @Deprecated
+    public static DateUtil getInstance() {
+        return instance;
+    }
 
     /**
      * The date format in iso.
@@ -147,33 +170,33 @@ public class DateUtil {
         return df.format(mills);
     }
 
-    public static String dateStringShort(long mills) {
+    public String dateStringShort(long mills) {
         String format = "MM/dd";
-        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+        if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "dd/MM";
         }
         return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
     }
 
-    public static String timeString(Date date) {
+    public String timeString(Date date) {
         String format = "hh:mma";
-        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+        if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm";
         }
         return new DateTime(date).toString(DateTimeFormat.forPattern(format));
     }
 
-    public static String timeString(long mills) {
+    public String timeString(long mills) {
         String format = "hh:mma";
-        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+        if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm";
         }
         return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
     }
 
-    public static String timeStringWithSeconds(long mills) {
+    public String timeStringWithSeconds(long mills) {
         String format = "hh:mm:ssa";
-        if (android.text.format.DateFormat.is24HourFormat(MainApp.instance())) {
+        if (android.text.format.DateFormat.is24HourFormat(context)) {
             format = "HH:mm:ss";
         }
         return new DateTime(mills).toString(DateTimeFormat.forPattern(format));
@@ -184,21 +207,21 @@ public class DateUtil {
     }
 
     public static String dateAndTimeString(Date date) {
-        return dateString(date) + " " + timeString(date);
+        return dateString(date) + " " + instance.timeString(date);
     }
 
     public static String dateAndTimeRangeString(long start, long end) {
-        return dateAndTimeString(start) + " - " + timeString(end);
+        return dateAndTimeString(start) + " - " + instance.timeString(end);
     }
 
     public static String dateAndTimeString(long mills) {
         if (mills == 0) return "";
-        return dateString(mills) + " " + timeString(mills);
+        return dateString(mills) + " " + instance.timeString(mills);
     }
 
     public static String dateAndTimeAndSecondsString(long mills) {
         if (mills == 0) return "";
-        return dateString(mills) + " " + timeStringWithSeconds(mills);
+        return dateString(mills) + " " + instance.timeStringWithSeconds(mills);
     }
 
     public static String dateAndTimeFullString(long mills) {
@@ -226,7 +249,7 @@ public class DateUtil {
         String cached = timeStrings.get(seconds);
         if (cached != null)
             return cached;
-        String t = timeString(toDate(seconds));
+        String t = instance.timeString(toDate(seconds));
         timeStrings.put(seconds, t);
         return t;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java b/core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
rename to core/src/main/java/info/nightscout/androidaps/utils/DecimalFormatter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
index 6f7e49c9bd..1f85996369 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DefaultValueHelper.kt
@@ -1,9 +1,9 @@
 package info.nightscout.androidaps.utils
 
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/JsonHelper.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Round.java b/core/src/main/java/info/nightscout/androidaps/utils/Round.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/Round.java
rename to core/src/main/java/info/nightscout/androidaps/utils/Round.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeChangeType.java b/core/src/main/java/info/nightscout/androidaps/utils/TimeChangeType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/TimeChangeType.java
rename to core/src/main/java/info/nightscout/androidaps/utils/TimeChangeType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/Translator.kt b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/utils/Translator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
index b68fb74194..501c2e7d1a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/Translator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.utils
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/res/drawable/icon_actions_profileswitch.png b/core/src/main/res/drawable/icon_actions_profileswitch.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions_profileswitch.png
rename to core/src/main/res/drawable/icon_actions_profileswitch.png
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index ab83365d64..19da434c99 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -4,15 +4,32 @@
     <color name="colorPrimaryDark">#000000</color>
     <color name="colorAccent">#40bbaa</color>
 
+    <!--    Dialogs-->
     <color name="dialog_title_background">#303030</color>
     <color name="activity_title_background">#121212</color>
     <color name="dialog_title_color">#FFFFFF</color>
     <color name="dialog_title_icon_tint">#FFFFFF</color>
-
     <color name="warningAlertBackground">#FFFB8C00</color>
     <color name="warningAlertHeaderText">#FF000000</color>
-
     <color name="errorAlertBackground">#FFFF5555</color>
     <color name="errorAlertHeaderText">#FF000000</color>
 
+    <!--    Treatment-->
+    <color name="tempbasal">#C803A9F4</color>
+
+    <!--    BgReading-->
+    <color name="inrange">#00FF00</color>
+    <color name="low">#FF0000</color>
+    <color name="high">#FFFF00</color>
+    <color name="iob">#1e88e5</color>
+    <color name="iobPredAS">#1ea3e5</color>
+    <color name="cob">#FFFB8C00</color>
+    <color name="carbs">#FFFB8C00</color>
+    <color name="uam">#c9bd60</color>
+    <color name="zt">#00d2d2</color>
+    <color name="white">#ffffff</color>
+
+    <!--    CareportalEvent-->
+    <color name="notificationAnnouncement">#FF8C00</color>
+
 </resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index be67629d42..b69a63c11c 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -2,16 +2,124 @@
 <resources>
     <string name="key_enable_fabric" translatable="false">enable_fabric</string>
     <string name="key_language" translatable="false">language</string>
+    <string name="key_units" translatable="false">units</string>
+    <string name="key_loop_openmode_min_change" translatable="false">loop_openmode_min_change</string>
+    <string name="key_absorption_maxtime" translatable="false">absorption_maxtime</string>
+    <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
+    <string name="key_absorption_cutoff" translatable="false">absorption_cutoff</string>
+    <string name="key_danar_visualizeextendedaspercentage" translatable="false">danar_visualizeextendedaspercentage"</string>
+    <string name="key_danar_useextended" translatable="false">danar_useextended</string>
+    <string name="key_eatingsoon_duration" translatable="false">eatingsoon_duration</string>
+    <string name="key_eatingsoon_target" translatable="false">eatingsoon_target</string>
+    <string name="key_activity_duration" translatable="false">activity_duration</string>
+    <string name="key_activity_target" translatable="false">activity_target</string>
+    <string name="key_hypo_duration" translatable="false">hypo_duration</string>
+    <string name="key_hypo_target" translatable="false">hypo_target</string>
+    <string name="key_low_mark" translatable="false">low_mark</string>
+    <string name="key_high_mark" translatable="false">high_mark</string>
 
+    <!--    Dialogs-->
     <string name="confirmation">Confirmation</string>
     <string name="message">Message</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="dismiss">DISMISS</string>
 
+    <!--    BlePreCheck-->
     <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy not supported.</string>
     <string name="rileylink_scanner_ble_not_enabled">Bluetooth not enabled.</string>
     <string name="location_not_found_title">Location Is Not Enabled</string>
     <string name="location_not_found_message">For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful.</string>
 
+    <!--    DateUtil-->
+    <string name="minago">%1$dm ago</string>
+    <string name="hoursago">%1$.1fh ago</string>
+    <string name="shorthour">h</string>
+    <string name="days">days</string>
+    <string name="hours">hours</string>
+    <string name="unit_second">second</string>
+    <string name="unit_minute">minute</string>
+    <string name="unit_hour">hour</string>
+    <string name="unit_day">day</string>
+    <string name="unit_week">week</string>
+    <string name="unit_seconds">seconds</string>
+    <string name="unit_minutes">minutes</string>
+    <string name="unit_hours">hours</string>
+    <string name="unit_days">days</string>
+    <string name="unit_weeks">weeks</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Basal values not aligned to hours: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basal value replaced by minimal supported value: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Basal value replaced by maximum supported value: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">No profile selected</string>
+
+    <!--    PumpType-->
+    <string name="virtualpump_pump_def_extended_note">* Only discrete values no ranges are supported as granularity for basal/bolus in virtual pump.</string>
+
+    <!--    APSResult-->
+    <string name="canceltemp">Cancel temp basal</string>
+    <string name="let_temp_basal_run">Let temp basal run</string>
+    <string name="rate">Rate</string>
+    <string name="duration">Duration</string>
+    <string name="reason">Reason</string>
+    <string name="nochangerequested">No change requested</string>
+
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Invalid profile: %1$s</string>
+
+    <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
+
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+
+    <!--    Translator-->
+    <string name="careportal_bgcheck">BG Check</string>
+    <string name="careportal_announcement">Announcement</string>
+    <string name="careportal_note">Note</string>
+    <string name="careportal_question">Question</string>
+    <string name="careportal_exercise">Exercise</string>
+    <string name="careportal_pumpsitechange">Pump Site Change</string>
+    <string name="careportal_cgmsensorinsert">CGM Sensor Insert</string>
+    <string name="careportal_cgmsensorstart">CGM Sensor Start</string>
+    <string name="careportal_insulincartridgechange">Insulin Cartridge Change</string>
+    <string name="careportal_profileswitch">Profile switch</string>
+    <string name="careportal_snackbolus">Snack Bolus</string>
+    <string name="careportal_mealbolus">Meal Bolus</string>
+    <string name="careportal_correctionbolus">Correction Bolus</string>
+    <string name="careportal_combobolus">Combo Bolus</string>
+    <string name="careportal_tempbasalstart">Temp Basal Start</string>
+    <string name="careportal_tempbasalend">Temp Basal End</string>
+    <string name="careportal_carbscorrection">Carbs correction</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Pump Battery Change</string>
+    <string name="careportal_temporarytarget">Temporary target</string>
+    <string name="careportal_temporarytargetcancel">Temporary target cancel</string>
+    <string name="glucosetype_finger">Finger</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manual</string>
+    <string name="unknown">unknown</string>
+
+    <!--    Command-->
+    <string name="connectiontimedout">Connection timed out</string>
+
+    <!--    PumpEnactResult-->
+    <string name="enacted">Enacted</string>
+    <string name="comment">Comment</string>
+    <string name="success">Success</string>
+    <string name="percent">Percent</string>
+    <string name="absolute">Absolute</string>
+    <string name="configbuilder_insulin">Insulin</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Waiting for result</string>
+    <string name="smb_shortname">SMB</string>
+
 </resources>
\ No newline at end of file

From eb6eebe853a43086904dd2e91f1e13907e519402 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Thu, 7 May 2020 21:17:32 +0200
Subject: [PATCH 039/400] Restore version for upstream merge from Omnipod repo

---
 app/build.gradle | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e3666c9961..fa13e0eea0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,7 +129,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.7-omnipod-0.4-dagger-SNAPSHOT"
+        version "2.6.5-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -137,11 +137,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         // if you change minSdkVersion to less than 11, you need to change executeTask for wear
 
-        // OMNIPOD: Keep track of what commit from the main repository we're on, these fields aren't actually used anywhere
-        buildConfigField "String", "DEV_VERSION", '"2.6.5-dev"'
-        buildConfigField "String", "DEV_VERSION_COMMIT", '"b87155ead499167b3d42a73e3daf808494f10a2d"'
-        buildConfigField "String", "DEV_VERSION_COMMIT_DATE", '"24.4.2020"' // 24th April
-
         ndk {
             moduleName "BleCommandUtil"
         }

From 70e9d3e88ad02c498a8a4f31babed2ba4873da4f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 7 May 2020 23:40:59 +0200
Subject: [PATCH 040/400] fix tests

---
 .../androidaps/activities/StatsActivity.kt    |  3 +-
 .../androidaps/activities/SurveyActivity.kt   |  3 +-
 .../androidaps/dialogs/CarbsDialog.kt         |  4 +-
 .../androidaps/dialogs/CareDialog.kt          |  2 +-
 .../androidaps/dialogs/FillDialog.kt          |  2 +-
 .../androidaps/dialogs/InsulinDialog.kt       |  2 +-
 .../androidaps/dialogs/ProfileSwitchDialog.kt |  2 +-
 .../androidaps/dialogs/ProfileViewerDialog.kt |  3 +-
 .../androidaps/dialogs/TempTargetDialog.kt    |  2 +-
 .../historyBrowser/HistoryBrowseActivity.kt   |  7 ++-
 .../IobCobStaticCalculatorPlugin.kt           |  6 +-
 .../plugins/aps/loop/LoopFragment.kt          | 11 ++--
 .../aps/openAPSAMA/OpenAPSAMAFragment.kt      |  3 +-
 .../aps/openAPSSMB/OpenAPSSMBFragment.kt      |  3 +-
 .../objectives/ObjectivesFragment.kt          |  8 ++-
 .../general/actions/ActionsFragment.kt        |  2 +-
 .../automation/triggers/TriggerTime.kt        |  5 +-
 .../Dialogs/NewNSTreatmentDialog.java         |  2 +-
 .../nsclient/services/NSClientService.java    |  3 +-
 .../general/tidepool/comm/TidepoolUploader.kt |  5 +-
 .../general/tidepool/comm/UploadChunk.kt      | 15 ++---
 .../IobCobCalculatorPlugin.java               | 27 ++++----
 .../iobCobCalculator/IobCobOref1Thread.java   |  5 +-
 .../iob/iobCobCalculator/IobCobThread.java    |  5 +-
 .../profile/local/LocalProfileFragment.kt     | 23 ++++---
 .../pump/common/PumpPluginAbstract.java       | 10 +--
 .../RileyLinkStatusGeneralFragment.java       |  6 +-
 .../RileyLinkStatusHistoryFragment.java       |  3 +-
 .../plugins/pump/common/utils/StringUtil.java |  4 +-
 .../pump/danaR/AbstractDanaRPlugin.java       | 11 ++--
 .../plugins/pump/danaR/DanaRPlugin.java       |  6 +-
 .../danaR/activities/DanaRHistoryActivity.kt  |  3 +-
 .../pump/danaR/comm/MessageHashTableR.kt      | 32 +++++-----
 .../pump/danaR/comm/MsgHistoryAlarm.kt        |  6 +-
 .../plugins/pump/danaR/comm/MsgHistoryAll.kt  |  5 +-
 .../pump/danaR/comm/MsgHistoryBasalHour.kt    |  6 +-
 .../pump/danaR/comm/MsgHistoryBolus.kt        |  6 +-
 .../pump/danaR/comm/MsgHistoryCarbo.kt        |  6 +-
 .../pump/danaR/comm/MsgHistoryDailyInsulin.kt |  6 +-
 .../pump/danaR/comm/MsgHistoryError.kt        |  6 +-
 .../pump/danaR/comm/MsgHistoryGlucose.kt      |  6 +-
 .../plugins/pump/danaR/comm/MsgHistoryNew.kt  |  6 +-
 .../pump/danaR/comm/MsgHistoryRefill.kt       |  6 +-
 .../pump/danaR/comm/MsgHistorySuspend.kt      |  6 +-
 .../pump/danaR/comm/MsgInitConnStatusTime.kt  |  5 +-
 .../plugins/pump/danaR/comm/MsgSetTime.kt     |  3 +-
 .../pump/danaR/comm/MsgSettingPumpTime.kt     |  5 +-
 .../pump/danaR/comm/MsgStatusBolusExtended.kt |  5 +-
 .../AbstractDanaRExecutionService.java        | 19 +++---
 .../danaR/services/DanaRExecutionService.java | 19 +++---
 .../pump/danaRKorean/DanaRKoreanPlugin.java   |  7 ++-
 .../comm/MessageHashTableRKorean.kt           | 22 ++++---
 .../comm/MsgInitConnStatusTime_k.kt           |  5 +-
 .../services/DanaRKoreanExecutionService.java | 13 ++--
 .../plugins/pump/danaRS/DanaRSPlugin.java     | 11 ++--
 .../danaRS/comm/DanaRSMessageHashTable.kt     | 36 +++++------
 .../comm/DanaRS_Packet_APS_History_Events.kt  | 34 +++++-----
 .../DanaRS_Packet_APS_Set_Event_History.kt    |  3 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |  5 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |  5 +-
 ...aRS_Packet_General_Get_More_Information.kt |  5 +-
 ...Packet_General_Get_Shipping_Information.kt |  5 +-
 .../danaRS/comm/DanaRS_Packet_History_.kt     |  7 ++-
 .../comm/DanaRS_Packet_History_Alarm.kt       |  4 +-
 .../comm/DanaRS_Packet_History_All_History.kt |  4 +-
 .../comm/DanaRS_Packet_History_Basal.kt       |  4 +-
 .../DanaRS_Packet_History_Blood_Glucose.kt    |  4 +-
 .../comm/DanaRS_Packet_History_Bolus.kt       |  4 +-
 .../DanaRS_Packet_History_Carbohydrate.kt     |  4 +-
 .../comm/DanaRS_Packet_History_Daily.kt       |  4 +-
 .../comm/DanaRS_Packet_History_Prime.kt       |  4 +-
 .../comm/DanaRS_Packet_History_Refill.kt      |  4 +-
 .../comm/DanaRS_Packet_History_Suspend.kt     |  4 +-
 .../comm/DanaRS_Packet_History_Temporary.kt   |  4 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |  5 +-
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     |  3 +-
 .../pump/danaRS/services/DanaRSService.java   | 46 +++++++-------
 .../plugins/pump/danaRv2/DanaRv2Plugin.java   |  5 +-
 .../pump/danaRv2/comm/MessageHashTableRv2.kt  | 28 ++++-----
 .../pump/danaRv2/comm/MsgHistoryEvents_v2.kt  | 30 ++++-----
 .../danaRv2/comm/MsgStatusTempBasal_v2.kt     |  6 +-
 .../services/DanaRv2ExecutionService.java     | 22 +++----
 .../pump/insight/LocalInsightPlugin.java      |  9 ++-
 .../pump/medtronic/MedtronicPumpPlugin.java   |  6 +-
 .../RileyLinkStatusDeviceMedtronic.java       |  4 +-
 .../pump/omnipod/OmnipodPumpPlugin.java       | 13 ++--
 .../omnipod/defs/state/PodSessionState.java   |  3 +-
 .../plugins/pump/virtual/VirtualPumpPlugin.kt |  7 ++-
 .../sensitivity/SensitivityAAPSPlugin.java    | 18 +++---
 .../sensitivity/SensitivityOref1Plugin.java   | 13 ++--
 .../SensitivityWeightedAveragePlugin.java     | 23 +++----
 .../plugins/source/BGSourceFragment.kt        | 10 +--
 .../plugins/source/EversensePlugin.kt         |  7 ++-
 .../plugins/source/NSClientSourcePlugin.kt    |  2 +-
 .../plugins/treatments/TreatmentsPlugin.java  | 11 ++--
 .../fragments/TreatmentsBolusFragment.kt      |  5 +-
 .../fragments/TreatmentsCareportalFragment.kt |  5 +-
 .../TreatmentsExtendedBolusesFragment.kt      |  8 +--
 .../TreatmentsProfileSwitchFragment.kt        |  9 +--
 .../TreatmentsTempTargetFragment.java         |  6 +-
 .../TreatmentsTemporaryBasalsFragment.kt      |  9 +--
 .../queue/commands/CommandSMBBolus.kt         |  3 +-
 .../androidaps/receivers/KeepAliveReceiver.kt |  3 +-
 .../androidaps/utils/LocalAlertUtils.kt       |  5 +-
 .../androidaps/utils/SntpClient.java          | 63 ++++++++++++-------
 .../androidaps/utils/TimeListEdit.java        | 26 +++++---
 .../androidaps/utils/stats/TddCalculator.kt   | 11 ++--
 .../androidaps/TestBaseWithProfile.kt         |  4 ++
 .../nightscout/androidaps/db/BgReadingTest.kt | 56 ++++++++---------
 .../interfaces/ConstraintsCheckerTest.kt      | 13 ++--
 .../objectives/ObjectivesPluginTest.kt        |  4 +-
 .../constraints/safety/SafetyPluginTest.kt    |  3 +-
 .../automation/triggers/TriggerBgTest.kt      |  2 +-
 .../automation/triggers/TriggerDeltaTest.kt   | 16 ++---
 .../automation/triggers/TriggerTestBase.kt    | 13 ++++
 .../maintenance/MaintenancePluginTest.kt      |  4 +-
 .../SmsCommunicatorPluginTest.kt              | 10 ++-
 .../GlucoseStatusTest.kt                      | 38 ++++++-----
 .../IobCobCalculatorPluginTest.kt             |  4 +-
 .../plugins/pump/danaR/DanaRPluginTest.kt     |  2 +-
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  |  2 +
 .../pump/danaR/comm/MessageHashTableRTest.kt  |  2 +-
 .../pump/danaR/comm/MsgHistoryAlarmTest.kt    |  2 +-
 .../pump/danaR/comm/MsgHistoryAllTest.kt      |  2 +-
 .../danaR/comm/MsgHistoryBasalHourTest.kt     |  2 +-
 .../pump/danaR/comm/MsgHistoryBolusTest.kt    |  2 +-
 .../pump/danaR/comm/MsgHistoryCarboTest.kt    |  2 +-
 .../danaR/comm/MsgHistoryDailyInsulinTest.kt  |  2 +-
 .../pump/danaR/comm/MsgHistoryErrorTest.kt    |  2 +-
 .../pump/danaR/comm/MsgHistoryGlucoseTest.kt  |  2 +-
 .../pump/danaR/comm/MsgHistoryNewTest.kt      |  2 +-
 .../pump/danaR/comm/MsgHistoryRefillTest.kt   |  2 +-
 .../pump/danaR/comm/MsgHistorySuspendTest.kt  |  2 +-
 .../danaR/comm/MsgInitConnStatusTimeTest.kt   |  2 +-
 .../plugins/pump/danaR/comm/MsgSetTimeTest.kt |  2 +-
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |  2 +-
 .../danaR/comm/MsgStatusBolusExtendedTest.kt  |  2 +-
 .../pump/danaRKorean/DanaRKoreanPluginTest.kt |  2 +-
 .../comm/MessageHashTableRKoreanTest.kt       |  2 +-
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |  2 +-
 .../danaRS/comm/DanaRSMessageHashTableTest.kt |  7 ++-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |  4 +-
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |  8 +--
 ...ket_Basal_Get_Temporary_Basal_StateTest.kt |  2 +-
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt |  2 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |  2 +-
 ...Packet_General_Get_More_InformationTest.kt |  4 +-
 ...et_General_Get_Shipping_InformationTest.kt |  4 +-
 .../comm/DanaRS_Packet_History_AlarmTest.kt   |  2 +-
 .../DanaRS_Packet_History_All_HistoryTest.kt  |  2 +-
 .../comm/DanaRS_Packet_History_BasalTest.kt   |  2 +-
 ...DanaRS_Packet_History_Blood_GlucoseTest.kt |  2 +-
 .../comm/DanaRS_Packet_History_BolusTest.kt   |  2 +-
 .../DanaRS_Packet_History_CarbohydrateTest.kt |  2 +-
 .../comm/DanaRS_Packet_History_DailyTest.kt   |  2 +-
 .../comm/DanaRS_Packet_History_PrimeTest.kt   |  2 +-
 .../comm/DanaRS_Packet_History_RefillTest.kt  |  2 +-
 .../comm/DanaRS_Packet_History_SuspendTest.kt |  2 +-
 .../DanaRS_Packet_History_TemporaryTest.kt    |  2 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |  2 +-
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt |  2 +-
 .../DanaRS_Packet_Option_Set_Pump_TimeTest.kt |  2 +-
 .../plugins/pump/danaRv2/DanaRv2PluginTest.kt |  2 +-
 .../danaRv2/comm/MessageHashTable_rv2Test.kt  |  5 +-
 .../danaRv2/comm/MsgHistoryEvents_v2Test.kt   |  5 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2Test.kt |  2 +-
 .../pump/virtual/VirtualPumpPluginUTest.kt    |  5 +-
 .../AbstractSensitivityPluginTest.kt          |  3 +-
 .../treatments/TreatmentsPluginTest.kt        |  2 +-
 .../androidaps/queue/CommandQueueTest.kt      |  3 +-
 .../androidaps/utils/DateUtilTest.kt          | 22 ++++---
 .../androidaps/utils/SntpClientTest.java      | 28 ---------
 .../androidaps/utils/SntpClientTest.kt        | 29 +++++++++
 .../nightscout/androidaps/db/BgReading.java   |  6 +-
 .../androidaps/db/CareportalEvent.java        |  5 +-
 .../androidaps/db/ExtendedBolus.java          |  2 +-
 .../androidaps/db/ProfileSwitch.java          | 13 ++--
 .../info/nightscout/androidaps/db/TDD.java    |  5 +-
 .../nightscout/androidaps/db/TempTarget.java  |  4 +-
 .../androidaps/db/TemporaryBasal.java         |  2 +-
 .../nightscout/androidaps/db/Treatment.java   |  3 +-
 .../iobCobCalculator/data/AutosensData.java   | 11 ++--
 .../nightscout/androidaps/utils/DateUtil.java | 29 +++------
 183 files changed, 814 insertions(+), 617 deletions(-)
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
index d53f06e67c..ca26266f8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
@@ -16,13 +16,12 @@ class StatsActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var tirCalculator: TirCalculator
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activityMonitor: ActivityMonitor
-    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_stats)
 
-        stats_tdds.text = tddCalculator.stats(dateUtil)
+        stats_tdds.text = tddCalculator.stats()
         stats_tir.text = tirCalculator.stats()
         stats_activity.text = activityMonitor.stats()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index 8797bcfe70..ff3e361a9b 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -31,7 +31,6 @@ class SurveyActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var activityMonitor: ActivityMonitor
     @Inject lateinit var defaultProfile: DefaultProfile
-    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -43,7 +42,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
         val profileList = profileStore?.getProfileList() ?: return
         survey_spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, profileList)
 
-        survey_tdds.text = tddCalculator.stats(dateUtil)
+        survey_tdds.text = tddCalculator.stats()
         survey_tir.text = tirCalculator.stats()
         survey_activity.text = activityMonitor.stats()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index 73effb19d8..28abd8eb60 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -170,7 +170,7 @@ class CarbsDialog : DialogFragmentWithDate() {
         eventTime -= eventTime % 1000
         val time = eventTime + timeOffset * 1000 * 60
         if (timeOffset != 0)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
         val duration = overview_carbs_duration.value.toInt()
         if (duration > 0)
             actions.add(resourceHelper.gs(R.string.duration) + ": " + duration + resourceHelper.gs(R.string.shorthour))
@@ -184,7 +184,7 @@ class CarbsDialog : DialogFragmentWithDate() {
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
 
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         if (carbsAfterConstraints > 0 || activitySelected || eatingSoonSelected || hypoSelected) {
             activity?.let { activity ->
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 8a07e111b9..1eda2e060e 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -167,7 +167,7 @@ class CareDialog : DialogFragmentWithDate() {
         eventTime -= eventTime % 1000
 
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         json.put("created_at", DateUtil.toISOString(eventTime))
         json.put("mills", eventTime)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index 135eeb0e09..1300ee1612 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -112,7 +112,7 @@ class FillDialog : DialogFragmentWithDate() {
         eventTime -= eventTime % 1000
 
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         if (insulinAfterConstraints > 0 || fill_catheter_change.isChecked || fill_cartridge_change.isChecked) {
             activity?.let { activity ->
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index e4fa54e2f3..f06f563874 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -145,7 +145,7 @@ class InsulinDialog : DialogFragmentWithDate() {
         val timeOffset = overview_insulin_time.value.toInt()
         val time = DateUtil.now() + T.mins(timeOffset.toLong()).msecs()
         if (timeOffset != 0)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(time))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(time))
 
         val notes = notes.text.toString()
         if (notes.isNotEmpty())
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 10be190380..72daeb1ad1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -98,7 +98,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
         if (notes.isNotEmpty())
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes)
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 382e6359a5..9536da6928 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -23,6 +23,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var dateUtil: DateUtil
 
     private var time: Long = 0
 
@@ -67,7 +68,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             Mode.RUNNING_PROFILE -> {
                 profile = treatmentsPlugin.getProfileSwitchFromHistory(time)?.profileObject
                 profileName = treatmentsPlugin.getProfileSwitchFromHistory(time)?.customizedName
-                date = DateUtil.dateAndTimeString(treatmentsPlugin.getProfileSwitchFromHistory(time)?.date
+                date = dateUtil.dateAndTimeString(treatmentsPlugin.getProfileSwitchFromHistory(time)?.date
                     ?: 0)
                 profileview_datelayout.visibility = View.VISIBLE
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index 95ca3c0723..d2e9c0454f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -129,7 +129,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
             actions.add(resourceHelper.gs(R.string.stoptemptarget))
         }
         if (eventTimeChanged)
-            actions.add(resourceHelper.gs(R.string.time) + ": " + DateUtil.dateAndTimeString(eventTime))
+            actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index ab8cae8666..f59a38d770 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -54,6 +54,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var overviewMenus: OverviewMenus
+    @Inject lateinit var dateUtil: DateUtil
 
     private val disposable = CompositeDisposable()
 
@@ -117,7 +118,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             cal.set(Calendar.MONTH, monthOfYear)
             cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
             start = cal.timeInMillis
-            historybrowse_date?.text = DateUtil.dateAndTimeString(start)
+            historybrowse_date?.text = dateUtil.dateAndTimeString(start)
             updateGUI("onClickDate")
             runCalculation("onClickDate")
         }
@@ -236,7 +237,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         val lowLine = defaultValueHelper.determineLowLine()
         val highLine = defaultValueHelper.determineHighLine()
-        historybrowse_date?.text = DateUtil.dateAndTimeString(start)
+        historybrowse_date?.text = dateUtil.dateAndTimeString(start)
         historybrowse_zoom?.text = rangeToDisplay.toString()
 
         GlobalScope.launch(Dispatchers.Main) {
@@ -248,7 +249,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             withContext(Dispatchers.Default) {
                 val fromTime: Long = start + T.secs(100).msecs()
                 val toTime: Long = start + T.hours(rangeToDisplay.toLong()).msecs()
-                aapsLogger.debug(LTag.UI, "Period: " + DateUtil.dateAndTimeString(fromTime) + " - " + DateUtil.dateAndTimeString(toTime))
+                aapsLogger.debug(LTag.UI, "Period: " + dateUtil.dateAndTimeString(fromTime) + " - " + dateUtil.dateAndTimeString(toTime))
                 val pointer = System.currentTimeMillis()
 
                 // **** In range Area ****
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
index 8334ce9567..4a81820fd7 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -27,9 +28,10 @@ class IobCobStaticCalculatorPlugin @Inject constructor(
     sensitivityOref1Plugin: SensitivityOref1Plugin,
     sensitivityAAPSPlugin: SensitivityAAPSPlugin,
     sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin,
-    fabricPrivacy: FabricPrivacy
+    fabricPrivacy: FabricPrivacy,
+    dateUtil: DateUtil
 ) : IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction,
-    activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy) {
+    activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil) {
 
     override fun onStart() { // do not attach to rxbus
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
index 8463e8f133..4092f1d602 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt
@@ -29,6 +29,7 @@ class LoopFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var loopPlugin: LoopPlugin
+    @Inject lateinit var dateUtil: DateUtil
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -81,12 +82,12 @@ class LoopFragment : DaggerFragment() {
             loop_request?.text = it.request?.toSpanned() ?: ""
             loop_constraintsprocessed?.text = it.constraintsProcessed?.toSpanned() ?: ""
             loop_source?.text = it.source ?: ""
-            loop_lastrun?.text = DateUtil.dateAndTimeString(it.lastAPSRun)
+            loop_lastrun?.text = dateUtil.dateAndTimeString(it.lastAPSRun)
                 ?: ""
-            loop_smbrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBRequest)
-            loop_smbexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastSMBEnact)
-            loop_tbrrequest_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBRRequest)
-            loop_tbrexecution_time?.text = DateUtil.dateAndTimeAndSecondsString(it.lastTBREnact)
+            loop_smbrequest_time?.text = dateUtil.dateAndTimeAndSecondsString(it.lastSMBRequest)
+            loop_smbexecution_time?.text = dateUtil.dateAndTimeAndSecondsString(it.lastSMBEnact)
+            loop_tbrrequest_time?.text = dateUtil.dateAndTimeAndSecondsString(it.lastTBRRequest)
+            loop_tbrexecution_time?.text = dateUtil.dateAndTimeAndSecondsString(it.lastTBREnact)
 
             loop_tbrsetbypump?.text = it.tbrSetByPump?.let { tbrSetByPump -> HtmlHelper.fromHtml(tbrSetByPump.toHtml()) }
                 ?: ""
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
index 342a1395f5..fcd78a9adc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt
@@ -32,6 +32,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -96,7 +97,7 @@ class OpenAPSAMAFragment : DaggerFragment() {
             openapsma_scriptdebugdata.text = determineBasalAdapterAMAJS.scriptDebug
         }
         if (openAPSAMAPlugin.lastAPSRun != 0L) {
-            openapsma_lastrun.text = DateUtil.dateAndTimeString(openAPSAMAPlugin.lastAPSRun)
+            openapsma_lastrun.text = dateUtil.dateAndTimeString(openAPSAMAPlugin.lastAPSRun)
         }
         openAPSAMAPlugin.lastAutosensResult?.let {
             openapsma_autosensdata.text = JSONFormatter.format(it.json())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
index 95b0f7f7b8..c16a432370 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt
@@ -33,6 +33,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -99,7 +100,7 @@ class OpenAPSSMBFragment : DaggerFragment() {
             }
         }
         if (openAPSSMBPlugin.lastAPSRun != 0L) {
-            openapsma_lastrun.text = DateUtil.dateAndTimeString(openAPSSMBPlugin.lastAPSRun)
+            openapsma_lastrun.text = dateUtil.dateAndTimeString(openAPSSMBPlugin.lastAPSRun)
         }
         openAPSSMBPlugin.lastAutosensResult?.let {
             openapsma_autosensdata.text = JSONFormatter.format(it.json())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index 5fe20f2968..1e01d814f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -49,6 +49,8 @@ class ObjectivesFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var objectivesPlugin: ObjectivesPlugin
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var sntpClient: SntpClient
 
     private val objectivesAdapter = ObjectivesAdapter()
     private val handler = Handler(Looper.getMainLooper())
@@ -221,7 +223,7 @@ class ObjectivesFragment : DaggerFragment() {
                     holder.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2)
                 }
             }
-            holder.accomplished.text = resourceHelper.gs(R.string.accomplished, DateUtil.dateAndTimeString(objective.accomplishedOn))
+            holder.accomplished.text = resourceHelper.gs(R.string.accomplished, dateUtil.dateAndTimeString(objective.accomplishedOn))
             holder.accomplished.setTextColor(-0x3e3e3f)
             holder.verify.setOnClickListener {
                 receiverStatusStore.updateNetworkStatus()
@@ -236,7 +238,7 @@ class ObjectivesFragment : DaggerFragment() {
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
                         rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
-                        SntpClient.ntpTime(object : SntpClient.Callback() {
+                        sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
                                 aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
                                 SystemClock.sleep(300)
@@ -275,7 +277,7 @@ class ObjectivesFragment : DaggerFragment() {
                     Thread {
                         NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck")
                         rxBus.send(EventNtpStatus(resourceHelper.gs(R.string.timedetection), 0))
-                        SntpClient.ntpTime(object : SntpClient.Callback() {
+                        sntpClient.ntpTime(object : SntpClient.Callback() {
                             override fun run() {
                                 aapsLogger.debug("NTP time: $time System time: ${DateUtil.now()}")
                                 SystemClock.sleep(300)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index e6077e6e26..f14f7732dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -248,7 +248,7 @@ class ActionsFragment : DaggerFragment() {
 
     private fun checkPumpCustomActions() {
         val activePump = activePlugin.activePump
-        val customActions = activePump.customActions
+        val customActions = activePump.customActions ?: return
         removePumpCustomActions()
 
         for (customAction in customActions) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
index 4726eb5e95..6641286484 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
@@ -12,8 +12,11 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.JsonHelper
 import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
+import javax.inject.Inject
 
 class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
+    @Inject lateinit var dateUtil: DateUtil
+
     var time = InputDateTime(injector)
 
     constructor(injector: HasAndroidInjector, runAt: Long) : this(injector) {
@@ -57,7 +60,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyName(): Int = R.string.time
 
     override fun friendlyDescription(): String =
-        resourceHelper.gs(R.string.atspecifiedtime, DateUtil.dateAndTimeString(time.value))
+        resourceHelper.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value))
 
     override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 8cbb16a8dc..8fe577ced3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -699,7 +699,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
         if (data.has("created_at")) {
             ret += resourceHelper.gs(R.string.event_time_label);
             ret += ": ";
-            ret += DateUtil.dateAndTimeString(eventTime);
+            ret += dateUtil.dateAndTimeString(eventTime);
             ret += "\n";
         }
         if (data.has("enteredBy")) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 54de04db85..3187ccc924 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -90,6 +90,7 @@ public class NSClientService extends DaggerService {
     @Inject NSClientPlugin nsClientPlugin;
     @Inject BuildHelper buildHelper;
     @Inject Config config;
+    @Inject DateUtil dateUtil;
 
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -721,7 +722,7 @@ public class NSClientService extends DaggerService {
                             }
                             handleNewSgv(sgvs, isDelta);
                         }
-                        rxBus.send(new EventNSClientNewLog("LAST", DateUtil.dateAndTimeString(latestDateInReceivedData)));
+                        rxBus.send(new EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)));
                     } catch (JSONException e) {
                         log.error("Unhandled exception", e);
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
index 6c120fc576..faaa1b40d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/TidepoolUploader.kt
@@ -38,7 +38,8 @@ class TidepoolUploader @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val sp: SP,
     private val uploadChunk: UploadChunk,
-    private val activePlugin: ActivePluginProvider
+    private val activePlugin: ActivePluginProvider,
+    private val dateUtil: DateUtil
 ) {
 
     private var wl: PowerManager.WakeLock? = null
@@ -233,7 +234,7 @@ class TidepoolUploader @Inject constructor(
     private fun uploadNext() {
         if (uploadChunk.getLastEnd() < DateUtil.now() - T.mins(1).msecs()) {
             SystemClock.sleep(3000)
-            aapsLogger.debug(LTag.TIDEPOOL, "Restarting doUpload. Last: " + DateUtil.dateAndTimeString(uploadChunk.getLastEnd()))
+            aapsLogger.debug(LTag.TIDEPOOL, "Restarting doUpload. Last: " + dateUtil.dateAndTimeString(uploadChunk.getLastEnd()))
             doUpload()
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
index 8ad1bdd0bc..4062f27bd0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/UploadChunk.kt
@@ -29,7 +29,8 @@ class UploadChunk @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val profileFunction: ProfileFunction,
     private val treatmentsPlugin: TreatmentsPlugin,
-    private val activePlugin: ActivePluginProvider
+    private val activePlugin: ActivePluginProvider,
+    private val dateUtil: DateUtil
 ) {
 
     private val MAX_UPLOAD_SIZE = T.days(7).msecs() // don't change this
@@ -51,9 +52,9 @@ class UploadChunk @Inject constructor(
 
     operator fun get(start: Long, end: Long): String {
 
-        aapsLogger.debug(LTag.TIDEPOOL, "Syncing data between: " + DateUtil.dateAndTimeString(start) + " -> " + DateUtil.dateAndTimeString(end))
+        aapsLogger.debug(LTag.TIDEPOOL, "Syncing data between: " + dateUtil.dateAndTimeString(start) + " -> " + dateUtil.dateAndTimeString(end))
         if (end <= start) {
-            aapsLogger.debug(LTag.TIDEPOOL, "End is <= start: " + DateUtil.dateAndTimeString(start) + " " + DateUtil.dateAndTimeString(end))
+            aapsLogger.debug(LTag.TIDEPOOL, "End is <= start: " + dateUtil.dateAndTimeString(start) + " " + dateUtil.dateAndTimeString(end))
             return ""
         }
         if (end - start > MAX_UPLOAD_SIZE) {
@@ -85,11 +86,11 @@ class UploadChunk @Inject constructor(
     fun setLastEnd(time: Long) {
         if (time > getLastEnd()) {
             sp.putLong(R.string.key_tidepool_last_end, time)
-            val friendlyEnd = DateUtil.dateAndTimeString(time)
+            val friendlyEnd = dateUtil.dateAndTimeString(time)
             rxBus.send(EventTidepoolStatus(("Marking uploaded data up to $friendlyEnd")))
-            aapsLogger.debug(LTag.TIDEPOOL, "Updating last end to: " + DateUtil.dateAndTimeString(time))
+            aapsLogger.debug(LTag.TIDEPOOL, "Updating last end to: " + dateUtil.dateAndTimeString(time))
         } else {
-            aapsLogger.debug(LTag.TIDEPOOL, "Cannot set last end to: " + DateUtil.dateAndTimeString(time) + " vs " + DateUtil.dateAndTimeString(getLastEnd()))
+            aapsLogger.debug(LTag.TIDEPOOL, "Cannot set last end to: " + dateUtil.dateAndTimeString(time) + " vs " + dateUtil.dateAndTimeString(getLastEnd()))
         }
     }
 
@@ -129,7 +130,7 @@ class UploadChunk @Inject constructor(
 
     }
 
-    internal fun getBgReadings(start: Long, end: Long): List<SensorGlucoseElement> {
+    private fun getBgReadings(start: Long, end: Long): List<SensorGlucoseElement> {
         val readings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, end, true)
         val selection = SensorGlucoseElement.fromBgReadings(readings)
         if (selection.isNotEmpty())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index fe5ac90449..c38c286122 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -69,6 +69,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     private final SensitivityAAPSPlugin sensitivityAAPSPlugin;
     private final SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
     private final FabricPrivacy fabricPrivacy;
+    private final DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -98,7 +99,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             SensitivityOref1Plugin sensitivityOref1Plugin,
             SensitivityAAPSPlugin sensitivityAAPSPlugin,
             SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin,
-            FabricPrivacy fabricPrivacy
+            FabricPrivacy fabricPrivacy,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.GENERAL)
@@ -119,6 +121,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         this.sensitivityAAPSPlugin = sensitivityAAPSPlugin;
         this.sensitivityWeightedAveragePlugin = sensitivityWeightedAveragePlugin;
         this.fabricPrivacy = fabricPrivacy;
+        this.dateUtil = dateUtil;
     }
 
     @Override
@@ -247,10 +250,10 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             // if close to now expect there can be some readings with time in close future (caused by wrong time setting)
             // so read all records
             bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, false);
-            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start));
+            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + dateUtil.dateAndTimeString(start));
         } else {
             bgReadings = MainApp.getDbHelper().getBgreadingsDataFromTime(start, to, false);
-            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + DateUtil.dateAndTimeString(start) + " End date: " + DateUtil.dateAndTimeString(to));
+            getAapsLogger().debug(LTag.AUTOSENS, "BG data loaded. Size: " + bgReadings.size() + " Start date: " + dateUtil.dateAndTimeString(start) + " End date: " + dateUtil.dateAndTimeString(to));
         }
     }
 
@@ -440,7 +443,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         if (limitDataToOldestAvailable) {
             getBGDataFrom = Math.max(oldestDataAvailable, (long) (from - T.hours(1).msecs() * (24 + dia)));
             if (getBGDataFrom == oldestDataAvailable)
-                getAapsLogger().debug(LTag.AUTOSENS, "Limiting data to oldest available temps: " + DateUtil.dateAndTimeString(oldestDataAvailable));
+                getAapsLogger().debug(LTag.AUTOSENS, "Limiting data to oldest available temps: " + dateUtil.dateAndTimeString(oldestDataAvailable));
         } else
             getBGDataFrom = (long) (from - T.hours(1).msecs() * (24 + dia));
         return getBGDataFrom;
@@ -675,7 +678,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             return null;
         }
         if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
-            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + DateUtil.dateAndTimeString(data.time));
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + dateUtil.dateAndTimeString(data.time));
             return null;
         } else {
             getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA (" + reason + ") " + data.toString());
@@ -686,7 +689,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     @Override
     public String lastDataTime() {
         if (autosensDataTable.size() > 0)
-            return DateUtil.dateAndTimeString(autosensDataTable.valueAt(autosensDataTable.size() - 1).time);
+            return dateUtil.dateAndTimeString(autosensDataTable.valueAt(autosensDataTable.size() - 1).time);
         else
             return "autosensDataTable empty";
     }
@@ -808,7 +811,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     }
 
     public void runCalculation(String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
-        getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + DateUtil.dateAndTimeString(end));
+        getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + dateUtil.dateAndTimeString(end));
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
             if (sensitivityOref1Plugin.isEnabled())
                 thread = new IobCobOref1Thread(injector, from, end, bgDataReload, limitDataToOldestAvailable, cause);
@@ -825,10 +828,10 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         synchronized (dataLock) {
             // clear up 5 min back for proper COB calculation
             long time = ev.getTime() - 5 * 60 * 1000L;
-            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data to: " + DateUtil.dateAndTimeString(time));
+            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data to: " + dateUtil.dateAndTimeString(time));
             for (int index = iobTable.size() - 1; index >= 0; index--) {
                 if (iobTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from iobTable: " + DateUtil.dateAndTimeString(iobTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from iobTable: " + dateUtil.dateAndTimeString(iobTable.keyAt(index)));
                     iobTable.removeAt(index);
                 } else {
                     break;
@@ -836,7 +839,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = absIobTable.size() - 1; index >= 0; index--) {
                 if (absIobTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from absIobTable: " + DateUtil.dateAndTimeString(absIobTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from absIobTable: " + dateUtil.dateAndTimeString(absIobTable.keyAt(index)));
                     absIobTable.removeAt(index);
                 } else {
                     break;
@@ -844,7 +847,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = autosensDataTable.size() - 1; index >= 0; index--) {
                 if (autosensDataTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + DateUtil.dateAndTimeString(autosensDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + dateUtil.dateAndTimeString(autosensDataTable.keyAt(index)));
                     autosensDataTable.removeAt(index);
                 } else {
                     break;
@@ -852,7 +855,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = basalDataTable.size() - 1; index >= 0; index--) {
                 if (basalDataTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from basalDataTable: " + DateUtil.dateAndTimeString(basalDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from basalDataTable: " + dateUtil.dateAndTimeString(basalDataTable.keyAt(index)));
                     basalDataTable.removeAt(index);
                 } else {
                     break;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index b1762e3722..457b16716a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -68,6 +68,7 @@ public class IobCobOref1Thread extends Thread {
     @Inject BuildHelper buildHelper;
     @Inject Profiler profiler;
     @Inject FabricPrivacy fabricPrivacy;
+    @Inject DateUtil dateUtil;
 
     private final HasAndroidInjector injector;
     private boolean bgDataReload;
@@ -122,7 +123,7 @@ public class IobCobOref1Thread extends Thread {
                 }
 
                 long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + DateUtil.dateAndTimeString(prevDataTime));
+                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + dateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
                 for (int i = bucketed_data.size() - 4; i >= 0; i--) {
@@ -378,7 +379,7 @@ public class IobCobOref1Thread extends Thread {
                     previous = autosensData;
                     if (bgTime < now())
                         autosensDataTable.put(bgTime, autosensData);
-                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
+                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + dateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + dateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
                     AutosensResult sensitivity = iobCobCalculatorPlugin.detectSensitivityWithLock(oldestTimeWithData, bgTime);
                     aapsLogger.debug(LTag.AUTOSENS, "Sensitivity result: " + sensitivity.toString());
                     autosensData.autosensResult = sensitivity;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index d9ceb47dfc..84a02005e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -65,6 +65,7 @@ public class IobCobThread extends Thread {
     @Inject BuildHelper buildHelper;
     @Inject Profiler profiler;
     @Inject FabricPrivacy fabricPrivacy;
+    @Inject DateUtil dateUtil;
 
     private final HasAndroidInjector injector;
     private boolean bgDataReload;
@@ -119,7 +120,7 @@ public class IobCobThread extends Thread {
                 }
 
                 long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
-                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + DateUtil.dateAndTimeString(prevDataTime));
+                aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + dateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
                 for (int i = bucketed_data.size() - 4; i >= 0; i--) {
@@ -302,7 +303,7 @@ public class IobCobThread extends Thread {
                     previous = autosensData;
                     if (bgTime < now())
                         autosensDataTable.put(bgTime, autosensData);
-                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + DateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + DateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
+                    aapsLogger.debug(LTag.AUTOSENS, "Running detectSensitivity from: " + dateUtil.dateAndTimeString(oldestTimeWithData) + " to: " + dateUtil.dateAndTimeString(bgTime) + " lastDataTime:" + iobCobCalculatorPlugin.lastDataTime());
                     AutosensResult sensitivity = iobCobCalculatorPlugin.detectSensitivityWithLock(oldestTimeWithData, bgTime);
                     aapsLogger.debug(LTag.AUTOSENS, "Sensitivity result: " + sensitivity.toString());
                     autosensData.autosensResult = sensitivity;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index f26bacf8ec..ef64d4a690 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.dialogs.ProfileSwitchDialog
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefBasePlugin.Companion.MIN_DIA
 import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
@@ -28,12 +29,14 @@ import java.text.DecimalFormat
 import javax.inject.Inject
 
 class LocalProfileFragment : DaggerFragment() {
+    @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var hardLimits: HardLimits
+    @Inject lateinit var dateUtil: DateUtil
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -103,14 +106,14 @@ class LocalProfileFragment : DaggerFragment() {
         localprofile_name.addTextChangedListener(textWatch)
         localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, hardLimits.MINDIA, hardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
         localprofile_dia.tag = "LP_DIA"
-        TimeListEdit(context, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
         } else {
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
         }
 
         // Spinner
@@ -187,10 +190,10 @@ class LocalProfileFragment : DaggerFragment() {
             localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
             localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
             localprofile_dia.tag = "LP_DIA"
-            TimeListEdit(context, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
-            basalView = TimeListEdit(context, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
-            TimeListEdit(context, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
+            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
             updateGUI()
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index f4dd6a48df..0bb38acb76 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -65,6 +65,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
     protected ResourceHelper resourceHelper;
     protected CommandQueueProvider commandQueue;
     protected SP sp;
+    protected DateUtil dateUtil;
 
     /*
         protected static final PumpEnactResult OPERATION_NOT_SUPPORTED = new PumpEnactResult().success(false)
@@ -92,7 +93,8 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
             ActivePluginProvider activePlugin,
             SP sp,
             Context context,
-            FabricPrivacy fabricPrivacy
+            FabricPrivacy fabricPrivacy,
+            DateUtil dateUtil
     ) {
 
         super(pluginDescription, injector, aapsLogger, resourceHelper, commandQueue);
@@ -107,7 +109,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
 
         pumpDescription.setPumpDescription(pumpType);
         this.pumpType = pumpType;
-
+        this.dateUtil = dateUtil;
     }
 
 
@@ -345,14 +347,14 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate",
                         tb.tempBasalConvertedToAbsolute(System.currentTimeMillis(), profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
 
             ExtendedBolus eb = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(System.currentTimeMillis());
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date));
                 extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index 623ecae9ef..bec19c7d1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -32,6 +32,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
@@ -45,6 +46,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
     @Inject MedtronicUtil medtronicUtil;
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
+    @Inject DateUtil dateUtil;
 
     TextView connectionStatus;
     TextView configuredAddress;
@@ -148,7 +150,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
                         rileyLinkServiceData.lastGoodFrequency));
 
             if (medtronicPumpStatus.lastConnection != 0)
-                this.lastDeviceContact.setText(StringUtil.toDateTimeString(new LocalDateTime(
+                this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(
                         medtronicPumpStatus.lastDataTime)));
             else
                 this.lastDeviceContact.setText(resourceHelper.gs(R.string.common_never));
@@ -182,7 +184,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
                                 rileyLinkServiceData.lastGoodFrequency));
 
                     if (omnipodPumpStatus.lastConnection != 0)
-                        this.lastDeviceContact.setText(StringUtil.toDateTimeString(new LocalDateTime(
+                        this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(
                                 omnipodPumpStatus.lastDataTime)));
                     else
                         this.lastDeviceContact.setText(resourceHelper.gs(R.string.common_never));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
index f8f79c821a..8a3ff18207 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
@@ -34,6 +34,7 @@ public class RileyLinkStatusHistoryFragment extends DaggerFragment implements Re
 
     @Inject RileyLinkUtil rileyLinkUtil;
     @Inject ResourceHelper resourceHelper;
+    @Inject DateUtil dateUtil;
 
     RecyclerView recyclerView;
     RecyclerViewAdapter recyclerViewAdapter;
@@ -136,7 +137,7 @@ public class RileyLinkStatusHistoryFragment extends DaggerFragment implements Re
             RLHistoryItem item = historyList.get(position);
 
             if (item != null) {
-                holder.timeView.setText(DateUtil.dateAndTimeAndSecondsString(item.getDateTime().toDateTime().getMillis()));
+                holder.timeView.setText(dateUtil.dateAndTimeAndSecondsString(item.getDateTime().toDateTime().getMillis()));
                 holder.typeView.setText(item.getSource().getDesc());
                 holder.valueView.setText(item.getDescription(resourceHelper));
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
index f7d86e5774..cc9533e669 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
@@ -84,8 +84,8 @@ public class StringUtil {
     }
 
 
-    public static String toDateTimeString(LocalDateTime localDateTime) {
-        return DateUtil.dateAndTimeAndSecondsString(localDateTime.toDateTime().getMillis());
+    public static String toDateTimeString(DateUtil dateUtil, LocalDateTime localDateTime) {
+        return dateUtil.dateAndTimeAndSecondsString(localDateTime.toDateTime().getMillis());
         //return localDateTime.toString("dd.MM.yyyy HH:mm:ss");
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 4fe2815bdc..50a94b0ca9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -59,6 +59,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected RxBusWrapper rxBus;
     protected TreatmentsPlugin treatmentsPlugin;
     protected SP sp;
+    protected DateUtil dateUtil;
 
     protected AbstractDanaRPlugin(
             HasAndroidInjector injector,
@@ -69,7 +70,8 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             CommandQueueProvider commandQueue,
             RxBusWrapper rxBus,
             TreatmentsPlugin treatmentsPlugin,
-            SP sp
+            SP sp,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.PUMP)
@@ -85,6 +87,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         this.rxBus = rxBus;
         this.treatmentsPlugin = treatmentsPlugin;
         this.sp = sp;
+        this.dateUtil = dateUtil;
     }
 
     @Override
@@ -349,19 +352,19 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
             if (pump.getLastBolusTime() != 0) {
-                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.getLastBolusTime()));
+                extended.put("LastBolus", dateUtil.dateAndTimeString(pump.getLastBolusTime()));
                 extended.put("LastBolusAmount", pump.getLastBolusAmount());
             }
             TemporaryBasal tb = treatmentsPlugin.getRealTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
             ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date));
                 extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
             }
             extended.put("BaseBasalRate", getBaseBasalRate());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index 95fdc80829..e1f06d4017 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -31,6 +31,7 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -58,9 +59,10 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             TreatmentsPlugin treatmentsPlugin,
             SP sp,
             CommandQueueProvider commandQueue,
-            DanaRPump danaRPump
+            DanaRPump danaRPump,
+            DateUtil dateUtil
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index 288e10ef9d..18ffab8460 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -47,6 +47,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var dateUtil: DateUtil
 
     private val disposable = CompositeDisposable()
 
@@ -143,7 +144,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
 
         override fun onBindViewHolder(holder: HistoryViewHolder, position: Int) {
             val record = historyList[position]
-            holder.time.text = DateUtil.dateAndTimeString(record.recordDate)
+            holder.time.text = dateUtil.dateAndTimeString(record.recordDate)
             holder.value.text = DecimalFormatter.to2Decimal(record.recordValue)
             holder.stringValue.text = record.stringRecordValue
             holder.bolusType.text = record.bolusType
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
index a81408b381..dd4c59cee4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -27,7 +28,8 @@ class MessageHashTableR @Inject constructor(
     configBuilderPlugin: ConfigBuilderPlugin,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
-    injector: HasAndroidInjector
+    injector: HasAndroidInjector,
+    dateUtil: DateUtil
 ) : MessageHashTableBase {
 
     var messages: HashMap<Int, MessageBase> = HashMap()
@@ -39,11 +41,11 @@ class MessageHashTableR @Inject constructor(
         put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
         put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
         put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
         put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
         put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
         // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))
         put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
         put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
         put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
@@ -55,15 +57,15 @@ class MessageHashTableR @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus, dateUtil))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil))          // 0x310A CMD_HISTORY_BASAL_HOUR
         put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
         // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))
@@ -74,7 +76,7 @@ class MessageHashTableR @Inject constructor(
         put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
         put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
         put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
         put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
         put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
         put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
@@ -83,9 +85,9 @@ class MessageHashTableR @Inject constructor(
         put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
         put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
         // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgCheckValue(aapsLogger, danaRPump, danaRPlugin))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
index 142d0fea04..97c942fbf1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryAlarm(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3105)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
index 8c50099756..8b953a15f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -10,7 +10,8 @@ import info.nightscout.androidaps.utils.DateUtil
 
 open class MsgHistoryAll(
     val aapsLogger: AAPSLogger,
-    val rxBus: RxBusWrapper
+    val rxBus: RxBusWrapper,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -138,6 +139,6 @@ open class MsgHistoryAll(
             17.toByte()                       -> failed = true
         }
         MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
-        rxBus.send(EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
+        rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
index 2f235f38d1..87bfbbc870 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBasalHour(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x310A)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
index 26e1506eac..693d56d462 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBolus(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3101)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
index 8650e251a8..23e060d2a7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryCarbo(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3107)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
index 60c1fffd14..5a978fc0ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryDailyInsulin(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3102)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
index 50d6cb9051..8883a704a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryError(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3106)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
index 07e2354f18..4f717dded1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryGlucose(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3104)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
index 0bf49cc612..b271f4f915 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryNew(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x42F2)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
index d77d0fbca7..24bb799db8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryRefill(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3108)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
index d3f947f77d..bd116ed709 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
@@ -3,11 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistorySuspend(
     aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper
-) : MsgHistoryAll(aapsLogger, rxBus) {
+    rxBus: RxBusWrapper,
+    dateUtil: DateUtil
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
 
     init {
         SetCommand(0x3109)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
index 1ff8eb0e9b..7d1ded9f8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
@@ -24,7 +24,8 @@ class MsgInitConnStatusTime(
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderPlugin,
-    private val commandQueue: CommandQueueProvider
+    private val commandQueue: CommandQueueProvider,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -54,7 +55,7 @@ class MsgInitConnStatusTime(
         }
         val time = dateTimeSecFromBuff(bytes, 0)
         val versionCode = intFromBuff(bytes, 6, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + dateUtil.dateAndTimeString(time))
         aapsLogger.debug(LTag.PUMPCOMM, "Version code: $versionCode")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
index 70971c431e..0fcdcd5589 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
@@ -7,13 +7,14 @@ import java.util.*
 
 class MsgSetTime(
     private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil,
     time: Date
 ) : MessageBase() {
 
     init {
         SetCommand(0x330a)
         AddParamDateTime(time)
-        aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + dateUtil.dateAndTimeString(time))
     }
 
     override fun handleMessage(bytes: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
index df356ca744..b8c9af91f4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
@@ -8,7 +8,8 @@ import java.util.*
 
 class MsgSettingPumpTime(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -25,7 +26,7 @@ class MsgSettingPumpTime(
             intFromBuff(bytes, 1, 1),
             intFromBuff(bytes, 0, 1)
         ).time
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time) + " Phone time: " + Date())
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + dateUtil.dateAndTimeString(time) + " Phone time: " + Date())
         danaRPump.pumpTime = time
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
index 448b45346a..b7151d8add 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
@@ -14,7 +14,8 @@ class MsgStatusBolusExtended(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
     private val danaRPump: DanaRPump,
-    private val activePlugin: ActivePluginProvider
+    private val activePlugin: ActivePluginProvider,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -48,7 +49,7 @@ class MsgStatusBolusExtended(
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: $extendedBolusAmount")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far in minutes: $extendedBolusSoFarInMinutes")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus absolute rate: $extendedBolusAbsoluteRate")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start: " + DateUtil.dateAndTimeString(extendedBolusStart))
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus start: " + dateUtil.dateAndTimeString(extendedBolusStart))
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: $extendedBolusRemainingMinutes")
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index a72d813199..b6b707381f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -62,6 +62,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     @Inject ResourceHelper resourceHelper;
     @Inject DanaRPump danaRPump;
     @Inject FabricPrivacy fabricPrivacy;
+    @Inject DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -228,31 +229,31 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
         MessageBase msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm(aapsLogger, rxBus);
+                msg = new MsgHistoryAlarm(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour(aapsLogger, rxBus);
+                msg = new MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus(aapsLogger, rxBus);
+                msg = new MsgHistoryBolus(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo(aapsLogger, rxBus);
+                msg = new MsgHistoryCarbo(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus);
+                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError(aapsLogger, rxBus);
+                msg = new MsgHistoryError(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose(aapsLogger, rxBus);
+                msg = new MsgHistoryGlucose(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill(aapsLogger, rxBus);
+                msg = new MsgHistoryRefill(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend(aapsLogger, rxBus);
+                msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil);
                 break;
         }
         danaRPump.setHistoryDoneReceived(false);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 510ba70578..f027216839 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -14,18 +14,19 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -63,10 +64,8 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
-import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -143,7 +142,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
             MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
             MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil);
             MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaRPump, danaRPlugin);
 
             if (danaRPump.isNewPump()) {
@@ -187,7 +186,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaRPump));
                 mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaRPump));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
                 if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -200,8 +199,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                 aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date()));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
                     timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -252,7 +251,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -261,7 +260,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -350,7 +349,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                                 t.insulin = danaRPump.getLastBolusAmount();
                                 aapsLogger.debug(LTag.PUMP, "Used bolus amount from history: " + danaRPump.getLastBolusAmount());
                             } else {
-                                aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + DateUtil.dateAndTimeString(danaRPump.getLastBolusTime()));
+                                aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + dateUtil.dateAndTimeString(danaRPump.getLastBolusTime()));
                             }
                             synchronized (o) {
                                 o.notify();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 57d14c36b4..580e7c4ad3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -60,10 +61,10 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             ConstraintChecker constraintChecker,
             TreatmentsPlugin treatmentsPlugin,
             SP sp,
-            CommandQueueProvider commandQueue
-
+            CommandQueueProvider commandQueue,
+            DateUtil dateUtil
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
index 7c8f5ca33b..882ab11739 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.*
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -28,6 +29,7 @@ class MessageHashTableRKorean @Inject constructor(
     configBuilderPlugin: ConfigBuilderPlugin,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
+    dateUtil: DateUtil,
     injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
@@ -39,10 +41,10 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
         put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
         put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
         put(MsgStatusBasic_k(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
         put(MsgStatus_k(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
         put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
         put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
         put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
@@ -53,11 +55,11 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
         put(MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
         put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
@@ -65,11 +67,11 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgSettingBasalProfileAll_k(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
         put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
         put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
         put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
         put(MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index 77402e0389..78575809a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -25,7 +25,8 @@ class MsgInitConnStatusTime_k(
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderPlugin,
-    private val commandQueue: CommandQueueProvider
+    private val commandQueue: CommandQueueProvider,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -55,7 +56,7 @@ class MsgInitConnStatusTime_k(
         val versionCode2 = intFromBuff(bytes, 7, 1)
         val versionCode3 = intFromBuff(bytes, 8, 1)
         val versionCode4 = intFromBuff(bytes, 9, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + dateUtil.dateAndTimeString(time))
         aapsLogger.debug(LTag.PUMPCOMM, "Version code1: $versionCode1")
         aapsLogger.debug(LTag.PUMPCOMM, "Version code2: $versionCode2")
         aapsLogger.debug(LTag.PUMPCOMM, "Version code3: $versionCode3")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index 96de7ad78d..0a0b0ce4c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -75,6 +75,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject MessageHashTableRKorean messageHashTableRKorean;
     @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
+    @Inject DateUtil dateUtil;
 
     public DanaRKoreanExecutionService() {
     }
@@ -132,7 +133,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             //MsgStatus_k statusMsg = new MsgStatus_k();
             MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaRPump);
             MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil);
             MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin);
 
             if (danaRPump.isNewPump()) {
@@ -172,7 +173,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
                 mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
                 if (danaRPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -187,8 +188,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
                     timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -239,7 +240,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -248,7 +249,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
index 8d5b8093b9..293faf8621 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.java
@@ -81,6 +81,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
     private final CommandQueueProvider commandQueue;
     private final DanaRPump danaRPump;
     private final DetailedBolusInfoStorage detailedBolusInfoStorage;
+    private final DateUtil dateUtil;
 
     private static DanaRSService danaRSService;
 
@@ -113,7 +114,8 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
             SP sp,
             CommandQueueProvider commandQueue,
             DanaRPump danaRPump,
-            DetailedBolusInfoStorage detailedBolusInfoStorage
+            DetailedBolusInfoStorage detailedBolusInfoStorage,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.PUMP)
@@ -134,6 +136,7 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
         this.commandQueue = commandQueue;
         this.danaRPump = danaRPump;
         this.detailedBolusInfoStorage = detailedBolusInfoStorage;
+        this.dateUtil = dateUtil;
 
         pumpDescription.setPumpDescription(PumpType.DanaRS);
     }
@@ -720,19 +723,19 @@ public class DanaRSPlugin extends PumpPluginBase implements PumpInterface, DanaR
             status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
             extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
             if (pump.getLastBolusTime() != 0) {
-                extended.put("LastBolus", DateUtil.dateAndTimeString(pump.getLastBolusTime()));
+                extended.put("LastBolus", dateUtil.dateAndTimeString(pump.getLastBolusTime()));
                 extended.put("LastBolusAmount", pump.getLastBolusAmount());
             }
             TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
             ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date));
                 extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
             }
             extended.put("BaseBasalRate", getBaseBasalRate());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
index 3e64372fc7..0a4c81314d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
@@ -49,7 +49,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Basal_Set_Suspend_Off(aapsLogger))
         put(DanaRS_Packet_Basal_Set_Suspend_On(aapsLogger))
         put(DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger))
-        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil))
         put(DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump))
         put(DanaRS_Packet_Bolus_Get_Initial_Bolus(aapsLogger))
         put(DanaRS_Packet_Bolus_Get_Calculation_Information(aapsLogger, danaRPump))
@@ -59,7 +59,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Bolus_Get_Extended_Bolus(aapsLogger, danaRPump))
         put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump))
         put(DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump, dateUtil))
         put(DanaRS_Packet_Bolus_Set_Bolus_Option(aapsLogger))
         put(DanaRS_Packet_Bolus_Set_Initial_Bolus(aapsLogger))
         put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(aapsLogger))
@@ -77,33 +77,33 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Notify_Delivery_Complete(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
         put(DanaRS_Packet_Notify_Delivery_Rate_Display(aapsLogger, rxBus, resourceHelper, danaRSPlugin))
         put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(aapsLogger))
-        put(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump))
+        put(DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump, dateUtil))
         put(DanaRS_Packet_Option_Get_User_Option(aapsLogger, danaRPump))
-        put(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger))
+        put(DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, dateUtil))
         put(DanaRS_Packet_Option_Set_User_Option(aapsLogger, danaRPump))
         //put(new DanaRS_Packet_History_());
-        put(DanaRS_Packet_History_Alarm(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_All_History(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Basal(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Bolus(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Alarm(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_All_History(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Basal(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Bolus(aapsLogger, rxBus, dateUtil))
         put(DanaRS_Packet_Review_Bolus_Avg(aapsLogger))
-        put(DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Daily(aapsLogger, rxBus))
-        put(DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Daily(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump, dateUtil))
         put(DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper))
-        put(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump))
+        put(DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil))
         put(DanaRS_Packet_General_Get_Today_Delivery_Total(aapsLogger, danaRPump))
         put(DanaRS_Packet_General_Get_User_Time_Change_Flag(aapsLogger))
-        put(DanaRS_Packet_History_Prime(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Refill(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Prime(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Refill(aapsLogger, rxBus, dateUtil))
         put(DanaRS_Packet_General_Set_History_Upload_Mode(aapsLogger))
         put(DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(aapsLogger))
-        put(DanaRS_Packet_History_Suspend(aapsLogger, rxBus))
-        put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus))
+        put(DanaRS_Packet_History_Suspend(aapsLogger, rxBus, dateUtil))
+        put(DanaRS_Packet_History_Temporary(aapsLogger, rxBus, dateUtil))
         // APS
         put(DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, 0))
         put(DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, dateUtil, 0))
-        put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, 0, 0, 0, 0))
+        put(DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, 0, 0, 0, 0))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index a3b57d12ef..cb26675222 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -52,7 +52,7 @@ open class DanaRS_Packet_APS_History_Events(
         hour = cal[Calendar.HOUR_OF_DAY]
         min = cal[Calendar.MINUTE]
         sec = cal[Calendar.SECOND]
-        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(cal.timeInMillis))
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(cal.timeInMillis))
         danaRSPlugin.apsHistoryDone = false
     }
 
@@ -83,7 +83,7 @@ open class DanaRS_Packet_APS_History_Events(
         val status: String
         when (recordCode.toInt()) {
             DanaRPump.TEMPSTART         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
@@ -91,13 +91,13 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaRPump.TEMPSTOP          -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTART     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
@@ -105,7 +105,7 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaRPump.EXTENDEDSTOP      -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
@@ -118,7 +118,7 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
@@ -130,12 +130,12 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTART -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
@@ -143,33 +143,33 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaRPump.DUALEXTENDEDSTOP  -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.REFILL            -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
@@ -180,17 +180,17 @@ open class DanaRS_Packet_APS_History_Events(
                 emptyCarbsInfo.source = Source.PUMP
                 emptyCarbsInfo.pumpId = datetime
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(emptyCarbsInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIMECANNULA      -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
             else                        -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+                aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
index 266554d3be..f513e6c7ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -9,6 +9,7 @@ import java.util.*
 
 class DanaRS_Packet_APS_Set_Event_History(
     private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil,
     private var packetType: Int,
     private var time: Long,
     private var param1: Int,
@@ -18,7 +19,7 @@ class DanaRS_Packet_APS_Set_Event_History(
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
         if ((packetType == DanaRPump.CARBS || packetType == DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
-        aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + DateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
+        aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + dateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
 
     override fun getRequestParams(): ByteArray {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index fdc5c16480..7a2f523da8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -9,7 +9,8 @@ import kotlin.math.ceil
 
 class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : DanaRS_Packet() {
 
     init {
@@ -35,7 +36,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaRPump.tempBasalPercent)
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: " + danaRPump.tempBasalTotalSec)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + DateUtil.dateAndTimeString(tempBasalStart))
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + dateUtil.dateAndTimeString(tempBasalStart))
     }
 
     override fun getFriendlyName(): String {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index e6c8121506..a78bf0c525 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -9,7 +9,8 @@ import java.util.*
 
 class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : DanaRS_Packet() {
 
     init {
@@ -48,7 +49,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
         aapsLogger.debug(LTag.PUMPCOMM, "BolusType: $bolusType")
         aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount: " + danaRPump.initialBolusAmount + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeString(danaRPump.lastBolusTime))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeString(danaRPump.lastBolusTime))
         aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
         aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep + " U")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
index b8e7e6bb53..a9b1b2df62 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -9,7 +9,8 @@ import java.util.*
 
 class DanaRS_Packet_General_Get_More_Information(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : DanaRS_Packet() {
 
     init {
@@ -52,7 +53,7 @@ class DanaRS_Packet_General_Get_More_Information(
         aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits.toString() + " U")
         aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: " + danaRPump.isExtendedInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: " + danaRPump.extendedBolusRemainingMinutes)
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + DateUtil.dateAndTimeAndSecondsString(lastBolusTime.time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeAndSecondsString(lastBolusTime.time))
         aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index 00ebd4118a..6a60ea523a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -8,7 +8,8 @@ import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_General_Get_Shipping_Information(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : DanaRS_Packet() {
 
     init {
@@ -31,7 +32,7 @@ class DanaRS_Packet_General_Get_Shipping_Information(
         dataSize = 3
         danaRPump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize)
         aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaRPump.serialNumber)
-        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + DateUtil.dateAndTimeString(danaRPump.shippingDate))
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + dateUtil.dateAndTimeString(danaRPump.shippingDate))
         aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaRPump.shippingCountry)
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
index e8da961028..dd62bc2136 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
@@ -13,6 +13,7 @@ import java.util.*
 abstract class DanaRS_Packet_History_(
     protected val aapsLogger: AAPSLogger,
     protected val rxBus: RxBusWrapper,
+    protected val dateUtil: DateUtil,
     protected val from: Long
 ) : DanaRS_Packet() {
 
@@ -36,7 +37,7 @@ abstract class DanaRS_Packet_History_(
         hour = cal[Calendar.HOUR_OF_DAY]
         min = cal[Calendar.MINUTE]
         sec = cal[Calendar.SECOND]
-        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(cal.timeInMillis))
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(cal.timeInMillis))
     }
 
     override fun getRequestParams(): ByteArray {
@@ -85,7 +86,7 @@ abstract class DanaRS_Packet_History_(
             val historyCode = byteArrayToInt(getBytes(data, DATA_START + 7, 1))
             val paramByte8 = historyCode.toByte()
             val value: Int = (data[DATA_START + 8].toInt() and 0xFF shl 8) + (data[DATA_START + 9].toInt() and 0xFF)
-            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + DateUtil.dateAndTimeString(datetimewihtsec) + " Code: " + historyCode + " Value: " + value)
+            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec) + " Code: " + historyCode + " Value: " + value)
             val danaRHistoryRecord = DanaRHistoryRecord()
             danaRHistoryRecord.setBytes(data)
             // danaRHistoryRecord.recordCode is different from DanaR codes
@@ -197,7 +198,7 @@ abstract class DanaRS_Packet_History_(
                 }
             }
             MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
-            rxBus.send(EventDanaRSyncStatus(DateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
+            rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
index 9b0c7ef4c6..360499cc21 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALARM
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
index a8010b2127..8f6343604b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_All_History(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__ALL_HISTORY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
index 0ac22574d5..e3268bcf1d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Basal @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BASAL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
index 6ebbeaed53..7235137871 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BLOOD_GLUCOSE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
index 47996fc8c6..1d7950e8b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__BOLUS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
index 1084434962..03b84489cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__CARBOHYDRATE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
index 93e974728d..74f3894e79 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Daily @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__DAILY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
index 0306e6f129..9d283e905c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Prime @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__PRIME
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
index 672c5e2cc4..637fb1be0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Refill @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__REFILL
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
index 9868cd10a4..3d35ec35dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__SUSPEND
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
index b185748495..31258ea1b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
@@ -4,12 +4,14 @@ import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
 
 class DanaRS_Packet_History_Temporary(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
+    dateUtil: DateUtil,
     from: Long = 0
-) : DanaRS_Packet_History_(aapsLogger, rxBus, from) {
+) : DanaRS_Packet_History_(aapsLogger, rxBus, dateUtil, from) {
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_REVIEW__TEMPORARY
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 2b18603d11..297804469c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -9,7 +9,8 @@ import java.util.*
 
 class DanaRS_Packet_Option_Get_Pump_Time(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : DanaRS_Packet() {
 
     init {
@@ -39,7 +40,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
         val time = Date(100 + year, month - 1, day, hour, min, sec)
         danaRPump.pumpTime = time.time
         failed = year == month && month == day && day == hour && hour == min && min == sec && sec == 1
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time))
     }
 
     override fun handleMessageNotReceived() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
index ec1a44c789..6739c50f57 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -8,6 +8,7 @@ import java.util.*
 
 class DanaRS_Packet_Option_Set_Pump_Time(
     private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil,
     private var time: Long = 0
 ) : DanaRS_Packet() {
 
@@ -15,7 +16,7 @@ class DanaRS_Packet_Option_Set_Pump_Time(
 
     init {
         opCode = BleCommandUtil.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME
-        aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + DateUtil.dateAndTimeString(time))
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting pump time " + dateUtil.dateAndTimeString(time))
     }
 
     override fun getRequestParams(): ByteArray {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
index 5122f012f8..359294ca00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.java
@@ -167,9 +167,9 @@ public class DanaRSService extends DaggerService {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
             bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Extended_Bolus_State(aapsLogger, danaRPump));
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus, bolusStep, maxBolus
+            bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump, dateUtil)); // last bolus, bolusStep, maxBolus
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)));
-            bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
+            bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil));
 
             danaRPump.setLastConnection(System.currentTimeMillis());
 
@@ -184,7 +184,7 @@ public class DanaRSService extends DaggerService {
             }
 
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
+            bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump, dateUtil));
 
             long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
             if (danaRPump.getPumpTime() == 0) {
@@ -198,7 +198,7 @@ public class DanaRSService extends DaggerService {
             long now = System.currentTimeMillis();
             if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)); // serial no
+                bleComm.sendMessage(new DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil)); // serial no
                 bleComm.sendMessage(new DanaRS_Packet_General_Get_Pump_Check(aapsLogger, danaRPump, rxBus, resourceHelper)); // firmware
                 bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Profile_Number(aapsLogger, danaRPump));
                 bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Bolus_Option(aapsLogger, rxBus, resourceHelper, danaRPump)); // isExtendedEnabled
@@ -228,13 +228,13 @@ public class DanaRSService extends DaggerService {
                     return;
                 } else {
                     if (danaRPump.getProtocol() >= 6) {
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now()));
+                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, dateUtil, DateUtil.now()));
                     } else {
                         waitForWholeMinute(); // Dana can set only whole minute
                         // add 10sec to be sure we are over minute (will be cutted off anyway)
-                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now() + T.secs(10).msecs()));
+                        bleComm.sendMessage(new DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, dateUtil, DateUtil.now() + T.secs(10).msecs()));
                     }
-                    bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump));
+                    bleComm.sendMessage(new DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump, dateUtil));
                     timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -276,7 +276,7 @@ public class DanaRSService extends DaggerService {
             aapsLogger.debug(LTag.PUMPCOMM, "Loading complete event history");
         } else {
             msg = new DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, dateUtil, lastHistoryFetched);
-            aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
+            aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched));
         }
         bleComm.sendMessage(msg);
         while (!danaRSPlugin.apsHistoryDone && bleComm.isConnected()) {
@@ -315,7 +315,7 @@ public class DanaRSService extends DaggerService {
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbtime, carbs); ####
 //            bleComm.sendMessage(msg);
-            DanaRS_Packet_APS_Set_Event_History msgSetHistoryEntry_v2 = new DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, carbtime, carbs, 0);
+            DanaRS_Packet_APS_Set_Event_History msgSetHistoryEntry_v2 = new DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, carbtime, carbs, 0);
             bleComm.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
@@ -370,7 +370,7 @@ public class DanaRSService extends DaggerService {
             public void run() {
                 // reread bolus status
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)); // last bolus
+                bleComm.sendMessage(new DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump, dateUtil)); // last bolus
                 bolusingEvent.setPercent(100);
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
@@ -403,7 +403,7 @@ public class DanaRSService extends DaggerService {
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Temporary_Basal(aapsLogger, percent, durationInHours));
         SystemClock.sleep(200);
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -417,7 +417,7 @@ public class DanaRSService extends DaggerService {
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -436,7 +436,7 @@ public class DanaRSService extends DaggerService {
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         bleComm.sendMessage(new DanaRS_Packet_APS_Basal_Set_Temporary_Basal(aapsLogger, percent));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -446,7 +446,7 @@ public class DanaRSService extends DaggerService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
         bleComm.sendMessage(new DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(aapsLogger));
-        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump));
+        bleComm.sendMessage(new DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -493,31 +493,31 @@ public class DanaRSService extends DaggerService {
         DanaRS_Packet_History_ msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new DanaRS_Packet_History_Alarm(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Alarm(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_PRIME:
-                msg = new DanaRS_Packet_History_Prime(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Prime(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new DanaRS_Packet_History_Basal(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Basal(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new DanaRS_Packet_History_Bolus(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Bolus(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new DanaRS_Packet_History_Daily(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Daily(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new DanaRS_Packet_History_Refill(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Refill(aapsLogger, rxBus, dateUtil);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new DanaRS_Packet_History_Suspend(aapsLogger, rxBus);
+                msg = new DanaRS_Packet_History_Suspend(aapsLogger, rxBus, dateUtil);
                 break;
         }
         if (msg != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index 9a88ce28f3..72df8b9e68 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -66,9 +66,10 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             TreatmentsPlugin treatmentsPlugin,
             SP sp,
             CommandQueueProvider commandQueue,
-            DetailedBolusInfoStorage detailedBolusInfoStorage
+            DetailedBolusInfoStorage detailedBolusInfoStorage,
+            DateUtil dateUtil
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
index f02062e05b..8833ea6b3f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -47,11 +47,11 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
         put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
         put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal_v2(aapsLogger, danaRPump))        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil))        // 0x0205 CMD_PUMP_EXERCISE_MODE
         put(MsgStatusBolusExtended_v2(aapsLogger, danaRPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
         put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
         put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
         put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
         put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
         put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
@@ -63,15 +63,15 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus, dateUtil))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil))          // 0x310A CMD_HISTORY_BASAL_HOUR
         put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
         put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
@@ -80,7 +80,7 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
         put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
         put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
         put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
         put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
         put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
@@ -89,9 +89,9 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
         put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
         put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgStatusAPS_v2(aapsLogger, danaRPump))              // 0xE001 CMD_PUMPSTATUS_APS
         put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
index 4f07a49ff9..7b11695910 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -75,7 +75,7 @@ class MsgHistoryEvents_v2 constructor(
         val status: String
         when (recordCode.toInt()) {
             DanaRPump.TEMPSTART         -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
@@ -83,13 +83,13 @@ class MsgHistoryEvents_v2 constructor(
             }
 
             DanaRPump.TEMPSTOP          -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime))
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.EXTENDEDSTART     -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
@@ -97,7 +97,7 @@ class MsgHistoryEvents_v2 constructor(
             }
 
             DanaRPump.EXTENDEDSTOP      -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
@@ -110,7 +110,7 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
@@ -122,12 +122,12 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.DUALEXTENDEDSTART -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
@@ -135,33 +135,33 @@ class MsgHistoryEvents_v2 constructor(
             }
 
             DanaRPump.DUALEXTENDEDSTOP  -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.REFILL            -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
@@ -172,12 +172,12 @@ class MsgHistoryEvents_v2 constructor(
                 emptyCarbsInfo.source = Source.PUMP
                 emptyCarbsInfo.pumpId = datetime
                 val newRecord = treatmentsPlugin.addToHistoryTreatment(emptyCarbsInfo, false)
-                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
             else                        -> {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + DateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
index ac21c3f533..e4668fcd2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -9,8 +9,8 @@ import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
-
+    private val danaRPump: DanaRPump,
+    private val dateUtil: DateUtil
 ) : MessageBase() {
 
     init {
@@ -37,7 +37,7 @@ class MsgStatusTempBasal_v2(
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: $tempBasalPercent")
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: $tempBasalTotalSec")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + DateUtil.dateAndTimeString(tempBasalStart))
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + dateUtil.dateAndTimeString(tempBasalStart))
     }
 
     private fun getDateFromTempBasalSecAgo(tempBasalAgoSecs: Int): Long {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index ba2729c672..1433d3727f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -16,19 +16,20 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -72,7 +73,6 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetAPSTempBasalSt
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetHistoryEntry_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusBolusExtended_v2;
 import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusTempBasal_v2;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
@@ -159,7 +159,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
             MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
             MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
-            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaRPump);
+            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil);
             MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaRPump);
             MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
 
@@ -191,7 +191,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             }
 
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
             if (danaRPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
@@ -222,8 +222,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 } else {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump));
+                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
                     timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -274,7 +274,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -289,7 +289,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -309,7 +309,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -319,7 +319,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -450,7 +450,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
         MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, dateUtil, lastHistoryFetched);
-        aapsLogger.debug(LTag.PUMP, "Loading event history from: " + DateUtil.dateAndTimeString(lastHistoryFetched));
+        aapsLogger.debug(LTag.PUMP, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
         while (!danaRv2Plugin.eventsLoadingDone && mRfcommSocket.isConnected()) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index b147d01b10..d44470bad1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -150,6 +150,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     private final CommandQueueProvider commandQueue;
     private final ProfileFunction profileFunction;
     private final Context context;
+    private final DateUtil dateUtil;
 
     public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert";
 
@@ -209,7 +210,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             CommandQueueProvider commandQueue,
             ProfileFunction profileFunction,
             Context context,
-            Config config
+            Config config,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .pluginName(R.string.insight_local)
@@ -229,6 +231,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         this.commandQueue = commandQueue;
         this.profileFunction = profileFunction;
         this.context = context;
+        this.dateUtil = dateUtil;
 
         pumpDescription = new PumpDescription();
         pumpDescription.setPumpDescription(PumpType.AccuChekInsightBluetooth);
@@ -996,13 +999,13 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             TemporaryBasal tb = treatmentsPlugin.getTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date));
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
             ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date));
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date));
                 extended.put("ExtendedBolusRemaining", eb.getPlannedRemainingMinutes());
             }
             extended.put("BaseBasalRate", getBaseBasalRate());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 9d4b89675e..95a3f68c12 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -84,6 +84,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButt
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.TimeChangeType;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -136,7 +137,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             MedtronicPumpStatus medtronicPumpStatus,
             MedtronicHistoryData medtronicHistoryData,
             RileyLinkServiceData rileyLinkServiceData,
-            ServiceTaskExecutor serviceTaskExecutor
+            ServiceTaskExecutor serviceTaskExecutor,
+            DateUtil dateUtil
     ) {
 
         super(new PluginDescription() //
@@ -147,7 +149,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                         .preferencesId(R.xml.pref_medtronic)
                         .description(R.string.description_pump_medtronic), //
                 PumpType.Medtronic_522_722, // we default to most basic model, correct model from config is loaded later
-                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy
+                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil
         );
 
         this.rileyLinkUtil = rileyLinkUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
index 2a7ffa2ce4..616f033799 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
@@ -18,6 +18,7 @@ import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
@@ -32,6 +33,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
 public class RileyLinkStatusDeviceMedtronic extends DaggerFragment implements RefreshableInterface {
 
     @Inject ResourceHelper resourceHelper;
+    @Inject DateUtil dateUtil;
 
     // @BindView(R.id.rileylink_history_list)
     ListView listView;
@@ -153,7 +155,7 @@ public class RileyLinkStatusDeviceMedtronic extends DaggerFragment implements Re
             }
 
             RLHistoryItem item = historyItemList.get(i);
-            viewHolder.itemTime.setText(StringUtil.toDateTimeString(item.getDateTime()));
+            viewHolder.itemTime.setText(StringUtil.toDateTimeString(dateUtil, item.getDateTime()));
             viewHolder.itemSource.setText("Riley Link"); // for now
             viewHolder.itemDescription.setText(item.getDescription(resourceHelper));
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 62adc49855..7f958a725c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -73,6 +73,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodRefres
 import info.nightscout.androidaps.plugins.pump.omnipod.service.RileyLinkOmnipodService;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.TimeChangeType;
@@ -136,7 +137,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
             CommandQueueProvider commandQueue,
             FabricPrivacy fabricPrivacy,
             RileyLinkServiceData rileyLinkServiceData,
-            ServiceTaskExecutor serviceTaskExecutor) {
+            ServiceTaskExecutor serviceTaskExecutor,
+            DateUtil dateUtil
+    ) {
 
         super(new PluginDescription() //
                         .mainType(PluginType.PUMP) //
@@ -146,7 +149,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                         .preferencesId(R.xml.pref_omnipod) //
                         .description(R.string.description_pump_omnipod), //
                 PumpType.Insulet_Omnipod,
-                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy
+                injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil
         );
         this.rileyLinkServiceData = rileyLinkServiceData;
         this.serviceTaskExecutor = serviceTaskExecutor;
@@ -232,8 +235,10 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                                 ActivePluginProvider activePlugin,
                                 info.nightscout.androidaps.utils.sharedPreferences.SP sp,
                                 CommandQueueProvider commandQueue,
-                                FabricPrivacy fabricPrivacy) {
-        super(pluginDescription, pumpType, injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy);
+                                FabricPrivacy fabricPrivacy,
+                                DateUtil dateUtil
+    ) {
+        super(pluginDescription, pumpType, injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil);
 
 //        this.rileyLinkUtil = rileyLinkUtil;
 //        this.medtronicUtil = medtronicUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
index 22bd4293fe..5664b1b539 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
@@ -36,6 +36,7 @@ public class PodSessionState extends PodState {
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
     @Inject OmnipodUtil omnipodUtil;
+    @Inject DateUtil dateUtil;
 
     private final Map<AlertSlot, AlertType> configuredAlerts;
     private transient PodStateChangedHandler stateChangedHandler;
@@ -112,7 +113,7 @@ public class PodSessionState extends PodState {
     }
 
     public String getExpiryDateAsString() {
-        return expiresAt == null ? "???" : DateUtil.dateAndTimeString(expiresAt.toDate());
+        return expiresAt == null ? "???" : dateUtil.dateAndTimeString(expiresAt.toDate());
     }
 
     public FirmwareVersion getPiVersion() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index 9dbaea4025..3db377a230 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -52,7 +52,8 @@ class VirtualPumpPlugin @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val treatmentsPlugin: TreatmentsPlugin,
     commandQueue: CommandQueueProvider,
-    private val config: Config
+    private val config: Config,
+    private val dateUtil: DateUtil
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
     .fragmentClass(VirtualPumpFragment::class.java.name)
@@ -356,13 +357,13 @@ class VirtualPumpPlugin @Inject constructor(
             val tb = treatmentsPlugin.getTempBasalFromHistory(now)
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile))
-                extended.put("TempBasalStart", DateUtil.dateAndTimeString(tb.date))
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date))
                 extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
             }
             val eb = treatmentsPlugin.getExtendedBolusFromHistory(now)
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate())
-                extended.put("ExtendedBolusStart", DateUtil.dateAndTimeString(eb.date))
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date))
                 extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
             }
             status.put("timestamp", DateUtil.toISOString(now))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index 317a25bdf9..fc527bab94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -38,7 +38,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
 
     private SP sp;
     private ProfileFunction profileFunction;
-    private ResourceHelper resourceHelper;
+    private DateUtil dateUtil;
 
     @Inject
     public SensitivityAAPSPlugin(
@@ -46,7 +46,8 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
             AAPSLogger aapsLogger,
             ResourceHelper resourceHelper,
             SP sp,
-            ProfileFunction profileFunction
+            ProfileFunction profileFunction,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.SENSITIVITY)
@@ -58,6 +59,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
         );
         this.sp = sp;
         this.profileFunction = profileFunction;
+        this.dateUtil = dateUtil;
     }
 
     @NonNull @Override
@@ -66,9 +68,9 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
 
         String age = sp.getString(R.string.key_age, "");
         int defaultHours = 24;
-        if (age.equals(resourceHelper.gs(R.string.key_adult))) defaultHours = 24;
-        if (age.equals(resourceHelper.gs(R.string.key_teenage))) defaultHours = 4;
-        if (age.equals(resourceHelper.gs(R.string.key_child))) defaultHours = 4;
+        if (age.equals(getResourceHelper().gs(R.string.key_adult))) defaultHours = 24;
+        if (age.equals(getResourceHelper().gs(R.string.key_teenage))) defaultHours = 4;
+        if (age.equals(getResourceHelper().gs(R.string.key_child))) defaultHours = 4;
         int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours);
 
         Profile profile = profileFunction.getProfile();
@@ -85,7 +87,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
 
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + dateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -116,7 +118,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
             }
 
             // reset deviations after profile switch
-            if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
+            if (new ProfileSwitch(getInjector()).isEvent5minBack(profileSwitches, autosensData.time, true)) {
                 deviationsArray.clear();
                 pastSensitivity += "(PROFILESWITCH)";
             }
@@ -172,7 +174,7 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
                 sensResult, deviationsArray.size());
 
         getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
-                + DateUtil.dateAndTimeString(toTime) +
+                + dateUtil.dateAndTimeString(toTime) +
                 " ratio: " + output.ratio
                 + " mealCOB: " + current.cob);
         getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: deviations " + Arrays.toString(deviations));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 97fb1a68bc..5740c7a5d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -35,7 +35,8 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 @Singleton
 public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
 
-    private ProfileFunction profileFunction;
+    private final ProfileFunction profileFunction;
+    private final DateUtil dateUtil;
 
     @Inject
     public SensitivityOref1Plugin(
@@ -43,7 +44,8 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             AAPSLogger aapsLogger,
             ResourceHelper resourceHelper,
             SP sp,
-            ProfileFunction profileFunction
+            ProfileFunction profileFunction,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.SENSITIVITY)
@@ -56,6 +58,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 injector, aapsLogger, resourceHelper, sp
         );
         this.profileFunction = profileFunction;
+        this.dateUtil = dateUtil;
     }
 
     @Override
@@ -79,7 +82,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         // the current
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + dateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -125,7 +128,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 }
 
                 // reset deviations after profile switch
-                if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
+                if (new ProfileSwitch(getInjector()).isEvent5minBack(profileSwitches, autosensData.time, true)) {
                     deviationsArray.clear();
                     pastSensitivity += "(PROFILESWITCH)";
                 }
@@ -241,7 +244,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                 sensResultArray.get(key) + comparison, deviationsHour.get(key).size());
 
         getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
-                + DateUtil.dateAndTimeString(toTime) +
+                + dateUtil.dateAndTimeString(toTime) +
                 " ratio: " + output.ratio
                 + " mealCOB: " + current.cob);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
index d2128791d8..27b1820735 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityWeightedAveragePlugin.java
@@ -32,7 +32,7 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin {
 
     private SP sp;
-    private ResourceHelper resourceHelper;
+    private DateUtil dateUtil;
     private ProfileFunction profileFunction;
 
     @Inject
@@ -41,7 +41,8 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
             AAPSLogger aapsLogger,
             ResourceHelper resourceHelper,
             SP sp,
-            ProfileFunction profileFunction
+            ProfileFunction profileFunction,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.SENSITIVITY)
@@ -52,7 +53,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
                 injector, aapsLogger, resourceHelper, sp
         );
         this.sp = sp;
-        this.resourceHelper = resourceHelper;
+        this.dateUtil = dateUtil;
         this.profileFunction = profileFunction;
     }
 
@@ -62,9 +63,9 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
 
         String age = sp.getString(R.string.key_age, "");
         int defaultHours = 24;
-        if (age.equals(resourceHelper.gs(R.string.key_adult))) defaultHours = 24;
-        if (age.equals(resourceHelper.gs(R.string.key_teenage))) defaultHours = 4;
-        if (age.equals(resourceHelper.gs(R.string.key_child))) defaultHours = 4;
+        if (age.equals(getResourceHelper().gs(R.string.key_adult))) defaultHours = 24;
+        if (age.equals(getResourceHelper().gs(R.string.key_teenage))) defaultHours = 4;
+        if (age.equals(getResourceHelper().gs(R.string.key_child))) defaultHours = 4;
         int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours);
 
         if (autosensDataTable == null || autosensDataTable.size() < 4) {
@@ -74,7 +75,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
 
         AutosensData current = iobCobCalculatorPlugin.getAutosensData(toTime); // this is running inside lock already
         if (current == null) {
-            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + DateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
+            getAapsLogger().debug(LTag.AUTOSENS, "No autosens data available. toTime: " + dateUtil.dateAndTimeString(toTime) + " lastDataTime: " + iobCobCalculatorPlugin.lastDataTime());
             return new AutosensResult();
         }
 
@@ -117,7 +118,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
             }
 
             // reset deviations after profile switch
-            if (ProfileSwitch.isEvent5minBack(getAapsLogger(), profileSwitches, autosensData.time, true)) {
+            if (new ProfileSwitch(getInjector()).isEvent5minBack(profileSwitches, autosensData.time, true)) {
                 data.clear();
                 pastSensitivity += "(PROFILESWITCH)";
             }
@@ -145,10 +146,10 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
         }
 
         if (data.size() == 0) {
-            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
+            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + dateUtil.dateAndTimeString(fromTime) + " toTime: " + dateUtil.dateAndTimeString(toTime));
             return new AutosensResult();
         } else {
-            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + DateUtil.dateAndTimeString(fromTime) + " toTime: " + DateUtil.dateAndTimeString(toTime));
+            getAapsLogger().debug(LTag.AUTOSENS, "Data size: " + data.size() + " fromTime: " + dateUtil.dateAndTimeString(fromTime) + " toTime: " + dateUtil.dateAndTimeString(toTime));
         }
 
         double weightedsum = 0;
@@ -192,7 +193,7 @@ public class SensitivityWeightedAveragePlugin extends AbstractSensitivityPlugin
                 sensResult, data.size());
 
         getAapsLogger().debug(LTag.AUTOSENS, "Sensitivity to: "
-                + DateUtil.dateAndTimeString(toTime) +
+                + dateUtil.dateAndTimeString(toTime) +
                 " ratio: " + output.ratio
                 + " mealCOB: " + current.cob);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
index 97b28f9dab..b01ba8d470 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -12,17 +12,16 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.plugins.source.BGSourceFragment.RecyclerViewAdapter.BgReadingsViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
@@ -34,6 +33,7 @@ class BGSourceFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     private val disposable = CompositeDisposable()
@@ -84,7 +84,7 @@ class BGSourceFragment : DaggerFragment() {
             val bgReading = bgReadings[position]
             holder.ns.visibility = if (NSUpload.isIdValid(bgReading._id)) View.VISIBLE else View.GONE
             holder.invalid.visibility = if (!bgReading.isValid) View.VISIBLE else View.GONE
-            holder.date.text = DateUtil.dateAndTimeString(bgReading.date)
+            holder.date.text = dateUtil.dateAndTimeString(bgReading.date)
             holder.value.text = bgReading.valueToUnitsToString(profileFunction.getUnits())
             holder.direction.text = bgReading.directionToSymbol(databaseHelper)
             holder.remove.tag = bgReading
@@ -106,7 +106,7 @@ class BGSourceFragment : DaggerFragment() {
                 remove.setOnClickListener { v: View ->
                     val bgReading = v.tag as BgReading
                     activity?.let { activity ->
-                        val text = DateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(profileFunction.getUnits())
+                        val text = dateUtil.dateAndTimeString(bgReading.date) + "\n" + bgReading.valueToUnitsToString(profileFunction.getUnits())
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
                             bgReading.isValid = false
                             MainApp.getDbHelper().update(bgReading)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
index 91683b3f4f..6b0021fbcf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
@@ -28,7 +28,8 @@ class EversensePlugin @Inject constructor(
     injector: HasAndroidInjector,
     private val sp: SP,
     resourceHelper: ResourceHelper,
-    aapsLogger: AAPSLogger
+    aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -50,7 +51,7 @@ class EversensePlugin @Inject constructor(
         if (bundle.containsKey("placementModeInProgress")) aapsLogger.debug(LTag.BGSOURCE, "placementModeInProgress: " + bundle.getBoolean("placementModeInProgress"))
         if (bundle.containsKey("glucoseLevel")) aapsLogger.debug(LTag.BGSOURCE, "glucoseLevel: " + bundle.getInt("glucoseLevel"))
         if (bundle.containsKey("glucoseTrendDirection")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTrendDirection: " + bundle.getString("glucoseTrendDirection"))
-        if (bundle.containsKey("glucoseTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("glucoseTimestamp")))
+        if (bundle.containsKey("glucoseTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamp: " + dateUtil.dateAndTimeString(bundle.getLong("glucoseTimestamp")))
         if (bundle.containsKey("batteryLevel")) aapsLogger.debug(LTag.BGSOURCE, "batteryLevel: " + bundle.getString("batteryLevel"))
         if (bundle.containsKey("signalStrength")) aapsLogger.debug(LTag.BGSOURCE, "signalStrength: " + bundle.getString("signalStrength"))
         if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
@@ -58,7 +59,7 @@ class EversensePlugin @Inject constructor(
         if (bundle.containsKey("transmitterModelNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterModelNumber: " + bundle.getString("transmitterModelNumber"))
         if (bundle.containsKey("transmitterSerialNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterSerialNumber: " + bundle.getString("transmitterSerialNumber"))
         if (bundle.containsKey("transmitterAddress")) aapsLogger.debug(LTag.BGSOURCE, "transmitterAddress: " + bundle.getString("transmitterAddress"))
-        if (bundle.containsKey("sensorInsertionTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "sensorInsertionTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("sensorInsertionTimestamp")))
+        if (bundle.containsKey("sensorInsertionTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "sensorInsertionTimestamp: " + dateUtil.dateAndTimeString(bundle.getLong("sensorInsertionTimestamp")))
         if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
         if (bundle.containsKey("transmitterConnectionState")) aapsLogger.debug(LTag.BGSOURCE, "transmitterConnectionState: " + bundle.getString("transmitterConnectionState"))
         if (bundle.containsKey("glucoseLevels")) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
index aa498105a6..daf570edc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
@@ -70,7 +70,7 @@ class NSClientSourcePlugin @Inject constructor(
 
     private fun storeSgv(sgvJson: JSONObject) {
         val nsSgv = NSSgv(sgvJson)
-        val bgReading = BgReading(nsSgv)
+        val bgReading = BgReading(injector, nsSgv)
         MainApp.getDbHelper().createIfNotExists(bgReading, "NS")
         detectSource(safeGetString(sgvJson, "device", "none"), safeGetLong(sgvJson, "mills"))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 698db2c81f..f83e522b30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -76,6 +76,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     private final ProfileFunction profileFunction;
     private final ActivePluginProvider activePlugin;
     private final FabricPrivacy fabricPrivacy;
+    private final DateUtil dateUtil;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -100,7 +101,8 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             SP sp,
             ProfileFunction profileFunction,
             ActivePluginProvider activePlugin,
-            FabricPrivacy fabricPrivacy
+            FabricPrivacy fabricPrivacy,
+            DateUtil dateUtil
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.TREATMENT)
@@ -119,6 +121,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         this.profileFunction = profileFunction;
         this.activePlugin = activePlugin;
         this.fabricPrivacy = fabricPrivacy;
+        this.dateUtil = dateUtil;
     }
 
     @Override
@@ -339,7 +342,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                     last = t.date;
             }
         }
-        getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + DateUtil.dateAndTimeString(last));
+        getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + dateUtil.dateAndTimeString(last));
         return last;
     }
 
@@ -354,7 +357,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                     last = t.date;
             }
         }
-        getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + DateUtil.dateAndTimeString(last));
+        getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + dateUtil.dateAndTimeString(last));
         return last;
     }
 
@@ -643,7 +646,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (!allowUpdate && !creatOrUpdateResult.success) {
             getAapsLogger().error("Treatment could not be added to DB", new Exception());
 
-            String status = String.format(resourceHelper.gs(R.string.error_adding_treatment_message), treatment.insulin, (int) treatment.carbs, DateUtil.dateAndTimeString(treatment.date));
+            String status = String.format(resourceHelper.gs(R.string.error_adding_treatment_message), treatment.insulin, (int) treatment.carbs, dateUtil.dateAndTimeString(treatment.date));
 
             Intent i = new Intent(context, ErrorHelperActivity.class);
             i.putExtra("soundid", R.raw.error);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
index 673f9bdc23..63574ea8d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
@@ -42,6 +42,7 @@ class TreatmentsBolusFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -109,7 +110,7 @@ class TreatmentsBolusFragment : DaggerFragment() {
         override fun onBindViewHolder(holder: TreatmentsViewHolder, position: Int) {
             val profile = profileFunction.getProfile() ?: return
             val t = treatments[position]
-            holder.date.text = DateUtil.dateAndTimeString(t.date)
+            holder.date.text = dateUtil.dateAndTimeString(t.date)
             holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, t.insulin)
             holder.carbs.text = resourceHelper.gs(R.string.format_carbs, t.carbs.toInt())
             val iob = t.iobCalc(System.currentTimeMillis(), profile.dia)
@@ -158,7 +159,7 @@ class TreatmentsBolusFragment : DaggerFragment() {
                         val text = resourceHelper.gs(R.string.configbuilder_insulin) + ": " +
                             resourceHelper.gs(R.string.formatinsulinunits, treatment.insulin) + "\n" +
                             resourceHelper.gs(R.string.carbs) + ": " + resourceHelper.gs(R.string.format_carbs, treatment.carbs.toInt()) + "\n" +
-                            resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(treatment.date)
+                            resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(treatment.date)
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
                             if (treatment.source == Source.PUMP) {
                                 treatment.isValid = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
index d7a5e99496..9307238211 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
@@ -38,6 +38,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var translator: Translator
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -106,7 +107,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
         override fun onBindViewHolder(holder: CareportalEventsViewHolder, position: Int) {
             val careportalEvent = careportalEventList[position]
             holder.ns.visibility = if (NSUpload.isIdValid(careportalEvent._id)) View.VISIBLE else View.GONE
-            holder.date.text = DateUtil.dateAndTimeString(careportalEvent.date)
+            holder.date.text = dateUtil.dateAndTimeString(careportalEvent.date)
             holder.duration.text = if (careportalEvent.durationInMsec() == 0L) "" else DateUtil.niceTimeScalar(careportalEvent.durationInMsec(), resourceHelper)
             holder.note.text = careportalEvent.notes
             holder.type.text = translator.translate(careportalEvent.eventType)
@@ -132,7 +133,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
                     activity?.let { activity ->
                         val text = resourceHelper.gs(R.string.careportal_newnstreatment_eventtype) + ": " + translator.translate(careportalEvent.eventType) + "\n" +
                             resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + careportalEvent.notes + "\n" +
-                            resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(careportalEvent.date)
+                            resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(careportalEvent.date)
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
                             if (NSUpload.isIdValid(careportalEvent._id))
                                 NSUpload.removeCareportalEntryFromNS(careportalEvent._id)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
index 175fb81c97..d2dcd632ea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -64,7 +64,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
             holder.ph.visibility = if (extendedBolus.source == Source.PUMP) View.VISIBLE else View.GONE
             holder.ns.visibility = if (NSUpload.isIdValid(extendedBolus._id)) View.VISIBLE else View.GONE
             if (extendedBolus.isEndingEvent) {
-                holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date)
+                holder.date.text = dateUtil.dateAndTimeString(extendedBolus.date)
                 holder.duration.text = resourceHelper.gs(R.string.cancel)
                 holder.insulin.text = ""
                 holder.realDuration.text = ""
@@ -73,8 +73,8 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
                 holder.ratio.text = ""
             } else {
                 @SuppressLint("SetTextI18n")
-                if (extendedBolus.isInProgress) holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date)
-                else holder.date.text = DateUtil.dateAndTimeString(extendedBolus.date) + " - " + dateUtil.timeString(extendedBolus.end())
+                if (extendedBolus.isInProgress) holder.date.text = dateUtil.dateAndTimeString(extendedBolus.date)
+                else holder.date.text = dateUtil.dateAndTimeString(extendedBolus.date) + " - " + dateUtil.timeString(extendedBolus.end())
 
                 holder.duration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.durationInMinutes)
                 holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulin)
@@ -113,7 +113,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
                         showConfirmation(it, resourceHelper.gs(R.string.removerecord),
                             """
                 ${resourceHelper.gs(R.string.extended_bolus)}
-                ${resourceHelper.gs(R.string.date)}: ${DateUtil.dateAndTimeString(extendedBolus.date)}
+                ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(extendedBolus.date)}
                 """.trimIndent(), DialogInterface.OnClickListener { _: DialogInterface, _: Int ->
                             val id = extendedBolus._id
                             if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index d45d547ef0..77934e304c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -43,6 +43,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -95,7 +96,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
             val profileSwitch = profileSwitchList[position]
             holder.ph.visibility = (profileSwitch.source == Source.PUMP).toVisibility()
             holder.ns.visibility = NSUpload.isIdValid(profileSwitch._id).toVisibility()
-            holder.date.text = DateUtil.dateAndTimeString(profileSwitch.date)
+            holder.date.text = dateUtil.dateAndTimeString(profileSwitch.date)
             if (!profileSwitch.isEndingEvent) {
                 holder.duration.text = resourceHelper.gs(R.string.format_mins, profileSwitch.durationInMinutes)
             } else {
@@ -132,7 +133,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                         activity?.let { activity ->
                             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord),
                                 resourceHelper.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
-                                    "\n" + resourceHelper.gs(R.string.date) + ": " + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
+                                    "\n" + resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 val id = profileSwitch._id
                                 if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
                                 else UploadQueue.removeID("dbAdd", id)
@@ -141,10 +142,10 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                         }
                     R.id.profileswitch_clone                         ->
                         activity?.let { activity ->
-                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.customizedName + "\n" + DateUtil.dateAndTimeString(profileSwitch.date), Runnable {
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.customizedName + "\n" + dateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 profileSwitch.profileObject?.let {
                                     val nonCustomized = it.convertToNonCustomizedProfile()
-                                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, nonCustomized, profileSwitch.customizedName + " " + DateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
+                                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, nonCustomized, profileSwitch.customizedName + " " + dateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
                                     rxBus.send(EventLocalProfileChanged())
                                 }
                             })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index 8e1e6fb663..7df7db72be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -78,13 +78,13 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
             holder.ph.setVisibility(tempTarget.source == Source.PUMP ? View.VISIBLE : View.GONE);
             holder.ns.setVisibility(NSUpload.isIdValid(tempTarget._id) ? View.VISIBLE : View.GONE);
             if (!tempTarget.isEndingEvent()) {
-                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.date) + " - " + dateUtil.timeString(tempTarget.originalEnd()));
+                holder.date.setText(dateUtil.dateAndTimeString(tempTarget.date) + " - " + dateUtil.timeString(tempTarget.originalEnd()));
                 holder.duration.setText(DecimalFormatter.to0Decimal(tempTarget.durationInMinutes) + " min");
                 holder.low.setText(tempTarget.lowValueToUnitsToString(units));
                 holder.high.setText(tempTarget.highValueToUnitsToString(units));
                 holder.reason.setText(tempTarget.reason);
             } else {
-                holder.date.setText(DateUtil.dateAndTimeString(tempTarget.date));
+                holder.date.setText(dateUtil.dateAndTimeString(tempTarget.date));
                 holder.duration.setText(R.string.cancel);
                 holder.low.setText("");
                 holder.high.setText("");
@@ -142,7 +142,7 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
                     final TempTarget tempTarget = (TempTarget) v.getTag();
                     OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.removerecord),
                             resourceHelper.gs(R.string.careportal_temporarytarget) + ": " + tempTarget.friendlyDescription(profileFunction.getUnits(), resourceHelper) +
-                                    "\n" + DateUtil.dateAndTimeString(tempTarget.date),
+                                    "\n" + dateUtil.dateAndTimeString(tempTarget.date),
                             (dialog, id) -> {
                                 final String _id = tempTarget._id;
                                 if (NSUpload.isIdValid(_id)) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
index 99764c73bf..4ff6b15950 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -44,6 +44,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -88,7 +89,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
             holder.ph.visibility = if (tempBasal.source == Source.PUMP) View.VISIBLE else View.GONE
             holder.ns.visibility = if (NSUpload.isIdValid(tempBasal._id)) View.VISIBLE else View.GONE
             if (tempBasal.isEndingEvent) {
-                holder.date.text = DateUtil.dateAndTimeString(tempBasal.date)
+                holder.date.text = dateUtil.dateAndTimeString(tempBasal.date)
                 holder.duration.text = resourceHelper.gs(R.string.cancel)
                 holder.absolute.text = ""
                 holder.percent.text = ""
@@ -100,10 +101,10 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
                 holder.iob.setTextColor(holder.netRatio.currentTextColor)
             } else {
                 if (tempBasal.isInProgress) {
-                    holder.date.text = DateUtil.dateAndTimeString(tempBasal.date)
+                    holder.date.text = dateUtil.dateAndTimeString(tempBasal.date)
                     holder.date.setTextColor(resourceHelper.gc(R.color.colorActive))
                 } else {
-                    holder.date.text = DateUtil.dateAndTimeRangeString(tempBasal.date, tempBasal.end())
+                    holder.date.text = dateUtil.dateAndTimeRangeString(tempBasal.date, tempBasal.end())
                     holder.date.setTextColor(holder.netRatio.currentTextColor)
                 }
                 holder.duration.text = resourceHelper.gs(R.string.format_mins, tempBasal.durationInMinutes)
@@ -160,7 +161,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
                         showConfirmation(it, resourceHelper.gs(R.string.removerecord),
                             """
                 ${resourceHelper.gs(R.string.pump_tempbasal_label)}: ${tempBasal.toStringFull()}
-                ${resourceHelper.gs(R.string.date)}: ${DateUtil.dateAndTimeString(tempBasal.date)}
+                ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.date)}
                 """.trimIndent(),
                             DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
                                 val id = tempBasal._id
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
index a52a23bd09..f18ae1db9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSMBBolus.kt
@@ -17,6 +17,7 @@ class CommandSMBBolus(
     callback: Callback?
 ) : Command(injector, CommandType.SMB_BOLUS, callback) {
 
+    @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var activePlugin: ActivePluginProvider
 
     override fun execute() {
@@ -29,7 +30,7 @@ class CommandSMBBolus(
             r = activePlugin.activePump.deliverTreatment(detailedBolusInfo)
         } else {
             r = PumpEnactResult(injector).enacted(false).success(false).comment("SMB request too old")
-            aapsLogger.debug(LTag.PUMPQUEUE, "SMB bolus canceled. deliverAt: " + DateUtil.dateAndTimeString(detailedBolusInfo.deliverAt))
+            aapsLogger.debug(LTag.PUMPQUEUE, "SMB bolus canceled. deliverAt: " + dateUtil.dateAndTimeString(detailedBolusInfo.deliverAt))
         }
         aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
         callback?.result(r)?.run()
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index 4ca7055636..a3dda44325 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -39,6 +39,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
     @Inject lateinit var config: Config
+    @Inject lateinit var dateUtil: DateUtil
 
     companion object {
         private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
@@ -117,7 +118,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         val lastConnection = pump.lastDataTime()
         val isStatusOutdated = lastConnection + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis()
         val isBasalOutdated = abs(profile.basal - pump.baseBasalRate) > pump.pumpDescription.basalStep
-        aapsLogger.debug(LTag.CORE, "Last connection: " + DateUtil.dateAndTimeString(lastConnection))
+        aapsLogger.debug(LTag.CORE, "Last connection: " + dateUtil.dateAndTimeString(lastConnection))
         // sometimes keep alive broadcast stops
         // as as workaround test if readStatus was requested before an alarm is generated
         if (lastReadStatus != 0L && lastReadStatus > System.currentTimeMillis() - T.mins(5).msecs()) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
index 77a269712f..eff444aa6e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -30,7 +30,8 @@ class LocalAlertUtils @Inject constructor(
     private val activePlugin: ActivePluginProvider,
     private val profileFunction: ProfileFunction,
     private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
-    private val config: Config
+    private val config: Config,
+    private val dateUtil: DateUtil
 ) {
 
     fun missedReadingsThreshold(): Long {
@@ -46,7 +47,7 @@ class LocalAlertUtils @Inject constructor(
         val nextAlarmOccurrenceReached = sp.getLong("nextPumpDisconnectedAlarm", 0L) < System.currentTimeMillis()
         if (config.APS && sp.getBoolean(resourceHelper.gs(R.string.key_enable_pump_unreachable_alert), true)
             && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached && !isDisconnected) {
-            aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + DateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
+            aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated)
             val n = Notification(Notification.PUMP_UNREACHABLE, resourceHelper.gs(R.string.pump_unreachable), Notification.URGENT)
             n.soundId = R.raw.alarm
             sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
index 38ef842f8d..0bfa1cbd0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SntpClient.java
@@ -23,6 +23,10 @@ import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
@@ -38,31 +42,42 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
  * }
  * </pre>
  */
+@Singleton
 public class SntpClient {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.CORE);
+    private final AAPSLogger aapsLogger;
+    private final DateUtil dateUtil;
+    
+    //private final int REFERENCE_TIME_OFFSET = 16;
+    private final int ORIGINATE_TIME_OFFSET = 24;
+    private final int RECEIVE_TIME_OFFSET = 32;
+    private final int TRANSMIT_TIME_OFFSET = 40;
+    private final int NTP_PACKET_SIZE = 48;
 
-    //private static final int REFERENCE_TIME_OFFSET = 16;
-    private static final int ORIGINATE_TIME_OFFSET = 24;
-    private static final int RECEIVE_TIME_OFFSET = 32;
-    private static final int TRANSMIT_TIME_OFFSET = 40;
-    private static final int NTP_PACKET_SIZE = 48;
+    private final int NTP_PORT = 123;
+    private final int NTP_MODE_CLIENT = 3;
+    private final int NTP_VERSION = 3;
 
-    private static final int NTP_PORT = 123;
-    private static final int NTP_MODE_CLIENT = 3;
-    private static final int NTP_VERSION = 3;
+    @Inject
+    public SntpClient(
+        AAPSLogger aapsLogger,
+        DateUtil dateUtil
+    ) {
+        this.aapsLogger = aapsLogger;
+        this.dateUtil = dateUtil;
+    }
 
     // Number of seconds between Jan 1, 1900 and Jan 1, 1970
     // 70 years plus 17 leap days
-    private static final long OFFSET_1900_TO_1970 = ((365L * 70L) + 17L) * 24L * 60L * 60L;
+    private final long OFFSET_1900_TO_1970 = ((365L * 70L) + 17L) * 24L * 60L * 60L;
 
     // system time computed from NTP server response
-    private static long mNtpTime;
+    private long mNtpTime;
 
     // value of SystemClock.elapsedRealtime() corresponding to mNtpTime
-    private static long mNtpTimeReference;
+    private long mNtpTimeReference;
 
     // round trip time in milliseconds
-    private static long mRoundTripTime;
+    private long mRoundTripTime;
 
     public static abstract class Callback implements Runnable {
         public boolean networkConnected = false;
@@ -70,7 +85,7 @@ public class SntpClient {
         public long time = 0;
     }
 
-    public static synchronized void ntpTime(final Callback callback, boolean isConnected) {
+    public synchronized void ntpTime(final Callback callback, boolean isConnected) {
         callback.networkConnected = isConnected;
         if (callback.networkConnected) {
             new Thread(() -> doNtpTime(callback)).start();
@@ -79,11 +94,11 @@ public class SntpClient {
         }
     }
 
-    static void doNtpTime(final Callback callback) {
-        log.debug("Time detection started");
+    void doNtpTime(final Callback callback) {
+        aapsLogger.debug("Time detection started");
         callback.success = requestTime("time.google.com", 5000);
         callback.time = getNtpTime() + SystemClock.elapsedRealtime() - getNtpTimeReference();
-        log.debug("Time detection ended: " + callback.success + " " + DateUtil.dateAndTimeString(getNtpTime()));
+        aapsLogger.debug("Time detection ended: " + callback.success + " " + dateUtil.dateAndTimeString(getNtpTime()));
         callback.run();
     }
 
@@ -94,7 +109,7 @@ public class SntpClient {
      * @param timeout network timeout in milliseconds.
      * @return true if the transaction was successful.
      */
-    private static synchronized boolean requestTime(String host, int timeout) {
+    private synchronized boolean requestTime(String host, int timeout) {
         try {
             DatagramSocket socket = new DatagramSocket();
             socket.setSoTimeout(timeout);
@@ -144,7 +159,7 @@ public class SntpClient {
             mNtpTimeReference = responseTicks;
             mRoundTripTime = roundTripTime;
         } catch (Exception e) {
-            log.debug("request time failed: " + e);
+            aapsLogger.debug("request time failed: " + e);
             return false;
         }
 
@@ -156,7 +171,7 @@ public class SntpClient {
      *
      * @return time value computed from NTP server response.
      */
-    private static long getNtpTime() {
+    private long getNtpTime() {
         return mNtpTime;
     }
 
@@ -166,7 +181,7 @@ public class SntpClient {
      *
      * @return reference clock corresponding to the NTP time.
      */
-    private static long getNtpTimeReference() {
+    private long getNtpTimeReference() {
         return mNtpTimeReference;
     }
 
@@ -182,7 +197,7 @@ public class SntpClient {
     /**
      * Reads an unsigned 32 bit big endian number from the given offset in the buffer.
      */
-    private static long read32(byte[] buffer, int offset) {
+    private long read32(byte[] buffer, int offset) {
         byte b0 = buffer[offset];
         byte b1 = buffer[offset + 1];
         byte b2 = buffer[offset + 2];
@@ -201,7 +216,7 @@ public class SntpClient {
      * Reads the NTP time stamp at the given offset in the buffer and returns
      * it as a system time (milliseconds since January 1, 1970).
      */
-    private static long readTimeStamp(byte[] buffer, int offset) {
+    private long readTimeStamp(byte[] buffer, int offset) {
         long seconds = read32(buffer, offset);
         long fraction = read32(buffer, offset + 4);
         return ((seconds - OFFSET_1900_TO_1970) * 1000) + ((fraction * 1000L) / 0x100000000L);
@@ -211,7 +226,7 @@ public class SntpClient {
      * Writes system time (milliseconds since January 1, 1970) as an NTP time stamp
      * at the given offset in the buffer.
      */
-    private static void writeTimeStamp(byte[] buffer, int offset, long time) {
+    private void writeTimeStamp(byte[] buffer, int offset, long time) {
         long seconds = time / 1000L;
         long milliseconds = time - seconds * 1000L;
         seconds += OFFSET_1900_TO_1970;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 892f9b2667..3386dd9235 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -29,6 +29,7 @@ import java.util.List;
 
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
@@ -36,7 +37,8 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
  */
 
 public class TimeListEdit {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(TimeListEdit.class);
+    private final AAPSLogger aapsLogger;
+    private final DateUtil dateUtil;
 
     private final int ONEHOURINSECONDS = 60 * 60;
 
@@ -65,8 +67,14 @@ public class TimeListEdit {
     private int inflatedUntil = -1;
 
 
-    public TimeListEdit(Context context, View view, int resLayoutId, String tagPrefix, String label, JSONArray data1, JSONArray data2, double min, double max, double step, NumberFormat formatter, Runnable save) {
+    public TimeListEdit(
+            Context context,
+            AAPSLogger aapsLogger,
+            DateUtil dateUtil,
+            View view, int resLayoutId, String tagPrefix, String label, JSONArray data1, JSONArray data2, double min, double max, double step, NumberFormat formatter, Runnable save) {
         this.context = context;
+        this.aapsLogger = aapsLogger;
+        this.dateUtil = dateUtil;
         this.view = view;
         this.resLayoutId = resLayoutId;
         this.tagPrefix = tagPrefix;
@@ -281,7 +289,7 @@ public class TimeListEdit {
         ArrayList<Integer> timeListValues = new ArrayList<>();
         int pos = 0;
         for (int t = previous + ONEHOURINSECONDS; t < next; t += ONEHOURINSECONDS) {
-            timeList.add(DateUtil.timeStringFromSeconds(t));
+            timeList.add(dateUtil.timeStringFromSeconds(t));
             timeListValues.add(t);
             if (secondsFromMidnight == t) posInList = pos;
             pos++;
@@ -311,7 +319,7 @@ public class TimeListEdit {
                 return time;
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -323,7 +331,7 @@ public class TimeListEdit {
                 return item.getDouble("value");
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return 0d;
     }
@@ -336,7 +344,7 @@ public class TimeListEdit {
                     return item.getDouble("value");
                 }
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception", e);
             }
         }
         return 0d;
@@ -362,7 +370,7 @@ public class TimeListEdit {
                 data2.put(index, newObject2);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
     }
@@ -383,7 +391,7 @@ public class TimeListEdit {
             // add new object
             editItem(index, timeAsSeconds, value1, value2);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
     }
@@ -396,7 +404,7 @@ public class TimeListEdit {
 
     private void log() {
         for (int i = 0; i < data1.length(); i++) {
-            log.debug(i + ": @" + DateUtil.timeStringFromSeconds(secondFromMidnight(i)) + " " + value1(i) + (data2 != null ? " " + value2(i) : ""));
+            aapsLogger.debug(i + ": @" + dateUtil.timeStringFromSeconds(secondFromMidnight(i)) + " " + value1(i) + (data2 != null ? " " + value2(i) : ""));
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 6d4895f1f3..6ee3024fc6 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -31,8 +31,9 @@ class TddCalculator @Inject constructor(
     val sp: SP,
     val activePlugin: ActivePluginProvider,
     val profileFunction: ProfileFunction,
-    fabricPrivacy: FabricPrivacy
-) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, mainApp, sp, profileFunction, activePlugin, fabricPrivacy) {
+    fabricPrivacy: FabricPrivacy,
+    private val dateUtil: DateUtil
+) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, mainApp, sp, profileFunction, activePlugin, fabricPrivacy, dateUtil) {
 
     init {
         service = TreatmentService(injector) // plugin is not started
@@ -85,18 +86,18 @@ class TddCalculator @Inject constructor(
         return totalTdd
     }
 
-    fun stats(dateUtil: DateUtil): Spanned {
+    fun stats(): Spanned {
         val tdds = calculate(7)
         val averageTdd = averageTDD(tdds)
         return HtmlHelper.fromHtml(
             "<b>" + resourceHelper.gs(R.string.tdd) + ":</b><br>" +
-                toText(tdds, dateUtil) +
+                toText(tdds) +
                 "<b>" + resourceHelper.gs(R.string.average) + ":</b><br>" +
                 averageTdd.toText(resourceHelper, tdds.size())
         )
     }
 
-    private fun toText(tdds: LongSparseArray<TDD>, dateUtil: DateUtil): String {
+    private fun toText(tdds: LongSparseArray<TDD>): String {
         var t = ""
         for (i in 0 until tdds.size()) {
             t += "${tdds.valueAt(i).toText(resourceHelper, dateUtil)}<br>"
diff --git a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
index 188266fbb3..7542f104e7 100644
--- a/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
+++ b/app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -26,6 +27,7 @@ open class TestBaseWithProfile : TestBase() {
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
+    @Mock lateinit var dateUtil: DateUtil
 
     val rxBus = RxBusWrapper()
 
@@ -37,12 +39,14 @@ open class TestBaseWithProfile : TestBase() {
                 it.resourceHelper = resourceHelper
                 it.rxBus = rxBus
                 it.fabricPrivacy = fabricPrivacy
+                it.configInterface = Config()
             }
             if (it is ProfileSwitch) {
                 it.treatmentsPlugin = treatmentsPlugin
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
+                it.dateUtil = dateUtil
             }
             if (it is Treatment) {
                 it.activePlugin = activePluginProvider
diff --git a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
index 7e37b24660..4b930d4947 100644
--- a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
@@ -1,13 +1,16 @@
 package info.nightscout.androidaps.db
 
+import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
@@ -31,6 +34,7 @@ class BgReadingTest : TestBase() {
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
@@ -55,21 +59,21 @@ class BgReadingTest : TestBase() {
     fun directionToSymbol() {
         val bgReading = BgReading(injector)
         bgReading.direction = "DoubleDown"
-        Assert.assertEquals("\u21ca", bgReading.directionToSymbol())
+        Assert.assertEquals("\u21ca", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "SingleDown"
-        Assert.assertEquals("\u2193", bgReading.directionToSymbol())
+        Assert.assertEquals("\u2193", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "FortyFiveDown"
-        Assert.assertEquals("\u2198", bgReading.directionToSymbol())
+        Assert.assertEquals("\u2198", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "Flat"
-        Assert.assertEquals("\u2192", bgReading.directionToSymbol())
+        Assert.assertEquals("\u2192", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "FortyFiveUp"
-        Assert.assertEquals("\u2197", bgReading.directionToSymbol())
+        Assert.assertEquals("\u2197", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "SingleUp"
-        Assert.assertEquals("\u2191", bgReading.directionToSymbol())
+        Assert.assertEquals("\u2191", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "DoubleUp"
-        Assert.assertEquals("\u21c8", bgReading.directionToSymbol())
+        Assert.assertEquals("\u21c8", bgReading.directionToSymbol(databaseHelper))
         bgReading.direction = "OUT OF RANGE"
-        Assert.assertEquals("??", bgReading.directionToSymbol())
+        Assert.assertEquals("??", bgReading.directionToSymbol(databaseHelper))
     }
 
     @Test fun dateTest() {
@@ -88,8 +92,8 @@ class BgReadingTest : TestBase() {
     }
 
     @Test fun copyFromTest() {
-        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
-        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
+//        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
+//        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
         setReadings(72, 0)
         val bgReading = BgReading(injector)
         val copy = BgReading(injector)
@@ -100,7 +104,7 @@ class BgReadingTest : TestBase() {
         copy.copyFrom(bgReading)
         Assert.assertEquals(81.0, copy.value, 0.1)
         Assert.assertEquals(now, copy.date)
-        Assert.assertEquals(bgReading.directionToSymbol(), copy.directionToSymbol())
+        Assert.assertEquals(bgReading.directionToSymbol(databaseHelper), copy.directionToSymbol(databaseHelper))
     }
 
     @Test
@@ -119,34 +123,28 @@ class BgReadingTest : TestBase() {
     @Test fun calculateDirection() {
         val bgReading = BgReading(injector)
         val bgReadingsList: List<BgReading>? = null
-        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
-        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
-        `when`(MainApp.getDbHelper().getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadingsList)
-        Assert.assertEquals("NONE", bgReading.calculateDirection())
+//        val databaseHelper = Mockito.mock(DatabaseHelper::class.java)
+//        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
+        `when`(databaseHelper.getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadingsList)
+        Assert.assertEquals("NONE", bgReading.calculateDirection(databaseHelper))
         setReadings(72, 0)
-        Assert.assertEquals("DoubleUp", bgReading.calculateDirection())
+        Assert.assertEquals("DoubleUp", bgReading.calculateDirection(databaseHelper))
         setReadings(76, 60)
-        Assert.assertEquals("SingleUp", bgReading.calculateDirection())
+        Assert.assertEquals("SingleUp", bgReading.calculateDirection(databaseHelper))
         setReadings(74, 65)
-        Assert.assertEquals("FortyFiveUp", bgReading.calculateDirection())
+        Assert.assertEquals("FortyFiveUp", bgReading.calculateDirection(databaseHelper))
         setReadings(72, 72)
-        Assert.assertEquals("Flat", bgReading.calculateDirection())
+        Assert.assertEquals("Flat", bgReading.calculateDirection(databaseHelper))
         setReadings(0, 72)
-        Assert.assertEquals("DoubleDown", bgReading.calculateDirection())
+        Assert.assertEquals("DoubleDown", bgReading.calculateDirection(databaseHelper))
         setReadings(60, 76)
-        Assert.assertEquals("SingleDown", bgReading.calculateDirection())
+        Assert.assertEquals("SingleDown", bgReading.calculateDirection(databaseHelper))
         setReadings(65, 74)
-        Assert.assertEquals("FortyFiveDown", bgReading.calculateDirection())
+        Assert.assertEquals("FortyFiveDown", bgReading.calculateDirection(databaseHelper))
     }
 
     @Before
     fun prepareMock() {
-        val mainApp = PowerMockito.mockStatic(MainApp::class.java)
-//        AAPSMocker.mockApplicationContext()
-//        AAPSMocker.mockSP()
-//        AAPSMocker.mockL()
-//        AAPSMocker.mockDatabaseHelper()
-//        `when`(mainApp.androidInjector()).thenReturn(injector.androidInjector())
     }
 
     fun setReadings(current_value: Int, previous_value: Int) {
@@ -159,6 +157,6 @@ class BgReadingTest : TestBase() {
         val bgReadings: MutableList<BgReading> = mutableListOf()
         bgReadings.add(now)
         bgReadings.add(previous)
-        `when`(MainApp.getDbHelper().getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadings)
+        `when`(databaseHelper.getAllBgreadingsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(bgReadings)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index fda1b15ae5..43451779f6 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.interfaces
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -57,7 +58,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
     @Mock lateinit var profiler: Profiler
 
-    private var buildHelper = BuildHelper()
+    private var buildHelper = BuildHelper(Config())
     lateinit var danaRPump: DanaRPump
 
     lateinit var constraintChecker: ConstraintChecker
@@ -110,14 +111,14 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
 
         danaRPump = DanaRPump(aapsLogger, sp, injector)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
-        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp)
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
         val constraintsPluginsList = ArrayList<PluginBase?>()
         constraintsPluginsList.add(safetyPlugin)
         constraintsPluginsList.add(objectivesPlugin)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
index b4dc882882..a0cd07823e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.constraints.objectives
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -38,7 +38,7 @@ class ObjectivesPluginTest : TestBase() {
     }
 
     @Before fun prepareMock() {
-        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp)
+        objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         objectivesPlugin.onStart()
         `when`(resourceHelper.gs(R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started")
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
index 3e36b8bca0..20474af664 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.constraints.safety
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -73,7 +74,7 @@ class SafetyPluginTest : TestBaseWithProfile() {
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
-        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin)
+        safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
     }
 
     @Test fun pumpDescriptionShouldLimitLoopInvocation() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
index f172acb741..b628f6035a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
@@ -95,7 +95,7 @@ class TriggerBgTest : TriggerTestBase() {
 
     private fun generateOneCurrentRecordBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":" + (now - 1) + ",\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":214,\"mills\":" + (now - 1) + ",\"direction\":\"Flat\"}"))))
         return list
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
index ebf0a57fc1..97c26dbcd0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
@@ -103,14 +103,14 @@ class TriggerDeltaTest : TriggerTestBase() {
 
     private fun generateValidBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
-        list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
+        list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
         return list
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
index 3cbaa271f2..2b35932914 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
@@ -51,6 +52,15 @@ open class TriggerTestBase : TestBaseWithProfile() {
             if (it is TriggerBg) {
                 it.profileFunction = profileFunction
             }
+            if (it is TriggerTime) {
+                it.dateUtil = dateUtil
+            }
+            if (it is TriggerTimeRange) {
+                it.dateUtil = dateUtil
+            }
+            if (it is TriggerRecurringTime) {
+                it.dateUtil = dateUtil
+            }
             if (it is TriggerBTDevice) {
                 it.context = context
                 it.automationPlugin = automationPlugin
@@ -68,6 +78,9 @@ open class TriggerTestBase : TestBaseWithProfile() {
             if (it is StaticLabel) {
                 it.resourceHelper = resourceHelper
             }
+            if (it is BgReading) {
+                it.dateUtil = dateUtil
+            }
         }
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
index e66c001aee..26706da190 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePluginTest.kt
@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.general.maintenance
 
 import android.content.Context
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -32,7 +32,7 @@ class MaintenancePluginTest : TestBase() {
 
     @Before
     fun mock() {
-        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper)
+        sut = MaintenancePlugin(injector, context, resourceHelper, sp, nsSettingsStatus, aapsLogger, buildHelper, Config())
     }
 
     @Test fun logfilesTest() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index bf96b45765..1e4d27804d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.general.smsCommunicator
 
+import android.content.Context
 import android.telephony.SmsManager
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
@@ -25,7 +27,10 @@ import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.CommandQueue
-import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.XdripCalibrations
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
@@ -46,6 +51,7 @@ import java.util.*
 @PrepareForTest(ConstraintChecker::class, FabricPrivacy::class, VirtualPumpPlugin::class, XdripCalibrations::class, SmsManager::class, CommandQueue::class, LocalProfilePlugin::class, DateUtil::class, IobCobCalculatorPlugin::class, OneTimePassword::class)
 class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var sp: SP
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var activePlugin: ActivePluginProvider
@@ -103,7 +109,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(SmsManager.getDefault()).thenReturn(smsManager)
         `when`(sp.getString(R.string.key_smscommunicator_allowednumbers, "")).thenReturn("1234;5678")
 
-        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculatorPlugin, xdripCalibrations, otp)
+        smsCommunicatorPlugin = SmsCommunicatorPlugin(injector, aapsLogger, resourceHelper, sp, constraintChecker, rxBus, profileFunction, fabricPrivacy, activePlugin, commandQueue, loopPlugin, iobCobCalculatorPlugin, xdripCalibrations, otp, Config(), DateUtil(context, resourceHelper))
         smsCommunicatorPlugin.setPluginEnabled(PluginType.GENERAL, true)
         Mockito.doAnswer { invocation: InvocationOnMock ->
             val callback = invocation.getArgument<Callback>(1)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
index d0a5f7ebeb..b7b421035b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
@@ -30,6 +30,7 @@ import java.util.*
 @PrepareForTest(IobCobCalculatorPlugin::class, DateUtil::class)
 class GlucoseStatusTest : TestBase() {
 
+    @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
 
     val injector = HasAndroidInjector {
@@ -38,6 +39,9 @@ class GlucoseStatusTest : TestBase() {
                 it.aapsLogger = aapsLogger
                 it.iobCobCalculatorPlugin = iobCobCalculatorPlugin
             }
+            if (it is BgReading) {
+                it.dateUtil = dateUtil
+            }
         }
     }
 
@@ -129,14 +133,14 @@ class GlucoseStatusTest : TestBase() {
     private fun generateValidBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
         try {
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}")))) // +2
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":219,\"mills\":1514766300000,\"direction\":\"Flat\"}")))) // +3
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":223,\"mills\":1514766000000,\"direction\":\"Flat\"}")))) // +4
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":222,\"mills\":1514765700000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":224,\"mills\":1514765400000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":226,\"mills\":1514765100000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
         } catch (e: JSONException) {
             throw RuntimeException(e)
         }
@@ -146,9 +150,9 @@ class GlucoseStatusTest : TestBase() {
     private fun generateMostRecentBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
         try {
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766800000,\"direction\":\"Flat\"}")))) // +2
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766800000,\"direction\":\"Flat\"}")))) // +2
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":216,\"mills\":1514766600000,\"direction\":\"Flat\"}"))))
         } catch (e: JSONException) {
             throw RuntimeException(e)
         }
@@ -162,7 +166,7 @@ class GlucoseStatusTest : TestBase() {
     private fun generateOldBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
         try {
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":228,\"mills\":1514764800000,\"direction\":\"Flat\"}"))))
         } catch (e: JSONException) {
             throw RuntimeException(e)
         }
@@ -172,7 +176,7 @@ class GlucoseStatusTest : TestBase() {
     private fun generateOneCurrentRecordBgData(): List<BgReading> {
         val list: MutableList<BgReading> = ArrayList()
         try {
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":214,\"mills\":1514766900000,\"direction\":\"Flat\"}"))))
         } catch (e: JSONException) {
             throw RuntimeException(e)
         }
@@ -185,15 +189,15 @@ class GlucoseStatusTest : TestBase() {
             val endTime = 1514766900000L
             val latestReading = 100.0
             // Now
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":$latestReading,\"mills\":$endTime,\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":$latestReading,\"mills\":$endTime,\"direction\":\"Flat\"}"))))
             // One minute ago
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 1) + ",\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 1) + ",\"direction\":\"Flat\"}"))))
             // Two minutes ago
-            list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 2) + ",\"direction\":\"Flat\"}"))))
+            list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":" + latestReading + ",\"mills\":" + (endTime - 1000 * 60 * 2) + ",\"direction\":\"Flat\"}"))))
 
             // Three minutes and beyond at constant rate
             for (i in 3..49) {
-                list.add(BgReading(NSSgv(JSONObject("{\"mgdl\":" + (latestReading + i * 2) + ",\"mills\":" + (endTime - 1000 * 60 * i) + ",\"direction\":\"Flat\"}"))))
+                list.add(BgReading(injector, NSSgv(JSONObject("{\"mgdl\":" + (latestReading + i * 2) + ",\"mills\":" + (endTime - 1000 * 60 * i) + ",\"direction\":\"Flat\"}"))))
             }
         } catch (e: JSONException) {
             throw RuntimeException(e)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
index 595c8215d7..a34d8b5022 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
@@ -42,6 +42,7 @@ class IobCobCalculatorPluginTest : TestBase() {
     @Mock lateinit var sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin
     @Mock lateinit var defaultValueHelper: DefaultValueHelper
     @Mock lateinit var fabricPrivacy: FabricPrivacy
+    @Mock lateinit var dateUtil: DateUtil
 
     lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
 
@@ -52,13 +53,14 @@ class IobCobCalculatorPluginTest : TestBase() {
                 it.defaultValueHelper = defaultValueHelper
                 it.resourceHelper = resourceHelper
                 it.profileFunction = profileFunction
+                it.dateUtil = dateUtil
             }
         }
     }
 
     @Before
     fun mock() {
-        iobCobCalculatorPlugin = IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction, activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy)
+        iobCobCalculatorPlugin = IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction, activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index d3f14725af..0880445d72 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -44,7 +44,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaRPump = DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
     }
 
     @Test @Throws(Exception::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 8392d74120..e2d094de22 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
@@ -16,6 +17,7 @@ open class DanaRTestBase : TestBase() {
     @Mock lateinit var sp: SP
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var activePluginProvider: ActivePluginProvider
+    @Mock lateinit var dateUtil: DateUtil
 
     val injector = HasAndroidInjector {
         AndroidInjector {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index d8a2d12b20..efd97bea09 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -36,7 +36,7 @@ class MessageHashTableRTest : DanaRTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, injector)
+        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, injector, dateUtil)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
index afb5e6ec6c..e70a9bfe9a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -11,7 +11,7 @@ class MsgHistoryAlarmTest : DanaRTestBase() {
     val rxBus = RxBusWrapper()
 
     @Test fun runTest() {
-        val packet = MsgHistoryAlarm(aapsLogger, rxBus)
+        val packet = MsgHistoryAlarm(aapsLogger, rxBus, dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
index 47401ff67b..694a523a67 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -18,7 +18,7 @@ class MsgHistoryAllTest : DanaRTestBase() {
     @Test fun runTest() {
         PowerMockito.mockStatic(MainApp::class.java)
         `when`(MainApp.getDbHelper()).thenReturn(PowerMockito.mock(DatabaseHelper::class.java))
-        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper(), dateUtil)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
index dd7d81502a..4240454bb9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBasalHourTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
index 5edd07ed2e..f93be7d72e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
index 225ea67259..e30cf23e14 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryCarboTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
index b6ef8be268..9c52a30bde 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDailyInsulinTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
index 756139c88b..e32d657577 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryError(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryError(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
index e460432652..1e01007392 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
index 52d000d56d..9cf8f16263 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
index 1a2014cb2b..1cfbee9c64 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryRefillTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper())
+        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
index 5863a7596c..d9b6576cda 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistorySuspendTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper())
+        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper(), dateUtil)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index c314b5d882..678842b9ae 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -24,7 +24,7 @@ class MsgInitConnStatusTimeTest : DanaRTestBase() {
     @Mock lateinit var commandQueue: CommandQueueProvider
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue)
+        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
index 067d368591..1b5ed6e857 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -10,7 +10,7 @@ import java.util.*
 class MsgSetTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetTime(aapsLogger, Date(System.currentTimeMillis()))
+        val packet = MsgSetTime(aapsLogger, dateUtil, Date(System.currentTimeMillis()))
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 7a40b86a07..28b69b98ef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -11,7 +11,7 @@ import java.util.*
 class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingPumpTime(aapsLogger, danaRPump)
+        val packet = MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil)
         danaRPump.units = DanaRPump.UNITS_MGDL
         // test message decoding
         val bytes = createArray(34, 7.toByte())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index 67403dfcd3..74bf318496 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -18,7 +18,7 @@ class MsgStatusBolusExtendedTest : DanaRTestBase() {
     @Test
     fun runTest() {
         `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin)
+        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index b4f61fd220..e35a45ed1f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -45,7 +45,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaRPump = DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue)
+        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, dateUtil)
     }
 
     @Test @Throws(Exception::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index f72d6cde94..94df6cc4fe 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -31,7 +31,7 @@ class MessageHashTableRKoreanTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, injector)
+        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index 3f5da64f27..81b3524543 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -63,6 +63,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index 8fe1009923..1907eef740 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import android.content.Context
 import com.cozmo.danar.util.BleCommandUtil
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -7,6 +8,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -19,6 +21,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
 class DanaRSMessageHashTableTest : DanaRSTestBase() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var constraintChecker: ConstraintChecker
@@ -28,8 +31,8 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
-        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage, injector)
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, 0, 0, 0)
+        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage, injector, DateUtil(context, resourceHelper))
+        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleCommandUtil.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
index f983386933..e97edfb860 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
+import android.content.Context
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -17,6 +18,7 @@ import java.util.*
 @PrepareForTest(RxBusWrapper::class, DetailedBolusInfoStorage::class)
 class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var danaRSPlugin: DanaRSPlugin
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
@@ -24,7 +26,7 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
     @Test fun runTest() {
         val now = DateUtil.now()
 
-        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, now)
+        val testPacket = DanaRS_Packet_APS_History_Events(aapsLogger, rxBus, resourceHelper, activePlugin, danaRSPlugin, detailedBolusInfoStorage, injector, DateUtil(context, resourceHelper),  now)
         // test getRequestedParams
         val returnedValues = testPacket.requestParams
         val expectedValues = getCalender(now)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index 33e343ee08..402352f235 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -14,19 +14,19 @@ class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() { // test for negative carbs
         val now = DateUtil.now()
-        var historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, -1, 0)
+        var historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, now, -1, 0)
         var testparams = historyTest.requestParams
         Assert.assertEquals(0.toByte(), testparams[8])
         // 5g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         // 150g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 150, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, now, 150, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(150.toByte(), testparams[8])
         // test message generation
-        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         Assert.assertEquals(11, testparams.size)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
index f8e3472c8e..ca70660272 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Basal_Get_Temporary_Basal_State(aapsLogger, danaRPump, dateUtil)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1.toByte())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index 86239a8ea1..ecfbd0ef40 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump, dateUtil)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index bcc56e2f92..b05a2643f9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -44,7 +44,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index 327aa1c8a6..4297e7683d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -11,13 +11,13 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump, dateUtil)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(13, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump, dateUtil)
         packet.handleMessage(createArray(15, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(15, 161.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index 3de89db27b..cd3f76de5c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -9,14 +9,14 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        var packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        var packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil)
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
-        packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump)
+        packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil)
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
index 743d3f66e7..5a5c6c4e81 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__ALARM", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
index 1f7dd00783..0a0f87fe56 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_All_HistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_All_History(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_All_History(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__ALL_HISTORY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
index 8451e90b0f..86e962d1df 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_BasalTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Basal(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Basal(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BASAL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
index 0442ea98b9..6cb0c847fc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_Blood_GlucoseTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BLOOD_GLUCOSE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
index badaa0aa10..da4c629042 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_BolusTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Bolus(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Bolus(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__BOLUS", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
index 22a99fcc53..2fc07b5eda 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_CarbohydrateTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__CARBOHYDRATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
index 91d4bea862..c1e4a772c6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_DailyTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Daily(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Daily(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__DAILY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
index 19c8d2ef4e..a53a5c0812 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_PrimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Prime(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Prime(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__PRIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
index 8b75ec344f..29641db16e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_RefillTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Refill(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Refill(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__REFILL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
index 66b06f4ed7..5bd6ce327d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_SuspendTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Suspend(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Suspend(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__SUSPEND", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
index a4e436a373..1c193ea587 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_History_TemporaryTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Temporary(aapsLogger, rxBus, System.currentTimeMillis())
+        val packet = DanaRS_Packet_History_Temporary(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
         Assert.assertEquals("REVIEW__TEMPORARY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 0f90812ed0..d91872f922 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -61,7 +61,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
         danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 8f74812e9e..9ed05dd6f1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump)
+        val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump, dateUtil)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
index 5fd034e5b6..e6c32cc43a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -13,7 +13,7 @@ import java.util.*
 class DanaRS_Packet_Option_Set_Pump_TimeTest : DanaRSTestBase() {
 
     @Test fun runTest() {
-        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, DateUtil.now())
+        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, dateUtil, DateUtil.now())
         // test params
         val params = packet.requestParams
         Assert.assertEquals((Date().date and 0xff).toByte(), params[2])
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index 23285e59e3..1c7a6083b5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -45,7 +45,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaRPump = DanaRPump(aapsLogger, sp, injector)
-        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, detailedBolusInfoStorage)
+        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, detailedBolusInfoStorage, dateUtil)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index b84258c00b..b497e88b95 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import android.content.Context
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -13,6 +14,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
@@ -26,6 +28,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
 class MessageHashTable_rv2Test : DanaRTestBase() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var rxBus: RxBusWrapper
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var constraintChecker: ConstraintChecker
@@ -41,7 +44,7 @@ class MessageHashTable_rv2Test : DanaRTestBase() {
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin, injector)
+        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin, injector, DateUtil(context, resourceHelper))
         val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaRPump)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
index 0c3d40916a..bcfacf1e81 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import android.content.Context
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
@@ -17,13 +19,14 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DetailedBolusInfoStorage::class)
 class MsgHistoryEvents_v2Test : DanaRTestBase() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
     @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
 
     @Test @Throws(Exception::class) fun runTest() {
-        var packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), treatmentsPlugin, injector, 0)
+        var packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), treatmentsPlugin, injector, DateUtil(context, resourceHelper), 0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
index fa98c68830..fefc050457 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTempBasal_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusTempBasal_v2(aapsLogger, danaRPump)
+        val packet = MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil)
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
         Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
index db6d30ef59..cdafb560a6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPluginUTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.virtual
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -9,6 +10,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -32,12 +34,13 @@ class VirtualPumpPluginUTest : TestBase() {
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
     @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var dateUtil: DateUtil
 
     lateinit var virtualPumpPlugin: VirtualPumpPlugin
 
     @Before
     fun prepareMocks() {
-        virtualPumpPlugin = VirtualPumpPlugin(HasAndroidInjector { AndroidInjector { } }, aapsLogger, rxBus, fabricPrivacy, resourceHelper, sp, profileFunction, treatmentsPlugin, commandQueue)
+        virtualPumpPlugin = VirtualPumpPlugin(HasAndroidInjector { AndroidInjector { } }, aapsLogger, rxBus, fabricPrivacy, resourceHelper, sp, profileFunction, treatmentsPlugin, commandQueue, Config(), dateUtil)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
index 000a718c01..f410b29a94 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPluginTest.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.sensitivity
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface
 import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensResult
@@ -24,7 +25,7 @@ class AbstractSensitivityPluginTest : TestBase() {
 
     private inner class SensitivityTestClass(pluginDescription: PluginDescription, aapsLogger: AAPSLogger, resourceHelper: ResourceHelper, sp: SP) : AbstractSensitivityPlugin(pluginDescription, HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, resourceHelper, sp) {
 
-        override fun detectSensitivity(plugin: IobCobCalculatorPlugin, fromTime: Long, toTime: Long): AutosensResult {
+        override fun detectSensitivity(plugin: IobCobCalculatorInterface, fromTime: Long, toTime: Long): AutosensResult {
             return AutosensResult()
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
index 8aa4ccad2d..f36a10ec7e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
@@ -58,7 +58,7 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
         `when`(profileFunction.getProfile(ArgumentMatchers.anyLong())).thenReturn(validProfile)
         `when`(activePluginProvider.activeInsulin).thenReturn(insulinOrefRapidActingPlugin)
 
-        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, resourceHelper, context, sp, profileFunction, activePluginProvider, fabricPrivacy)
+        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, resourceHelper, context, sp, profileFunction, activePluginProvider, fabricPrivacy, dateUtil)
         sot.service = treatmentService
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
index f4ebe83fdd..b375602bfb 100644
--- a/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/queue/CommandQueueTest.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import dagger.Lazy
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -38,7 +39,7 @@ class CommandQueueTest : TestBaseWithProfile() {
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var sp: SP
 
-    private val buildHelper = BuildHelper()
+    private val buildHelper = BuildHelper(Config())
 
     val injector = HasAndroidInjector {
         AndroidInjector {
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
index 0edbe93c11..3a70e1a34c 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DateUtilTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.utils
 
+import android.content.Context
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -14,6 +15,7 @@ import java.util.*
 @RunWith(PowerMockRunner::class)
 class DateUtilTest : TestBase() {
 
+    @Mock lateinit var context: Context
     @Mock lateinit var resourceHelper: ResourceHelper
 
     @Test
@@ -46,22 +48,22 @@ class DateUtilTest : TestBase() {
     }
 
     @Test fun timeStringTest() {
-        Assert.assertTrue(DateUtil.timeString(Date(1513902750000L)).contains("32"))
-        Assert.assertTrue(DateUtil.timeString(1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).timeString(Date(1513902750000L)).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).timeString(1513902750000L).contains("32"))
     }
 
     @Test fun dateAndTimeStringTest() {
-        Assert.assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("22"))
-        Assert.assertTrue(DateUtil.dateAndTimeString(1513902750000L).contains("32"))
-        Assert.assertTrue(DateUtil.dateAndTimeString(Date(1513902750000L)).contains("22"))
-        Assert.assertTrue(DateUtil.dateAndTimeString(Date(1513902750000L)).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeString(1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeString(1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeString(Date(1513902750000L)).contains("22"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeString(Date(1513902750000L)).contains("32"))
     }
 
     @Test fun dateAndTimeRangeStringTest() {
-        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
-        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
-        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
-        Assert.assertTrue(DateUtil.dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("22"))
+        Assert.assertTrue(DateUtil(context, resourceHelper).dateAndTimeRangeString(1513902750000L, 1513902750000L).contains("32"))
     }
 
     /*
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.java b/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.java
deleted file mode 100644
index 166ce04b10..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class SntpClientTest {
-
-    @Test
-    public void ntpTimeTest() {
-        // no internet
-        SntpClient.ntpTime(new SntpClient.Callback() {
-            @Override
-            public void run() {
-                Assert.assertFalse(networkConnected);
-                Assert.assertFalse(success);
-                Assert.assertEquals(0L, time);
-            }
-        }, false);
-        // internet
-        SntpClient.doNtpTime(new SntpClient.Callback() {
-            @Override
-            public void run() {
-                Assert.assertTrue(success);
-                Assert.assertTrue(Math.abs(time - DateUtil.now()) < 60000);
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt b/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt
new file mode 100644
index 0000000000..79a8541daf
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/utils/SntpClientTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.utils
+
+import info.nightscout.androidaps.TestBase
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.Mock
+
+class SntpClientTest : TestBase() {
+    @Mock lateinit var dateUtil: DateUtil
+
+    @Test
+    fun ntpTimeTest() {
+        // no internet
+        SntpClient(aapsLogger, dateUtil).ntpTime(object : SntpClient.Callback() {
+            override fun run() {
+                Assert.assertFalse(networkConnected)
+                Assert.assertFalse(success)
+                Assert.assertEquals(0L, time)
+            }
+        }, false)
+        // internet
+        SntpClient(aapsLogger, dateUtil).doNtpTime(object : SntpClient.Callback() {
+            override fun run() {
+                Assert.assertTrue(success)
+                Assert.assertTrue(Math.abs(time - DateUtil.now()) < 60000)
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/db/BgReading.java b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
index f2b53b8738..89ef6b473a 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -33,6 +33,7 @@ public class BgReading implements DataPointWithLabelInterface {
     @Inject public DefaultValueHelper defaultValueHelper;
     @Inject public ProfileFunction profileFunction;
     @Inject public ResourceHelper resourceHelper;
+    @Inject public DateUtil dateUtil;
 
     @DatabaseField(id = true)
     public long date;
@@ -66,7 +67,8 @@ public class BgReading implements DataPointWithLabelInterface {
         injector.androidInjector().inject(this);
     }
 
-    public BgReading(NSSgv sgv) {
+    public BgReading(HasAndroidInjector injector, NSSgv sgv) {
+        injector.androidInjector().inject(this);
         date = sgv.getMills();
         value = sgv.getMgdl();
         raw = sgv.getFiltered() != null ? sgv.getFiltered() : value;
@@ -125,7 +127,7 @@ public class BgReading implements DataPointWithLabelInterface {
     public String toString() {
         return "BgReading{" +
                 "date=" + date +
-                ", date=" + DateUtil.dateAndTimeString(date) +
+                ", date=" + dateUtil.dateAndTimeString(date) +
                 ", value=" + value +
                 ", direction=" + direction +
                 ", raw=" + raw +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index 6f95917ace..1300d0bbf9 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -38,6 +38,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
     @Inject ResourceHelper resourceHelper;
     @Inject AAPSLogger aapsLogger;
     @Inject Translator translator;
+    @Inject DateUtil dateUtil;
 
     @DatabaseField(id = true)
     public long date;
@@ -122,7 +123,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
     public String toString() {
         return "CareportalEvent{" +
                 "date= " + date +
-                ", date= " + DateUtil.dateAndTimeString(date) +
+                ", date= " + dateUtil.dateAndTimeString(date) +
                 ", isValid= " + isValid +
                 ", _id= " + _id +
                 ", eventType= " + eventType +
@@ -134,7 +135,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
         for (int i = 0; i < list.size(); i++) {
             CareportalEvent event = list.get(i);
             if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
-                aapsLogger.debug(LTag.DATABASE, "Found event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
+                aapsLogger.debug(LTag.DATABASE, "Found event for time: " + dateUtil.dateAndTimeString(time) + " " + event.toString());
                 return true;
             }
         }
diff --git a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 49b223d9b9..e1f96431cb 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -212,7 +212,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
     public String log() {
         return "ExtendedBolus{" +
                 "date= " + date +
-                ", date= " + DateUtil.dateAndTimeString(date) +
+                ", date= " + dateUtil.dateAndTimeString(date) +
                 ", isValid=" + isValid +
                 ", _id= " + _id +
                 ", pumpId= " + pumpId +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java b/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
index 09b7d047ba..006a839510 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ProfileSwitch.java
@@ -73,6 +73,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     @Inject public AAPSLogger aapsLogger;
     @Inject public RxBusWrapper rxBus;
     @Inject public ResourceHelper resourceHelper;
+    @Inject public DateUtil dateUtil;
 
     public ProfileSwitch() {
         this.injector = StaticInjector.Companion.getInstance();
@@ -233,11 +234,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
 
     @Override
     public boolean isValid() {
-        boolean isValid = getProfileObject() != null && getProfileObject().isValid(DateUtil.dateAndTimeString(date));
+        boolean isValid = getProfileObject() != null && getProfileObject().isValid(dateUtil.dateAndTimeString(date));
         ProfileSwitch active = treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now());
         long activeProfileSwitchDate = active != null ? active.date : -1L;
         if (!isValid && date == activeProfileSwitchDate)
-            createNotificationInvalidProfile(DateUtil.dateAndTimeString(date));
+            createNotificationInvalidProfile(dateUtil.dateAndTimeString(date));
         return isValid;
     }
 
@@ -246,17 +247,17 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
         rxBus.send(new EventNewNotification(notification));
     }
 
-    public static boolean isEvent5minBack(AAPSLogger aapsLogger, List<ProfileSwitch> list, long time, boolean zeroDurationOnly) {
+    public boolean isEvent5minBack(List<ProfileSwitch> list, long time, boolean zeroDurationOnly) {
         for (int i = 0; i < list.size(); i++) {
             ProfileSwitch event = list.get(i);
             if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
                 if (zeroDurationOnly) {
                     if (event.durationInMinutes == 0) {
-                        aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
+                        aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + dateUtil.dateAndTimeString(time) + " " + event.toString());
                         return true;
                     }
                 } else {
-                    aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
+                    aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + dateUtil.dateAndTimeString(time) + " " + event.toString());
                     return true;
                 }
             }
@@ -314,7 +315,7 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
     public String toString() {
         return "ProfileSwitch{" +
                 "date=" + date +
-                "date=" + DateUtil.dateAndTimeString(date) +
+                "date=" + dateUtil.dateAndTimeString(date) +
                 ", isValid=" + isValid +
                 ", duration=" + durationInMinutes +
                 ", profileName=" + profileName +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TDD.java b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
index eba359f2ad..05b9025491 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -46,11 +46,10 @@ public class TDD {
     }
 
 
-    @Override
-    public String toString() {
+    public String toString(DateUtil dateUtil) {
         return "TDD [" +
                 "date=" + date +
-                "date(str)=" + DateUtil.dateAndTimeString(date) +
+                "date(str)=" + dateUtil.dateAndTimeString(date) +
                 ", bolus=" + bolus +
                 ", basal=" + basal +
                 ", total=" + total +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index cc9b7db990..92668d255a 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -182,10 +182,10 @@ public class TempTarget implements Interval {
         else return DecimalFormatter.to1Decimal(low * Constants.MGDL_TO_MMOLL);
     }
 
-    public String toString() {
+    public String toString(DateUtil dateUtil) {
         return "TemporaryTarget{" +
                 "date=" + date +
-                "date=" + DateUtil.dateAndTimeString(date) +
+                "date=" + dateUtil.dateAndTimeString(date) +
                 ", isValid=" + isValid +
                 ", duration=" + durationInMinutes +
                 ", reason=" + reason +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index cf59c456d3..d4f89fdd7e 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -404,7 +404,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
     public String toString() {
         return "TemporaryBasal{" +
                 "date=" + date +
-                ", date=" + DateUtil.dateAndTimeString(date) +
+                ", date=" + dateUtil.dateAndTimeString(date) +
                 ", isValid=" + isValid +
                 ", pumpId=" + pumpId +
                 ", _id=" + _id +
diff --git a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
index 0df0dd0efa..bd3a4c0ebe 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/Treatment.java
@@ -37,6 +37,7 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
     @Inject public ResourceHelper resourceHelper;
     @Inject public ProfileFunction profileFunction;
     @Inject public ActivePluginProvider activePlugin;
+    @Inject public DateUtil dateUtil;
 
     public static final String TABLE_TREATMENTS = "Treatments";
 
@@ -108,7 +109,7 @@ public class Treatment implements DataPointWithLabelInterface, DbObjectBase {
     @NonNull public String toString() {
         return "Treatment{" +
                 "date= " + date +
-                ", date= " + DateUtil.dateAndTimeString(date) +
+                ", date= " + dateUtil.dateAndTimeString(date) +
                 ", isValid= " + isValid +
                 ", isSMB= " + isSMB +
                 ", _id= " + _id +
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
index 9cd8c74f87..51a1b58c18 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/data/AutosensData.java
@@ -11,7 +11,6 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -29,8 +28,8 @@ public class AutosensData implements DataPointWithLabelInterface {
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
     @Inject ResourceHelper resourceHelper;
-    @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
+    @Inject DateUtil dateUtil;
 
     public AutosensData(HasAndroidInjector injector) {
         injector.androidInjector().inject(this);
@@ -56,7 +55,7 @@ public class AutosensData implements DataPointWithLabelInterface {
                 double sens = profile.getIsfMgdl(t.date);
                 double ic = profile.getIc(t.date);
                 min5minCarbImpact = t.carbs / (maxAbsorptionHours * 60 / 5) * sens / ic;
-                aapsLogger.debug(LTag.AUTOSENS, "Min 5m carbs impact for " + carbs + "g @" + DateUtil.dateAndTimeString(t.date) + " for " + maxAbsorptionHours + "h calculated to " + min5minCarbImpact + " ISF: " + sens + " IC: " + ic);
+                aapsLogger.debug(LTag.AUTOSENS, "Min 5m carbs impact for " + carbs + "g @" + dateUtil.dateAndTimeString(t.date) + " for " + maxAbsorptionHours + "h calculated to " + min5minCarbImpact + " ISF: " + sens + " IC: " + ic);
             } else {
                 min5minCarbImpact = sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, SMBDefaults.min_5m_carbimpact);
             }
@@ -71,7 +70,7 @@ public class AutosensData implements DataPointWithLabelInterface {
 
         @Override
         public String toString() {
-            return String.format(Locale.ENGLISH, "CarbsInPast: time: %s carbs: %.02f min5minCI: %.02f remaining: %.2f", DateUtil.dateAndTimeString(time), carbs, min5minCarbImpact, remaining);
+            return String.format(Locale.ENGLISH, "CarbsInPast: time: %s carbs: %.02f min5minCI: %.02f remaining: %.2f", dateUtil.dateAndTimeString(time), carbs, min5minCarbImpact, remaining);
         }
     }
 
@@ -107,7 +106,7 @@ public class AutosensData implements DataPointWithLabelInterface {
     @Override
     public String toString() {
         return String.format(Locale.ENGLISH, "AutosensData: %s pastSensitivity=%s  delta=%.02f  avgDelta=%.02f bgi=%.02f deviation=%.02f avgDeviation=%.02f absorbed=%.02f carbsFromBolus=%.02f cob=%.02f autosensRatio=%.02f slopeFromMaxDeviation=%.02f slopeFromMinDeviation=%.02f activeCarbsList=%s",
-                DateUtil.dateAndTimeString(time), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
+                dateUtil.dateAndTimeString(time), pastSensitivity, delta, avgDelta, bgi, deviation, avgDeviation, absorbed, carbsFromBolus, cob, autosensResult.ratio, slopeFromMaxDeviation, slopeFromMinDeviation, activeCarbsList.toString());
     }
 
     public List<CarbsInPast> cloneCarbsList() {
@@ -134,7 +133,7 @@ public class AutosensData implements DataPointWithLabelInterface {
                 activeCarbsList.remove(i--);
                 if (c.remaining > 0)
                     cob -= c.remaining;
-                aapsLogger.debug(LTag.AUTOSENS, "Removing carbs at " + DateUtil.dateAndTimeString(toTime) + " after " + maxAbsorptionHours + "h > " + c.toString());
+                aapsLogger.debug(LTag.AUTOSENS, "Removing carbs at " + dateUtil.dateAndTimeString(toTime) + " after " + maxAbsorptionHours + "h > " + c.toString());
             }
         }
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index 16fb3e2504..58e156d7a0 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -44,19 +44,10 @@ public class DateUtil {
     private final Context context;
     private final ResourceHelper resourceHelper;
 
-    @Deprecated
-    private static DateUtil instance;
-
     @Inject
     public DateUtil(Context context, ResourceHelper resourceHelper) {
         this.context = context;
         this.resourceHelper = resourceHelper;
-        instance = this;
-    }
-
-    @Deprecated
-    public static DateUtil getInstance() {
-        return instance;
     }
 
     /**
@@ -206,22 +197,22 @@ public class DateUtil {
         return new DateTime(mills).toString(DateTimeFormat.fullTime());
     }
 
-    public static String dateAndTimeString(Date date) {
-        return dateString(date) + " " + instance.timeString(date);
+    public String dateAndTimeString(Date date) {
+        return dateString(date) + " " + timeString(date);
     }
 
-    public static String dateAndTimeRangeString(long start, long end) {
-        return dateAndTimeString(start) + " - " + instance.timeString(end);
+    public String dateAndTimeRangeString(long start, long end) {
+        return dateAndTimeString(start) + " - " + timeString(end);
     }
 
-    public static String dateAndTimeString(long mills) {
+    public String dateAndTimeString(long mills) {
         if (mills == 0) return "";
-        return dateString(mills) + " " + instance.timeString(mills);
+        return dateString(mills) + " " + timeString(mills);
     }
 
-    public static String dateAndTimeAndSecondsString(long mills) {
+    public String dateAndTimeAndSecondsString(long mills) {
         if (mills == 0) return "";
-        return dateString(mills) + " " + instance.timeStringWithSeconds(mills);
+        return dateString(mills) + " " + timeStringWithSeconds(mills);
     }
 
     public static String dateAndTimeFullString(long mills) {
@@ -245,11 +236,11 @@ public class DateUtil {
 
     private static LongSparseArray<String> timeStrings = new LongSparseArray<>();
 
-    public static String timeStringFromSeconds(int seconds) {
+    public String timeStringFromSeconds(int seconds) {
         String cached = timeStrings.get(seconds);
         if (cached != null)
             return cached;
-        String t = instance.timeString(toDate(seconds));
+        String t = timeString(toDate(seconds));
         timeStrings.put(seconds, t);
         return t;
     }

From 7dc7c9528b4ecb0398c5b661c028aefd21fd2112 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 8 May 2020 00:23:17 +0200
Subject: [PATCH 041/400] Omni comments

---
 .../pump/omnipod/defs/state/PodSessionState.java   | 14 ++++++++++----
 .../comm/OmnipodDashCommunicationManager.java      |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
index 97ac22bda1..862976afbc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java
@@ -33,13 +33,17 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class PodSessionState extends PodState {
 
-    @Inject AAPSLogger aapsLogger;
-    @Inject SP sp;
-    @Inject OmnipodUtil omnipodUtil;
-    @Inject DateUtil dateUtil;
+    @Inject transient AAPSLogger aapsLogger;
+    @Inject transient SP sp;
+    @Inject transient OmnipodUtil omnipodUtil;
+    @Inject transient DateUtil dateUtil;
 
     private transient PodStateChangedHandler stateChangedHandler;
 
+    // TODO
+    // the problem you have with injection in this class is that you are mixing
+    // data storing and handlind. Move these member variables to extra class you can
+    // easy serialize and load it here by setData(dataInOtherClass)
     private final Map<AlertSlot, AlertType> configuredAlerts;
     private DateTimeZone timeZone;
     private DateTime activatedAt;
@@ -78,10 +82,12 @@ public class PodSessionState extends PodState {
         handleUpdates();
     }
 
+    @Deprecated
     public void injectDaggerClass(HasAndroidInjector injector) {
         injector.androidInjector().inject(this);
     }
 
+    @Deprecated
     public void setStateChangedHandler(PodStateChangedHandler handler) {
         // FIXME this is an ugly workaround for not being able to serialize the PodStateChangedHandler
         if (stateChangedHandler != null) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
index 4f869bd286..e440d632a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
@@ -18,12 +18,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
  * Created by andy on 4.8.2019
  */
 // TODO refactor to use dagger, just commented out errors
+// TODO is this class used? remove if not
 public class OmnipodDashCommunicationManager implements OmnipodCommunicationManagerInterface {
 
     // TODO Dagger
 
 //    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
 
+    // i didn't find where you instantiate this
     private static OmnipodDashCommunicationManager omnipodCommunicationManager;
     private String errorMessage;
 
@@ -38,6 +40,7 @@ public class OmnipodDashCommunicationManager implements OmnipodCommunicationMana
         return null;
     }
 
+    @Deprecated
     public static OmnipodDashCommunicationManager getInstance() {
         return omnipodCommunicationManager;
     }

From 15207d1bf10a67af2d7c9a071353e6b8bb5069ca Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 8 May 2020 01:09:30 +0200
Subject: [PATCH 042/400] Omni comments 2

---
 .../pump/omnipod/OmnipodPumpPlugin.java       |  4 +--
 .../OmnipodCommunicationManagerInterface.java |  4 ---
 .../driver/comm/AapsOmnipodManager.java       | 36 +++++++++----------
 .../service/RileyLinkOmnipodService.java      |  2 +-
 .../comm/OmnipodDashCommunicationManager.java |  5 ---
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 79cee43c89..0c51b5901c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -519,13 +519,13 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                     } else {
                         aapsLogger.warn(LTag.PUMP, "Result was NOT null.");
 
-                        Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                        Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", 0);
                         i.putExtra("status", "Pulse Log (copied to clipboard):\n" + result.toString());
                         i.putExtra("title", resourceHelper.gs(R.string.combo_warning));
                         i.putExtra("clipboardContent", result.toString());
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        MainApp.instance().startActivity(i);
+                        context.startActivity(i);
 
 //                        OKDialog.show(MainApp.instance().getApplicationContext(), MainApp.gs(R.string.action),
 //                                "Pulse Log:\n" + result.toString(), null);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
index 3999cd2923..d345a3c385 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
@@ -71,9 +71,5 @@ public interface OmnipodCommunicationManagerInterface {
      */
     PumpEnactResult setTime();
 
-
-    void setPumpStatus(OmnipodPumpStatus pumpStatusLocal);
-
-
     PodInfoRecentPulseLog readPulseLog();
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index f8c67f5471..6632cd0213 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.driver.comm;
 
+import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
@@ -83,42 +84,47 @@ import io.reactivex.disposables.Disposable;
 
 public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface {
 
-    private OmnipodUtil omnipodUtil;
-    private AAPSLogger aapsLogger;
-    private RxBusWrapper rxBus;
-    private ResourceHelper resourceHelper;
-    private HasAndroidInjector injector;
-    private ActivePluginProvider activePlugin;
-    private OmnipodPumpStatus pumpStatus;
+    private final OmnipodUtil omnipodUtil;
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+    private final ResourceHelper resourceHelper;
+    private final HasAndroidInjector injector;
+    private final ActivePluginProvider activePlugin;
+    private final OmnipodPumpStatus pumpStatus;
+    private final Context context;
 
     private final OmnipodManager delegate;
 
+    @Deprecated
     private static AapsOmnipodManager instance;
 
     private Date lastBolusTime;
     private Double lastBolusUnits;
 
+    @Deprecated
     public static AapsOmnipodManager getInstance() {
         return instance;
     }
 
     public AapsOmnipodManager(OmnipodCommunicationManager communicationService,
                               PodSessionState podState,
-                              OmnipodPumpStatus _pumpStatus,
+                              OmnipodPumpStatus pumpStatus,
                               OmnipodUtil omnipodUtil,
                               AAPSLogger aapsLogger,
                               RxBusWrapper rxBus,
                               SP sp,
                               ResourceHelper resourceHelper,
                               HasAndroidInjector injector,
-                              ActivePluginProvider activePlugin) {
+                              ActivePluginProvider activePlugin,
+                              Context context) {
         this.omnipodUtil = omnipodUtil;
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
         this.resourceHelper = resourceHelper;
         this.injector = injector;
         this.activePlugin = activePlugin;
-        this.pumpStatus = _pumpStatus;
+        this.pumpStatus = pumpStatus;
+        this.context = context;
 
         delegate = new OmnipodManager(aapsLogger, sp, communicationService, podState, podSessionState -> {
             // Handle pod state changes
@@ -460,12 +466,6 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         return new PumpEnactResult(injector).success(true).enacted(true);
     }
 
-    @Override
-    public void setPumpStatus(OmnipodPumpStatus pumpStatus) {
-        this.pumpStatus = pumpStatus;
-        updatePumpStatus(delegate.getPodState());
-    }
-
     // TODO should we add this to the OmnipodCommunicationManager interface?
     public PumpEnactResult getPodInfo(PodInfoType podInfoType) {
         long time = System.currentTimeMillis();
@@ -706,12 +706,12 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
     }
 
     private void showErrorDialog(String message, Integer sound) {
-        Intent intent = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+        Intent intent = new Intent(context, ErrorHelperActivity.class);
         intent.putExtra("soundid", sound == null ? 0 : sound);
         intent.putExtra("status", message);
         intent.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        MainApp.instance().startActivity(intent);
+        context.startActivity(intent);
     }
 
     private void showNotification(String message, int urgency, Integer sound) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
index 2ecd3685c0..908748b991 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
@@ -124,7 +124,7 @@ public class RileyLinkOmnipodService extends RileyLinkService {
             this.omnipodCommunicationManager = omnipodCommunicationService;
 
             this.aapsOmnipodManager = new AapsOmnipodManager(omnipodCommunicationService, podState, omnipodPumpStatus,
-                    omnipodUtil, aapsLogger, rxBus, sp, resourceHelper, injector, activePlugin);
+                    omnipodUtil, aapsLogger, rxBus, sp, resourceHelper, injector, activePlugin, this);
         } else {
             aapsOmnipodManager = AapsOmnipodManager.getInstance();
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
index e440d632a5..39ccadd308 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
@@ -117,11 +117,6 @@ public class OmnipodDashCommunicationManager implements OmnipodCommunicationMana
         return null;
     }
 
-    @Override
-    public void setPumpStatus(OmnipodPumpStatus pumpStatusLocal) {
-
-    }
-
     @Override
     public PodInfoRecentPulseLog readPulseLog() {
         return null;

From 73d132649de5085ad49c0e4a79d08c6d7fa1eab8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 8 May 2020 11:37:14 +0200
Subject: [PATCH 043/400] fix tests

---
 .../interfaces/ConstraintsCheckerTest.kt      |  2 +-
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |  6 +-----
 .../danaRS/comm/DanaRSMessageHashTableTest.kt | 21 +------------------
 .../DanaRS_Packet_APS_History_EventsTest.kt   |  5 ++++-
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |  5 ++++-
 ...ket_Basal_Get_Temporary_Basal_StateTest.kt |  5 ++++-
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt | 17 ++++-----------
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |  6 +-----
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |  6 +-----
 ...Packet_General_Get_More_InformationTest.kt | 19 ++++-------------
 ...et_General_Get_Shipping_InformationTest.kt | 13 ++++--------
 .../comm/DanaRS_Packet_History_AlarmTest.kt   | 10 ++++-----
 .../DanaRS_Packet_History_All_HistoryTest.kt  |  9 ++++----
 .../comm/DanaRS_Packet_History_BasalTest.kt   |  9 ++++----
 ...DanaRS_Packet_History_Blood_GlucoseTest.kt |  9 ++++----
 .../comm/DanaRS_Packet_History_BolusTest.kt   |  9 ++++----
 .../DanaRS_Packet_History_CarbohydrateTest.kt |  9 ++++----
 .../comm/DanaRS_Packet_History_DailyTest.kt   |  9 ++++----
 .../comm/DanaRS_Packet_History_PrimeTest.kt   |  9 ++++----
 .../comm/DanaRS_Packet_History_RefillTest.kt  |  9 ++++----
 .../comm/DanaRS_Packet_History_SuspendTest.kt |  9 ++++----
 .../DanaRS_Packet_History_TemporaryTest.kt    |  9 ++++----
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |  6 +-----
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt | 13 ++----------
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt | 17 ++++-----------
 .../DanaRS_Packet_Option_Set_Pump_TimeTest.kt |  9 ++++----
 26 files changed, 84 insertions(+), 166 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 6cd8b0e2ca..7f5806e962 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -115,7 +115,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context, dateUtil)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index 5485c6ae9d..effe08b5f8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -63,10 +63,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-<<<<<<< HEAD
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
-=======
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
->>>>>>> origin/dev
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
index 4bcf9b4c92..4ad7df5359 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
@@ -1,23 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
-<<<<<<< HEAD
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-=======
-import android.content.Context
-import com.cozmo.danar.util.BleCommandUtil
->>>>>>> origin/dev
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-<<<<<<< HEAD
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-=======
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.utils.DateUtil
->>>>>>> origin/dev
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -30,11 +20,6 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class)
 class DanaRSMessageHashTableTest : DanaRSTestBase() {
 
-<<<<<<< HEAD
-=======
-    @Mock lateinit var context: Context
-    @Mock lateinit var danaRSPlugin: DanaRSPlugin
->>>>>>> origin/dev
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var constraintChecker: ConstraintChecker
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
@@ -43,6 +28,7 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
                 it.constraintChecker = constraintChecker
@@ -60,13 +46,8 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
-<<<<<<< HEAD
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
         val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, 0, 0, 0)
-=======
-        val danaRSMessageHashTable = DanaRSMessageHashTable(aapsLogger, rxBus, resourceHelper, danaRPump, danaRSPlugin, activePlugin, constraintChecker, detailedBolusInfoStorage, injector, DateUtil(context, resourceHelper))
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(aapsLogger, dateUtil, DanaRPump.CARBS, 0, 0, 0)
->>>>>>> origin/dev
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 6b7835ffbd..20aaa5591d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -26,8 +26,11 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_APS_History_Events) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_APS_History_Events) {
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
                 it.activePlugin = activePlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index b252c07830..36146b4ca9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -16,8 +16,11 @@ class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_APS_Set_Event_History) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_APS_Set_Event_History) {
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
index 115dba03b0..56e308fc1f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -14,8 +14,11 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Basal_Get_Temporary_Basal_State) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_Basal_Get_Temporary_Basal_State) {
                 it.danaRPump = danaRPump
             }
         }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index 0979f33075..9d250d8872 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -15,15 +15,17 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Bolus_Get_Step_Bolus_Information) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_Bolus_Get_Step_Bolus_Information) {
                 it.danaRPump = danaRPump
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(packetInjector)
 
         val array = createArray(13, 0.toByte()) // 11 + 2
@@ -45,17 +47,6 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
         Assert.assertEquals(12.5, danaRPump.lastBolusAmount, 0.01)
         Assert.assertEquals(25.0, danaRPump.maxBolus, 0.01)
         Assert.assertEquals(1.0, danaRPump.bolusStep, 0.01)
-=======
-        val packet = DanaRS_Packet_Bolus_Get_Step_Bolus_Information(aapsLogger, danaRPump, dateUtil)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(34, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(34, 1.toByte()))
-        val valueRequested: Int = (1 and 0x000000FF shl 8) + (1 and 0x000000FF)
-        Assert.assertEquals(valueRequested / 100.0, danaRPump.lastBolusAmount, 0.0)
-        Assert.assertEquals(true, packet.failed)
->>>>>>> origin/dev
         Assert.assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index da0bbc434f..b69ffe2ee3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -54,11 +54,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-<<<<<<< HEAD
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
-=======
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
->>>>>>> origin/dev
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index f0d67530c5..0b68225a54 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -2,14 +2,10 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-<<<<<<< HEAD
-import info.nightscout.androidaps.plugins.treatments.Treatment
-=======
-import info.nightscout.androidaps.db.Treatment
->>>>>>> origin/dev
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index ee57e0b1f2..7d93a60dbd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -13,15 +13,17 @@ class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_More_Information) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_General_Get_More_Information) {
                 it.danaRPump = danaRPump
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         var packet = DanaRS_Packet_General_Get_More_Information(packetInjector)
 
         packet.handleMessage(createArray(14, 0.toByte()))
@@ -48,19 +50,6 @@ class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
         Assert.assertEquals(25, lastBolus.minutes)
         Assert.assertEquals(1.7, danaRPump.lastBolusAmount, 0.01)
 
-=======
-        var packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump, dateUtil)
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        // test for the length message
-        packet.handleMessage(createArray(13, 0.toByte()))
-        Assert.assertEquals(true, packet.failed)
-        packet = DanaRS_Packet_General_Get_More_Information(aapsLogger, danaRPump, dateUtil)
-        packet.handleMessage(createArray(15, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        packet.handleMessage(createArray(15, 161.toByte()))
-        Assert.assertEquals(true, packet.failed)
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__GET_MORE_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index 8f2d792423..f9247b152b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -12,30 +12,25 @@ class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_General_Get_Shipping_Information) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_General_Get_Shipping_Information) {
                 it.danaRPump = danaRPump
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         var packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
-=======
-        var packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil)
->>>>>>> origin/dev
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         // test for the length message
         packet.handleMessage(createArray(1, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
-<<<<<<< HEAD
         packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
-=======
-        packet = DanaRS_Packet_General_Get_Shipping_Information(aapsLogger, danaRPump, dateUtil)
->>>>>>> origin/dev
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
index 0485d8a06e..7b64daa632 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -20,7 +20,6 @@ import java.util.*
 @PrepareForTest(MainApp::class)
 class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
 
-<<<<<<< HEAD
     @Mock lateinit var databaseHelper: DatabaseHelper
 
     @Before
@@ -31,8 +30,11 @@ class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Alarm) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Alarm) {
                 it.rxBus = rxBus
             }
         }
@@ -59,10 +61,6 @@ class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
         Assert.assertEquals(Date(119, 1, 4, 20, 11, 35).time, packet.danaRHistoryRecord.recordDate)
         Assert.assertEquals("Occlusion", packet.danaRHistoryRecord.recordAlarm)
         Assert.assertEquals(3.56, packet.danaRHistoryRecord.recordValue, 0.01)
-=======
-    @Test fun runTest() {
-        val packet = DanaRS_Packet_History_Alarm(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__ALARM", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
index 7aea8d84a9..6913ec5da1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_All_HistoryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_All_History) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_All_History) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_All_History(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_All_History(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__ALL_HISTORY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
index a34513a30a..227e305eba 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_BasalTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Basal) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Basal) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Basal(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Basal(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__BASAL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
index 152bc1e7fc..9c1474ebe2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_Blood_GlucoseTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Blood_Glucose) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Blood_Glucose) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Blood_Glucose(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Blood_Glucose(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__BLOOD_GLUCOSE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
index 44fede7ae9..202f52d0be 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_BolusTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Bolus) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Bolus) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Bolus(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Bolus(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__BOLUS", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
index 4e2544107e..93d40faac9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_CarbohydrateTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Carbohydrate) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Carbohydrate) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Carbohydrate(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Carbohydrate(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__CARBOHYDRATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
index 5564ba584c..00b407f32a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_DailyTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Daily) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Daily) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Daily(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Daily(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__DAILY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
index 592d45be98..59ed19ac48 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_PrimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Prime) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Prime) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Prime(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Prime(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__PRIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
index 84ea21d91c..832d52f6e6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_RefillTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Refill) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Refill) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Refill(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Refill(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__REFILL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
index 7b0300aaef..f1f612fe13 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_SuspendTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Suspend) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Suspend) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Suspend(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Suspend(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__SUSPEND", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
index e0dc156d8a..0a74282ddd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
@@ -12,19 +12,18 @@ class DanaRS_Packet_History_TemporaryTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_History_Temporary) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_History_Temporary) {
                 it.rxBus = rxBus
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_History_Temporary(packetInjector, System.currentTimeMillis())
-=======
-        val packet = DanaRS_Packet_History_Temporary(aapsLogger, rxBus, dateUtil, System.currentTimeMillis())
->>>>>>> origin/dev
         Assert.assertEquals("REVIEW__TEMPORARY", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index 065fc9ce6f..9e437107b1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -2,14 +2,10 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-<<<<<<< HEAD
-import info.nightscout.androidaps.plugins.treatments.Treatment
-=======
-import info.nightscout.androidaps.db.Treatment
->>>>>>> origin/dev
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index b026c4f7bf..d015035113 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -3,17 +3,13 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-<<<<<<< HEAD
-import info.nightscout.androidaps.plugins.treatments.Treatment
-=======
-import info.nightscout.androidaps.db.Treatment
->>>>>>> origin/dev
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -71,12 +67,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-<<<<<<< HEAD
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         danaRPump.bolusingTreatment = Treatment(packetInjector)
-=======
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, dateUtil)
-        danaRSPlugin.bolusingTreatment = Treatment(treatmentInjector)
->>>>>>> origin/dev
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 7298f57d19..1c64b0d82a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -13,15 +13,17 @@ class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Option_Get_Pump_Time) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_Option_Get_Pump_Time) {
                 it.danaRPump = danaRPump
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val packet = DanaRS_Packet_Option_Get_Pump_Time(packetInjector)
         val array = createArray(8, 0.toByte()) // 6 + 2
         putByteToArray(array, 0, 19) // year 2019
@@ -33,17 +35,6 @@ class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
 
         packet.handleMessage(array)
         Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaRPump.pumpTime)
-=======
-        val packet = DanaRS_Packet_Option_Get_Pump_Time(aapsLogger, danaRPump, dateUtil)
-        // test params
-        Assert.assertEquals(null, packet.requestParams)
-        // test message decoding
-        packet.handleMessage(createArray(8, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
-        // this should fail
-        packet.handleMessage(createArray(8, 1.toByte()))
-        Assert.assertEquals(true, packet.failed)
->>>>>>> origin/dev
         Assert.assertEquals("OPTION__GET_PUMP_TIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
index f9ca5fe57d..67a9eed70d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -13,19 +13,18 @@ class DanaRS_Packet_Option_Set_Pump_TimeTest : DanaRSTestBase() {
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
-            if (it is DanaRS_Packet_Option_Set_Pump_Time) {
+            if (it is DanaRS_Packet) {
                 it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+            }
+            if (it is DanaRS_Packet_Option_Set_Pump_Time) {
             }
         }
     }
 
     @Test fun runTest() {
-<<<<<<< HEAD
         val date = Date()
         val packet = DanaRS_Packet_Option_Set_Pump_Time(packetInjector, date.time)
-=======
-        val packet = DanaRS_Packet_Option_Set_Pump_Time(aapsLogger, dateUtil, DateUtil.now())
->>>>>>> origin/dev
         // test params
         val params = packet.requestParams
         Assert.assertEquals((date.year - 100 and 0xff).toByte(), params[0]) // 2019 -> 19

From 61a077542cdd0975b29b01fc76b63f8af66c6624 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 8 May 2020 11:56:02 +0200
Subject: [PATCH 044/400] DanaRPump -> danars

---
 .../androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt          | 1 -
 .../pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt        | 2 +-
 app/src/main/res/values/strings.xml                             | 2 --
 .../plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt        | 1 -
 .../info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt  | 2 +-
 danars/src/main/res/values/strings.xml                          | 2 ++
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt (99%)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
index bdabef46da..3d4fade70d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 89b3239b11..676290cbba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -195,7 +195,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
-            else                        -> {
+            else                                                                                         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d4218e877..35a25bca9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -557,7 +557,6 @@
     <string name="key_nsclientinternal_url" translatable="false">nsclientinternal_url</string>
     <string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string>
     <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
-    <string name="key_danar_password" translatable="false">danar_password</string>
     <string name="clearlog">Clear log</string>
     <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
     <string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string>
@@ -1758,7 +1757,6 @@
     <string name="key_statuslights_copy_ns" translatable="false">statuslights_copy_ns</string>
     <string name="copyexistingvalues">Copy NS settings (if exists)?</string>
     <string name="key_statuslights_overview_advanced" translatable="false">statuslights_overview_advanced</string>
-    <string name="key_danars_password">danars_password</string>
     <string name="classic_desrciption">Original skin</string>
     <string name="buttonson_desrciption">Buttons are always displayed on bottom of screen</string>
     <string name="key_skin" translatable="false">skin</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index f18dde576b..2be556b1e1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -5,7 +5,6 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
-import kotlin.experimental.and
 
 @RunWith(PowerMockRunner::class)
 class MsgSettingUserOptionsTest : DanaRTestBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
index 11f679bbb1..e33ddb1dbc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.logging.AAPSLogger
diff --git a/danars/src/main/res/values/strings.xml b/danars/src/main/res/values/strings.xml
index f3f951e035..5cef8b70b6 100644
--- a/danars/src/main/res/values/strings.xml
+++ b/danars/src/main/res/values/strings.xml
@@ -2,6 +2,8 @@
 <resources>
     <string name="key_danars_address" translatable="false">danars_address</string>
     <string name="key_danars_name" translatable="false">danars_name</string>
+    <string name="key_danar_password" translatable="false">danar_password</string>
+    <string name="key_danars_password">danars_password</string>
 
     <string name="danars_pairing">Pairing</string>
     <string name="danars_nodeviceavailable">No device found so far</string>

From 040c76d83989a72fd8b3131233d0af855f51d7b4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 8 May 2020 14:59:30 +0200
Subject: [PATCH 045/400] move pass 1

---
 .../activities/MyPreferenceFragment.kt        |   1 -
 .../dependencyInjection/ActivitiesModule.kt   |   1 +
 .../dependencyInjection/PluginsModule.kt      |   1 -
 .../plugins/aps/loop/LoopPlugin.java          |  89 ++++---
 .../general/maintenance/ImportExportPrefs.kt  |   1 -
 .../plugins/general/nsclient/UploadQueue.java |   3 +-
 .../PersistentNotificationPlugin.kt           |   1 -
 .../plugins/pump/combo/ComboPlugin.java       |   2 +-
 .../pump/common/PumpPluginAbstract.java       |   2 +-
 .../pump/danaR/AbstractDanaRPlugin.java       |   2 +-
 .../plugins/pump/danaR/DanaRPlugin.java       |   2 +-
 .../danaR/activities/DanaRHistoryActivity.kt  |  10 +-
 .../plugins/pump/danaR/comm/MsgHistoryAll.kt  |   2 +-
 .../pump/danaRKorean/DanaRKoreanPlugin.java   |   2 +-
 .../plugins/pump/danaRv2/DanaRv2Plugin.java   |   4 +-
 .../pump/medtronic/MedtronicPumpPlugin.java   |   2 +-
 .../pump/omnipod/OmnipodPumpPlugin.java       |   1 -
 .../plugins/treatments/TreatmentsPlugin.java  |  23 +-
 .../androidNotification/NotificationHolder.kt |   9 +-
 app/src/main/jniLibs/README.md                |   1 -
 app/src/main/res/values/strings.xml           |  41 ----
 .../bolusInfo/DetailedBolusInfoStorageTest.kt |   2 -
 core/build.gradle                             |   1 +
 .../activities/BolusProgressHelperActivity.kt |   0
 .../activities/DialogAppCompatActivity.kt     |   0
 .../activities/ErrorHelperActivity.kt         |   5 +-
 .../androidaps/dialogs/BolusProgressDialog.kt |   4 +-
 .../androidaps/dialogs/ErrorDialog.kt         |  13 +-
 .../androidaps/events/EventAppExit.kt         |   0
 .../androidaps/events/EventChargingState.kt   |   0
 .../events/EventConfigBuilderChange.kt        |   0
 .../events/EventInitializationChanged.kt      |   0
 .../androidaps/events/EventNetworkChange.kt   |   0
 .../events/EventProfileNeedsUpdate.kt         |   0
 .../events/EventPumpStatusChanged.kt          |   4 +-
 .../androidaps/events/EventStatus.kt          |   2 +-
 .../androidaps/interfaces/DanaRInterface.java |   0
 .../interfaces/IobCobCalculatorInterface.java |   3 +
 .../androidaps/interfaces/LoopInterface.kt    |  24 ++
 .../interfaces/NotificationHolderInterface.kt |  10 +
 .../interfaces/UploadQueueInterface.java      |   8 +
 .../plugins/aps/loop/DeviceStatus.java        |   0
 .../plugins/general/nsclient/NSUpload.java    | 232 ++++++++++--------
 .../EventDismissBolusProgressIfRunning.kt     |   0
 .../events/EventOverviewBolusProgress.kt      |   0
 .../bolusInfo/DetailedBolusInfoStorage.kt     |   2 -
 .../receivers/NetworkChangeReceiver.kt        |   0
 .../receivers/ReceiverStatusStore.kt          |   0
 .../androidaps/services/AlarmSoundService.kt  |   6 +-
 .../androidaps/utils/StringUtils.java         |   3 -
 .../extensions/HexByteArrayConversion.kt      |   0
 .../textValidator/DefaultEditTextValidator.kt |   2 +-
 .../textValidator/EditTextValidator.java      |   0
 .../ValidatingEditTextPreference.kt           |   2 +-
 .../validators/AlphaNumericValidator.kt       |   0
 .../validators/AlphaValidator.kt              |   0
 .../textValidator/validators/AndValidator.kt  |   0
 .../validators/CreditCardValidator.kt         |   0
 .../textValidator/validators/DateValidator.kt |   0
 .../validators/DigitLengthRangeValidator.kt   |   0
 .../validators/DomainValidator.kt             |   0
 .../validators/DummyValidator.kt              |   0
 .../validators/EmailValidator.kt              |   0
 .../validators/EmptyValidator.kt              |   0
 .../validators/FloatNumericRangeValidator.kt  |   0
 .../validators/HttpsUrlValidator.kt           |   0
 .../validators/IpAddressValidator.kt          |   0
 .../validators/MinDigitLengthValidator.kt     |   0
 .../validators/MultiPhoneValidator.kt         |   0
 .../validators/MultiValidator.kt              |   0
 .../textValidator/validators/NotValidator.kt  |   0
 .../validators/NumericRangeValidator.kt       |   0
 .../validators/NumericValidator.kt            |   0
 .../textValidator/validators/OrValidator.kt   |   0
 .../validators/PatternValidator.kt            |   0
 .../validators/PersonFullNameValidator.kt     |   0
 .../validators/PersonNameValidator.kt         |   0
 .../validators/PhoneValidator.kt              |   0
 .../validators/PinStrengthValidator.kt        |   0
 .../validators/RegexpValidator.kt             |   0
 .../validators/SameValueValidator.kt          |   0
 .../textValidator/validators/Validator.kt     |   0
 .../validators/WebUrlValidator.kt             |   0
 .../main/res/layout/dialog_bolusprogress.xml  |   0
 .../src/main/res/layout/dialog_error.xml      |   0
 .../src/main/res/layout/okcancel.xml          |   0
 {app => core}/src/main/res/raw/error.mp3      | Bin
 .../src/main/res/values/fet_attrs.xml         |   0
 core/src/main/res/values/strings.xml          |  28 +++
 .../src/main/res/values/validator.xml         |   0
 danars/build.gradle                           |   3 +
 .../plugins/pump/danaR/DanaRFragment.kt       |   0
 .../plugins/pump/danaR/comm/RecordTypes.kt    |   0
 .../pump/danaR/events/EventDanaRNewStatus.kt  |   0
 .../plugins/pump/danaRS/DanaRSPlugin.kt       |  51 ++--
 .../danaRS/activities/EnterPinActivity.kt     |   4 +-
 .../danaRS/comm/DanaRSMessageHashTable.kt     |   0
 .../pump/danaRS/comm/DanaRS_Packet.java       |   0
 ...RS_Packet_APS_Basal_Set_Temporary_Basal.kt |   0
 .../comm/DanaRS_Packet_APS_History_Events.kt  |   4 +-
 .../DanaRS_Packet_APS_Set_Event_History.kt    |   0
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |   2 +-
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |   0
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |   0
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |   0
 .../DanaRS_Packet_Basal_Set_Basal_Rate.kt     |   0
 ...Packet_Basal_Set_Cancel_Temporary_Basal.kt |   0
 ...aRS_Packet_Basal_Set_Profile_Basal_Rate.kt |   0
 .../DanaRS_Packet_Basal_Set_Profile_Number.kt |   0
 .../DanaRS_Packet_Basal_Set_Suspend_Off.kt    |   0
 .../DanaRS_Packet_Basal_Set_Suspend_On.kt     |   0
 ...DanaRS_Packet_Basal_Set_Temporary_Basal.kt |   0
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |   1 +
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |   0
 ...acket_Bolus_Get_Calculation_Information.kt |   0
 ...et_Carbohydrate_Calculation_Information.kt |   0
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |   0
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |   0
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |   0
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |   0
 .../DanaRS_Packet_Bolus_Get_Initial_Bolus.kt  |   0
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |   0
 .../DanaRS_Packet_Bolus_Set_Bolus_Option.kt   |   0
 .../DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt   |   0
 .../DanaRS_Packet_Bolus_Set_Dual_Bolus.kt     |   0
 .../DanaRS_Packet_Bolus_Set_Extended_Bolus.kt |   0
 ..._Packet_Bolus_Set_Extended_Bolus_Cancel.kt |   0
 .../DanaRS_Packet_Bolus_Set_Initial_Bolus.kt  |   0
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |   0
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |   0
 .../comm/DanaRS_Packet_Etc_Keep_Connection.kt |   0
 .../DanaRS_Packet_Etc_Set_History_Save.kt     |   0
 .../DanaRS_Packet_General_Delivery_Status.kt  |   0
 ...aRS_Packet_General_Get_More_Information.kt |   0
 .../DanaRS_Packet_General_Get_Password.kt     |   0
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |   0
 ...Packet_General_Get_Shipping_Information.kt |   0
 ...aRS_Packet_General_Get_Shipping_Version.kt |   0
 ...Packet_General_Get_Today_Delivery_Total.kt |   0
 ...acket_General_Get_User_Time_Change_Flag.kt |   0
 ...cket_General_Initial_Screen_Information.kt |   0
 ..._Packet_General_Set_History_Upload_Mode.kt |   0
 ...General_Set_User_Time_Change_Flag_Clear.kt |   0
 .../danaRS/comm/DanaRS_Packet_History_.kt     |   0
 .../comm/DanaRS_Packet_History_Alarm.kt       |   0
 .../comm/DanaRS_Packet_History_All_History.kt |   0
 .../comm/DanaRS_Packet_History_Basal.kt       |   0
 .../DanaRS_Packet_History_Blood_Glucose.kt    |   0
 .../comm/DanaRS_Packet_History_Bolus.kt       |   0
 .../DanaRS_Packet_History_Carbohydrate.kt     |   0
 .../comm/DanaRS_Packet_History_Daily.kt       |   0
 .../comm/DanaRS_Packet_History_Prime.kt       |   0
 .../comm/DanaRS_Packet_History_Refill.kt      |   0
 .../comm/DanaRS_Packet_History_Suspend.kt     |   0
 .../comm/DanaRS_Packet_History_Temporary.kt   |   0
 .../danaRS/comm/DanaRS_Packet_Notify_Alarm.kt |   0
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |   0
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |   0
 ...DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt |   0
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |   0
 .../DanaRS_Packet_Option_Get_User_Option.kt   |   0
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     |   0
 .../DanaRS_Packet_Option_Set_User_Option.kt   |   0
 .../comm/DanaRS_Packet_Review_Bolus_Avg.kt    |   0
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |   0
 .../pump/danaRS/encryption/BleEncryption.java |   0
 .../plugins/pump/danaRS/services/BLEComm.kt   |   0
 .../pump/danaRS/services/DanaRSService.kt     |   1 -
 .../jniLibs/arm64-v8a/libBleEncryption.so     | Bin
 .../jniLibs/armeabi-v7a/libBleEncryption.so   | Bin
 .../src/main/jniLibs/x86/libBleEncryption.so  | Bin
 .../main/jniLibs/x86_64/libBleEncryption.so   | Bin
 .../res/layout/danars_enter_pin_activity.xml  |   0
 danars/src/main/res/values/strings.xml        |  19 +-
 .../src/main/res/xml/pref_danars.xml          |   0
 175 files changed, 349 insertions(+), 287 deletions(-)
 delete mode 100644 app/src/main/jniLibs/README.md
 rename {app => core}/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt (86%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt (89%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventAppExit.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventProfileNeedsUpdate.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt (94%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventStatus.kt (84%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/interfaces/DanaRInterface.java (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolderInterface.kt
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java (66%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt (95%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt (91%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/StringUtils.java (86%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt (99%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt (100%)
 rename {app => core}/src/main/res/layout/dialog_bolusprogress.xml (100%)
 rename {app => core}/src/main/res/layout/dialog_error.xml (100%)
 rename {app => core}/src/main/res/layout/okcancel.xml (100%)
 rename {app => core}/src/main/res/raw/error.mp3 (100%)
 rename {app => core}/src/main/res/values/fet_attrs.xml (100%)
 rename {app => core}/src/main/res/values/validator.xml (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt (93%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt (97%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt (98%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt (98%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt (99%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt (99%)
 rename {app => danars}/src/main/jniLibs/arm64-v8a/libBleEncryption.so (100%)
 rename {app => danars}/src/main/jniLibs/armeabi-v7a/libBleEncryption.so (100%)
 rename {app => danars}/src/main/jniLibs/x86/libBleEncryption.so (100%)
 rename {app => danars}/src/main/jniLibs/x86_64/libBleEncryption.so (100%)
 rename {app => danars}/src/main/res/layout/danars_enter_pin_activity.xml (100%)
 rename {app => danars}/src/main/res/xml/pref_danars.xml (100%)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 0b8fc440ca..f7872853f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -41,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index f4b6e9a27a..dbfd40c33d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -4,6 +4,7 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.activities.*
+import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImportListActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index de00d631e4..e7b1903389 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -41,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index c5c723731c..f04035277e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -41,9 +41,11 @@ import info.nightscout.androidaps.interfaces.APSInterface;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
+import info.nightscout.androidaps.interfaces.LoopInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
@@ -53,7 +55,6 @@ import info.nightscout.androidaps.plugins.aps.loop.events.EventLoopUpdateGui;
 import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotification;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
@@ -65,15 +66,15 @@ import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.T;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
-import info.nightscout.androidaps.utils.HardLimits;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 
 @Singleton
-public class LoopPlugin extends PluginBase {
+public class LoopPlugin extends PluginBase implements LoopInterface {
     private final HasAndroidInjector injector;
     private final SP sp;
     private final RxBusWrapper rxBus;
@@ -89,6 +90,7 @@ public class LoopPlugin extends PluginBase {
     private final IobCobCalculatorPlugin iobCobCalculatorPlugin;
     private final ReceiverStatusStore receiverStatusStore;
     private final FabricPrivacy fabricPrivacy;
+    private final NSUpload nsUpload;
     private final HardLimits hardLimits;
 
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -101,21 +103,15 @@ public class LoopPlugin extends PluginBase {
     private boolean isSuperBolus;
     private boolean isDisconnected;
 
-    public class LastRun {
-        public APSResult request = null;
-        public APSResult constraintsProcessed = null;
-        public PumpEnactResult tbrSetByPump = null;
-        public PumpEnactResult smbSetByPump = null;
-        public String source = null;
-        public long lastAPSRun = DateUtil.now();
-        public long lastTBREnact = 0;
-        public long lastSMBEnact = 0;
-        public long lastTBRRequest = 0;
-        public long lastSMBRequest = 0;
-        public long lastOpenModeAccept;
+    @Nullable public LastRun lastRun = null;
+
+    @Nullable @Override public LastRun getLastRun() {
+        return lastRun;
     }
 
-    @Nullable public LastRun lastRun = null;
+    @Override public void setLastRun(@Nullable LastRun lastRun) {
+        this.lastRun = lastRun;
+    }
 
     @Inject
     public LoopPlugin(
@@ -135,6 +131,7 @@ public class LoopPlugin extends PluginBase {
             IobCobCalculatorPlugin iobCobCalculatorPlugin,
             ReceiverStatusStore receiverStatusStore,
             FabricPrivacy fabricPrivacy,
+            NSUpload nsUpload,
             HardLimits hardLimits
     ) {
         super(new PluginDescription()
@@ -161,6 +158,7 @@ public class LoopPlugin extends PluginBase {
         this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
         this.receiverStatusStore = receiverStatusStore;
         this.fabricPrivacy = fabricPrivacy;
+        this.nsUpload = nsUpload;
         this.hardLimits = hardLimits;
 
         loopSuspendedTill = sp.getLong("loopSuspendedTill", 0L);
@@ -292,7 +290,7 @@ public class LoopPlugin extends PluginBase {
         return true;
     }
 
-    public boolean isLGS(){
+    public boolean isLGS() {
         Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
         Double MaxIOBallowed = constraintChecker.getMaxIOBAllowed().value();
         String APSmode = sp.getString(R.string.key_aps_mode, "open");
@@ -403,18 +401,18 @@ public class LoopPlugin extends PluginBase {
             }
 
             if (lastRun == null) lastRun = new LastRun();
-            lastRun.request = result;
-            lastRun.constraintsProcessed = resultAfterConstraints;
-            lastRun.lastAPSRun = DateUtil.now();
-            lastRun.source = ((PluginBase) usedAPS).getName();
-            lastRun.tbrSetByPump = null;
-            lastRun.smbSetByPump = null;
-            lastRun.lastTBREnact = 0;
-            lastRun.lastTBRRequest = 0;
-            lastRun.lastSMBEnact = 0;
-            lastRun.lastSMBRequest = 0;
+            lastRun.setRequest(result);
+            lastRun.setConstraintsProcessed(resultAfterConstraints);
+            lastRun.setLastAPSRun(DateUtil.now());
+            lastRun.setSource(((PluginBase) usedAPS).getName());
+            lastRun.setTbrSetByPump(null);
+            lastRun.setSmbSetByPump(null);
+            lastRun.setLastTBREnact(0);
+            lastRun.setLastTBRRequest(0);
+            lastRun.setLastSMBEnact(0);
+            lastRun.setLastSMBRequest(0);
 
-            NSUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
+            nsUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
 
             if (isSuspended()) {
                 getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended));
@@ -437,27 +435,27 @@ public class LoopPlugin extends PluginBase {
                     final PumpEnactResult waiting = new PumpEnactResult(getInjector());
                     waiting.queued = true;
                     if (resultAfterConstraints.tempBasalRequested)
-                        lastRun.tbrSetByPump = waiting;
+                        lastRun.setTbrSetByPump(waiting);
                     if (resultAfterConstraints.bolusRequested)
-                        lastRun.smbSetByPump = waiting;
+                        lastRun.setSmbSetByPump(waiting);
                     rxBus.send(new EventLoopUpdateGui());
                     fabricPrivacy.logCustom("APSRequest");
                     applyTBRRequest(resultAfterConstraints, profile, new Callback() {
                         @Override
                         public void run() {
                             if (result.enacted || result.success) {
-                                lastRun.tbrSetByPump = result;
-                                lastRun.lastTBRRequest = lastRun.lastAPSRun;
-                                lastRun.lastTBREnact = DateUtil.now();
+                                lastRun.setTbrSetByPump(result);
+                                lastRun.setLastTBRRequest(lastRun.getLastAPSRun());
+                                lastRun.setLastTBREnact(DateUtil.now());
                                 rxBus.send(new EventLoopUpdateGui());
                                 applySMBRequest(resultAfterConstraints, new Callback() {
                                     @Override
                                     public void run() {
                                         //Callback is only called if a bolus was acutally requested
                                         if (result.enacted || result.success) {
-                                            lastRun.smbSetByPump = result;
-                                            lastRun.lastSMBRequest = lastRun.lastAPSRun;
-                                            lastRun.lastSMBEnact = DateUtil.now();
+                                            lastRun.setTbrSetByPump(result);
+                                            lastRun.setLastTBRRequest(lastRun.getLastAPSRun());
+                                            lastRun.setLastTBREnact(DateUtil.now());
                                         } else {
                                             new Thread(() -> {
                                                 SystemClock.sleep(1000);
@@ -472,8 +470,8 @@ public class LoopPlugin extends PluginBase {
                         }
                     });
                 } else {
-                    lastRun.tbrSetByPump = null;
-                    lastRun.smbSetByPump = null;
+                    lastRun.setTbrSetByPump(null);
+                    lastRun.setSmbSetByPump(null);
                 }
             } else {
                 if (resultAfterConstraints.isChangeRequested() && allowNotification) {
@@ -531,15 +529,15 @@ public class LoopPlugin extends PluginBase {
     public void acceptChangeRequest() {
         Profile profile = profileFunction.getProfile();
         final LoopPlugin lp = this;
-        applyTBRRequest(lastRun.constraintsProcessed, profile, new Callback() {
+        applyTBRRequest(lastRun.getConstraintsProcessed(), profile, new Callback() {
             @Override
             public void run() {
                 if (result.enacted) {
-                    lastRun.tbrSetByPump = result;
-                    lastRun.lastTBRRequest = lastRun.lastAPSRun;
-                    lastRun.lastTBREnact = DateUtil.now();
-                    lastRun.lastOpenModeAccept = DateUtil.now();
-                    NSUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
+                    lastRun.setTbrSetByPump(result);
+                    lastRun.setLastTBRRequest(lastRun.getLastAPSRun());
+                    lastRun.setLastTBREnact(DateUtil.now());
+                    lastRun.setLastOpenModeAccept(DateUtil.now());
+                    nsUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
                     sp.incInt(R.string.key_ObjectivesmanualEnacts);
                 }
                 rxBus.send(new EventAcceptOpenLoopChange());
@@ -773,6 +771,7 @@ public class LoopPlugin extends PluginBase {
         event.eventType = CareportalEvent.OPENAPSOFFLINE;
         event.json = data.toString();
         MainApp.getDbHelper().createOrUpdate(event);
-        NSUpload.uploadOpenAPSOffline(event);
+        nsUpload.uploadOpenAPSOffline(event);
     }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index 4d9021bb71..4fa6c43fce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -20,7 +20,6 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.maintenance.formats.*
-import info.nightscout.androidaps.plugins.general.smsCommunicator.otp.OneTimePassword
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index 0786aae250..d9bd5a6307 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -16,6 +16,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.DbRequest;
+import info.nightscout.androidaps.interfaces.UploadQueueInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
@@ -27,7 +28,7 @@ import info.nightscout.androidaps.utils.SP;
 /**
  * Created by mike on 21.02.2016.
  */
-public class UploadQueue {
+public class UploadQueue implements UploadQueueInterface {
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
 
     public static String status() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
index e8d32ed386..ca4b8c1720 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt
@@ -14,7 +14,6 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index ace9df0a97..de9b4e66fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -485,7 +485,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
                 getAapsLogger().error("deliverTreatment: Invalid input");
                 return new PumpEnactResult(getInjector()).success(false).enacted(false)
                         .bolusDelivered(0d).carbsDelivered(0d)
-                        .comment(getResourceHelper().gs(R.string.danar_invalidinput));
+                        .comment(getResourceHelper().gs(R.string.invalidinput));
             } else if (detailedBolusInfo.insulin > 0) {
                 // bolus needed, ask pump to deliver it
                 return deliverBolus(detailedBolusInfo);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 0bb38acb76..6d06f2e788 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -413,7 +413,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
                 // neither carbs nor bolus requested
                 aapsLogger.error("deliverTreatment: Invalid input");
                 return new PumpEnactResult(getInjector()).success(false).enacted(false).bolusDelivered(0d).carbsDelivered(0d)
-                        .comment(getResourceHelper().gs(R.string.danar_invalidinput));
+                        .comment(getResourceHelper().gs(R.string.invalidinput));
             } else if (detailedBolusInfo.insulin > 0) {
                 // bolus needed, ask pump to deliver it
                 return deliverBolus(detailedBolusInfo);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 064e7c8d5b..b055cacda3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -224,7 +224,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             result.isTempCancel = false;
             result.enacted = false;
             result.success = false;
-            result.comment = getResourceHelper().gs(R.string.danar_invalidinput);
+            result.comment = getResourceHelper().gs(R.string.invalidinput);
             getAapsLogger().error("setTempBasalPercent: Invalid input");
             return result;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index d0d1442225..aae520eb06 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -180,7 +180,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            result.comment = resourceHelper.gs(R.string.invalidinput);
             aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index 18ffab8460..eb63a70a0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -151,7 +151,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
             holder.duration.text = DecimalFormatter.to0Decimal(record.recordDuration.toDouble())
             holder.alarm.text = record.recordAlarm
             when (showingType) {
-                RecordTypes.RECORD_TYPE_ALARM                                                                                                                                                              -> {
+                RecordTypes.RECORD_TYPE_ALARM                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
                     holder.stringValue.visibility = View.GONE
@@ -163,7 +163,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.VISIBLE
                 }
 
-                RecordTypes.RECORD_TYPE_BOLUS                                                                                                                                                              -> {
+                RecordTypes.RECORD_TYPE_BOLUS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
                     holder.stringValue.visibility = View.GONE
@@ -175,7 +175,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                              -> {
+                RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
                     holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBasal)
                     holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus)
                     holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus + record.recordDailyBasal)
@@ -191,7 +191,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_GLUCOSE                                                                                                                                                            -> {
+                RecordTypes.RECORD_TYPE_GLUCOSE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          -> {
                     holder.value.text = Profile.toUnitsString(record.recordValue, record.recordValue * Constants.MGDL_TO_MMOLL, profileFunction.getUnits())
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
@@ -216,7 +216,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_SUSPEND                                                                                                                                                            -> {
+                RecordTypes.RECORD_TYPE_SUSPEND                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.GONE
                     holder.stringValue.visibility = View.VISIBLE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
index 3572e0eb54..b25a5b9b1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -136,7 +136,7 @@ open class MsgHistoryAll(
                 danaRHistoryRecord.stringRecordValue = strRecordValue
             }
 
-            17.toByte()                       -> failed = true
+            17.toByte()                                                                                             -> failed = true
         }
         MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
         rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index 201b43f184..ad079c06ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -182,7 +182,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            result.comment = resourceHelper.gs(R.string.invalidinput);
             aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index d9f41d0b3f..992819a136 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -200,7 +200,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.success = false;
             result.bolusDelivered = 0d;
             result.carbsDelivered = 0d;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            result.comment = resourceHelper.gs(R.string.invalidinput);
             aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
@@ -301,7 +301,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.isTempCancel = false;
             result.enacted = false;
             result.success = false;
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput);
+            result.comment = resourceHelper.gs(R.string.invalidinput);
             aapsLogger.error("setTempBasalPercent: Invalid input");
             return result;
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 95a3f68c12..77df3be676 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -201,7 +201,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
         if (pref.getKey().equals(getResourceHelper().gs(R.string.key_rileylink_mac_address))) {
             String value = sp.getStringOrNull(R.string.key_rileylink_mac_address, null);
-            pref.setSummary(value == null ? getResourceHelper().gs(R.string.rileylink_error_address_not_set_short) : value);
+            pref.setSummary(value == null ? getResourceHelper().gs(R.string.not_set_short) : value);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 0c51b5901c..8d5c7b8b41 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 3dd183bff6..4d28d2dcdd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -75,6 +75,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     private final ResourceHelper resourceHelper;
     private final ProfileFunction profileFunction;
     private final ActivePluginProvider activePlugin;
+    private final NSUpload nsUpload;
     private final FabricPrivacy fabricPrivacy;
     private final DateUtil dateUtil;
 
@@ -101,6 +102,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             SP sp,
             ProfileFunction profileFunction,
             ActivePluginProvider activePlugin,
+            NSUpload nsUpload,
             FabricPrivacy fabricPrivacy,
             DateUtil dateUtil
     ) {
@@ -122,6 +124,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         this.activePlugin = activePlugin;
         this.fabricPrivacy = fabricPrivacy;
         this.dateUtil = dateUtil;
+        this.nsUpload = nsUpload;
     }
 
     @Override
@@ -553,13 +556,13 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         if (newRecordCreated) {
             if (extendedBolus.durationInMinutes == 0) {
                 if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
-                    NSUpload.uploadTempBasalEnd(extendedBolus.date, true, extendedBolus.pumpId);
+                    nsUpload.uploadTempBasalEnd(extendedBolus.date, true, extendedBolus.pumpId);
                 else
-                    NSUpload.uploadExtendedBolusEnd(extendedBolus.date, extendedBolus.pumpId);
+                    nsUpload.uploadExtendedBolusEnd(extendedBolus.date, extendedBolus.pumpId);
             } else if (activePlugin.getActivePump().isFakingTempsByExtendedBoluses())
-                NSUpload.uploadTempBasalStartAbsolute(new TemporaryBasal(extendedBolus), extendedBolus.insulin);
+                nsUpload.uploadTempBasalStartAbsolute(new TemporaryBasal(extendedBolus), extendedBolus.insulin);
             else
-                NSUpload.uploadExtendedBolus(extendedBolus);
+                nsUpload.uploadExtendedBolus(extendedBolus);
         }
         return newRecordCreated;
     }
@@ -586,11 +589,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         boolean newRecordCreated = MainApp.getDbHelper().createOrUpdate(tempBasal);
         if (newRecordCreated) {
             if (tempBasal.durationInMinutes == 0)
-                NSUpload.uploadTempBasalEnd(tempBasal.date, false, tempBasal.pumpId);
+                nsUpload.uploadTempBasalEnd(tempBasal.date, false, tempBasal.pumpId);
             else if (tempBasal.isAbsolute)
-                NSUpload.uploadTempBasalStartAbsolute(tempBasal, null);
+                nsUpload.uploadTempBasalStartAbsolute(tempBasal, null);
             else
-                NSUpload.uploadTempBasalStartPercent(tempBasal, profileFunction.getProfile(tempBasal.date));
+                nsUpload.uploadTempBasalStartPercent(tempBasal, profileFunction.getProfile(tempBasal.date));
         }
         return newRecordCreated;
     }
@@ -641,7 +644,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             //log.debug("Adding new Treatment record" + carbsTreatment);
         }
         if (newRecordCreated && detailedBolusInfo.isValid)
-            NSUpload.uploadTreatmentRecord(detailedBolusInfo);
+            nsUpload.uploadTreatmentRecord(detailedBolusInfo);
 
         if (!allowUpdate && !creatOrUpdateResult.success) {
             getAapsLogger().error("Treatment could not be added to DB", new Exception());
@@ -710,7 +713,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
     public void addToHistoryTempTarget(TempTarget tempTarget) {
         //log.debug("Adding new TemporaryBasal record" + profileSwitch.log());
         MainApp.getDbHelper().createOrUpdate(tempTarget);
-        NSUpload.uploadTempTarget(tempTarget, profileFunction);
+        nsUpload.uploadTempTarget(tempTarget, profileFunction);
     }
 
     @Override
@@ -733,7 +736,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         //log.debug("Adding new TemporaryBasal record" + profileSwitch.log());
         rxBus.send(new EventDismissNotification(Notification.PROFILE_SWITCH_MISSING));
         MainApp.getDbHelper().createOrUpdate(profileSwitch);
-        NSUpload.uploadProfileSwitch(profileSwitch);
+        nsUpload.uploadProfileSwitch(profileSwitch);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolder.kt b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolder.kt
index 6ee23a85f5..028c63086e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolder.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/androidNotification/NotificationHolder.kt
@@ -10,6 +10,7 @@ import androidx.core.app.TaskStackBuilder
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.NotificationHolderInterface
 import info.nightscout.androidaps.utils.resources.IconsProvider
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -20,11 +21,11 @@ class NotificationHolder @Inject constructor(
     private val resourceHelper: ResourceHelper,
     private val context: Context,
     private val iconsProvider: IconsProvider
-) {
+) : NotificationHolderInterface {
 
-    val channelID = "AndroidAPS-Ongoing"
-    val notificationID = 4711
-    var notification: Notification
+    override val channelID = "AndroidAPS-Ongoing"
+    override val notificationID = 4711
+    override lateinit var notification: Notification
 
     init {
         val stackBuilder = TaskStackBuilder.create(context)
diff --git a/app/src/main/jniLibs/README.md b/app/src/main/jniLibs/README.md
deleted file mode 100644
index 7041df4e10..0000000000
--- a/app/src/main/jniLibs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# danars-support-lib
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35a25bca9b..b36ff01254 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,7 +62,6 @@
     <string name="description_pump_dana_r">Pump integration for DANA Diabecare R pumps</string>
     <string name="description_pump_dana_r_korean">Pump integration for domestic DANA Diabecare R pumps</string>
     <string name="description_pump_dana_r_v2">Pump integration for DANA Diabecare R pumps with upgraded firmware</string>
-    <string name="description_pump_dana_rs">Pump integration for DANA Diabecare RS pumps</string>
     <string name="description_pump_mdi">Pump integration for people who do multiple daily injections for their diabetes therapy</string>
     <string name="description_pump_virtual">Pump integration for pumps which don\'t have any driver yet (Open Loop)</string>
     <string name="description_sensitivity_aaps">Sensitivity is calculated the same way like Oref0, but you can specify timeframe to the past. Minimal carb absorption is calculated from max carb absorption time from preferences.</string>
@@ -161,7 +160,6 @@
     <string name="openapsma_disabled">Plugin is disabled</string>
     <string name="constraints_violation">Constraints violation</string>
     <string name="treatmentdeliveryerror">Bolus delivery error</string>
-    <string name="tempbasaldeliveryerror">Tempbasal delivery error</string>
     <string name="overview_newtempbasal_basalpercent">Basal value [%]</string>
     <string name="setbasalquestion">Accept new temp basal:</string>
     <string name="overview_treatment_label">Treatment</string>
@@ -283,9 +281,6 @@
     <string name="in_directory" comment="placeholder is for exported file path">in directory: %1$s</string>
 
     <string name="danarpump">DanaR</string>
-    <string name="connecting">Connecting</string>
-    <string name="connected">Connected</string>
-    <string name="disconnected">Disconnected</string>
     <string name="danar_pump_settings">Dana pump settings</string>
     <string name="end_user_license_agreement">End User License Agreement</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
@@ -297,8 +292,6 @@
     <string name="danar_iob_label">Pump IOB</string>
     <string name="danar_dailyunits">Daily units</string>
     <string name="pump_lastbolus_label">Last bolus</string>
-    <string name="danar_invalidinput">Invalid input data</string>
-    <string name="danar_valuenotsetproperly">Value not set properly</string>
     <string name="reloadprofile">Reload profile</string>
     <string name="danar_viewprofile">View profile</string>
     <string name="smscommunicator">SMS Communicator</string>
@@ -328,7 +321,6 @@
     <string name="danarprofile">DanaR profile settings</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
-    <string name="failedupdatebasalprofile">Failed to update basal profile</string>
     <string name="danar_historyreload">Reload</string>
     <string name="uploading">Uploading</string>
     <string name="danar_ebolus">E bolus</string>
@@ -351,7 +343,6 @@
     <string name="danar_history_glucose">Glucose</string>
     <string name="danar_history_refill">Refill</string>
     <string name="danar_history_syspend">Suspend</string>
-    <string name="danar_history_connectingfor">Connecting for %1$d s</string>
     <string name="danars_password_title">Pump password (v1 only)</string>
     <string name="danar_password_title">Pump password</string>
     <string name="wrongpumppassword">Wrong pump password!</string>
@@ -363,8 +354,6 @@
     <string name="occlusion">Occlusion</string>
     <string name="overview_bolusprogress_stop">Stop</string>
     <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
-    <string name="waitingforpump">Waiting for pump</string>
-    <string name="overview_bolusprogress_goingtodeliver">Going to deliver %1$.2fU</string>
     <string name="youareonallowedlimit">You reached allowed limit</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
@@ -406,11 +395,9 @@
     <string name="mealbolus">Meal</string>
     <string name="correctionbous">Corr</string>
     <string name="actions">Actions</string>
-    <string name="androidaps_start">AndroidAPS started</string>
     <string name="ns_upload_only">NS upload only (disabled sync)</string>
     <string name="ns_upload_only_summary">NS upload only. Not effective on SGV unless a local source like xDrip is selected. Not effective on Profiles while NS-Profiles is used.</string>
     <string name="pumpNotInitialized">Pump not initialized!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pump not initialized, profile not set!</string>
     <string name="primefill">Prime/Fill</string>
     <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
     <string name="othersettings_title">Other</string>
@@ -439,7 +426,6 @@
     <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Basal rate:</string>
     <string name="profile_set_failed">Setting of basal profile failed</string>
-    <string name="profile_set_ok">Basal profile in pump updated</string>
     <string name="danar_disableeasymode">Disable EasyUI mode in pump</string>
     <string name="danar_enableextendedbolus">Enable extended boluses on pump</string>
     <string name="danar_switchtouhmode">Change mode from U/d to U/h on pump</string>
@@ -531,7 +517,6 @@
     <string name="settingextendedbolus">Setting extended bolus</string>
     <string name="stoppingextendedbolus">Stopping extended bolus</string>
     <string name="updatingbasalrates">Updating basal rates</string>
-    <string name="disconnecting">Disconnecting</string>
     <string name="executing">Executing</string>
     <string name="virtualpump_settings">Virtual pump settings</string>
     <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
@@ -609,7 +594,6 @@
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Log app start to NS</string>
-    <string name="key_ns_logappstartedevent" translatable="false">ns_logappstartedevent</string>
     <string name="restartingapp">Exiting application to apply settings.</string>
     <string name="danarv2pump">DanaRv2</string>
     <string name="configbuilder_insulin_description">Which type of insulin are you using?</string>
@@ -751,20 +735,12 @@
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="pairing">Pairing</string>
-    <string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
-    <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>
-    <string name="key_danars_v3_pairingkey" translatable="false">danars_v3_pairing_key_</string>
-    <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
     <string name="emptyreservoir">Empty reservoir</string>
     <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
     <string name="remaininsulinalert">Remaining insulin level</string>
     <string name="missedbolus">Missed bolus</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
     <string name="selectedpump">Selected pump</string>
     <string name="bolusspeed">Bolus speed</string>
-    <string name="key_danars_bolusspeed" translatable="false">danars_bolusspeed</string>
-    <string name="danar_setbasalstep001">Set basal step to 0.01 U/h</string>
     <string name="serialnumber">Serial number</string>
     <string name="key_wizard_include_cob" translatable="false">wizard_include_cob</string>
     <string name="key_wizard_include_trend_bg" translatable="false">wizard_include_trend_bg</string>
@@ -938,7 +914,6 @@
     <string name="nav_historybrowser">History browser</string>
     <string name="wear_notifysmb_title">Notify on SMB</string>
     <string name="wear_notifysmb_summary">Show SMB on the watch like a standard bolus.</string>
-    <string name="key_ns_create_announcements_from_errors" translatable="false">ns_create_announcements_from_errors</string>
     <string name="ns_create_announcements_from_errors_title">Create announcements from errors</string>
     <string name="ns_create_announcements_from_errors_summary">Create Nightscout announcement for error dialogs and local alerts (also viewable in Careportal under Treatments)</string>
     <string name="eversense_shortname" translatable="false">EVR</string>
@@ -994,20 +969,15 @@
     <string name="smbdisabledinpreferences">SMB disabled in preferences</string>
     <string name="uamdisabledinpreferences">UAM disabled in preferences</string>
     <string name="uamdisabledoref1notselected">UAM disabled because it rely on Oref1 sensitivity plugin</string>
-    <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
-    <string name="pumplimit">pump limit</string>
     <string name="key_openapsma_max_basal" translatable="false">openapsma_max_basal</string>
     <string name="key_openapsama_current_basal_safety_multiplier" translatable="false">openapsama_current_basal_safety_multiplier</string>
     <string name="key_openapsama_max_daily_safety_multiplier" translatable="false">openapsama_max_daily_safety_multiplier</string>
-    <string name="itmustbepositivevalue">it must be positive value</string>
     <string name="maxbasalmultiplier">max basal multiplier</string>
     <string name="maxdailybasalmultiplier">max daily basal multiplier</string>
     <string name="key_openapsma_max_iob" translatable="false">openapsma_max_iob</string>
     <string name="smb_frequency_exceeded">A bolus was delivered within the last 3 minutes, skipping SMB</string>
     <string name="basal_set_correctly">Basal set correctly</string>
-    <string name="limitingpercentrate">Limiting max percent rate to %1$d%% because of %2$s</string>
     <string name="key_treatmentssafety_maxbolus" translatable="false">treatmentssafety_maxbolus</string>
-    <string name="limitingbolus">Limiting bolus to %1$.1f U because of %2$s</string>
     <string name="limitingextendedbolus">Limiting extended bolus to %1$.1f U because of %2$s</string>
     <string name="limitingmaxiob">Limiting max IOB to %1$.1f U because of %2$s</string>
     <string name="limitingcarbs">Limiting carbs to %1$d g because of %2$s</string>
@@ -1044,7 +1014,6 @@
     <string name="nav_setupwizard">Setup Wizard</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
-    <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
     <string name="firstinsulinincrement">First insulin increment</string>
     <string name="secondinsulinincrement">Second insulin increment</string>
     <string name="thirdinsulinincrement">Third insulin increment</string>
@@ -1183,12 +1152,7 @@
     <string name="setupwizard_preferred_aps_mode">Preferred APS mode</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Handshaking</string>
     <string name="sendlogfiles">Send today\'s log files to developers along with this time. Unexpected situation.</string>
-    <string name="maxbolusviolation">Max bolus violation</string>
-    <string name="commanderror">Command error</string>
-    <string name="speederror">Speed error</string>
-    <string name="insulinlimitviolation">Insulin limit violation</string>
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
@@ -1521,7 +1485,6 @@
     <string name="rileylink_error_tuneup_failed">TuneUp Failed</string>
     <string name="rileylink_error_pump_unreachable">Pump unreachable</string>
     <string name="rileylink_error_pod_unreachable">Pod unreachable</string>
-    <string name="rileylink_error_address_not_set_short">Not set</string>
 
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pump</string>
@@ -1636,7 +1599,6 @@
     <string name="time_or_timezone_change">Time and/or Timezone change on pump</string>
     <string name="nopumpselected">No pump selected</string>
     <string name="setupwizard_units_prompt">Select units you want to display values in</string>
-    <string name="key_ns_uploadlocalprofile" translatable="false">ns_uploadlocalprofile</string>
     <string name="ns_ploadlocalprofile">Upload local profile changes to NS</string>
     <string name="key_wear_detailediob" translatable="false">wear_detailediob</string>
     <string name="key_wear_showbgi" translatable="false">wear_showbgi</string>
@@ -1674,7 +1636,6 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Tools</string>
     <string name="show_calculation">Show calcuation</string>
-    <string name="error">Error</string>
     <string name="timeformat12h">12h</string>
     <string name="timeformat24h">24h</string>
     <string name="automation_event">Automation event</string>
@@ -1741,10 +1702,8 @@
     <string name="overview_show_predictions">Predictions</string>
     <string name="overview_show_deviationslope">Deviation slope</string>
     <string name="key_graphconfig" translatable="false">graphconfig</string>
-    <string name="key_rs_loginsulinchange" translatable="false">rs_loginsulinchange</string>
     <string name="rs_loginsulinchange_title">Log reservoir change</string>
     <string name="rs_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
-    <string name="key_rs_logcanulachange" translatable="false">rs_logcanulachange</string>
     <string name="rs_logcanulachange_title">Log canula change</string>
     <string name="rs_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
     <string name="authorizationfailed">Authorization failed</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
index 28117e5583..9f483da250 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorageTest.kt
@@ -2,13 +2,11 @@ package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.logging.AAPSLogger
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
diff --git a/core/build.gradle b/core/build.gradle
index bde94da837..b3045c0f35 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -46,6 +46,7 @@ dependencies {
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation 'com.google.android.material:material:1.1.0'
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
rename to core/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
rename to core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
rename to core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
index ce02742381..11affb41d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.activities
 
 import android.os.Bundle
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.dialogs.ErrorDialog
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -9,6 +9,7 @@ import javax.inject.Inject
 
 class ErrorHelperActivity : DialogAppCompatActivity() {
     @Inject lateinit var sp : SP
+    @Inject lateinit var nsUpload: NSUpload
 
     @Override
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -21,7 +22,7 @@ class ErrorHelperActivity : DialogAppCompatActivity() {
         errorDialog.show(supportFragmentManager, "Error")
 
         if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-            NSUpload.uploadError(intent.getStringExtra("status"))
+            nsUpload.uploadError(intent.getStringExtra("status"))
         }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
index 8152c25ab0..98e459a5b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/BolusProgressDialog.kt
@@ -9,8 +9,8 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.BolusProgressHelperActivity
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -71,7 +71,7 @@ class BolusProgressDialog : DaggerDialogFragment() {
         savedInstanceState?.let {
             amount = it.getDouble("amount")
         }
-        overview_bolusprogress_title.text = resourceHelper.gs(R.string.overview_bolusprogress_goingtodeliver, amount)
+        overview_bolusprogress_title.text = resourceHelper.gs(R.string.goingtodeliver, amount)
         overview_bolusprogress_stop.setOnClickListener {
             aapsLogger.debug(LTag.UI, "Stop bolus delivery button pressed")
             stopPressed = true
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
index 07917899bf..9d2035b279 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ErrorDialog.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.dialogs
 
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -9,9 +10,8 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.services.AlarmSoundService
 import kotlinx.android.synthetic.main.dialog_error.*
@@ -19,7 +19,6 @@ import javax.inject.Inject
 
 class ErrorDialog : DaggerDialogFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var mainApp: MainApp
 
     var helperActivity: ErrorHelperActivity? = null
     var status: String = ""
@@ -82,16 +81,16 @@ class ErrorDialog : DaggerDialogFragment() {
 
     private fun startAlarm() {
         if (sound != 0) {
-            val alarm = Intent(mainApp, AlarmSoundService::class.java)
+            val alarm = Intent(context, AlarmSoundService::class.java)
             alarm.putExtra("soundid", sound)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                mainApp.startForegroundService(alarm)
+                context?.startForegroundService(alarm)
             } else {
-                mainApp.startService(alarm)
+                context?.startService(alarm)
             }
         }
     }
 
     private fun stopAlarm() =
-        mainApp.stopService(Intent(mainApp, AlarmSoundService::class.java))
+        context?.stopService(Intent(context, AlarmSoundService::class.java))
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventAppExit.kt b/core/src/main/java/info/nightscout/androidaps/events/EventAppExit.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventAppExit.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventAppExit.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt b/core/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventChargingState.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventProfileNeedsUpdate.kt b/core/src/main/java/info/nightscout/androidaps/events/EventProfileNeedsUpdate.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventProfileNeedsUpdate.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventProfileNeedsUpdate.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
index cc92defe8d..0b9ce7ebf0 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.events
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventPumpStatusChanged : EventStatus {
@@ -46,7 +46,7 @@ class EventPumpStatusChanged : EventStatus {
     // status for startup wizard
     override fun getStatus(resourceHelper: ResourceHelper): String {
         return when (status) {
-            Status.CONNECTING    -> String.format(resourceHelper.gs(R.string.danar_history_connectingfor), secondsElapsed)
+            Status.CONNECTING    -> String.format(resourceHelper.gs(R.string.connectingfor), secondsElapsed)
             Status.HANDSHAKING   -> resourceHelper.gs(R.string.handshaking)
             Status.CONNECTED     -> resourceHelper.gs(R.string.connected)
             Status.PERFORMING    -> performingAction
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt b/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
index 360b62f0e9..88c8073e69 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventStatus.kt
@@ -3,6 +3,6 @@ package info.nightscout.androidaps.events
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 // pass string to startup wizard
-abstract class EventStatus :Event() {
+abstract class EventStatus : Event() {
     abstract fun getStatus(resourceHelper: ResourceHelper) : String
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/DanaRInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/DanaRInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/interfaces/DanaRInterface.java
rename to core/src/main/java/info/nightscout/androidaps/interfaces/DanaRInterface.java
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
index 2d06449082..75a57b2c07 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/IobCobCalculatorInterface.java
@@ -2,10 +2,13 @@ package info.nightscout.androidaps.interfaces;
 
 import androidx.collection.LongSparseArray;
 
+import info.nightscout.androidaps.data.IobTotal;
+import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
 
 public interface IobCobCalculatorInterface {
     LongSparseArray<AutosensData> getAutosensDataTable();
+    IobTotal[] calculateIobArrayInDia(Profile profile);
     String lastDataTime();
     AutosensData getAutosensData(long toTime);
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt
new file mode 100644
index 0000000000..2ec67b461b
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/LoopInterface.kt
@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.androidaps.utils.DateUtil
+
+interface LoopInterface {
+
+    class LastRun {
+        var request: APSResult? = null
+        var constraintsProcessed: APSResult? = null
+        var tbrSetByPump: PumpEnactResult? = null
+        var smbSetByPump: PumpEnactResult? = null
+        var source: String? = null
+        var lastAPSRun = DateUtil.now()
+        var lastTBREnact: Long = 0
+        var lastSMBEnact: Long = 0
+        var lastTBRRequest: Long = 0
+        var lastSMBRequest: Long = 0
+        var lastOpenModeAccept: Long = 0
+    }
+
+    var lastRun: LastRun?
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolderInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolderInterface.kt
new file mode 100644
index 0000000000..cbba8f326a
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/NotificationHolderInterface.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.interfaces
+
+import android.app.Notification
+
+interface NotificationHolderInterface {
+    val channelID : String
+    val notificationID : Int
+    var notification: Notification
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
new file mode 100644
index 0000000000..d051d43501
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.interfaces;
+
+import info.nightscout.androidaps.db.DbRequest;
+
+public interface UploadQueueInterface {
+
+    void add(DbRequest dbRequest);
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 48a2b31b35..85331b0f3a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -1,31 +1,29 @@
 package info.nightscout.androidaps.plugins.general.nsclient;
 
+import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
-import androidx.preference.PreferenceManager;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DbRequest;
@@ -33,27 +31,50 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
+import info.nightscout.androidaps.interfaces.LoopInterface;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.interfaces.PumpInterface;
+import info.nightscout.androidaps.interfaces.UploadQueueInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus;
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
 import info.nightscout.androidaps.receivers.ReceiverStatusStore;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 26.05.2017.
  */
+@Singleton
 public class NSUpload {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
 
-    public static void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
+    private final AAPSLogger aapsLogger;
+    private final ResourceHelper resourceHelper;
+    private final SP sp;
+    private final Context context;
+    private final UploadQueueInterface uploadQueue;
+
+    public NSUpload(
+            AAPSLogger aapsLogger,
+            ResourceHelper resourceHelper,
+            SP sp,
+            Context context,
+            UploadQueueInterface uploadQueue
+    ) {
+        this.aapsLogger = aapsLogger;
+        this.resourceHelper = resourceHelper;
+        this.sp = sp;
+        this.context = context;
+        this.uploadQueue = uploadQueue;
+    }
+
+    public void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
         try {
             JSONObject data = new JSONObject();
             data.put("eventType", CareportalEvent.TEMPBASAL);
@@ -63,19 +84,18 @@ public class NSUpload {
             if (temporaryBasal.pumpId != 0)
                 data.put("pumpId", temporaryBasal.pumpId);
             data.put("created_at", DateUtil.toISOString(temporaryBasal.date));
-            data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
+            data.put("enteredBy", "openaps://" + "AndroidAPS");
             if (originalExtendedAmount != null)
                 data.put("originalExtendedAmount", originalExtendedAmount); // for back synchronization
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadTempBasalStartPercent(TemporaryBasal temporaryBasal, Profile profile) {
+    public void uploadTempBasalStartPercent(TemporaryBasal temporaryBasal, Profile profile) {
         try {
-            SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
-            boolean useAbsolute = SP.getBoolean("ns_sync_use_absolute", false);
+            boolean useAbsolute = sp.getBoolean("ns_sync_use_absolute", false);
             double absoluteRate = 0;
             if (profile != null) {
                 absoluteRate = profile.getBasal(temporaryBasal.date) * temporaryBasal.percentRate / 100d;
@@ -97,31 +117,31 @@ public class NSUpload {
                 if (temporaryBasal.pumpId != 0)
                     data.put("pumpId", temporaryBasal.pumpId);
                 data.put("created_at", DateUtil.toISOString(temporaryBasal.date));
-                data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-                UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+                data.put("enteredBy", "openaps://" + "AndroidAPS");
+                uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadTempBasalEnd(long time, boolean isFakedTempBasal, long pumpId) {
+    public void uploadTempBasalEnd(long time, boolean isFakedTempBasal, long pumpId) {
         try {
             JSONObject data = new JSONObject();
             data.put("eventType", CareportalEvent.TEMPBASAL);
             data.put("created_at", DateUtil.toISOString(time));
-            data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
+            data.put("enteredBy", "openaps://" + "AndroidAPS");
             if (isFakedTempBasal)
                 data.put("isFakedTempBasal", isFakedTempBasal);
             if (pumpId != 0)
                 data.put("pumpId", pumpId);
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadExtendedBolus(ExtendedBolus extendedBolus) {
+    public void uploadExtendedBolus(ExtendedBolus extendedBolus) {
         try {
             JSONObject data = new JSONObject();
             data.put("eventType", CareportalEvent.COMBOBOLUS);
@@ -133,14 +153,14 @@ public class NSUpload {
             if (extendedBolus.pumpId != 0)
                 data.put("pumpId", extendedBolus.pumpId);
             data.put("created_at", DateUtil.toISOString(extendedBolus.date));
-            data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            data.put("enteredBy", "openaps://" + "AndroidAPS");
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadExtendedBolusEnd(long time, long pumpId) {
+    public void uploadExtendedBolusEnd(long time, long pumpId) {
         try {
             JSONObject data = new JSONObject();
             data.put("eventType", CareportalEvent.COMBOBOLUS);
@@ -150,59 +170,59 @@ public class NSUpload {
             data.put("enteredinsulin", 0);
             data.put("relative", 0);
             data.put("created_at", DateUtil.toISOString(time));
-            data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
+            data.put("enteredBy", "openaps://" + "AndroidAPS");
             if (pumpId != 0)
                 data.put("pumpId", pumpId);
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadDeviceStatus(LoopPlugin loopPlugin, IobCobCalculatorPlugin iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface, ReceiverStatusStore receiverStatusStore) {
+    public void uploadDeviceStatus(LoopInterface loopPlugin, IobCobCalculatorInterface iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface, ReceiverStatusStore receiverStatusStore) {
         Profile profile = profileFunction.getProfile();
         String profileName = profileFunction.getProfileName();
 
         if (profile == null) {
-            log.error("Profile is null. Skipping upload");
+            aapsLogger.error("Profile is null. Skipping upload");
             return;
         }
 
         DeviceStatus deviceStatus = new DeviceStatus();
         try {
-            LoopPlugin.LastRun lastRun = loopPlugin.lastRun;
-            if (lastRun != null && lastRun.lastAPSRun > System.currentTimeMillis() - 300 * 1000L) {
+            LoopInterface.LastRun lastRun = loopPlugin.getLastRun();
+            if (lastRun != null && lastRun.getLastAPSRun() > System.currentTimeMillis() - 300 * 1000L) {
                 // do not send if result is older than 1 min
-                APSResult apsResult = lastRun.request;
-                apsResult.json().put("timestamp", DateUtil.toISOString(lastRun.lastAPSRun));
+                APSResult apsResult = lastRun.getRequest();
+                apsResult.json().put("timestamp", DateUtil.toISOString(lastRun.getLastAPSRun()));
                 deviceStatus.suggested = apsResult.json();
 
-                deviceStatus.iob = lastRun.request.iob.json();
-                deviceStatus.iob.put("time", DateUtil.toISOString(lastRun.lastAPSRun));
+                deviceStatus.iob = lastRun.getRequest().iob.json();
+                deviceStatus.iob.put("time", DateUtil.toISOString(lastRun.getLastAPSRun()));
 
                 JSONObject requested = new JSONObject();
 
-                if (lastRun.tbrSetByPump != null && lastRun.tbrSetByPump.enacted) { // enacted
-                    deviceStatus.enacted = lastRun.request.json();
-                    deviceStatus.enacted.put("rate", lastRun.tbrSetByPump.json(profile).get("rate"));
-                    deviceStatus.enacted.put("duration", lastRun.tbrSetByPump.json(profile).get("duration"));
+                if (lastRun.getTbrSetByPump() != null && lastRun.getTbrSetByPump().enacted) { // enacted
+                    deviceStatus.enacted = lastRun.getRequest().json();
+                    deviceStatus.enacted.put("rate", lastRun.getTbrSetByPump().json(profile).get("rate"));
+                    deviceStatus.enacted.put("duration", lastRun.getTbrSetByPump().json(profile).get("duration"));
                     deviceStatus.enacted.put("recieved", true);
-                    requested.put("duration", lastRun.request.duration);
-                    requested.put("rate", lastRun.request.rate);
+                    requested.put("duration", lastRun.getRequest().duration);
+                    requested.put("rate", lastRun.getRequest().rate);
                     requested.put("temp", "absolute");
                     deviceStatus.enacted.put("requested", requested);
                 }
-                if (lastRun.smbSetByPump != null && lastRun.smbSetByPump.enacted) { // enacted
+                if (lastRun.getTbrSetByPump() != null && lastRun.getTbrSetByPump().enacted) { // enacted
                     if (deviceStatus.enacted == null) {
-                        deviceStatus.enacted = lastRun.request.json();
+                        deviceStatus.enacted = lastRun.getRequest().json();
                     }
-                    deviceStatus.enacted.put("smb", lastRun.smbSetByPump.bolusDelivered);
-                    requested.put("smb", lastRun.request.smb);
+                    deviceStatus.enacted.put("smb", lastRun.getTbrSetByPump().bolusDelivered);
+                    requested.put("smb", lastRun.getRequest().smb);
                     deviceStatus.enacted.put("requested", requested);
                 }
             } else {
                 if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug("OpenAPS data too old to upload, sending iob only");
+                    aapsLogger.debug("OpenAPS data too old to upload, sending iob only");
                 IobTotal[] iob = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
                 if (iob.length > 0) {
                     deviceStatus.iob = iob[0].json();
@@ -219,13 +239,13 @@ public class NSUpload {
             deviceStatus.uploaderBattery = batteryLevel;
 
             deviceStatus.created_at = DateUtil.toISOString(new Date());
-            UploadQueue.add(new DbRequest("dbAdd", "devicestatus", deviceStatus.mongoRecord()));
+            uploadQueue.add(new DbRequest("dbAdd", "devicestatus", deviceStatus.mongoRecord()));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadTreatmentRecord(DetailedBolusInfo detailedBolusInfo) {
+    public void uploadTreatmentRecord(DetailedBolusInfo detailedBolusInfo) {
         JSONObject data = new JSONObject();
         try {
             data.put("eventType", detailedBolusInfo.eventType);
@@ -248,21 +268,21 @@ public class NSUpload {
                 data.put("notes", detailedBolusInfo.notes);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         uploadCareportalEntryToNS(data);
     }
 
-    public static void uploadProfileSwitch(ProfileSwitch profileSwitch) {
+    public void uploadProfileSwitch(ProfileSwitch profileSwitch) {
         try {
             JSONObject data = getJson(profileSwitch);
             uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadTempTarget(TempTarget tempTarget, ProfileFunction profileFunction) {
+    public void uploadTempTarget(TempTarget tempTarget, ProfileFunction profileFunction) {
         try {
             JSONObject data = new JSONObject();
             data.put("eventType", CareportalEvent.TEMPORARYTARGET);
@@ -274,21 +294,21 @@ public class NSUpload {
                 data.put("units", profileFunction.getUnits());
             }
             data.put("created_at", DateUtil.toISOString(tempTarget.date));
-            data.put("enteredBy", MainApp.gs(R.string.app_name));
+            data.put("enteredBy", "AndroidAPS");
             uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void updateProfileSwitch(ProfileSwitch profileSwitch) {
+    public void updateProfileSwitch(ProfileSwitch profileSwitch) {
         try {
             JSONObject data = getJson(profileSwitch);
             if (profileSwitch._id != null) {
-                UploadQueue.add(new DbRequest("dbUpdate", "treatments", profileSwitch._id, data));
+                uploadQueue.add(new DbRequest("dbUpdate", "treatments", profileSwitch._id, data));
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -305,12 +325,12 @@ public class NSUpload {
             data.put("percentage", profileSwitch.percentage);
         }
         data.put("created_at", DateUtil.toISOString(profileSwitch.date));
-        data.put("enteredBy", MainApp.gs(R.string.app_name));
+        data.put("enteredBy", "AndroidAPS");
 
         return data;
     }
 
-    public static void uploadCareportalEntryToNS(JSONObject data) {
+    public void uploadCareportalEntryToNS(JSONObject data) {
         try {
             if (data.has("preBolus") && data.has("carbs")) {
                 JSONObject prebolus = new JSONObject();
@@ -325,48 +345,48 @@ public class NSUpload {
                 uploadCareportalEntryToNS(prebolus);
             }
             DbRequest dbr = new DbRequest("dbAdd", "treatments", data);
-            log.debug("Prepared: " + dbr.log());
-            UploadQueue.add(dbr);
+            aapsLogger.debug("Prepared: " + dbr.log());
+            uploadQueue.add(dbr);
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
     }
 
-    public static void removeCareportalEntryFromNS(String _id) {
-        UploadQueue.add(new DbRequest("dbRemove", "treatments", _id));
+    public void removeCareportalEntryFromNS(String _id) {
+        uploadQueue.add(new DbRequest("dbRemove", "treatments", _id));
     }
 
-    public static void uploadOpenAPSOffline(CareportalEvent event) {
+    public void uploadOpenAPSOffline(CareportalEvent event) {
         try {
             JSONObject data = new JSONObject(event.json);
             data.put("created_at", DateUtil.toISOString(event.date));
-            data.put("enteredBy", "openaps://" + MainApp.gs(R.string.app_name));
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            data.put("enteredBy", "openaps://" + "AndroidAPS");
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    public static void uploadError(String error) {
+    public void uploadError(String error) {
         uploadError(error, new Date());
     }
 
-    public static void uploadError(String error, Date date) {
+    public void uploadError(String error, Date date) {
         JSONObject data = new JSONObject();
         try {
             data.put("eventType", "Announcement");
             data.put("created_at", DateUtil.toISOString(date));
-            data.put("enteredBy", SP.getString("careportal_enteredby", MainApp.gs(R.string.app_name)));
+            data.put("enteredBy", sp.getString("careportal_enteredby", "AndroidAPS"));
             data.put("notes", error);
             data.put("isAnnouncement", true);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+        uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
     }
 
-    public static void uploadBg(BgReading reading, String source) {
+    public void uploadBg(BgReading reading, String source) {
         JSONObject data = new JSONObject();
         try {
             data.put("device", source);
@@ -376,56 +396,56 @@ public class NSUpload {
             data.put("direction", reading.direction);
             data.put("type", "sgv");
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        UploadQueue.add(new DbRequest("dbAdd", "entries", data));
+        uploadQueue.add(new DbRequest("dbAdd", "entries", data));
     }
 
-    public static void uploadAppStart() {
-        if (SP.getBoolean(R.string.key_ns_logappstartedevent, true)) {
+    public void uploadAppStart() {
+        if (sp.getBoolean(R.string.key_ns_logappstartedevent, true)) {
             JSONObject data = new JSONObject();
             try {
                 data.put("eventType", "Note");
                 data.put("created_at", DateUtil.toISOString(new Date()));
-                data.put("notes", MainApp.gs(R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL);
+                data.put("notes", resourceHelper.gs(R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL);
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception", e);
             }
-            UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+            uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
         }
     }
 
-    public static void uploadProfileStore(JSONObject profileStore) {
-        if (SP.getBoolean(R.string.key_ns_uploadlocalprofile, false)) {
-            UploadQueue.add(new DbRequest("dbAdd", "profile", profileStore));
+    public void uploadProfileStore(JSONObject profileStore) {
+        if (sp.getBoolean(R.string.key_ns_uploadlocalprofile, false)) {
+            uploadQueue.add(new DbRequest("dbAdd", "profile", profileStore));
         }
     }
 
-    public static void uploadEvent(String careportalEvent, long time, @Nullable String notes) {
+    public void uploadEvent(String careportalEvent, long time, @Nullable String notes) {
         JSONObject data = new JSONObject();
         try {
             data.put("eventType", careportalEvent);
             data.put("created_at", DateUtil.toISOString(time));
-            data.put("enteredBy", SP.getString("careportal_enteredby", MainApp.gs(R.string.app_name)));
+            data.put("enteredBy", sp.getString("careportal_enteredby", "AndroidAPS"));
             if (notes != null) {
                 data.put("notes", notes);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        UploadQueue.add(new DbRequest("dbAdd", "treatments", data));
+        uploadQueue.add(new DbRequest("dbAdd", "treatments", data));
     }
 
-    public static void removeFoodFromNS(String _id) {
+    public void removeFoodFromNS(String _id) {
         try {
-            UploadQueue.add(new DbRequest("dbRemove", "food", _id));
+            uploadQueue.add(new DbRequest("dbRemove", "food", _id));
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
     }
 
-    public static void sendToXdrip(BgReading bgReading) {
+    public void sendToXdrip(BgReading bgReading) {
         final String XDRIP_PLUS_NS_EMULATOR = "com.eveningoutpost.dexdrip.NS_EMULATOR";
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US);
 
@@ -450,22 +470,22 @@ public class NSUpload {
             bundle.putString("data", entriesBody.toString());
             final Intent intent = new Intent(XDRIP_PLUS_NS_EMULATOR);
             intent.putExtras(bundle).addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            MainApp.instance().sendBroadcast(intent);
-            List<ResolveInfo> receivers = MainApp.instance().getPackageManager().queryBroadcastReceivers(intent, 0);
+            context.sendBroadcast(intent);
+            List<ResolveInfo> receivers = context.getPackageManager().queryBroadcastReceivers(intent, 0);
             if (receivers.size() < 1) {
-                log.debug("No xDrip receivers found. ");
+                aapsLogger.debug("No xDrip receivers found. ");
             } else {
-                log.debug(receivers.size() + " xDrip receivers");
+                aapsLogger.debug(receivers.size() + " xDrip receivers");
             }
 
 
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
     }
 
-    public static void createNSTreatment(JSONObject data, ProfileStore profileStore, ProfileFunction profileFunction, long eventTime) {
+    public void createNSTreatment(JSONObject data, ProfileStore profileStore, ProfileFunction profileFunction, long eventTime) {
         if (JsonHelper.safeGetString(data, "eventType", "").equals(CareportalEvent.PROFILESWITCH)) {
             ProfileSwitch profileSwitch = profileFunction.prepareProfileSwitch(
                     profileStore,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventDismissBolusProgressIfRunning.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/general/overview/events/EventOverviewBolusProgress.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
index 51a63f62bb..b74fc2ac00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/bolusInfo/DetailedBolusInfoStorage.kt
@@ -2,9 +2,7 @@ package info.nightscout.androidaps.plugins.pump.common.bolusInfo
 
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper
 import info.nightscout.androidaps.utils.T
 import java.util.*
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
rename to core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt b/core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
rename to core/src/main/java/info/nightscout/androidaps/receivers/ReceiverStatusStore.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
rename to core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
index 0d261b5071..140cfda5b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -6,17 +6,17 @@ import android.media.AudioManager
 import android.media.MediaPlayer
 import android.os.IBinder
 import dagger.android.DaggerService
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.interfaces.NotificationHolderInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.utils.androidNotification.NotificationHolder
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
 class AlarmSoundService : DaggerService() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var notificationHolder: NotificationHolder
+    @Inject lateinit var notificationHolder: NotificationHolderInterface
 
     private var player: MediaPlayer? = null
     private var resourceId = R.raw.error
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java b/core/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
rename to core/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
index ebd31dea17..01b92a680f 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/StringUtils.java
@@ -1,8 +1,5 @@
 package info.nightscout.androidaps.utils;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-
 /**
  * class contains useful String functions
  */
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt b/core/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/extensions/HexByteArrayConversion.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
index 21146a9a72..2956a8d2b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/DefaultEditTextValidator.kt
@@ -7,7 +7,7 @@ import android.text.TextUtils
 import android.text.TextWatcher
 import android.widget.EditText
 import com.google.android.material.textfield.TextInputLayout
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.textValidator.validators.*
 
 class DefaultEditTextValidator : EditTextValidator {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/EditTextValidator.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
index 6130d7acf6..ae75641b4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt
@@ -6,7 +6,7 @@ import android.util.AttributeSet
 import androidx.preference.EditTextPreference
 import androidx.preference.EditTextPreference.OnBindEditTextListener
 import androidx.preference.PreferenceViewHolder
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 
 class ValidatingEditTextPreference(ctx: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int)
     : EditTextPreference(ctx, attrs, defStyleAttr, defStyleRes) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaNumericValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AlphaValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/AndValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/CreditCardValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DateValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DigitLengthRangeValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DomainValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/DummyValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmailValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/EmptyValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/FloatNumericRangeValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/HttpsUrlValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/IpAddressValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MinDigitLengthValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiPhoneValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/MultiValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NotValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericRangeValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/NumericValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/OrValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PatternValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonFullNameValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PersonNameValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PhoneValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/PinStrengthValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/RegexpValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/SameValueValidator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/Validator.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/textValidator/validators/WebUrlValidator.kt
diff --git a/app/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_bolusprogress.xml
rename to core/src/main/res/layout/dialog_bolusprogress.xml
diff --git a/app/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_error.xml
rename to core/src/main/res/layout/dialog_error.xml
diff --git a/app/src/main/res/layout/okcancel.xml b/core/src/main/res/layout/okcancel.xml
similarity index 100%
rename from app/src/main/res/layout/okcancel.xml
rename to core/src/main/res/layout/okcancel.xml
diff --git a/app/src/main/res/raw/error.mp3 b/core/src/main/res/raw/error.mp3
similarity index 100%
rename from app/src/main/res/raw/error.mp3
rename to core/src/main/res/raw/error.mp3
diff --git a/app/src/main/res/values/fet_attrs.xml b/core/src/main/res/values/fet_attrs.xml
similarity index 100%
rename from app/src/main/res/values/fet_attrs.xml
rename to core/src/main/res/values/fet_attrs.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b69a63c11c..2842da7183 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -17,6 +17,34 @@
     <string name="key_hypo_target" translatable="false">hypo_target</string>
     <string name="key_low_mark" translatable="false">low_mark</string>
     <string name="key_high_mark" translatable="false">high_mark</string>
+    <string name="key_ns_create_announcements_from_errors" translatable="false">ns_create_announcements_from_errors</string>
+    <string name="key_ns_logappstartedevent" translatable="false">ns_logappstartedevent</string>
+    <string name="key_ns_uploadlocalprofile" translatable="false">ns_uploadlocalprofile</string>
+
+    <!--    General-->
+    <string name="error">Error</string>
+    <string name="not_set_short">Not set</string>
+    <string name="failedupdatebasalprofile">Failed to update basal profile</string>
+    <string name="profile_set_ok">Basal profile in pump updated</string>
+    <string name="invalidinput">Invalid input data</string>
+    <string name="tempbasaldeliveryerror">Tempbasal delivery error</string>
+    <string name="goingtodeliver">Going to deliver %1$.2fU</string>
+    <string name="waitingforpump">Waiting for pump</string>
+    <string name="connectingfor">Connecting for %1$d s</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connecting">Connecting</string>
+    <string name="connected">Connected</string>
+    <string name="disconnected">Disconnected</string>
+    <string name="disconnecting">Disconnecting</string>
+    <string name="androidaps_start">AndroidAPS started</string>
+
+    <!--    Constraints-->
+    <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
+    <string name="pumplimit">pump limit</string>
+    <string name="limitingpercentrate">Limiting max percent rate to %1$d%% because of %2$s</string>
+    <string name="itmustbepositivevalue">it must be positive value</string>
+    <string name="limitingbolus">Limiting bolus to %1$.1f U because of %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pump not initialized, profile not set!</string>
 
     <!--    Dialogs-->
     <string name="confirmation">Confirmation</string>
diff --git a/app/src/main/res/values/validator.xml b/core/src/main/res/values/validator.xml
similarity index 100%
rename from app/src/main/res/values/validator.xml
rename to core/src/main/res/values/validator.xml
diff --git a/danars/build.gradle b/danars/build.gradle
index 96753367b4..a80ef58dfb 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -50,9 +50,12 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
index 8eb3b26d4e..2cf3e44656 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
@@ -8,8 +8,7 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
@@ -34,7 +33,6 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -56,13 +54,14 @@ class DanaRSPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val constraintChecker: ConstraintChecker,
     private val profileFunction: ProfileFunction,
-    private val treatmentsPlugin: TreatmentsPlugin,
+    private val activePluginProvider: ActivePluginProvider,
     private val sp: SP,
     commandQueue: CommandQueueProvider,
     private val danaRPump: DanaRPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val fabricPrivacy: FabricPrivacy,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val config: ConfigInterface
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
     .fragmentClass(DanaRFragment::class.java.name)
@@ -85,7 +84,7 @@ class DanaRSPlugin @Inject constructor(
         if (pref.key == resourceHelper.gs(R.string.key_danars_name)) {
             val value = sp.getStringOrNull(R.string.key_danars_name, null)
             pref.summary = value
-                ?: resourceHelper.gs(R.string.rileylink_error_address_not_set_short)
+                ?: resourceHelper.gs(R.string.not_set_short)
         }
     }
 
@@ -320,7 +319,7 @@ class DanaRSPlugin @Inject constructor(
                     0x80 -> error = resourceHelper.gs(R.string.insulinlimitviolation)
                 }
                 result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, error)
-            } else result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            } else result.comment = resourceHelper.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
             result
         } else {
@@ -328,7 +327,7 @@ class DanaRSPlugin @Inject constructor(
             result.success = false
             result.bolusDelivered = 0.0
             result.carbsDelivered = 0.0
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput)
+            result.comment = resourceHelper.gs(R.string.invalidinput)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }
@@ -348,7 +347,7 @@ class DanaRSPlugin @Inject constructor(
         val doHighTemp = absoluteAfterConstrain > baseBasalRate
         if (doTempOff) {
             // If temp in progress
-            if (treatmentsPlugin.isTempBasalInProgress) {
+            if (activePluginProvider.activeTreatments.isTempBasalInProgress) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)")
                 return cancelTempBasal(false)
             }
@@ -366,7 +365,7 @@ class DanaRSPlugin @Inject constructor(
             if (percentRate > 500) // Special high temp 500/15min
                 percentRate = 500
             // Check if some temp is already in progress
-            val activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
+            val activeTemp = activePluginProvider.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
             if (activeTemp != null) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running: $activeTemp")
                 // Correct basal already set ?
@@ -413,18 +412,18 @@ class DanaRSPlugin @Inject constructor(
             result.isTempCancel = false
             result.enacted = false
             result.success = false
-            result.comment = resourceHelper.gs(R.string.danar_invalidinput)
+            result.comment = resourceHelper.gs(R.string.invalidinput)
             aapsLogger.error("setTempBasalPercent: Invalid input")
             return result
         }
         if (percentAfterConstraint > pumpDescription.maxTempPercent) percentAfterConstraint = pumpDescription.maxTempPercent
         val now = System.currentTimeMillis()
-        val activeTemp = treatmentsPlugin.getTempBasalFromHistory(now)
+        val activeTemp = activePluginProvider.activeTreatments.getTempBasalFromHistory(now)
         if (activeTemp != null && activeTemp.percentRate == percentAfterConstraint && activeTemp.plannedRemainingMinutes > 4 && !enforceNew) {
             result.enacted = false
             result.success = true
             result.isTempCancel = false
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             result.duration = danaRPump.tempBasalRemainingMin
             result.percent = danaRPump.tempBasalPercent
             result.isPercent = true
@@ -442,7 +441,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percentAfterConstraint) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaRPump.tempBasalRemainingMin
             result.percent = danaRPump.tempBasalPercent
@@ -463,7 +462,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percent) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaRPump.tempBasalRemainingMin
             result.percent = danaRPump.tempBasalPercent
@@ -485,11 +484,11 @@ class DanaRSPlugin @Inject constructor(
         val durationInHalfHours = max(durationInMinutes / 30, 1)
         insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
         val result = PumpEnactResult(injector)
-        val runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        val runningEB = activePluginProvider.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
         if (runningEB != null && abs(runningEB.insulin - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = false
             result.success = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             result.duration = danaRPump.extendedBolusRemainingMinutes
             result.absolute = danaRPump.extendedBolusAbsoluteRate
             result.isPercent = false
@@ -502,7 +501,7 @@ class DanaRSPlugin @Inject constructor(
         if (connectionOK && danaRPump.isExtendedInProgress && abs(danaRPump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = true
             result.success = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
             result.duration = danaRPump.extendedBolusRemainingMinutes
             result.absolute = danaRPump.extendedBolusAbsoluteRate
@@ -521,7 +520,7 @@ class DanaRSPlugin @Inject constructor(
     @Synchronized
     override fun cancelTempBasal(force: Boolean): PumpEnactResult {
         val result = PumpEnactResult(injector)
-        val runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis())
+        val runningTB = activePluginProvider.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
         if (runningTB != null) {
             danaRSService?.tempBasalStop()
             result.enacted = true
@@ -530,7 +529,7 @@ class DanaRSPlugin @Inject constructor(
         return if (!danaRPump.isTempBasalInProgress) {
             result.success = true
             result.isTempCancel = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
             result
         } else {
@@ -544,7 +543,7 @@ class DanaRSPlugin @Inject constructor(
 
     @Synchronized override fun cancelExtendedBolus(): PumpEnactResult {
         val result = PumpEnactResult(injector)
-        val runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        val runningEB = activePluginProvider.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
         if (runningEB != null) {
             danaRSService?.extendedBolusStop()
             result.enacted = true
@@ -552,7 +551,7 @@ class DanaRSPlugin @Inject constructor(
         }
         return if (!danaRPump.isExtendedInProgress) {
             result.success = true
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok)
+            result.comment = resourceHelper.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
             result
         } else {
@@ -581,13 +580,13 @@ class DanaRSPlugin @Inject constructor(
                 extended.put("LastBolus", dateUtil.dateAndTimeString(danaRPump.lastBolusTime))
                 extended.put("LastBolusAmount", danaRPump.lastBolusAmount)
             }
-            val tb = treatmentsPlugin.getTempBasalFromHistory(now)
+            val tb = activePluginProvider.activeTreatments.getTempBasalFromHistory(now)
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile))
                 extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date))
                 extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
             }
-            val eb = treatmentsPlugin.getExtendedBolusFromHistory(now)
+            val eb = activePluginProvider.activeTreatments.getExtendedBolusFromHistory(now)
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate())
                 extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date))
@@ -636,11 +635,11 @@ class DanaRSPlugin @Inject constructor(
         if (danaRPump.lastBolusTime != 0L)
             ret += "LastBolus: ${DecimalFormatter.to2Decimal(danaRPump.lastBolusAmount)}U @${DateFormat.format("HH:mm", danaRPump.lastBolusTime)}"
 
-        val activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis())
+        val activeTemp = activePluginProvider.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())
         if (activeTemp != null)
             ret += "Temp: ${activeTemp.toStringFull()}"
 
-        val activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
+        val activeExtendedBolus = activePluginProvider.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
         if (activeExtendedBolus != null)
             ret += "Extended: $activeExtendedBolus\n"
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
index 13eebbaa0e..2c25053da2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
@@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.danaRS.activities
 
 import android.os.Bundle
 import android.util.Base64
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
@@ -56,7 +56,7 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
                     bleComm.finishV3Pairing()
                     finish()
                 }
-                else OKDialog.show(this, resourceHelper.gs(R.string.error), resourceHelper.gs(R.string.danar_invalidinput))
+                else OKDialog.show(this, resourceHelper.gs(R.string.error), resourceHelper.gs(R.string.invalidinput))
             }
         }
         cancel.setOnClickListener { finish() }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 676290cbba..3427c46b2a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.ExtendedBolus
@@ -195,7 +195,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
-            else                                                                                         -> {
+            else                        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index b25bc2c587..76dde13995 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index 432f0792dd..252ce8761a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
index c40eda80fb..43dc6eb34e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
@@ -9,7 +9,6 @@ import android.os.SystemClock
 import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
diff --git a/app/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
similarity index 100%
rename from app/src/main/jniLibs/arm64-v8a/libBleEncryption.so
rename to danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
diff --git a/app/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
similarity index 100%
rename from app/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
rename to danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
diff --git a/app/src/main/jniLibs/x86/libBleEncryption.so b/danars/src/main/jniLibs/x86/libBleEncryption.so
similarity index 100%
rename from app/src/main/jniLibs/x86/libBleEncryption.so
rename to danars/src/main/jniLibs/x86/libBleEncryption.so
diff --git a/app/src/main/jniLibs/x86_64/libBleEncryption.so b/danars/src/main/jniLibs/x86_64/libBleEncryption.so
similarity index 100%
rename from app/src/main/jniLibs/x86_64/libBleEncryption.so
rename to danars/src/main/jniLibs/x86_64/libBleEncryption.so
diff --git a/app/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
similarity index 100%
rename from app/src/main/res/layout/danars_enter_pin_activity.xml
rename to danars/src/main/res/layout/danars_enter_pin_activity.xml
diff --git a/danars/src/main/res/values/strings.xml b/danars/src/main/res/values/strings.xml
index 5cef8b70b6..73b38830ee 100644
--- a/danars/src/main/res/values/strings.xml
+++ b/danars/src/main/res/values/strings.xml
@@ -4,13 +4,28 @@
     <string name="key_danars_name" translatable="false">danars_name</string>
     <string name="key_danar_password" translatable="false">danar_password</string>
     <string name="key_danars_password">danars_password</string>
+    <string name="key_danars_bolusspeed" translatable="false">danars_bolusspeed</string>
+    <string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
+    <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>
+    <string name="key_danars_v3_pairingkey" translatable="false">danars_v3_pairing_key_</string>
+    <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
+    <string name="key_rs_logcanulachange" translatable="false">rs_logcanulachange</string>
+    <string name="key_rs_loginsulinchange" translatable="false">rs_loginsulinchange</string>
 
     <string name="danars_pairing">Pairing</string>
     <string name="danars_nodeviceavailable">No device found so far</string>
     <string name="danars_pairingok">Pairing OK</string>
     <string name="danars_pairingtimedout">Pairing timed out</string>
     <string name="danars_waitingforpairing">Waiting for pairing on pump</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pump integration for DANA Diabecare RS pumps</string>
+    <string name="maxbolusviolation">Max bolus violation</string>
+    <string name="commanderror">Command error</string>
+    <string name="speederror">Speed error</string>
+    <string name="insulinlimitviolation">Insulin limit violation</string>
+    <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
+    <string name="danar_valuenotsetproperly">Value not set properly</string>
+    <string name="danar_setbasalstep001">Set basal step to 0.01 U/h</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_danars.xml b/danars/src/main/res/xml/pref_danars.xml
similarity index 100%
rename from app/src/main/res/xml/pref_danars.xml
rename to danars/src/main/res/xml/pref_danars.xml

From 7708e5961a475252d3ef10af5a1ca0b3de3592a3 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 8 May 2020 17:56:02 +0200
Subject: [PATCH 046/400] Add new icons for basal on ovenview fragment

I also add photoshop files (it's bitmap but it's easier to work with them)
---
 .../res/drawable-hdpi/icon_cp_basal_no_tbr.png  | Bin 0 -> 17474 bytes
 .../drawable-hdpi/icon_cp_basal_tbr_high.png    | Bin 0 -> 17644 bytes
 .../res/drawable-hdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17650 bytes
 .../res/drawable-mdpi/icon_cp_basal_no_tbr.png  | Bin 0 -> 17622 bytes
 .../drawable-mdpi/icon_cp_basal_tbr_high.png    | Bin 0 -> 17558 bytes
 .../res/drawable-mdpi/icon_cp_basal_tbr_low.png | Bin 0 -> 17558 bytes
 .../res/drawable-xhdpi/icon_cp_basal_no_tbr.png | Bin 0 -> 17522 bytes
 .../drawable-xhdpi/icon_cp_basal_tbr_high.png   | Bin 0 -> 17703 bytes
 .../drawable-xhdpi/icon_cp_basal_tbr_low.png    | Bin 0 -> 17692 bytes
 .../drawable-xxhdpi/icon_cp_basal_no_tbr.png    | Bin 0 -> 17667 bytes
 .../drawable-xxhdpi/icon_cp_basal_tbr_high.png  | Bin 0 -> 17926 bytes
 .../drawable-xxhdpi/icon_cp_basal_tbr_low.png   | Bin 0 -> 17932 bytes
 .../drawable-xxxhdpi/icon_cp_basal_no_tbr.png   | Bin 0 -> 15488 bytes
 .../drawable-xxxhdpi/icon_cp_basal_tbr_high.png | Bin 0 -> 15631 bytes
 .../drawable-xxxhdpi/icon_cp_basal_tbr_low.png  | Bin 0 -> 15636 bytes
 .../main/res/drawable/icon_cp_basal_no_tbr.png  | Bin 0 -> 17622 bytes
 .../res/drawable/icon_cp_basal_tbr_high.png     | Bin 0 -> 17558 bytes
 .../main/res/drawable/icon_cp_basal_tbr_low.png | Bin 0 -> 17558 bytes
 icons/temp-basal/icon_cp_basal_100px.psd        | Bin 0 -> 28136 bytes
 icons/temp-basal/icon_cp_basal_150px.psd        | Bin 0 -> 33597 bytes
 icons/temp-basal/icon_cp_basal_200px.psd        | Bin 0 -> 38873 bytes
 icons/temp-basal/icon_cp_basal_50px.psd         | Bin 0 -> 23095 bytes
 icons/temp-basal/icon_cp_basal_75px.psd         | Bin 0 -> 24072 bytes
 23 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
 create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
 create mode 100644 app/src/main/res/drawable/icon_cp_basal_no_tbr.png
 create mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_high.png
 create mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_low.png
 create mode 100644 icons/temp-basal/icon_cp_basal_100px.psd
 create mode 100644 icons/temp-basal/icon_cp_basal_150px.psd
 create mode 100644 icons/temp-basal/icon_cp_basal_200px.psd
 create mode 100644 icons/temp-basal/icon_cp_basal_50px.psd
 create mode 100644 icons/temp-basal/icon_cp_basal_75px.psd

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94fac29866402036735ff47b8b1ef3f159ca867
GIT binary patch
literal 17474
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
PKbeWq$<n98hmQXP8&ePg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..a213f1955f7405a230eea9a87e9e9d6dbc576f2c
GIT binary patch
literal 17644
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
Z+I%cwtkJ(%=Dm+(aN|&J--eyP{SS23YQq2k

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..23aeee14d43cc081272f4c5746839dfd1e85bbb9
GIT binary patch
literal 17650
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9d84303f68bc2af7358914def6e289932977b39
GIT binary patch
literal 17622
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b
GIT binary patch
literal 17558
zcmeI4Yitx%6vqbyff@{`0fVCB8Uv)x&SQ7>F>bfCUCLJ3+LS6K24!~UZaZOjW}KOJ
zw@nPFi9w0rgG5DQ_}~{ztU+U9B*wRqM1y`(K@AX1)BpxQ5b;&-%s%dPyDL|V8qIC8
zyQg=~`QN#}x#!Hi^I;zB>s`CBWmyYFQ44$0sebq?xS#nK!|!X_w;zB%3(WLJo1!kc
z-2Kd=_UyfqqB_rL1B1?BW}T!Mg`lh&Sr9B0Oz2HfiT08yD_ej=XTgxBw*|gG_<DfW
z)V9C|F~eodE-<X6$1Sjaymvqu-=f6TKzp(!QIeoQ0XQ;UD&%!rDzybXT?yK5GaH~i
z7iUXbpu_Eu9?bO7U4{i{F(@($$A{@?JjjcDIL6;d3mhL}xe&{T7+#RLxWtQe<u8zI
zfmXs&b5eh*yV4!}uPrd_IHtt1#bPm73<V8qh~?w)ILisFATZE_vBz{rE-|`&eOaWc
zlLEG4X{MtYI_>JpS!2X$3k2MbYJZh+70g;kx?N!hDY7NmWceV+HVRUeT8uej<-Jo=
z6&B<{0qBkm<M@Vg=CI)y_OQ{U%i7_l9m8vq$<+F8c)o=~!>(;-%_u}rLE13V9vCwL
z+YfAG#8SYTQ8<+A8;#y}`T@E+7*f!^p^&5Hn&`MknnD02tx1@Bq#WkWsq&>xKxk5z
z1!M=L;3p|?0>^M6hKmjGqQr+KfotV>iQ^J%ohO<uo<_z{wcMCbL-aHvk`RK^xs`+S
zx}xFptk;04qsoqqrQ-Lk)A7b*SObQUPnOfKuR6Ert}c4z22EFuqP@yDri!;uNL8eq
zVHIR2sTJfQz?%9{f<=u!&)UqCx{SPG!SR7)D8V*r_C<NKRqD}gN7fb4lS;ydpr)yk
zsz#JtB${QooFFnWJ`9+6G#+QTNIWY>LSjVDl}TnY{_ttiDMJ}?Gp-`7y3$H477244
zBa14}WW(V&v_ydkD|}SVMngG}i+WI?v@d*`^sSZ#tEHUx`M78Ab|FVY0w=2?1J5?Z
zM1?TV#Kf3uMFce}Msso~UhSfR%(Sl3n(Y|Ym~YC$iR;zF_2BNQt<?j0&8ussY}vrg
z+O|M7ZEJ<FR_ELpFZ(4~aVuidmPdh_V5hX9ld8p4g0$(E4-Y_D-xuDzkK!=UD|uPX
zDV~!AzM4~IDbK69h;8JYqHKYVAvhz>lN4pasS(YUm0?*Q0&0@2LaR2^ha_0{Zj;yk
zhKr^c`Y5oRKXKvU<dET=8d!ERXBh>$mgBTz(6VXfHAQyk13Rj#mHS>TpQ{7)Y5ap@
zRe`1bnJMZ!%Ni#7KQ`tWCna9tBS~4SZ{-sE?^aSSD#I0WG|WVVY>tsbVTF--nPWgy
zi2_c|iJUA{bMdcM(kZJGQc07w5>W+Pxh>WgICS6i)fca-oTqrY^|e-PtDX2X>O1-y
z?;01blKywbJo8G5wK|<yCH)^IWqJBeU8+`>ztfkt?oP^GdY5nU-R{D~T{FS-IL}HJ
zE=S=$Qu0;7>TUwJh}MNqNyCb|`d2p;<&*P;H&Qodx~C}j(m)3FRweHP>|2c{+>Nya
zHzjb1>@EJ1e1e_U=2P>I4Z53){D`-ChzcD1V|n+x66!x(AG-06L;Z*ALs8^yy5=O|
zeb76Zx@KRLyZbNiPuIgIULY9}#gLd_>znH%`m_?r52iG@k+j|IkqF1-#nc~Y7`U-n
zpzlB>u$(BqXH(vVDYwEWU+|$DTYKu}yJl#?a=|S$q6;pK1W6}|1%^d%VL(DI1Q%j~
zVG&#ykdO<(g;-!%1Q!M*<U(*E78n-6g#ih<5L}1_hDC5;Kte7A7h-{75nLFMkPE?u
zSYTKL7X~EcLU17#7#6{W0SUPfT!;mRMQ~w2LM{XsVu4{1To{m$3&Dk0U|0kf1|;M{
za3K~L7Qux93Aqqlhy{j4aA80~E(8~1fngC`7?6+)!G&00SOgaaB;-PHAr=@G!G!?{
zxe#241%^d%VL(DI1Q%j~VG&#ykdO<(g;-!%1Q!M*<U(*E78uqa;%Y(fu>d-Jc|{Sv
zrQ*5cT@rl51+Ap}GZZy`14V7SpQ6r9!ryNxYJ{Vx?>1AE^dv<sH6FX`-ENASb!|_o
zW1w{8<YxzNe!K6A_s&cfj;x+{;PD-=EZEf2x#I5qFYP+sdd1a0&F&5ETz>G!OJ9{f
z{WxkaK6(2?Pw#Q!!Rs;;XO_J6^-YU{Up-@<-gQf7?};B0D<1e}QP2FqcKSZ|i|=^#
zw#Q#6zWLqWi<YjQz5BJ#<2Ow%_~71?#S{5u)MYDoZd-fojZpjC)AyfF?~8@s*}-tk
zp>r4aZoA{yi_bs8UiHKqU2E>lK9V_VobCAVm;Dbvb<OLZEc$x1^UL1`w|wzzdeh<L
zobKIQ-#T;ZlU<j*_Va`p*?Dj4KI7M)*Ux`{p}Bl`sQ>WG>rSqmJvnzHb?w=XeTODu
z2hYwcO&q#sUT*c_kCt!#dQ*Dq$lS%LMICe8ud_>z&Z4$jtJa-rkG$-@IizPzZ)&1*
H^L@Vql|()h

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..0479c1a3afeef3c6788613cf3731dcb5160a0faa
GIT binary patch
literal 17558
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
Fe+RtnL@fXS

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..c448cadbdb3d9907936c9b9514f27ce6e3872ed7
GIT binary patch
literal 17522
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
Lt9)Yn-e>;-<s27=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89fd99246dccaad663ec3371a07e56985423ae0
GIT binary patch
literal 17703
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bb1a0b9826d7b1e8d984e4763da643cc52a4dec
GIT binary patch
literal 17692
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c7597c5ea29c8227772cb21995929afc61217a7
GIT binary patch
literal 17667
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
T#J}#orlhZDLwdSv(=&eqC!km)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa25d872c79366ad9fa3302150e47637c2d975ac
GIT binary patch
literal 17926
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7df0c266a22675e7fe71f85649846df7b7e0b95
GIT binary patch
literal 17932
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6750042e8f217352795bba3d0800ad7c6f81167
GIT binary patch
literal 15488
zcmeI3O^6#+9KheM#kMOeTYB&V4?~Jn+fHUC$z(TUlBP|zCe*CUHnm$p?0mf449(2M
znMspf1h-cFI0<^Nh}47N!D68(UJ8n$(29t+ideizwWZX9mx|T(&18~HUXs@;J$QJ5
z$>jh2-tWEt%UtHQ`MJj@Cmx&t08EyOg#~m!?_HbjM&BPUo;ihXo9o5H4gmLT^{z4S
z_B;0jAdTylMR&3Mgrr(VRMsp7Mq5T5c>|E%-Kxv#QRp%XT-MD@<hOI5MHpSnL=K5%
zzFg14s$N{R;epk;in@AKO=*$c*@<*ZLJ17$%1q0snU2)TMEtxG`t7N?2;;lBM>CN<
zUO{HDJkR7U8!}>4WK~{BFw?21APR{YVHXqQg*eB@IU&vpF^Nw}g2)7)NOl7KO556!
zv{2X=ltWS`Qgz+B#Bt4LGun(tEqj?0QmGWj$GBLGMINlPV!CpRHJxqkB%M43=%}_{
zcXi8Tyu7kvHQY=j;uY$Cf_WMBZXweN*ddBsORjT5l;?&8X=*p7-mq)_&@`2UHE2N7
zbx@ozG_GE?T+69iBT9D7BMYN7DVMvohmO}UhL(2R*<%PnfOKf2Q(37)ZUH)0!&c$!
zF*KEJ!)EX5OTESE%j8)`jvco25n-OC9p-O^_6nuZT&27XWfvCEm5uQ+p5@~#KT{Dz
zNk~XBekU(TJfG$;&)zEgIm(u%FRg@fh<=Ww#3!X#YA27jV~``{iRVB&UXxw<wz7nM
zu{{2KEW2V^wQRd<<~v)0$>*6z4(X<5HJwL8a|*mei8NJOvTQ?kv$`QKL#}Qvr@5Xo
z<k{U&Qr@arHku#I#?#y|btuZ;WKzj=T-j7%sgOmAsIF_0A}SiM#5Fd-PfxRol1Q*h
z5++%VPsN24TAw9(#vggP91b5yU9i-K*C;`14W&*B2{|stWi}})JgdoxI6EVYGwe)E
zO$f<UA}Pj{PU=wjK<X!L9UXFVE#%{k{@<1ul4hV(QFmO+UI}ekv~m4o>;QbOU)wR%
zbpJT2%eDi(X3Io6-PS$7y2q0j<2S7&tKLDDb>w4EOLKj?-k`d1L6APUe7DEAoj(*l
zx<<1K&7d!b_EbBS?=?D!V=cK&*@k<T(T=!9Q?wKIM~u#_R%LS;YFVxWt)sw0(wz4v
zQPcmAi*|cGM;9&F|LvvhZ@|vEG1#za?+;5t&5pL7>^GT^<_2`V?b7yN^qRKT@cpM_
zJo<2g_Z@_W&3Ncxa%k9$hxQ^5n!1~f1=TQhD9Za+ZJ+xG&;uaMCPgtWra4@VN6hOj
zSX(UU=zw;-V+Tzz2*NExBM*;^3|WH6_F{z|*8B!+Ytf@1dJ5&bkD&v-**);?<d5Ez
z?qpUh7cGJTA&V3jnGa^AxG*4Ok>Vor!K@S)281k9Tx33&mEyvHkVT4%%m=elTo@3t
zNO6(*U{;C?140%lE;1j?N^xO8$Rfo>=7U)&E({1+q`1g@Fe}A{0U?VN7nu)crMNI4
zWRc<`^TDhX7Y2kZQe0#{n3dwffRIIsi_8bJQd}4ivPf}}`CwLx3j;zHDK0V}%t~=#
zK*%D+MdpK9DJ~2MS){ngd@w7;g#jUp6c?EfW~I0=AY_r^BJ;tl6c+}BEK*!#KA4r_
z!hn!PBCd(vi=EI!Z*w-$Ynwmj_nt$qd@^crp$x$4!vL(E0N{^xbiV>Xg9qU15%jj`
zNdWG%-gx$_eE^KzC>8cpT0dO-{_NxzxvAODt^CV{?XP}ve#<kt;#H}7;-zG9^VI&r
z<&z(|@yQz>f4Y4oQ#rV{^4^xUT#jL;rZ#Qbuwi_B?D$#^pzBsD;CuFY4XT2CVXpyI
zw`$L8P^E0>8(@z4?%l@ejX!Y@ym{^EQ^()maY23IoBho1_m<9FFJ1h$G?zVl*|_xj
zb>kXyq_h#u=I>vPo0tCF_17A^u9QosN>5!cy|v?lapjeVKKT0d_+!1Pw+De0^TYvF
xZ@66&1F8XxIcA7z-+u#l^Z79V*4OU>3qNoD<>bXLCGQ>K((GK}%-$m}{sVxAnacnG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aaf00fd6100c2611d210e714337cd6973a4fb6b
GIT binary patch
literal 15631
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
b<9AR^>*usC2#p-n>bGU#V)xF+SHJi#zE|-u

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..67c74252c2a239a57737733b29f1ac178139a86c
GIT binary patch
literal 15636
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9d84303f68bc2af7358914def6e289932977b39
GIT binary patch
literal 17622
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png
new file mode 100644
index 0000000000000000000000000000000000000000..ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b
GIT binary patch
literal 17558
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
H^L@Vql|()h

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png
new file mode 100644
index 0000000000000000000000000000000000000000..0479c1a3afeef3c6788613cf3731dcb5160a0faa
GIT binary patch
literal 17558
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
Fe+RtnL@fXS

literal 0
HcmV?d00001

diff --git a/icons/temp-basal/icon_cp_basal_100px.psd b/icons/temp-basal/icon_cp_basal_100px.psd
new file mode 100644
index 0000000000000000000000000000000000000000..9eee5dbcd2475c2e503bc7e2d1e99277a2eb609a
GIT binary patch
literal 28136
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
Plw?n8kLvVT?BV|l&{*El

literal 0
HcmV?d00001

diff --git a/icons/temp-basal/icon_cp_basal_150px.psd b/icons/temp-basal/icon_cp_basal_150px.psd
new file mode 100644
index 0000000000000000000000000000000000000000..fd66def325a054a334607775f91312dc576e315e
GIT binary patch
literal 33597
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%0Ahf0c3ru3(WJaA`n6+q0(sug<uVN
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

literal 0
HcmV?d00001

diff --git a/icons/temp-basal/icon_cp_basal_200px.psd b/icons/temp-basal/icon_cp_basal_200px.psd
new file mode 100644
index 0000000000000000000000000000000000000000..df4edab59d296fbe805bcf51a1c5ce375c93ec20
GIT binary patch
literal 38873
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

literal 0
HcmV?d00001

diff --git a/icons/temp-basal/icon_cp_basal_50px.psd b/icons/temp-basal/icon_cp_basal_50px.psd
new file mode 100644
index 0000000000000000000000000000000000000000..9db88a0ffaef689030fbbf7a1b942f532aa5d5a9
GIT binary patch
literal 23095
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

literal 0
HcmV?d00001

diff --git a/icons/temp-basal/icon_cp_basal_75px.psd b/icons/temp-basal/icon_cp_basal_75px.psd
new file mode 100644
index 0000000000000000000000000000000000000000..585554299b4e9727fffbc81785cecfb006af35d8
GIT binary patch
literal 24072
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

literal 0
HcmV?d00001


From 84f032a7a2a6349cf559396d3a0d905bf751c124 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 8 May 2020 17:58:01 +0200
Subject: [PATCH 047/400] Revert "Temp Basal icon switched" I replace first
 proposal with a new one with 3 icons

This reverts commit 24112eb4
---
 .../androidaps/plugins/general/overview/OverviewFragment.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 021c3729e2..7194d39d61 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -667,7 +667,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
             ?: resourceHelper.gc(R.color.defaulttextcolor))
-        overview_basebasal_icon.setImageResource(if (activeTemp == null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
+
+        if (activeTemp != null)
+            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
+        else
+            overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())

From 7fc631a7296f6d9baa6ecafa17659a3b76e4e1b8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 9 May 2020 10:52:20 +0200
Subject: [PATCH 048/400] RS -> danaRS finished

---
 .../info/nightscout/androidaps/MainApp.java   |  10 +-
 .../androidaps/db/DatabaseHelper.java         |   4 +-
 .../androidaps/db/DatabaseHelperProvider.java |  68 +++++++++++++
 .../dependencyInjection/AppModule.kt          |   8 +-
 .../dependencyInjection/FragmentsModule.kt    |   2 +-
 .../androidaps/dialogs/CarbsDialog.kt         |   3 +-
 .../androidaps/dialogs/CareDialog.kt          |   3 +-
 .../androidaps/dialogs/FillDialog.kt          |  31 +-----
 .../plugins/aps/loop/LoopPlugin.java          |   7 +-
 .../objectives/ObjectivesFragment.kt          |   4 +-
 .../automation/actions/ActionNotification.kt  |   3 +-
 .../Dialogs/NewNSTreatmentDialog.java         |   3 +-
 .../plugins/general/food/FoodFragment.kt      |   3 +-
 .../general/nsclient/NSClientFragment.java    |   7 +-
 .../general/nsclient/NSClientPlugin.java      |   4 -
 .../plugins/general/nsclient/UploadQueue.java |  87 ++++++++++-------
 .../nsclient/services/NSClientService.java    |  62 ++++++------
 .../general/overview/OverviewFragment.kt      |   8 +-
 .../general/overview/graphData/GraphData.kt   |   4 +-
 .../plugins/general/wear/WearPlugin.kt        |   2 +-
 .../wearintegration/WatchUpdaterService.java  |   8 +-
 .../profile/local/LocalProfilePlugin.kt       |   5 +-
 .../plugins/pump/combo/ComboPlugin.java       |   4 +-
 .../pump/common/PumpPluginAbstract.java       |   4 +-
 .../pump/danaR/AbstractDanaRPlugin.java       |   4 +-
 .../pump/danaR/comm/MessageHashTableR.kt      |   4 +-
 .../plugins/pump/danaR/comm/MsgError.kt       |   5 +-
 .../plugins/pump/danaR/comm/MsgHistoryAll.kt  |   2 +-
 .../danaR/services/DanaRExecutionService.java |   3 +-
 .../comm/MessageHashTableRKorean.kt           |   4 +-
 .../services/DanaRKoreanExecutionService.java |   3 +-
 .../pump/danaRv2/comm/MessageHashTableRv2.kt  |   4 +-
 .../services/DanaRv2ExecutionService.java     |   3 +-
 .../pump/insight/LocalInsightPlugin.java      |  27 ++---
 .../plugins/pump/mdi/MDIPlugin.java           |   4 +-
 .../medtronic/data/MedtronicHistoryData.java  |   5 +-
 .../wizard/pages/InitPodRefreshAction.java    |   3 +-
 .../plugins/pump/virtual/VirtualPumpPlugin.kt |   4 +-
 .../androidaps/plugins/source/DexcomPlugin.kt |  11 ++-
 .../plugins/source/EversensePlugin.kt         |   9 +-
 .../plugins/source/PoctechPlugin.kt           |   7 +-
 .../androidaps/plugins/source/TomatoPlugin.kt |   7 +-
 .../fragments/TreatmentsBolusFragment.kt      |  10 +-
 .../fragments/TreatmentsCareportalFragment.kt |  10 +-
 .../TreatmentsExtendedBolusesFragment.kt      |   6 +-
 .../TreatmentsProfileSwitchFragment.kt        |   6 +-
 .../TreatmentsTempTargetFragment.java         |   6 +-
 .../TreatmentsTemporaryBasalsFragment.kt      |   6 +-
 .../androidaps/receivers/KeepAliveReceiver.kt |   6 +-
 .../androidaps/services/DataService.java      |   4 +-
 .../nightscout/androidaps/utils/HardLimits.kt |  13 +--
 .../androidaps/utils/LocalAlertUtils.kt       |   5 +-
 .../androidaps/utils/stats/TddCalculator.kt   |   4 +-
 app/src/main/res/layout/okcancel.xml          |  44 +++++++++
 app/src/main/res/values/colors.xml            |   2 -
 app/src/main/res/values/strings.xml           |  92 +-----------------
 .../activities/TDDStatsActivity.java          |  27 ++---
 .../androidaps}/dialogs/NtpProgressDialog.kt  |   6 +-
 .../androidaps/dialogs/ProfileViewerDialog.kt |  12 +--
 .../events/EventDanaRSyncStatus.kt            |   2 +-
 .../events/EventExtendedBolusChange.kt        |   0
 .../nightscout/androidaps/events/EventLoop.kt |   0
 .../androidaps}/events/EventNtpStatus.kt      |   2 +-
 .../androidaps/events/EventTempBasalChange.kt |   0
 .../interfaces/DatabaseHelperInterface.kt     |  18 +++-
 .../androidaps/interfaces/PumpInterface.java  |   2 +-
 .../plugins/general/nsclient/NSUpload.java    |  41 +++++++-
 .../treatments/fragments/ProfileGraph.kt      |   0
 .../queue/events/EventQueueChanged.kt         |   0
 .../utils/DigitsKeyListenerWithComma.java     |   0
 .../androidaps/utils/NumberPicker.java        |   2 +-
 .../nightscout/androidaps/utils/WarnColors.kt |   2 +-
 .../CompositeDisposablePlusAssign.kt          |   0
 .../utils/extensions/Concurrency.kt           |   0
 core/src/main/res/layout/close.xml            |  19 ++++
 .../main/res/layout/danar_statsactivity.xml   |   0
 .../main/res/layout/dialog_profileviewer.xml  |   0
 .../main/res/layout/number_picker_layout.xml  |   0
 .../src/main/res/layout/spinner_centered.xml  |   0
 {app => core}/src/main/res/raw/boluserror.mp3 | Bin
 core/src/main/res/values/colors.xml           |   4 +
 core/src/main/res/values/strings.xml          |  32 ++++++
 danars/build.gradle                           |   6 ++
 .../plugins/pump/danaR/DanaRFragment.kt       |   8 +-
 .../danaR/activities/DanaRHistoryActivity.kt  |  34 +++----
 .../activities/DanaRUserOptionsActivity.kt    |  27 +++--
 .../plugins/pump/danaRS/DanaRSPlugin.kt       |   4 +-
 .../pump/danaRS/comm/DanaRS_Packet.java       |  13 +--
 .../comm/DanaRS_Packet_APS_History_Events.kt  |   7 +-
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |   1 -
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |   2 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |   2 +-
 .../danaRS/comm/DanaRS_Packet_History_.kt     |   7 +-
 .../danaRS/comm/DanaRS_Packet_Notify_Alarm.kt |   5 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |   2 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |   2 +-
 .../plugins/pump/danaRS/services/BLEComm.kt   |   7 +-
 .../pump/danaRS/services/DanaRSService.kt     |   4 +-
 .../src/main/res/layout/danar_fragment.xml    |   0
 .../main/res/layout/danar_history_item.xml    |   0
 .../main/res/layout/danar_historyactivity.xml |   0
 .../layout/danar_user_options_activity.xml    |   0
 danars/src/main/res/layout/okcancel.xml       |  44 +++++++++
 danars/src/main/res/values/strings.xml        |  62 ++++++++++++
 104 files changed, 666 insertions(+), 407 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
 create mode 100644 app/src/main/res/layout/okcancel.xml
 rename {app => core}/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives => core/src/main/java/info/nightscout/androidaps}/dialogs/NtpProgressDialog.kt (94%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt (89%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => core/src/main/java/info/nightscout/androidaps}/events/EventDanaRSyncStatus.kt (63%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventLoop.kt (100%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives => core/src/main/java/info/nightscout/androidaps}/events/EventNtpStatus.kt (61%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/queue/events/EventQueueChanged.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java (99%)
 rename app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.kt => core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt (100%)
 create mode 100644 core/src/main/res/layout/close.xml
 rename {app => core}/src/main/res/layout/danar_statsactivity.xml (100%)
 rename {app => core}/src/main/res/layout/dialog_profileviewer.xml (100%)
 rename {app => core}/src/main/res/layout/number_picker_layout.xml (100%)
 rename {app => core}/src/main/res/layout/spinner_centered.xml (100%)
 rename {app => core}/src/main/res/raw/boluserror.mp3 (100%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt (84%)
 rename {app => danars}/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt (88%)
 rename {app => danars}/src/main/res/layout/danar_fragment.xml (100%)
 rename {app => danars}/src/main/res/layout/danar_history_item.xml (100%)
 rename {app => danars}/src/main/res/layout/danar_historyactivity.xml (100%)
 rename {app => danars}/src/main/res/layout/danar_user_options_activity.xml (100%)
 create mode 100644 danars/src/main/res/layout/okcancel.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 85d8f83ed7..27d60be03c 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -23,6 +23,7 @@ import javax.inject.Inject;
 import dagger.android.AndroidInjector;
 import dagger.android.DaggerApplication;
 import info.nightscout.androidaps.db.BgReading;
+import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.StaticInjector;
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent;
@@ -45,7 +46,7 @@ import info.nightscout.androidaps.utils.ActivityMonitor;
 import info.nightscout.androidaps.utils.LocaleHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
-public class MainApp extends DaggerApplication implements DatabaseHelperInterface {
+public class MainApp extends DaggerApplication {
 
     static MainApp sInstance;
     private static Resources sResources;
@@ -57,6 +58,7 @@ public class MainApp extends DaggerApplication implements DatabaseHelperInterfac
     @Inject ActivityMonitor activityMonitor;
     @Inject VersionCheckerUtils versionCheckersUtils;
     @Inject SP sp;
+    @Inject NSUpload nsUpload;
 
     @Inject ConfigBuilderPlugin configBuilderPlugin;
     @Inject KeepAliveReceiver.KeepAliveManager keepAliveManager;
@@ -99,7 +101,7 @@ public class MainApp extends DaggerApplication implements DatabaseHelperInterfac
         pluginStore.setPlugins(plugins);
         configBuilderPlugin.initialize();
 
-        NSUpload.uploadAppStart();
+        nsUpload.uploadAppStart();
 
         new Thread(() -> keepAliveManager.setAlarm(this)).start();
         doMigrations();
@@ -173,8 +175,4 @@ public class MainApp extends DaggerApplication implements DatabaseHelperInterfac
         keepAliveManager.cancelAlarm(this);
         super.onTerminate();
     }
-
-    @NotNull @Override public List<BgReading> getAllBgreadingsDataFromTime(long mills, boolean ascending) {
-        return getDbHelper().getAllBgreadingsDataFromTime(mills, ascending);
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index abc6df92c9..b5e5c89819 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -1733,7 +1733,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 }
   */
 
-    public void createProfileSwitchFromJsonIfNotExists(ActivePluginProvider activePluginProvider, JSONObject trJson) {
+    public void createProfileSwitchFromJsonIfNotExists(ActivePluginProvider activePluginProvider, NSUpload nsUpload, JSONObject trJson) {
         try {
             ProfileSwitch profileSwitch = new ProfileSwitch(MainApp.instance());
             profileSwitch.date = trJson.getLong("mills");
@@ -1759,7 +1759,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         if (L.isEnabled(LTag.DATABASE))
                             log.debug("Profile switch prefilled with JSON from local store");
                         // Update data in NS
-                        NSUpload.updateProfileSwitch(profileSwitch);
+                        nsUpload.updateProfileSwitch(profileSwitch);
                     } else {
                         if (L.isEnabled(LTag.DATABASE))
                             log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
new file mode 100644
index 0000000000..60c7578b74
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -0,0 +1,68 @@
+package info.nightscout.androidaps.db;
+
+import com.j256.ormlite.dao.CloseableIterator;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+
+@Singleton
+public class DatabaseHelperProvider implements DatabaseHelperInterface {
+
+    @Inject DatabaseHelperProvider() {}
+
+    @NotNull @Override public List<BgReading> getAllBgreadingsDataFromTime(long mills, boolean ascending) {
+        return MainApp.getDbHelper().getAllBgreadingsDataFromTime(mills, ascending);
+    }
+
+    @Override public void createOrUpdate(@NotNull CareportalEvent careportalEvent) {
+        MainApp.getDbHelper().createOrUpdate(careportalEvent);
+    }
+
+    @Override public void createOrUpdate(@NotNull DanaRHistoryRecord record) {
+        MainApp.getDbHelper().createOrUpdate(record);
+    }
+
+    @NotNull @Override public List<DanaRHistoryRecord> getDanaRHistoryRecordsByType(byte type) {
+        return MainApp.getDbHelper().getDanaRHistoryRecordsByType(type);
+    }
+
+    @NotNull @Override public List<TDD> getTDDs() {
+        return MainApp.getDbHelper().getTDDs();
+    }
+
+    @Override public long size(@NotNull String table) {
+        return MainApp.getDbHelper().size(table);
+    }
+
+    @Override public void create(@NotNull DbRequest record) {
+        try {
+            MainApp.getDbHelper().create(record);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override public void deleteAllDbRequests() {
+        MainApp.getDbHelper().deleteAllDbRequests();
+    }
+
+    @Override public int deleteDbRequest(@NotNull String id) {
+        return MainApp.getDbHelper().deleteDbRequest(id);
+    }
+
+    @Override public void deleteDbRequestbyMongoId(@NotNull String action, @NotNull String _id) {
+        MainApp.getDbHelper().deleteDbRequestbyMongoId(action, _id);
+    }
+
+    @NotNull @Override public CloseableIterator<DbRequest> getDbRequestInterator() {
+        return MainApp.getDbHelper().getDbRequestInterator();
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index e405ab91fd..16543e8a86 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -8,13 +8,16 @@ import dagger.Provides
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.androidNotification.NotificationHolder
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.storage.FileStorage
@@ -61,11 +64,12 @@ open class AppModule {
 
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
-        @Binds fun bindDatabaseHelperInterface(mainApp: MainApp): DatabaseHelperInterface
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
         @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
         @Binds fun configInterfaceProvider(config: Config): ConfigInterface
         @Binds fun treatmentInterfaceProvider(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
-
+        @Binds fun provideDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
+        @Binds fun provideUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
+        @Binds fun provideNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 89783c9e4f..8748891d07 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBFragment
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
-import info.nightscout.androidaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
+import info.nightscout.androidaps.dialogs.NtpProgressDialog
 import info.nightscout.androidaps.plugins.general.actions.ActionsFragment
 import info.nightscout.androidaps.plugins.general.automation.AutomationFragment
 import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseActionDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
index 28abd8eb60..31ced947d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
@@ -40,6 +40,7 @@ class CarbsDialog : DialogFragmentWithDate() {
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var carbsGenerator: CarbsGenerator
 
     companion object {
@@ -233,7 +234,7 @@ class CarbsDialog : DialogFragmentWithDate() {
                         } else {
                             aapsLogger.debug("USER ENTRY: CARBS $carbsAfterConstraints time: $time duration: $duration")
                             carbsGenerator.generateCarbs(carbsAfterConstraints, time, duration, notes)
-                            NSUpload.uploadEvent(CareportalEvent.NOTE, DateUtil.now() - 2000, resourceHelper.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
+                            nsUpload.uploadEvent(CareportalEvent.NOTE, DateUtil.now() - 2000, resourceHelper.gs(R.string.generated_ecarbs_note, carbsAfterConstraints, duration, timeOffset))
                         }
                     }
                 }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index 1eda2e060e..f9fa675438 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -36,6 +36,7 @@ class CareDialog : DialogFragmentWithDate() {
     @Inject lateinit var mainApp: MainApp
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var translator: Translator
 
     enum class EventType {
@@ -197,7 +198,7 @@ class CareDialog : DialogFragmentWithDate() {
                 careportalEvent.json = json.toString()
                 aapsLogger.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
                 MainApp.getDbHelper().createOrUpdate(careportalEvent)
-                NSUpload.uploadCareportalEntryToNS(json)
+                nsUpload.uploadCareportalEntryToNS(json)
             }, null)
         }
         return true
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index eb5e9ccf59..580b27228c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -40,9 +40,9 @@ class FillDialog : DialogFragmentWithDate() {
     @Inject lateinit var constraintChecker: ConstraintChecker
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var ctx: Context
+    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var injector: HasAndroidInjector
 
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
@@ -124,12 +124,12 @@ class FillDialog : DialogFragmentWithDate() {
                     }
                     if (siteChange) {
                         aapsLogger.debug("USER ENTRY: SITE CHANGE")
-                        generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes, resourceHelper, sp, injector)
+                        nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, eventTime, notes)
                     }
                     if (insulinChange) {
                         // add a second for case of both checked
                         aapsLogger.debug("USER ENTRY: INSULIN CHANGE")
-                        generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes, resourceHelper, sp, injector)
+                        nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, eventTime + 1000, notes)
                     }
                 }, null)
             }
@@ -162,29 +162,4 @@ class FillDialog : DialogFragmentWithDate() {
             }
         })
     }
-
-    companion object {
-        fun generateCareportalEvent(eventType: String, time: Long, notes: String, resourceHelper: ResourceHelper, sp: SP, injector: HasAndroidInjector) {
-            val careportalEvent = CareportalEvent(injector)
-            careportalEvent.source = Source.USER
-            careportalEvent.date = time
-            careportalEvent.json = generateJson(eventType, time, notes, resourceHelper, sp).toString()
-            careportalEvent.eventType = eventType
-            MainApp.getDbHelper().createOrUpdate(careportalEvent)
-            NSUpload.uploadEvent(eventType, time, notes)
-        }
-
-        private fun generateJson(careportalEvent: String, time: Long, notes: String, resourceHelper: ResourceHelper, sp: SP): JSONObject {
-            val data = JSONObject()
-            try {
-                data.put("eventType", careportalEvent)
-                data.put("created_at", DateUtil.toISOString(time))
-                data.put("mills", time)
-                data.put("enteredBy", sp.getString("careportal_enteredby", resourceHelper.gs(R.string.app_name)))
-                if (notes.isNotEmpty()) data.put("notes", notes)
-            } catch (ignored: JSONException) {
-            }
-            return data
-        }
-    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index f04035277e..6b25f97882 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -22,6 +22,7 @@ import javax.inject.Singleton;
 
 import dagger.Lazy;
 import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.MainApp;
@@ -103,7 +104,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
     private boolean isSuperBolus;
     private boolean isDisconnected;
 
-    @Nullable public LastRun lastRun = null;
+    @Nullable private LastRun lastRun = null;
 
     @Nullable @Override public LastRun getLastRun() {
         return lastRun;
@@ -412,7 +413,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
             lastRun.setLastSMBEnact(0);
             lastRun.setLastSMBRequest(0);
 
-            nsUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
+            nsUpload.uploadDeviceStatus(this, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
 
             if (isSuspended()) {
                 getAapsLogger().debug(LTag.APS, resourceHelper.gs(R.string.loopsuspended));
@@ -537,7 +538,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                     lastRun.setLastTBRRequest(lastRun.getLastAPSRun());
                     lastRun.setLastTBREnact(DateUtil.now());
                     lastRun.setLastOpenModeAccept(DateUtil.now());
-                    nsUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore);
+                    nsUpload.uploadDeviceStatus(lp, iobCobCalculatorPlugin, profileFunction, activePlugin.getActivePump(), receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
                     sp.incInt(R.string.key_ObjectivesmanualEnacts);
                 }
                 rxBus.send(new EventAcceptOpenLoopChange());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
index 1e01d814f6..69a8892bdc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
@@ -22,8 +22,8 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
-import info.nightscout.androidaps.plugins.constraints.objectives.dialogs.NtpProgressDialog
-import info.nightscout.androidaps.plugins.constraints.objectives.events.EventNtpStatus
+import info.nightscout.androidaps.dialogs.NtpProgressDialog
+import info.nightscout.androidaps.events.EventNtpStatus
 import info.nightscout.androidaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective.ExamTask
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
index 7a730585c1..43342f35e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt
@@ -22,6 +22,7 @@ import javax.inject.Inject
 class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var nsUpload: NSUpload
 
     var text = InputString(injector)
 
@@ -32,7 +33,7 @@ class ActionNotification(injector: HasAndroidInjector) : Action(injector) {
     override fun doAction(callback: Callback) {
         val notification = NotificationUserMessage(text.value)
         rxBus.send(EventNewNotification(notification))
-        NSUpload.uploadError(text.value)
+        nsUpload.uploadError(text.value)
         rxBus.send(EventRefreshOverview("ActionNotification"))
         callback.result(PumpEnactResult(injector).success(true).comment(R.string.ok))?.run()
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
index 8fe577ced3..52d7a25c49 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
@@ -78,6 +78,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
     @Inject ActivePluginProvider activePlugin;
     @Inject TreatmentsPlugin treatmentsPlugin;
     @Inject HardLimits hardLimits;
+    @Inject NSUpload nsUpload;
     @Inject Translator translator;
     @Inject DateUtil dateUtil;
 
@@ -714,7 +715,7 @@ public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.O
 
     private void confirmNSTreatmentCreation() {
         final JSONObject data = gatherData();
-        OKDialog.showConfirmation(getContext(), translator.translate(JsonHelper.safeGetString(data, "eventType", resourceHelper.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> NSUpload.createNSTreatment(data, profileStore, profileFunction, eventTime.getTime()));
+        OKDialog.showConfirmation(getContext(), translator.translate(JsonHelper.safeGetString(data, "eventType", resourceHelper.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> nsUpload.createNSTreatment(data, profileStore, profileFunction, eventTime.getTime()));
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index c54e383afc..d4efd0ff96 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -35,6 +35,7 @@ class FoodFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var foodPlugin: FoodPlugin
+    @Inject lateinit var nsUpload: NSUpload
 
     private val disposable = CompositeDisposable()
     private lateinit var unfiltered: List<Food>
@@ -200,7 +201,7 @@ class FoodFragment : DaggerFragment() {
                     activity?.let { activity ->
                         showConfirmation(activity, resourceHelper.gs(R.string.confirmation), resourceHelper.gs(R.string.removerecord) + "\n" + food.name, DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
                             if (food._id != null && food._id != "") {
-                                NSUpload.removeFoodFromNS(food._id)
+                                nsUpload.removeFoodFromNS(food._id)
                             }
                             foodPlugin.service?.delete(food)
                         }, null)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
index 89d0f65bc7..27310dad90 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
@@ -33,6 +33,7 @@ public class NSClientFragment extends DaggerFragment implements View.OnClickList
     @Inject SP sp;
     @Inject ResourceHelper resourceHelper;
     @Inject RxBusWrapper rxBus;
+    @Inject UploadQueue uploadQueue;
     @Inject FabricPrivacy fabricPrivacy;
 
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -119,13 +120,13 @@ public class NSClientFragment extends DaggerFragment implements View.OnClickList
                 break;
             case R.id.nsclientinternal_clearqueue:
                 OKDialog.showConfirmation(getContext(), resourceHelper.gs(R.string.nsclientinternal), resourceHelper.gs(R.string.clearqueueconfirm), () -> {
-                    UploadQueue.clearQueue();
+                    uploadQueue.clearQueue();
                     updateGui();
                     fabricPrivacy.logCustom("NSClientClearQueue");
                 });
                 break;
             case R.id.nsclientinternal_showqueue:
-                rxBus.send(new EventNSClientNewLog("QUEUE", nsClientPlugin.queue().textList()));
+                rxBus.send(new EventNSClientNewLog("QUEUE", uploadQueue.textList()));
                 break;
         }
     }
@@ -154,7 +155,7 @@ public class NSClientFragment extends DaggerFragment implements View.OnClickList
             logScrollview.fullScroll(ScrollView.FOCUS_DOWN);
         }
         urlTextView.setText(nsClientPlugin.url());
-        Spanned queuetext = Html.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + UploadQueue.size() + "</b>");
+        Spanned queuetext = Html.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + uploadQueue.size() + "</b>");
         queueTextView.setText(queuetext);
         statusTextView.setText(nsClientPlugin.status);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index da77936384..9443e23e39 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -253,10 +253,6 @@ public class NSClientPlugin extends PluginBase {
         rxBus.send(new EventPreferenceChange(resourceHelper, R.string.key_nsclientinternal_paused));
     }
 
-    public UploadQueue queue() {
-        return NSClientService.uploadQueue;
-    }
-
     public String url() {
         return NSClientService.nsURL;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
index d9bd5a6307..08fecd9283 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java
@@ -8,71 +8,86 @@ import com.j256.ormlite.dao.CloseableIterator;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import java.sql.SQLException;
 
-import info.nightscout.androidaps.MainApp;
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.DbRequest;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.UploadQueueInterface;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
 import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.utils.SP;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by mike on 21.02.2016.
  */
 public class UploadQueue implements UploadQueueInterface {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
+    private final AAPSLogger aapsLogger;
+    private final DatabaseHelperInterface databaseHelper;
+    private final Context context;
+    private final SP sp;
+    private final RxBusWrapper rxBus;
 
-    public static String status() {
-        return "QUEUE: " + MainApp.getDbHelper().size(DatabaseHelper.DATABASE_DBREQUESTS);
+    @Inject
+    public UploadQueue(
+            AAPSLogger aapsLogger,
+            DatabaseHelperInterface databaseHelper,
+            Context context,
+            SP sp,
+            RxBusWrapper rxBus
+    ) {
+        this.aapsLogger = aapsLogger;
+        this.databaseHelper = databaseHelper;
+        this.context = context;
+        this.sp = sp;
+        this.rxBus = rxBus;
     }
 
-    public static long size() {
-        return MainApp.getDbHelper().size(DatabaseHelper.DATABASE_DBREQUESTS);
+    public String status() {
+        return "QUEUE: " + databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
     }
 
-    private static void startService() {
+    public long size() {
+        return databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
+    }
+
+    private void startService() {
         if (NSClientService.handler == null) {
-            Context context = MainApp.instance();
             context.startService(new Intent(context, NSClientService.class));
             SystemClock.sleep(2000);
         }
     }
 
-    public static void add(final DbRequest dbr) {
-        if (SP.getBoolean(R.string.key_ns_noupload, false)) return;
-        if (L.isEnabled(LTag.NSCLIENT))
-            log.debug("Adding to queue: " + dbr.log());
+    public void add(final DbRequest dbr) {
+        if (sp.getBoolean(R.string.key_ns_noupload, false)) return;
+        aapsLogger.debug(LTag.NSCLIENT, "Adding to queue: " + dbr.log());
         try {
-            MainApp.getDbHelper().create(dbr);
+            databaseHelper.create(dbr);
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        RxBus.getINSTANCE().send(new EventNSClientResend("newdata"));
+        rxBus.send(new EventNSClientResend("newdata"));
     }
 
-    static void clearQueue() {
+    void clearQueue() {
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(() -> {
-                if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug("ClearQueue");
-                MainApp.getDbHelper().deleteAllDbRequests();
-                if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug(status());
+                aapsLogger.debug(LTag.NSCLIENT, "ClearQueue");
+                databaseHelper.deleteAllDbRequests();
+                aapsLogger.debug(LTag.NSCLIENT, status());
             });
         }
     }
 
-    public static void removeID(final JSONObject record) {
+    public void removeID(final JSONObject record) {
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(() -> {
@@ -83,26 +98,24 @@ public class UploadQueue implements UploadQueueInterface {
                     } else {
                         return;
                     }
-                    if (MainApp.getDbHelper().deleteDbRequest(id) == 1) {
-                        if (L.isEnabled(LTag.NSCLIENT))
-                            log.debug("Removed item from UploadQueue. " + UploadQueue.status());
+                    if (databaseHelper.deleteDbRequest(id) == 1) {
+                        aapsLogger.debug(LTag.NSCLIENT, "Removed item from UploadQueue. " + status());
                     }
                 } catch (JSONException e) {
-                    log.error("Unhandled exception", e);
+                    aapsLogger.error("Unhandled exception", e);
                 }
             });
         }
     }
 
-    public static void removeID(final String action, final String _id) {
+    public void removeID(final String action, final String _id) {
         if (_id == null || _id.equals(""))
             return;
         startService();
         if (NSClientService.handler != null) {
             NSClientService.handler.post(() -> {
-                MainApp.getDbHelper().deleteDbRequestbyMongoId(action, _id);
-                if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug("Removing " + _id + " from UploadQueue. " + UploadQueue.status());
+                databaseHelper.deleteDbRequestbyMongoId(action, _id);
+                aapsLogger.debug(LTag.NSCLIENT, "Removing " + _id + " from UploadQueue. " + status());
             });
         }
     }
@@ -111,7 +124,7 @@ public class UploadQueue implements UploadQueueInterface {
         String result = "";
         CloseableIterator<DbRequest> iterator;
         try {
-            iterator = MainApp.getDbHelper().getDbRequestInterator();
+            iterator = databaseHelper.getDbRequestInterator();
             try {
                 while (iterator.hasNext()) {
                     DbRequest dbr = iterator.next();
@@ -124,7 +137,7 @@ public class UploadQueue implements UploadQueueInterface {
                 iterator.close();
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return result;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 3187ccc924..195bb577cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -31,15 +31,15 @@ import javax.inject.Inject;
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Config;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventNsFood;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
@@ -83,7 +83,7 @@ public class NSClientService extends DaggerService {
     @Inject AAPSLogger aapsLogger;
     @Inject NSSettingsStatus nsSettingsStatus;
     @Inject NSDeviceStatus nsDeviceStatus;
-    @Inject MainApp mainApp;
+    @Inject DatabaseHelperInterface databaseHelper;
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject SP sp;
@@ -91,6 +91,7 @@ public class NSClientService extends DaggerService {
     @Inject BuildHelper buildHelper;
     @Inject Config config;
     @Inject DateUtil dateUtil;
+    @Inject UploadQueue uploadQueue;
 
     private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -124,8 +125,6 @@ public class NSClientService extends DaggerService {
 
     private String nsAPIhashCode = "";
 
-    public static UploadQueue uploadQueue = new UploadQueue();
-
     private final ArrayList<Long> reconnections = new ArrayList<>();
     private int WATCHDOG_INTERVAL_MINUTES = 2;
     private int WATCHDOG_RECONNECT_IN = 15;
@@ -143,7 +142,7 @@ public class NSClientService extends DaggerService {
     @Override
     public void onCreate() {
         super.onCreate();
-        PowerManager powerManager = (PowerManager) mainApp.getApplicationContext().getSystemService(Context.POWER_SERVICE);
+        PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
         mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "AndroidAPS:NSClientService");
         mWakeLock.acquire();
 
@@ -528,7 +527,7 @@ public class NSClientService extends DaggerService {
         @Override
         public void call(final Object... args) {
             NSClientService.handler.post(() -> {
-                PowerManager powerManager = (PowerManager) mainApp.getApplicationContext().getSystemService(Context.POWER_SERVICE);
+                PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
                 PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                         "AndroidAPS:NSClientService_onDataUpdate");
                 wakeLock.acquire();
@@ -604,7 +603,7 @@ public class NSClientService extends DaggerService {
                                 NSTreatment treatment = new NSTreatment(jsonTreatment);
 
                                 // remove from upload queue if Ack is failing
-                                UploadQueue.removeID(jsonTreatment);
+                                uploadQueue.removeID(jsonTreatment);
                                 //Find latest date in treatment
                                 if (treatment.getMills() != null && treatment.getMills() < System.currentTimeMillis())
                                     if (treatment.getMills() > latestDateInReceivedData)
@@ -636,7 +635,7 @@ public class NSClientService extends DaggerService {
                                 for (Integer index = 0; index < devicestatuses.length(); index++) {
                                     JSONObject jsonStatus = devicestatuses.getJSONObject(index);
                                     // remove from upload queue if Ack is failing
-                                    UploadQueue.removeID(jsonStatus);
+                                    uploadQueue.removeID(jsonStatus);
                                 }
                                 nsDeviceStatus.handleNewData(devicestatuses);
                             }
@@ -652,7 +651,7 @@ public class NSClientService extends DaggerService {
                                 JSONObject jsonFood = foods.getJSONObject(index);
 
                                 // remove from upload queue if Ack is failing
-                                UploadQueue.removeID(jsonFood);
+                                uploadQueue.removeID(jsonFood);
 
                                 String action = JsonHelper.safeGetString(jsonFood, "action");
 
@@ -684,7 +683,7 @@ public class NSClientService extends DaggerService {
                             for (Integer index = 0; index < mbgs.length(); index++) {
                                 JSONObject jsonMbg = mbgs.getJSONObject(index);
                                 // remove from upload queue if Ack is failing
-                                UploadQueue.removeID(jsonMbg);
+                                uploadQueue.removeID(jsonMbg);
                             }
                             handleNewMbg(mbgs, isDelta);
                         }
@@ -695,7 +694,7 @@ public class NSClientService extends DaggerService {
                             // Retreive actual calibration
                             for (Integer index = 0; index < cals.length(); index++) {
                                 // remove from upload queue if Ack is failing
-                                UploadQueue.removeID(cals.optJSONObject(index));
+                                uploadQueue.removeID(cals.optJSONObject(index));
                             }
                             handleNewCal(cals, isDelta);
                         }
@@ -709,7 +708,7 @@ public class NSClientService extends DaggerService {
                                 NSSgv sgv = new NSSgv(jsonSgv);
                                 // Handle new sgv here
                                 // remove from upload queue if Ack is failing
-                                UploadQueue.removeID(jsonSgv);
+                                uploadQueue.removeID(jsonSgv);
                                 //Find latest date in sgv
                                 if (sgv.getMills() != null && sgv.getMills() < System.currentTimeMillis())
                                     if (sgv.getMills() > latestDateInReceivedData)
@@ -795,7 +794,7 @@ public class NSClientService extends DaggerService {
     }
 
     public void resend(final String reason) {
-        if (UploadQueue.size() == 0)
+        if (uploadQueue.size() == 0)
             return;
 
         if (!isConnected || !hasWriteAuth) return;
@@ -804,8 +803,7 @@ public class NSClientService extends DaggerService {
             if (mSocket == null || !mSocket.connected()) return;
 
             if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
-                if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug("Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
+                aapsLogger.debug(LTag.NSCLIENT, "Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
                 return;
             }
             lastResendTime = System.currentTimeMillis();
@@ -815,7 +813,7 @@ public class NSClientService extends DaggerService {
             CloseableIterator<DbRequest> iterator;
             int maxcount = 30;
             try {
-                iterator = mainApp.getDbHelper().getDbRequestInterator();
+                iterator = databaseHelper.getDbRequestInterator();
                 try {
                     while (iterator.hasNext() && maxcount > 0) {
                         DbRequest dbr = iterator.next();
@@ -852,7 +850,7 @@ public class NSClientService extends DaggerService {
 
     private void handleAnnouncement(JSONObject announcement) {
         NSAlarm nsAlarm = new NSAlarm(announcement);
-        Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+        Notification notification = new NotificationWithAction(injector, nsAlarm);
         rxBus.send(new EventNewNotification(notification));
         rxBus.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(announcement, "message", "received")));
         aapsLogger.debug(LTag.NSCLIENT, announcement.toString());
@@ -862,7 +860,7 @@ public class NSClientService extends DaggerService {
         long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
         if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
             NSAlarm nsAlarm = new NSAlarm(alarm);
-            Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+            Notification notification = new NotificationWithAction(injector, nsAlarm);
             rxBus.send(new EventNewNotification(notification));
         }
         rxBus.send(new EventNSClientNewLog("ALARM", JsonHelper.safeGetString(alarm, "message", "received")));
@@ -873,7 +871,7 @@ public class NSClientService extends DaggerService {
         long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
         if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
             NSAlarm nsAlarm = new NSAlarm(alarm);
-            Notification notification = new NotificationWithAction(mainApp, nsAlarm);
+            Notification notification = new NotificationWithAction(injector, nsAlarm);
             rxBus.send(new EventNewNotification(notification));
         }
         rxBus.send(new EventNSClientNewLog("URGENTALARM", JsonHelper.safeGetString(alarm, "message", "received")));
@@ -887,7 +885,7 @@ public class NSClientService extends DaggerService {
         Intent intent = new Intent(Intents.ACTION_NEW_CAL);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
     public void handleNewMbg(JSONArray mbgs, boolean isDelta) {
@@ -897,7 +895,7 @@ public class NSClientService extends DaggerService {
         Intent intent = new Intent(Intents.ACTION_NEW_MBG);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
     public void handleNewProfile(ProfileStore profile, boolean isDelta) {
@@ -907,7 +905,7 @@ public class NSClientService extends DaggerService {
         Intent intent = new Intent(Intents.ACTION_NEW_PROFILE);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
 
         if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
             bundle = new Bundle();
@@ -916,7 +914,7 @@ public class NSClientService extends DaggerService {
             intent = new Intent(Intents.ACTION_NEW_PROFILE);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            mainApp.sendBroadcast(intent);
+            this.sendBroadcast(intent);
         }
     }
 
@@ -929,7 +927,7 @@ public class NSClientService extends DaggerService {
             Intent intent = new Intent(Intents.ACTION_NEW_SGV);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
         }
 
         if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
@@ -940,7 +938,7 @@ public class NSClientService extends DaggerService {
                 Intent intent = new Intent(Intents.ACTION_NEW_SGV);
                 intent.putExtras(bundle);
                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                mainApp.sendBroadcast(intent);
+                this.sendBroadcast(intent);
             }
         }
     }
@@ -954,7 +952,7 @@ public class NSClientService extends DaggerService {
             Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
         }
 
         if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
@@ -966,7 +964,7 @@ public class NSClientService extends DaggerService {
                 Intent intent = new Intent(Intents.ACTION_NEW_TREATMENT);
                 intent.putExtras(bundle);
                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                mainApp.getApplicationContext().sendBroadcast(intent);
+                this.getApplicationContext().sendBroadcast(intent);
             }
         }
     }
@@ -980,7 +978,7 @@ public class NSClientService extends DaggerService {
             Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
         }
 
         if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
@@ -992,7 +990,7 @@ public class NSClientService extends DaggerService {
                 Intent intent = new Intent(Intents.ACTION_CHANGED_TREATMENT);
                 intent.putExtras(bundle);
                 intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-                mainApp.getApplicationContext().sendBroadcast(intent);
+                this.getApplicationContext().sendBroadcast(intent);
             }
         }
     }
@@ -1004,7 +1002,7 @@ public class NSClientService extends DaggerService {
         Intent intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        LocalBroadcastManager.getInstance(mainApp).sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
 
 
         if (sp.getBoolean(R.string.key_nsclient_localbroadcasts, false)) {
@@ -1014,7 +1012,7 @@ public class NSClientService extends DaggerService {
             intent = new Intent(Intents.ACTION_REMOVED_TREATMENT);
             intent.putExtras(bundle);
             intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-            mainApp.getApplicationContext().sendBroadcast(intent);
+            this.getApplicationContext().sendBroadcast(intent);
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 2a462fb44a..bda7d5b249 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -20,6 +20,7 @@ import android.view.View.OnLongClickListener
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.text.toSpanned
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
@@ -344,8 +345,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     if (loopPlugin.isEnabled(PluginType.LOOP)) {
                         val lastRun = loopPlugin.lastRun
                         loopPlugin.invoke("Accept temp button", false)
-                        if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed.isChangeRequested) {
-                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.pump_tempbasal_label), lastRun.constraintsProcessed.toSpanned(), Runnable {
+                        if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.pump_tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
+                                ?: "".toSpanned(), Runnable {
                                 aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
                                 overview_accepttempbutton?.visibility = View.GONE
                                 (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
@@ -442,7 +444,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         val showAcceptButton = !closedLoopEnabled.value() && // Open mode needed
             lastRun != null &&
             (lastRun.lastOpenModeAccept == 0L || lastRun.lastOpenModeAccept < lastRun.lastAPSRun) &&// never accepted or before last result
-            lastRun.constraintsProcessed.isChangeRequested // change is requested
+            lastRun.constraintsProcessed?.isChangeRequested == true // change is requested
 
         if (showAcceptButton && pump.isInitialized && !pump.isSuspended && loopPlugin.isEnabled(PluginType.LOOP)) {
             overview_accepttempbutton?.visibility = View.VISIBLE
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
index 02ccf1480f..70e4f9f8fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -16,10 +16,10 @@ import info.nightscout.androidaps.data.IobTotal
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.LoopInterface
 import info.nightscout.androidaps.interfaces.TreatmentsInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin.LastRun
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.SMBDefaults
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.*
@@ -197,7 +197,7 @@ class GraphData(injector: HasAndroidInjector, private val graph: GraphView, priv
         basalScale.setMultiplier(maxY * scale / maxBasalValueFound)
     }
 
-    fun addTargetLine(fromTime: Long, toTimeParam: Long, profile: Profile, lastRun: LastRun?) {
+    fun addTargetLine(fromTime: Long, toTimeParam: Long, profile: Profile, lastRun: LoopInterface.LastRun?) {
         var toTime = toTimeParam
         val targetsSeriesArray: MutableList<DataPoint> = ArrayList()
         var lastTarget = -1.0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
index abff22eae3..02b201f5ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt
@@ -104,7 +104,7 @@ class WearPlugin @Inject constructor(
             .observeOn(Schedulers.io())
             .subscribe({ event: EventDismissBolusProgressIfRunning ->
                 if (event.result == null) return@subscribe
-                val status: String = if (event.result.success) {
+                val status: String = if (event.result!!.success) {
                     resourceHelper.gs(R.string.success)
                 } else {
                     resourceHelper.gs(R.string.nosuccess)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index e0a0657826..dd0babf951 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -531,9 +531,9 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         }
 
-        final LoopPlugin.LastRun finalLastRun = loopPlugin.lastRun;
-        if (sp.getBoolean("wear_predictions", true) && finalLastRun != null && finalLastRun.request.hasPredictions && finalLastRun.constraintsProcessed != null) {
-            List<BgReading> predArray = finalLastRun.constraintsProcessed.getPredictions();
+        final LoopPlugin.LastRun finalLastRun = loopPlugin.getLastRun();
+        if (sp.getBoolean("wear_predictions", true) && finalLastRun != null && finalLastRun.getRequest().hasPredictions && finalLastRun.getConstraintsProcessed() != null) {
+            List<BgReading> predArray = finalLastRun.getConstraintsProcessed().getPredictions();
 
             if (!predArray.isEmpty()) {
                 for (BgReading bg : predArray) {
@@ -715,7 +715,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             //OpenAPS status
             if (config.getAPS()) {
                 //we are AndroidAPS
-                openApsStatus = loopPlugin.lastRun != null && loopPlugin.lastRun.lastTBREnact != 0 ? loopPlugin.lastRun.lastTBREnact : -1;
+                openApsStatus = loopPlugin.getLastRun() != null && loopPlugin.getLastRun().getLastTBREnact() != 0 ? loopPlugin.getLastRun().getLastTBREnact() : -1;
             } else {
                 //NSClient or remote
                 openApsStatus = NSDeviceStatus.getOpenApsTimestamp();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index 8d2761cfa3..7944707e57 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -37,7 +37,8 @@ class LocalProfilePlugin @Inject constructor(
     private val rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     private val sp: SP,
-    private val profileFunction: ProfileFunction
+    private val profileFunction: ProfileFunction,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.PROFILE)
     .fragmentClass(LocalProfileFragment::class.java.name)
@@ -140,7 +141,7 @@ class LocalProfilePlugin @Inject constructor(
             if (name.contains(".")) namesOK = false
         }
         if (namesOK)
-            rawProfile?.let { NSUpload.uploadProfileStore(it.data) }
+            rawProfile?.let { nsUpload.uploadProfileStore(it.data) }
         else
             activity?.let {
                 OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index de9b4e66fc..50f40318d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -1259,7 +1259,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
     }
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
+    public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
         if (!pump.initialized) {
             return null;
         }
@@ -1281,7 +1281,7 @@ public class ComboPlugin extends PumpPluginBase implements PumpInterface, Constr
             pumpJson.put("status", statusJson);
 
             JSONObject extendedJson = new JSONObject();
-            extendedJson.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extendedJson.put("Version", version);
             extendedJson.put("ActiveProfile", profileFunction.getProfileName());
             PumpState ps = pump.state;
             if (ps.tbrActive) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 6d06f2e788..6227d2ea2a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -324,7 +324,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
 
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
+    public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
 
         if ((getPumpStatusData().lastConnection + 5 * 60 * 1000L) < System.currentTimeMillis()) {
             return new JSONObject();
@@ -337,7 +337,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
         try {
             battery.put("percent", getPumpStatusData().batteryRemaining);
             status.put("status", getPumpStatusData().pumpStatusType != null ? getPumpStatusData().pumpStatusType.getStatus() : "normal");
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("Version", version);
             try {
                 extended.put("ActiveProfile", profileName);
             } catch (Exception ignored) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index b055cacda3..3e0a853dc5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -366,7 +366,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     }
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profilename) {
+    public JSONObject getJSONStatus(Profile profile, String profilename, String version) {
         DanaRPump pump = danaRPump;
         long now = System.currentTimeMillis();
         if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
@@ -380,7 +380,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             battery.put("percent", pump.getBatteryRemaining());
             status.put("status", pump.getPumpSuspended() ? "suspended" : "normal");
             status.put("timestamp", DateUtil.toISOString(pump.getLastConnection()));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("Version", version);
             if (pump.getLastBolusTime() != 0) {
                 extended.put("LastBolus", dateUtil.dateAndTimeString(pump.getLastBolusTime()));
                 extended.put("LastBolusAmount", pump.getLastBolusAmount());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
index dd4c59cee4..630bb9ecad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
@@ -28,6 +29,7 @@ class MessageHashTableR @Inject constructor(
     configBuilderPlugin: ConfigBuilderPlugin,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
+    nsUpload: NSUpload,
     injector: HasAndroidInjector,
     dateUtil: DateUtil
 ) : MessageHashTableBase {
@@ -54,7 +56,7 @@ class MessageHashTableR @Inject constructor(
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
index 6069520870..08d4c57324 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
@@ -13,7 +13,8 @@ class MsgError(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaRPump: DanaRPump,
+    private val nsUpload: NSUpload
 ) : MessageBase() {
 
     init {
@@ -41,6 +42,6 @@ class MsgError(
             failed = false
         }
         aapsLogger.debug(LTag.PUMPCOMM, "Error detected: $errorString")
-        NSUpload.uploadError(errorString)
+        nsUpload.uploadError(errorString)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
index b25a5b9b1f..26f48639d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
+import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.utils.DateUtil
 
 open class MsgHistoryAll(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 73fe0ec10c..2a357761f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -83,6 +83,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     @Inject MessageHashTableR messageHashTableR;
     @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
+    @Inject NSUpload nsUpload;
     @Inject SP sp;
     @Inject HasAndroidInjector injector;
 
@@ -214,7 +215,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
index 882ab11739..67ce3eb6b4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.*
@@ -30,6 +31,7 @@ class MessageHashTableRKorean @Inject constructor(
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
     dateUtil: DateUtil,
+    nsUpload: NSUpload,
     injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
@@ -52,7 +54,7 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index 2f00754404..d8da9b78c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -75,6 +75,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject MessageHashTableRKorean messageHashTableRKorean;
     @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
+    @Inject NSUpload nsUpload;
     @Inject DateUtil dateUtil;
 
     public DanaRKoreanExecutionService() {
@@ -203,7 +204,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
index 8833ea6b3f..836de3d6cc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
@@ -35,6 +36,7 @@ class MessageHashTableRv2 @Inject constructor(
     activePlugin: ActivePluginProvider,
     detailedBolusInfoStorage: DetailedBolusInfoStorage,
     treatmentsPlugin: TreatmentsPlugin,
+    nsUpload: NSUpload,
     injector: HasAndroidInjector,
     dateUtil: DateUtil
 ) : MessageHashTableBase {
@@ -60,7 +62,7 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index 4c664ea1df..f072d3a8e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -99,6 +99,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
     @Inject TreatmentsPlugin treatmentsPlugin;
     @Inject ProfileFunction profileFunction;
+    @Inject NSUpload nsUpload;
     @Inject SP sp;
     @Inject DateUtil dateUtil;
 
@@ -255,7 +256,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index d44470bad1..f8d1cf1ce5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -27,7 +27,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
@@ -39,6 +38,7 @@ import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
@@ -46,6 +46,7 @@ import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
 import info.nightscout.androidaps.interfaces.PluginDescription;
 import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
@@ -53,7 +54,6 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
@@ -132,7 +132,6 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_erro
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.NoActiveTBRToCanceLException;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ParameterBlockUtil;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.TimeChangeType;
@@ -149,7 +148,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     private final SP sp;
     private final CommandQueueProvider commandQueue;
     private final ProfileFunction profileFunction;
+    private final NSUpload nsUpload;
     private final Context context;
+    private final UploadQueue uploadQueue;
     private final DateUtil dateUtil;
 
     public static final String ALERT_CHANNEL_ID = "AndroidAPS-InsightAlert";
@@ -209,7 +210,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             SP sp,
             CommandQueueProvider commandQueue,
             ProfileFunction profileFunction,
+            NSUpload nsUpload,
             Context context,
+            UploadQueue uploadQueue,
             Config config,
             DateUtil dateUtil
     ) {
@@ -230,7 +233,9 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         this.sp = sp;
         this.commandQueue = commandQueue;
         this.profileFunction = profileFunction;
+        this.nsUpload = nsUpload;
         this.context = context;
+        this.uploadQueue = uploadQueue;
         this.dateUtil = dateUtil;
 
         pumpDescription = new PumpDescription();
@@ -929,8 +934,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                             if (extendedBolus.durationInMinutes <= 0) {
                                 final String _id = extendedBolus._id;
                                 if (NSUpload.isIdValid(_id))
-                                    NSUpload.removeCareportalEntryFromNS(_id);
-                                else UploadQueue.removeID("dbAdd", _id);
+                                    nsUpload.removeCareportalEntryFromNS(_id);
+                                else uploadQueue.removeID("dbAdd", _id);
                                 MainApp.getDbHelper().delete(extendedBolus);
                             } else
                                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus);
@@ -978,7 +983,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     }
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
+    public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
         long now = System.currentTimeMillis();
         if (connectionService == null) return null;
         if (System.currentTimeMillis() - connectionService.getLastConnected() > (60 * 60 * 1000)) {
@@ -991,7 +996,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         final JSONObject extended = new JSONObject();
         try {
             status.put("timestamp", DateUtil.toISOString(connectionService.getLastConnected()));
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("Version", version);
             try {
                 extended.put("ActiveProfile", profileFunction.getProfileName());
             } catch (Exception e) {
@@ -1451,8 +1456,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                 ExtendedBolus extendedBolus = MainApp.getDbHelper().getExtendedBolusByPumpId(bolusID.id);
                 if (extendedBolus != null) {
                     final String _id = extendedBolus._id;
-                    if (NSUpload.isIdValid(_id)) NSUpload.removeCareportalEntryFromNS(_id);
-                    else UploadQueue.removeID("dbAdd", _id);
+                    if (NSUpload.isIdValid(_id)) nsUpload.removeCareportalEntryFromNS(_id);
+                    else uploadQueue.removeID("dbAdd", _id);
                     MainApp.getDbHelper().delete(extendedBolus);
                 }
             } else {
@@ -1583,7 +1588,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             careportalEvent.eventType = CareportalEvent.NOTE;
             careportalEvent.json = data.toString();
             MainApp.getDbHelper().createOrUpdate(careportalEvent);
-            NSUpload.uploadCareportalEntryToNS(data);
+            nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
         }
@@ -1617,7 +1622,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
             MainApp.getDbHelper().createOrUpdate(careportalEvent);
-            NSUpload.uploadCareportalEntryToNS(data);
+            nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
index b5d7fafb4e..44550ebea6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/mdi/MDIPlugin.java
@@ -227,14 +227,14 @@ public class MDIPlugin extends PumpPluginBase implements PumpInterface {
     }
 
     @NonNull @Override
-    public JSONObject getJSONStatus(Profile profile, String profileName) {
+    public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
         long now = System.currentTimeMillis();
         JSONObject pump = new JSONObject();
         JSONObject status = new JSONObject();
         JSONObject extended = new JSONObject();
         try {
             status.put("status", "normal");
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION);
+            extended.put("Version", version);
             try {
                 extended.put("ActiveProfile", profileName);
             } catch (Exception e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index d8f5c47b4f..76f011da16 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -78,6 +78,7 @@ public class MedtronicHistoryData {
     private final AAPSLogger aapsLogger;
     private final SP sp;
     private final ActivePluginProvider activePlugin;
+    private final NSUpload nsUpload;
     private final MedtronicUtil medtronicUtil;
     private final MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
 
@@ -106,6 +107,7 @@ public class MedtronicHistoryData {
             AAPSLogger aapsLogger,
             SP sp,
             ActivePluginProvider activePlugin,
+            NSUpload nsUpload,
             MedtronicUtil medtronicUtil,
             MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder
     ) {
@@ -115,6 +117,7 @@ public class MedtronicHistoryData {
         this.aapsLogger = aapsLogger;
         this.sp = sp;
         this.activePlugin = activePlugin;
+        this.nsUpload = nsUpload;
         this.medtronicUtil = medtronicUtil;
         this.medtronicPumpHistoryDecoder = medtronicPumpHistoryDecoder;
     }
@@ -543,7 +546,7 @@ public class MedtronicHistoryData {
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
             MainApp.getDbHelper().createOrUpdate(careportalEvent);
-            NSUpload.uploadCareportalEntryToNS(data);
+            nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
index 37c6d420f7..70dac25789 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/wizard/pages/InitPodRefreshAction.java
@@ -35,6 +35,7 @@ public class InitPodRefreshAction extends AbstractCancelAction implements Finish
     @Inject OmnipodUtil omnipodUtil;
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
+    @Inject NSUpload nsUpload;
 
     public InitPodRefreshAction(HasAndroidInjector injector, PodManagementActivity podManagementActivity, PodActionType actionType) {
         injector.androidInjector().inject(this);
@@ -86,7 +87,7 @@ public class InitPodRefreshAction extends AbstractCancelAction implements Finish
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
             MainApp.getDbHelper().createOrUpdate(careportalEvent);
-            NSUpload.uploadCareportalEntryToNS(data);
+            nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception when uploading SiteChange event.", e);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index 3db377a230..e8916b5647 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -337,7 +337,7 @@ class VirtualPumpPlugin @Inject constructor(
         return result
     }
 
-    override fun getJSONStatus(profile: Profile, profileName: String): JSONObject {
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
         val now = System.currentTimeMillis()
         if (!sp.getBoolean("virtualpump_uploadstatus", false)) {
             return JSONObject()
@@ -349,7 +349,7 @@ class VirtualPumpPlugin @Inject constructor(
         try {
             battery.put("percent", batteryPercent)
             status.put("status", "normal")
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
+            extended.put("Version", version)
             try {
                 extended.put("ActiveProfile", profileName)
             } catch (ignored: Exception) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index 7e854f7e96..41d1c07ddc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -31,7 +31,8 @@ class DexcomPlugin @Inject constructor(
     private val sp: SP,
     private val mainApp: MainApp,
     resourceHelper: ResourceHelper,
-    aapsLogger: AAPSLogger
+    aapsLogger: AAPSLogger,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -78,10 +79,10 @@ class DexcomPlugin @Inject constructor(
                     bgReading.raw = 0.0
                     if (MainApp.getDbHelper().createIfNotExists(bgReading, "Dexcom$sensorType")) {
                         if (sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                            NSUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
+                            nsUpload.uploadBg(bgReading, "AndroidAPS-Dexcom$sensorType")
                         }
                         if (sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                            NSUpload.sendToXdrip(bgReading)
+                            nsUpload.sendToXdrip(bgReading)
                         }
                     }
                 }
@@ -108,7 +109,7 @@ class DexcomPlugin @Inject constructor(
                             careportalEvent.eventType = CareportalEvent.BGCHECK
                             careportalEvent.json = jsonObject.toString()
                             MainApp.getDbHelper().createOrUpdate(careportalEvent)
-                            NSUpload.uploadCareportalEntryToNS(jsonObject)
+                            nsUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
             }
@@ -128,7 +129,7 @@ class DexcomPlugin @Inject constructor(
                             careportalEvent.eventType = CareportalEvent.SENSORCHANGE
                             careportalEvent.json = jsonObject.toString()
                             MainApp.getDbHelper().createOrUpdate(careportalEvent)
-                            NSUpload.uploadCareportalEntryToNS(jsonObject)
+                            nsUpload.uploadCareportalEntryToNS(jsonObject)
                         }
                 }
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
index 6b0021fbcf..9141d57214 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/EversensePlugin.kt
@@ -29,7 +29,8 @@ class EversensePlugin @Inject constructor(
     private val sp: SP,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -77,10 +78,10 @@ class EversensePlugin @Inject constructor(
                     bgReading.raw = 0.0
                     val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Eversense")
                     if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                        NSUpload.uploadBg(bgReading, "AndroidAPS-Eversense")
+                        nsUpload.uploadBg(bgReading, "AndroidAPS-Eversense")
                     }
                     if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                        NSUpload.sendToXdrip(bgReading)
+                        nsUpload.sendToXdrip(bgReading)
                     }
                 }
             }
@@ -103,7 +104,7 @@ class EversensePlugin @Inject constructor(
                             data.put("glucoseType", "Finger")
                             data.put("glucose", calibrationGlucoseLevels[i])
                             data.put("units", Constants.MGDL)
-                            NSUpload.uploadCareportalEntryToNS(data)
+                            nsUpload.uploadCareportalEntryToNS(data)
                         }
                     } catch (e: JSONException) {
                         aapsLogger.error("Unhandled exception", e)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
index c33cfaee0f..2032dd4479 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/PoctechPlugin.kt
@@ -26,7 +26,8 @@ class PoctechPlugin @Inject constructor(
     injector: HasAndroidInjector,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val sp: SP
+    private val sp: SP,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -58,10 +59,10 @@ class PoctechPlugin @Inject constructor(
                 if (safeGetString(json, "units", Constants.MGDL) == "mmol/L") bgReading.value = bgReading.value * Constants.MMOLL_TO_MGDL
                 val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Poctech")
                 if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-                    NSUpload.uploadBg(bgReading, "AndroidAPS-Poctech")
+                    nsUpload.uploadBg(bgReading, "AndroidAPS-Poctech")
                 }
                 if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-                    NSUpload.sendToXdrip(bgReading)
+                    nsUpload.sendToXdrip(bgReading)
                 }
             }
         } catch (e: JSONException) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
index db4c658614..1ba7958b61 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/TomatoPlugin.kt
@@ -22,7 +22,8 @@ class TomatoPlugin @Inject constructor(
     injector: HasAndroidInjector,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val sp: SP
+    private val sp: SP,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -46,10 +47,10 @@ class TomatoPlugin @Inject constructor(
         bgReading.date = bundle.getLong("com.fanqies.tomatofn.Extras.Time")
         val isNew = MainApp.getDbHelper().createIfNotExists(bgReading, "Tomato")
         if (isNew && sp.getBoolean(R.string.key_dexcomg5_nsupload, false)) {
-            NSUpload.uploadBg(bgReading, "AndroidAPS-Tomato")
+            nsUpload.uploadBg(bgReading, "AndroidAPS-Tomato")
         }
         if (isNew && sp.getBoolean(R.string.key_dexcomg5_xdripupload, false)) {
-            NSUpload.sendToXdrip(bgReading)
+            nsUpload.sendToXdrip(bgReading)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
index 63574ea8d2..e6d2f02883 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
@@ -42,6 +42,8 @@ class TreatmentsBolusFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var nsUpload: NSUpload
+    @Inject lateinit var uploadQueue: UploadQueue
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -68,9 +70,9 @@ class TreatmentsBolusFragment : DaggerFragment() {
                     val futureTreatments = treatmentsPlugin.service.getTreatmentDataFromTime(DateUtil.now() + 1000, true)
                     for (treatment in futureTreatments) {
                         if (NSUpload.isIdValid(treatment._id))
-                            NSUpload.removeCareportalEntryFromNS(treatment._id)
+                            nsUpload.removeCareportalEntryFromNS(treatment._id)
                         else
-                            UploadQueue.removeID("dbAdd", treatment._id)
+                            uploadQueue.removeID("dbAdd", treatment._id)
                         treatmentsPlugin.service.delete(treatment)
                     }
                     updateGui()
@@ -166,9 +168,9 @@ class TreatmentsBolusFragment : DaggerFragment() {
                                 treatmentsPlugin.service.update(treatment)
                             } else {
                                 if (NSUpload.isIdValid(treatment._id))
-                                    NSUpload.removeCareportalEntryFromNS(treatment._id)
+                                    nsUpload.removeCareportalEntryFromNS(treatment._id)
                                 else
-                                    UploadQueue.removeID("dbAdd", treatment._id)
+                                    uploadQueue.removeID("dbAdd", treatment._id)
                                 treatmentsPlugin.service.delete(treatment)
                             }
                             updateGui()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
index 9307238211..191957a8f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
@@ -38,6 +38,8 @@ class TreatmentsCareportalFragment : DaggerFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var translator: Translator
+    @Inject lateinit var nsUpload: NSUpload
+    @Inject lateinit var uploadQueue: UploadQueue
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -66,9 +68,9 @@ class TreatmentsCareportalFragment : DaggerFragment() {
                         val careportalEvent = events[i]
                         if (careportalEvent.json.contains(resourceHelper.gs(R.string.androidaps_start))) {
                             if (NSUpload.isIdValid(careportalEvent._id))
-                                NSUpload.removeCareportalEntryFromNS(careportalEvent._id)
+                                nsUpload.removeCareportalEntryFromNS(careportalEvent._id)
                             else
-                                UploadQueue.removeID("dbAdd", careportalEvent._id)
+                                uploadQueue.removeID("dbAdd", careportalEvent._id)
                             MainApp.getDbHelper().delete(careportalEvent)
                         }
                     }
@@ -136,9 +138,9 @@ class TreatmentsCareportalFragment : DaggerFragment() {
                             resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(careportalEvent.date)
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
                             if (NSUpload.isIdValid(careportalEvent._id))
-                                NSUpload.removeCareportalEntryFromNS(careportalEvent._id)
+                                nsUpload.removeCareportalEntryFromNS(careportalEvent._id)
                             else
-                                UploadQueue.removeID("dbAdd", careportalEvent._id)
+                                uploadQueue.removeID("dbAdd", careportalEvent._id)
                             MainApp.getDbHelper().delete(careportalEvent)
                         }, null)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
index d2dcd632ea..91e3b098fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -40,6 +40,8 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var nsUpload: NSUpload
+    @Inject lateinit var uploadQueue: UploadQueue
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -116,8 +118,8 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
                 ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(extendedBolus.date)}
                 """.trimIndent(), DialogInterface.OnClickListener { _: DialogInterface, _: Int ->
                             val id = extendedBolus._id
-                            if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
-                            else UploadQueue.removeID("dbAdd", id)
+                            if (NSUpload.isIdValid(id)) nsUpload.removeCareportalEntryFromNS(id)
+                            else uploadQueue.removeID("dbAdd", id)
                             MainApp.getDbHelper().delete(extendedBolus)
                         }, null)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index 77934e304c..886c0ec34e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -43,6 +43,8 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var nsUpload: NSUpload
+    @Inject lateinit var uploadQueue: UploadQueue
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -135,8 +137,8 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                                 resourceHelper.gs(R.string.careportal_profileswitch) + ": " + profileSwitch.profileName +
                                     "\n" + resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 val id = profileSwitch._id
-                                if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
-                                else UploadQueue.removeID("dbAdd", id)
+                                if (NSUpload.isIdValid(id)) nsUpload.removeCareportalEntryFromNS(id)
+                                else uploadQueue.removeID("dbAdd", id)
                                 MainApp.getDbHelper().delete(profileSwitch)
                             })
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
index 7df7db72be..980e9efe7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.java
@@ -47,6 +47,8 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
     @Inject RxBusWrapper rxBus;
     @Inject ProfileFunction profileFunction;
     @Inject ResourceHelper resourceHelper;
+    @Inject NSUpload nsUpload;
+    @Inject UploadQueue uploadQueue;
     @Inject FabricPrivacy fabricPrivacy;
     @Inject DateUtil dateUtil;
 
@@ -146,9 +148,9 @@ public class TreatmentsTempTargetFragment extends DaggerFragment {
                             (dialog, id) -> {
                                 final String _id = tempTarget._id;
                                 if (NSUpload.isIdValid(_id)) {
-                                    NSUpload.removeCareportalEntryFromNS(_id);
+                                    nsUpload.removeCareportalEntryFromNS(_id);
                                 } else {
-                                    UploadQueue.removeID("dbAdd", _id);
+                                    uploadQueue.removeID("dbAdd", _id);
                                 }
                                 MainApp.getDbHelper().delete(tempTarget);
                             }, null);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
index 4ff6b15950..8b8aee6b91 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -44,6 +44,8 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var nsUpload: NSUpload
+    @Inject lateinit var uploadQueue: UploadQueue
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -165,8 +167,8 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
                 """.trimIndent(),
                             DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
                                 val id = tempBasal._id
-                                if (NSUpload.isIdValid(id)) NSUpload.removeCareportalEntryFromNS(id)
-                                else UploadQueue.removeID("dbAdd", id)
+                                if (NSUpload.isIdValid(id)) nsUpload.removeCareportalEntryFromNS(id)
+                                else uploadQueue.removeID("dbAdd", id)
                                 MainApp.getDbHelper().delete(tempBasal)
                             }, null)
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index a3dda44325..b6705ac733 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -8,15 +8,16 @@ import android.content.Intent
 import android.os.PowerManager
 import android.os.SystemClock
 import dagger.android.DaggerBroadcastReceiver
+import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.queue.commands.Command
@@ -39,6 +40,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var receiverStatusStore: ReceiverStatusStore
     @Inject lateinit var config: Config
+    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var dateUtil: DateUtil
 
     companion object {
@@ -108,7 +110,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         else if (DateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
         if (DateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY) && shouldUploadStatus) {
             lastIobUpload = DateUtil.now()
-            NSUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore)
+            nsUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index 83891275a2..cf1833e892 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.BundleLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
@@ -42,6 +43,7 @@ public class DataService extends DaggerIntentService {
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
     @Inject RxBusWrapper rxBus;
+    @Inject NSUpload nsUpload;
     @Inject SmsCommunicatorPlugin smsCommunicatorPlugin;
     @Inject DexcomPlugin dexcomPlugin;
     @Inject EversensePlugin eversensePlugin;
@@ -210,7 +212,7 @@ public class DataService extends DaggerIntentService {
         } else if (eventType.equals(CareportalEvent.COMBOBOLUS)) {
             MainApp.getDbHelper().createExtendedBolusFromJsonIfNotExists(json);
         } else if (eventType.equals(CareportalEvent.PROFILESWITCH)) {
-            MainApp.getDbHelper().createProfileSwitchFromJsonIfNotExists(activePlugin, json);
+            MainApp.getDbHelper().createProfileSwitchFromJsonIfNotExists(activePlugin, nsUpload, json);
         } else if (eventType.equals(CareportalEvent.SITECHANGE) ||
                 eventType.equals(CareportalEvent.INSULINCHANGE) ||
                 eventType.equals(CareportalEvent.SENSORCHANGE) ||
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
index c9e2835ceb..bec9c0fa16 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
@@ -12,11 +12,12 @@ import javax.inject.Singleton
 
 @Singleton
 class HardLimits @Inject constructor(
-    val aapsLogger: AAPSLogger,
-    val rxBus: RxBusWrapper,
-    val sp: SP,
-    val resourceHelper: ResourceHelper,
-    val context: Context
+    private val aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val sp: SP,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val nsUpload: NSUpload
 ) {
 
     val CHILD = 0
@@ -90,7 +91,7 @@ class HardLimits @Inject constructor(
             msg += ".\n"
             msg += String.format(resourceHelper.gs(R.string.valuelimitedto), value, newvalue)
             aapsLogger.error(msg)
-            NSUpload.uploadError(msg)
+            nsUpload.uploadError(msg)
             ToastUtils.showToastInUiThread(context, rxBus, msg, R.raw.error)
         }
         return newvalue
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
index eff444aa6e..f5ac9d64ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt
@@ -31,6 +31,7 @@ class LocalAlertUtils @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
     private val config: Config,
+    private val nsUpload: NSUpload,
     private val dateUtil: DateUtil
 ) {
 
@@ -53,7 +54,7 @@ class LocalAlertUtils @Inject constructor(
             sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold())
             rxBus.send(EventNewNotification(n))
             if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-                NSUpload.uploadError(n.text)
+                nsUpload.uploadError(n.text)
             }
         }
         if (!isStatusOutdated && !alarmTimeoutExpired) rxBus.send(EventDismissNotification(Notification.PUMP_UNREACHABLE))
@@ -101,7 +102,7 @@ class LocalAlertUtils @Inject constructor(
             sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold())
             rxBus.send(EventNewNotification(n))
             if (sp.getBoolean(R.string.key_ns_create_announcements_from_errors, true)) {
-                NSUpload.uploadError(n.text)
+                nsUpload.uploadError(n.text)
             }
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 6ee3024fc6..1e567dd94a 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -32,8 +33,9 @@ class TddCalculator @Inject constructor(
     val activePlugin: ActivePluginProvider,
     val profileFunction: ProfileFunction,
     fabricPrivacy: FabricPrivacy,
+    nsUpload: NSUpload,
     private val dateUtil: DateUtil
-) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, mainApp, sp, profileFunction, activePlugin, fabricPrivacy, dateUtil) {
+) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, mainApp, sp, profileFunction, activePlugin, nsUpload, fabricPrivacy, dateUtil) {
 
     init {
         service = TreatmentService(injector) // plugin is not started
diff --git a/app/src/main/res/layout/okcancel.xml b/app/src/main/res/layout/okcancel.xml
new file mode 100644
index 0000000000..f1322fd566
--- /dev/null
+++ b/app/src/main/res/layout/okcancel.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/done_background"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:orientation="horizontal"
+    android:background="@android:color/transparent"
+    android:gravity="end|right"
+    android:layout_gravity="center_vertical"
+    android:paddingBottom="8dp">
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
+        style="@style/mdtp_ActionButton.Text"
+        android:text="@string/mdtp_cancel" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        style="@style/mdtp_ActionButton.Text"
+        android:text="@string/mdtp_ok" />
+</LinearLayout>
+    <!-- From: file:/Users/wdullaer/Documents/Programming%20Projects/MaterialDateTimePicker/library/src/main/res/layout/mdtp_done_button.xml -->
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 27adfdd924..9bfd6aa1a9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,7 +9,6 @@
     <color name="devslopepos">#FFFFFF00</color>
     <color name="devslopeneg">#FFFF00FF</color>
     <color name="actionsConfirm">#FFFF00</color>
-    <color name="listdelimiter">#505050</color>
     <color name="tabBgColorSelected">#FF33B5E5</color>
     <color name="deviations">#FF0000</color>
     <color name="cobAlert">#7484E2</color>
@@ -30,7 +29,6 @@
 
 
     <color name="mdtp_accent_color">#40bbaa</color>
-    <color name="colorInitializingBorder">#00695c</color>
 
     <color name="cardColorBackground">#121212</color>
     <color name="cardObjectiveText">#779ECB</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b36ff01254..71b1948ad1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,7 +124,6 @@
     <string name="sms_delta">Delta:</string>
 
     <string name="configbuilder">Config Builder</string>
-    <string name="objectives">Objectives</string>
     <string name="overview">Overview</string>
     <string name="nsprofile">NS Profile</string>
     <string name="simpleprofile">Simple profile</string>
@@ -288,7 +287,6 @@
     <string name="save">Save</string>
     <string name="nobtadapter">No bluetooth adapter found</string>
     <string name="devicenotfound">Selected device not found</string>
-    <string name="connectionerror">Pump connection error</string>
     <string name="danar_iob_label">Pump IOB</string>
     <string name="danar_dailyunits">Daily units</string>
     <string name="pump_lastbolus_label">Last bolus</string>
@@ -316,7 +314,6 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s for %2$d minutes</string>
     <string name="smscommunicator_tt_set">Target %1$s for %2$d minutes set successfully</string>
     <string name="smscommunicator_tt_canceled">Temp Target canceled successfully</string>
-    <string name="bolusdelivering">Delivering %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Allow remote commands via SMS</string>
     <string name="danarprofile">DanaR profile settings</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -334,27 +331,12 @@
     <string name="danar_alarm">alarm</string>
     <string name="danar_totaluploaded">Total %1$d records uploaded</string>
     <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarms</string>
-    <string name="danar_history_basalhours">Basal Hours</string>
-    <string name="danar_history_bolus">Boluses</string>
-    <string name="danar_history_carbohydrates">Carbohydrates</string>
-    <string name="danar_history_dailyinsulin">Daily insulin</string>
-    <string name="danar_history_errors">Errors</string>
-    <string name="danar_history_glucose">Glucose</string>
-    <string name="danar_history_refill">Refill</string>
-    <string name="danar_history_syspend">Suspend</string>
     <string name="danars_password_title">Pump password (v1 only)</string>
     <string name="danar_password_title">Pump password</string>
-    <string name="wrongpumppassword">Wrong pump password!</string>
-    <string name="pumpbusy">Pump is busy</string>
-    <string name="overview_bolusprogress_delivered">Delivered</string>
-    <string name="overview_bolusprogress_stoped">Stopped</string>
     <string name="bolusstopped">Bolus stopped</string>
     <string name="bolusstopping">Stopping bolus</string>
-    <string name="occlusion">Occlusion</string>
     <string name="overview_bolusprogress_stop">Stop</string>
     <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
-    <string name="youareonallowedlimit">You reached allowed limit</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
     <string name="smscommunicator_loopisdisabled">Loop is disabled</string>
@@ -418,16 +400,10 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Resend All Data</string>
     <string name="open_settings_on_wear">Open Settings on Wear</string>
-    <string name="pumperror">Pump Error</string>
-    <string name="lowbattery">Low Battery</string>
-    <string name="basalcompare">Delivering less than preset basal rate</string>
-    <string name="pumpshutdown">Pump Shutdown</string>
-    <string name="batterydischarged">Pump Battery Discharged</string>
     <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Basal rate:</string>
     <string name="profile_set_failed">Setting of basal profile failed</string>
     <string name="danar_disableeasymode">Disable EasyUI mode in pump</string>
-    <string name="danar_enableextendedbolus">Enable extended boluses on pump</string>
     <string name="danar_switchtouhmode">Change mode from U/d to U/h on pump</string>
     <string name="basalvaluebelowminimum">Basal value below minimum. Profile not set!</string>
     <string name="sms_actualbg">BG:</string>
@@ -451,20 +427,6 @@
     <string name="hypo">Hypo</string>
     <string name="activity">Activity</string>
     <string name="removerecord">Remove record</string>
-    <string name="danar_stats">DanaR Stats</string>
-    <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
-    <string name="danar_stats_expweight">Exponentially Weighted TDD</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Date</string>
-    <string name="danar_stats_ratio">Ratio</string>
-    <string name="danar_stats_amount_days"># Days</string>
-    <string name="danar_stats_weight">Weight</string>
-    <string name="danar_stats_warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
-    <string name="danar_stats_olddata_Message">Old Data Please Press "RELOAD"</string>
-    <string name="danar_stats_tbb">Total Base Basal</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
     <string name="initializing">Initializing ...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
@@ -486,7 +448,6 @@
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
     <string name="advancedsettings_title">Advanced Settings</string>
     <string name="key_advancedsettings" translatable="false">key_advancedsettings</string>
-    <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
     <string name="profile">Profile</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3 This is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Default value: 4 This is the other half of the key OpenAPS safety caps, and the other half of “3x max daily; 4x current” of the safety caps. This means your basal, regardless of max basal set on your pump, cannot be any higher than this number times the current level of your basal. This is to prevent people from getting into dangerous territory by setting excessively high max basals before understanding how the algorithm works. Again, the default is 4x; most people will never need to adjust this and are instead more likely to need to adjust other settings if they feel like they are “running into” this safety cap.</string>
@@ -511,17 +472,9 @@
     <string name="smscommunicator_calibrationsent">Calibration sent. Receiving must be enabled in xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip is not receiving calibrations</string>
     <string name="pumpsuspended">Pump suspended</string>
-    <string name="gettingpumpstatus">Getting pump status</string>
-    <string name="settingtempbasal">Setting temp basal</string>
-    <string name="stoppingtempbasal">Stopping temp basal</string>
-    <string name="settingextendedbolus">Setting extended bolus</string>
-    <string name="stoppingextendedbolus">Stopping extended bolus</string>
-    <string name="updatingbasalrates">Updating basal rates</string>
     <string name="executing">Executing</string>
     <string name="virtualpump_settings">Virtual pump settings</string>
     <string name="virtualpump_uploadstatus_title">Upload status to NS</string>
-    <string name="wrongpassword">Wrong password</string>
-    <string name="approachingdailylimit">Approaching insulin daily limit</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -735,10 +688,6 @@
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="pairing">Pairing</string>
-    <string name="emptyreservoir">Empty reservoir</string>
-    <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
-    <string name="remaininsulinalert">Remaining insulin level</string>
-    <string name="missedbolus">Missed bolus</string>
     <string name="selectedpump">Selected pump</string>
     <string name="bolusspeed">Bolus speed</string>
     <string name="serialnumber">Serial number</string>
@@ -753,12 +702,6 @@
     <string name="activity_target">activity target</string>
     <string name="hypo_duration">hypo duration</string>
     <string name="hypo_target">hypo target</string>
-    <string name="danar_history_prime">Prime</string>
-    <string name="gettingextendedbolusstatus">Getting extended bolus status</string>
-    <string name="gettingbolusstatus">Getting bolus status</string>
-    <string name="gettingtempbasalstatus">Getting temporary basal status</string>
-    <string name="gettingpumpsettings">Getting pump settings</string>
-    <string name="gettingpumptime">Getting pump time</string>
     <string name="reuse">reuse</string>
     <string name="wearcontrol_title">Controls from Watch</string>
     <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
@@ -770,9 +713,6 @@
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Fat</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Waiting for bolus end. Remaining %1$d sec.</string>
-    <string name="processinghistory">Processing event</string>
-    <string name="startingbolus">Starting bolus delivery</string>
     <string name="executingrightnow">Command is executed right now</string>
     <string name="pumpdrivercorrected">Pump driver corrected</string>
     <string name="pump_unreachable">Pump unreachable</string>
@@ -809,7 +749,6 @@
     <string name="key_carbsReqThreshold" translatable="false">carbsReqThreshold</string>
     <string name="carbsReqThreshold">Carb suggestion threshold</string>
     <string name="carbsReqThreshold_summary">When Carbs are suggested, how many carbs will prompt a notification</string>
-    <string name="unsupportedfirmware">Unsupported pump firmware</string>
     <string name="dexcomg5_xdripupload_title">Send BG data to xDrip+</string>
     <string name="key_dexcomg5_xdripupload" translatable="false">dexcomg5_xdripupload</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ select 640g/Eversense data source</string>
@@ -871,10 +810,7 @@
     <string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">ago</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d mins</string>
-    <string name="format_mins_short">%1$dm</string>
-    <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
+     <string name="key_enableSMB_always" translatable="false">enableSMB_always</string>
     <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
     <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
@@ -946,7 +882,6 @@
     <string name="key_fromNSAreCommingFakedExtendedBoluses" translatable="false">fromNSAreCommingFakedExtendedBoluses</string>
     <string name="engineering_mode_enabled">Engineering mode enabled</string>
     <string name="not_eng_mode_or_release">Engineering mode not enabled and not on release branch</string>
-    <string name="pump_basebasalrate">%1$.2fU/h</string>
     <string name="combo_actvity_reading_basal_profile">Reading basal profile</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">The pump history has changed after the bolus calculation was performed. The bolus was not delivered. Please recalculate if a bolus is still needed.</string>
     <string name="combo_error_updating_treatment_record">Bolus successfully delivered, but adding the treatment entry failed. This can happen if two small boluses of the same size are administered within the last two minutes. Please check the pump history and treatment entries and use the Careportal to add missing entries. Make sure not to add any entries for the exact same minute and same amount.</string>
@@ -995,7 +930,6 @@
     <string name="food_short">Food</string>
     <string name="iobcobcalculator" translatable="false">IobCobCalculator</string>
     <string name="reset">reset</string>
-    <string name="waitingfortimesynchronization">Waiting for time synchronization (%1$d sec)</string>
     <string name="loopdisconnectedfor">Disconnected (%1$d m)</string>
     <string name="key_openapssmb_max_iob" translatable="false">openapsmb_max_iob</string>
     <string name="openapssmb_maxiob_title">Maximum total IOB OpenAPS can\'t go over [U]</string>
@@ -1079,20 +1013,6 @@
     <string name="request">Request</string>
     <string name="insulinsourcesetup">Configure Insulin plugin</string>
     <string name="exit">Exit</string>
-    <string name="danar_useroptions">User options</string>
-    <string name="danar_timedisplay">Display time format</string>
-    <string name="danar_buttonscroll">Button scroll</string>
-    <string name="danar_beep">Beep on button press</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Sound</string>
-    <string name="danar_pumpalarm_vibrate">Vibrate</string>
-    <string name="danar_pumpalarm_both">Both</string>
-    <string name="danar_screentimeout">LCD on time [seconds]</string>
-    <string name="danar_backlight">Backlight on time [seconds]</string>
-    <string name="danar_glucoseunits">Glucose units</string>
-    <string name="danar_shutdown">Shutdown [hours]</string>
-    <string name="danar_lowreservoir">Low reservoir [Units]</string>
-    <string name="danar_saveuseroptions">Save options to pump</string>
     <string name="option_on">On</string>
     <string name="option_off">Off</string>
     <string name="open_navigation">Open navigation</string>
@@ -1118,8 +1038,6 @@
     <string name="sensitivity_raises_target_summary">When sensitivity is detected, raise the target glucose</string>
     <string name="combo_invalid_setup">Invalid pump setup, check the docs and verify that the Quick Info menu is named QUICK INFO using the 360 configuration software.</string>
     <string name="custom">Custom</string>
-    <string name="largetimedifftitle">Large Time Difference</string>
-    <string name="largetimediff">Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
     <string name="key_keep_screen_on" translatable="false">keep_screen_on</string>
     <string name="careportal_removestartedevents">Clean AndroidAPS started</string>
     <string name="storedsettingsfound">Stored settings found</string>
@@ -1156,9 +1074,7 @@
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
-    <string name="pairfirst">Please pair your pump with your phone!</string>
     <string name="searching_for_devices">Searching for devices…</string>
-    <string name="please_wait">Please wait…</string>
     <string name="pairing_completed">Pairing completed</string>
     <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
     <string name="insight_pairing">Insight pairing</string>
@@ -1334,7 +1250,6 @@
     <string name="very_old_version">very old version</string>
     <string name="new_version_warning">New version for at least %1$d days available! Fallback to LGS after %2$d days, loop will be disabled after %3$d days</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
 
     <string name="dexcom_app_patched">Dexcom App (patched)</string>
     <string name="dexcom_short">DXCM</string>
@@ -1565,7 +1480,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus constraint applied: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Slow carbs absorption detected: %2$d%% of time. Double check your calculation. COB can be overestimated thus more insulin could be given !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="key_boluswizard_percentage" translatable="false">boluswizard_percentage</string>
     <string name="partialboluswizard">Deliver this part of bolus wizard result [%]</string>
     <string name="deliverpartofboluswizard">Bolus wizard performs calculation but only this part of calculated insulin is delivered. Useful with SMB algorithm.</string>
@@ -1575,7 +1489,6 @@
     <string name="timerange_value">Time is between %1$s and %2$s</string>
     <string name="between">Between </string>
 
-    <string name="close">Close</string>
     <string name="increasingmaxbasal">Increasing max basal value because setting is lower than your max basal in profile</string>
     <string name="smscommunicator_messagebody">Invalid message body</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1594,7 +1507,6 @@
     <string name="common_off">Off</string>
     <string name="objectives_button_unfinish">Clear finished</string>
     <string name="objectives_button_unstart">Clear started</string>
-    <string name="timedetection">Time detection</string>
     <string name="doyouwantresetstart">Do you want reset objective start? You may lose your progress.</string>
     <string name="time_or_timezone_change">Time and/or Timezone change on pump</string>
     <string name="nopumpselected">No pump selected</string>
@@ -1695,8 +1607,6 @@
     <string name="press_ok_on_the_pump">Press OK on the pump\nand enter 2 displayed numbers\nKeep display on pump ON by pressing minus button until you finish entering code.</string>
     <string name="num1pin">1: (12 digits)</string>
     <string name="num2pin">2: (8 digits)</string>
-    <string name="resetpairing">Reset pairing information?</string>
-    <string name="invalidpairing">Invalid pairing information. Requesting new pairing</string>
     <string name="onconnect">On connect</string>
     <string name="ondisconnect">On disconnect</string>
     <string name="overview_show_predictions">Predictions</string>
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
rename to core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index 1cf80ed1ca..da70f73124 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -29,23 +29,18 @@ import java.util.Locale;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TDD;
+import info.nightscout.androidaps.events.EventDanaRSyncStatus;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.SafeParse;
@@ -61,13 +56,8 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
     @Inject SP sp;
     @Inject ProfileFunction profileFunction;
     @Inject ActivePluginProvider activePlugin;
-    @Inject DanaRSPlugin danaRSPlugin;
-    @Inject DanaRPlugin danaRPlugin;
-    @Inject DanaRv2Plugin danaRv2Plugin;
-    @Inject DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject LocalInsightPlugin localInsightPlugin;
-    @Inject ConfigBuilderPlugin configBuilderPlugin;
     @Inject CommandQueueProvider commandQueue;
+    @Inject DatabaseHelperInterface databaseHelper;
     @Inject FabricPrivacy fabricPrivacy;
 
     private CompositeDisposable disposable = new CompositeDisposable();
@@ -300,7 +290,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
     }
 
     private void loadDataFromDB() {
-        historyList = MainApp.getDbHelper().getTDDs();
+        historyList = databaseHelper.getTDDs();
 
         //only use newest 10
         historyList = historyList.subList(0, Math.min(10, historyList.size()));
@@ -527,7 +517,8 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
 
     public boolean isOldData(List<TDD> historyList) {
 
-        boolean startsYesterday = danaRPlugin.isEnabled() || danaRSPlugin.isEnabled() || danaRv2Plugin.isEnabled() || danaRKoreanPlugin.isEnabled() || localInsightPlugin.isEnabled();
+        PumpType type = activePlugin.getActivePump().getPumpDescription().pumpType;
+        boolean startsYesterday = type == PumpType.DanaR || type == PumpType.DanaRS || type == PumpType.DanaRv2 || type == PumpType.DanaRKorean || type == PumpType.AccuChekInsight;
 
         DateFormat df = new SimpleDateFormat("dd.MM.", Locale.getDefault());
         return (historyList.size() < 3 || !(df.format(new Date(historyList.get(0).date)).equals(df.format(new Date(System.currentTimeMillis() - (startsYesterday ? 1000 * 60 * 60 * 24 : 0))))));
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
index 2e5ec7d9e5..176e6fba88 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/NtpProgressDialog.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.constraints.objectives.dialogs
+package info.nightscout.androidaps.dialogs
 
 import android.os.Bundle
 import android.os.SystemClock
@@ -6,11 +6,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
+import info.nightscout.androidaps.events.EventNtpStatus
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.constraints.objectives.events.EventNtpStatus
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.extensions.plusAssign
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
rename to core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 9536da6928..df60da2067 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -9,9 +9,9 @@ import android.view.WindowManager
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.close.*
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class ProfileViewerDialog : DaggerDialogFragment() {
     @Inject lateinit var injector: HasAndroidInjector
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var dateUtil: DateUtil
 
     private var time: Long = 0
@@ -66,9 +66,9 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         val date: String?
         when (mode) {
             Mode.RUNNING_PROFILE -> {
-                profile = treatmentsPlugin.getProfileSwitchFromHistory(time)?.profileObject
-                profileName = treatmentsPlugin.getProfileSwitchFromHistory(time)?.customizedName
-                date = dateUtil.dateAndTimeString(treatmentsPlugin.getProfileSwitchFromHistory(time)?.date
+                profile = activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.profileObject
+                profileName = activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.customizedName
+                date = dateUtil.dateAndTimeString(activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.date
                     ?: 0)
                 profileview_datelayout.visibility = View.VISIBLE
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.kt b/core/src/main/java/info/nightscout/androidaps/events/EventDanaRSyncStatus.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventDanaRSyncStatus.kt
index 59ad7e2d83..152a45491f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRSyncStatus.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventDanaRSyncStatus.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.events
+package info.nightscout.androidaps.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventLoop.kt b/core/src/main/java/info/nightscout/androidaps/events/EventLoop.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventLoop.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventLoop.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/events/EventNtpStatus.kt b/core/src/main/java/info/nightscout/androidaps/events/EventNtpStatus.kt
similarity index 61%
rename from app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/events/EventNtpStatus.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventNtpStatus.kt
index fc4e5cb8e9..0ad455836a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/events/EventNtpStatus.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventNtpStatus.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.constraints.objectives.events
+package info.nightscout.androidaps.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index fb6c30a2c3..b7753c8f02 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -1,8 +1,24 @@
 package info.nightscout.androidaps.interfaces
 
+import com.j256.ormlite.dao.CloseableIterator
 import info.nightscout.androidaps.db.BgReading
+import info.nightscout.androidaps.db.CareportalEvent
+import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.db.DbRequest
+import info.nightscout.androidaps.db.TDD
 
 @Deprecated("Remove with new DB")
 interface DatabaseHelperInterface {
-    fun getAllBgreadingsDataFromTime(mills : Long, ascending: Boolean): List<BgReading>
+
+    fun getAllBgreadingsDataFromTime(mills: Long, ascending: Boolean): List<BgReading>
+    fun createOrUpdate(careportalEvent: CareportalEvent)
+    fun createOrUpdate(record: DanaRHistoryRecord)
+    fun create(record: DbRequest)
+    fun getDanaRHistoryRecordsByType(type: Byte): List<DanaRHistoryRecord>
+    fun getTDDs(): List<TDD>
+    fun size(table: String) : Long
+    fun deleteAllDbRequests()
+    fun deleteDbRequest(id: String) : Int
+    fun deleteDbRequestbyMongoId(action: String, _id: String)
+    fun getDbRequestInterator() : CloseableIterator<DbRequest>
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index d5356af55d..0585a7b19b 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -79,7 +79,7 @@ public interface PumpInterface {
 
     // Status to be passed to NS
     @NotNull
-    JSONObject getJSONStatus(Profile profile, String profileName);
+    JSONObject getJSONStatus(Profile profile, String profileName, String version);
 
     @NotNull
     ManufacturerType manufacturer();
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index 85331b0f3a..d5b03fd747 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -18,8 +18,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.IobTotal;
@@ -29,8 +31,10 @@ import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.ProfileSwitch;
+import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.IobCobCalculatorInterface;
 import info.nightscout.androidaps.interfaces.LoopInterface;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
@@ -54,24 +58,31 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 @Singleton
 public class NSUpload {
 
+    private final HasAndroidInjector injector;
     private final AAPSLogger aapsLogger;
     private final ResourceHelper resourceHelper;
     private final SP sp;
     private final Context context;
     private final UploadQueueInterface uploadQueue;
+    private final DatabaseHelperInterface databaseHelper;
 
+    @Inject
     public NSUpload(
+            HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             ResourceHelper resourceHelper,
             SP sp,
             Context context,
-            UploadQueueInterface uploadQueue
+            UploadQueueInterface uploadQueue,
+            DatabaseHelperInterface databaseHelper
     ) {
+        this.injector = injector;
         this.aapsLogger = aapsLogger;
         this.resourceHelper = resourceHelper;
         this.sp = sp;
         this.context = context;
         this.uploadQueue = uploadQueue;
+        this.databaseHelper = databaseHelper;
     }
 
     public void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
@@ -179,7 +190,7 @@ public class NSUpload {
         }
     }
 
-    public void uploadDeviceStatus(LoopInterface loopPlugin, IobCobCalculatorInterface iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface, ReceiverStatusStore receiverStatusStore) {
+    public void uploadDeviceStatus(LoopInterface loopPlugin, IobCobCalculatorInterface iobCobCalculatorPlugin, ProfileFunction profileFunction, PumpInterface pumpInterface, ReceiverStatusStore receiverStatusStore, String version) {
         Profile profile = profileFunction.getProfile();
         String profileName = profileFunction.getProfileName();
 
@@ -230,7 +241,7 @@ public class NSUpload {
                 }
             }
             deviceStatus.device = "openaps://" + Build.MANUFACTURER + " " + Build.MODEL;
-            JSONObject pumpstatus = pumpInterface.getJSONStatus(profile, profileName);
+            JSONObject pumpstatus = pumpInterface.getJSONStatus(profile, profileName, version);
             if (pumpstatus != null) {
                 deviceStatus.pump = pumpstatus;
             }
@@ -508,4 +519,28 @@ public class NSUpload {
             return true;
         return false;
     }
+
+    public void generateCareportalEvent(String eventType, long time, String notes) {
+        CareportalEvent careportalEvent = new CareportalEvent(injector);
+        careportalEvent.source = Source.USER;
+        careportalEvent.date = time;
+        careportalEvent.json = generateJson(eventType, time, notes).toString();
+        careportalEvent.eventType = eventType;
+        databaseHelper.createOrUpdate(careportalEvent);
+        uploadEvent(eventType, time, notes);
+    }
+
+    private JSONObject generateJson(String careportalEvent, long time, String notes) {
+        JSONObject data = new JSONObject();
+        try {
+            data.put("eventType", careportalEvent);
+            data.put("created_at", DateUtil.toISOString(time));
+            data.put("mills", time);
+            data.put("enteredBy", sp.getString("careportal_enteredby", "AndroidAPS"));
+            if (!notes.isEmpty()) data.put("notes", notes);
+        } catch (JSONException ignored) {
+        }
+        return data;
+    }
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt b/core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/events/EventQueueChanged.kt b/core/src/main/java/info/nightscout/androidaps/queue/events/EventQueueChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/queue/events/EventQueueChanged.kt
rename to core/src/main/java/info/nightscout/androidaps/queue/events/EventQueueChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java b/core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
rename to core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java b/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
rename to core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
index 775582473e..c9973579ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
@@ -19,7 +19,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 
 /**
  * Created by mike on 28.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.kt b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
index fd375ad1cc..5c74ab6c7d 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SetWarnColor.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/WarnColors.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.utils
 
 import android.graphics.Color
 import android.widget.TextView
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt b/core/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/extensions/CompositeDisposablePlusAssign.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt b/core/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/extensions/Concurrency.kt
diff --git a/core/src/main/res/layout/close.xml b/core/src/main/res/layout/close.xml
new file mode 100644
index 0000000000..682cf2bc22
--- /dev/null
+++ b/core/src/main/res/layout/close.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/done_background"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:orientation="horizontal"
+    android:background="@android:color/transparent"
+    android:gravity="end"
+    android:layout_gravity="center_vertical"
+    android:paddingBottom="8dp">
+
+    <Button
+        android:id="@+id/close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        style="@style/mdtp_ActionButton.Text"
+        android:text="@string/close" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/danar_statsactivity.xml b/core/src/main/res/layout/danar_statsactivity.xml
similarity index 100%
rename from app/src/main/res/layout/danar_statsactivity.xml
rename to core/src/main/res/layout/danar_statsactivity.xml
diff --git a/app/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_profileviewer.xml
rename to core/src/main/res/layout/dialog_profileviewer.xml
diff --git a/app/src/main/res/layout/number_picker_layout.xml b/core/src/main/res/layout/number_picker_layout.xml
similarity index 100%
rename from app/src/main/res/layout/number_picker_layout.xml
rename to core/src/main/res/layout/number_picker_layout.xml
diff --git a/app/src/main/res/layout/spinner_centered.xml b/core/src/main/res/layout/spinner_centered.xml
similarity index 100%
rename from app/src/main/res/layout/spinner_centered.xml
rename to core/src/main/res/layout/spinner_centered.xml
diff --git a/app/src/main/res/raw/boluserror.mp3 b/core/src/main/res/raw/boluserror.mp3
similarity index 100%
rename from app/src/main/res/raw/boluserror.mp3
rename to core/src/main/res/raw/boluserror.mp3
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 19da434c99..d122ed5158 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -4,6 +4,9 @@
     <color name="colorPrimaryDark">#000000</color>
     <color name="colorAccent">#40bbaa</color>
 
+    <!--    Fragments-->
+    <color name="colorInitializingBorder">#00695c</color>
+
     <!--    Dialogs-->
     <color name="dialog_title_background">#303030</color>
     <color name="activity_title_background">#121212</color>
@@ -16,6 +19,7 @@
 
     <!--    Treatment-->
     <color name="tempbasal">#C803A9F4</color>
+    <color name="listdelimiter">#505050</color>
 
     <!--    BgReading-->
     <color name="inrange">#00FF00</color>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2842da7183..3c7e94deee 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -31,12 +31,25 @@
     <string name="goingtodeliver">Going to deliver %1$.2fU</string>
     <string name="waitingforpump">Waiting for pump</string>
     <string name="connectingfor">Connecting for %1$d s</string>
+    <string name="bolusdelivering">Delivering %1$.2fU</string>
     <string name="handshaking">Handshaking</string>
     <string name="connecting">Connecting</string>
     <string name="connected">Connected</string>
     <string name="disconnected">Disconnected</string>
     <string name="disconnecting">Disconnecting</string>
     <string name="androidaps_start">AndroidAPS started</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pump is busy</string>
+    <string name="connectionerror">Pump connection error</string>
+    <string name="youareonallowedlimit">You reached allowed limit</string>
+    <string name="objectives">Objectives</string>
+    <string name="close">Close</string>
+    <string name="please_wait">Please wait…</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
@@ -150,4 +163,23 @@
     <string name="waitingforpumpresult">Waiting for result</string>
     <string name="smb_shortname">SMB</string>
 
+    <!--    TDDStatsActivity-->
+    <string name="danar_stats">DanaR Stats</string>
+    <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
+    <string name="danar_stats_expweight">Exponentially Weighted TDD</string>
+    <string name="danar_stats_basalrate">Basal</string>
+    <string name="danar_stats_bolus">Bolus</string>
+    <string name="danar_stats_tdd">TDD</string>
+    <string name="danar_stats_date">Date</string>
+    <string name="danar_stats_ratio">Ratio</string>
+    <string name="danar_stats_amount_days"># Days</string>
+    <string name="danar_stats_weight">Weight</string>
+    <string name="danar_stats_warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
+    <string name="danar_stats_olddata_Message">Old Data Please Press "RELOAD"</string>
+    <string name="danar_stats_tbb">Total Base Basal</string>
+    <string name="danar_stats_tbb2">TBB * 2</string>
+
+    <!--    Ntp-->
+    <string name="timedetection">Time detection</string>
+
 </resources>
\ No newline at end of file
diff --git a/danars/build.gradle b/danars/build.gradle
index a80ef58dfb..42726eb8ab 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -54,9 +54,15 @@ dependencies {
     implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    implementation 'net.danlew:android.joda:2.10.6'
+
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
index da7f8b2e33..7d3e561ec1 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
@@ -7,8 +7,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.TDDStatsActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventInitializationChanged
@@ -16,15 +16,14 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.interfaces.PumpInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
 import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
 import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
@@ -46,7 +45,6 @@ class DanaRFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var resourceHelper: ResourceHelper
@@ -223,7 +221,7 @@ class DanaRFragment : DaggerFragment() {
         }
         //hide user options button if not an RS pump or old firmware
         // also excludes pump with model 03 because of untested error
-        val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
+        val isKorean = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRKorean
         if (isKorean || pump.hwModel == 0 || pump.hwModel == 3) {
             danar_user_options?.visibility = View.GONE
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
index eb63a70a0e..e9d69f3453 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
@@ -10,22 +10,21 @@ import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
@@ -44,9 +43,9 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Inject lateinit var danaRSPlugin: DanaRSPlugin
+    @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
     @Inject lateinit var dateUtil: DateUtil
 
     private val disposable = CompositeDisposable()
@@ -87,8 +86,9 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
         danar_history_recyclerview.adapter = RecyclerViewAdapter(historyList)
         danar_history_status.visibility = View.GONE
 
-        val isKorean = danaRKoreanPlugin.isEnabled(PluginType.PUMP)
-        val isRS = danaRSPlugin.isEnabled(PluginType.PUMP)
+        val pump = activePlugin.activePump
+        val isKorean = pump.pumpDescription.pumpType == PumpType.DanaRKorean
+        val isRS = pump.pumpDescription.pumpType == PumpType.DanaRS
 
         // Types
         val typeList = ArrayList<TypeList>()
@@ -151,7 +151,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
             holder.duration.text = DecimalFormatter.to0Decimal(record.recordDuration.toDouble())
             holder.alarm.text = record.recordAlarm
             when (showingType) {
-                RecordTypes.RECORD_TYPE_ALARM                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
+                RecordTypes.RECORD_TYPE_ALARM                                                                                                                                                              -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
                     holder.stringValue.visibility = View.GONE
@@ -163,7 +163,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.VISIBLE
                 }
 
-                RecordTypes.RECORD_TYPE_BOLUS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
+                RecordTypes.RECORD_TYPE_BOLUS                                                                                                                                                              -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
                     holder.stringValue.visibility = View.GONE
@@ -175,7 +175,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            -> {
+                RecordTypes.RECORD_TYPE_DAILY                                                                                                                                                              -> {
                     holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBasal)
                     holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus)
                     holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.recordDailyBolus + record.recordDailyBasal)
@@ -191,7 +191,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_GLUCOSE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          -> {
+                RecordTypes.RECORD_TYPE_GLUCOSE                                                                                                                                                            -> {
                     holder.value.text = Profile.toUnitsString(record.recordValue, record.recordValue * Constants.MGDL_TO_MMOLL, profileFunction.getUnits())
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.VISIBLE
@@ -216,7 +216,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
                     holder.alarm.visibility = View.GONE
                 }
 
-                RecordTypes.RECORD_TYPE_SUSPEND                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          -> {
+                RecordTypes.RECORD_TYPE_SUSPEND                                                                                                                                                            -> {
                     holder.time.visibility = View.VISIBLE
                     holder.value.visibility = View.GONE
                     holder.stringValue.visibility = View.VISIBLE
@@ -248,7 +248,7 @@ class DanaRHistoryActivity : NoSplashAppCompatActivity() {
     }
 
     private fun loadDataFromDB(type: Byte) {
-        historyList = MainApp.getDbHelper().getDanaRHistoryRecordsByType(type)
+        historyList = databaseHelper.getDanaRHistoryRecordsByType(type)
         runOnUiThread { danar_history_recyclerview?.swapAdapter(RecyclerViewAdapter(historyList), false) }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
index 624b681dc5..2d081c403f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
@@ -1,22 +1,20 @@
 package info.nightscout.androidaps.plugins.pump.danaR.activities
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.extensions.plusAssign
@@ -34,20 +32,17 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var mainApp: MainApp
-    @Inject lateinit var danaRSPlugin: DanaRSPlugin
-    @Inject lateinit var danaRPlugin: DanaRPlugin
-    @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Inject lateinit var context: Context
     @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var commandQueue: CommandQueueProvider
 
     private val disposable = CompositeDisposable()
 
     // This is for Dana pumps only
-    private fun isRS() = danaRSPlugin.isEnabled(PluginType.PUMP)
-
-    private fun isDanaR() = danaRPlugin.isEnabled(PluginType.PUMP)
-    private fun isDanaRv2() = danaRv2Plugin.isEnabled(PluginType.PUMP)
+    private fun isRS() = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRS
+    private fun isDanaR() = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaR
+    private fun isDanaRv2() = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRv2
 
     @Synchronized
     override fun onResume() {
@@ -153,12 +148,12 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
         commandQueue.setUserOptions(object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    val i = Intent(mainApp, ErrorHelperActivity::class.java)
+                    val i = Intent(context, ErrorHelperActivity::class.java)
                     i.putExtra("soundid", R.raw.boluserror)
                     i.putExtra("status", result.comment)
                     i.putExtra("title", resourceHelper.gs(R.string.pumperror))
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    mainApp.startActivity(i)
+                    context.startActivity(i)
                 }
             }
         })
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
index 2cf3e44656..92e5550afa 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
@@ -562,7 +562,7 @@ class DanaRSPlugin @Inject constructor(
         }
     }
 
-    override fun getJSONStatus(profile: Profile, profileName: String): JSONObject {
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
         val now = System.currentTimeMillis()
         if (danaRPump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return JSONObject()
@@ -575,7 +575,7 @@ class DanaRSPlugin @Inject constructor(
             battery.put("percent", danaRPump.batteryRemaining)
             status.put("status", if (danaRPump.pumpSuspended) "suspended" else "normal")
             status.put("timestamp", DateUtil.toISOString(danaRPump.lastConnection))
-            extended.put("Version", BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
+            extended.put("Version", version)
             if (danaRPump.lastBolusTime != 0L) {
                 extended.put("LastBolus", dateUtil.dateAndTimeString(danaRPump.lastBolusTime))
                 extended.put("LastBolusAmount", danaRPump.lastBolusAmount)
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
index 37670980f3..245081e064 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
@@ -3,20 +3,15 @@ package info.nightscout.androidaps.plugins.pump.danaRS.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption;
-
-import org.slf4j.Logger;
-
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption;
 import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet {
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
index 3427c46b2a..3fb7d1fd21 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
@@ -7,11 +7,11 @@ import info.nightscout.androidaps.db.CareportalEvent
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.dialogs.FillDialog
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
@@ -32,6 +32,7 @@ open class DanaRS_Packet_APS_History_Events(
     @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var sp: SP
+    @Inject lateinit var nsUpload: NSUpload
 
     private var year = 0
     private var month = 0
@@ -163,14 +164,14 @@ open class DanaRS_Packet_APS_History_Events(
             DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
-                    FillDialog.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump), resourceHelper, sp, injector)
+                    nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
-                    FillDialog.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump), resourceHelper, sp, injector)
+                    nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index 252ce8761a..9b8c9fb199 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index cf42e445ee..bb90a91c82 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index dc942cdfe9..7f99748239 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
index bedbbb8175..945885d605 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRSyncStatus
+import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import org.joda.time.DateTime
 import java.util.*
 import javax.inject.Inject
@@ -17,6 +17,7 @@ abstract class DanaRS_Packet_History_(
 ) : DanaRS_Packet(injector) {
 
     @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     protected var year = 0
     protected var month = 0
@@ -198,7 +199,7 @@ abstract class DanaRS_Packet_History_(
                     danaRHistoryRecord.stringRecordValue = strRecordValue
                 }
             }
-            MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
+            databaseHelper.createOrUpdate(danaRHistoryRecord)
             rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
         }
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
index de92b18367..b986f08b17 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
@@ -17,6 +17,7 @@ class DanaRS_Packet_Notify_Alarm(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var nsUpload: NSUpload
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
@@ -57,7 +58,7 @@ class DanaRS_Packet_Notify_Alarm(
         }
         val notification = Notification(Notification.USERMESSAGE, errorString, Notification.URGENT)
         rxBus.send(EventNewNotification(notification))
-        NSUpload.uploadError(errorString)
+        nsUpload.uploadError(errorString)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index fd059dfe57..35adaa4b6a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index 27d6c011a8..c4963b497e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRS.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
index c3a60805d2..074cdc642f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import android.os.SystemClock
 import android.util.Base64
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -45,7 +45,8 @@ class BLEComm @Inject internal constructor(
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
     private val danaRPump: DanaRPump,
     private val danaRSPlugin: DanaRSPlugin,
-    private val bleEncryption: BleEncryption
+    private val bleEncryption: BleEncryption,
+    private val nsUpload: NSUpload
 ) {
 
     companion object {
@@ -481,7 +482,7 @@ class BLEComm @Inject internal constructor(
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
             mSendQueue.clear()
             rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, resourceHelper.gs(R.string.pumperror)))
-            NSUpload.uploadError(resourceHelper.gs(R.string.pumperror))
+            nsUpload.uploadError(resourceHelper.gs(R.string.pumperror))
             val n = Notification(Notification.PUMPERROR, resourceHelper.gs(R.string.pumperror), Notification.URGENT)
             rxBus.send(EventNewNotification(n))
             // response BUSY: error status
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
index 43dc6eb34e..45c48a51f2 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
@@ -10,6 +10,7 @@ import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.db.Treatment
@@ -65,6 +66,7 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var bleComm: BLEComm
     @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var dateUtil: DateUtil
 
     private val disposable = CompositeDisposable()
@@ -192,7 +194,7 @@ class DanaRSService : DaggerService() {
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
                     rxBus.send(EventNewNotification(reportFail))
-                    NSUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U")
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U")
                     lastApproachingDailyLimit = System.currentTimeMillis()
                 }
             }
diff --git a/app/src/main/res/layout/danar_fragment.xml b/danars/src/main/res/layout/danar_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/danar_fragment.xml
rename to danars/src/main/res/layout/danar_fragment.xml
diff --git a/app/src/main/res/layout/danar_history_item.xml b/danars/src/main/res/layout/danar_history_item.xml
similarity index 100%
rename from app/src/main/res/layout/danar_history_item.xml
rename to danars/src/main/res/layout/danar_history_item.xml
diff --git a/app/src/main/res/layout/danar_historyactivity.xml b/danars/src/main/res/layout/danar_historyactivity.xml
similarity index 100%
rename from app/src/main/res/layout/danar_historyactivity.xml
rename to danars/src/main/res/layout/danar_historyactivity.xml
diff --git a/app/src/main/res/layout/danar_user_options_activity.xml b/danars/src/main/res/layout/danar_user_options_activity.xml
similarity index 100%
rename from app/src/main/res/layout/danar_user_options_activity.xml
rename to danars/src/main/res/layout/danar_user_options_activity.xml
diff --git a/danars/src/main/res/layout/okcancel.xml b/danars/src/main/res/layout/okcancel.xml
new file mode 100644
index 0000000000..f1322fd566
--- /dev/null
+++ b/danars/src/main/res/layout/okcancel.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/done_background"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:orientation="horizontal"
+    android:background="@android:color/transparent"
+    android:gravity="end|right"
+    android:layout_gravity="center_vertical"
+    android:paddingBottom="8dp">
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
+        style="@style/mdtp_ActionButton.Text"
+        android:text="@string/mdtp_cancel" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
+        style="@style/mdtp_ActionButton.Text"
+        android:text="@string/mdtp_ok" />
+</LinearLayout>
+    <!-- From: file:/Users/wdullaer/Documents/Programming%20Projects/MaterialDateTimePicker/library/src/main/res/layout/mdtp_done_button.xml -->
\ No newline at end of file
diff --git a/danars/src/main/res/values/strings.xml b/danars/src/main/res/values/strings.xml
index 73b38830ee..14f8864d67 100644
--- a/danars/src/main/res/values/strings.xml
+++ b/danars/src/main/res/values/strings.xml
@@ -27,5 +27,67 @@
     <string name="boluserrorcode">Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
     <string name="danar_valuenotsetproperly">Value not set properly</string>
     <string name="danar_setbasalstep001">Set basal step to 0.01 U/h</string>
+    <string name="resetpairing">Reset pairing information?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
+    <string name="processinghistory">Processing event</string>
+    <string name="danar_enableextendedbolus">Enable extended boluses on pump</string>
+    <string name="overview_bolusprogress_delivered">Delivered</string>
+    <string name="overview_bolusprogress_stoped">Stopped</string>
+    <string name="unsupportedfirmware">Unsupported pump firmware</string>
+    <string name="pumperror">Pump Error</string>
+    <string name="lowbattery">Low Battery</string>
+    <string name="basalcompare">Delivering less than preset basal rate</string>
+    <string name="pumpshutdown">Pump Shutdown</string>
+    <string name="batterydischarged">Pump Battery Discharged</string>
+    <string name="occlusion">Occlusion</string>
+    <string name="emptyreservoir">Empty reservoir</string>
+    <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
+    <string name="remaininsulinalert">Remaining insulin level</string>
+    <string name="missedbolus">Missed bolus</string>
+    <string name="invalidpairing">Invalid pairing information. Requesting new pairing</string>
+    <string name="gettingpumpstatus">Getting pump status</string>
+    <string name="gettingextendedbolusstatus">Getting extended bolus status</string>
+    <string name="gettingbolusstatus">Getting bolus status</string>
+    <string name="gettingtempbasalstatus">Getting temporary basal status</string>
+    <string name="gettingpumpsettings">Getting pump settings</string>
+    <string name="gettingpumptime">Getting pump time</string>
+    <string name="largetimedifftitle">Large Time Difference</string>
+    <string name="largetimediff">Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
+    <string name="pairfirst">Please pair your pump with your phone!</string>
+    <string name="approachingdailylimit">Approaching insulin daily limit</string>
+    <string name="startingbolus">Starting bolus delivery</string>
+    <string name="waitingforestimatedbolusend">Waiting for bolus end. Remaining %1$d sec.</string>
+    <string name="stoppingtempbasal">Stopping temp basal</string>
+    <string name="settingextendedbolus">Setting extended bolus</string>
+    <string name="stoppingextendedbolus">Stopping extended bolus</string>
+    <string name="updatingbasalrates">Updating basal rates</string>
+    <string name="settingtempbasal">Setting temp basal</string>
+    <string name="waitingfortimesynchronization">Waiting for time synchronization (%1$d sec)</string>
+    <string name="wrongpassword">Wrong password</string>
+    <string name="wrongpumppassword">Wrong pump password!</string>
+    <string name="danar_history_alarm">Alarms</string>
+    <string name="danar_history_basalhours">Basal Hours</string>
+    <string name="danar_history_bolus">Boluses</string>
+    <string name="danar_history_carbohydrates">Carbohydrates</string>
+    <string name="danar_history_dailyinsulin">Daily insulin</string>
+    <string name="danar_history_errors">Errors</string>
+    <string name="danar_history_glucose">Glucose</string>
+    <string name="danar_history_refill">Refill</string>
+    <string name="danar_history_syspend">Suspend</string>
+    <string name="danar_history_prime">Prime</string>
+    <string name="danar_useroptions">User options</string>
+    <string name="danar_timedisplay">Display time format</string>
+    <string name="danar_buttonscroll">Button scroll</string>
+    <string name="danar_beep">Beep on button press</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Sound</string>
+    <string name="danar_pumpalarm_vibrate">Vibrate</string>
+    <string name="danar_pumpalarm_both">Both</string>
+    <string name="danar_screentimeout">LCD on time [seconds]</string>
+    <string name="danar_backlight">Backlight on time [seconds]</string>
+    <string name="danar_glucoseunits">Glucose units</string>
+    <string name="danar_shutdown">Shutdown [hours]</string>
+    <string name="danar_lowreservoir">Low reservoir [Units]</string>
+    <string name="danar_saveuseroptions">Save options to pump</string>
 
 </resources>

From a99be409ebe51db98a6f919e89778e4839154f10 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 9 May 2020 20:18:12 +0200
Subject: [PATCH 049/400] dana module

---
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |  12 +--
 .../activities/MyPreferenceFragment.kt        |   2 +-
 .../androidaps/db/DatabaseHelper.java         |   2 +-
 .../dependencyInjection/ActivitiesModule.kt   |  10 +--
 .../dependencyInjection/DanaRSCommModule.kt   |   2 +-
 .../dependencyInjection/FragmentsModule.kt    |   6 +-
 .../dependencyInjection/PluginsModule.kt      |   2 +-
 .../dependencyInjection/ServicesModule.kt     |   2 +-
 .../general/wear/ActionStringHandler.kt       |   6 +-
 .../pump/danaR/AbstractDanaRPlugin.java       |  11 ++-
 .../plugins/pump/danaR/DanaRPlugin.java       |   1 +
 .../plugins/pump/danaR/SerialIOThread.java    |   1 +
 .../pump/danaR/comm/MessageHashTableR.kt      |   4 +-
 .../pump/danaR/comm/MsgBolusProgress.kt       |   4 +-
 .../plugins/pump/danaR/comm/MsgBolusStart.kt  |   4 +-
 .../pump/danaR/comm/MsgBolusStartWithSpeed.kt |   4 +-
 .../plugins/pump/danaR/comm/MsgBolusStop.kt   |   4 +-
 .../plugins/pump/danaR/comm/MsgCheckValue.kt  |   6 +-
 .../plugins/pump/danaR/comm/MsgError.kt       |   4 +-
 .../plugins/pump/danaR/comm/MsgHistoryAll.kt  |  24 +++---
 .../pump/danaR/comm/MsgHistoryAllDone.kt      |   4 +-
 .../plugins/pump/danaR/comm/MsgHistoryDone.kt |   4 +-
 .../pump/danaR/comm/MsgHistoryNewDone.kt      |   4 +-
 .../pump/danaR/comm/MsgInitConnStatusBasic.kt |  12 +--
 .../pump/danaR/comm/MsgInitConnStatusBolus.kt |   4 +-
 .../danaR/comm/MsgInitConnStatusOption.kt     |   4 +-
 .../pump/danaR/comm/MsgInitConnStatusTime.kt  |   4 +-
 .../pump/danaR/comm/MsgSetCarbsEntry.kt       |   2 +-
 .../pump/danaR/comm/MsgSetUserOptions.kt      |   4 +-
 .../danaR/comm/MsgSettingActiveProfile.kt     |   4 +-
 .../pump/danaR/comm/MsgSettingBasal.kt        |   4 +-
 .../danaR/comm/MsgSettingBasalProfileAll.kt   |   4 +-
 .../pump/danaR/comm/MsgSettingGlucose.kt      |   6 +-
 .../pump/danaR/comm/MsgSettingMaxValues.kt    |   4 +-
 .../plugins/pump/danaR/comm/MsgSettingMeal.kt |   4 +-
 .../danaR/comm/MsgSettingProfileRatios.kt     |   8 +-
 .../danaR/comm/MsgSettingProfileRatiosAll.kt  |   8 +-
 .../pump/danaR/comm/MsgSettingPumpTime.kt     |   4 +-
 .../pump/danaR/comm/MsgSettingShippingInfo.kt |   4 +-
 .../pump/danaR/comm/MsgSettingUserOptions.kt  |   4 +-
 .../plugins/pump/danaR/comm/MsgStatus.kt      |   4 +-
 .../plugins/pump/danaR/comm/MsgStatusBasic.kt |   4 +-
 .../pump/danaR/comm/MsgStatusBolusExtended.kt |   4 +-
 .../pump/danaR/comm/MsgStatusProfile.kt       |   8 +-
 .../pump/danaR/comm/MsgStatusTempBasal.kt     |   4 +-
 .../AbstractDanaRExecutionService.java        |   4 +-
 .../danaR/services/DanaRExecutionService.java |   8 +-
 .../pump/danaRKorean/DanaRKoreanPlugin.java   |   2 +-
 .../comm/MessageHashTableRKorean.kt           |   4 +-
 .../pump/danaRKorean/comm/MsgCheckValue_k.kt  |   6 +-
 .../comm/MsgInitConnStatusBasic_k.kt          |   4 +-
 .../comm/MsgInitConnStatusBolus_k.kt          |   4 +-
 .../comm/MsgInitConnStatusTime_k.kt           |   4 +-
 .../comm/MsgSettingBasalProfileAll_k.kt       |   4 +-
 .../danaRKorean/comm/MsgSettingBasal_k.kt     |   4 +-
 .../pump/danaRKorean/comm/MsgStatusBasic_k.kt |   4 +-
 .../pump/danaRKorean/comm/MsgStatus_k.kt      |   4 +-
 .../services/DanaRKoreanExecutionService.java |  12 +--
 .../plugins/pump/danaRv2/DanaRv2Plugin.java   |   2 +-
 .../pump/danaRv2/comm/MessageHashTableRv2.kt  |   4 +-
 .../pump/danaRv2/comm/MsgCheckValue_v2.kt     |   6 +-
 .../pump/danaRv2/comm/MsgHistoryEvents_v2.kt  |  30 +++----
 .../pump/danaRv2/comm/MsgStatusAPS_v2.kt      |   4 +-
 .../danaRv2/comm/MsgStatusBolusExtended_v2.kt |   4 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2.kt     |   4 +-
 .../services/DanaRv2ExecutionService.java     |   4 +-
 .../comm/DanaRSMessageHashTableTest.kt        |   8 +-
 .../danaRS => danars}/comm/DanaRSTestBase.kt  |   8 +-
 ...acket_APS_Basal_Set_Temporary_BasalTest.kt |   2 +-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |   4 +-
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |  14 ++--
 .../DanaRS_Packet_Basal_Get_Basal_RateTest.kt |   2 +-
 ...Packet_Basal_Get_Profile_Basal_RateTest.kt |   2 +-
 ...aRS_Packet_Basal_Get_Profile_NumberTest.kt |   2 +-
 ...ket_Basal_Get_Temporary_Basal_StateTest.kt |   2 +-
 .../DanaRS_Packet_Basal_Set_Basal_RateTest.kt |   2 +-
 ...et_Basal_Set_Cancel_Temporary_BasalTest.kt |   2 +-
 ...Packet_Basal_Set_Profile_Basal_RateTest.kt |   2 +-
 ...aRS_Packet_Basal_Set_Profile_NumberTest.kt |   2 +-
 ...DanaRS_Packet_Basal_Set_Suspend_OffTest.kt |   2 +-
 .../DanaRS_Packet_Basal_Set_Suspend_OnTest.kt |   2 +-
 ...RS_Packet_Basal_Set_Temporary_BasalTest.kt |   3 +-
 ...anaRS_Packet_Bolus_Get_Bolus_OptionTest.kt |   2 +-
 ...anaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt |   6 +-
 ...t_Bolus_Get_Calculation_InformationTest.kt |   2 +-
 ...arbohydrate_Calculation_InformationTest.kt |   2 +-
 .../DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt |   2 +-
 ...aRS_Packet_Bolus_Get_Extended_BolusTest.kt |   2 +-
 ...cket_Bolus_Get_Extended_Bolus_StateTest.kt |   2 +-
 ...olus_Get_Extended_Menu_Option_StateTest.kt |   2 +-
 ...naRS_Packet_Bolus_Get_Initial_BolusTest.kt |   2 +-
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt |   2 +-
 ...anaRS_Packet_Bolus_Set_Bolus_OptionTest.kt |   2 +-
 ...anaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt |   2 +-
 .../DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt |   2 +-
 ...aRS_Packet_Bolus_Set_Extended_BolusTest.kt |   2 +-
 ...ket_Bolus_Set_Extended_Bolus_CancelTest.kt |   2 +-
 ...naRS_Packet_Bolus_Set_Initial_BolusTest.kt |   2 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |   7 +-
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |   4 +-
 .../DanaRS_Packet_Etc_Keep_ConnectionTest.kt  |   2 +-
 .../DanaRS_Packet_Etc_Set_History_SaveTest.kt |   2 +-
 ...naRS_Packet_General_Delivery_StatusTest.kt |   2 +-
 ...Packet_General_Get_More_InformationTest.kt |   2 +-
 .../DanaRS_Packet_General_Get_PasswordTest.kt |   2 +-
 ...anaRS_Packet_General_Get_Pump_CheckTest.kt |   2 +-
 ...et_General_Get_Shipping_InformationTest.kt |   2 +-
 ...Packet_General_Get_Shipping_VerisonTest.kt |   2 +-
 ...et_General_Get_Today_Delivery_TotalTest.kt |   2 +-
 ...t_General_Get_User_Time_Change_FlagTest.kt |   2 +-
 ..._General_Initial_Screen_InformationTest.kt |   2 +-
 ...ket_General_Set_History_Upload_ModeTest.kt |   2 +-
 ...ral_Set_User_Time_Change_Flag_ClearTest.kt |   2 +-
 .../comm/DanaRS_Packet_History_AlarmTest.kt   |  24 ++----
 .../DanaRS_Packet_History_All_HistoryTest.kt  |   2 +-
 .../comm/DanaRS_Packet_History_BasalTest.kt   |   2 +-
 ...DanaRS_Packet_History_Blood_GlucoseTest.kt |   2 +-
 .../comm/DanaRS_Packet_History_BolusTest.kt   |   2 +-
 .../DanaRS_Packet_History_CarbohydrateTest.kt |   2 +-
 .../comm/DanaRS_Packet_History_DailyTest.kt   |   2 +-
 .../comm/DanaRS_Packet_History_PrimeTest.kt   |   2 +-
 .../comm/DanaRS_Packet_History_RefillTest.kt  |   2 +-
 .../comm/DanaRS_Packet_History_SuspendTest.kt |   2 +-
 .../DanaRS_Packet_History_TemporaryTest.kt    |   2 +-
 .../comm/DanaRS_Packet_Notify_AlarmTest.kt    |   6 +-
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |   4 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |   7 +-
 ...RS_Packet_Notify_Missed_Bolus_AlarmTest.kt |   2 +-
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt |   2 +-
 ...anaRS_Packet_Option_Get_User_OptionTest.kt |   2 +-
 .../DanaRS_Packet_Option_Set_Pump_TimeTest.kt |   2 +-
 ...anaRS_Packet_Option_Set_User_OptionTest.kt |   2 +-
 .../DanaRS_Packet_Review_Bolus_AvgTest.kt     |   2 +-
 ...RS_Packet_Review_Get_Pump_Dec_RatioTest.kt |   2 +-
 .../interfaces/ConstraintsCheckerTest.kt      |  18 +++--
 .../plugins/aps/loop/LoopPluginTest.kt        |   8 +-
 .../constraints/safety/SafetyPluginTest.kt    |   4 +-
 .../actions/ActionNotificationTest.kt         |   3 +-
 .../plugins/pump/danaR/DanaRPluginTest.kt     |   4 +-
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  |   6 +-
 .../pump/danaR/comm/MessageHashTableRTest.kt  |   4 +-
 .../pump/danaR/comm/MsgCheckValueTest.kt      |   6 +-
 .../plugins/pump/danaR/comm/MsgErrorTest.kt   |   3 +-
 .../comm/MsgSettingProfileRatiosAllTest.kt    |   4 +-
 .../danaR/comm/MsgSettingProfileRatiosTest.kt |   4 +-
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |   4 +-
 .../danaR/comm/MsgSettingShippingInfoTest.kt  |   4 +-
 .../danaR/comm/MsgSettingUserOptionsTest.kt   |   4 +-
 .../pump/danaR/comm/MsgStatusProfileTest.kt   |   4 +-
 .../pump/danaR/comm/RecordTypesTest.kt        |   2 +-
 .../pump/danaRKorean/DanaRKoreanPluginTest.kt |   6 +-
 .../comm/MessageHashTableRKoreanTest.kt       |   6 +-
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |   6 +-
 .../plugins/pump/danaRv2/DanaRv2PluginTest.kt |   6 +-
 .../danaRv2/comm/MessageHashTable_rv2Test.kt  |   4 +-
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt |   4 +-
 .../comm/MsgSetAPSTempBasalStart_v2Test.kt    |   2 +-
 .../treatments/TreatmentsPluginTest.kt        |  28 +++----
 .../androidaps/db/StaticInjector.kt           |   3 +-
 .../interfaces/DatabaseHelperInterface.kt     |   1 -
 dana/.gitignore                               |   1 +
 dana/build.gradle                             |  74 ++++++++++++++++++
 dana/consumer-rules.pro                       |   0
 dana/proguard-rules.pro                       |  21 +++++
 .../dana/ExampleInstrumentedTest.kt           |  25 ++++++
 dana/src/main/AndroidManifest.xml             |   2 +
 .../androidaps/dana/DanaPumpInterface.kt      |   5 ++
 .../androidaps/dana}/DanaRFragment.kt         |  22 ++----
 .../nightscout/androidaps/dana}/DanaRPump.kt  |   3 +-
 .../dana}/activities/DanaRHistoryActivity.kt  |   6 +-
 .../activities/DanaRUserOptionsActivity.kt    |   6 +-
 .../androidaps/dana}/comm/RecordTypes.kt      |   2 +-
 .../dana}/events/EventDanaRNewStatus.kt       |   2 +-
 .../src/main/res/layout/danar_fragment.xml    |   0
 .../main/res/layout/danar_history_item.xml    |   0
 .../main/res/layout/danar_historyactivity.xml |   0
 .../layout/danar_user_options_activity.xml    |   0
 .../src/main/res/values/strings.xml           |   0
 .../androidaps/dana/ExampleUnitTest.kt        |  18 +++++
 danars/build.gradle                           |   5 +-
 .../pump/danaRS => danars}/DanaRSPlugin.kt    |  25 +++---
 .../activities/BLEScanActivity.kt             |   4 +-
 .../activities/EnterPinActivity.kt            |   6 +-
 .../activities/PairingHelperActivity.kt       |   4 +-
 .../comm/DanaRSMessageHashTable.kt            |   2 +-
 .../danaRS => danars}/comm/DanaRS_Packet.java |   8 +-
 ...RS_Packet_APS_Basal_Set_Temporary_Basal.kt |   4 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  40 +++++-----
 .../DanaRS_Packet_APS_Set_Event_History.kt    |   8 +-
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |   8 +-
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |   8 +-
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |   8 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |   8 +-
 .../DanaRS_Packet_Basal_Set_Basal_Rate.kt     |   4 +-
 ...Packet_Basal_Set_Cancel_Temporary_Basal.kt |   4 +-
 ...aRS_Packet_Basal_Set_Profile_Basal_Rate.kt |   4 +-
 .../DanaRS_Packet_Basal_Set_Profile_Number.kt |   4 +-
 .../DanaRS_Packet_Basal_Set_Suspend_Off.kt    |   4 +-
 .../DanaRS_Packet_Basal_Set_Suspend_On.kt     |   4 +-
 ...DanaRS_Packet_Basal_Set_Temporary_Basal.kt |   4 +-
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |   8 +-
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |  12 +--
 ...acket_Bolus_Get_Calculation_Information.kt |  12 +--
 ...et_Carbohydrate_Calculation_Information.kt |   8 +-
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |   8 +-
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |   8 +-
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |   8 +-
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |   8 +-
 .../DanaRS_Packet_Bolus_Get_Initial_Bolus.kt  |   4 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |   8 +-
 .../DanaRS_Packet_Bolus_Set_Bolus_Option.kt   |   4 +-
 .../DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt   |   4 +-
 .../DanaRS_Packet_Bolus_Set_Dual_Bolus.kt     |   4 +-
 .../DanaRS_Packet_Bolus_Set_Extended_Bolus.kt |   4 +-
 ..._Packet_Bolus_Set_Extended_Bolus_Cancel.kt |   4 +-
 .../DanaRS_Packet_Bolus_Set_Initial_Bolus.kt  |   4 +-
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |   8 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |   8 +-
 .../comm/DanaRS_Packet_Etc_Keep_Connection.kt |   4 +-
 .../DanaRS_Packet_Etc_Set_History_Save.kt     |   4 +-
 .../DanaRS_Packet_General_Delivery_Status.kt  |   4 +-
 ...aRS_Packet_General_Get_More_Information.kt |   8 +-
 .../DanaRS_Packet_General_Get_Password.kt     |   8 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |   8 +-
 ...Packet_General_Get_Shipping_Information.kt |   8 +-
 ...aRS_Packet_General_Get_Shipping_Version.kt |   8 +-
 ...Packet_General_Get_Today_Delivery_Total.kt |   8 +-
 ...acket_General_Get_User_Time_Change_Flag.kt |   4 +-
 ...cket_General_Initial_Screen_Information.kt |  12 +--
 ..._Packet_General_Set_History_Upload_Mode.kt |   4 +-
 ...General_Set_User_Time_Change_Flag_Clear.kt |   4 +-
 .../comm/DanaRS_Packet_History_.kt            |  24 +++---
 .../comm/DanaRS_Packet_History_Alarm.kt       |   4 +-
 .../comm/DanaRS_Packet_History_All_History.kt |   4 +-
 .../comm/DanaRS_Packet_History_Basal.kt       |   4 +-
 .../DanaRS_Packet_History_Blood_Glucose.kt    |   4 +-
 .../comm/DanaRS_Packet_History_Bolus.kt       |   4 +-
 .../DanaRS_Packet_History_Carbohydrate.kt     |   4 +-
 .../comm/DanaRS_Packet_History_Daily.kt       |   4 +-
 .../comm/DanaRS_Packet_History_Prime.kt       |   4 +-
 .../comm/DanaRS_Packet_History_Refill.kt      |   4 +-
 .../comm/DanaRS_Packet_History_Suspend.kt     |   4 +-
 .../comm/DanaRS_Packet_History_Temporary.kt   |   4 +-
 .../comm/DanaRS_Packet_Notify_Alarm.kt        |   4 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |   8 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |   8 +-
 ...DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt |   4 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |   8 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |  10 +--
 .../DanaRS_Packet_Option_Set_Pump_Time.kt     |   4 +-
 .../DanaRS_Packet_Option_Set_User_Option.kt   |   8 +-
 .../comm/DanaRS_Packet_Review_Bolus_Avg.kt    |   4 +-
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |   8 +-
 .../DanaRSActivitiesModule.kt                 |   4 +-
 .../dialogs/PairingProgressDialog.java        |   6 +-
 .../encryption/BleEncryption.java             |   2 +-
 .../events/EventDanaRSDeviceChange.kt         |   2 +-
 .../events/EventDanaRSPairingSuccess.kt       |   2 +-
 .../danaRS => danars}/services/BLEComm.kt     |  24 +++---
 .../services/DanaRSService.kt                 |  40 +++++-----
 .../jniLibs/arm64-v8a/libBleEncryption.so     | Bin 22680 -> 22680 bytes
 .../jniLibs/armeabi-v7a/libBleEncryption.so   | Bin 26448 -> 26448 bytes
 .../src/main/jniLibs/x86/libBleEncryption.so  | Bin 22296 -> 22296 bytes
 .../main/jniLibs/x86_64/libBleEncryption.so   | Bin 22944 -> 22944 bytes
 .../res/layout/danars_blescanner_activity.xml |   2 +-
 settings.gradle                               |   1 +
 267 files changed, 821 insertions(+), 666 deletions(-)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRSMessageHashTableTest.kt (89%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRSTestBase.kt (86%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt (98%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_History_EventsTest.kt (96%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt (80%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt (97%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt (96%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt (90%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt (96%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt (85%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt (97%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt (89%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Delivery_StatusTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_More_InformationTest.kt (97%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_PasswordTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_AlarmTest.kt (69%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_All_HistoryTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_BasalTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_BolusTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_CarbohydrateTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_DailyTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_PrimeTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_RefillTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_SuspendTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_TemporaryTest.kt (93%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_AlarmTest.kt (90%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt (91%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt (96%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt (95%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt (94%)
 rename app/src/test/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt (93%)
 create mode 100644 dana/.gitignore
 create mode 100644 dana/build.gradle
 create mode 100644 dana/consumer-rules.pro
 create mode 100644 dana/proguard-rules.pro
 create mode 100644 dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt
 create mode 100644 dana/src/main/AndroidManifest.xml
 create mode 100644 dana/src/main/java/info/nightscout/androidaps/dana/DanaPumpInterface.kt
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/DanaRFragment.kt (90%)
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/DanaRPump.kt (99%)
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/activities/DanaRHistoryActivity.kt (98%)
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/activities/DanaRUserOptionsActivity.kt (97%)
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/comm/RecordTypes.kt (91%)
 rename {danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => dana/src/main/java/info/nightscout/androidaps/dana}/events/EventDanaRNewStatus.kt (58%)
 rename {danars => dana}/src/main/res/layout/danar_fragment.xml (100%)
 rename {danars => dana}/src/main/res/layout/danar_history_item.xml (100%)
 rename {danars => dana}/src/main/res/layout/danar_historyactivity.xml (100%)
 rename {danars => dana}/src/main/res/layout/danar_user_options_activity.xml (100%)
 rename {danars => dana}/src/main/res/values/strings.xml (100%)
 create mode 100644 dana/src/test/java/info/nightscout/androidaps/dana/ExampleUnitTest.kt
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/DanaRSPlugin.kt (96%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/activities/BLEScanActivity.kt (97%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/activities/EnterPinActivity.kt (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/activities/PairingHelperActivity.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRSMessageHashTable.kt (98%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet.java (96%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt (93%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_History_Events.kt (88%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_APS_Set_Event_History.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt (74%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt (89%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt (89%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt (92%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt (83%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt (89%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt (79%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt (92%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt (91%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt (91%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Etc_Keep_Connection.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Etc_Set_History_Save.kt (92%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Delivery_Status.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_More_Information.kt (88%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Password.kt (79%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Pump_Check.kt (88%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Shipping_Information.kt (84%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Shipping_Version.kt (75%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt (86%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Initial_Screen_Information.kt (88%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt (87%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt (85%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_.kt (86%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Alarm.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_All_History.kt (76%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Basal.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Blood_Glucose.kt (78%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Bolus.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Carbohydrate.kt (78%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Daily.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Prime.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Refill.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Suspend.kt (77%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_History_Temporary.kt (76%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Alarm.kt (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Delivery_Complete.kt (86%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt (86%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt (91%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Get_Pump_Time.kt (86%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Get_User_Option.kt (92%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Set_Pump_Time.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Option_Set_User_Option.kt (90%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Review_Bolus_Avg.kt (92%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt (73%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/dialogs/PairingProgressDialog.java (95%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/encryption/BleEncryption.java (99%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/events/EventDanaRSDeviceChange.kt (58%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/events/EventDanaRSPairingSuccess.kt (59%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/services/BLEComm.kt (97%)
 rename danars/src/main/java/info/nightscout/androidaps/{plugins/pump/danaRS => danars}/services/DanaRSService.kt (91%)

diff --git a/app/build.gradle b/app/build.gradle
index aaeac79c7e..4bf7ed83e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -242,6 +242,7 @@ dependencies {
     wearApp project(':wear')
 
     implementation project(':core')
+    implementation project(':dana')
     implementation project(':danars')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0cc562041..59f2a2d054 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,8 +64,8 @@
         <activity
             android:name=".activities.ErrorHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity android:name=".plugins.pump.danaR.activities.DanaRHistoryActivity" />
-        <activity android:name=".plugins.pump.danaR.activities.DanaRUserOptionsActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaRHistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity" />
         <activity android:name=".activities.TDDStatsActivity" />
         <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
             <intent-filter>
@@ -74,7 +74,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".plugins.pump.danaRS.activities.BLEScanActivity">
+        <activity android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
 
@@ -82,9 +82,9 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".plugins.pump.danaRS.activities.PairingHelperActivity"
+            android:name="info.nightscout.androidaps.danars.activities.PairingHelperActivity"
             android:launchMode="singleTask" />
-        <activity android:name=".plugins.pump.danaRS.activities.EnterPinActivity"
+        <activity android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
             android:launchMode="singleTask" />
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
@@ -166,7 +166,7 @@
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.pump.danaRS.services.DanaRSService"
+            android:name="info.nightscout.androidaps.danars.services.DanaRSService"
             android:enabled="true"
             android:exported="true" />
         <service
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index f7872853f5..7260a0da2d 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -37,7 +37,7 @@ import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index b5e5c89819..06fe0edb0d 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -31,6 +31,7 @@ import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.ProfileStore;
@@ -52,7 +53,6 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightPumpID;
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index dbfd40c33d..3979531280 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -12,9 +12,9 @@ import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizar
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivity
+import info.nightscout.androidaps.dana.activities.DanaRHistoryActivity
+import info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity
+import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
@@ -26,8 +26,8 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 abstract class ActivitiesModule {
 
     @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): info.nightscout.androidaps.dana.activities.DanaRHistoryActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity
     @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
index fa915f8246..9c6f172262 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.*
+import info.nightscout.androidaps.danars.comm.*
 
 @Module
 @Suppress("unused")
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 8748891d07..9fbfbc6307 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -34,8 +34,8 @@ import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
-import info.nightscout.androidaps.plugins.pump.danaRS.dialogs.PairingProgressDialog
+import info.nightscout.androidaps.dana.DanaRFragment
+import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
@@ -61,7 +61,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector
     abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
 
-    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaRFragment
+    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): info.nightscout.androidaps.dana.DanaRFragment
     @ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
     @ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
     @ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index e7b1903389..8df9748d27 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -36,7 +36,7 @@ import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index 25d102e3ef..27f9cf5cf1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService
 import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService
 import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService
-import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService
+import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index 8aed0f5288..402c9a58ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -24,9 +24,9 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
@@ -65,7 +65,7 @@ class ActionStringHandler @Inject constructor(
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
     private val danaRSPlugin: DanaRSPlugin,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val hardLimits: HardLimits,
     private val carbsGenerator: CarbsGenerator,
     private val dateUtil: DateUtil,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
index 3e0a853dc5..1f314d143c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
@@ -9,8 +9,11 @@ import java.util.Date;
 import java.util.List;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaPumpInterface;
+import info.nightscout.androidaps.dana.DanaRFragment;
+import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
@@ -36,7 +39,6 @@ import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -52,7 +54,7 @@ import io.reactivex.schedulers.Schedulers;
  * Created by mike on 28.01.2018.
  */
 
-public abstract class AbstractDanaRPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface {
+public abstract class AbstractDanaRPlugin extends PumpPluginBase implements PumpInterface, DanaRInterface, ConstraintsInterface, DanaPumpInterface {
     protected AbstractDanaRExecutionService sExecutionService;
 
     protected CompositeDisposable disposable = new CompositeDisposable();
@@ -521,4 +523,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     @Override
     public void timezoneOrDSTChanged(TimeChangeType timeChangeType) {
     }
+
+    @Override public void clearPairing() {
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
index aae520eb06..1ebd144b40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
@@ -13,6 +13,7 @@ import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
index 4b49d652a2..60c38b2f66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
index 630bb9ecad..518285ce65 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -23,7 +23,7 @@ class MessageHashTableR @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     configBuilderPlugin: ConfigBuilderPlugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
index b83da483fe..0b15befcfd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
@@ -13,7 +13,7 @@ class MsgBolusProgress(
     private val aapsLogger: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val rxBus: RxBusWrapper,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
index 320d8b85d3..306ee71097 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
@@ -4,12 +4,12 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgBolusStart(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private var amount: Double
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
index 2925172735..85cf6341c8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
@@ -4,12 +4,12 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgBolusStartWithSpeed(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private var amount: Double,
     speed: Int
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
index 3d4fade70d..7b3195e4a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
@@ -5,14 +5,14 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgBolusStop(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
index f573ef0475..6170acf78d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgCheckValue(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
@@ -22,7 +22,7 @@ class MsgCheckValue(
         danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL) {
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
index 08d4c57324..f44de7442b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
@@ -6,14 +6,14 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgError(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val nsUpload: NSUpload
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
index 26f48639d2..5ed2b212b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
@@ -36,7 +36,7 @@ open class MsgHistoryAll(
         danaRHistoryRecord.setBytes(bytes)
         var messageType = ""
         when (recordCode) {
-            RecordTypes.RECORD_TYPE_BOLUS     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS     -> {
                 danaRHistoryRecord.recordDate = datetime
                 when (0xF0 and paramByte8.toInt()) {
                     0xA0 -> {
@@ -65,56 +65,56 @@ open class MsgHistoryAll(
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_DAILY     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY     -> {
                 messageType += "dailyinsulin"
                 danaRHistoryRecord.recordDate = date
                 danaRHistoryRecord.recordDailyBasal = dailyBasal
                 danaRHistoryRecord.recordDailyBolus = dailyBolus
             }
 
-            RecordTypes.RECORD_TYPE_PRIME     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_PRIME     -> {
                 messageType += "prime"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_ERROR     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ERROR     -> {
                 messageType += "error"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_REFILL    -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_REFILL    -> {
                 messageType += "refill"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_BASALHOUR -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BASALHOUR -> {
                 messageType += "basal hour"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_TB        -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_TB        -> {
                 messageType += "tb"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_GLUCOSE   -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_GLUCOSE   -> {
                 messageType += "glucose"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value
             }
 
-            RecordTypes.RECORD_TYPE_CARBO     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO     -> {
                 messageType += "carbo"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value
             }
 
-            RecordTypes.RECORD_TYPE_ALARM     -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM     -> {
                 messageType += "alarm"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 var strAlarm = "None"
@@ -128,7 +128,7 @@ open class MsgHistoryAll(
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
-            RecordTypes.RECORD_TYPE_SUSPEND   -> {
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_SUSPEND   -> {
                 messageType += "suspend"
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 var strRecordValue = "Off"
@@ -136,7 +136,7 @@ open class MsgHistoryAll(
                 danaRHistoryRecord.stringRecordValue = strRecordValue
             }
 
-            17.toByte()                                                                                             -> failed = true
+            17.toByte()                                                            -> failed = true
         }
         MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
         rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
index bd5d634423..5caff7d6e9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryAllDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
index 203b5f71d7..f0c3ba1170 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
index e6d292d54e..b71179342a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryNewDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
index f91042282e..be6ea26f4b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgInitConnStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
@@ -33,10 +33,10 @@ class MsgInitConnStatusBasic(
         val extendedBolusRate = intFromBuff(bytes, 18, 2) / 100.0
         danaRPump.batteryRemaining = intFromBuff(bytes, 20, 1)
         val bolusConfig = intFromBuff(bytes, 21, 1)
-        val deliveryPrime = bolusConfig and DanaRPump.DELIVERY_PRIME != 0
-        val deliveryStepBolus = bolusConfig and DanaRPump.DELIVERY_STEP_BOLUS != 0
-        val deliveryBasal = bolusConfig and DanaRPump.DELIVERY_BASAL != 0
-        val deliveryExtBolus = bolusConfig and DanaRPump.DELIVERY_EXT_BOLUS != 0
+        val deliveryPrime = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_PRIME != 0
+        val deliveryStepBolus = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_STEP_BOLUS != 0
+        val deliveryBasal = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_BASAL != 0
+        val deliveryExtBolus = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_EXT_BOLUS != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery prime: $deliveryPrime")
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery step bolus: $deliveryStepBolus")
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery basal: $deliveryBasal")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
index 580df8e133..9bd09848d7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
@@ -7,14 +7,14 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
index ee1d26ce3f..9b7ce29bea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
@@ -8,14 +8,14 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusOption(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
index 7d1ded9f8f..dd0a975726 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -20,7 +20,7 @@ class MsgInitConnStatusTime(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderPlugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
index 0e62c0d625..03fcfbca6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
@@ -15,7 +15,7 @@ class MsgSetCarbsEntry(
         aapsLogger.debug(LTag.PUMPBTCOMM, "New message")
         val calendar = Calendar.getInstance()
         calendar.timeInMillis = time
-        AddParamByte(RecordTypes.RECORD_TYPE_CARBO)
+        AddParamByte(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO)
         AddParamByte((calendar[Calendar.YEAR] % 100).toByte())
         AddParamByte((calendar[Calendar.MONTH] + 1).toByte())
         AddParamByte(calendar[Calendar.DAY_OF_MONTH].toByte())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
index f2a579fd72..8a69890dd4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSetUserOptions(
     private val aapsLogger: AAPSLogger,
-    danaRPump: DanaRPump
+    danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
index 4da6770031..1319874016 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingActiveProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
index 256063ced1..1f06d35217 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
@@ -3,12 +3,12 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import java.util.*
 
 class MsgSettingBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
index c0270a29dd..3e3eb03a5a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import java.util.*
 
 /**
@@ -15,7 +15,7 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     override fun handleMessage(bytes: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
index a4cad21293..86f3be273e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 /**
  * Created by mike on 05.07.2016.
  */
 class MsgSettingGlucose(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
@@ -20,7 +20,7 @@ class MsgSettingGlucose(
     override fun handleMessage(bytes: ByteArray) {
         danaRPump.units = intFromBuff(bytes, 0, 1)
         danaRPump.easyBasalMode = intFromBuff(bytes, 1, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaRPump.easyBasalMode)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
index 437af793f8..f637e28842 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingMaxValues(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
index df40a71cf1..8f0dfa15c4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -16,7 +16,7 @@ class MsgSettingMeal(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
index 6c29024677..609ce479f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingProfileRatios(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
@@ -15,7 +15,7 @@ class MsgSettingProfileRatios(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
             danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -28,7 +28,7 @@ class MsgSettingProfileRatios(
             danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
             danaRPump.currentAIDR = intFromBuff(bytes, 8, 1)
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
index 4f626e89df..201625bb66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingProfileRatiosAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
@@ -15,7 +15,7 @@ class MsgSettingProfileRatiosAll(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
             danaRPump.morningCIR = intFromBuff(bytes, 0, 2)
             danaRPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
             danaRPump.afternoonCIR = intFromBuff(bytes, 4, 2)
@@ -34,7 +34,7 @@ class MsgSettingProfileRatiosAll(
             danaRPump.nightCIR = intFromBuff(bytes, 12, 2)
             danaRPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
index 2d2f665043..0bfec34561 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
 import java.util.*
 
 class MsgSettingPumpTime(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
index 7d442e00d6..cde068bfd8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingShippingInfo(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
index 3678424499..eea5a9a7d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import java.util.*
 
 class MsgSettingUserOptions(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
index e37ad1ebb6..e0f611b06c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatus(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
index 97b485eead..5eabda782a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
index b7151d8add..d96915d170 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
@@ -6,14 +6,14 @@ import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val activePlugin: ActivePluginProvider,
     private val dateUtil: DateUtil
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
index e8bd43012b..678ee859ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatusProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
@@ -15,7 +15,7 @@ class MsgStatusProfile(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
             danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -26,7 +26,7 @@ class MsgStatusProfile(
             danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
             danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
index 67b865bed5..aa30e615f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
@@ -6,12 +6,12 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import kotlin.math.ceil
 
 class MsgStatusTempBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
index b6b707381f..3b77c9723e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
@@ -17,6 +17,8 @@ import javax.inject.Inject;
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.events.EventAppExit;
@@ -25,7 +27,6 @@ import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryAlarm;
@@ -39,7 +40,6 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryRefill;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistorySuspend;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
index 2a357761f5..d32383bef4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.services;
 
-import android.content.Context;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -12,6 +11,8 @@ import javax.inject.Inject;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
@@ -25,14 +26,12 @@ import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableR;
@@ -62,7 +61,6 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
@@ -77,9 +75,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     @Inject DanaRPump danaRPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject ConfigBuilderPlugin configBuilderPlugin;
     @Inject CommandQueueProvider commandQueue;
-    @Inject Context context;
     @Inject MessageHashTableR messageHashTableR;
     @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
index ad079c06ce..01b70b63aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
@@ -13,6 +13,7 @@ import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -29,7 +30,6 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
index 67ce3eb6b4..04a2c45ccd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.*
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -24,7 +24,7 @@ class MessageHashTableRKorean @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     configBuilderPlugin: ConfigBuilderPlugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
index 1742c4b1dd..90c5324be9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 
 class MsgCheckValue_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 
 ) : MessageBase() {
@@ -24,7 +24,7 @@ class MsgCheckValue_k(
         danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != DanaRPump.DOMESTIC_MODEL) {
+        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.DOMESTIC_MODEL) {
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index 89a083f34a..e2496e9d55 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -15,7 +15,7 @@ class MsgInitConnStatusBasic_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index f59778fa8f..f99fbb1cd2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -16,7 +16,7 @@ class MsgInitConnStatusBolus_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index 78575809a3..8f1c9a56d9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -21,7 +21,7 @@ class MsgInitConnStatusTime_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderPlugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 9f33c81dbe..0c1b3475b9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import java.util.*
 
@@ -16,7 +16,7 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
index 13b29aba9c..cbb46fa0be 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import java.util.*
 
 class MsgSettingBasal_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
index 8f08587c5c..6d3b8660f1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
 class MsgStatusBasic_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
index bef2e8a926..b4c2c68870 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
 class MsgStatus_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
index d8da9b78c2..1e06b7a1de 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.services;
 
-import android.content.Context;
 import android.os.Binder;
 import android.os.SystemClock;
 
@@ -11,25 +10,26 @@ import javax.inject.Inject;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.dialogs.BolusProgressDialog;
 import info.nightscout.androidaps.events.EventInitializationChanged;
 import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
@@ -48,14 +48,12 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTableRKorean;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.T;
@@ -69,9 +67,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject DanaRPump danaRPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
-    @Inject ConfigBuilderPlugin configBuilderPlugin;
     @Inject CommandQueueProvider commandQueue;
-    @Inject Context context;
     @Inject MessageHashTableRKorean messageHashTableRKorean;
     @Inject ActivePluginProvider activePlugin;
     @Inject ProfileFunction profileFunction;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
index 992819a136..b7e03ec67e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
@@ -13,6 +13,7 @@ import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -27,7 +28,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
index 836de3d6cc..a5896b5a4c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.*
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
@@ -27,7 +27,7 @@ class MessageHashTableRv2 @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     danaRv2Plugin: DanaRv2Plugin,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
index 7d0b2b5e53..8f0ab31d36 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
@@ -21,7 +21,7 @@ class MsgCheckValue_v2(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
@@ -41,7 +41,7 @@ class MsgCheckValue_v2(
         danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL) {
             danaRPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
index 7b11695910..8b1bbf6e15 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
@@ -74,7 +74,7 @@ class MsgHistoryEvents_v2 constructor(
             .pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            DanaRPump.TEMPSTART         -> {
+            info.nightscout.androidaps.dana.DanaRPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -82,13 +82,13 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.TEMPSTOP          -> {
+            info.nightscout.androidaps.dana.DanaRPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.EXTENDEDSTART     -> {
+            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -96,13 +96,13 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.EXTENDEDSTOP      -> {
+            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.BOLUS             -> {
+            info.nightscout.androidaps.dana.DanaRPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -114,7 +114,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALBOLUS         -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -126,7 +126,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALEXTENDEDSTART -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -134,38 +134,38 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALEXTENDEDSTOP  -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.SUSPENDON         -> {
+            info.nightscout.androidaps.dana.DanaRPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.SUSPENDOFF        -> {
+            info.nightscout.androidaps.dana.DanaRPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.REFILL            -> {
+            info.nightscout.androidaps.dana.DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.PRIME             -> {
+            info.nightscout.androidaps.dana.DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.PROFILECHANGE     -> {
+            info.nightscout.androidaps.dana.DanaRPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.CARBS             -> {
+            info.nightscout.androidaps.dana.DanaRPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
index 1821c17321..f3ff2d1afd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
 class MsgStatusAPS_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
index b769b8a8f8..bef75168a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
index e4668fcd2b..ce13522cc8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
index f072d3a8e1..e3a88158b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
@@ -14,6 +14,8 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
+import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
@@ -36,7 +38,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
 import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
@@ -62,7 +63,6 @@ import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingUserOptions;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
index 4ad7df5359..c3a29d7891 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
@@ -6,8 +6,8 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,7 +47,7 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, 0, 0, 0)
+        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
similarity index 86%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
index 1d82f58369..c12d651eea 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
@@ -1,10 +1,10 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
@@ -24,7 +24,7 @@ open class DanaRSTestBase : TestBaseWithProfile() {
         }
     }
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
@@ -55,6 +55,6 @@ open class DanaRSTestBase : TestBaseWithProfile() {
 
     @Before
     fun setup() {
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
similarity index 98%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
index 8672867161..ae09fe8315 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
similarity index 96%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 20aaa5591d..dc4447fc22 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import android.content.Context
 import dagger.android.AndroidInjector
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
similarity index 80%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index 36146b4ca9..d38ee929b1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Test
@@ -27,23 +27,23 @@ class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() { // test for negative carbs
         val now = DateUtil.now()
-        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, -1, 0)
+        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, -1, 0)
         var testparams = historyTest.requestParams
         Assert.assertEquals(0.toByte(), testparams[8])
         // 5g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         // 150g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 150, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 150, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(150.toByte(), testparams[8])
         // test message generation
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         Assert.assertEquals(11, testparams.size)
-        Assert.assertEquals(DanaRPump.CARBS.toByte(), testparams[0])
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.CARBS.toByte(), testparams[0])
         // test message decoding
         historyTest.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, historyTest.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
index aa79c64b03..98a92ddaef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
index 7cc2d5cb5c..6bce045a98 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
index 458370fdc5..7f53f69b19 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
similarity index 96%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
index 56e308fc1f..57790f279c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
index 58d89e6220..84450ababc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_RateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
index a48dc769eb..2cc549c533 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_BasalTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
index 035387ac85..fcf254887f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_RateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
index a39c2efde9..2e7a720970 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_NumberTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
index 50ce4c0c35..24abfb3538 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OffTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
index 3665cd96b1..f0791ef578 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_OnTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
index 6fccfdcb81..841f2b8a24 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_BasalTest.kt
@@ -1,11 +1,10 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
similarity index 96%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
index ac17776c70..6840435153 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
similarity index 85%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
index 997014a92b..0d97178ae9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -27,7 +27,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // are pump units MG/DL ???
-        Assert.assertEquals(DanaRPump.UNITS_MGDL, danaRPump.units)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL, danaRPump.units)
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(34, 3.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
index f09c01657f..d83edb311d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
index effd2fa235..b04fbd9dfb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
index 19ade4619b..4f745638de 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
index 3d54ad98bc..b615090ac5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
index 1e2af1ae1e..50326edff1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
index c489cc6677..f78c827ff2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
index 6976effbdb..0bd7db33a3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index 9d250d8872..35c7928f24 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
index b4bfc7018a..7fa66dbe43 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_OptionTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
index b749f9fb99..925dd1731b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_ArrayTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
index 2aeba32298..5ae468084e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
index 55f3620850..aa3eb950d6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
index 2f0615f9c2..3d836828d9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_CancelTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
index 1fb3c6928d..dee94531fc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
similarity index 89%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index b69ffe2ee3..4da17b3646 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -1,13 +1,14 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -54,7 +55,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index 0b68225a54..03c42168dc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
index 1a8b2e6fbc..8316314b5e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_ConnectionTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
index cb82f0b277..e69ff881fb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_SaveTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
index 6515062bb0..03f46ecb5b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_StatusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index 7d93a60dbd..df2503b270 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
index eac2fc9127..9f410bc69e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_PasswordTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
index ed6a23541f..c9b9269cbc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index f9247b152b..eb40c21843 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
index 7aef230f52..88b9eb5afa 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
index 8c2092a425..b24b19f5ea 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
index 2dc51fb3af..69cada9822 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_FlagTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
index 9f878e0be1..9a8e5a588a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
index b0e0867b4c..4e88396e27 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_ModeTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
index 2ee55972da..20b312641a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_ClearTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_AlarmTest.kt
similarity index 69%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_AlarmTest.kt
index 7b64daa632..3f4c681beb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_AlarmTest.kt
@@ -1,32 +1,21 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.db.DatabaseHelper
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import org.junit.Assert
-import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(MainApp::class)
 class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
 
-    @Mock lateinit var databaseHelper: DatabaseHelper
-
-    @Before
-    fun mock() {
-        PowerMockito.mockStatic(MainApp::class.java)
-        `when`(MainApp.getDbHelper()).thenReturn(databaseHelper)
-    }
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
+    @Mock lateinit var nsUpload: NSUpload
 
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
@@ -36,6 +25,7 @@ class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
             }
             if (it is DanaRS_Packet_History_Alarm) {
                 it.rxBus = rxBus
+                it.databaseHelper = databaseHelper
             }
         }
     }
@@ -57,7 +47,7 @@ class DanaRS_Packet_History_AlarmTest : DanaRSTestBase() {
         putByteToArray(array, 9, 100) // value
 
         packet.handleMessage(array)
-        Assert.assertEquals(RecordTypes.RECORD_TYPE_ALARM, packet.danaRHistoryRecord.recordCode)
+        Assert.assertEquals(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM, packet.danaRHistoryRecord.recordCode)
         Assert.assertEquals(Date(119, 1, 4, 20, 11, 35).time, packet.danaRHistoryRecord.recordDate)
         Assert.assertEquals("Occlusion", packet.danaRHistoryRecord.recordAlarm)
         Assert.assertEquals(3.56, packet.danaRHistoryRecord.recordValue, 0.01)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_HistoryTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_HistoryTest.kt
index 6913ec5da1..8e2558f0e2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_HistoryTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BasalTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BasalTest.kt
index 227e305eba..f0ab651b9e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BasalTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
index 9c1474ebe2..df83c63baa 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_GlucoseTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BolusTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BolusTest.kt
index 202f52d0be..e2bc27ae88 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_BolusTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_CarbohydrateTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_CarbohydrateTest.kt
index 93d40faac9..6a9aa52189 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_CarbohydrateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_CarbohydrateTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_DailyTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_DailyTest.kt
index 00b407f32a..85719ce40d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_DailyTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_DailyTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_PrimeTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_PrimeTest.kt
index 59ed19ac48..f06f0605b9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_PrimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_PrimeTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_RefillTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_RefillTest.kt
index 832d52f6e6..fcbc0a182c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_RefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_RefillTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_SuspendTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_SuspendTest.kt
index f1f612fe13..e6de597869 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_SuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_SuspendTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_TemporaryTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_TemporaryTest.kt
index 0a74282ddd..9064a8d3b4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_TemporaryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_TemporaryTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_AlarmTest.kt
similarity index 90%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_AlarmTest.kt
index f10bb50efd..04df7d84f9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_AlarmTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
@@ -7,6 +7,7 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mock
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,12 +16,15 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(NSUpload::class)
 class DanaRS_Packet_Notify_AlarmTest : DanaRSTestBase() {
 
+    @Mock lateinit var nsUpload: NSUpload
+
     private val packetInjector = HasAndroidInjector {
         AndroidInjector {
             if (it is DanaRS_Packet_Notify_Alarm) {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
+                it.nsUpload = nsUpload
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index 9e437107b1..c80419e165 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
similarity index 91%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index d015035113..28ff206b5e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -1,15 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -67,7 +68,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
         danaRPump.bolusingTreatment = Treatment(packetInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
index 9eae04dbec..164720f011 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_AlarmTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 1c64b0d82a..b0a2f04ec1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
index 4412f5b1fb..9adab432df 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
similarity index 96%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
index 67a9eed70d..b67447884e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_TimeTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
similarity index 95%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
index 6f53976045..ab0238d448 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
similarity index 94%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
index 2842e99c74..5b5e179f7d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_AvgTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
similarity index 93%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
rename to app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
index 9c5a6f824c..615ed0da72 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 7f5806e962..30ac7a766c 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -14,12 +14,14 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugin
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -57,9 +59,11 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var glimpPlugin: GlimpPlugin
     @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
     @Mock lateinit var profiler: Profiler
+    @Mock lateinit var nsUpload: NSUpload
+    @Mock lateinit var uploadQueue: UploadQueue
 
     private var buildHelper = BuildHelper(Config())
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     lateinit var constraintChecker: ConstraintChecker
     private lateinit var safetyPlugin: SafetyPlugin
@@ -109,13 +113,13 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         constraintChecker = ConstraintChecker(activePlugin)
 
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, context, Config(), dateUtil)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
index 28fb3668da..7d35e2f1b2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt
@@ -9,10 +9,11 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PluginType
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
@@ -49,6 +50,7 @@ class LoopPluginTest : TestBase() {
     @Mock lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
     @Mock lateinit var fabricPrivacy: FabricPrivacy
     @Mock lateinit var receiverStatusStore: ReceiverStatusStore
+    @Mock lateinit var nsUpload: NSUpload
 
     private lateinit var hardLimits: HardLimits
 
@@ -56,9 +58,9 @@ class LoopPluginTest : TestBase() {
 
     val injector = HasAndroidInjector { AndroidInjector { } }
     @Before fun prepareMock() {
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
 
-        loopPlugin = LoopPlugin(injector, aapsLogger, rxBus, sp, constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, treatmentsPlugin, virtualPumpPlugin, actionStringHandler, iobCobCalculatorPlugin, receiverStatusStore, fabricPrivacy, hardLimits)
+        loopPlugin = LoopPlugin(injector, aapsLogger, rxBus, sp, constraintChecker, resourceHelper, profileFunction, context, commandQueue, activePlugin, treatmentsPlugin, virtualPumpPlugin, actionStringHandler, iobCobCalculatorPlugin, receiverStatusStore, fabricPrivacy, nsUpload, hardLimits)
         `when`(activePlugin.getActivePump()).thenReturn(virtualPumpPlugin)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
index 20474af664..4f85fb9b02 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPluginTest.kt
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.interfaces.PumpDescription
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.GlimpPlugin
@@ -42,6 +43,7 @@ class SafetyPluginTest : TestBaseWithProfile() {
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var glimpPlugin: GlimpPlugin
     @Mock lateinit var context: Context
+    @Mock lateinit var nsUpload: NSUpload
 
     private lateinit var hardLimits: HardLimits
     private lateinit var safetyPlugin: SafetyPlugin
@@ -73,7 +75,7 @@ class SafetyPluginTest : TestBaseWithProfile() {
 
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription)
-        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context)
+        hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
index a2422d44d8..06307d2347 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt
@@ -5,7 +5,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
@@ -29,6 +28,7 @@ class ActionNotificationTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var rxBus: RxBusWrapper
+    @Mock lateinit var nsUpload: NSUpload
 
     private lateinit var sut: ActionNotification
     var injector: HasAndroidInjector = HasAndroidInjector {
@@ -36,6 +36,7 @@ class ActionNotificationTest : TestBase() {
             if (it is ActionNotification) {
                 it.resourceHelper = resourceHelper
                 it.rxBus = rxBus
+                it.nsUpload = nsUpload
             }
             if (it is PumpEnactResult) {
                 it.aapsLogger = aapsLogger
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index 0880445d72..f7fb9ac936 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -29,7 +29,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     private lateinit var danaRPlugin: DanaRPlugin
 
@@ -43,7 +43,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index e2d094de22..2a46bd697c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
@@ -30,7 +30,7 @@ open class DanaRTestBase : TestBase() {
         }
     }
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
@@ -61,6 +61,6 @@ open class DanaRTestBase : TestBase() {
 
     @Before
     fun setup() {
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index efd97bea09..b17f8efc8d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -6,6 +6,7 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
@@ -33,10 +34,11 @@ class MessageHashTableRTest : DanaRTestBase() {
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var nsUpload: NSUpload
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, injector, dateUtil)
+        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, dateUtil)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index 2b5058241d..d6b43ff775 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -18,8 +18,8 @@ class MsgCheckValueTest : DanaRTestBase() {
 
         // test message decoding
         val array = ByteArray(100)
-        putByteToArray(array, 0, DanaRPump.EXPORT_MODEL.toByte())
+        putByteToArray(array, 0, info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index 2c372c4c21..d03dbf6f20 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -16,11 +16,12 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgErrorTest : DanaRTestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var nsUpload: NSUpload
     val rxBus = RxBusWrapper()
 
     @Test fun runTest() {
         PowerMockito.mockStatic(NSUpload::class.java)
-        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaRPump)
+        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index be2f65f3ad..c263cf9134 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingProfileRatiosAll(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.morningCIR)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index 080aef2a8d..f33f608b56 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ class MsgSettingProfileRatiosTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingProfileRatios(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 28b69b98ef..8b5c462142 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,7 +12,7 @@ class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         val bytes = createArray(34, 7.toByte())
         val time = Date(
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index 7f9e2ea6c3..8001eec0df 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ class MsgSettingShippingInfoTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingShippingInfo(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaRPump.serialNumber)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index 2be556b1e1..0d1b936aef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingUserOptions(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(48, 7.toByte()))
         Assert.assertEquals(7, danaRPump.lcdOnTimeSec)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index 4af9c12894..bb9fa76163 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +11,7 @@ class MsgStatusProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgStatusProfile(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt
index 51f06e7ec9..c67d8c0b52 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypesTest.kt
@@ -6,6 +6,6 @@ import org.junit.Test
 class RecordTypesTest {
 
     @Test fun runTest() {
-        Assert.assertEquals(1.toByte(), RecordTypes.RECORD_TYPE_BOLUS)
+        Assert.assertEquals(1.toByte(), info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index e35a45ed1f..defc719499 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
@@ -30,7 +30,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     private lateinit var danaRPlugin: DanaRKoreanPlugin
 
@@ -44,7 +44,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
         danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, dateUtil)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 94df6cc4fe..eb5660a162 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -1,14 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
+import info.nightscout.androidaps.danars.comm.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -28,10 +29,11 @@ class MessageHashTableRKoreanTest : DanaRSTestBase() {
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var nsUpload: NSUpload
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, injector)
+        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index effe08b5f8..371df0b44c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -3,15 +3,17 @@ package info.nightscout.androidaps.plugins.pump.danaRS
 import android.content.Context
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.danars.comm.DanaRSTestBase
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -63,6 +65,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, treatmentsPlugin, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index 1c7a6083b5..28e45ef20f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -30,7 +30,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     private lateinit var danaRv2Plugin: DanaRv2Plugin
 
@@ -44,7 +44,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
         danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, detailedBolusInfoStorage, dateUtil)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index b497e88b95..28d07d33d9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
@@ -40,11 +41,12 @@ class MessageHashTable_rv2Test : DanaRTestBase() {
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+    @Mock lateinit var nsUpload: NSUpload
 
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin, injector, DateUtil(context, resourceHelper))
+        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin, nsUpload, injector, DateUtil(context, resourceHelper))
         val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaRPump)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index dd199a9f46..cc064d48b6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -4,7 +4,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
@@ -33,6 +33,6 @@ class MsgCheckValue_v2Test : DanaRTestBase() {
         val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
index 92ea976697..901596d7ff 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase.intFromBuff
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
+import info.nightscout.androidaps.danars.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
index f36a10ec7e..e0d17cc4ac 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefRapidActingPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -19,7 +19,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
 import org.mockito.Mock
-import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
@@ -33,6 +32,7 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var databaseHelper: DatabaseHelper
     @Mock lateinit var treatmentService: TreatmentService
+    @Mock lateinit var nsUpload: NSUpload
 
     val injector = HasAndroidInjector {
         AndroidInjector {
@@ -58,18 +58,18 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
         `when`(profileFunction.getProfile(ArgumentMatchers.anyLong())).thenReturn(validProfile)
         `when`(activePluginProvider.activeInsulin).thenReturn(insulinOrefRapidActingPlugin)
 
-        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, resourceHelper, context, sp, profileFunction, activePluginProvider, fabricPrivacy, dateUtil)
+        sot = TreatmentsPlugin(profileInjector, aapsLogger, rxBus, resourceHelper, context, sp, profileFunction, activePluginProvider, nsUpload, fabricPrivacy, dateUtil)
         sot.service = treatmentService
     }
 
     @Test
     fun `zero TBR should produce zero absolute insulin`() {
         val now = DateUtil.now()
-        val tbrs : MutableList<TemporaryBasal> = ArrayList()
-        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30). msecs()).duration(10000).percent(0))
+        val tbrs: MutableList<TemporaryBasal> = ArrayList()
+        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30).msecs()).duration(10000).percent(0))
 
         `when`(databaseHelper.getTemporaryBasalsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(tbrs)
-        sot.initializeData(T.hours(30). msecs())
+        sot.initializeData(T.hours(30).msecs())
         val iob = sot.getAbsoluteIOBTempBasals(now)
         Assert.assertEquals(0.0, iob.iob, 0.0)
     }
@@ -77,13 +77,13 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
     @Test
     fun `90% TBR and should produce less absolute insulin`() {
         val now = DateUtil.now()
-        val tbrs : MutableList<TemporaryBasal> = ArrayList()
+        val tbrs: MutableList<TemporaryBasal> = ArrayList()
         `when`(databaseHelper.getTemporaryBasalsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(tbrs)
-        sot.initializeData(T.hours(30). msecs())
+        sot.initializeData(T.hours(30).msecs())
         val iob100pct = sot.getAbsoluteIOBTempBasals(now)
 
-        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30). msecs()).duration(10000).percent(90))
-        sot.initializeData(T.hours(30). msecs())
+        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30).msecs()).duration(10000).percent(90))
+        sot.initializeData(T.hours(30).msecs())
         val iob90pct = sot.getAbsoluteIOBTempBasals(now)
         Assert.assertTrue(iob100pct.iob > iob90pct.iob)
     }
@@ -91,13 +91,13 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
     @Test
     fun `110% TBR and should produce 10% more absolute insulin`() {
         val now = DateUtil.now()
-        val tbrs : MutableList<TemporaryBasal> = ArrayList()
+        val tbrs: MutableList<TemporaryBasal> = ArrayList()
         `when`(databaseHelper.getTemporaryBasalsDataFromTime(ArgumentMatchers.anyLong(), ArgumentMatchers.anyBoolean())).thenReturn(tbrs)
-        sot.initializeData(T.hours(30). msecs())
+        sot.initializeData(T.hours(30).msecs())
         val iob100pct = sot.getAbsoluteIOBTempBasals(now)
 
-        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30). msecs()).duration(10000).percent(110))
-        sot.initializeData(T.hours(30). msecs())
+        tbrs.add(TemporaryBasal(injector).date(now - T.hours(30).msecs()).duration(10000).percent(110))
+        sot.initializeData(T.hours(30).msecs())
         val iob110pct = sot.getAbsoluteIOBTempBasals(now)
         Assert.assertEquals(1.1, iob110pct.iob / iob100pct.iob, 0.0001)
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt b/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
index 65a31bd812..6472410bf3 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
+++ b/core/src/main/java/info/nightscout/androidaps/db/StaticInjector.kt
@@ -7,14 +7,13 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-@Deprecated("Only until DB is refactored")
 class StaticInjector @Inject constructor(
     private val injector: HasAndroidInjector
 ) : HasAndroidInjector {
     companion object {
-        @Deprecated("Only until DB is refactored")
         private var instance : StaticInjector? = null
 
+        @Deprecated("Only until DB is refactored")
         fun getInstance() : StaticInjector {
             if (instance == null) throw IllegalStateException("StaticInjector not initialized")
             return instance!!
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index b7753c8f02..e24d0fc678 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -7,7 +7,6 @@ import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.db.DbRequest
 import info.nightscout.androidaps.db.TDD
 
-@Deprecated("Remove with new DB")
 interface DatabaseHelperInterface {
 
     fun getAllBgreadingsDataFromTime(mills: Long, ascending: Boolean): List<BgReading>
diff --git a/dana/.gitignore b/dana/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/dana/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/dana/build.gradle b/dana/build.gradle
new file mode 100644
index 0000000000..1b83d2b2a2
--- /dev/null
+++ b/dana/build.gradle
@@ -0,0 +1,74 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation project(':core')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity:${activityVersion}"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/dana/consumer-rules.pro b/dana/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dana/proguard-rules.pro b/dana/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/dana/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt b/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..92ec3b8644
--- /dev/null
+++ b/dana/src/androidTest/java/info/nightscout/androidaps/dana/ExampleInstrumentedTest.kt
@@ -0,0 +1,25 @@
+package info.nightscout.androidaps.dana
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("info.nightscout.androidaps.dana.test", appContext.packageName)
+    }
+}
diff --git a/dana/src/main/AndroidManifest.xml b/dana/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..4701a95697
--- /dev/null
+++ b/dana/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.dana" />
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPumpInterface.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPumpInterface.kt
new file mode 100644
index 0000000000..56bbede985
--- /dev/null
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPumpInterface.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.dana
+
+interface DanaPumpInterface {
+    fun clearPairing()
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt
index 7d3e561ec1..b71304dfaf 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRFragment.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR
+package info.nightscout.androidaps.dana
 
 import android.content.Intent
 import android.os.Bundle
@@ -8,7 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.activities.TDDStatsActivity
-import info.nightscout.androidaps.danars.R
+import info.nightscout.androidaps.dana.R
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventInitializationChanged
@@ -21,10 +21,6 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRHistoryActivity
-import info.nightscout.androidaps.plugins.pump.danaR.activities.DanaRUserOptionsActivity
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.queue.events.EventQueueChanged
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
@@ -45,7 +41,6 @@ class DanaRFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRSPlugin: DanaRSPlugin
     @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var sp: SP
@@ -74,7 +69,7 @@ class DanaRFragment : DaggerFragment() {
 
         dana_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        danar_history.setOnClickListener { startActivity(Intent(context, DanaRHistoryActivity::class.java)) }
+        danar_history.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaRHistoryActivity::class.java)) }
         danar_viewprofile.setOnClickListener {
             val profile = danaRPump.createConvertedProfile()?.getDefaultProfile()
                 ?: return@setOnClickListener
@@ -91,20 +86,17 @@ class DanaRFragment : DaggerFragment() {
             pvd.show(childFragmentManager, "ProfileViewDialog")
         }
         danar_stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
-        danar_user_options.setOnClickListener { startActivity(Intent(context, DanaRUserOptionsActivity::class.java)) }
+        danar_user_options.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity::class.java)) }
         danar_btconnection.setOnClickListener {
             aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
             danaRPump.lastConnection = 0
             commandQueue.readStatus("Clicked connect to pump", null)
         }
-        if (danaRSPlugin.isEnabled())
+        if (activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRS)
             danar_btconnection.setOnLongClickListener {
                 activity?.let {
                     OKDialog.showConfirmation(it, resourceHelper.gs(R.string.resetpairing), Runnable {
-                        sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName)
-                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
-                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
-                        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
+                        (activePlugin.activePump as DanaPumpInterface).clearPairing()
                     })
                 }
                 true
@@ -120,7 +112,7 @@ class DanaRFragment : DaggerFragment() {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
         disposable += rxBus
-            .toObservable(EventDanaRNewStatus::class.java)
+            .toObservable(info.nightscout.androidaps.dana.events.EventDanaRNewStatus::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ updateGUI() }, { fabricPrivacy.logException(it) })
         disposable += rxBus
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt
similarity index 99%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt
index e33ddb1dbc..519f713479 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt
@@ -1,8 +1,7 @@
-package info.nightscout.androidaps.plugins.pump.danaR
+package info.nightscout.androidaps.dana
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
-import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.logging.AAPSLogger
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt
similarity index 98%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt
index e9d69f3453..ef8d78b2f4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.activities
+package info.nightscout.androidaps.dana.activities
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -11,7 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.danars.R
+import info.nightscout.androidaps.dana.R
+import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.events.EventPumpStatusChanged
@@ -23,7 +24,6 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt
similarity index 97%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt
index 2d081c403f..42f101283d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.activities
+package info.nightscout.androidaps.dana.activities
 
 import android.content.Context
 import android.content.Intent
@@ -6,7 +6,8 @@ import android.os.Bundle
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.danars.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.R
 import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
@@ -14,7 +15,6 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.extensions.plusAssign
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt b/dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt
index 74d594dc71..30ba45483e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/RecordTypes.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/comm/RecordTypes.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.dana.comm
 
 object RecordTypes {
     const val RECORD_TYPE_BOLUS = 0x01.toByte()
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt b/dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt
similarity index 58%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt
index 67b12d954c..f022e5b128 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/events/EventDanaRNewStatus.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/events/EventDanaRNewStatus.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.events
+package info.nightscout.androidaps.dana.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/danars/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
similarity index 100%
rename from danars/src/main/res/layout/danar_fragment.xml
rename to dana/src/main/res/layout/danar_fragment.xml
diff --git a/danars/src/main/res/layout/danar_history_item.xml b/dana/src/main/res/layout/danar_history_item.xml
similarity index 100%
rename from danars/src/main/res/layout/danar_history_item.xml
rename to dana/src/main/res/layout/danar_history_item.xml
diff --git a/danars/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
similarity index 100%
rename from danars/src/main/res/layout/danar_historyactivity.xml
rename to dana/src/main/res/layout/danar_historyactivity.xml
diff --git a/danars/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
similarity index 100%
rename from danars/src/main/res/layout/danar_user_options_activity.xml
rename to dana/src/main/res/layout/danar_user_options_activity.xml
diff --git a/danars/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
similarity index 100%
rename from danars/src/main/res/values/strings.xml
rename to dana/src/main/res/values/strings.xml
diff --git a/dana/src/test/java/info/nightscout/androidaps/dana/ExampleUnitTest.kt b/dana/src/test/java/info/nightscout/androidaps/dana/ExampleUnitTest.kt
new file mode 100644
index 0000000000..a85dae0d49
--- /dev/null
+++ b/dana/src/test/java/info/nightscout/androidaps/dana/ExampleUnitTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.dana
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
diff --git a/danars/build.gradle b/danars/build.gradle
index 42726eb8ab..f3831ea0cb 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -41,6 +41,7 @@ android {
 
 dependencies {
     implementation project(':core')
+    implementation project(':dana')
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -56,12 +57,10 @@ dependencies {
 
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
-    implementation 'net.danlew:android.joda:2.10.6'
-
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
-    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+    implementation 'net.danlew:android.joda:2.10.6'
 
     implementation "com.google.dagger:dagger-android:$dagger_version"
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
similarity index 96%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 92e5550afa..7a118ffdc6 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS
+package info.nightscout.androidaps.danars
 
 import android.content.ComponentName
 import android.content.Context
@@ -8,7 +8,9 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danars.R
+import info.nightscout.androidaps.dana.DanaPumpInterface
+import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
+import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
@@ -28,11 +30,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
-import info.nightscout.androidaps.plugins.pump.danaRS.services.DanaRSService
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -57,20 +54,20 @@ class DanaRSPlugin @Inject constructor(
     private val activePluginProvider: ActivePluginProvider,
     private val sp: SP,
     commandQueue: CommandQueueProvider,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil,
     private val config: ConfigInterface
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
-    .fragmentClass(DanaRFragment::class.java.name)
+    .fragmentClass(info.nightscout.androidaps.dana.DanaRFragment::class.java.name)
     .pluginName(R.string.danarspump)
     .shortName(R.string.danarspump_shortname)
     .preferencesId(R.xml.pref_danars)
     .description(R.string.description_pump_dana_rs),
     injector, aapsLogger, resourceHelper, commandQueue
-), PumpInterface, DanaRInterface, ConstraintsInterface {
+), PumpInterface, DanaRInterface, ConstraintsInterface, DanaPumpInterface {
 
     private val disposable = CompositeDisposable()
     private var danaRSService: DanaRSService? = null
@@ -652,9 +649,15 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun isFakingTempsByExtendedBoluses(): Boolean = false
-    override fun loadTDDs(): PumpEnactResult = loadHistory(RecordTypes.RECORD_TYPE_DAILY)
+    override fun loadTDDs(): PumpEnactResult = loadHistory(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY)
     override fun getCustomActions(): List<CustomAction>? = null
     override fun executeCustomAction(customActionType: CustomActionType) {}
     override fun canHandleDST(): Boolean = false
     override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType?) {}
+    override fun clearPairing() {
+        sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + mDeviceName)
+        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + mDeviceName)
+        sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + mDeviceName)
+        sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + mDeviceName)
+    }
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
similarity index 97%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
index 79024ca402..f49ee80376 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/BLEScanActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/BLEScanActivity.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.activities
+package info.nightscout.androidaps.danars.activities
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
@@ -17,7 +17,7 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSDeviceChange
+import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import kotlinx.android.synthetic.main.danars_blescanner_activity.*
 import java.util.*
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
index 2c25053da2..ac97ce50a3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/EnterPinActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.activities
+package info.nightscout.androidaps.danars.activities
 
 import android.os.Bundle
 import android.util.Base64
@@ -6,8 +6,8 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.services.BLEComm
+import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.danars.services.BLEComm
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.hexStringToByteArray
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt b/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt
index 5a2ab565ae..c7f5efc3a5 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/activities/PairingHelperActivity.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/activities/PairingHelperActivity.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.activities
+package info.nightscout.androidaps.danars.activities
 
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.Bundle
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.dialogs.PairingProgressDialog
+import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog
 
 class PairingHelperActivity : NoSplashAppCompatActivity() {
     var dialog: PairingProgressDialog? = null
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
similarity index 98%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
index fea80dc506..9280187622 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRSMessageHashTable.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import java.util.*
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
similarity index 96%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
index 245081e064..619700d90b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm;
+package info.nightscout.androidaps.danars.comm;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -9,9 +9,9 @@ import java.util.Date;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.danars.encryption.BleEncryption;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption;
 import info.nightscout.androidaps.utils.DateUtil;
 
 public class DanaRS_Packet {
@@ -21,8 +21,8 @@ public class DanaRS_Packet {
 
     protected HasAndroidInjector injector;
 
-    protected static final int TYPE_START = 0;
-    protected static final int OPCODE_START = 1;
+    private static final int TYPE_START = 0;
+    private static final int OPCODE_START = 1;
     public static final int DATA_START = 2;
 
     private boolean received;
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
similarity index 93%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
index bfcfeac676..ab1649f380 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Basal_Set_Temporary_Basal.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_APS_Basal_Set_Temporary_Basal(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
similarity index 88%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index 3fb7d1fd21..28e3116233 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
@@ -13,8 +13,8 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -29,7 +29,7 @@ open class DanaRS_Packet_APS_History_Events(
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var sp: SP
     @Inject lateinit var nsUpload: NSUpload
@@ -85,7 +85,7 @@ open class DanaRS_Packet_APS_History_Events(
         val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            DanaRPump.TEMPSTART         -> {
+            info.nightscout.androidaps.dana.DanaRPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -93,13 +93,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.TEMPSTOP          -> {
+            info.nightscout.androidaps.dana.DanaRPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.EXTENDEDSTART     -> {
+            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -107,13 +107,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.EXTENDEDSTOP      -> {
+            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.BOLUS             -> {
+            info.nightscout.androidaps.dana.DanaRPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -125,7 +125,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALBOLUS         -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -137,7 +137,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALEXTENDEDSTART -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -145,42 +145,42 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.DUALEXTENDEDSTOP  -> {
+            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.SUSPENDON         -> {
+            info.nightscout.androidaps.dana.DanaRPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.SUSPENDOFF        -> {
+            info.nightscout.androidaps.dana.DanaRPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.REFILL            -> {
+            info.nightscout.androidaps.dana.DanaRPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.PRIME             -> {
+            info.nightscout.androidaps.dana.DanaRPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.PROFILECHANGE     -> {
+            info.nightscout.androidaps.dana.DanaRPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.CARBS             -> {
+            info.nightscout.androidaps.dana.DanaRPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
@@ -191,12 +191,12 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            DanaRPump.PRIMECANNULA      -> {
+            info.nightscout.androidaps.dana.DanaRPump.PRIMECANNULA      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
-            else                        -> {
+            else                                                        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
index 71c0b8887c..bb9f14dd32 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.util.*
 
 class DanaRS_Packet_APS_Set_Event_History(
@@ -16,7 +16,7 @@ class DanaRS_Packet_APS_Set_Event_History(
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
-        if ((packetType == DanaRPump.CARBS || packetType == DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
+        if ((packetType == info.nightscout.androidaps.dana.DanaRPump.CARBS || packetType == info.nightscout.androidaps.dana.DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + dateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index 76dde13995..ba9d4c9741 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
@@ -7,8 +7,8 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
@@ -19,7 +19,7 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
index bbac168239..02c0f97982 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.util.*
 import javax.inject.Inject
 
@@ -12,7 +12,7 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
     private val profileNumber: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
similarity index 74%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
index c973a5aa11..9800c8a685 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Basal_Get_Profile_Number(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index b807d0dc8a..19bb45c5dc 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 import kotlin.math.ceil
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
similarity index 89%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
index f16bc7c0cf..de96fb2c4d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Basal_Rate.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Basal_Rate(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
index c7fa4c3536..e20f2ba80e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
index ddf0adba78..6d397ca86f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Basal_Rate.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Profile_Basal_Rate(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
index 7c0994196b..2f88623296 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Profile_Number.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Profile_Number(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
index 3608ee30ca..cdd3b83f2c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_Off.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Suspend_Off(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
index df5bee1aac..6d0cb88052 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Suspend_On.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Basal_Set_Suspend_On(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
similarity index 89%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
index cbd91aa051..3e5725694f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Set_Temporary_Basal.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 open class DanaRS_Packet_Basal_Set_Temporary_Basal(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index 9b8c9fb199..ec51a4d4a9 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
@@ -7,8 +7,8 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -18,7 +18,7 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index 4af5c48fac..19591e2b7a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
@@ -48,7 +48,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         val cf02: Double
         val cf04: Double
         val cf06: Double
-        if (danaRPump.units == DanaRPump.UNITS_MGDL) {
+        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
             dataIndex += dataSize
             dataSize = 2
             danaRPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
@@ -95,7 +95,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         }
         if (danaRPump.units < 0 || danaRPump.units > 1) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Language: $language")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index 8f618bce4f..2512fcf342 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
@@ -42,14 +42,14 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         dataIndex += dataSize
         dataSize = 1
         danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (danaRPump.units == DanaRPump.UNITS_MMOL) {
+        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MMOL) {
             danaRPump.currentCF = danaRPump.currentCF / 100.0
             danaRPump.currentTarget = danaRPump.currentTarget / 100.0
             currentBG = currentBG / 100.0
         }
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current BG: $currentBG")
         aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbohydrate")
         aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaRPump.currentTarget)
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
similarity index 83%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
index ad7a5de3b7..28a0b9e661 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
index 8334d04028..e598818bdd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Dual_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
index 4795b08482..0684e97bf0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
similarity index 89%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
index ecf337987e..aa50fa1c81 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
similarity index 79%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
index 001107cfa2..cf75621379 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
index c301490a9f..3c58bc5175 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Initial_Bolus.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Get_Initial_Bolus(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index 741cf38384..646d2858d4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
index ebf19f1459..ac40d4ef56 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Bolus_Option.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Bolus_Option(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
index cf2bfa44d1..783b874f4a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_CIR_CF_Array.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_CIR_CF_Array(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
index d9c18cb839..0f93dbf349 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Dual_Bolus.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Dual_Bolus(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
index 095f9f5080..749b72206c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Extended_Bolus(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
index 4b36940aaf..7bc1cea154 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
index 0229c9434c..6b8278ac29 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Initial_Bolus.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Bolus_Set_Initial_Bolus(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index 9dfc6016c7..01357331e1 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
@@ -14,7 +14,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     private var speed: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
     @Inject lateinit var constraintChecker: ConstraintChecker
 
     init {
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index bb90a91c82..738caa4ed3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -16,7 +16,7 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt
index 89ae76b68e..0a5f5f10b4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Keep_Connection.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Keep_Connection.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Etc_Keep_Connection(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt
index 2859aa8496..aa812ca588 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Etc_Set_History_Save.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Etc_Set_History_Save.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Etc_Set_History_Save(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt
index eb71b50be1..9ff3884a57 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Delivery_Status.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Delivery_Status.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_General_Delivery_Status(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
similarity index 88%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
index bd85b5a2aa..10c853ff87 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_More_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
similarity index 79%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
index dcbbb54136..766fb9cf20 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Password.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Password(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
similarity index 88%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index 7f99748239..fa06dc7257 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
@@ -6,8 +6,8 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
@@ -17,7 +17,7 @@ class DanaRS_Packet_General_Get_Pump_Check(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
similarity index 84%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index 629ee5c439..c85fcd1d85 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Shipping_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
similarity index 75%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
index e13912f666..336963a5d0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.nio.charset.Charset
 import javax.inject.Inject
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_Shipping_Version(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
index 2075528d8a..8b31babf73 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_Today_Delivery_Total(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
index 6ff8fa6231..eaaecf7f03 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_User_Time_Change_Flag.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_General_Get_User_Time_Change_Flag(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
similarity index 88%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index 586577be09..ee0f514d4b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_General_Initial_Screen_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
@@ -57,8 +57,8 @@ class DanaRS_Packet_General_Initial_Screen_Information(
             //protocol 10+
             dataIndex += dataSize
             dataSize = 1
-            danaRPump.errorState = DanaRPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
-                ?: DanaRPump.ErrorState.NONE
+            danaRPump.errorState = info.nightscout.androidaps.dana.DanaRPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
+                ?: info.nightscout.androidaps.dana.DanaRPump.ErrorState.NONE
             aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaRPump.errorState.name)
         }
         aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
similarity index 87%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
index 969dd36c87..c695632177 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_History_Upload_Mode.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_General_Set_History_Upload_Mode(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
similarity index 85%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
index 4190545f99..45a5d01962 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_General_Set_User_Time_Change_Flag_Clear(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
index 945885d605..5026d117d6 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
+import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import org.joda.time.DateTime
 import java.util.*
@@ -96,7 +96,7 @@ abstract class DanaRS_Packet_History_(
             var messageType = ""
             when (recordCode) {
                 0x02 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BOLUS
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS
                     danaRHistoryRecord.recordDate = datetime.millis
                     when (0xF0 and paramByte8.toInt()) {
                         0xA0 -> {
@@ -126,7 +126,7 @@ abstract class DanaRS_Packet_History_(
                 }
 
                 0x03 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_DAILY
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY
                     messageType += "dailyinsulin"
                     danaRHistoryRecord.recordDate = date.millis
                     danaRHistoryRecord.recordDailyBasal = dailyBasal
@@ -134,49 +134,49 @@ abstract class DanaRS_Packet_History_(
                 }
 
                 0x04 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_PRIME
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_PRIME
                     messageType += "prime"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x05 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_REFILL
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_REFILL
                     messageType += "refill"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x0b -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BASALHOUR
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BASALHOUR
                     messageType += "basal hour"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x99 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_TEMP_BASAL
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_TEMP_BASAL
                     messageType += "tb"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
                 }
 
                 0x06 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_GLUCOSE
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_GLUCOSE
                     messageType += "glucose"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
                 }
 
                 0x07 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_CARBO
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO
                     messageType += "carbo"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
                 }
 
                 0x0a -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_ALARM
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM
                     messageType += "alarm"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strAlarm = "None"
@@ -191,7 +191,7 @@ abstract class DanaRS_Packet_History_(
                 }
 
                 0x09 -> {
-                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_SUSPEND
+                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_SUSPEND
                     messageType += "suspend"
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strRecordValue = "Off"
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt
index eef5b0bac1..23430fab80 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Alarm.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Alarm @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt
similarity index 76%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt
index 298d0005c9..c8cbc8e39e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_All_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_All_History.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_All_History(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt
index afd2469f64..5166d9de0c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Basal.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Basal.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Basal @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt
similarity index 78%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt
index eda50d6749..237006ef4a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Blood_Glucose.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Blood_Glucose.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Blood_Glucose @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt
index 6970681afb..3b8cec0a6f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Bolus.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Bolus @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt
similarity index 78%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt
index 2ddeae6a9a..6ac0f18b17 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Carbohydrate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Carbohydrate.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Carbohydrate @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt
index 4ce5d88af5..d0b3625e6a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Daily.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Daily.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Daily @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt
index 93dd90576f..4069f9be0b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Prime.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Prime.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Prime @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt
index adeff980df..ba83640f5b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Refill.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Refill.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Refill @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt
similarity index 77%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt
index e3d0ac2219..fdc4bb7086 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Suspend.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Suspend.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Suspend @JvmOverloads constructor(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt
similarity index 76%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt
index 045457a699..534a0f0667 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_History_Temporary.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_Temporary.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_History_Temporary(
     injector: HasAndroidInjector,
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
index b986f08b17..fe94033ea8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index 35adaa4b6a..61fd16286d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import kotlin.math.min
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index c4963b497e..c95bba668f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -1,12 +1,12 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 import kotlin.math.min
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
index afe2599866..8e5fcdfeaf 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Missed_Bolus_Alarm.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Notify_Missed_Bolus_Alarm(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
similarity index 86%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 78ba5dc276..3d921048f7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
 
@@ -11,7 +11,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
index 6e44cdace8..d4aead111c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Option_Get_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
@@ -74,7 +74,7 @@ class DanaRS_Packet_Option_Get_User_Option(
         aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaRPump.lcdOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaRPump.backlightOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaRPump.selectedLanguage)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaRPump.shutdownHour)
         aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaRPump.lowReservoirRate)
         aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaRPump.refillAmount)
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
index 1671a17c8c..dc4b6b0efe 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_Time.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 
 class DanaRS_Packet_Option_Set_Pump_Time(
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
similarity index 90%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
index 01ca99c2e5..45ec9d593b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Option_Set_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt
similarity index 92%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt
index 04751087eb..6e0af1260f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Bolus_Avg.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Bolus_Avg.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 
 class DanaRS_Packet_Review_Bolus_Avg(
     injector: HasAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
similarity index 73%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
index 182f58c3fe..8fefb4c454 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
@@ -1,16 +1,16 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.comm
+package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
 class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
index 269fa7a131..5af5be0d62 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
@@ -2,8 +2,8 @@ package info.nightscout.androidaps.danars.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
+import info.nightscout.androidaps.danars.activities.BLEScanActivity
+import info.nightscout.androidaps.danars.activities.PairingHelperActivity
 
 @Module
 @Suppress("unused")
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java b/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
similarity index 95%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
rename to danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
index 48a567c840..49dc7c8f07 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/dialogs/PairingProgressDialog.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dialogs/PairingProgressDialog.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.dialogs;
+package info.nightscout.androidaps.danars.dialogs;
 
 
 import android.app.Activity;
@@ -19,8 +19,8 @@ import javax.inject.Inject;
 import dagger.android.support.DaggerDialogFragment;
 import info.nightscout.androidaps.danars.R;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity;
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess;
+import info.nightscout.androidaps.danars.activities.PairingHelperActivity;
+import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import io.reactivex.disposables.CompositeDisposable;
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java b/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
similarity index 99%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
rename to danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
index 425a5a87a2..418881d6df 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/encryption/BleEncryption.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.encryption;
+package info.nightscout.androidaps.danars.encryption;
 
 import android.content.Context;
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt b/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt
similarity index 58%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt
index 8b87d59ec1..3d7a0789d7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSDeviceChange.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSDeviceChange.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.events
+package info.nightscout.androidaps.danars.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt b/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt
similarity index 59%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt
index 6e0379a4d3..605bf347ea 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/events/EventDanaRSPairingSuccess.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/events/EventDanaRSPairingSuccess.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.events
+package info.nightscout.androidaps.danars.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
similarity index 97%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 074cdc642f..b29ab6d8ef 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.services
+package info.nightscout.androidaps.danars.services
 
 import android.bluetooth.*
 import android.content.Context
@@ -15,14 +15,14 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.EnterPinActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.activities.PairingHelperActivity
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRSMessageHashTable
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet
-import info.nightscout.androidaps.plugins.pump.danaRS.encryption.BleEncryption
-import info.nightscout.androidaps.plugins.pump.danaRS.events.EventDanaRSPairingSuccess
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.danars.activities.EnterPinActivity
+import info.nightscout.androidaps.danars.activities.PairingHelperActivity
+import info.nightscout.androidaps.danars.comm.DanaRSMessageHashTable
+import info.nightscout.androidaps.danars.comm.DanaRS_Packet
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.extensions.notify
@@ -43,7 +43,7 @@ class BLEComm @Inject internal constructor(
     private val rxBus: RxBusWrapper,
     private val sp: SP,
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
-    private val danaRPump: DanaRPump,
+    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
     private val danaRSPlugin: DanaRSPlugin,
     private val bleEncryption: BleEncryption,
     private val nsUpload: NSUpload
@@ -450,6 +450,9 @@ class BLEComm @Inject internal constructor(
         } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
             // v3 2nd layer encryption
             v3Encryption = true
+            rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
+            disconnect("Wrong firmware")
+            /*
             val model = decryptedBuffer[5]
             // val protocol = decryptedBuffer[7]
             if (model == 0x05.toByte()) {
@@ -477,6 +480,7 @@ class BLEComm @Inject internal constructor(
                 val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
                 writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
             }
+            */
             // response PUMP : error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
diff --git a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
similarity index 91%
rename from danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index 45c48a51f2..ca027e8f5a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/plugins/pump/danaRS/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRS.services
+package info.nightscout.androidaps.danars.services
 
 import android.app.Service
 import android.content.Context
@@ -31,11 +31,11 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.RecordTypes
-import info.nightscout.androidaps.plugins.pump.danaR.events.EventDanaRNewStatus
-import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRS.comm.*
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.comm.RecordTypes
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
+import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.danars.comm.*
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.DateUtil
@@ -59,7 +59,7 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var context: Context
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
     @Inject lateinit var danaRSMessageHashTable: DanaRSMessageHashTable
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var constraintChecker: ConstraintChecker
@@ -138,7 +138,7 @@ class DanaRSService : DaggerService() {
                 // initial handshake was not successful
                 // de-initialize pump
                 danaRPump.reset()
-                rxBus.send(EventDanaRNewStatus())
+                rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
                 rxBus.send(EventInitializationChanged())
                 return
             }
@@ -169,7 +169,7 @@ class DanaRSService : DaggerService() {
 
                     //de-initialize pump
                     danaRPump.reset()
-                    rxBus.send(EventDanaRNewStatus())
+                    rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
                     rxBus.send(EventInitializationChanged())
                     return
                 } else {
@@ -186,7 +186,7 @@ class DanaRSService : DaggerService() {
                 }
             }
             loadEvents()
-            rxBus.send(EventDanaRNewStatus())
+            rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
             rxBus.send(EventInitializationChanged())
             //NSUpload.uploadDeviceStatus();
             if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
@@ -249,7 +249,7 @@ class DanaRSService : DaggerService() {
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, DanaRPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, info.nightscout.androidaps.dana.DanaRPump.CARBS, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             lastHistoryFetched = min(lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
@@ -414,15 +414,15 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return result
         var msg: DanaRS_Packet_History_? = null
         when (type) {
-            RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(injector)
-            RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(injector)
-            RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(injector)
-            RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(injector)
-            RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(injector)
-            RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(injector)
-            RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(injector)
-            RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(injector)
-            RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM     -> msg = DanaRS_Packet_History_Alarm(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_PRIME     -> msg = DanaRS_Packet_History_Prime(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BASALHOUR -> msg = DanaRS_Packet_History_Basal(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS     -> msg = DanaRS_Packet_History_Bolus(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO     -> msg = DanaRS_Packet_History_Carbohydrate(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY     -> msg = DanaRS_Packet_History_Daily(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_GLUCOSE   -> msg = DanaRS_Packet_History_Blood_Glucose(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_REFILL    -> msg = DanaRS_Packet_History_Refill(injector)
+            info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_SUSPEND   -> msg = DanaRS_Packet_History_Suspend(injector)
         }
         if (msg != null) {
             sendMessage(DanaRS_Packet_General_Set_History_Upload_Mode(injector, 1))
diff --git a/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so b/danars/src/main/jniLibs/arm64-v8a/libBleEncryption.so
index 641efb745b5c23483796bfc031ce1cf7bf1ae240..59e0c564336b389d1bc5257acb12d0fae4efa331 100644
GIT binary patch
delta 1966
zcmc&#ZA@EL7(S;h&|At!VY8HvQDDicTWAZkx7|8ub%ZUj@*&P?vPoOIsF}>Nk?=#)
zYGT5SOCYZ<EZIbeCYy;<yqG1EWJ@sW4~<)tsr#`oV=^?G5%+^NGvfPlPJt2k+c$ao
zocH6L_v74qJ37fnC;4y*PmS1G6nl^@i+$vUOO~M~p{y|Y`4-DyKv-885`64{>GS)6
z#_>~@rGILi*Y5>#@87sPM{yQJ4WblbMHmqz#fS=ojTDrPh-ySOA`f9elpt~t78vJc
zkxE?UA_@>B8w9Z;$tKB<Ae-g73OOH9j!>jck6ehzk~+~QL>Xo&PTFxrHB+5b12GS=
zAWIq8ixXX(y%*FmrrV4e&IU|>77z7Y&`}I!r|Kv(Wu!BxLaHVsnO<oYR1syhBdBlo
zal`z=9s?hPl)ilT#K`xdU-~~fK09^8v-@gVSMX_L>ldd#usq&8dprGlYtxxmCmw6N
zcCh)!I|HwTUxR^5*PkvsoIanrb$<HXHT7=COlyxrdAENYTPn}eV__-ahNi4Pu=FBo
zllMW$VCBz1!r)BK;zSDB!cs?s>R6RATo&QpT^?bZ;)1=>ewpqS<!?dkOL-1kcMe@M
zopX;iqD;$kE{gc%()tbGVGwP&vUNG0y)B5%J*3e2huC}2PUpN#6`+*J#M_aV&v%hE
z$=ETvX_O-fav1HTF?LyQc!K6e9qbVHpdfZy+NXTNFfHv%(*7&mGRj+mm?jH-pkd6<
zPRfd=>Cr)PNWOq;O8j-zvY8DDVz*>`?>1pLEF0LB>DVvqM%ln`sM0ypn}vM?y;dkc
zV0^`Y-MvvB<b&~StF637gugF{*`;?7uA;Z2TA06)UZ3<1X||jap4}Vii}W9bT%{Ba
z8r=`7IWS}NteRR^msRklvc^*iw-x`Yw^Zvg9pg66I6Hya=yfKE<<U#6V;pYgT5ZE}
zh`|HPPNtVbN`b|^m2ZNbW+$(Lm&{gff;Y@g8@;j_Is2Sg>2Oazd~0sum9R0-$%~;m
z&uJ^mgdxwbiL_}a@}B3q&h6S_emCb=w6?;uS$ET=wN(6`Z)$UoV6C6ThTPhYZ3}vX
zgRx=F<(etrQ3wSCIo^6tU4yqy3k4U=&=GuA$uy9H&|YhF05_A!D`m-bIt^m2|DARE
znRWVyQkPR=cl2;^Zy(QwN5k!wIr^5N$mfKO!troBAB3O7mAn?x;bgLhzS1cF6Kjj@
zMZDBo?^YYUsy!Mx8t=6q>9hCOdp&53xuLqV-4S=iBJsG(7xx@;`J?q}L!?fPcvWw&
ztHH1OVm|kwSk&#W^J%9#8@cvVmz`t#=_j2^t!%#*+})}&D78UIpf)PCQJCyjO_@Q>
z<-%XxUS(w(;C@O~QgXH_NTB8mh>7`N61CO8&jr*RJB7~y?tQAV@`tM>_I<_qXW-wj
K;%{RAmVW_DX*9b4

delta 2042
zcmc&#T})g>6rN!(WiNaAhwd&v?NTts*0_J{-mZYqsG&w-3#>?D8hUr3mISwKD`_97
zOMGZB>4WR^q0uTW(X{q~pIj0XLsAU>Y>dWD2()T6O*9eP5<zP!NfSMD=PVME_0`#&
z`_1|0oSARVot=AehF+YZZ`x=oVQ-a(T8Pnx5(77iZZ!*M6Ip=nElM^Db`x2Qjvuk=
z9r}*45^ZsGbuoT_`OCT2g75ISBCr~fK&*gfunMp;uu3o+7;hzDcCZ~_`Ct+l&&>fV
zWmjlLd>8Z-utG52s=#&{JwhCa7Q|e@JnYMe1&AiVY_L7(b127tF=931Za}UARL2cT
zTz)krE#^@|j*~)}TyDt%(Y2LhrfUas*Gfi@>c$qi5H6OB;0vcGP74Og*gD@bU!0eO
zZ-_5wEIw7gvi7VrJ~QR~Y{~b{)aej=-L&&*DKg-_{`39#L}Kya((I4EPcMB?^wcv;
z_uf4_vG1i&c=_h)@JRIY^51TJ_hQB1#^mTPlXD*~tA89`c<yN3bmw(Ne(&TJC}w50
ziC9RAQK^|WvY2G0bH?*3Je}bhsC^+>|NF28Vz#t#=odrY1)m^islXqg0-Tou!k-gB
z{D7P<tQEvV<Vz)XN7_|<NEQAZPGgo>dG@Zj<1s;B!05*_sPSjuTVXoBs>3ZNcopJ!
zJB=z2;qh%TSVAV@Jn;B=UVi?XZK&r2czmG8!FfXFk#EC<dXYfRi(x`h5Ydo8_y~~C
zW5WYChWs=NRq$Ze@na9`lef}}u%2dII3IT~ixnEgo$bj`iEf-{tU;_eFMxCcazTSN
zf_NYKD35<029i$*W*!I50rG^)xPz~d{}p-V5kZvlKP$9zxbQ9Ao@1jWLxaOF4@6J(
z4h_FD)Z3>;wazY<kjq(z*`0B0!rYi~EGXx&Y<b^*jAzR2%8*l~=j6sH{0Axgz6bT`
zJ0_CHZ;C7uWC@Gae%p9MgtQznwn<F*0#fV~%YItLRxM8IU{#8hT9{99+Dk>4@x0b6
zoGi#GU}u$9cF&@)lu}E}*q;!azJYku%9dE0-jsKoW+fW*tN9^Hr}c*g8%kESM}JUx
zCqMVRCjn}wBT0{bcmKLcg6nBbzwKNoVC&6IIexd>>-Pur^=6tUr^Tn(!8U7n0n&KG
zqeZ^n=JO(K9sg;Ye|MYz7y4Ks(jc*q+oCkY9&Ha6xfC%O9uKm@-e?cfB>T2~HyvRc
z?eX|DUe^B;>JNg&)b0zoTrOY05!O!i_c=~P9VfkhpWo|_u$qowoyVp2saiPV);wDH
zn79AffxddL%dL9-eSS^t4@W$ndd(AX>2G&DN%fnZ)f9HW(dCp!@S`-s+#yv?qL*Yb
z@K(@UVKX5$H(e)}!hR3=<;`L+_Y10=!qTQ#47@SC#m3kSc>jKi*TFl}B+7k;xw}<)
V^W&|@y1$@wmIZoLc*c76{sWbkU={!X

diff --git a/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so b/danars/src/main/jniLibs/armeabi-v7a/libBleEncryption.so
index 560c7a890510c5a429c6fd95ae2192a192035533..fabc03368aa2046882f3205875c147bcaaa401e2 100644
GIT binary patch
delta 4413
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

delta 4529
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

diff --git a/danars/src/main/jniLibs/x86/libBleEncryption.so b/danars/src/main/jniLibs/x86/libBleEncryption.so
index 59487f74cfe4019219eac6aebcc9ba7f73088e1e..fb51d4816fa9b6e18aa071daa306f8533e16145d 100644
GIT binary patch
delta 1562
zcmY*Z4NRM55We>-EfflCVanfNg*J)^vp>+%!IZKLC5#n9Su!<9p~bm4U@T~6P=02J
z!jO?8WHC&T&BSTeZ2PvQ%gnN<F~%P<!eonXb5k-+#0=w1Mlz{)<wLeho<4W)``-KB
zbN8i(g5pq69Q12KZh(+`cvp)yio6JhZ?%X<G?bM@JM4wF0*4K2gbTkD`n4mvo58#N
z`Em1i{6FS)rl+*csCBp?N)2zQ;D1XbZwTE|QvO6Cz_$V*5#nJdtxlK#z98n<L)_*B
z_+HsRjKfk={G}%WCY2M%@T8Qq`=Sw`N;&f?vEB-BAZq!J9(vW72@qB?IwXoW0oavz
zisDiiz;8<YHRtO9$_>l;M#^u<0FagaQ8cKMy7buqFDomlbVGL@K)>>0fHEu_2}(uj
z#BFAP=cAWze4Fx&CV(y_{|P!@S^{uYi9^KQbpN;#ySakm)%_hRkiaOPQI!jg-`C=6
z--`+A%2hWD2i1kEVH)01TOSUi(W`mr#958&!4vDEXLpi(&=5!zP~o6=L(u_%m=`ZB
zRDNuX&*nW|XNw`k5~yvkhQPTiwpMW-Ax<Ww5Yh<i2!B;XjblShO4l##$KO3NJmY?D
zdQn<)>gmdRy_L^=IrfoZ^Ohgx55GB?yLGmH%auPnIz2tuaXa|gvE7To?$0Y5a;`Z4
zuGW6g{vkg|GXj1jiLhc^)T0EovXDy553?vOfjSFutdqaT1p0)NeevY2)J$%~SSM>+
z(Z%(%u^!gT`f12CmSufJ5#t`Q>6a<;n~r<5C%WjpOD|Ca696tVQ&Cr$>6L5DRNzf!
zs$`CtUi_Vzx;M{E6)iB6z`M*O@E$XXz0b@-AF!~@io-{^P&RoYRwu*@cs$M{#d&cl
zF4OQwEx`WysKNc0m%`z}f%#7{U$<VI$12_90_6_fR)fC03}B#2KTxL|=!h8%P2hCK
z3DJkWnPJf<_pToo;<lWf^|K^tN>F8<k{reIjJZBq%%UyN5_A4K-Fxzz>$ofLb?Gs?
z{A=EOQDRhXw+=-~np|1sm=cmBN1ky`3DJy`u6eOf9@_YnkSff0vG|5~1;<Nnh<^F4
zO|b?vmQ`!tsRuYn)2qheZOMkyG*6xz&xkRG=e9Y^=4itIEQMQ-Qp30fe(C^EDoE?h
zA%*#);rJ^ho>KTH71}%-Qq6Sv{cyOof%soyK1ywB?ZkbaXA`&66q*UI5&8(Dv3S9=
z;Z$|3NORb&&H{(i*y!6E@EcoOjO}(uAuTpp(NyEf30RtZfq<nbP}pp7HQJp8KAY3$
za60^!0++L>smR*g)M$0titzoK3^`PDO-OSp9Iee%v!0`PuGXYxMSi?R9v5jwt=FXH
zG8@oJUMG2-xP!bg^2V^oYtnG1PHXWKZ??LWsx8H7+OCc?a*;eQ{W*FutInhzA#VgL
T$cy~t%X{iJ3vm|DY;XDx)4NPh

delta 1634
zcmZ`)e@t6d6h8OSmX?BRR~*8CwG=Z@GTPU*UHK6yWS9k62b5)M925$3>Pk0;%MuL`
z%(93Zkeje2Q(<hzj4Z6ngSln?flkeg$WR%>WT0CJ8m+O3_=5yi&w;n;Kb+*tch0-#
z-g~}tZsGJ0J3Yj@{VH`afV#Nnm4L?U23SGQy#W8jT^Q@IT5S%8i&rogA7i>iw`p|v
zmmY7?_JP@j$=s}yrY}$3<q=k-zZnCMY(082+$|UiBX)qV7{Gc+fOVMB?E?4-S1EoO
zIbsI5A;%u%Q76FHa{jNpT`(jVa{vb9jKBF=!BDO<0hG%*N0Do-0PiSP&%7W21PcLd
z@{U`0XD}TgD#rngLumk#9M5r6jG?tQ17M&0<vyJl4^XOKJyF6PZFv9|`Nkr=VFGJ<
zTfXrv+!r(hw95OBV19Q2z_c7+MV`R(`{cNbD#-tDeIvtWjAjD75W9NehnNtQMq)~t
zA^2L$zWssbnqbR;V2$4w@KsiErYu|IyNNd|?Q5*1@S95Onrq3bf;HD#RIWAG##K`&
z8yf{G1U3Xv1Jp9ub}=sI_@1svSz9Q<NNZ{YnFgUnBv61xdmowsokYarhz*D&L^5I{
zBC<o#cllE8=eO;*E=?;JZ+w4nPikqdSazMKsbgCe_4{pua|^BKdcJdi_U;GzlI^#{
z@4Y$j)QjG_sXM>5ywUVU%J1_-A741IIMnuOS#8!G=O4R5m4oq`_Ya+=3h+U!7`<CE
zx}B<|N|Xq)ClIL!QW=N9DFHqcQXqg1e;-MOROn*}GJGwMjKq^*5>G}#sVQXCFnm#v
zgeMsE>*y02wSlCkaFZs~idRh3V5$yak{HXFCdM=G5@Sg}663jZ#JKZkVr*cT81Ih|
zqof65l=KfV%3C5PY5%jRL>i;#9?neK6&KH#mcOL+2-mClkTzX^rV5}VtT@pz`5+oS
z(OGbj&uBNXSNXDbGb@pvjDJqA`^yc`S+47>j_+(ypST*~?P($A;9`1|IV5pYA7j1J
zx5gg?;YvQ2%;Um*p45@KH<lga_n)??wX=Bc<&;^Tl5<3u5+$B<Qo%~43~QG{xRNbN
z_Hic6Z<aco<BV<Km98+$mY&JWWx}GF2lHoHGWQhBvOH-^VVqubd@nW##rN}`ok@BH
zPLKLagC~UfwVlpl5jFq$AlkHm10ngtsGerHgmWfV;YVVc9dV)@r^=kI;G$<s@?o6u
zQZ(8WLS9CuRBTbx7(eQHmQQ+e^t-W;M#SrgV~Ad9*^|JM?JkSOVs{zqe9aAhV^hF*
z$mXy+Y}R_7S>eeNEl$7FS66TKiN3l<TSMbE|5lsD>a;oh4xh83u3i+k`b3w7pQ%Wb
zKB|~uf~erVRq0BSv%s%anUy4HnBPN>YCOy}UbB*_3~?)ZW9W_X=g|wJ7v}9=vx*v}
zh~tCa3}rXE-TWI|?#Gh*`67Df@z3meZmKpb=g^zuJJ4JC*C8FOE@5nhkL<4h7uJt|
AKmY&$

diff --git a/danars/src/main/jniLibs/x86_64/libBleEncryption.so b/danars/src/main/jniLibs/x86_64/libBleEncryption.so
index 53a606a968419ea3772d592a71db7972cfec4a85..777d55b7f67d2644f7c192561e971e9ed1b212ba 100644
GIT binary patch
delta 4052
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

delta 4143
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
Ty!F>Vbggm_&)xub|K|Sya4%MN

diff --git a/danars/src/main/res/layout/danars_blescanner_activity.xml b/danars/src/main/res/layout/danars_blescanner_activity.xml
index fe9e25879c..9a22d37441 100644
--- a/danars/src/main/res/layout/danars_blescanner_activity.xml
+++ b/danars/src/main/res/layout/danars_blescanner_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="info.nightscout.androidaps.plugins.pump.danaRS.activities.BLEScanActivity">
+    tools:context=".activities.BLEScanActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/settings.gradle b/settings.gradle
index cd2caae7bd..c1a3ec986c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app', ':wear', ':core', ':danars'
+include ':dana'

From 311f9dd119cc91d79880e061489c39e1b925e3a6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 11:03:19 +0200
Subject: [PATCH 050/400] danar module

---
 app/build.gradle                              |  1 +
 .../nightscout/androidaps/RealPumpTest.kt     |  4 +-
 app/src/main/AndroidManifest.xml              |  6 +-
 .../activities/MyPreferenceFragment.kt        |  6 +-
 .../dependencyInjection/AppModule.kt          |  2 +
 .../dependencyInjection/PluginsModule.kt      | 12 +--
 .../dependencyInjection/ServicesModule.kt     | 10 +--
 .../configBuilder/ConfigBuilderPlugin.kt      |  4 +-
 .../general/wear/ActionStringHandler.kt       | 10 +--
 .../services/AbstractSerialIOThread.java      | 13 ---
 .../plugins/pump/virtual/VirtualPumpPlugin.kt |  1 -
 app/src/main/res/values/strings.xml           | 14 ---
 .../androidaps/danars/comm/DanaRSTestBase.kt  |  2 +-
 .../interfaces/ConstraintsCheckerTest.kt      | 10 +--
 .../plugins/pump/danaR/DanaRPluginTest.kt     |  6 +-
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  | 12 ++-
 .../pump/danaR/comm/MessageHashTableRTest.kt  |  7 +-
 .../danaR/comm/MessageOriginalNamesTest.kt    |  1 +
 .../pump/danaR/comm/MsgBolusProgressTest.kt   |  3 +-
 .../pump/danaR/comm/MsgBolusStartTest.kt      |  1 +
 .../danaR/comm/MsgBolusStartWithSpeedTest.kt  |  1 +
 .../pump/danaR/comm/MsgBolusStopTest.kt       |  1 +
 .../pump/danaR/comm/MsgCheckValueTest.kt      |  4 +-
 .../plugins/pump/danaR/comm/MsgErrorTest.kt   |  1 +
 .../pump/danaR/comm/MsgHistoryAlarmTest.kt    |  3 +-
 .../pump/danaR/comm/MsgHistoryAllDoneTest.kt  |  1 +
 .../pump/danaR/comm/MsgHistoryAllTest.kt      |  3 +-
 .../danaR/comm/MsgHistoryBasalHourTest.kt     |  3 +-
 .../pump/danaR/comm/MsgHistoryBolusTest.kt    |  3 +-
 .../pump/danaR/comm/MsgHistoryCarboTest.kt    |  3 +-
 .../danaR/comm/MsgHistoryDailyInsulinTest.kt  |  3 +-
 .../pump/danaR/comm/MsgHistoryDoneTest.kt     |  1 +
 .../pump/danaR/comm/MsgHistoryErrorTest.kt    |  3 +-
 .../pump/danaR/comm/MsgHistoryGlucoseTest.kt  |  3 +-
 .../pump/danaR/comm/MsgHistoryNewDoneTest.kt  |  1 +
 .../pump/danaR/comm/MsgHistoryNewTest.kt      |  3 +-
 .../pump/danaR/comm/MsgHistoryRefillTest.kt   |  3 +-
 .../pump/danaR/comm/MsgHistorySuspendTest.kt  |  3 +-
 .../danaR/comm/MsgInitConnStatusBasicTest.kt  |  1 +
 .../danaR/comm/MsgInitConnStatusBolusTest.kt  |  1 +
 .../danaR/comm/MsgInitConnStatusOptionTest.kt |  1 +
 .../danaR/comm/MsgInitConnStatusTimeTest.kt   |  7 +-
 .../pump/danaR/comm/MsgPCCommStartTest.kt     |  1 +
 .../pump/danaR/comm/MsgPCCommStopTest.kt      |  1 +
 .../comm/MsgSetActivateBasalProfileTest.kt    |  1 +
 .../pump/danaR/comm/MsgSetBasalProfileTest.kt |  1 +
 .../pump/danaR/comm/MsgSetCarbsEntryTest.kt   |  1 +
 .../comm/MsgSetExtendedBolusStartTest.kt      |  1 +
 .../danaR/comm/MsgSetExtendedBolusStopTest.kt |  1 +
 .../comm/MsgSetSingleBasalProfileTest.kt      |  1 +
 .../danaR/comm/MsgSetTempBasalStartTest.kt    |  1 +
 .../plugins/pump/danaR/comm/MsgSetTimeTest.kt |  1 +
 .../pump/danaR/comm/MsgSetUserOptionsTest.kt  |  1 +
 .../danaR/comm/MsgSettingActiveProfileTest.kt |  2 +
 .../comm/MsgSettingBasalProfileAllTest.kt     |  1 +
 .../pump/danaR/comm/MsgSettingBasalTest.kt    |  6 +-
 .../pump/danaR/comm/MsgSettingGlucoseTest.kt  |  1 +
 .../danaR/comm/MsgSettingMaxValuesTest.kt     |  2 +
 .../pump/danaR/comm/MsgSettingMealTest.kt     |  8 +-
 .../comm/MsgSettingProfileRatiosAllTest.kt    |  2 +
 .../danaR/comm/MsgSettingProfileRatiosTest.kt |  2 +
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |  2 +
 .../danaR/comm/MsgSettingShippingInfoTest.kt  |  2 +
 .../danaR/comm/MsgSettingUserOptionsTest.kt   |  3 +-
 .../pump/danaR/comm/MsgStatusBasicTest.kt     |  2 +
 .../danaR/comm/MsgStatusBolusExtendedTest.kt  |  1 +
 .../pump/danaR/comm/MsgStatusProfileTest.kt   |  2 +
 .../pump/danaR/comm/MsgStatusTempBasalTest.kt |  1 +
 .../plugins/pump/danaR/comm/MsgStatusTest.kt  |  2 +
 .../pump/danaRKorean/DanaRKoreanPluginTest.kt |  9 +-
 .../comm/MessageHashTableRKoreanTest.kt       |  9 +-
 .../plugins/pump/danaRv2/DanaRv2PluginTest.kt |  9 +-
 .../danaRv2/comm/MessageHashTable_rv2Test.kt  | 12 +--
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt |  8 +-
 .../danaRv2/comm/MsgHistoryEvents_v2Test.kt   |  6 +-
 .../comm/MsgSetAPSTempBasalStart_v2Test.kt    | 16 ++--
 .../danaRv2/comm/MsgSetHistoryEntry_v2Test.kt |  2 +-
 .../pump/danaRv2/comm/MsgStatusAPS_v2Test.kt  |  4 +-
 .../comm/MsgStatusBolusExtended_v2Test.kt     |  4 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2Test.kt |  2 +-
 .../androidaps/events/EventBTChange.kt        |  0
 .../events/EventPreferenceChange.kt           |  2 -
 .../androidaps/events/EventRebuildTabs.kt     |  0
 .../interfaces/ConfigBuilderInterface.kt      |  5 ++
 .../info/nightscout/androidaps/utils/CRC.java |  0
 dana/src/main/res/values/strings.xml          | 14 +++
 danar/.gitignore                              |  1 +
 danar/build.gradle                            | 82 +++++++++++++++++
 danar/consumer-rules.pro                      |  0
 danar/proguard-rules.pro                      | 21 +++++
 danar/src/main/AndroidManifest.xml            |  5 ++
 .../danaRKorean/DanaRKoreanPlugin.java        | 45 +++++-----
 .../comm/MessageHashTableRKorean.kt           | 34 ++++----
 .../danaRKorean/comm/MsgCheckValue_k.kt       | 10 +--
 .../comm/MsgInitConnStatusBasic_k.kt          | 10 +--
 .../comm/MsgInitConnStatusBolus_k.kt          | 10 +--
 .../comm/MsgInitConnStatusTime_k.kt           | 18 ++--
 .../comm/MsgSettingBasalProfileAll_k.kt       |  8 +-
 .../danaRKorean/comm/MsgSettingBasal_k.kt     | 12 +--
 .../danaRKorean/comm/MsgStatusBasic_k.kt      |  8 +-
 .../danaRKorean/comm/MsgStatus_k.kt           |  8 +-
 .../services/DanaRKoreanExecutionService.java | 56 ++++++------
 .../androidaps}/danaRv2/DanaRv2Plugin.java    | 42 ++++-----
 .../danaRv2/comm/MessageHashTableRv2.kt       | 50 +++++------
 .../danaRv2/comm/MsgCheckValue_v2.kt          | 20 ++---
 .../danaRv2/comm/MsgHistoryEvents_v2.kt       | 33 ++++---
 .../comm/MsgSetAPSTempBasalStart_v2.kt        |  4 +-
 .../danaRv2/comm/MsgSetHistoryEntry_v2.kt     |  4 +-
 .../danaRv2/comm/MsgStatusAPS_v2.kt           |  6 +-
 .../danaRv2/comm/MsgStatusBolusExtended_v2.kt |  6 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2.kt     |  6 +-
 .../services/DanaRv2ExecutionService.java     | 87 +++++++++----------
 .../danar}/AbstractDanaRPlugin.java           | 41 +++++----
 .../danar}/BluetoothDevicePreference.java     |  2 +-
 .../androidaps/danar}/DanaRPlugin.java        | 42 ++++-----
 .../androidaps/danar}/SerialIOThread.java     | 64 ++++++--------
 .../androidaps/danar}/comm/MessageBase.java   |  2 +-
 .../danar}/comm/MessageHashTableBase.kt       |  2 +-
 .../danar}/comm/MessageHashTableR.kt          | 38 ++++----
 .../danar}/comm/MessageOriginalNames.kt       |  2 +-
 .../danar}/comm/MsgBolusProgress.kt           |  8 +-
 .../androidaps/danar}/comm/MsgBolusStart.kt   |  4 +-
 .../danar}/comm/MsgBolusStartWithSpeed.kt     |  4 +-
 .../androidaps/danar}/comm/MsgBolusStop.kt    |  8 +-
 .../androidaps/danar}/comm/MsgCheckValue.kt   |  8 +-
 .../androidaps/danar}/comm/MsgError.kt        |  8 +-
 .../androidaps/danar}/comm/MsgHistoryAlarm.kt |  8 +-
 .../androidaps/danar}/comm/MsgHistoryAll.kt   | 11 +--
 .../danar}/comm/MsgHistoryAllDone.kt          |  4 +-
 .../danar}/comm/MsgHistoryBasalHour.kt        |  8 +-
 .../androidaps/danar}/comm/MsgHistoryBolus.kt |  8 +-
 .../androidaps/danar}/comm/MsgHistoryCarbo.kt |  8 +-
 .../danar}/comm/MsgHistoryDailyInsulin.kt     |  8 +-
 .../androidaps/danar}/comm/MsgHistoryDone.kt  |  4 +-
 .../androidaps/danar}/comm/MsgHistoryError.kt |  8 +-
 .../danar}/comm/MsgHistoryGlucose.kt          |  8 +-
 .../androidaps/danar}/comm/MsgHistoryNew.kt   |  8 +-
 .../danar}/comm/MsgHistoryNewDone.kt          |  4 +-
 .../danar}/comm/MsgHistoryRefill.kt           |  8 +-
 .../danar}/comm/MsgHistorySuspend.kt          |  8 +-
 .../danar}/comm/MsgInitConnStatusBasic.kt     |  4 +-
 .../danar}/comm/MsgInitConnStatusBolus.kt     |  8 +-
 .../danar}/comm/MsgInitConnStatusOption.kt    |  8 +-
 .../danar}/comm/MsgInitConnStatusTime.kt      | 16 ++--
 .../androidaps/danar}/comm/MsgPCCommStart.kt  |  2 +-
 .../androidaps/danar}/comm/MsgPCCommStop.kt   |  2 +-
 .../danar}/comm/MsgSetActivateBasalProfile.kt |  2 +-
 .../danar}/comm/MsgSetBasalProfile.kt         |  4 +-
 .../danar}/comm/MsgSetCarbsEntry.kt           |  2 +-
 .../danar}/comm/MsgSetExtendedBolusStart.kt   |  2 +-
 .../danar}/comm/MsgSetExtendedBolusStop.kt    |  2 +-
 .../danar}/comm/MsgSetSingleBasalProfile.kt   |  4 +-
 .../danar}/comm/MsgSetTempBasalStart.kt       |  2 +-
 .../danar}/comm/MsgSetTempBasalStop.kt        |  2 +-
 .../androidaps/danar}/comm/MsgSetTime.kt      |  2 +-
 .../danar}/comm/MsgSetUserOptions.kt          |  4 +-
 .../danar}/comm/MsgSettingActiveProfile.kt    |  4 +-
 .../androidaps/danar}/comm/MsgSettingBasal.kt |  6 +-
 .../danar}/comm/MsgSettingBasalProfileAll.kt  |  4 +-
 .../danar}/comm/MsgSettingGlucose.kt          |  4 +-
 .../danar}/comm/MsgSettingMaxValues.kt        |  4 +-
 .../androidaps/danar}/comm/MsgSettingMeal.kt  | 10 +--
 .../danar}/comm/MsgSettingProfileRatios.kt    |  4 +-
 .../danar}/comm/MsgSettingProfileRatiosAll.kt |  4 +-
 .../danar}/comm/MsgSettingPumpTime.kt         |  4 +-
 .../danar}/comm/MsgSettingShippingInfo.kt     |  4 +-
 .../danar}/comm/MsgSettingUserOptions.kt      |  4 +-
 .../androidaps/danar}/comm/MsgStatus.kt       |  4 +-
 .../androidaps/danar}/comm/MsgStatusBasic.kt  |  4 +-
 .../danar}/comm/MsgStatusBolusExtended.kt     |  4 +-
 .../danar}/comm/MsgStatusProfile.kt           |  4 +-
 .../danar}/comm/MsgStatusTempBasal.kt         |  4 +-
 .../AbstractDanaRExecutionService.java        | 55 ++++++------
 .../services/DanaRExecutionService.java       | 68 +++++++--------
 .../src/main/res/xml/pref_danar.xml           |  2 +-
 .../src/main/res/xml/pref_danarkorean.xml     |  2 +-
 .../src/main/res/xml/pref_danarv2.xml         |  2 +-
 .../androidaps/danars/DanaRSPlugin.kt         |  3 +-
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  2 +-
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |  2 +-
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |  2 +-
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |  2 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |  2 +-
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |  2 +-
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |  2 +-
 ...acket_Bolus_Get_Calculation_Information.kt |  2 +-
 ...et_Carbohydrate_Calculation_Information.kt |  2 +-
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |  2 +-
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |  2 +-
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |  2 +-
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |  2 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |  2 +-
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |  2 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |  2 +-
 ...aRS_Packet_General_Get_More_Information.kt |  2 +-
 .../DanaRS_Packet_General_Get_Password.kt     |  2 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |  2 +-
 ...Packet_General_Get_Shipping_Information.kt |  2 +-
 ...aRS_Packet_General_Get_Shipping_Version.kt |  2 +-
 ...Packet_General_Get_Today_Delivery_Total.kt |  2 +-
 ...cket_General_Initial_Screen_Information.kt |  2 +-
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |  2 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |  2 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |  2 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |  2 +-
 .../DanaRS_Packet_Option_Set_User_Option.kt   |  2 +-
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |  2 +-
 .../androidaps/danars/services/BLEComm.kt     |  2 +-
 .../danars/services/DanaRSService.kt          |  2 +-
 settings.gradle                               |  1 +
 210 files changed, 893 insertions(+), 692 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt (86%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilderInterface.kt
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/CRC.java (100%)
 create mode 100644 danar/.gitignore
 create mode 100644 danar/build.gradle
 create mode 100644 danar/consumer-rules.pro
 create mode 100644 danar/proguard-rules.pro
 create mode 100644 danar/src/main/AndroidManifest.xml
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/DanaRKoreanPlugin.java (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MessageHashTableRKorean.kt (77%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgCheckValue_k.kt (81%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgInitConnStatusBasic_k.kt (90%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgInitConnStatusBolus_k.kt (90%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgInitConnStatusTime_k.kt (84%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgSettingBasal_k.kt (73%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgStatusBasic_k.kt (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/comm/MsgStatus_k.kt (88%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRKorean/services/DanaRKoreanExecutionService.java (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/DanaRv2Plugin.java (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MessageHashTableRv2.kt (75%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgCheckValue_v2.kt (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgHistoryEvents_v2.kt (88%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgSetHistoryEntry_v2.kt (88%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgStatusAPS_v2.kt (77%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgStatusBolusExtended_v2.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/comm/MsgStatusTempBasal_v2.kt (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump => danar/src/main/java/info/nightscout/androidaps}/danaRv2/services/DanaRv2ExecutionService.java (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/AbstractDanaRPlugin.java (93%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/BluetoothDevicePreference.java (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/DanaRPlugin.java (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/SerialIOThread.java (70%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MessageBase.java (99%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MessageHashTableBase.kt (66%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MessageHashTableR.kt (77%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MessageOriginalNames.kt (99%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgBolusProgress.kt (89%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgBolusStart.kt (89%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgBolusStartWithSpeed.kt (90%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgBolusStop.kt (88%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgCheckValue.kt (79%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgError.kt (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryAlarm.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryAll.kt (95%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryAllDone.kt (81%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryBasalHour.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryBolus.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryCarbo.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryDailyInsulin.kt (64%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryDone.kt (81%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryError.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryGlucose.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryNew.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryNewDone.kt (81%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistoryRefill.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgHistorySuspend.kt (63%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgInitConnStatusBasic.kt (96%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgInitConnStatusBolus.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgInitConnStatusOption.kt (93%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgInitConnStatusTime.kt (85%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgPCCommStart.kt (87%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgPCCommStop.kt (87%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetActivateBasalProfile.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetBasalProfile.kt (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetCarbsEntry.kt (96%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetExtendedBolusStart.kt (95%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetExtendedBolusStop.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetSingleBasalProfile.kt (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetTempBasalStart.kt (95%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetTempBasalStop.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetTime.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSetUserOptions.kt (93%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingActiveProfile.kt (81%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingBasal.kt (83%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingBasalProfileAll.kt (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingGlucose.kt (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingMaxValues.kt (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingMeal.kt (91%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingProfileRatios.kt (93%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingProfileRatiosAll.kt (95%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingPumpTime.kt (89%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingShippingInfo.kt (86%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgSettingUserOptions.kt (95%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgStatus.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgStatusBasic.kt (94%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgStatusBolusExtended.kt (97%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgStatusProfile.kt (92%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/comm/MsgStatusTempBasal.kt (97%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/services/AbstractDanaRExecutionService.java (87%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR => danar/src/main/java/info/nightscout/androidaps/danar}/services/DanaRExecutionService.java (87%)
 rename {app => danar}/src/main/res/xml/pref_danar.xml (96%)
 rename {app => danar}/src/main/res/xml/pref_danarkorean.xml (96%)
 rename {app => danar}/src/main/res/xml/pref_danarv2.xml (95%)

diff --git a/app/build.gradle b/app/build.gradle
index 4bf7ed83e4..b2cb9db72f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -244,6 +244,7 @@ dependencies {
     implementation project(':core')
     implementation project(':dana')
     implementation project(':danars')
+    implementation project(':danar')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
diff --git a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
index 9158c5f119..0a99af2948 100644
--- a/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
+++ b/app/src/androidTest/java/info/nightscout/androidaps/RealPumpTest.kt
@@ -16,7 +16,7 @@ import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugi
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefUltraRapidActingPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.source.RandomBgPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
@@ -42,7 +42,7 @@ class RealPumpTest {
 
     private val validProfile = "{\"dia\":\"6\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"10\"},{\"time\":\"2:00\",\"value\":\"11\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"0.1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4\"}],\"target_high\":[{\"time\":\"00:00\",\"value\":\"5\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
 
-    @Inject lateinit var pump : DanaRv2Plugin
+    @Inject lateinit var pump : info.nightscout.androidaps.danaRv2.DanaRv2Plugin
     @Inject lateinit var randomBgPlugin :RandomBgPlugin
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var profileFunction: ProfileFunction
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 59f2a2d054..2a3dd58566 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -154,15 +154,15 @@
             android:name=".services.LocationService"
             android:exported="false" />
         <service
-            android:name=".plugins.pump.danaR.services.DanaRExecutionService"
+            android:name=".danar.services.DanaRExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.pump.danaRKorean.services.DanaRKoreanExecutionService"
+            android:name=".danaRKorean.services.DanaRKoreanExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
-            android:name=".plugins.pump.danaRv2.services.DanaRv2ExecutionService"
+            android:name=".danaRv2.services.DanaRv2ExecutionService"
             android:enabled="true"
             android:exported="false" />
         <service
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 7260a0da2d..d07bd02c9e 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -35,10 +35,10 @@ import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.general.xdripStatusline.StatusLinePlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 16543e8a86..1157383ec8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -11,6 +11,7 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
@@ -67,6 +68,7 @@ open class AppModule {
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
         @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
         @Binds fun configInterfaceProvider(config: Config): ConfigInterface
+        @Binds fun configBuilderInterfaceProvider(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
         @Binds fun treatmentInterfaceProvider(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
         @Binds fun provideDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
         @Binds fun provideUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 8df9748d27..ccbb4624d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -34,10 +34,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorP
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
@@ -110,19 +110,19 @@ abstract class PluginsModule {
     @PumpDriver
     @IntoMap
     @IntKey(90)
-    abstract fun bindDanaRPlugin(plugin: DanaRPlugin): PluginBase
+    abstract fun bindDanaRPlugin(plugin: info.nightscout.androidaps.danar.DanaRPlugin): PluginBase
 
     @Binds
     @PumpDriver
     @IntoMap
     @IntKey(100)
-    abstract fun bindDanaRKoreanPlugin(plugin: DanaRKoreanPlugin): PluginBase
+    abstract fun bindDanaRKoreanPlugin(plugin: info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin): PluginBase
 
     @Binds
     @PumpDriver
     @IntoMap
     @IntKey(110)
-    abstract fun bindDanaRv2Plugin(plugin: DanaRv2Plugin): PluginBase
+    abstract fun bindDanaRv2Plugin(plugin: info.nightscout.androidaps.danaRv2.DanaRv2Plugin): PluginBase
 
     @Binds
     @PumpDriver
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index 27f9cf5cf1..70258c66e5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -7,11 +7,11 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Dismiss
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService
-import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService
-import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService
+import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService
+import info.nightscout.androidaps.danar.services.DanaRExecutionService
+import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
 import info.nightscout.androidaps.danars.services.DanaRSService
-import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService
+import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.services.LocationService
 @Suppress("unused")
 abstract class ServicesModule {
 
-    @ContributesAndroidInjector abstract fun contributesAbstractDanaRExecutionService(): AbstractDanaRExecutionService
+    @ContributesAndroidInjector abstract fun contributesAbstractDanaRExecutionService(): info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService
     @ContributesAndroidInjector abstract fun contributesAlarmSoundService(): AlarmSoundService
     @ContributesAndroidInjector abstract fun contributesDataService(): DataService
     @ContributesAndroidInjector abstract fun contributesDismissNotificationService(): DismissNotificationService
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
index 5d274d933b..598ddf085f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
@@ -36,7 +36,7 @@ class ConfigBuilderPlugin @Inject constructor(
     .shortName(R.string.configbuilder_shortname)
     .description(R.string.description_config_builder),
     aapsLogger, resourceHelper, injector
-) {
+), ConfigBuilderInterface {
 
     fun initialize() {
         (activePlugin as PluginStore).loadDefaults()
@@ -52,7 +52,7 @@ class ConfigBuilderPlugin @Inject constructor(
         storeSettings("setAlwaysEnabledPluginsEnabled")
     }
 
-    fun storeSettings(from: String) {
+    override fun storeSettings(from: String) {
         activePlugin.pluginsList
         aapsLogger.debug(LTag.CONFIGBUILDER, "Storing settings from: $from")
         activePlugin.verifySelectionInCategories()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index 402c9a58ee..1fd3222cbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.CareportalEvent
@@ -23,11 +24,10 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.treatments.CarbsGenerator
 import info.nightscout.androidaps.queue.Callback
@@ -65,7 +65,7 @@ class ActionStringHandler @Inject constructor(
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
     private val danaRSPlugin: DanaRSPlugin,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val hardLimits: HardLimits,
     private val carbsGenerator: CarbsGenerator,
     private val dateUtil: DateUtil,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
deleted file mode 100644
index 6d2cba9741..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractSerialIOThread.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.services;
-
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-
-/**
- * Created by mike on 28.01.2018.
- */
-
-public abstract class AbstractSerialIOThread extends Thread {
-
-    public abstract void sendMessage(MessageBase message);
-    public abstract void disconnect(String reason);
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index e8916b5647..c91f916d11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.virtual
 
 import android.os.SystemClock
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.DetailedBolusInfo
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71b1948ad1..335bb4898d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,9 +59,6 @@
     <string name="description_profile_nightscout">Provides the profile you have defined in Nightscout</string>
     <string name="description_profile_simple">Define a profile with only one time block.</string>
     <string name="description_pump_combo">Pump integration for Accu-Chek Combo pumps, requires having ruffy installed</string>
-    <string name="description_pump_dana_r">Pump integration for DANA Diabecare R pumps</string>
-    <string name="description_pump_dana_r_korean">Pump integration for domestic DANA Diabecare R pumps</string>
-    <string name="description_pump_dana_r_v2">Pump integration for DANA Diabecare R pumps with upgraded firmware</string>
     <string name="description_pump_mdi">Pump integration for people who do multiple daily injections for their diabetes therapy</string>
     <string name="description_pump_virtual">Pump integration for pumps which don\'t have any driver yet (Open Loop)</string>
     <string name="description_sensitivity_aaps">Sensitivity is calculated the same way like Oref0, but you can specify timeframe to the past. Minimal carb absorption is calculated from max carb absorption time from preferences.</string>
@@ -279,14 +276,11 @@
     <string name="exported_less_than_hour_ago">exported less than hour ago</string>
     <string name="in_directory" comment="placeholder is for exported file path">in directory: %1$s</string>
 
-    <string name="danarpump">DanaR</string>
     <string name="danar_pump_settings">Dana pump settings</string>
     <string name="end_user_license_agreement">End User License Agreement</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string>
     <string name="save">Save</string>
-    <string name="nobtadapter">No bluetooth adapter found</string>
-    <string name="devicenotfound">Selected device not found</string>
     <string name="danar_iob_label">Pump IOB</string>
     <string name="danar_dailyunits">Daily units</string>
     <string name="pump_lastbolus_label">Last bolus</string>
@@ -400,11 +394,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Resend All Data</string>
     <string name="open_settings_on_wear">Open Settings on Wear</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Basal rate:</string>
-    <string name="profile_set_failed">Setting of basal profile failed</string>
-    <string name="danar_disableeasymode">Disable EasyUI mode in pump</string>
-    <string name="danar_switchtouhmode">Change mode from U/d to U/h on pump</string>
     <string name="basalvaluebelowminimum">Basal value below minimum. Profile not set!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Last BG:</string>
@@ -434,7 +424,6 @@
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFILE</string>
@@ -494,7 +483,6 @@
     <string name="paused">Paused</string>
     <string name="key_nsclientinternal_url" translatable="false">nsclientinternal_url</string>
     <string name="key_nsclientinternal_api_secret" translatable="false">nsclientinternal_api_secret</string>
-    <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
     <string name="clearlog">Clear log</string>
     <string name="key_nsclientinternal_autoscroll" translatable="false">nsclientinternal_autoscroll</string>
     <string name="key_nsclientinternal_paused" translatable="false">nsclientinternal_paused</string>
@@ -548,7 +536,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Log app start to NS</string>
     <string name="restartingapp">Exiting application to apply settings.</string>
-    <string name="danarv2pump">DanaRv2</string>
     <string name="configbuilder_insulin_description">Which type of insulin are you using?</string>
     <string name="fastactinginsulin">Fast Acting Insulin</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -714,7 +701,6 @@
     <string name="shortfat">Fat</string>
     <string name="active"><![CDATA[<Active>]]></string>
     <string name="executingrightnow">Command is executed right now</string>
-    <string name="pumpdrivercorrected">Pump driver corrected</string>
     <string name="pump_unreachable">Pump unreachable</string>
     <string name="missed_bg_readings">Missed BG readings</string>
     <string name="key_raise_notifications_as_android_notifications" translatable="false">raise_urgent_alarms_as_android_notification</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
index c12d651eea..74f6bbd89f 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
@@ -24,7 +24,7 @@ open class DanaRSTestBase : TestBaseWithProfile() {
         }
     }
 
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 30ac7a766c..0f229116de 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -7,6 +7,7 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
@@ -19,8 +20,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
@@ -63,7 +63,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var uploadQueue: UploadQueue
 
     private var buildHelper = BuildHelper(Config())
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     lateinit var constraintChecker: ConstraintChecker
     private lateinit var safetyPlugin: SafetyPlugin
@@ -113,11 +113,11 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         constraintChecker = ConstraintChecker(activePlugin)
 
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaRPump, dateUtil, fabricPrivacy)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index f7fb9ac936..86f6e01c2a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -6,6 +6,8 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
@@ -29,7 +31,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     private lateinit var danaRPlugin: DanaRPlugin
 
@@ -44,7 +46,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
         danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, danaRPump, dateUtil)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaRPump, dateUtil, fabricPrivacy)
     }
 
     @Test @Throws(Exception::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 2a46bd697c..c632b3eec0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -7,10 +7,13 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.interfaces.TreatmentsInterface
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
+import org.mockito.Mockito.`when`
 
 open class DanaRTestBase : TestBase() {
 
@@ -18,6 +21,13 @@ open class DanaRTestBase : TestBase() {
     @Mock lateinit var profileFunction: ProfileFunction
     @Mock lateinit var activePluginProvider: ActivePluginProvider
     @Mock lateinit var dateUtil: DateUtil
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
+    @Mock lateinit var treatmentsInterface: TreatmentsInterface
+
+    @Before
+    fun prepareMock() {
+        `when`(activePluginProvider.activeTreatments).thenReturn(treatmentsInterface)
+    }
 
     val injector = HasAndroidInjector {
         AndroidInjector {
@@ -30,7 +40,7 @@ open class DanaRTestBase : TestBase() {
         }
     }
 
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index b17f8efc8d..bea0bc17e5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -1,5 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageHashTableR
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -8,8 +11,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
@@ -38,7 +39,7 @@ class MessageHashTableRTest : DanaRTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, dateUtil)
+        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, databaseHelper, dateUtil)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt
index 0b9c519177..beca8d68d5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNamesTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.danar.comm.MessageOriginalNames
 import org.junit.Assert
 import org.junit.Test
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index b98ac3e378..dee4524a10 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -3,8 +3,9 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.danar.comm.MsgBolusProgress
 import info.nightscout.androidaps.db.Treatment
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
index 87cec753d7..8494fa1106 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgBolusStart
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index 34c0024a99..3b43441b0a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index e64df1a055..7f4f1c24e7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danar.comm.MsgBolusStop
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index d6b43ff775..42a4a6ba59 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MsgCheckValue
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index d03dbf6f20..37dcc2bb21 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgError
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
index e70a9bfe9a..ffea0e4dbe 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryAlarm
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +12,7 @@ class MsgHistoryAlarmTest : DanaRTestBase() {
     val rxBus = RxBusWrapper()
 
     @Test fun runTest() {
-        val packet = MsgHistoryAlarm(aapsLogger, rxBus, dateUtil)
+        val packet = MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
index 7da9c4c241..d4509345db 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryAllDone
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
index 694a523a67..7384ce84d7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.MainApp
+import info.nightscout.androidaps.danar.comm.MsgHistoryAll
 import info.nightscout.androidaps.db.DatabaseHelper
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
@@ -18,7 +19,7 @@ class MsgHistoryAllTest : DanaRTestBase() {
     @Test fun runTest() {
         PowerMockito.mockStatic(MainApp::class.java)
         `when`(MainApp.getDbHelper()).thenReturn(PowerMockito.mock(DatabaseHelper::class.java))
-        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
index 4240454bb9..79ec7d8fdc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryBasalHour
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBasalHourTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
index f93be7d72e..9852196047 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryBolus
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
index e30cf23e14..e455a469ba 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryCarbo
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryCarboTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
index 9c52a30bde..0d00fab90a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryDailyInsulin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDailyInsulinTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
index 8530b9baec..ee77380db4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryDone
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
index e32d657577..f13bcadec9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryError
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryError(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryError(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
index 1e01007392..bc3ab42785 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryGlucose
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
index c5c9ec4f11..5f9f4a9896 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryNewDone
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
index 9cf8f16263..daf56f0b10 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryNew
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
index 1cfbee9c64..fc6a9d3fbd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistoryRefill
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryRefillTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
index d9b6576cda..dcc199df53 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgHistorySuspend
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -9,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistorySuspendTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper(), dateUtil)
+        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
index eba32dbf35..4e3294ca69 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBasic
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
index 28039329a7..6e0e2718e4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBolus
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
index 3b2f7b9045..a6364df74f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgInitConnStatusOption
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index 678842b9ae..ad33c1e690 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -3,8 +3,9 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.comm.MsgInitConnStatusTime
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
@@ -14,7 +15,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, ConfigBuilderPlugin::class)
+@PrepareForTest(info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class, info.nightscout.androidaps.danar.DanaRPlugin::class, ConfigBuilderPlugin::class)
 class MsgInitConnStatusTimeTest : DanaRTestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
index 8a4856ffab..235d5e6757 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgPCCommStart
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
index 89b3c6a334..10452ad547 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgPCCommStop
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
index 47875c29a7..24be4bf480 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetActivateBasalProfile
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
index 9f6dbeb07e..a74a940e0f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
index 2de9486752..9bedcdf29c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetCarbsEntry
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index 8971cee5f3..ad28decac2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
index 5ed8ed4dcb..a870698fdf 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStop
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
index 36fdee444e..f2b1de97da 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetSingleBasalProfile
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
index cee42aea82..f67d0f2aad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStart
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
index 1b5ed6e857..db01c3c138 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetTime
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
index d151b539c0..f62d73b85e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSetUserOptions
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
index 3af752abe9..7978729ba6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
index 2d38ce7bd7..015419579a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSettingBasalProfileAll
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
index 158a364a6d..dad9c144f5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingBasal
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +13,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(DanaRPlugin::class)
+@PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class)
 class MsgSettingBasalTest : DanaRTestBase() {
 
     @Mock lateinit var danaRPlugin: DanaRPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
index 99da2bbc92..498801d889 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgSettingGlucose
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
index 07500d1ce5..000bfa56ea 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
index a56270ad09..949af62d60 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingMeal
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
@@ -12,7 +14,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
+@PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class, info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class)
 class MsgSettingMealTest : DanaRTestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index c263cf9134..01457d0669 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index f33f608b56..31c34db6ec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 8b5c462142..57525da3bb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index 8001eec0df..ef1a7402e1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index 0d1b936aef..3c73bab86e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MsgSettingUserOptions
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -11,7 +12,7 @@ class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
         val packet = MsgSettingUserOptions(aapsLogger, danaRPump)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        danaRPump.units = DanaRPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(48, 7.toByte()))
         Assert.assertEquals(7, danaRPump.lcdOnTimeSec)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
index b627d55c86..eba8672e28 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgStatusBasic
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index 74bf318496..bd12040a0c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index bb9fa76163..bbe5068aa7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgStatusProfile
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
index 7c8fc242cd..ae613c4685 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
index 8bde4483c0..9ef8ff10ce 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MsgStatus
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index defc719499..06c9376188 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -6,11 +6,12 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Assert
 import org.junit.Before
@@ -30,7 +31,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     private lateinit var danaRPlugin: DanaRKoreanPlugin
 
@@ -44,8 +45,8 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, dateUtil)
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, dateUtil, fabricPrivacy)
     }
 
     @Test @Throws(Exception::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index eb5660a162..28618f8281 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -8,8 +8,10 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -30,10 +32,11 @@ class MessageHashTableRKoreanTest : DanaRSTestBase() {
     @Mock lateinit var activePlugin: ActivePluginProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var nsUpload: NSUpload
+    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, injector)
+        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, databaseHelper, injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index 28e45ef20f..dd1f284a63 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -6,12 +6,13 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -30,7 +31,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
-    lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    lateinit var danaRPump: DanaRPump
 
     private lateinit var danaRv2Plugin: DanaRv2Plugin
 
@@ -44,8 +45,8 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
-        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, treatmentsPlugin, sp, commandQueue, detailedBolusInfoStorage, dateUtil)
+        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, detailedBolusInfoStorage, dateUtil, fabricPrivacy)
     }
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index 28d07d33d9..53c454780d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -1,6 +1,12 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import android.content.Context
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -9,11 +15,7 @@ import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -46,7 +48,7 @@ class MessageHashTable_rv2Test : DanaRTestBase() {
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, treatmentsPlugin, nsUpload, injector, DateUtil(context, resourceHelper))
+        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, nsUpload, injector, DateUtil(context, resourceHelper), databaseHelper)
         val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaRPump)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index cc064d48b6..0c6c105342 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -3,11 +3,11 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
index bcfacf1e81..6192aec5e8 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -1,11 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import android.content.Context
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
@@ -23,10 +22,9 @@ class MsgHistoryEvents_v2Test : DanaRTestBase() {
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
 
     @Test @Throws(Exception::class) fun runTest() {
-        var packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), treatmentsPlugin, injector, DateUtil(context, resourceHelper), 0)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), activePluginProvider, injector, DateUtil(context, resourceHelper), 0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
index 901596d7ff..0a275c8418 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase.intFromBuff
+import info.nightscout.androidaps.danar.comm.MessageBase.intFromBuff
 import info.nightscout.androidaps.danars.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
 import org.junit.Assert
 import org.junit.Test
@@ -14,31 +14,31 @@ class MsgSetAPSTempBasalStart_v2Test : DanaRTestBase() {
     @Test fun runTest() {
 
         // test low hard limit
-        var packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
+        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
         Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
         Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
         // test setting 15 min
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
         Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
         // test setting 30 min
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
         Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
         // over 200% set always 15 min
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
         Assert.assertEquals(250, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
         // test low hard limit
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
         Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
         Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
         Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
index 34b0fc8b7b..0510313426 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetHistoryEntry_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        var packet = MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
+        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
         // test message decoding
         // != 1 fails
         packet.handleMessage(createArray(34, 2.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
index c873d4619b..268e8721c3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,7 +12,7 @@ class MsgStatusAPS_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = MsgStatusAPS_v2(aapsLogger, danaRPump)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2(aapsLogger, danaRPump)
         // test iob
         //TODO Find a way to mock treatments plugin
         val testArray = createArray(34, 7.toByte())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
index 2f55887d29..6a30acd7e4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,7 +12,7 @@ class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = MsgStatusBolusExtended_v2(aapsLogger, danaRPump)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2(aapsLogger, danaRPump)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaRPump.extendedBolusAmount, 0.0)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
index fefc050457..a1cb55b1e2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTempBasal_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil)
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
         Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventBTChange.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
index 1f7856b7cd..d30f0d9a54 100644
--- a/app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.kt
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.events
 
-import android.content.res.Resources
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class EventPreferenceChange : Event {
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt b/core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilderInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilderInterface.kt
new file mode 100644
index 0000000000..effafb788a
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ConfigBuilderInterface.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.interfaces
+
+interface ConfigBuilderInterface {
+    fun storeSettings(from: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/CRC.java b/core/src/main/java/info/nightscout/androidaps/utils/CRC.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/CRC.java
rename to core/src/main/java/info/nightscout/androidaps/utils/CRC.java
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index 14f8864d67..ada62ece9c 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="key_danars_v3_randomsynckey" translatable="false">danars_v3_randomsync_key_</string>
     <string name="key_rs_logcanulachange" translatable="false">rs_logcanulachange</string>
     <string name="key_rs_loginsulinchange" translatable="false">rs_loginsulinchange</string>
+    <string name="key_danar_bt_name" translatable="false">danar_bt_name</string>
 
     <string name="danars_pairing">Pairing</string>
     <string name="danars_nodeviceavailable">No device found so far</string>
@@ -89,5 +90,18 @@
     <string name="danar_shutdown">Shutdown [hours]</string>
     <string name="danar_lowreservoir">Low reservoir [Units]</string>
     <string name="danar_saveuseroptions">Save options to pump</string>
+    <string name="description_pump_dana_r">Pump integration for DANA Diabecare R pumps</string>
+    <string name="description_pump_dana_r_korean">Pump integration for domestic DANA Diabecare R pumps</string>
+    <string name="description_pump_dana_r_v2">Pump integration for DANA Diabecare R pumps with upgraded firmware</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">No bluetooth adapter found</string>
+    <string name="devicenotfound">Selected device not found</string>
+    <string name="danar_switchtouhmode">Change mode from U/d to U/h on pump</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pump driver corrected</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Disable EasyUI mode in pump</string>
+    <string name="profile_set_failed">Setting of basal profile failed</string>
 
 </resources>
diff --git a/danar/.gitignore b/danar/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/danar/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/danar/build.gradle b/danar/build.gradle
new file mode 100644
index 0000000000..dc0b51d60e
--- /dev/null
+++ b/danar/build.gradle
@@ -0,0 +1,82 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
+}
+
+dependencies {
+    implementation project(':core')
+    implementation project(':dana')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity:${activityVersion}"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    // remove after conversion to aapslogger
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    implementation 'net.danlew:android.joda:2.10.6'
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    //RxBus
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/danar/consumer-rules.pro b/danar/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/danar/proguard-rules.pro b/danar/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/danar/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/danar/src/main/AndroidManifest.xml b/danar/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..75256d3b75
--- /dev/null
+++ b/danar/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.danar" >
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+</manifest>
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
index 01b70b63aa..d504b9a24a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean;
+package info.nightscout.androidaps.danaRKorean;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,15 +12,19 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService;
+import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
+import info.nightscout.androidaps.danar.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
@@ -29,10 +33,6 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.services.DanaRKoreanExecutionService;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
@@ -49,6 +49,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
     private final Context context;
     private final ResourceHelper resourceHelper;
     private final ConstraintChecker constraintChecker;
+    private final FabricPrivacy fabricPrivacy;
 
     @Inject
     public DanaRKoreanPlugin(
@@ -59,16 +60,18 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             Context context,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
-            TreatmentsPlugin treatmentsPlugin,
+            ActivePluginProvider activePlugin,
             SP sp,
             CommandQueueProvider commandQueue,
-            DateUtil dateUtil
+            DateUtil dateUtil,
+            FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
         this.constraintChecker = constraintChecker;
+        this.fabricPrivacy = fabricPrivacy;
         getPluginDescription().description(R.string.description_pump_dana_r_korean);
 
         useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
@@ -87,16 +90,16 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
                         boolean previousValue = useExtendedBoluses;
                         useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
 
-                        if (useExtendedBoluses != previousValue && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
+                        if (useExtendedBoluses != previousValue && activePlugin.getActiveTreatments().isInHistoryExtendedBoluslInProgress()) {
                             sExecutionService.extendedBolusStop();
                         }
                     }
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
         );
         super.onStart();
     }
@@ -171,11 +174,11 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             if (!result.success)
                 result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
-                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+                result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             detailedBolusInfo.insulin = t.insulin;
             detailedBolusInfo.date = System.currentTimeMillis();
-            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
+            activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
             return result;
         } else {
             PumpEnactResult result = new PumpEnactResult(getInjector());
@@ -206,8 +209,8 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
-        ExtendedBolus activeExtended = treatmentsPlugin.getExtendedBolusFromHistory(now);
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(now);
+        ExtendedBolus activeExtended = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(now);
 
         if (doTempOff) {
             // If extended in progress
@@ -328,15 +331,15 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
     @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        if (treatmentsPlugin.isInHistoryRealTempBasalInProgress())
+        if (activePlugin.getActiveTreatments().isInHistoryRealTempBasalInProgress())
             return cancelRealTempBasal();
-        if (treatmentsPlugin.isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
+        if (activePlugin.getActiveTreatments().isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
             return cancelExtendedBolus();
         }
         PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         result.enacted = false;
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+        result.comment = resourceHelper.gs(R.string.ok);
         result.isTempCancel = true;
         return result;
     }
@@ -348,7 +351,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
     private PumpEnactResult cancelRealTempBasal() {
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal runningTB = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
@@ -357,7 +360,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
         if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
index 04a2c45ccd..2fff171f46 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -1,17 +1,18 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.*
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.*
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -24,18 +25,19 @@ class MessageHashTableRKorean @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    danaRPump: DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderPlugin,
+    configBuilderPlugin: ConfigBuilderInterface,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
     dateUtil: DateUtil,
     nsUpload: NSUpload,
+    databaseHelper: DatabaseHelperInterface,
     injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
-    var messages: HashMap<Int, MessageBase> = HashMap()
+    private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
         put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
@@ -57,11 +59,11 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
         put(MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
         put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
@@ -71,9 +73,9 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
         put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
         put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
         put(MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 90c5324be9..8cc5d40ae5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -1,14 +1,14 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 
 class MsgCheckValue_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index e2496e9d55..1a2b09eb95 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -1,21 +1,21 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBasic_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index f99fbb1cd2..243c5714d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -1,6 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -8,15 +10,13 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index 8f1c9a56d9..feb7a292cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -1,19 +1,19 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -21,10 +21,10 @@ class MsgInitConnStatusTime_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val configBuilderPlugin: ConfigBuilderInterface,
     private val commandQueue: CommandQueueProvider,
     private val dateUtil: DateUtil
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 0c1b3475b9..463c7ffe04 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -1,9 +1,9 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 import java.util.*
 
 /**
@@ -16,7 +16,7 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
similarity index 73%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
index cbb46fa0be..c460a7f313 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -1,15 +1,15 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import java.util.*
 
 class MsgSettingBasal_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
@@ -19,7 +19,7 @@ class MsgSettingBasal_k(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         for (index in 0..23) {
             var basal = intFromBuff(bytes, 2 * index, 2)
             if (basal < danaRKoreanPlugin.pumpDescription.basalMinimumRate) basal = 0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
index 6d3b8660f1..b01011af8b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
 class MsgStatusBasic_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
index b4c2c68870..10d5a96473 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MsgStatus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
+package info.nightscout.androidaps.danaRKorean.comm
 
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
 
 class MsgStatus_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
rename to danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 1e06b7a1de..78e9e6256b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRKorean.services;
+package info.nightscout.androidaps.danaRKorean.services;
 
 import android.os.Binder;
 import android.os.SystemClock;
@@ -9,9 +9,30 @@ import java.util.Date;
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danar.DanaRPlugin;
+import info.nightscout.androidaps.danar.R;
+import info.nightscout.androidaps.danar.SerialIOThread;
+import info.nightscout.androidaps.danar.comm.MsgBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.danar.comm.MsgSetSingleBasalProfile;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.danar.comm.MsgSetTime;
+import info.nightscout.androidaps.danar.comm.MsgSettingBasal;
+import info.nightscout.androidaps.danar.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.danar.comm.MsgSettingMeal;
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended;
+import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal;
+import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
@@ -29,31 +50,10 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetSingleBasalProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MessageHashTableRKorean;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgCheckValue_k;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgSettingBasal_k;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.comm.MsgStatusBasic_k;
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean;
+import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgSettingBasal_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.T;
@@ -115,7 +115,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableRKorean, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRKorean, danaRPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index b7e03ec67e..2802bb5b0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2Plugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2;
+package info.nightscout.androidaps.danaRv2;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,13 +12,17 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
+import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
+import info.nightscout.androidaps.danar.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.logging.AAPSLogger;
@@ -27,10 +31,6 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.danaR.AbstractDanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2ExecutionService;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
@@ -49,7 +49,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     private final ResourceHelper resourceHelper;
     private final ConstraintChecker constraintChecker;
     private final DetailedBolusInfoStorage detailedBolusInfoStorage;
-
+    private final FabricPrivacy fabricPrivacy;
 
     public long lastEventTimeLoaded = 0;
     public boolean eventsLoadingDone = false;
@@ -63,18 +63,20 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             DanaRPump danaRPump,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
-            TreatmentsPlugin treatmentsPlugin,
+            ActivePluginProvider activePlugin,
             SP sp,
             CommandQueueProvider commandQueue,
             DetailedBolusInfoStorage detailedBolusInfoStorage,
-            DateUtil dateUtil
+            DateUtil dateUtil,
+            FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
         this.constraintChecker = constraintChecker;
         this.detailedBolusInfoStorage = detailedBolusInfoStorage;
+        this.fabricPrivacy = fabricPrivacy;
         getPluginDescription().description(R.string.description_pump_dana_r_v2);
 
         useExtendedBoluses = false;
@@ -89,7 +91,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
         );
         super.onStart();
     }
@@ -191,7 +193,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             if (!result.success)
                 result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
-                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+                result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             // remove carbs because it's get from history separately
             return result;
@@ -234,7 +236,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
         if (doTempOff) {
             // If temp in progress
-            if (treatmentsPlugin.isTempBasalInProgress()) {
+            if (activePlugin.getActiveTreatments().isTempBasalInProgress()) {
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)");
                 return cancelTempBasal(false);
             }
@@ -254,7 +256,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             if (percentRate > 500) // Special high temp 500/15min
                 percentRate = 500;
             // Check if some temp is already in progress
-            TemporaryBasal activeTemp = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
+            TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
             if (activeTemp != null) {
                 // Correct basal already set ?
                 if (activeTemp.percentRate == percentRate && activeTemp.getPlannedRemainingMinutes() > 4) {
@@ -308,12 +310,12 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(now);
         if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             result.duration = pump.getTempBasalRemainingMin();
             result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
@@ -330,7 +332,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             result.isTempCancel = false;
             result.duration = pump.getTempBasalRemainingMin();
             result.percent = pump.getTempBasalPercent();
@@ -352,7 +354,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             result.isTempCancel = false;
             result.duration = pump.getTempBasalRemainingMin();
             result.percent = pump.getTempBasalPercent();
@@ -370,7 +372,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal runningTB = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
@@ -379,7 +381,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
similarity index 75%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
index a5896b5a4c..004a1078af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTableRv2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
@@ -1,20 +1,20 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.*
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.*
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -27,21 +27,21 @@ class MessageHashTableRv2 @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    danaRPump: DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     danaRv2Plugin: DanaRv2Plugin,
-    configBuilderPlugin: ConfigBuilderPlugin,
+    configBuilderPlugin: ConfigBuilderInterface,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
     detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    treatmentsPlugin: TreatmentsPlugin,
     nsUpload: NSUpload,
     injector: HasAndroidInjector,
-    dateUtil: DateUtil
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
 ) : MessageHashTableBase {
 
-    var messages: HashMap<Int, MessageBase> = HashMap()
+    private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
         put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
@@ -65,15 +65,15 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
         put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
         put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
@@ -91,13 +91,13 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
         put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
         put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgStatusAPS_v2(aapsLogger, danaRPump))              // 0xE001 CMD_PUMPSTATUS_APS
         put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
+        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
         put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 8f0ab31d36..3144eec663 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -1,31 +1,31 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgCheckValue_v2(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
-    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val configBuilderPlugin: ConfigBuilderInterface,
     private val commandQueue: CommandQueueProvider
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
index 8b1bbf6e15..29292f6256 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -1,20 +1,19 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.R
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -25,7 +24,7 @@ class MsgHistoryEvents_v2 constructor(
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     val danaRv2Plugin: DanaRv2Plugin,
     val rxBus: RxBusWrapper,
-    val treatmentsPlugin: TreatmentsPlugin,
+    val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector,
     private val dateUtil: DateUtil,
     var from: Long = 0
@@ -78,13 +77,13 @@ class MsgHistoryEvents_v2 constructor(
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
-                treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
+                activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
             info.nightscout.androidaps.dana.DanaRPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
-                treatmentsPlugin.addToHistoryTempBasal(temporaryBasal)
+                activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
@@ -92,13 +91,13 @@ class MsgHistoryEvents_v2 constructor(
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
-                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
@@ -109,7 +108,7 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.source = Source.PUMP
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
-                val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
@@ -121,7 +120,7 @@ class MsgHistoryEvents_v2 constructor(
                 detailedBolusInfo.source = Source.PUMP
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
-                val newRecord = treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false)
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
@@ -130,13 +129,13 @@ class MsgHistoryEvents_v2 constructor(
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
-                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
             info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
-                treatmentsPlugin.addToHistoryExtendedBolus(extendedBolus)
+                activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
@@ -171,12 +170,12 @@ class MsgHistoryEvents_v2 constructor(
                 emptyCarbsInfo.date = datetime
                 emptyCarbsInfo.source = Source.PUMP
                 emptyCarbsInfo.pumpId = datetime
-                val newRecord = treatmentsPlugin.addToHistoryTreatment(emptyCarbsInfo, false)
+                val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(emptyCarbsInfo, false)
                 aapsLogger.debug(LTag.PUMPBTCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            else                        -> {
+            else                                                        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 2ff8c669ef..8e09ee1273 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 
 @Suppress("UNUSED_PARAMETER")
 class MsgSetAPSTempBasalStart_v2(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
index b0d8777efa..7a73fc4c00 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
@@ -1,8 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 import java.util.*
 
 class MsgSetHistoryEntry_v2(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
index f3ff2d1afd..88ee0eeec7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 
 class MsgStatusAPS_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
index bef75168a6..e7d26326ff 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -1,14 +1,14 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
index ce13522cc8..38533d3ad5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -1,15 +1,15 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
rename to danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index e3a88158b7..f0138a3fba 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.services;
+package info.nightscout.androidaps.danaRv2.services;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,10 +12,46 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2;
+import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2;
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2;
+import info.nightscout.androidaps.danar.DanaRPlugin;
+import info.nightscout.androidaps.danar.R;
+import info.nightscout.androidaps.danar.SerialIOThread;
+import info.nightscout.androidaps.danar.comm.MessageBase;
+import info.nightscout.androidaps.danar.comm.MsgBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.danar.comm.MsgSetActivateBasalProfile;
+import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile;
+import info.nightscout.androidaps.danar.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.danar.comm.MsgSetTime;
+import info.nightscout.androidaps.danar.comm.MsgSetUserOptions;
+import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile;
+import info.nightscout.androidaps.danar.comm.MsgSettingBasal;
+import info.nightscout.androidaps.danar.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.danar.comm.MsgSettingMeal;
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll;
+import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.danar.comm.MsgSettingUserOptions;
+import info.nightscout.androidaps.danar.comm.MsgStatus;
+import info.nightscout.androidaps.danar.comm.MsgStatusBasic;
+import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
@@ -25,55 +61,18 @@ import info.nightscout.androidaps.events.EventProfileNeedsUpdate;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetUserOptions;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingActiveProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatiosAll;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingUserOptions;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MessageHashTableRv2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgCheckValue_v2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgHistoryEvents_v2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetAPSTempBasalStart_v2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgSetHistoryEntry_v2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusBolusExtended_v2;
-import info.nightscout.androidaps.plugins.pump.danaRv2.comm.MsgStatusTempBasal_v2;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -92,12 +91,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject DanaRv2Plugin danaRv2Plugin;
     @Inject ActivePluginProvider activePlugin;
-    @Inject ConfigBuilderPlugin configBuilderPlugin;
+    @Inject ConfigBuilderInterface configBuilderPlugin;
     @Inject CommandQueueProvider commandQueue;
     @Inject Context context;
     @Inject MessageHashTableRv2 messageHashTableRv2;
     @Inject DetailedBolusInfoStorage detailedBolusInfoStorage;
-    @Inject TreatmentsPlugin treatmentsPlugin;
+    @Inject ActivePluginProvider activePluginProvider;
     @Inject ProfileFunction profileFunction;
     @Inject NSUpload nsUpload;
     @Inject SP sp;
@@ -146,7 +145,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableRv2, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRv2, danaRPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
@@ -449,7 +448,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, treatmentsPlugin, injector, dateUtil, lastHistoryFetched);
+        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil, lastHistoryFetched);
         aapsLogger.debug(LTag.PUMP, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index 1f314d143c..20403812b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/AbstractDanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
+package info.nightscout.androidaps.danar;
 
 import androidx.annotation.NonNull;
 
@@ -9,17 +9,18 @@ import java.util.Date;
 import java.util.List;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaPumpInterface;
 import info.nightscout.androidaps.dana.DanaRFragment;
 import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
+import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.ConstraintsInterface;
@@ -39,8 +40,6 @@ import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractDanaRExecutionService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.Round;
@@ -65,7 +64,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected DanaRPump danaRPump;
     protected ConstraintChecker constraintChecker;
     protected RxBusWrapper rxBus;
-    protected TreatmentsPlugin treatmentsPlugin;
+    protected ActivePluginProvider activePlugin;
     protected SP sp;
     protected DateUtil dateUtil;
 
@@ -77,7 +76,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             AAPSLogger aapsLogger,
             CommandQueueProvider commandQueue,
             RxBusWrapper rxBus,
-            TreatmentsPlugin treatmentsPlugin,
+            ActivePluginProvider activePlugin,
             SP sp,
             DateUtil dateUtil
     ) {
@@ -86,14 +85,14 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
                         .fragmentClass(DanaRFragment.class.getName())
                         .pluginName(R.string.danarspump)
                         .shortName(R.string.danarpump_shortname)
-                        .preferencesId(R.xml.pref_danars)
+                        .preferencesId(R.xml.pref_danar)
                         .description(R.string.description_pump_dana_r),
                 injector, aapsLogger, resourceHelper, commandQueue
         );
         this.danaRPump = danaRPump;
         this.constraintChecker = constraintChecker;
         this.rxBus = rxBus;
-        this.treatmentsPlugin = treatmentsPlugin;
+        this.activePlugin = activePlugin;
         this.sp = sp;
         this.dateUtil = dateUtil;
     }
@@ -233,12 +232,12 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(now);
         if (activeTemp != null && activeTemp.percentRate == percent && activeTemp.getPlannedRemainingMinutes() > 4 && !enforceNew) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
-            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.ok);
             result.duration = pump.getTempBasalRemainingMin();
             result.percent = pump.getTempBasalPercent();
             result.isPercent = true;
@@ -250,7 +249,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
             result.enacted = true;
             result.success = true;
-            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.ok);
             result.isTempCancel = false;
             result.duration = pump.getTempBasalRemainingMin();
             result.percent = pump.getTempBasalPercent();
@@ -274,11 +273,11 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep);
 
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
+        ExtendedBolus runningEB = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
-            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.ok);
             result.duration = pump.getExtendedBolusRemainingMinutes();
             result.absolute = pump.getExtendedBolusAbsoluteRate();
             result.isPercent = false;
@@ -290,7 +289,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         if (connectionOK && pump.isExtendedInProgress() && Math.abs(pump.getExtendedBolusAmount() - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = true;
             result.success = true;
-            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.ok);
             result.isTempCancel = false;
             result.duration = pump.getExtendedBolusRemainingMinutes();
             result.absolute = pump.getExtendedBolusAbsoluteRate();
@@ -310,7 +309,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     @NonNull @Override
     public PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        ExtendedBolus runningEB = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
+        ExtendedBolus runningEB = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(System.currentTimeMillis());
         if (runningEB != null) {
             sExecutionService.extendedBolusStop();
             result.enacted = true;
@@ -318,7 +317,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         }
         if (!danaRPump.isExtendedInProgress()) {
             result.success = true;
-            result.comment = getResourceHelper().gs(R.string.virtualpump_resultok);
+            result.comment = getResourceHelper().gs(R.string.ok);
             getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");
             return result;
         } else {
@@ -372,7 +371,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         DanaRPump pump = danaRPump;
         long now = System.currentTimeMillis();
         if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
-            return null;
+            return new JSONObject();
         }
         JSONObject pumpjson = new JSONObject();
         JSONObject battery = new JSONObject();
@@ -387,13 +386,13 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
                 extended.put("LastBolus", dateUtil.dateAndTimeString(pump.getLastBolusTime()));
                 extended.put("LastBolusAmount", pump.getLastBolusAmount());
             }
-            TemporaryBasal tb = treatmentsPlugin.getRealTempBasalFromHistory(now);
+            TemporaryBasal tb = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(now);
             if (tb != null) {
                 extended.put("TempBasalAbsoluteRate", tb.tempBasalConvertedToAbsolute(now, profile));
                 extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.date));
                 extended.put("TempBasalRemaining", tb.getPlannedRemainingMinutes());
             }
-            ExtendedBolus eb = treatmentsPlugin.getExtendedBolusFromHistory(now);
+            ExtendedBolus eb = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(now);
             if (eb != null) {
                 extended.put("ExtendedBolusAbsoluteRate", eb.absoluteRate());
                 extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.date));
@@ -486,11 +485,11 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         if (pump.getLastBolusTime() != 0) {
             ret += "LastBolus: " + DecimalFormatter.to2Decimal(pump.getLastBolusAmount()) + "U @" + android.text.format.DateFormat.format("HH:mm", pump.getLastBolusTime()) + "\n";
         }
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(System.currentTimeMillis());
         if (activeTemp != null) {
             ret += "Temp: " + activeTemp.toStringFull() + "\n";
         }
-        ExtendedBolus activeExtendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis());
+        ExtendedBolus activeExtendedBolus = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(System.currentTimeMillis());
         if (activeExtendedBolus != null) {
             ret += "Extended: " + activeExtendedBolus.toString() + "\n";
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java b/danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.java
index b255b1b556..794587c2ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/BluetoothDevicePreference.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/BluetoothDevicePreference.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
+package info.nightscout.androidaps.danar;
 
 import android.bluetooth.*;
 import android.content.Context;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index 1ebd144b40..0f37479d47 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
+package info.nightscout.androidaps.danar;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,15 +12,17 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.danar.services.DanaRExecutionService;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.ExtendedBolus;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
 import info.nightscout.androidaps.interfaces.PluginType;
@@ -29,9 +31,6 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.danaR.services.DanaRExecutionService;
-import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.Round;
@@ -48,6 +47,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
     private final Context context;
     private final ResourceHelper resourceHelper;
     private final ConstraintChecker constraintChecker;
+    private final FabricPrivacy fabricPrivacy;
 
     @Inject
     public DanaRPlugin(
@@ -57,17 +57,19 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             Context context,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
-            TreatmentsPlugin treatmentsPlugin,
+            ActivePluginProvider activePlugin,
             SP sp,
             CommandQueueProvider commandQueue,
             DanaRPump danaRPump,
-            DateUtil dateUtil
+            DateUtil dateUtil,
+            FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, treatmentsPlugin, sp, dateUtil);
+        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
         this.constraintChecker = constraintChecker;
+        this.fabricPrivacy = fabricPrivacy;
 
         useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
         pumpDescription.setPumpDescription(PumpType.DanaR);
@@ -85,16 +87,16 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
                         boolean previousValue = useExtendedBoluses;
                         useExtendedBoluses = sp.getBoolean(R.string.key_danar_useextended, false);
 
-                        if (useExtendedBoluses != previousValue && treatmentsPlugin.isInHistoryExtendedBoluslInProgress()) {
+                        if (useExtendedBoluses != previousValue && activePlugin.getActiveTreatments().isInHistoryExtendedBoluslInProgress()) {
                             sExecutionService.extendedBolusStop();
                         }
                     }
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> context.unbindService(mConnection), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> context.unbindService(mConnection), fabricPrivacy::logException)
         );
         super.onStart();
     }
@@ -170,11 +172,11 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             if (!result.success)
                 result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
             else
-                result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+                result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
             detailedBolusInfo.insulin = t.insulin;
             detailedBolusInfo.date = System.currentTimeMillis();
-            treatmentsPlugin.addToHistoryTreatment(detailedBolusInfo, false);
+            activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
             return result;
         } else {
             PumpEnactResult result = new PumpEnactResult(getInjector());
@@ -205,8 +207,8 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
         long now = System.currentTimeMillis();
-        TemporaryBasal activeTemp = treatmentsPlugin.getRealTempBasalFromHistory(now);
-        ExtendedBolus activeExtended = treatmentsPlugin.getExtendedBolusFromHistory(now);
+        TemporaryBasal activeTemp = activePlugin.getActiveTreatments().getRealTempBasalFromHistory(now);
+        ExtendedBolus activeExtended = activePlugin.getActiveTreatments().getExtendedBolusFromHistory(now);
 
         if (doTempOff) {
             // If extended in progress
@@ -327,15 +329,15 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     @NonNull @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
-        if (treatmentsPlugin.isInHistoryRealTempBasalInProgress())
+        if (activePlugin.getActiveTreatments().isInHistoryRealTempBasalInProgress())
             return cancelRealTempBasal();
-        if (treatmentsPlugin.isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
+        if (activePlugin.getActiveTreatments().isInHistoryExtendedBoluslInProgress() && useExtendedBoluses) {
             return cancelExtendedBolus();
         }
         PumpEnactResult result = new PumpEnactResult(getInjector());
         result.success = true;
         result.enacted = false;
-        result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+        result.comment = resourceHelper.gs(R.string.ok);
         result.isTempCancel = true;
         return result;
     }
@@ -347,7 +349,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     private PumpEnactResult cancelRealTempBasal() {
         PumpEnactResult result = new PumpEnactResult(getInjector());
-        TemporaryBasal runningTB = treatmentsPlugin.getTempBasalFromHistory(System.currentTimeMillis());
+        TemporaryBasal runningTB = activePlugin.getActiveTreatments().getTempBasalFromHistory(System.currentTimeMillis());
         if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
@@ -356,7 +358,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
         if (!danaRPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
-            result.comment = resourceHelper.gs(R.string.virtualpump_resultok);
+            result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK");
             return result;
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
similarity index 70%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
index 60c38b2f66..055090ca1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/SerialIOThread.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
@@ -1,28 +1,24 @@
-package info.nightscout.androidaps.plugins.pump.danaR;
+package info.nightscout.androidaps.danar;
 
 import android.bluetooth.BluetoothSocket;
 import android.os.SystemClock;
 
-import org.slf4j.Logger;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
 import info.nightscout.androidaps.dana.DanaRPump;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.danar.comm.MessageBase;
+import info.nightscout.androidaps.danar.comm.MessageHashTableBase;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableBase;
-import info.nightscout.androidaps.plugins.pump.danaR.services.AbstractSerialIOThread;
 import info.nightscout.androidaps.utils.CRC;
 
 /**
  * Created by mike on 17.07.2016.
  */
-public class SerialIOThread extends AbstractSerialIOThread {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.PUMPBTCOMM);
+public class SerialIOThread extends Thread {
+    private AAPSLogger aapsLogger;
 
     private InputStream mInputStream = null;
     private OutputStream mOutputStream = null;
@@ -35,17 +31,18 @@ public class SerialIOThread extends AbstractSerialIOThread {
     private MessageHashTableBase hashTable;
     private DanaRPump danaRPump;
 
-    public SerialIOThread(BluetoothSocket rfcommSocket, MessageHashTableBase hashTable, DanaRPump danaRPump) {
+    public SerialIOThread(AAPSLogger aapsLogger, BluetoothSocket rfcommSocket, MessageHashTableBase hashTable, DanaRPump danaRPump) {
         super();
         this.hashTable = hashTable;
         this.danaRPump = danaRPump;
+        this.aapsLogger = aapsLogger;
 
         mRfCommSocket = rfcommSocket;
         try {
             mOutputStream = mRfCommSocket.getOutputStream();
             mInputStream = mRfCommSocket.getInputStream();
         } catch (IOException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         this.start();
     }
@@ -77,8 +74,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
                         message = hashTable.findMessage(command);
                     }
 
-                    if (L.isEnabled(LTag.PUMPBTCOMM))
-                        log.debug("<<<<< " + message.getMessageName() + " " + MessageBase.toHexString(extractedBuff));
+                    aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message.getMessageName() + " " + MessageBase.toHexString(extractedBuff));
 
                     // process the message content
                     message.received = true;
@@ -90,7 +86,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
             }
         } catch (Exception e) {
             if (!e.getMessage().contains("bt socket closed"))
-                log.error("Thread exception: ", e);
+                aapsLogger.error("Thread exception: ", e);
             mKeepRunning = false;
         }
         disconnect("EndOfLoop");
@@ -112,7 +108,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
                 return null;
             }
             if (mReadBuff[length - 2] != (byte) 0x2E || mReadBuff[length - 1] != (byte) 0x2E) {
-                log.error("wrong packet lenght=" + length + " data " + MessageBase.toHexString(mReadBuff));
+                aapsLogger.error("wrong packet lenght=" + length + " data " + MessageBase.toHexString(mReadBuff));
                 disconnect("wrong packet");
                 return null;
             }
@@ -125,7 +121,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
             byte crcByte1received = mReadBuff[length - 3];
 
             if (crcByte0 != crcByte0received || crcByte1 != crcByte1received) {
-                log.error("CRC Error" + String.format("%02x ", crcByte0) + String.format("%02x ", crcByte1) + String.format("%02x ", crcByte0received) + String.format("%02x ", crcByte1received));
+                aapsLogger.error("CRC Error" + String.format("%02x ", crcByte0) + String.format("%02x ", crcByte1) + String.format("%02x ", crcByte0received) + String.format("%02x ", crcByte1received));
                 disconnect("crc error");
                 return null;
             }
@@ -138,80 +134,70 @@ public class SerialIOThread extends AbstractSerialIOThread {
             mReadBuff = unprocessedData;
             return extractedBuff;
         } else {
-            log.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.toHexString(mReadBuff));
+            aapsLogger.error("Wrong beginning of packet len=" + mReadBuff.length + "    " + MessageBase.toHexString(mReadBuff));
             disconnect("Wrong beginning of packet");
             return null;
         }
     }
 
-    @Override
     public synchronized void sendMessage(MessageBase message) {
         if (!mRfCommSocket.isConnected()) {
-            log.error("Socket not connected on sendMessage");
+            aapsLogger.error("Socket not connected on sendMessage");
             return;
         }
         processedMessage = message;
 
         byte[] messageBytes = message.getRawMessageBytes();
-        if (L.isEnabled(LTag.PUMPBTCOMM))
-            log.debug(">>>>> " + message.getMessageName() + " " + MessageBase.toHexString(messageBytes));
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.getMessageName() + " " + MessageBase.toHexString(messageBytes));
 
         try {
             mOutputStream.write(messageBytes);
         } catch (Exception e) {
-            log.error("sendMessage write exception: ", e);
+            aapsLogger.error("sendMessage write exception: ", e);
         }
 
         synchronized (message) {
             try {
                 message.wait(5000);
             } catch (InterruptedException e) {
-                log.error("sendMessage InterruptedException", e);
+                aapsLogger.error("sendMessage InterruptedException", e);
             }
         }
 
         SystemClock.sleep(200);
         if (!message.isReceived()) {
             message.handleMessageNotReceived();
-            if (L.isEnabled(LTag.PUMPBTCOMM))
-                log.error("Reply not received " + message.getMessageName());
+            aapsLogger.error(LTag.PUMPBTCOMM, "Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
                 danaRPump.setNewPump(false);
-                if (L.isEnabled(LTag.PUMPCOMM))
-                    log.debug("Old firmware detected");
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Old firmware detected");
             }
         }
     }
 
-    @Override
     public void disconnect(String reason) {
         mKeepRunning = false;
         try {
             mInputStream.close();
         } catch (Exception e) {
-            if (L.isEnabled(LTag.PUMPBTCOMM))
-                log.debug(e.getMessage());
+            aapsLogger.debug(LTag.PUMPBTCOMM, e.getMessage());
         }
         try {
             mOutputStream.close();
         } catch (Exception e) {
-            if (L.isEnabled(LTag.PUMPBTCOMM))
-                log.debug(e.getMessage());
+            aapsLogger.debug(LTag.PUMPBTCOMM, e.getMessage());
         }
         try {
             mRfCommSocket.close();
         } catch (Exception e) {
-            if (L.isEnabled(LTag.PUMPBTCOMM))
-                log.debug(e.getMessage());
+            aapsLogger.debug(LTag.PUMPBTCOMM, e.getMessage());
         }
         try {
             System.runFinalization();
         } catch (Exception e) {
-            if (L.isEnabled(LTag.PUMPBTCOMM))
-                log.debug(e.getMessage());
+            aapsLogger.debug(LTag.PUMPBTCOMM, e.getMessage());
         }
-        if (L.isEnabled(LTag.PUMPBTCOMM))
-            log.debug("Disconnected: " + reason);
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Disconnected: " + reason);
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
index 9ebf373795..fc9e9ab6ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
+package info.nightscout.androidaps.danar.comm;
 
 import android.annotation.TargetApi;
 import android.os.Build;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt
similarity index 66%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt
index 9c524e02a6..269ac7f756 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableBase.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableBase.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 interface MessageHashTableBase {
     fun put(message: MessageBase)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
similarity index 77%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
index 518285ce65..54188ed836 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableR.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
@@ -1,16 +1,17 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -23,14 +24,15 @@ class MessageHashTableR @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    danaRPump: DanaRPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderPlugin,
+    configBuilderPlugin: ConfigBuilderInterface,
     commandQueue: CommandQueueProvider,
     activePlugin: ActivePluginProvider,
     nsUpload: NSUpload,
     injector: HasAndroidInjector,
+    databaseHelper: DatabaseHelperInterface,
     dateUtil: DateUtil
 ) : MessageHashTableBase {
 
@@ -59,15 +61,15 @@ class MessageHashTableR @Inject constructor(
         put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
         put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
         // 0x3202 CMD_SETTING_V_BASAL_INS_I
         put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))
@@ -87,9 +89,9 @@ class MessageHashTableR @Inject constructor(
         put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
         put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
         put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
         // 0xF0F1 CMD_PUMP_CHECK_VALUE
         put(MsgCheckValue(aapsLogger, danaRPump, danaRPlugin))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt
index dd3dd75512..4c1e077a11 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageOriginalNames.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageOriginalNames.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import java.util.*
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index 0b15befcfd..05b1bfd39b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -1,11 +1,11 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
@@ -13,7 +13,7 @@ class MsgBolusProgress(
     private val aapsLogger: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val rxBus: RxBusWrapper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index 306ee71097..a4889bb28a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 class MsgBolusStart(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private var amount: Double
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
similarity index 90%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index 85cf6341c8..391ecb0794 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeed.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 class MsgBolusStartWithSpeed(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private var amount: Double,
     speed: Int
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
similarity index 88%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index 7b3195e4a9..69c302256e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -1,18 +1,18 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgBolusStop(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
index 6170acf78d..abdca3d96b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValue.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
@@ -1,13 +1,13 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
 
 class MsgCheckValue(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
@@ -22,7 +22,7 @@ class MsgCheckValue(
         danaRPump.hwModel = intFromBuff(bytes, 0, 1)
         danaRPump.protocol = intFromBuff(bytes, 1, 1)
         danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL) {
+        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index f44de7442b..3a2114677e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -1,19 +1,19 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgError(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val nsUpload: NSUpload
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
index 97c942fbf1..81750a9eac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarm.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryAlarm(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3105)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
index 5ed2b212b5..5c437ddc77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
@@ -1,17 +1,18 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.events.EventDanaRSyncStatus
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.utils.DateUtil
 
 open class MsgHistoryAll(
     val aapsLogger: AAPSLogger,
     val rxBus: RxBusWrapper,
-    private val dateUtil: DateUtil
+    private val dateUtil: DateUtil,
+    private val databaseHelper: DatabaseHelperInterface
 ) : MessageBase() {
 
     init {
@@ -138,7 +139,7 @@ open class MsgHistoryAll(
 
             17.toByte()                                                            -> failed = true
         }
-        MainApp.getDbHelper().createOrUpdate(danaRHistoryRecord)
+        databaseHelper.createOrUpdate(danaRHistoryRecord)
         rxBus.send(EventDanaRSyncStatus(dateUtil.dateAndTimeString(danaRHistoryRecord.recordDate) + " " + messageType))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
index 5caff7d6e9..ea4a343466 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryAllDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
index 87bfbbc870..14b7c009c6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHour.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryBasalHour(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x310A)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
index 693d56d462..94ee55b969 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryBolus(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3101)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
index 23e060d2a7..9f55b2c5e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarbo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryCarbo(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3107)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
similarity index 64%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
index 5a978fc0ec..173eaa29ea 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulin.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryDailyInsulin(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3102)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
index f0c3ba1170..99525ee1d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
index 8883a704a9..e8ee5fd720 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryError(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3106)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
index 4f717dded1..325154157d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryGlucose(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3104)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
index b271f4f915..1ba71e3138 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNew.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryNew(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x42F2)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
index b71179342a..b24e661cad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgHistoryNewDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
index 24bb799db8..66494adfbb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefill.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistoryRefill(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3108)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
index bd116ed709..a37fad26f9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspend.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
@@ -8,8 +9,9 @@ import info.nightscout.androidaps.utils.DateUtil
 class MsgHistorySuspend(
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
-    dateUtil: DateUtil
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil) {
+    dateUtil: DateUtil,
+    databaseHelper: DatabaseHelperInterface
+) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
 
     init {
         SetCommand(0x3109)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
index be6ea26f4b..66e417add6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgInitConnStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index 9bd09848d7..e2b7aa0ccf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -1,20 +1,20 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index 9b7ce29bea..755c61489f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -1,6 +1,7 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -8,14 +9,13 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusOption(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
similarity index 85%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index dd0a975726..7d345d77e9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -1,18 +1,18 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
@@ -20,10 +20,10 @@ class MsgInitConnStatusTime(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderPlugin,
+    private val configBuilderPlugin: ConfigBuilderInterface,
     private val commandQueue: CommandQueueProvider,
     private val dateUtil: DateUtil
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
index 35e5f2391a..3765d47905 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
index c6d6ac4ae7..c2c2ee78d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
index 6343002f99..ba60178a34 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
index 1af0c71832..f49a34b394 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
index 03fcfbca6b..611da11862 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntry.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index 23da6ede84..cb13f2c2e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
index 887f6c0cdb..b655ba6361 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
index 2997a8478f..c194eebe0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
@@ -1,6 +1,6 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
index abdf6b9d1b..e9f9a201c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
index cc1308b5e3..97551b446c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
index 0fcdcd5589..aa526f19ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index 8a69890dd4..1a883b93df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSetUserOptions(
     private val aapsLogger: AAPSLogger,
-    danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
similarity index 81%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
index 1319874016..cd1bcdb95d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingActiveProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
index 1f06d35217..5984651836 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
@@ -1,14 +1,14 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
 import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danar.DanaRPlugin
 import java.util.*
 
 class MsgSettingBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
index 3e3eb03a5a..c87a05a006 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -15,7 +15,7 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     override fun handleMessage(bytes: ByteArray) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
index 86f3be273e..a46584b16f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -9,7 +9,7 @@ import info.nightscout.androidaps.dana.DanaRPump
  */
 class MsgSettingGlucose(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
index f637e28842..a16de6951e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValues.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingMaxValues(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 8f0dfa15c4..74ec24b32e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -1,6 +1,8 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.R
+import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -8,15 +10,13 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSettingMeal(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
index 609ce479f9..ee3647e7e8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatios.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingProfileRatios(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
index 201625bb66..2ebc3776f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingProfileRatiosAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 0bfec34561..553bce504c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -9,7 +9,7 @@ import java.util.*
 
 class MsgSettingPumpTime(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
index cde068bfd8..586f91515b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgSettingShippingInfo(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index eea5a9a7d0..096547aa24 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -7,7 +7,7 @@ import java.util.*
 
 class MsgSettingUserOptions(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
index e0f611b06c..abe8e7f524 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatus(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 
 ) : MessageBase() {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
index 5eabda782a..41d40907f7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index d96915d170..9ef8c39c9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.ExtendedBolus
@@ -13,7 +13,7 @@ import kotlin.math.ceil
 class MsgStatusBolusExtended(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val activePlugin: ActivePluginProvider,
     private val dateUtil: DateUtil
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
similarity index 92%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
index 678ee859ac..63e0eb0fc0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.dana.DanaRPump
 
 class MsgStatusProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    private val danaRPump: DanaRPump
 ) : MessageBase() {
 
     init {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
rename to danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
index aa30e615f6..67ff7fadfb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm
+package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.Source
@@ -11,7 +11,7 @@ import kotlin.math.ceil
 
 class MsgStatusTempBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector
 ) : MessageBase() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 3b77c9723e..0d94d3797f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.services;
+package info.nightscout.androidaps.danar.services;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -16,31 +16,33 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
+import info.nightscout.androidaps.danar.R;
+import info.nightscout.androidaps.danar.SerialIOThread;
+import info.nightscout.androidaps.danar.comm.MessageBase;
+import info.nightscout.androidaps.danar.comm.MsgBolusStop;
+import info.nightscout.androidaps.danar.comm.MsgHistoryAlarm;
+import info.nightscout.androidaps.danar.comm.MsgHistoryBasalHour;
+import info.nightscout.androidaps.danar.comm.MsgHistoryBolus;
+import info.nightscout.androidaps.danar.comm.MsgHistoryCarbo;
+import info.nightscout.androidaps.danar.comm.MsgHistoryDailyInsulin;
+import info.nightscout.androidaps.danar.comm.MsgHistoryError;
+import info.nightscout.androidaps.danar.comm.MsgHistoryGlucose;
+import info.nightscout.androidaps.danar.comm.MsgHistoryRefill;
+import info.nightscout.androidaps.danar.comm.MsgHistorySuspend;
+import info.nightscout.androidaps.danar.comm.MsgPCCommStart;
+import info.nightscout.androidaps.danar.comm.MsgPCCommStop;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventBTChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryAlarm;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBasalHour;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryBolus;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryCarbo;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryDailyInsulin;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryError;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryGlucose;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistoryRefill;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgHistorySuspend;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgPCCommStop;
-import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.ToastUtils;
@@ -63,6 +65,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     @Inject DanaRPump danaRPump;
     @Inject FabricPrivacy fabricPrivacy;
     @Inject DateUtil dateUtil;
+    @Inject DatabaseHelperInterface databaseHelper;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -76,7 +79,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     protected boolean mConnectionInProgress = false;
     protected boolean mHandshakeInProgress = false;
 
-    protected AbstractSerialIOThread mSerialIOThread;
+    protected SerialIOThread mSerialIOThread;
 
     protected IBinder mBinder;
 
@@ -229,31 +232,31 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
         MessageBase msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil);
+                msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
         }
         danaRPump.setHistoryDoneReceived(false);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
rename to danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index d32383bef4..f7e52e9ff9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.danaR.services;
+package info.nightscout.androidaps.danar.services;
 
 import android.os.Binder;
 import android.os.SystemClock;
@@ -10,9 +10,40 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.dana.DanaRPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danar.DanaRPlugin;
+import info.nightscout.androidaps.danar.R;
+import info.nightscout.androidaps.danar.SerialIOThread;
+import info.nightscout.androidaps.danar.comm.MessageBase;
+import info.nightscout.androidaps.danar.comm.MessageHashTableR;
+import info.nightscout.androidaps.danar.comm.MsgBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgBolusStartWithSpeed;
+import info.nightscout.androidaps.danar.comm.MsgCheckValue;
+import info.nightscout.androidaps.danar.comm.MsgSetActivateBasalProfile;
+import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile;
+import info.nightscout.androidaps.danar.comm.MsgSetCarbsEntry;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStart;
+import info.nightscout.androidaps.danar.comm.MsgSetExtendedBolusStop;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStart;
+import info.nightscout.androidaps.danar.comm.MsgSetTempBasalStop;
+import info.nightscout.androidaps.danar.comm.MsgSetTime;
+import info.nightscout.androidaps.danar.comm.MsgSetUserOptions;
+import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile;
+import info.nightscout.androidaps.danar.comm.MsgSettingBasal;
+import info.nightscout.androidaps.danar.comm.MsgSettingGlucose;
+import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues;
+import info.nightscout.androidaps.danar.comm.MsgSettingMeal;
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios;
+import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll;
+import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime;
+import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo;
+import info.nightscout.androidaps.danar.comm.MsgSettingUserOptions;
+import info.nightscout.androidaps.danar.comm.MsgStatus;
+import info.nightscout.androidaps.danar.comm.MsgStatusBasic;
+import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended;
+import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Treatment;
@@ -31,37 +62,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.SerialIOThread;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableR;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgBolusStartWithSpeed;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgCheckValue;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetActivateBasalProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetBasalProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetCarbsEntry;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetExtendedBolusStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStart;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTempBasalStop;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSetUserOptions;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingActiveProfile;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingBasal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingGlucose;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMaxValues;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingMeal;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatios;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingProfileRatiosAll;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingPumpTime;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingShippingInfo;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgSettingUserOptions;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatus;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBasic;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusBolusExtended;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MsgStatusTempBasal;
-import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -124,7 +124,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(mRfcommSocket, messageHashTableR, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableR, danaRPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
diff --git a/app/src/main/res/xml/pref_danar.xml b/danar/src/main/res/xml/pref_danar.xml
similarity index 96%
rename from app/src/main/res/xml/pref_danar.xml
rename to danar/src/main/res/xml/pref_danar.xml
index 16ef4aa57d..64246a6544 100644
--- a/app/src/main/res/xml/pref_danar.xml
+++ b/danar/src/main/res/xml/pref_danar.xml
@@ -7,7 +7,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.danar.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/app/src/main/res/xml/pref_danarkorean.xml b/danar/src/main/res/xml/pref_danarkorean.xml
similarity index 96%
rename from app/src/main/res/xml/pref_danarkorean.xml
rename to danar/src/main/res/xml/pref_danarkorean.xml
index 90b8ead439..c4de35face 100644
--- a/app/src/main/res/xml/pref_danarkorean.xml
+++ b/danar/src/main/res/xml/pref_danarkorean.xml
@@ -7,7 +7,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.danar.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/app/src/main/res/xml/pref_danarv2.xml b/danar/src/main/res/xml/pref_danarv2.xml
similarity index 95%
rename from app/src/main/res/xml/pref_danarv2.xml
rename to danar/src/main/res/xml/pref_danarv2.xml
index 011490beec..d31b25f699 100644
--- a/app/src/main/res/xml/pref_danarv2.xml
+++ b/danar/src/main/res/xml/pref_danarv2.xml
@@ -7,7 +7,7 @@
         android:title="@string/danar_pump_settings"
         app:initialExpandedChildrenCount="0">
 
-        <info.nightscout.androidaps.plugins.pump.danaR.BluetoothDevicePreference
+        <info.nightscout.androidaps.danar.BluetoothDevicePreference
             android:dialogTitle="@string/danar_bt_name_title"
             android:key="@string/key_danar_bt_name"
             android:title="@string/danar_bt_name_title" />
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 7a118ffdc6..96695dca2f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -9,6 +9,7 @@ import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPumpInterface
+import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -54,7 +55,7 @@ class DanaRSPlugin @Inject constructor(
     private val activePluginProvider: ActivePluginProvider,
     private val sp: SP,
     commandQueue: CommandQueueProvider,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil,
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index 28e3116233..a79143ca42 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -29,7 +29,7 @@ open class DanaRS_Packet_APS_History_Events(
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var sp: SP
     @Inject lateinit var nsUpload: NSUpload
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index ba9d4c9741..e0fdc9080c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -19,7 +19,7 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
index 02c0f97982..acfd4ed210 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -12,7 +12,7 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
     private val profileNumber: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
index 9800c8a685..04deec02eb 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Basal_Get_Profile_Number(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index 19bb45c5dc..127a9c5331 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index ec51a4d4a9..ed706bb52b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -18,7 +18,7 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index 19591e2b7a..53f0eba737 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index 2512fcf342..cad921d048 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
index 28a0b9e661..d1d521af1a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
index e598818bdd..e033733b6a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Dual_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
index 0684e97bf0..0d7c5e9b89 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
index aa50fa1c81..701ce3c723 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
index cf75621379..3bae9a92d3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index 646d2858d4..984983a04f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index 01357331e1..9df37cef85 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     private var speed: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var constraintChecker: ConstraintChecker
 
     init {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index 738caa4ed3..18eada935d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -16,7 +16,7 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
index 10c853ff87..ce7d36e8d4 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_More_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
index 766fb9cf20..6c5785c358 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Password(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index fa06dc7257..6ff1ef656c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -17,7 +17,7 @@ class DanaRS_Packet_General_Get_Pump_Check(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index c85fcd1d85..3e30953062 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Shipping_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
index 336963a5d0..ca023162f8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_Shipping_Version(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
index 8b31babf73..471d1dbc0a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Today_Delivery_Total(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index ee0f514d4b..920c597ffd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Initial_Screen_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index 61fd16286d..051a78b351 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index c95bba668f..66a99aed58 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 3d921048f7..1a7f475ad3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -11,7 +11,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
index d4aead111c..46e1560868 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Option_Get_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
index 45ec9d593b..7ed2b082cf 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Option_Set_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
index 8fefb4c454..81f15ee543 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
@@ -10,7 +10,7 @@ class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index b29ab6d8ef..59d2bcad34 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -43,7 +43,7 @@ class BLEComm @Inject internal constructor(
     private val rxBus: RxBusWrapper,
     private val sp: SP,
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
-    private val danaRPump: info.nightscout.androidaps.dana.DanaRPump,
+    private val danaRPump: DanaRPump,
     private val danaRSPlugin: DanaRSPlugin,
     private val bleEncryption: BleEncryption,
     private val nsUpload: NSUpload
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index ca027e8f5a..596aee5356 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -59,7 +59,7 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var context: Context
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
-    @Inject lateinit var danaRPump: info.nightscout.androidaps.dana.DanaRPump
+    @Inject lateinit var danaRPump: DanaRPump
     @Inject lateinit var danaRSMessageHashTable: DanaRSMessageHashTable
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var constraintChecker: ConstraintChecker
diff --git a/settings.gradle b/settings.gradle
index c1a3ec986c..15de48ff31 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
 include ':app', ':wear', ':core', ':danars'
 include ':dana'
+include ':danar'

From e8062e120954bca8f72ef19a3184fce6abe79054 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:21:45 +1200
Subject: [PATCH 051/400] Add Red Carb Icon

---
 .../drawable-hdpi/icon_cp_bolus_carbs_red.png    | Bin 0 -> 1520 bytes
 .../drawable-mdpi/icon_cp_bolus_carbs_red.png    | Bin 0 -> 905 bytes
 .../drawable-xhdpi/icon_cp_bolus_carbs_red.png   | Bin 0 -> 2057 bytes
 .../drawable-xxhdpi/icon_cp_bolus_carbs_red.png  | Bin 0 -> 3253 bytes
 .../drawable-xxxhdpi/icon_cp_bolus_carbs_red.png | Bin 0 -> 4514 bytes
 app/src/main/res/drawable/anim_carbs.xml         |   6 ++++++
 .../res/drawable/icon_cp_bolus_carbs_red.png     | Bin 0 -> 905 bytes
 7 files changed, 6 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png
 create mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png
 create mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png
 create mode 100644 app/src/main/res/drawable/anim_carbs.xml
 create mode 100644 app/src/main/res/drawable/icon_cp_bolus_carbs_red.png

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5f02cc24210d9b26469057bccb3f9c3d36e0d03
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00odqL_t(|+U=TYY!y`)hMxjWg<7O|
zi_lb%#ehIdk%)*JF?tg~Q4}yD8VDK`H71IHaruFU#3ccvjaw5D0<ro7+{$8b!Ne44
zSR`0#nu1zXXc5}V(psoL=ACdd&a_v#)4Sxn37Ny3bH17T&bOa}g@uKMg@uKMg@uKM
zg@uKMg@uKMg@uJhf{_t#fz4T2@eq>_M1UXSAuOk*B`&|MM-qO(!N6BQU*HyCdklLr
zfw4fLh|UE50Nw*mrK@IL3{(Ka^#6KbJa8~z{Rm(Ya2L?WXTBKN6EDr`mSkG>u0a$)
z9`G@6foEM7@G`I$m@lH5fK9;nrUl0H<&uf4slasL3@{lO2^<58fThN|T;NOKDY=oY
zz%*&)WZ-(BO>6&3SF)bb^-XC=74Wp~Jt1Gz8`ua;1e$?+fSZ9&4T5qEUwkN?qG1Nm
z4h#qO1FgUyIcN7{R?9RSL`Z+2Q6yFR$h=kL{UTYUgU=cU>;awyR_NZ>22lWKff9`)
zA_`zm08s#Qb^ScvFPx~<;WA(wFhJqn#SWjf8w@f5)&rjf$h{i4Q`-7Yyk9yIn$=Sg
zZh+66pF=(<|K#Gu0J#?dYh>CV0=v_Jtfh)@jldH5Di;?9>^Y`uC9u<HzBf<~Tn^L$
zkB9N%T}@U*NhH8S%9Umqk!)x{5Qu2}iO>9%B5|TVz;xhnI*@fg&`a7;rhEGg|1#cZ
zPoef8&2h_{sgkin_nUxd2aZ1_$QlUD0<wXHx>qVE>|%u?-w<GoXa7uNd>>E)9Fdcs
zW&DP<p6os4$SPDJTm~F9%<K!#x*Fg+jUV&WiVHn!hX&MvGnL7wWQ!(WL=||JoK?!w
z?zz8Q8G9QrPVJfZWx6h!l#A5@r-6RJ1eHb@er<u7uO)knCPQJo063w{JXdoqK15-3
z7J8_p*{2o_z^}jyGPRRFd#?bV1m;P*u2JCFmI`J#1Gq^<jZ?N>YvfruoqV`_gQ!iw
zD0L)G20X6{ct8=cR^5s%!0c2YYl*I}sJ8nPc*GO#y%-!IYn3M{?Fid}WkwsPM1C)6
z$r>STYE=gTLqm3HJjG{UG(g^Kih|u^c=lLevBs@9O~IqdOx7e_D-_~Qlp6U~mS;~<
zfV@k9)xb}{bNUe7JY~-9z(>llMv9=Q`d&$GhNE=#D@(TM+TSqCOi!WgEpz_Xc!*4_
zQogGO_+4u@$WLY{O(_DtNrkRMUtJq~<__R=Lc0Uc8yZlo`O}J`Yo(cP%pWd?zW^95
ztu#xc6WaGW@MBncRv2Wpbs+nUG$A7MS!K*^1|AlnUR3K}32+DSsx-~T?0~v4=`;9x
zBmDb4&oBF~Q>}NP6WQ(RXB7iK8~3m3io!MwvUVAbIKK{opT^|@H~fcZ^f8L-M)j{!
zlB}&Vw<4txChiT`lcjy@fonUE-4EwfXSWD$RwUfp6=a1~8<yi7OO*l-YN`OI(U%>A
zm^wwXL!3LL812!_3Y9neI};YK+Au7#t^>Z6kBQ<O$CrB&&uZ0xRX9iN1vqDZlT;D~
zVW$$+H32nd%8}(Jp!1bU9|kTpnth8D{rrAx1b9?yvOR_N-T$X&l?r6_QpAcF)2n5c
ztucri2&^-FSh*r5i6Se^=HDs)eOj|IMxwwuBsDYpF#%~ummy5Dmf@Tans{60)iZ|u
zw*f0PK8|w`aXgV^g=K~-Id>fOhBRt1aHH-WQ4O~l=Ty2u?@}NKKM$vY=SIe9M*fyC
zGYo^Qxj27B2F@RQEH|Dt2dCpXC<amOzy~6|{(RmknaRqN#*_gs1(<#m=YU}X&M{V|
zG5;IR$<15mqfMz44Kt0_N-W65X*D;6;g{k?mW73dg@uKMg@uKMg@uKMg@uJhn&KZs
WM?wa;(ngs80000<MNUMnLSTX(2&_&3

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..19534dfdfb4738e9c1dd4d0aec20d4a82c48a14e
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00SvWL_t(&-tE|1h*f162H<Bj8w+)!
znu4+;Aw(HQ6C|C3qM)b=5~9+ZpzHv4B2WrCS_zd&BvMd@S{Fe<8qpMVx*4g9kSHiE
zva=JJ9hfrh=H0N`?AXoTv-ix!|H5V+{<Zf1zw7(n_xskOprD|jprD|jpr8qQTDfUg
zZ|_(xKLoepZv5Hgx@q_xyJwD$j%iI(I{ct!U<h|&O@r|Ptiz5F*pAy<nW)o5R^TW+
zgN6CQR6L4d%)?{2G7;Oim5KK0Ac-SzZPIEL`tUH`!Tq=bH(@pQgxquZX0i}D5a(e&
ze#6r_e;2l38}^3COO^Z1Of=q`3}WxY`#2%TLpZ-OK8#cGG6w6`@fHri$uQAkUxOp@
zagKM_jc?6%dENQ@5|JgXPCTAO2Cx8&aT>mj(5sjgcN)%de{``FH{<PACm#=u^r1Jx
z-HI0ziRE}4heg2qMK^sB_@THc_pZiM?JT0*i1bGjUttk8R?=yGwl`+GI2!1|b+{}f
z;6j``QAB$10_Maz;k(NCNDAB%JP;l1#JxBXGjTYs!Vh>8PqdmP?WES_d5UMJf^SN?
zR52C%M*}<JNZTvpzb0}Uuq<Tf;8KisD<U^!@$cd_yk3_cv-8BO?aDdnry50fZ}xv|
z(vyvQMCRkR%JDj^P2G4SE>y*IJdXzxg%7j%xpBMWQu&uvNOhdZ!EvE&b;S-I!m+po
ze}v%1=wLQ3j&5o~|0@I+;G=H0@dqX62UDdbjjH+odEDr;27hsM>c?4lB@Xs4bgQzD
z;HRWT4ae7A^E-a|kNdxfZNt|S{bKcO`lh+*Ue~7;SLaG=@oE-7D{cEVI2|jav%lMo
zNIOL4MX*cpX{D1LN~^IeRyvsKUc;W4!6RuD8={*;YA;T;H@Z)7H9n}jd>XEgTg`~j
zS2mlY+uiTx%KnB1Bx<g-suHnY9Y8xoPQjCD*@tjX9PENr^IBy;Blf!}ZT^bM^c7`F
zQfVX>yAzk>OUXbA+Rv#q)6=@&k$UmJ&`ph;gfBy)ieutt{n5vkv@v5^*;t7b6ciK`
f6ciK`6g0&@hTXmQkgT6c00000NkvXXu0mjfe73L;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..521b5ede826b5dd6bf1cd7f9310035cefb3f1d90
GIT binary patch
literal 2057
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
XJ0~6=%@S1n^X(u!j$m1C?sfhDVj#oy

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b831ffd847420fd0b1abb2dc901292156a17bac
GIT binary patch
literal 3253
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..95df9af00c45d059905a36bf52bc5655c992ad02
GIT binary patch
literal 4514
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
AH2?qr

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/anim_carbs.xml b/app/src/main/res/drawable/anim_carbs.xml
new file mode 100644
index 0000000000..28ae262b46
--- /dev/null
+++ b/app/src/main/res/drawable/anim_carbs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:oneshot="false">
+    <item android:drawable="@drawable/icon_cp_bolus_carbs" android:duration="1200" />
+    <item android:drawable="@drawable/icon_cp_bolus_carbs_red" android:duration="1200" />
+</animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png
new file mode 100644
index 0000000000000000000000000000000000000000..19534dfdfb4738e9c1dd4d0aec20d4a82c48a14e
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00SvWL_t(&-tE|1h*f162H<Bj8w+)!
znu4+;Aw(HQ6C|C3qM)b=5~9+ZpzHv4B2WrCS_zd&BvMd@S{Fe<8qpMVx*4g9kSHiE
zva=JJ9hfrh=H0N`?AXoTv-ix!|H5V+{<Zf1zw7(n_xskOprD|jprD|jpr8qQTDfUg
zZ|_(xKLoepZv5Hgx@q_xyJwD$j%iI(I{ct!U<h|&O@r|Ptiz5F*pAy<nW)o5R^TW+
zgN6CQR6L4d%)?{2G7;Oim5KK0Ac-SzZPIEL`tUH`!Tq=bH(@pQgxquZX0i}D5a(e&
ze#6r_e;2l38}^3COO^Z1Of=q`3}WxY`#2%TLpZ-OK8#cGG6w6`@fHri$uQAkUxOp@
zagKM_jc?6%dENQ@5|JgXPCTAO2Cx8&aT>mj(5sjgcN)%de{``FH{<PACm#=u^r1Jx
z-HI0ziRE}4heg2qMK^sB_@THc_pZiM?JT0*i1bGjUttk8R?=yGwl`+GI2!1|b+{}f
z;6j``QAB$10_Maz;k(NCNDAB%JP;l1#JxBXGjTYs!Vh>8PqdmP?WES_d5UMJf^SN?
zR52C%M*}<JNZTvpzb0}Uuq<Tf;8KisD<U^!@$cd_yk3_cv-8BO?aDdnry50fZ}xv|
z(vyvQMCRkR%JDj^P2G4SE>y*IJdXzxg%7j%xpBMWQu&uvNOhdZ!EvE&b;S-I!m+po
ze}v%1=wLQ3j&5o~|0@I+;G=H0@dqX62UDdbjjH+odEDr;27hsM>c?4lB@Xs4bgQzD
z;HRWT4ae7A^E-a|kNdxfZNt|S{bKcO`lh+*Ue~7;SLaG=@oE-7D{cEVI2|jav%lMo
zNIOL4MX*cpX{D1LN~^IeRyvsKUc;W4!6RuD8={*;YA;T;H@Z)7H9n}jd>XEgTg`~j
zS2mlY+uiTx%KnB1Bx<g-suHnY9Y8xoPQjCD*@tjX9PENr^IBy;Blf!}ZT^bM^c7`F
zQfVX>yAzk>OUXbA+Rv#q)6=@&k$UmJ&`ph;gfBy)ieutt{n5vkv@v5^*;t7b6ciK`
f6ciK`6g0&@hTXmQkgT6c00000NkvXXu0mjfe73L;

literal 0
HcmV?d00001


From 26f487a697141b284ac871883fd5fb2d6d0fa6a9 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:22:42 +1200
Subject: [PATCH 052/400] Extend local notification framework

---
 .../plugins/general/overview/notifications/Notification.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
index b13cd74796..b43b058277 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
@@ -70,6 +70,10 @@ public class Notification {
     public static final int OMNIPOD_PUMP_ALARM = 57;
     public static final int TIME_OR_TIMEZONE_CHANGE = 58;
     public static final int OMNIPOD_POD_NOT_ATTACHED = 59;
+    public static final int CARBS_REQUIRED = 60;
+    public static final int IMPORTANCE_HIGH = 2;
+
+    public static final String CATEGORY_ALARM = "alarm";
 
     public static final int USERMESSAGE = 1000;
 

From 9070a1f3942dbf79ca6472a7fca77b5f9905f425 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:23:44 +1200
Subject: [PATCH 053/400] Add Preferences for local carbs req alerts

---
 app/src/main/res/values/strings.xml            | 5 +++++
 app/src/main/res/xml/pref_alerts.xml           | 5 +++++
 app/src/main/res/xml/pref_nsclientinternal.xml | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1497345967..400c1b185b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -812,10 +812,12 @@
     <string name="raise_notifications_as_android_notifications">Use system notifications for alerts and notifications</string>
     <string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
     <string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
+    <string name="key_enable_carbs_required_alert_local" translatable="false">enable_carbs_required_alert_local</string>
     <string name="localalertsettings_title">Local alerts</string>
     <string name="enable_missed_bg_readings_alert">Alert if no BG data is received</string>
     <string name="enable_pump_unreachable_alert">Alert if pump is unreachable</string>
     <string name="pump_unreachable_threshold">Pump unreachable threshold [min]</string>
+    <string name="enable_carbs_req_alert">Alert if carbs are required</string>
     <string name="key_pump_unreachable_threshold" translatable="false">pump_unreachable_threshold</string>
     <string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
     <string name="urgent_alarm">Urgent Alarm</string>
@@ -946,8 +948,11 @@
     <string name="wear_notifysmb_title">Notify on SMB</string>
     <string name="wear_notifysmb_summary">Show SMB on the watch like a standard bolus.</string>
     <string name="key_ns_create_announcements_from_errors" translatable="false">ns_create_announcements_from_errors</string>
+    <string name="key_ns_create_announcements_from_carbs_req" translatable="false">ns_create_announcements_from_carbs_req</string>
     <string name="ns_create_announcements_from_errors_title">Create announcements from errors</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Create announcements from carbs required alerts</string>
     <string name="ns_create_announcements_from_errors_summary">Create Nightscout announcement for error dialogs and local alerts (also viewable in Careportal under Treatments)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Create Nightscout announcements for carbs required alerts</string>
     <string name="eversense_shortname" translatable="false">EVR</string>
     <string name="wear_predictions_summary">Show the predictions on the watchface.</string>
     <string name="wear_predictions_title">Predictions</string>
diff --git a/app/src/main/res/xml/pref_alerts.xml b/app/src/main/res/xml/pref_alerts.xml
index 1a81cefc66..a7783f7954 100644
--- a/app/src/main/res/xml/pref_alerts.xml
+++ b/app/src/main/res/xml/pref_alerts.xml
@@ -27,6 +27,11 @@
             android:key="@string/key_enable_pump_unreachable_alert"
             android:title="@string/enable_pump_unreachable_alert" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_enable_carbs_required_alert_local"
+            android:title="@string/enable_carbs_req_alert" />
+
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="30"
             android:dependency="@string/key_enable_pump_unreachable_alert"
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 6f68d77a7b..83901bfd75 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -144,6 +144,12 @@
                 android:summary="@string/ns_create_announcements_from_errors_summary"
                 android:title="@string/ns_create_announcements_from_errors_title" />
 
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_ns_create_announcements_from_carbs_req"
+                android:summary="@string/ns_create_announcements_from_carbs_req_summary"
+                android:title="@string/ns_create_announcements_from_carbs_req_title" />
+
             <SwitchPreference
                 android:defaultValue="false"
                 android:key="@string/key_nsclient_localbroadcasts"

From 68d0e33a9b77e4012f01bb2fa5f9c409a2c86622 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:24:09 +1200
Subject: [PATCH 054/400] Use background for animation

---
 app/src/main/res/layout/overview_info_layout.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 9f2cdd8c2f..12c373961f 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -140,7 +140,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_cp_bolus_carbs" />
+            android:id="@+id/overview_carbs_icon"
+            android:background="@drawable/anim_carbs" />
 
         <TextView
             android:id="@+id/overview_cob"

From a501b37159d8ab9b20a939175274bf40264ced4e Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:24:46 +1200
Subject: [PATCH 055/400] Show animation if carbs are required

---
 .../general/overview/OverviewFragment.kt      | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 92cde49903..d84f49f3c6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.os.Handler
 import android.util.DisplayMetrics
@@ -155,6 +156,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     private val secondaryGraphs = ArrayList<GraphView>()
     private val secondaryGraphsLabel = ArrayList<TextView>()
 
+    private lateinit var carbAnimation: AnimationDrawable
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
 
@@ -184,6 +187,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_bggraph?.gridLabelRenderer?.reloadStyles()
         overview_bggraph?.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
+        val carbicon = overview_carbs_icon;
+        carbAnimation = carbicon.background as AnimationDrawable
+        carbAnimation.setEnterFadeDuration(1200);
+        carbAnimation.setExitFadeDuration(1200);
+
         rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6)
 
         overview_bggraph?.setOnLongClickListener {
@@ -733,17 +741,18 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             cobText = resourceHelper.gs(R.string.format_carbs, cobInfo.displayCob.toInt())
             if (cobInfo.futureCarbs > 0) cobText += "(" + DecimalFormatter.to0Decimal(cobInfo.futureCarbs) + ")"
         }
-        overview_cob?.text = cobText
 
         val lastRun = loopPlugin.lastRun
-
-        // if (config.APS && lastRun?.constraintsProcessed != null && lastRun?.constraintsProcessed.carbsReq > 0) {
-        //     overview_cob_required.visibility = View.VISIBLE
-        //     var carbsRequiredString: String = String.format(resourceHelper.gs(R.string.overview_carbs_required), lastRun?.constraintsProcessed?.carbsReq, lastRun?.constraintsProcessed?.carbsReqWithin)
-        //     overview_cob_required.text = carbsRequiredString
-        // } else {
-        //     overview_cob_required.visibility = View.GONE
-        // }
+        if (config.APS && lastRun?.constraintsProcessed != null && lastRun?.constraintsProcessed.carbsReq > 0) {
+            overview_cob?.text = cobText + " ("+lastRun?.constraintsProcessed.carbsReq + " req)"
+            if(!carbAnimation.isRunning)
+                carbAnimation.start()
+        }else{
+            overview_cob?.text = cobText
+            if(carbAnimation.isRunning)
+                carbAnimation.stop()
+                carbAnimation.selectDrawable(0);
+        }
 
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
 

From efc25ddcd55e3fc9b6c9918590dfa16191d77988 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 10 May 2020 21:25:14 +1200
Subject: [PATCH 056/400] Use preferences

---
 .../plugins/aps/loop/LoopPlugin.java          | 84 +++++++++++--------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 59a65f4a2c..ea291ca6a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.aps.loop;
 
 import android.annotation.SuppressLint;
-import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -54,6 +53,9 @@ import info.nightscout.androidaps.plugins.aps.loop.events.EventNewOpenLoopNotifi
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
+import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.wear.ActionStringHandler;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
@@ -90,6 +92,7 @@ public class LoopPlugin extends PluginBase {
     private final ReceiverStatusStore receiverStatusStore;
     private final FabricPrivacy fabricPrivacy;
     private final HardLimits hardLimits;
+    private Notification notification;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -439,46 +442,55 @@ public class LoopPlugin extends PluginBase {
                             && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0)
                             && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
 
-                        Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
-                        intentAction5m.putExtra("ignoreDuration",5);
-                        PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context,1, intentAction5m,PendingIntent.FLAG_UPDATE_CURRENT);
-                        NotificationCompat.Action actionIgnore5m = new
-                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 5m", pendingIntent5m);
+                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local,true)) {
+                            Notification carbreqlocal = new Notification(Notification.CARBS_REQUIRED, resultAfterConstraints.getCarbsRequiredText(), Notification.NORMAL);
+                            rxBus.send(new EventNewNotification(carbreqlocal));
+                        }
+                        if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
+                            NSUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
+                        }
+                        if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)){
+                            Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
+                            intentAction5m.putExtra("ignoreDuration", 5);
+                            PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT);
+                            NotificationCompat.Action actionIgnore5m = new
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 5m", pendingIntent5m);
 
-                        Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
-                        intentAction15m.putExtra("ignoreDuration",15);
-                        PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context,1, intentAction15m,PendingIntent.FLAG_UPDATE_CURRENT);
-                        NotificationCompat.Action actionIgnore15m = new
-                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 15m", pendingIntent15m);
+                            Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
+                            intentAction15m.putExtra("ignoreDuration", 15);
+                            PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT);
+                            NotificationCompat.Action actionIgnore15m = new
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 15m", pendingIntent15m);
 
-                        Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
-                        intentAction30m.putExtra("ignoreDuration",30);
-                        PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context,1, intentAction30m,PendingIntent.FLAG_UPDATE_CURRENT);
-                        NotificationCompat.Action actionIgnore30m = new
-                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 30m", pendingIntent30m);
+                            Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
+                            intentAction30m.putExtra("ignoreDuration", 30);
+                            PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT);
+                            NotificationCompat.Action actionIgnore30m = new
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 30m", pendingIntent30m);
 
-                        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
-                        builder.setSmallIcon(R.drawable.notif_icon)
-                                .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
-                                .setContentText(resultAfterConstraints.getCarbsRequiredText())
-                                .setAutoCancel(true)
-                                .setPriority(Notification.PRIORITY_MAX)
-                                .setCategory(Notification.CATEGORY_ALARM)
-                                .addAction(actionIgnore5m)
-                                .addAction(actionIgnore15m)
-                                .addAction(actionIgnore30m)
-                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                                .setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
+                            NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
+                            builder.setSmallIcon(R.drawable.notif_icon)
+                                    .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
+                                    .setContentText(resultAfterConstraints.getCarbsRequiredText())
+                                    .setAutoCancel(true)
+                                    .setPriority(Notification.IMPORTANCE_HIGH)
+                                    .setCategory(Notification.CATEGORY_ALARM)
+                                    .addAction(actionIgnore5m)
+                                    .addAction(actionIgnore15m)
+                                    .addAction(actionIgnore30m)
+                                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                                    .setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
 
-                        NotificationManager mNotificationManager =
-                                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+                            NotificationManager mNotificationManager =
+                                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
-                        // mId allows you to update the notification later on.
-                        mNotificationManager.notify(Constants.notificationID, builder.build());
-                        rxBus.send(new EventNewOpenLoopNotification());
+                            // mId allows you to update the notification later on.
+                            mNotificationManager.notify(Constants.notificationID, builder.build());
+                            rxBus.send(new EventNewOpenLoopNotification());
 
-                        // Send to Wear
-                        actionStringHandler.get().handleInitiate("changeRequest");
+                            // Send to Wear
+                            actionStringHandler.get().handleInitiate("changeRequest");
+                        }
 
                     } else {
                         dismissSuggestion();
@@ -537,7 +549,7 @@ public class LoopPlugin extends PluginBase {
                             .setContentTitle(resourceHelper.gs(R.string.openloop_newsuggestion))
                             .setContentText(resultAfterConstraints.toString())
                             .setAutoCancel(true)
-                            .setPriority(Notification.PRIORITY_HIGH)
+                            .setPriority(Notification.IMPORTANCE_HIGH)
                             .setCategory(Notification.CATEGORY_ALARM)
                             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
                     if (sp.getBoolean("wearcontrol", false)) {

From 54e68ef248b115e46f389e4a5f440b694b14a939 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 11:49:37 +0200
Subject: [PATCH 057/400] clean up

---
 .../info/nightscout/androidaps/MainApp.java   | 19 +------
 .../androidaps/db/DatabaseHelper.java         | 16 +++---
 .../plugins/aps/logger/LoggerCallback.java    |  4 +-
 .../common/defs/PumpHistoryEntryGroup.java    | 51 ++++++++-----------
 .../ble/defs/RileyLinkEncodingType.java       | 27 +++++-----
 .../dialog/MedtronicHistoryActivity.java      |  4 +-
 .../service/RileyLinkMedtronicService.java    |  2 +-
 .../plugins/pump/omnipod/OmnipodFragment.kt   |  2 +-
 .../omnipod/dialogs/PodHistoryActivity.java   |  2 +-
 .../driver/comm/AapsOmnipodManager.java       |  6 +--
 .../pump/omnipod/util/OmnipodUtil.java        |  9 ++--
 .../plugins/treatments/TreatmentService.java  | 31 -----------
 .../info/nightscout/androidaps/utils/SP.java  | 50 ------------------
 .../androidaps/utils/SPBackupAgent.java       |  9 +---
 .../danaRv2/comm/MsgHistoryEvents_v2Test.kt   |  3 +-
 15 files changed, 61 insertions(+), 174 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/utils/SP.java

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 27d60be03c..a00c681e81 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -7,27 +7,21 @@ import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 
-import androidx.annotation.StringRes;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 
 import net.danlew.android.joda.JodaTimeAndroid;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 import javax.inject.Inject;
 
 import dagger.android.AndroidInjector;
 import dagger.android.DaggerApplication;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.StaticInjector;
 import info.nightscout.androidaps.dependencyInjection.DaggerAppComponent;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -64,7 +58,7 @@ public class MainApp extends DaggerApplication {
     @Inject KeepAliveReceiver.KeepAliveManager keepAliveManager;
     @Inject List<PluginBase> plugins;
 
-    @Inject StaticInjector staticInjector; // TODO remove , fake only to initialize
+    @Inject StaticInjector staticInjector; // TODO avoid , here fake only to initialize
 
     @Override
     public void onCreate() {
@@ -109,7 +103,6 @@ public class MainApp extends DaggerApplication {
 
 
     private void doMigrations() {
-
     }
 
     @Override
@@ -154,16 +147,6 @@ public class MainApp extends DaggerApplication {
         registerReceiver(new BTReceiver(), filter);
     }
 
-    @Deprecated
-    public static String gs(@StringRes int id) {
-        return sResources.getString(id);
-    }
-
-    @Deprecated
-    public static MainApp instance() {
-        return sInstance;
-    }
-
     public static DatabaseHelper getDbHelper() {
         return sDatabaseHelper;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 06fe0edb0d..212a26dfd8 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -34,7 +34,6 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.data.NonOverlappingIntervals;
 import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
 import info.nightscout.androidaps.events.EventNewBG;
@@ -47,6 +46,7 @@ import info.nightscout.androidaps.events.EventTempBasalChange;
 import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
+import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
@@ -61,7 +61,6 @@ import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.utils.JsonHelper;
 import info.nightscout.androidaps.utils.PercentageSplitter;
 import info.nightscout.androidaps.utils.T;
-import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * This Helper contains all resource to provide a central DB management functionality. Only methods handling
@@ -483,7 +482,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             Dao<TDD, String> dao = getDaoTDD();
             dao.createOrUpdate(tdd);
         } catch (SQLException e) {
-            ToastUtils.showToastInUiThread(MainApp.instance(), "createOrUpdate-Exception");
             log.error("Unhandled exception", e);
         }
     }
@@ -1008,7 +1006,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public void createTempBasalFromJsonIfNotExists(JSONObject trJson) {
         try {
             if (trJson.has("originalExtendedAmount")) { // extended bolus uploaded as temp basal
-                ExtendedBolus extendedBolus = new ExtendedBolus(MainApp.instance())
+                ExtendedBolus extendedBolus = new ExtendedBolus(StaticInjector.Companion.getInstance())
                         .source(Source.NIGHTSCOUT)
                         .date(trJson.getLong("mills"))
                         .pumpId(trJson.has("pumpId") ? trJson.getLong("pumpId") : 0)
@@ -1023,7 +1021,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 }
                 createOrUpdate(extendedBolus);
             } else if (trJson.has("isFakedTempBasal")) { // extended bolus end uploaded as temp basal end
-                ExtendedBolus extendedBolus = new ExtendedBolus(MainApp.instance());
+                ExtendedBolus extendedBolus = new ExtendedBolus(StaticInjector.Companion.getInstance());
                 extendedBolus.source = Source.NIGHTSCOUT;
                 extendedBolus.date = trJson.getLong("mills");
                 extendedBolus.pumpId = trJson.has("pumpId") ? trJson.getLong("pumpId") : 0;
@@ -1038,7 +1036,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 }
                 createOrUpdate(extendedBolus);
             } else {
-                TemporaryBasal tempBasal = new TemporaryBasal( MainApp.instance())
+                TemporaryBasal tempBasal = new TemporaryBasal(StaticInjector.Companion.getInstance())
                         .date(trJson.getLong("mills"))
                         .source(Source.NIGHTSCOUT)
                         .pumpId(trJson.has("pumpId") ? trJson.getLong("pumpId") : 0);
@@ -1313,7 +1311,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
      */
 
     public void createExtendedBolusFromJsonIfNotExists(JSONObject json) {
-        ExtendedBolus extendedBolus = ExtendedBolus.createFromJson(MainApp.instance(), json);
+        ExtendedBolus extendedBolus = ExtendedBolus.createFromJson(StaticInjector.Companion.getInstance(), json);
         if (extendedBolus != null)
             createOrUpdate(extendedBolus);
     }
@@ -1505,7 +1503,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             List<CareportalEvent> list = getDaoCareportalEvents().query(preparedQuery);
             CareportalEvent careportalEvent;
             if (list.size() == 0) {
-                careportalEvent = new CareportalEvent(MainApp.instance());
+                careportalEvent = new CareportalEvent(StaticInjector.Companion.getInstance());
                 careportalEvent.source = Source.NIGHTSCOUT;
                 if (L.isEnabled(LTag.DATABASE))
                     log.debug("Adding CareportalEvent record to database: " + trJson.toString());
@@ -1735,7 +1733,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public void createProfileSwitchFromJsonIfNotExists(ActivePluginProvider activePluginProvider, NSUpload nsUpload, JSONObject trJson) {
         try {
-            ProfileSwitch profileSwitch = new ProfileSwitch(MainApp.instance());
+            ProfileSwitch profileSwitch = new ProfileSwitch(StaticInjector.Companion.getInstance());
             profileSwitch.date = trJson.getLong("mills");
             if (trJson.has("duration"))
                 profileSwitch.durationInMinutes = trJson.getInt("duration");
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.java
index 815cf2fa24..2fa1816ad5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/logger/LoggerCallback.java
@@ -4,7 +4,7 @@ import org.mozilla.javascript.ScriptableObject;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.db.StaticInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 
@@ -26,7 +26,7 @@ public class LoggerCallback extends ScriptableObject {
         //empty constructor needed for Rhino
         errorBuffer = new StringBuffer();
         logBuffer = new StringBuffer();
-        MainApp.instance().androidInjector().inject(this);
+        StaticInjector.Companion.getInstance().androidInjector().inject(this);
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
index bbe96c41c5..9958d290e4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.common.defs;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 
 /**
@@ -16,58 +16,49 @@ import info.nightscout.androidaps.R;
 
 public enum PumpHistoryEntryGroup {
 
-    All(R.string.medtronic_history_group_all), //
-    Bolus(R.string.danar_history_bolus), //
-    Basal(R.string.medtronic_history_group_basal), //
-    Prime(R.string.danar_history_prime), //
-    Configuration(R.string.medtronic_history_group_configuration), //
-    Alarm(R.string.danar_history_alarm), //
-    Glucose(R.string.danar_history_glucose), //
-    Notification(R.string.medtronic_history_group_notification), //
+    All(R.string.medtronic_history_group_all),
+    Bolus(R.string.danar_history_bolus),
+    Basal(R.string.medtronic_history_group_basal),
+    Prime(R.string.danar_history_prime),
+    Configuration(R.string.medtronic_history_group_configuration),
+    Alarm(R.string.danar_history_alarm),
+    Glucose(R.string.danar_history_glucose),
+    Notification(R.string.medtronic_history_group_notification),
     Statistic(R.string.medtronic_history_group_statistic),
-    Unknown(R.string.medtronic_history_group_unknown), //
+    Unknown(R.string.medtronic_history_group_unknown),
     ;
 
     private int resourceId;
     private String translated;
 
-    public static boolean doNotTranslate = false;
-
-    private static List<PumpHistoryEntryGroup> list;
-
-    static {
-        list = new ArrayList<>();
-
-        for (PumpHistoryEntryGroup pumpHistoryEntryGroup : values()) {
-            //if (doNotTranslate) {
-            pumpHistoryEntryGroup.translated = MainApp.gs(pumpHistoryEntryGroup.resourceId);
-            //}
-            list.add(pumpHistoryEntryGroup);
-        }
-    }
-
+    private static List<PumpHistoryEntryGroup> translatedList;
 
     PumpHistoryEntryGroup(int resourceId) {
         this.resourceId = resourceId;
-        // this.translated = MainApp.gs(resourceId);
     }
 
+    private static void doTranslation(ResourceHelper resourceHelper) {
+        translatedList = new ArrayList<>();
 
-    public static List<PumpHistoryEntryGroup> getList() {
-        return list;
+        for (PumpHistoryEntryGroup pumpHistoryEntryGroup : values()) {
+            pumpHistoryEntryGroup.translated = resourceHelper.gs(pumpHistoryEntryGroup.resourceId);
+            translatedList.add(pumpHistoryEntryGroup);
+        }
     }
 
+    public static List<PumpHistoryEntryGroup> getTranslatedList(ResourceHelper resourceHelper) {
+        if (translatedList == null) doTranslation(resourceHelper);
+        return translatedList;
+    }
 
     public int getResourceId() {
         return resourceId;
     }
 
-
     public String getTranslated() {
         return translated;
     }
 
-
     public String toString() {
         return this.translated;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
index 5482e224e3..fcfe1915a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
@@ -5,6 +5,7 @@ import java.util.Map;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public enum RileyLinkEncodingType {
 
@@ -20,33 +21,31 @@ public enum RileyLinkEncodingType {
 
     private static Map<String, RileyLinkEncodingType> encodingTypeMap;
 
-    static {
-        encodingTypeMap = new HashMap<>();
-
-        for (RileyLinkEncodingType encType : values()) {
-            if (encType.resourceId!=null) {
-                encodingTypeMap.put(MainApp.gs(encType.resourceId), encType);
-            }
-        }
-    }
-
-
     RileyLinkEncodingType(int value) {
         this.value = (byte)value;
     }
 
-
     RileyLinkEncodingType(int value, Integer resourceId) {
         this.value = (byte)value;
         this.resourceId = resourceId;
     }
 
-    public static RileyLinkEncodingType getByDescription(String description) {
+    private static void doTranslation(ResourceHelper resourceHelper) {
+        encodingTypeMap = new HashMap<>();
+
+        for (RileyLinkEncodingType encType : values()) {
+            if (encType.resourceId!=null) {
+                encodingTypeMap.put(resourceHelper.gs(encType.resourceId), encType);
+            }
+        }
+    }
+
+    public static RileyLinkEncodingType getByDescription(String description, ResourceHelper resourceHelper) {
+        if (encodingTypeMap == null) doTranslation(resourceHelper);
         if (encodingTypeMap.containsKey(description)) {
             return encodingTypeMap.get(description);
         }
 
         return RileyLinkEncodingType.FourByteSixByteLocal;
     }
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
index cb3aad5f94..1d5d300b49 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
@@ -23,11 +23,13 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 
 public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
 
     @Inject MedtronicHistoryData medtronicHistoryData;
+    @Inject ResourceHelper resourceHelper;
 
     Spinner historyTypeSpinner;
     TextView statusView;
@@ -119,7 +121,7 @@ public class MedtronicHistoryActivity extends NoSplashAppCompatActivity {
 
         statusView.setVisibility(View.GONE);
 
-        typeListFull = getTypeList(PumpHistoryEntryGroup.getList());
+        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper));
 
         ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
         historyTypeSpinner.setAdapter(spinnerAdapter);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index 4b0da7db4a..7ae299036d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -319,7 +319,7 @@ public class RileyLinkMedtronicService extends RileyLinkService {
                 return false;
             }
 
-            RileyLinkEncodingType newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr);
+            RileyLinkEncodingType newEncodingType = RileyLinkEncodingType.getByDescription(encodingTypeStr, resourceHelper);
 
             if (encodingType == null) {
                 encodingType = newEncodingType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index 6dba697009..843beed61f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -100,7 +100,7 @@ class OmnipodFragment : DaggerFragment() {
 
         omnipod_refresh.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() != true) {
-                OmnipodUtil.displayNotConfiguredDialog(context)
+                displayNotConfiguredDialog()
             } else {
                 omnipod_refresh.isEnabled = false
                 omnipodPumpPlugin.addPodStatusRequest(OmnipodStatusRequest.GetPodState);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
index d98721ff15..bfbdbfc9d6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodHistoryActivity.java
@@ -148,7 +148,7 @@ public class PodHistoryActivity extends NoSplashAppCompatActivity {
 
         statusView.setVisibility(View.GONE);
 
-        typeListFull = getTypeList(PumpHistoryEntryGroup.getList());
+        typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(resourceHelper));
 
         ArrayAdapter<TypeList> spinnerAdapter = new ArrayAdapter<>(this, R.layout.spinner_centered, typeListFull);
         historyTypeSpinner.setAdapter(spinnerAdapter);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 6632cd0213..5a47672e8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -425,7 +425,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         pumpStatus.tempBasalEnd = DateTimeUtil.getTimeInFutureFromMinutes(time, tempBasalPair.getDurationMinutes());
         pumpStatus.tempBasalPumpId = pumpId;
 
-        TemporaryBasal tempStart = new TemporaryBasal() //
+        TemporaryBasal tempStart = new TemporaryBasal(injector) //
                 .date(time) //
                 .duration(tempBasalPair.getDurationMinutes()) //
                 .absolute(tempBasalPair.getInsulinRate()) //
@@ -561,7 +561,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
 
             addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, null);
 
-            TemporaryBasal temporaryBasal = new TemporaryBasal() //
+            TemporaryBasal temporaryBasal = new TemporaryBasal(injector) //
                     .date(time) //
                     .duration(0) //
                     .pumpId(pumpStatus.tempBasalPumpId)
@@ -709,7 +709,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         Intent intent = new Intent(context, ErrorHelperActivity.class);
         intent.putExtra("soundid", sound == null ? 0 : sound);
         intent.putExtra("status", message);
-        intent.putExtra("title", MainApp.gs(R.string.treatmentdeliveryerror));
+        intent.putExtra("title", resourceHelper.gs(R.string.treatmentdeliveryerror));
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
index f002989e3c..dfaa18bcaa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
@@ -35,6 +35,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodDeviceStatusChange;
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
@@ -49,6 +50,7 @@ public class OmnipodUtil {
     private final OmnipodPumpStatus omnipodPumpStatus;
     private final ActivePluginProvider activePlugins;
     private final SP sp;
+    private final ResourceHelper resourceHelper;
     private final HasAndroidInjector injector;
 
     private boolean lowLevelDebug = true;
@@ -67,6 +69,7 @@ public class OmnipodUtil {
             RileyLinkUtil rileyLinkUtil,
             OmnipodPumpStatus omnipodPumpStatus,
             SP sp,
+            ResourceHelper resourceHelper,
             ActivePluginProvider activePlugins,
             HasAndroidInjector injector
     ) {
@@ -75,6 +78,7 @@ public class OmnipodUtil {
         this.rileyLinkUtil = rileyLinkUtil;
         this.omnipodPumpStatus = omnipodPumpStatus;
         this.sp = sp;
+        this.resourceHelper = resourceHelper;
         this.activePlugins = activePlugins;
         this.injector = injector;
     }
@@ -102,11 +106,6 @@ public class OmnipodUtil {
             rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(currentCommand));
     }
 
-    public static void displayNotConfiguredDialog(Context context) {
-        OKDialog.showConfirmation(context, MainApp.gs(R.string.combo_warning),
-                MainApp.gs(R.string.omnipod_error_operation_not_possible_no_configuration), (Runnable) null);
-    }
-
 
     public OmnipodDriverState getDriverState() {
         return driverState;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index f43ece03d8..dd1e84c960 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -539,37 +539,6 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         return (Math.abs(diff) <= 0.00001);
     }
 
-    @Deprecated
-    private void treatmentCopy(Treatment oldTreatment, Treatment newTreatment, boolean fromNightScout) {
-
-        aapsLogger.debug(LTag.DATATREATMENTS, "treatmentCopy [old={}, new={}]", oldTreatment.toString(), newTreatment.toString());
-
-
-        if (fromNightScout) {
-            long pumpId_old = oldTreatment.pumpId;
-            boolean isSMB = (oldTreatment.isSMB || newTreatment.isSMB);
-
-            oldTreatment.copyFrom(newTreatment);
-
-            if (pumpId_old != 0) {
-                oldTreatment.pumpId = pumpId_old;
-            }
-
-            if (oldTreatment.pumpId != 0 && oldTreatment.source != Source.PUMP) {
-                oldTreatment.source = Source.PUMP;
-            }
-
-            oldTreatment.isSMB = isSMB;
-
-        } else {
-            oldTreatment.copyFrom(newTreatment);
-        }
-
-        aapsLogger.debug(LTag.DATATREATMENTS, "treatmentCopy [newAfterChange={}]", oldTreatment.toString());
-
-    }
-
-
     public Treatment getRecord(long pumpId, long date) {
 
         Treatment record = null;
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SP.java b/app/src/main/java/info/nightscout/androidaps/utils/SP.java
deleted file mode 100644
index a6124acf10..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/utils/SP.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.nightscout.androidaps.utils;
-
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import java.util.Map;
-
-import info.nightscout.androidaps.MainApp;
-
-/**
- * Created by mike on 17.02.2017.
- */
-
-public class SP {
-    private static SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
-
-    @Deprecated
-    static public Map<String, ?> getAll() {
-        return sharedPreferences.getAll();
-    }
-
-    @Deprecated
-    static public String getString(String key, String defaultValue) {
-        return sharedPreferences.getString(key, defaultValue);
-    }
-
-    @Deprecated
-    static public boolean getBoolean(int resourceID, Boolean defaultValue) {
-        try {
-            return sharedPreferences.getBoolean(MainApp.gs(resourceID), defaultValue);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    @Deprecated
-    static public void putString(int resourceID, String value) {
-        sharedPreferences.edit().putString(MainApp.gs(resourceID), value).apply();
-    }
-
-    @Deprecated
-    static public void putString(String key, String value) {
-        sharedPreferences.edit().putString(key, value).apply();
-    }
-
-    @Deprecated
-    static public void remove(String key) {
-        sharedPreferences.edit().remove(key).apply();
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
index fa79caaf2b..b3348ddc73 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
@@ -2,18 +2,13 @@ package info.nightscout.androidaps.utils;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.SharedPreferencesBackupHelper;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-import info.nightscout.androidaps.MainApp;
 
 public class SPBackupAgent extends BackupAgentHelper {
 
     // API 24
-    //static final String PREFS = PreferenceManager.getDefaultSharedPreferencesName(MainApp.instance().getApplicationContext());
-    static final String PREFS = MainApp.instance().getApplicationContext().getPackageName() + "_preferences";
+    final String PREFS = getApplicationContext().getPackageName() + "_preferences";
 
-    static final String PREFS_BACKUP_KEY = "SP";
+    final String PREFS_BACKUP_KEY = "SP";
 
     @Override
     public void onCreate() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
index 6192aec5e8..a7e4082c11 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
 import android.content.Context
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
@@ -24,7 +25,7 @@ class MsgHistoryEvents_v2Test : DanaRTestBase() {
     @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
 
     @Test @Throws(Exception::class) fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), activePluginProvider, injector, DateUtil(context, resourceHelper), 0)
+        val packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), activePluginProvider, injector, DateUtil(context, resourceHelper), 0)
 
         // test message decoding
         val array = ByteArray(100)

From cd84597058935ee8ddc72b957e32e7b9fa938032 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Sun, 10 May 2020 16:56:48 +0200
Subject: [PATCH 058/400] Kotlin interface not stricter than Java superclass

Intrinsic check in Kotlin if view is null lead to crashes.
view is not even used so we can accept null.
---
 .../androidaps/plugins/general/food/FoodFragment.kt         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index c54e383afc..3843f4c946 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -58,7 +58,7 @@ class FoodFragment : DaggerFragment() {
             filterData()
         }
         food_category.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 fillSubcategories()
                 filterData()
             }
@@ -69,7 +69,7 @@ class FoodFragment : DaggerFragment() {
             }
         }
         food_subcategory.setOnItemSelectedListener(object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 filterData()
             }
 
@@ -210,4 +210,4 @@ class FoodFragment : DaggerFragment() {
             }
         }
     }
-}
\ No newline at end of file
+}

From f727b25bb317d78f98c368e67f057291147be274 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 18:42:20 +0200
Subject: [PATCH 059/400] cleanup

---
 app/src/main/res/values/strings.xml                       | 1 -
 {app => core}/src/main/res/drawable/ic_error_red_48dp.xml | 0
 core/src/main/res/layout/dialog_error.xml                 | 2 +-
 core/src/main/res/values/strings.xml                      | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {app => core}/src/main/res/drawable/ic_error_red_48dp.xml (100%)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 335bb4898d..e56d145f97 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -811,7 +811,6 @@
     <string name="enablesmbwithtemptarget_summary">Enable SMB when there is temp target active (eating soon, exercise)</string>
     <string name="enablesmbwithhightemptarget">Enable SMB with high temp targets</string>
     <string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise)</string>
-    <string name="mute">Mute</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Carbs</string>
     <string name="overview_buttons_selection">Buttons</string>
diff --git a/app/src/main/res/drawable/ic_error_red_48dp.xml b/core/src/main/res/drawable/ic_error_red_48dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_error_red_48dp.xml
rename to core/src/main/res/drawable/ic_error_red_48dp.xml
diff --git a/core/src/main/res/layout/dialog_error.xml b/core/src/main/res/layout/dialog_error.xml
index 42ad93318d..a731078fd4 100644
--- a/core/src/main/res/layout/dialog_error.xml
+++ b/core/src/main/res/layout/dialog_error.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".dialogs.ErrorDialog">
+    tools:context="info.nightscout.androidaps.dialogs.ErrorDialog">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 3c7e94deee..0139796eb5 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -50,6 +50,7 @@
     <string name="objectives">Objectives</string>
     <string name="close">Close</string>
     <string name="please_wait">Please wait…</string>
+    <string name="mute">Mute</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>

From 05f73cd3ff37265e3c695cf07ce8db5505683128 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 20:10:08 +0200
Subject: [PATCH 060/400] elimitate careportal

---
 .../activities/MyPreferenceFragment.kt        |   3 -
 .../dependencyInjection/AppModule.kt          |   2 -
 .../dependencyInjection/FragmentsModule.kt    |   6 +-
 .../dependencyInjection/PluginsModule.kt      |  16 +-
 .../androidaps/dialogs/CareDialog.kt          |  21 +-
 .../general/actions/ActionsFragment.kt        |   6 +
 .../general/careportal/CareportalFragment.kt  | 134 ----
 .../general/careportal/CareportalPlugin.kt    |  29 -
 .../Dialogs/NewNSTreatmentDialog.java         | 740 ------------------
 .../general/careportal/OptionsToShow.java     |  81 --
 app/src/main/res/layout/actions_fragment.xml  |  41 +-
 app/src/main/res/values/strings.xml           |   2 -
 12 files changed, 60 insertions(+), 1021 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/OptionsToShow.java

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index d07bd02c9e..0af1782c90 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -25,7 +25,6 @@ import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
-import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
@@ -73,7 +72,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
     @Inject lateinit var danaRv2Plugin: DanaRv2Plugin
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
-    @Inject lateinit var careportalPlugin: CareportalPlugin
     @Inject lateinit var comboPlugin: ComboPlugin
     @Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
     @Inject lateinit var loopPlugin: LoopPlugin
@@ -161,7 +159,6 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(tomatoPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(poctechPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(glimpPlugin, rootKey)
-            addPreferencesFromResourceIfEnabled(careportalPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(loopPlugin, rootKey, config.APS)
             addPreferencesFromResourceIfEnabled(openAPSAMAPlugin, rootKey, config.APS)
             addPreferencesFromResourceIfEnabled(openAPSSMBPlugin, rootKey, config.APS)
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index 1157383ec8..cbf5dbb806 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -43,14 +43,12 @@ open class AppModule {
                         @PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
                         @PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.NotNSClient notNsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
-                        @PluginsModule.NSClient nsClient: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
                         @PluginsModule.APS aps: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>)
         : List<@JvmSuppressWildcards PluginBase> {
         val plugins = allConfigs.toMutableMap()
         if (configInterface.PUMPDRIVERS) plugins += pumpDrivers.get()
         if (configInterface.APS) plugins += aps.get()
         if (!configInterface.NSCLIENT) plugins += notNsClient.get()
-        if (configInterface.NSCLIENT) plugins += nsClient.get()
         return plugins.toList().sortedBy { it.first }.map { it.second }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 9fbfbc6307..9f65841adc 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -18,8 +18,6 @@ import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseTrigg
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditActionDialog
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditEventDialog
 import info.nightscout.androidaps.plugins.general.automation.dialogs.EditTriggerDialog
-import info.nightscout.androidaps.plugins.general.careportal.CareportalFragment
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
 import info.nightscout.androidaps.plugins.general.food.FoodFragment
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenanceFragment
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientFragment
@@ -55,13 +53,12 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesActionsFragment(): ActionsFragment
     @ContributesAndroidInjector abstract fun contributesAutomationFragment(): AutomationFragment
     @ContributesAndroidInjector abstract fun contributesBGSourceFragment(): BGSourceFragment
-    @ContributesAndroidInjector abstract fun contributesCareportalFragment(): CareportalFragment
     @ContributesAndroidInjector abstract fun contributesComboFragment(): ComboFragment
 
     @ContributesAndroidInjector
     abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
 
-    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): info.nightscout.androidaps.dana.DanaRFragment
+    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaRFragment
     @ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
     @ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
     @ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
@@ -108,7 +105,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
     @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
     @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
-    @ContributesAndroidInjector abstract fun contributesNewNSTreatmentDialog(): NewNSTreatmentDialog
     @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
     @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
     @ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index ccbb4624d4..ed14d108c9 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -4,6 +4,7 @@ import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntKey
 import dagger.multibindings.IntoMap
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -17,7 +18,6 @@ import info.nightscout.androidaps.plugins.constraints.storage.StorageConstraintP
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerPlugin
 import info.nightscout.androidaps.plugins.general.actions.ActionsPlugin
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
-import info.nightscout.androidaps.plugins.general.careportal.CareportalPlugin
 import info.nightscout.androidaps.plugins.general.dataBroadcaster.DataBroadcastPlugin
 import info.nightscout.androidaps.plugins.general.food.FoodPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
@@ -34,10 +34,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorP
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.profile.ns.NSProfilePlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
@@ -160,12 +156,6 @@ abstract class PluginsModule {
     @IntKey(170)
     abstract fun bindVirtualPumpPlugin(plugin: VirtualPumpPlugin): PluginBase
 
-    @Binds
-    @NSClient
-    @IntoMap
-    @IntKey(180)
-    abstract fun bindCareportalPlugin(plugin: CareportalPlugin): PluginBase
-
     @Binds
     @APS
     @IntoMap
@@ -226,7 +216,6 @@ abstract class PluginsModule {
     @IntKey(280)
     abstract fun bindSmsCommunicatorPlugin(plugin: SmsCommunicatorPlugin): PluginBase
 
-
     @Binds
     @APS
     @IntoMap
@@ -356,9 +345,6 @@ abstract class PluginsModule {
     @Qualifier
     annotation class NotNSClient
 
-    @Qualifier
-    annotation class NSClient
-
     @Qualifier
     annotation class APS
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index f9fa675438..ed2b96d1e7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -20,8 +20,8 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.HtmlHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.Translator
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.dialog_care.*
 import kotlinx.android.synthetic.main.notes.*
@@ -44,10 +44,13 @@ class CareDialog : DialogFragmentWithDate() {
         SENSOR_INSERT,
         BATTERY_CHANGE,
         NOTE,
-        EXERCISE
+        EXERCISE,
+        QUESTION,
+        ANNOUNCEMENT
     }
 
     private var options: EventType = EventType.BGCHECK
+
     @StringRes
     private var event: Int = R.string.none
 
@@ -85,6 +88,8 @@ class CareDialog : DialogFragmentWithDate() {
             EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery
             EventType.NOTE           -> R.drawable.icon_cp_note
             EventType.EXERCISE       -> R.drawable.icon_cp_exercise
+            EventType.QUESTION       -> R.drawable.icon_cp_question
+            EventType.ANNOUNCEMENT   -> R.drawable.icon_cp_announcement
         })
         actions_care_title.text = resourceHelper.gs(when (options) {
             EventType.BGCHECK        -> R.string.careportal_bgcheck
@@ -92,9 +97,13 @@ class CareDialog : DialogFragmentWithDate() {
             EventType.BATTERY_CHANGE -> R.string.careportal_pumpbatterychange
             EventType.NOTE           -> R.string.careportal_note
             EventType.EXERCISE       -> R.string.careportal_exercise
+            EventType.QUESTION       -> R.string.careportal_question
+            EventType.ANNOUNCEMENT   -> R.string.careportal_announcement
         })
 
         when (options) {
+            EventType.QUESTION,
+            EventType.ANNOUNCEMENT,
             EventType.BGCHECK        -> {
                 action_care_duration_layout.visibility = View.GONE
             }
@@ -134,7 +143,7 @@ class CareDialog : DialogFragmentWithDate() {
         }
         actions_care_duration.setParams(savedInstanceState?.getDouble("actions_care_duration")
             ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
-        if (options == EventType.NOTE)
+        if (options == EventType.NOTE || options == EventType.QUESTION || options == EventType.ANNOUNCEMENT)
             notes_layout?.visibility = View.VISIBLE // independent to preferences
     }
 
@@ -144,7 +153,7 @@ class CareDialog : DialogFragmentWithDate() {
 
         val json = JSONObject()
         val actions: LinkedList<String> = LinkedList()
-        if (options == EventType.BGCHECK) {
+        if (options == EventType.BGCHECK || options == EventType.QUESTION || options == EventType.ANNOUNCEMENT) {
             val type =
                 when {
                     actions_care_meter.isChecked  -> "Finger"
@@ -178,6 +187,8 @@ class CareDialog : DialogFragmentWithDate() {
             EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
             EventType.NOTE           -> CareportalEvent.NOTE
             EventType.EXERCISE       -> CareportalEvent.EXERCISE
+            EventType.QUESTION       -> CareportalEvent.QUESTION
+            EventType.ANNOUNCEMENT   -> CareportalEvent.ANNOUNCEMENT
         })
         json.put("units", profileFunction.getUnits())
         if (enteredBy.isNotEmpty())
@@ -194,6 +205,8 @@ class CareDialog : DialogFragmentWithDate() {
                     EventType.BATTERY_CHANGE -> CareportalEvent.PUMPBATTERYCHANGE
                     EventType.NOTE           -> CareportalEvent.NOTE
                     EventType.EXERCISE       -> CareportalEvent.EXERCISE
+                    EventType.QUESTION       -> CareportalEvent.QUESTION
+                    EventType.ANNOUNCEMENT   -> CareportalEvent.ANNOUNCEMENT
                 }
                 careportalEvent.json = json.toString()
                 aapsLogger.debug("USER ENTRY: CAREPORTAL ${careportalEvent.eventType} json: ${careportalEvent.json}")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index f14f7732dd..0100ca69dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -144,6 +144,12 @@ class ActionsFragment : DaggerFragment() {
         actions_exercise.setOnClickListener {
             CareDialog().setOptions(CareDialog.EventType.EXERCISE, R.string.careportal_exercise).show(childFragmentManager, "Actions")
         }
+        actions_question.setOnClickListener {
+            CareDialog().setOptions(CareDialog.EventType.QUESTION, R.string.careportal_question).show(childFragmentManager, "Actions")
+        }
+        actions_announcement.setOnClickListener {
+            CareDialog().setOptions(CareDialog.EventType.ANNOUNCEMENT, R.string.careportal_announcement).show(childFragmentManager, "Actions")
+        }
 
         sp.putBoolean(R.string.key_objectiveuseactions, true)
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt
deleted file mode 100644
index 4007e43b45..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalFragment.kt
+++ /dev/null
@@ -1,134 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.events.EventCareportalEventChange
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.careportal.Dialogs.NewNSTreatmentDialog
-import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
-import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import kotlinx.android.synthetic.main.careportal_fragment.*
-import kotlinx.android.synthetic.main.careportal_stats_fragment.*
-import javax.inject.Inject
-
-class CareportalFragment : DaggerFragment(), View.OnClickListener {
-    @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var rxBus: RxBusWrapper
-    @Inject lateinit var statusLightHandler: StatusLightHandler
-    @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var activePlugin: ActivePluginProvider
-
-    private val disposable = CompositeDisposable()
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.careportal_fragment, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        careportal_bgcheck.setOnClickListener(this)
-        careportal_announcement.setOnClickListener(this)
-        careportal_cgmsensorinsert.setOnClickListener(this)
-        careportal_cgmsensorstart.setOnClickListener(this)
-        careportal_combobolus.setOnClickListener(this)
-        careportal_correctionbolus.setOnClickListener(this)
-        careportal_carbscorrection.setOnClickListener(this)
-        careportal_exercise.setOnClickListener(this)
-        careportal_insulincartridgechange.setOnClickListener(this)
-        careportal_pumpbatterychange.setOnClickListener(this)
-        careportal_mealbolus.setOnClickListener(this)
-        careportal_note.setOnClickListener(this)
-        careportal_profileswitch.setOnClickListener(this)
-        careportal_pumpsitechange.setOnClickListener(this)
-        careportal_question.setOnClickListener(this)
-        careportal_snackbolus.setOnClickListener(this)
-        careportal_tempbasalend.setOnClickListener(this)
-        careportal_tempbasalstart.setOnClickListener(this)
-        careportal_openapsoffline.setOnClickListener(this)
-        careportal_temporarytarget.setOnClickListener(this)
-
-        val profileStore = activePlugin.activeProfileInterface.profile
-        if (profileStore == null) {
-            profileview_noprofile.visibility = View.VISIBLE
-            careportal_buttons.visibility = View.GONE
-        } else {
-            profileview_noprofile.visibility = View.GONE
-            careportal_buttons.visibility = View.VISIBLE
-        }
-    }
-
-    @Synchronized override fun onResume() {
-        super.onResume()
-        disposable.add(rxBus
-            .toObservable(EventCareportalEventChange::class.java)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ updateGUI() }) { fabricPrivacy.logException(it) }
-        )
-        updateGUI()
-    }
-
-    @Synchronized override fun onPause() {
-        super.onPause()
-        disposable.clear()
-    }
-
-    override fun onClick(view: View) {
-        val BGCHECK = OptionsToShow(R.id.careportal_bgcheck, R.string.careportal_bgcheck).date().bg()
-        val SNACKBOLUS = OptionsToShow(R.id.careportal_snackbolus, R.string.careportal_snackbolus).date().bg().insulin().carbs().prebolus()
-        val MEALBOLUS = OptionsToShow(R.id.careportal_mealbolus, R.string.careportal_mealbolus).date().bg().insulin().carbs().prebolus()
-        val CORRECTIONBOLUS = OptionsToShow(R.id.careportal_correctionbolus, R.string.careportal_correctionbolus).date().bg().insulin().carbs().prebolus()
-        val CARBCORRECTION = OptionsToShow(R.id.careportal_carbscorrection, R.string.careportal_carbscorrection).date().bg().carbs()
-        val COMBOBOLUS = OptionsToShow(R.id.careportal_combobolus, R.string.careportal_combobolus).date().bg().insulin().carbs().prebolus().duration().split()
-        val ANNOUNCEMENT = OptionsToShow(R.id.careportal_announcement, R.string.careportal_announcement).date().bg()
-        val NOTE = OptionsToShow(R.id.careportal_note, R.string.careportal_note).date().bg().duration()
-        val QUESTION = OptionsToShow(R.id.careportal_question, R.string.careportal_question).date().bg()
-        val EXERCISE = OptionsToShow(R.id.careportal_exercise, R.string.careportal_exercise).date().duration()
-        val SITECHANGE = OptionsToShow(R.id.careportal_pumpsitechange, R.string.careportal_pumpsitechange).date().bg()
-        val SENSORSTART = OptionsToShow(R.id.careportal_cgmsensorstart, R.string.careportal_cgmsensorstart).date().bg()
-        val SENSORCHANGE = OptionsToShow(R.id.careportal_cgmsensorinsert, R.string.careportal_cgmsensorinsert).date().bg()
-        val INSULINCHANGE = OptionsToShow(R.id.careportal_insulincartridgechange, R.string.careportal_insulincartridgechange).date().bg()
-        val PUMPBATTERYCHANGE = OptionsToShow(R.id.careportal_pumpbatterychange, R.string.careportal_pumpbatterychange).date().bg()
-        val TEMPBASALSTART = OptionsToShow(R.id.careportal_tempbasalstart, R.string.careportal_tempbasalstart).date().bg().duration().percent().absolute()
-        val TEMPBASALEND = OptionsToShow(R.id.careportal_tempbasalend, R.string.careportal_tempbasalend).date().bg()
-        val PROFILESWITCH = OptionsToShow(R.id.careportal_profileswitch, R.string.careportal_profileswitch).date().duration().profile()
-        val OPENAPSOFFLINE = OptionsToShow(R.id.careportal_openapsoffline, R.string.careportal_openapsoffline).date().duration()
-        val TEMPTARGET = OptionsToShow(R.id.careportal_temporarytarget, R.string.careportal_temporarytarget).date().duration().tempTarget()
-
-        val newDialog = NewNSTreatmentDialog()
-        when (view.id) {
-            R.id.careportal_bgcheck                -> newDialog.setOptions(BGCHECK, R.string.careportal_bgcheck)
-            R.id.careportal_announcement           -> newDialog.setOptions(ANNOUNCEMENT, R.string.careportal_announcement)
-            R.id.careportal_cgmsensorinsert        -> newDialog.setOptions(SENSORCHANGE, R.string.careportal_cgmsensorinsert)
-            R.id.careportal_cgmsensorstart         -> newDialog.setOptions(SENSORSTART, R.string.careportal_cgmsensorstart)
-            R.id.careportal_combobolus             -> newDialog.setOptions(COMBOBOLUS, R.string.careportal_combobolus)
-            R.id.careportal_correctionbolus        -> newDialog.setOptions(CORRECTIONBOLUS, R.string.careportal_correctionbolus)
-            R.id.careportal_carbscorrection        -> newDialog.setOptions(CARBCORRECTION, R.string.careportal_carbscorrection)
-            R.id.careportal_exercise               -> newDialog.setOptions(EXERCISE, R.string.careportal_exercise)
-            R.id.careportal_insulincartridgechange -> newDialog.setOptions(INSULINCHANGE, R.string.careportal_insulincartridgechange)
-            R.id.careportal_pumpbatterychange      -> newDialog.setOptions(PUMPBATTERYCHANGE, R.string.careportal_pumpbatterychange)
-            R.id.careportal_mealbolus              -> newDialog.setOptions(MEALBOLUS, R.string.careportal_mealbolus)
-            R.id.careportal_note                   -> newDialog.setOptions(NOTE, R.string.careportal_note)
-            R.id.careportal_profileswitch          -> newDialog.setOptions(PROFILESWITCH, R.string.careportal_profileswitch)
-            R.id.careportal_pumpsitechange         -> newDialog.setOptions(SITECHANGE, R.string.careportal_pumpsitechange)
-            R.id.careportal_question               -> newDialog.setOptions(QUESTION, R.string.careportal_question)
-            R.id.careportal_snackbolus             -> newDialog.setOptions(SNACKBOLUS, R.string.careportal_snackbolus)
-            R.id.careportal_tempbasalstart         -> newDialog.setOptions(TEMPBASALSTART, R.string.careportal_tempbasalstart)
-            R.id.careportal_tempbasalend           -> newDialog.setOptions(TEMPBASALEND, R.string.careportal_tempbasalend)
-            R.id.careportal_openapsoffline         -> newDialog.setOptions(OPENAPSOFFLINE, R.string.careportal_openapsoffline)
-            R.id.careportal_temporarytarget        -> newDialog.setOptions(TEMPTARGET, R.string.careportal_temporarytarget)
-        }
-        NewNSTreatmentDialog().show(childFragmentManager, "CareportalFragment")
-    }
-
-    private fun updateGUI() {
-        statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, careportal_pbage, null)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
deleted file mode 100644
index 897f28b0ae..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/CareportalPlugin.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal
-
-import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Config
-import info.nightscout.androidaps.R
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class CareportalPlugin @Inject constructor(
-    injector: HasAndroidInjector,
-    aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper,
-    config: Config
-) : PluginBase(PluginDescription()
-    .mainType(PluginType.GENERAL)
-    .fragmentClass(CareportalFragment::class.java.name)
-    .pluginName(R.string.careportal)
-    .shortName(R.string.careportal_shortname)
-    .visibleByDefault(config.NSCLIENT)
-    .enableByDefault(config.NSCLIENT)
-    .description(R.string.description_careportal),
-    aapsLogger, resourceHelper, injector
-)
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
deleted file mode 100644
index 52d7a25c49..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/Dialogs/NewNSTreatmentDialog.java
+++ /dev/null
@@ -1,740 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal.Dialogs;
-
-
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.text.format.DateFormat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioButton;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.DialogFragment;
-
-import com.google.common.collect.Lists;
-import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
-import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import dagger.android.HasAndroidInjector;
-import dagger.android.support.DaggerDialogFragment;
-import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.CareportalEvent;
-import info.nightscout.androidaps.db.ProfileSwitch;
-import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
-import info.nightscout.androidaps.interfaces.ProfileStore;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.plugins.general.careportal.OptionsToShow;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.DefaultValueHelper;
-import info.nightscout.androidaps.utils.HardLimits;
-import info.nightscout.androidaps.utils.JsonHelper;
-import info.nightscout.androidaps.utils.NumberPicker;
-import info.nightscout.androidaps.utils.SafeParse;
-import info.nightscout.androidaps.utils.Translator;
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-public class NewNSTreatmentDialog extends DaggerDialogFragment implements View.OnClickListener, DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener {
-    @Inject HasAndroidInjector injector;
-    @Inject AAPSLogger aapsLogger;
-    @Inject DefaultValueHelper defaultValueHelper;
-    @Inject ProfileFunction profileFunction;
-    @Inject ResourceHelper resourceHelper;
-    @Inject ConstraintChecker constraintChecker;
-    @Inject SP sp;
-    @Inject ActivePluginProvider activePlugin;
-    @Inject TreatmentsPlugin treatmentsPlugin;
-    @Inject HardLimits hardLimits;
-    @Inject NSUpload nsUpload;
-    @Inject Translator translator;
-    @Inject DateUtil dateUtil;
-
-    private static OptionsToShow options;
-    private static @StringRes int event;
-
-    private Profile profile;
-    public ProfileStore profileStore;
-
-    TextView eventTypeText;
-    LinearLayout layoutPercent;
-    LinearLayout layoutAbsolute;
-    LinearLayout layoutReuse;
-
-
-    TextView dateButton;
-    TextView timeButton;
-
-    TextView bgUnitsView;
-    RadioButton meterRadioButton;
-    RadioButton sensorRadioButton;
-    RadioButton otherRadioButton;
-    EditText notesEdit;
-    Spinner profileSpinner;
-    Spinner reasonSpinner;
-    Button reuseButton;
-
-    NumberPicker editBg;
-    NumberPicker editCarbs;
-    NumberPicker editInsulin;
-    NumberPicker editSplit;
-    NumberPicker editDuration;
-    NumberPicker editPercent;
-    NumberPicker editAbsolute;
-    NumberPicker editCarbTime;
-    NumberPicker editTemptarget;
-    NumberPicker editPercentage;
-    NumberPicker editTimeshift;
-
-    Date eventTime;
-
-    private static Integer seconds = null;
-
-    public NewNSTreatmentDialog setOptions(OptionsToShow options, int event) {
-        this.options = options;
-        this.event = event;
-        return this;
-    }
-
-    public NewNSTreatmentDialog() {
-        super();
-
-        if (seconds == null) {
-            seconds = Double.valueOf(Math.random() * 59).intValue();
-        }
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        if (options == null) return null;
-        getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        getDialog().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
-        setCancelable(true);
-        getDialog().setCanceledOnTouchOutside(false);
-        setStyle(DialogFragment.STYLE_NORMAL, getTheme());
-        View view = inflater.inflate(R.layout.careportal_newnstreatment_dialog, container, false);
-
-        layoutPercent = view.findViewById(R.id.careportal_newnstreatment_percent_layout);
-        layoutAbsolute = view.findViewById(R.id.careportal_newnstreatment_absolute_layout);
-
-        layoutReuse = view.findViewById(R.id.careportal_newnstreatment_reuse_layout);
-
-        eventTypeText = view.findViewById(R.id.careportal_newnstreatment_eventtype);
-        eventTypeText.setText(event);
-        bgUnitsView = view.findViewById(R.id.careportal_newnstreatment_bgunits);
-        meterRadioButton = view.findViewById(R.id.careportal_newnstreatment_meter);
-        sensorRadioButton = view.findViewById(R.id.careportal_newnstreatment_sensor);
-        otherRadioButton = view.findViewById(R.id.careportal_newnstreatment_other);
-        profileSpinner = view.findViewById(R.id.careportal_newnstreatment_profile);
-
-        reuseButton = view.findViewById(R.id.careportal_newnstreatment_reusebutton);
-
-        notesEdit = view.findViewById(R.id.careportal_newnstreatment_notes);
-
-        reasonSpinner = view.findViewById(R.id.careportal_newnstreatment_temptarget_reason);
-
-        eventTime = new Date();
-        dateButton = view.findViewById(R.id.careportal_newnstreatment_eventdate);
-        timeButton = view.findViewById(R.id.careportal_newnstreatment_eventtime);
-        dateButton.setText(DateUtil.dateString(eventTime));
-        timeButton.setText(dateUtil.timeString(eventTime));
-        dateButton.setOnClickListener(this);
-        timeButton.setOnClickListener(this);
-
-        view.findViewById(R.id.ok).setOnClickListener(this);
-        view.findViewById(R.id.cancel).setOnClickListener(this);
-
-        // profile
-        profile = profileFunction.getProfile();
-        profileStore = activePlugin.getActiveProfileInterface().getProfile();
-        if (profileStore == null) {
-            if (options.eventType == R.id.careportal_profileswitch) {
-                aapsLogger.error("Profile switch called but plugin doesn't contain valid profile");
-            }
-        } else {
-            ArrayList<CharSequence> profileList;
-            profileList = profileStore.getProfileList();
-            ArrayAdapter<CharSequence> adapter = new ArrayAdapter<>(getContext(),
-                    R.layout.spinner_centered, profileList);
-            profileSpinner.setAdapter(adapter);
-            // set selected to actual profile
-            for (int p = 0; p < profileList.size(); p++) {
-                if (profileList.get(p).equals(profileFunction.getProfileName(false)))
-                    profileSpinner.setSelection(p);
-            }
-        }
-        final Double bg = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
-
-        // temp target
-        final List<String> reasonList = Lists.newArrayList(
-                resourceHelper.gs(R.string.manual),
-                resourceHelper.gs(R.string.eatingsoon),
-                resourceHelper.gs(R.string.activity),
-                resourceHelper.gs(R.string.hypo));
-        ArrayAdapter<String> adapterReason = new ArrayAdapter<>(getContext(),
-                R.layout.spinner_centered, reasonList);
-        reasonSpinner.setAdapter(adapterReason);
-        reasonSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                double defaultDuration;
-                double defaultTarget;
-                if (profile != null && editTemptarget.getValue().equals(bg)) {
-                    defaultTarget = bg;
-                } else {
-                    //prevent changes on screen rotate
-                    defaultTarget = editTemptarget.getValue();
-                }
-                boolean erase = false;
-
-                if (resourceHelper.gs(R.string.eatingsoon).equals(reasonList.get(position))) {
-                    defaultDuration = defaultValueHelper.determineEatingSoonTTDuration();
-                    defaultTarget = defaultValueHelper.determineEatingSoonTT();
-                } else if (resourceHelper.gs(R.string.activity).equals(reasonList.get(position))) {
-                    defaultDuration = defaultValueHelper.determineActivityTTDuration();
-                    defaultTarget = defaultValueHelper.determineActivityTT();
-                } else if (resourceHelper.gs(R.string.hypo).equals(reasonList.get(position))) {
-                    defaultDuration = defaultValueHelper.determineHypoTTDuration();
-                    defaultTarget = defaultValueHelper.determineHypoTT();
-                } else if (editDuration.getValue() != 0) {
-                    defaultDuration = editDuration.getValue();
-                } else {
-                    defaultDuration = 0;
-                    erase = true;
-                }
-
-                if (defaultTarget != 0 || erase) {
-                    editTemptarget.setValue(defaultTarget);
-                }
-                if (defaultDuration != 0) {
-                    editDuration.setValue(defaultDuration);
-                } else if (erase) {
-                    editDuration.setValue(0d);
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-
-        // bg
-        bgUnitsView.setText(profileFunction.getUnits());
-
-        TextWatcher bgTextWatcher = new TextWatcher() {
-
-            public void afterTextChanged(Editable s) {
-            }
-
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (sensorRadioButton.isChecked()) meterRadioButton.setChecked(true);
-            }
-        };
-        editBg = view.findViewById(R.id.careportal_newnstreatment_bginput);
-        editTemptarget = view.findViewById(R.id.careportal_newnstreatment_temptarget);
-        if (profile == null) {
-            editBg.setParams(bg, 0d, 500d, 0.1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(Constants.MIN_TT_MGDL, Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
-        } else if (profileFunction.getUnits().equals(Constants.MMOL)) {
-            editBg.setParams(bg, 0d, 30d, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(Constants.MIN_TT_MMOL, Constants.MIN_TT_MMOL, Constants.MAX_TT_MMOL, 0.1d, new DecimalFormat("0.0"), false, view.findViewById(R.id.ok));
-        } else {
-            editBg.setParams(bg, 0d, 500d, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok), bgTextWatcher);
-            editTemptarget.setParams(Constants.MIN_TT_MGDL, Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-        }
-
-        sensorRadioButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            double bg1 = Profile.fromMgdlToUnits(new GlucoseStatus(injector).getGlucoseStatusData() != null ? new GlucoseStatus(injector).getGlucoseStatusData().glucose : 0d, profileFunction.getUnits());
-            if (savedInstanceState != null && savedInstanceState.getDouble("editBg") != bg1) {
-                editBg.setValue(savedInstanceState.getDouble("editBg"));
-            } else {
-                editBg.setValue(bg1);
-            }
-        });
-
-        Integer maxCarbs = constraintChecker.getMaxCarbsAllowed().value();
-        editCarbs = view.findViewById(R.id.careportal_newnstreatment_carbsinput);
-        editCarbs.setParams(0d, 0d, (double) maxCarbs, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        Double maxInsulin = constraintChecker.getMaxBolusAllowed().value();
-        editInsulin = view.findViewById(R.id.careportal_newnstreatment_insulininput);
-        editInsulin.setParams(0d, 0d, maxInsulin, 0.05d, new DecimalFormat("0.00"), false, view.findViewById(R.id.ok));
-
-        editSplit = view.findViewById(R.id.careportal_newnstreatment_splitinput);
-        editSplit.setParams(100d, 0d, 100d, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok));
-        editDuration = view.findViewById(R.id.careportal_newnstreatment_durationinput);
-        editDuration.setParams(0d, 0d, Constants.MAX_PROFILE_SWITCH_DURATION, 10d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        TextWatcher percentTextWatcher = new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start,
-                                          int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start,
-                                      int before, int count) {
-                layoutPercent.setVisibility(View.VISIBLE);
-                layoutAbsolute.setVisibility(View.GONE);
-            }
-        };
-
-        Integer maxPercent = 200;
-        if (profile != null)
-            maxPercent = constraintChecker.getMaxBasalPercentAllowed(profile).value();
-        editPercent = view.findViewById(R.id.careportal_newnstreatment_percentinput);
-        editPercent.setParams(0d, -100d, (double) maxPercent, 5d, new DecimalFormat("0"), true, view.findViewById(R.id.ok), percentTextWatcher);
-
-        TextWatcher absoluteTextWatcher = new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start,
-                                          int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start,
-                                      int before, int count) {
-                layoutPercent.setVisibility(View.GONE);
-                layoutAbsolute.setVisibility(View.VISIBLE);
-            }
-        };
-
-        Double maxAbsolute = hardLimits.maxBasal();
-        if (profile != null)
-            maxAbsolute = constraintChecker.getMaxBasalAllowed(profile).value();
-        editAbsolute = view.findViewById(R.id.careportal_newnstreatment_absoluteinput);
-        editAbsolute.setParams(0d, 0d, maxAbsolute, 0.05d, new DecimalFormat("0.00"), true, view.findViewById(R.id.ok), absoluteTextWatcher);
-
-        editCarbTime = view.findViewById(R.id.careportal_newnstreatment_carbtimeinput);
-        editCarbTime.setParams(0d, -60d, 60d, 5d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        editPercentage = view.findViewById(R.id.careportal_newnstreatment_percentage);
-        editPercentage.setParams(100d, (double) Constants.CPP_MIN_PERCENTAGE, (double) Constants.CPP_MAX_PERCENTAGE, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        editTimeshift = view.findViewById(R.id.careportal_newnstreatment_timeshift);
-        editTimeshift.setParams(0d, (double) Constants.CPP_MIN_TIMESHIFT, (double) Constants.CPP_MAX_TIMESHIFT, 1d, new DecimalFormat("0"), false, view.findViewById(R.id.ok));
-
-        ProfileSwitch ps = treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now());
-        if (ps != null && ps.isCPP) {
-            final int percentage = ps.percentage;
-            final int timeshift = ps.timeshift;
-            reuseButton.setText(reuseButton.getText() + " " + percentage + "% " + timeshift + "h");
-            reuseButton.setOnClickListener(v -> {
-                editPercentage.setValue((double) percentage);
-                editTimeshift.setValue((double) timeshift);
-            });
-        }
-        if (ps == null) {
-            options.duration = false;
-        }
-
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_eventtime_layout), options.date);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_bg_layout), options.bg);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_bgsource_layout), options.bg);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_insulin_layout), options.insulin);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_carbs_layout), options.carbs);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_split_layout), options.split);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_duration_layout), options.duration);
-        showOrHide(layoutPercent, options.percent);
-        showOrHide(layoutAbsolute, options.absolute);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_carbtime_layout), options.prebolus);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_profile_layout), options.profile);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_percentage_layout), options.profile);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_timeshift_layout), options.profile);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_reuse_layout), options.profile && ps != null && ps.isCPP);
-        showOrHide(view.findViewById(R.id.careportal_newnstreatment_temptarget_layout), options.tempTarget);
-
-        setCancelable(true);
-        getDialog().setCanceledOnTouchOutside(false);
-        //recovering state if there is something
-        // only numberPickers and editTexts
-        if (savedInstanceState != null) {
-            editBg.setValue(savedInstanceState.getDouble("editBg"));
-            editTemptarget.setValue(savedInstanceState.getDouble("editTemptarget"));
-            notesEdit.setText(savedInstanceState.getString("notesEdit"));
-            editCarbs.setValue(savedInstanceState.getDouble("editCarbs"));
-            editCarbs.setValue(savedInstanceState.getDouble("editCarbs"));
-            editInsulin.setValue(savedInstanceState.getDouble("editInsulin"));
-            editDuration.setValue(savedInstanceState.getDouble("editDuration"));
-            editPercent.setValue(savedInstanceState.getDouble("editPercent"));
-            editAbsolute.setValue(savedInstanceState.getDouble("editAbsolute"));
-            editCarbTime.setValue(savedInstanceState.getDouble("editCarbTime"));
-            editPercentage.setValue(savedInstanceState.getDouble("editPercentage"));
-            editTimeshift.setValue(savedInstanceState.getDouble("editTimeshift"));
-            // time and date
-            dateButton.setText(savedInstanceState.getString("dateButton"));
-            timeButton.setText(savedInstanceState.getString("timeButton"));
-        }
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(eventTime);
-        switch (view.getId()) {
-            case R.id.careportal_newnstreatment_eventdate:
-                DatePickerDialog dpd = DatePickerDialog.newInstance(
-                        this,
-                        calendar.get(Calendar.YEAR),
-                        calendar.get(Calendar.MONTH),
-                        calendar.get(Calendar.DAY_OF_MONTH)
-                );
-                dpd.setThemeDark(true);
-                dpd.dismissOnPause(true);
-                dpd.show(getActivity().getSupportFragmentManager(), "Datepickerdialog");
-                break;
-            case R.id.careportal_newnstreatment_eventtime:
-                TimePickerDialog tpd = TimePickerDialog.newInstance(
-                        this,
-                        calendar.get(Calendar.HOUR_OF_DAY),
-                        calendar.get(Calendar.MINUTE),
-                        DateFormat.is24HourFormat(getContext())
-                );
-                tpd.setThemeDark(true);
-                tpd.dismissOnPause(true);
-                tpd.show(getActivity().getSupportFragmentManager(), "Timepickerdialog");
-                break;
-            case R.id.ok:
-                confirmNSTreatmentCreation();
-                dismiss();
-                break;
-            case R.id.cancel:
-                dismiss();
-                break;
-        }
-    }
-
-    private void showOrHide(ViewGroup layout, boolean visible) {
-        if (visible) layout.setVisibility(View.VISIBLE);
-        else layout.setVisibility(View.GONE);
-    }
-
-    private void updateBGforDateTime() {
-        long millis = eventTime.getTime() - (150 * 1000L); // 2,5 * 60 * 1000
-        List<BgReading> data = MainApp.getDbHelper().getBgreadingsDataFromTime(millis, true);
-        if ((data.size() > 0) &&
-                (data.get(0).date > millis - 7 * 60 * 1000L) &&
-                (data.get(0).date < millis + 7 * 60 * 1000L)) {
-            editBg.setValue(Profile.fromMgdlToUnits(data.get(0).value, profileFunction.getUnits()));
-        }
-    }
-
-    @Override
-    public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
-        eventTime.setYear(year - 1900);
-        eventTime.setMonth(monthOfYear);
-        eventTime.setDate(dayOfMonth);
-        dateButton.setText(DateUtil.dateString(eventTime));
-        updateBGforDateTime();
-    }
-
-    @Override
-    public void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {
-        eventTime.setHours(hourOfDay);
-        eventTime.setMinutes(minute);
-        eventTime.setSeconds(this.seconds++); // randomize seconds to prevent creating record of the same time, if user choose time manually
-        timeButton.setText(dateUtil.timeString(eventTime));
-        updateBGforDateTime();
-    }
-
-    private JSONObject gatherData() {
-        String enteredBy = sp.getString("careportal_enteredby", "");
-        JSONObject data = new JSONObject();
-        try {
-            boolean allowZeroDuration = false;
-            data.put("created_at", DateUtil.toISOString(eventTime));
-            switch (options.eventType) {
-                case R.id.careportal_bgcheck:
-                    data.put("eventType", CareportalEvent.BGCHECK);
-                    break;
-                case R.id.careportal_announcement:
-                    data.put("eventType", CareportalEvent.ANNOUNCEMENT);
-                    data.put("isAnnouncement", true);
-                    break;
-                case R.id.careportal_cgmsensorinsert:
-                    data.put("eventType", CareportalEvent.SENSORCHANGE);
-                    break;
-                case R.id.careportal_cgmsensorstart:
-                    data.put("eventType", "Sensor Start");
-                    break;
-                case R.id.careportal_combobolus:
-                    data.put("splitNow", SafeParse.stringToDouble(editSplit.getText()));
-                    data.put("splitExt", 100 - SafeParse.stringToDouble(editSplit.getText()));
-                    data.put("eventType", CareportalEvent.COMBOBOLUS);
-                    break;
-                case R.id.careportal_correctionbolus:
-                    data.put("eventType", "Correction Bolus");
-                    break;
-                case R.id.careportal_carbscorrection:
-                    data.put("eventType", "Carb Correction");
-                    break;
-                case R.id.careportal_exercise:
-                    data.put("eventType", CareportalEvent.EXERCISE);
-                    break;
-                case R.id.careportal_insulincartridgechange:
-                    data.put("eventType", CareportalEvent.INSULINCHANGE);
-                    break;
-                case R.id.careportal_pumpbatterychange:
-                    data.put("eventType", CareportalEvent.PUMPBATTERYCHANGE);
-                    break;
-                case R.id.careportal_mealbolus:
-                    data.put("eventType", "Meal Bolus");
-                    break;
-                case R.id.careportal_note:
-                    data.put("eventType", CareportalEvent.NOTE);
-                    break;
-                case R.id.careportal_profileswitch:
-                    data.put("eventType", CareportalEvent.PROFILESWITCH);
-                    allowZeroDuration = true;
-                    break;
-                case R.id.careportal_pumpsitechange:
-                    data.put("eventType", CareportalEvent.SITECHANGE);
-                    break;
-                case R.id.careportal_question:
-                    data.put("eventType", CareportalEvent.QUESTION);
-                    break;
-                case R.id.careportal_snackbolus:
-                    data.put("eventType", "Snack Bolus");
-                    break;
-                case R.id.careportal_tempbasalstart:
-                    data.put("eventType", CareportalEvent.TEMPBASAL);
-                    break;
-                case R.id.careportal_tempbasalend:
-                    data.put("eventType", CareportalEvent.TEMPBASAL);
-                    break;
-                case R.id.careportal_openapsoffline:
-                    data.put("eventType", CareportalEvent.OPENAPSOFFLINE);
-                    break;
-                case R.id.careportal_temporarytarget:
-                    data.put("eventType", CareportalEvent.TEMPORARYTARGET);
-                    if (!reasonSpinner.getSelectedItem().toString().equals(""))
-                        data.put("reason", reasonSpinner.getSelectedItem().toString());
-                    if (SafeParse.stringToDouble(editTemptarget.getText()) != 0d) {
-                        data.put("targetBottom", SafeParse.stringToDouble(editTemptarget.getText()));
-                        data.put("targetTop", SafeParse.stringToDouble(editTemptarget.getText()));
-                    }
-                    allowZeroDuration = true;
-                    break;
-            }
-            if (options.bg && SafeParse.stringToDouble(editBg.getText()) != 0d) {
-                data.put("glucose", SafeParse.stringToDouble(editBg.getText()));
-                if (meterRadioButton.isChecked()) data.put("glucoseType", "Finger");
-                if (sensorRadioButton.isChecked()) data.put("glucoseType", "Sensor");
-                if (otherRadioButton.isChecked()) data.put("glucoseType", "Manual");
-            }
-            if (SafeParse.stringToDouble(editCarbs.getText()) != 0d)
-                data.put("carbs", SafeParse.stringToDouble(editCarbs.getText()));
-            if (SafeParse.stringToDouble(editInsulin.getText()) != 0d)
-                data.put("insulin", SafeParse.stringToDouble(editInsulin.getText()));
-            if (allowZeroDuration || SafeParse.stringToDouble(editDuration.getText()) != 0d)
-                data.put("duration", SafeParse.stringToDouble(editDuration.getText()));
-            if (layoutPercent.getVisibility() != View.GONE)
-                data.put("percent", SafeParse.stringToDouble(editPercent.getText()));
-            if (layoutAbsolute.getVisibility() != View.GONE)
-                data.put("absolute", SafeParse.stringToDouble(editAbsolute.getText()));
-            if (options.profile && profileSpinner.getSelectedItem() != null)
-                data.put("profile", profileSpinner.getSelectedItem().toString());
-            if (options.profile)
-                data.put("percentage", SafeParse.stringToInt(editPercentage.getText()));
-            if (options.profile)
-                data.put("timeshift", SafeParse.stringToInt(editTimeshift.getText()));
-            if (SafeParse.stringToDouble(editCarbTime.getText()) != 0d)
-                data.put("preBolus", SafeParse.stringToDouble(editCarbTime.getText()));
-            if (!notesEdit.getText().toString().equals(""))
-                data.put("notes", notesEdit.getText().toString());
-            data.put("units", profileFunction.getUnits());
-            if (!enteredBy.equals("")) data.put("enteredBy", enteredBy);
-            if (options.eventType == R.id.careportal_combobolus) {
-                Double enteredInsulin = SafeParse.stringToDouble(editInsulin.getText());
-                data.put("enteredinsulin", enteredInsulin);
-                data.put("insulin", enteredInsulin * SafeParse.stringToDouble(editSplit.getText()) / 100);
-                data.put("relative", enteredInsulin * (100 - SafeParse.stringToDouble(editSplit.getText())) / 100 / SafeParse.stringToDouble(editDuration.getText()) * 60);
-            }
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return data;
-    }
-
-    private String buildConfirmText(JSONObject data) {
-        String ret = "";
-//        if (data.has("eventType")) {
-//            ret += resourceHelper.gs(R.string.careportal_newnstreatment_eventtype);
-//            ret += ": ";
-//            ret += Translator.translate(JsonHelper.safeGetString(data, "eventType", ""));
-//            ret += "\n";
-//        }
-        if (data.has("glucose")) {
-            ret += resourceHelper.gs(R.string.treatments_wizard_bg_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "glucose", "");
-            ret += " " + profileFunction.getUnits() + "\n";
-        }
-        if (data.has("glucoseType")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_glucosetype);
-            ret += ": ";
-            ret += translator.translate(JsonHelper.safeGetString(data, "glucoseType", ""));
-            ret += "\n";
-        }
-        if (data.has("carbs")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbs_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "carbs", "");
-            ret += " g\n";
-        }
-        if (data.has("insulin")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_insulin_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "insulin", "");
-            ret += " U\n";
-        }
-        if (data.has("duration")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_duration_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "duration", "");
-            ret += " min\n";
-        }
-        if (data.has("percent")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_percent_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "percent", "");
-            ret += " %\n";
-        }
-        if (data.has("absolute")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_absolute_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "absolute", "");
-            ret += " U/h\n";
-        }
-        if (data.has("preBolus")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_carbtime_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "preBolus", "");
-            ret += " min\n";
-        }
-        if (data.has("notes")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_notes_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "notes", "");
-            ret += "\n";
-        }
-        if (data.has("profile")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_profile_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "profile", "");
-            ret += "\n";
-        }
-        if (data.has("percentage")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_percentage_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "percentage", "");
-            ret += " %\n";
-        }
-        if (data.has("timeshift")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "timeshift", "");
-            ret += " h\n";
-        }
-        if (data.has("targetBottom") && data.has("targetTop")) {
-            ret += resourceHelper.gs(R.string.target_range);
-            ret += " ";
-            ret += JsonHelper.safeGetObject(data, "targetBottom", "");
-            ret += " - ";
-            ret += JsonHelper.safeGetObject(data, "targetTop", "");
-            ret += "\n";
-        }
-        if (data.has("created_at")) {
-            ret += resourceHelper.gs(R.string.event_time_label);
-            ret += ": ";
-            ret += dateUtil.dateAndTimeString(eventTime);
-            ret += "\n";
-        }
-        if (data.has("enteredBy")) {
-            ret += resourceHelper.gs(R.string.careportal_newnstreatment_enteredby_title);
-            ret += ": ";
-            ret += JsonHelper.safeGetObject(data, "enteredBy", "");
-            ret += "\n";
-        }
-
-        return ret;
-    }
-
-    private void confirmNSTreatmentCreation() {
-        final JSONObject data = gatherData();
-        OKDialog.showConfirmation(getContext(), translator.translate(JsonHelper.safeGetString(data, "eventType", resourceHelper.gs(R.string.overview_treatment_label))), buildConfirmText(data), () -> nsUpload.createNSTreatment(data, profileStore, profileFunction, eventTime.getTime()));
-    }
-
-
-    @Override
-    public void onSaveInstanceState(Bundle savedInstanceState) {
-        savedInstanceState.putString("notesEdit", notesEdit.getText().toString());
-        savedInstanceState.putString("dateButton", dateButton.getText().toString());
-        savedInstanceState.putString("timeButton", timeButton.getText().toString());
-        savedInstanceState.putDouble("editBg", editBg.getValue());
-        savedInstanceState.putDouble("editCarbs", editCarbs.getValue());
-        savedInstanceState.putDouble("editInsulin", editInsulin.getValue());
-        savedInstanceState.putDouble("editDuration", editDuration.getValue());
-        savedInstanceState.putDouble("editPercent", editPercent.getValue());
-        savedInstanceState.putDouble("editAbsolute", editAbsolute.getValue());
-        savedInstanceState.putDouble("editCarbTime", editCarbTime.getValue());
-        savedInstanceState.putDouble("editTemptarget", editTemptarget.getValue());
-        savedInstanceState.putDouble("editPercentage", editPercentage.getValue());
-        savedInstanceState.putDouble("editTimeshift", editTimeshift.getValue());
-        super.onSaveInstanceState(savedInstanceState);
-    }
-
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/OptionsToShow.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/OptionsToShow.java
deleted file mode 100644
index e1effcd561..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/careportal/OptionsToShow.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package info.nightscout.androidaps.plugins.general.careportal;
-
-/**
- * Created by mike on 05.11.2016.
- */
-
-public class OptionsToShow {
-    public int eventType;
-    public int eventName;
-    public boolean date;
-    public boolean bg;
-    public boolean insulin;
-    public boolean carbs;
-    public boolean prebolus;
-    public boolean duration;
-    public boolean percent;
-    public boolean absolute;
-    public boolean profile;
-    public boolean split;
-    public boolean tempTarget;
-
-    public OptionsToShow(int eventType, int eventName) {
-        this.eventType = eventType;
-        this.eventName = eventName;
-    }
-
-    public OptionsToShow date() {
-        date = true;
-        return this;
-    }
-
-    public OptionsToShow bg() {
-        bg = true;
-        return this;
-    }
-
-    public OptionsToShow insulin() {
-        insulin = true;
-        return this;
-    }
-
-    public OptionsToShow carbs() {
-        carbs = true;
-        return this;
-    }
-
-    public OptionsToShow prebolus() {
-        prebolus = true;
-        return this;
-    }
-
-    public OptionsToShow duration() {
-        duration = true;
-        return this;
-    }
-
-    public OptionsToShow percent() {
-        percent = true;
-        return this;
-    }
-
-    public OptionsToShow absolute() {
-        absolute = true;
-        return this;
-    }
-
-    public OptionsToShow profile() {
-        profile = true;
-        return this;
-    }
-
-    public OptionsToShow split() {
-        split = true;
-        return this;
-    }
-
-    public OptionsToShow tempTarget() {
-        tempTarget = true;
-        return this;
-    }
-}
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 77a5ab00dd..cf17417b72 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -126,6 +126,13 @@
             android:paddingEnd="15dp"
             android:text="@string/careportal" />
 
+        <include
+            android:id="@+id/careportal_stats"
+            layout="@layout/careportal_stats_fragment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp" />
+
         <androidx.gridlayout.widget.GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -218,13 +225,35 @@
                 app:layout_gravity="fill"
                 app:layout_row="4" />
 
-        </androidx.gridlayout.widget.GridLayout>
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/actions_announcement"
+                style="@style/ButtonSmallFontStyle"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:drawableTop="@drawable/icon_cp_announcement"
+                android:paddingLeft="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/careportal_announcement"
+                app:layout_column="0"
+                app:layout_columnWeight="1"
+                app:layout_gravity="fill"
+                app:layout_row="5" />
 
-        <include
-            android:id="@+id/careportal_stats"
-            layout="@layout/careportal_stats_fragment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
+            <info.nightscout.androidaps.utils.SingleClickButton
+                android:id="@+id/actions_question"
+                style="@style/ButtonSmallFontStyle"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:drawableTop="@drawable/icon_cp_question"
+                android:paddingLeft="0dp"
+                android:paddingRight="0dp"
+                android:text="@string/careportal_question"
+                app:layout_column="1"
+                app:layout_columnWeight="1"
+                app:layout_gravity="fill"
+                app:layout_row="5" />
+
+        </androidx.gridlayout.widget.GridLayout>
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e56d145f97..c0383d967b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,6 @@
     <string name="alert_dialog_permission_battery_optimization_failed">This device does not appear to support battery optimization whitelisting - you may experience performance issues.</string>
 
     <string name="description_actions">Some buttons to quickly access common features</string>
-    <string name="description_careportal">Enter advanced log book entries.</string>
     <string name="description_config_builder">Used for configuring the active plugins</string>
     <string name="description_objectives">Learning program</string>
     <string name="description_food">Displays the food presets defined in Nightscout</string>
@@ -428,7 +427,6 @@
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFILE</string>
     <string name="treatments_shortname">TREAT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>

From 9ac88f7def130bd33b7c00797a3b0ebd73c754f3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 21:07:58 +0200
Subject: [PATCH 061/400] remove mdtp library

---
 app/build.gradle                              |   1 -
 .../general/actions/ActionsFragment.kt        |   8 +----
 app/src/main/res/layout/actions_fragment.xml  |   4 +--
 app/src/main/res/values/colors.xml            |   7 ----
 app/src/main/res/values/dimens.xml            |   6 ----
 app/src/main/res/values/strings.xml           |  13 --------
 .../res/drawable-hdpi/background_darkgray.xml |   0
 .../main/res/drawable-hdpi/border_gray.xml    |   0
 .../res/drawable-hdpi/icon_home_profile.png   | Bin
 .../res/drawable-hdpi}/toast_border_ok.xml    |  24 +++++++-------
 .../res/drawable-mdpi/icon_home_profile.png   | Bin
 .../res/drawable-xhdpi/icon_home_profile.png  | Bin
 .../res/drawable-xxhdpi/icon_home_profile.png | Bin
 .../drawable-xxxhdpi/icon_home_profile.png    | Bin
 .../main/res/drawable/alert_border_error.xml  |  30 +++++++++---------
 .../res/drawable/alert_border_warning.xml     |  30 +++++++++---------
 .../drawable/ic_trending_flat_white_48dp.xml  |   0
 .../main/res/drawable/icon_home_profile.png   | Bin
 .../mdtp_material_button_background.xml       |   6 ++++
 .../mdtp_material_button_selected.xml         |  13 ++++++++
 .../src/main/res/drawable/pillborder.xml      |   0
 .../main/res/layout/danar_statsactivity.xml   |  21 ++++--------
 .../main/res/layout/dialog_alert_custom.xml   |   4 +--
 .../main/res/layout/dialog_bolusprogress.xml  |   2 +-
 .../main/res/layout/dialog_profileviewer.xml  |   2 +-
 core/src/main/res/layout/okcancel.xml         |   8 ++---
 core/src/main/res/values/colors.xml           |  14 ++++++++
 core/src/main/res/values/dimens.xml           |   8 +++++
 core/src/main/res/values/strings.xml          |  13 ++++++++
 core/src/main/res/values/styles.xml           |  28 +++++++++++++++-
 .../main/res/layout/danar_historyactivity.xml |   2 +-
 31 files changed, 140 insertions(+), 104 deletions(-)
 rename {app => core}/src/main/res/drawable-hdpi/background_darkgray.xml (100%)
 rename {app => core}/src/main/res/drawable-hdpi/border_gray.xml (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_home_profile.png (100%)
 rename {app/src/main/res/drawable => core/src/main/res/drawable-hdpi}/toast_border_ok.xml (97%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_home_profile.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_home_profile.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_home_profile.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_home_profile.png (100%)
 rename {app => core}/src/main/res/drawable/alert_border_error.xml (97%)
 rename {app => core}/src/main/res/drawable/alert_border_warning.xml (97%)
 rename {app => core}/src/main/res/drawable/ic_trending_flat_white_48dp.xml (100%)
 rename {app => core}/src/main/res/drawable/icon_home_profile.png (100%)
 create mode 100644 core/src/main/res/drawable/mdtp_material_button_background.xml
 create mode 100644 core/src/main/res/drawable/mdtp_material_button_selected.xml
 rename {app => core}/src/main/res/drawable/pillborder.xml (100%)
 create mode 100644 core/src/main/res/values/dimens.xml

diff --git a/app/build.gradle b/app/build.gradle
index b2cb9db72f..6289c5f27b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -269,7 +269,6 @@ dependencies {
     implementation "androidx.activity:activity-ktx:${activityVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 0100ca69dc..47651ef9ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -198,13 +198,7 @@ class ActionsFragment : DaggerFragment() {
         val pump = activePlugin.activePump
 
         actions_temptarget?.visibility = (profile != null).toVisibility()
-        actions_canceltempbasal.visibility = (profile == null).toVisibility()
-        actions_settempbasal.visibility = (profile == null).toVisibility()
-        actions_fill.visibility = (profile == null).toVisibility()
-        actions_extendedbolus.visibility = (profile == null).toVisibility()
-        actions_extendedbolus_cancel.visibility = (profile == null).toVisibility()
-        actions_historybrowser.visibility = (profile == null).toVisibility()
-        actions_tddstats.visibility = (profile == null).toVisibility()
+        actions_historybrowser.visibility = (profile != null).toVisibility()
 
         val basalProfileEnabled = buildHelper.isEngineeringModeOrRelease() && pump.pumpDescription.isSetBasalProfileCapable
 
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index cf17417b72..588bde9ab8 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -280,7 +280,7 @@
                 app:layout_column="0"
                 app:layout_columnWeight="1"
                 app:layout_gravity="fill"
-                app:layout_row="4" />
+                app:layout_row="6" />
 
             <info.nightscout.androidaps.utils.SingleClickButton
                 android:id="@+id/actions_tddstats"
@@ -295,7 +295,7 @@
                 app:layout_column="1"
                 app:layout_columnWeight="1"
                 app:layout_gravity="fill"
-                app:layout_row="4" />
+                app:layout_row="6" />
 
         </androidx.gridlayout.widget.GridLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9bfd6aa1a9..a2b72f3f49 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -70,13 +70,6 @@
 
     <color name="splashBackground">#2E2E2E</color>
 
-    <color name="toastBorder">#666666</color>
-    <color name="toastBase">#ffffff</color>
-    <color name="toastOk">#77dd77</color>
-    <color name="toastError">#ff0400</color>
-    <color name="toastWarn">#FF8C00</color>
-    <color name="toastInfo">#03A9F4</color>
-
     <color name="metadataOk">#77dd77</color>
     <color name="metadataTextWarning">#FF8C00</color>
     <color name="metadataTextError">#FF5555</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b650a33ce6..8542005550 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,2 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="compact_height">30dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
-    <dimen name="appbar_padding_top">8dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0383d967b..63a2c9a8e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,13 +73,6 @@
     <string name="description_xdrip_status_line">Show information about your loop on your xDrip+ watchface.</string>
     <string name="description_sms_communicator">Remote control AndroidAPS using SMS commands.</string>
 
-    <string name="nsprofileview_units_label">Units</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Target</string>
-    <string name="noprofileset">NO PROFILE SET</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Carbs:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -165,7 +158,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Carbs</string>
     <string name="changeyourinput">Change your input!</string>
     <string name="configbuilder_bgsource">BG Source</string>
     <string name="configbuilder_bgsource_description">Where should AndroidAPS gain  it\'s data from?</string>
@@ -311,7 +303,6 @@
     <string name="danarprofile">DanaR profile settings</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
-    <string name="danar_historyreload">Reload</string>
     <string name="uploading">Uploading</string>
     <string name="danar_ebolus">E bolus</string>
     <string name="danar_dsbolus">DS bolus</string>
@@ -328,8 +319,6 @@
     <string name="danar_password_title">Pump password</string>
     <string name="bolusstopped">Bolus stopped</string>
     <string name="bolusstopping">Stopping bolus</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
     <string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
     <string name="smscommunicator_loopisdisabled">Loop is disabled</string>
@@ -591,7 +580,6 @@
     <string name="careportal_sensorage_label">Sensor age</string>
     <string name="careportal_canulaage_label">Canula age</string>
     <string name="careportal_insulinage_label">Insulin age</string>
-    <string name="invalidprofile">Invalid profile !!!</string>
     <string name="doprofileswitch">Do Profile Switch</string>
     <string name="careportal_pbage_label">Pump battery age</string>
     <string name="ns_alarmoptions">Alarm options</string>
@@ -670,7 +658,6 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">DIA of %1$f too short - using %2$f instead!</string>
     <string name="activate_profile">Activate profile</string>
-    <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="pairing">Pairing</string>
     <string name="selectedpump">Selected pump</string>
diff --git a/app/src/main/res/drawable-hdpi/background_darkgray.xml b/core/src/main/res/drawable-hdpi/background_darkgray.xml
similarity index 100%
rename from app/src/main/res/drawable-hdpi/background_darkgray.xml
rename to core/src/main/res/drawable-hdpi/background_darkgray.xml
diff --git a/app/src/main/res/drawable-hdpi/border_gray.xml b/core/src/main/res/drawable-hdpi/border_gray.xml
similarity index 100%
rename from app/src/main/res/drawable-hdpi/border_gray.xml
rename to core/src/main/res/drawable-hdpi/border_gray.xml
diff --git a/app/src/main/res/drawable-hdpi/icon_home_profile.png b/core/src/main/res/drawable-hdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_home_profile.png
rename to core/src/main/res/drawable-hdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable/toast_border_ok.xml b/core/src/main/res/drawable-hdpi/toast_border_ok.xml
similarity index 97%
rename from app/src/main/res/drawable/toast_border_ok.xml
rename to core/src/main/res/drawable-hdpi/toast_border_ok.xml
index 1c62848b31..c16b59d200 100644
--- a/app/src/main/res/drawable/toast_border_ok.xml
+++ b/core/src/main/res/drawable-hdpi/toast_border_ok.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:shape="rectangle"
-    tools:ignore="PrivateResource">
-    <corners android:radius="18dp" />
-    <solid android:color="@color/background_floating_material_dark" />
-    <stroke
-        android:width="3dp"
-        android:color="@color/toastBorder" />
-</shape>
-
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle"
+    tools:ignore="PrivateResource">
+    <corners android:radius="18dp" />
+    <solid android:color="@color/background_floating_material_dark" />
+    <stroke
+        android:width="3dp"
+        android:color="@color/toastBorder" />
+</shape>
+
diff --git a/app/src/main/res/drawable-mdpi/icon_home_profile.png b/core/src/main/res/drawable-mdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_home_profile.png
rename to core/src/main/res/drawable-mdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_home_profile.png b/core/src/main/res/drawable-xhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_home_profile.png
rename to core/src/main/res/drawable-xhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_home_profile.png
rename to core/src/main/res/drawable-xxhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_home_profile.png
rename to core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
diff --git a/app/src/main/res/drawable/alert_border_error.xml b/core/src/main/res/drawable/alert_border_error.xml
similarity index 97%
rename from app/src/main/res/drawable/alert_border_error.xml
rename to core/src/main/res/drawable/alert_border_error.xml
index d1bcae1348..310604bdea 100644
--- a/app/src/main/res/drawable/alert_border_error.xml
+++ b/core/src/main/res/drawable/alert_border_error.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="PrivateResource"
-    android:insetLeft="16dp"
-    android:insetTop="16dp"
-    android:insetRight="16dp"
-    android:insetBottom="16dp">
-    <shape
-        android:shape="rectangle">
-        <corners android:radius="2dp" />
-        <solid android:color="@color/background_floating_material_dark" />
-        <stroke android:color="@color/errorAlertBackground" android:width="3dp" />
-    </shape></inset>
-
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="PrivateResource"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape
+        android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/background_floating_material_dark" />
+        <stroke android:color="@color/errorAlertBackground" android:width="3dp" />
+    </shape></inset>
+
diff --git a/app/src/main/res/drawable/alert_border_warning.xml b/core/src/main/res/drawable/alert_border_warning.xml
similarity index 97%
rename from app/src/main/res/drawable/alert_border_warning.xml
rename to core/src/main/res/drawable/alert_border_warning.xml
index c73a9517a5..6c6feeafe2 100644
--- a/app/src/main/res/drawable/alert_border_warning.xml
+++ b/core/src/main/res/drawable/alert_border_warning.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="PrivateResource"
-    android:insetLeft="16dp"
-    android:insetTop="16dp"
-    android:insetRight="16dp"
-    android:insetBottom="16dp">
-    <shape
-        android:shape="rectangle">
-        <corners android:radius="2dp" />
-        <solid android:color="@color/background_floating_material_dark" />
-        <stroke android:color="@color/warningAlertBackground" android:width="3dp" />
-    </shape></inset>
-
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="PrivateResource"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape
+        android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/background_floating_material_dark" />
+        <stroke android:color="@color/warningAlertBackground" android:width="3dp" />
+    </shape></inset>
+
diff --git a/app/src/main/res/drawable/ic_trending_flat_white_48dp.xml b/core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_trending_flat_white_48dp.xml
rename to core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
diff --git a/app/src/main/res/drawable/icon_home_profile.png b/core/src/main/res/drawable/icon_home_profile.png
similarity index 100%
rename from app/src/main/res/drawable/icon_home_profile.png
rename to core/src/main/res/drawable/icon_home_profile.png
diff --git a/core/src/main/res/drawable/mdtp_material_button_background.xml b/core/src/main/res/drawable/mdtp_material_button_background.xml
new file mode 100644
index 0000000000..f70c39c0cf
--- /dev/null
+++ b/core/src/main/res/drawable/mdtp_material_button_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
+    <item android:drawable="@drawable/mdtp_material_button_selected" android:state_focused="true" />
+    <item android:drawable="@drawable/mdtp_material_button_selected" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/mdtp_material_button_selected.xml b/core/src/main/res/drawable/mdtp_material_button_selected.xml
new file mode 100644
index 0000000000..1733e2d3ea
--- /dev/null
+++ b/core/src/main/res/drawable/mdtp_material_button_selected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetBottom="6dp"
+    android:insetTop="6dp">
+    <shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+        <corners android:radius="2dp" />
+        <solid android:color="@color/mdtp_button_selected" />
+        <padding
+            android:bottom="4dp"
+            android:top="4dp" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/pillborder.xml b/core/src/main/res/drawable/pillborder.xml
similarity index 100%
rename from app/src/main/res/drawable/pillborder.xml
rename to core/src/main/res/drawable/pillborder.xml
diff --git a/core/src/main/res/layout/danar_statsactivity.xml b/core/src/main/res/layout/danar_statsactivity.xml
index d4320c05f2..d26170b128 100644
--- a/core/src/main/res/layout/danar_statsactivity.xml
+++ b/core/src/main/res/layout/danar_statsactivity.xml
@@ -5,17 +5,7 @@
     android:layout_height="fill_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:orientation="horizontal">
-
-    </LinearLayout>
+    tools:context="info.nightscout.androidaps.activities.TDDStatsActivity">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -117,7 +107,7 @@
                             android:labelFor="@+id/danar_stats_editTotalBaseBasal"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="left"
+                            android:gravity="start"
                             android:layout_weight="1" />
 
                         <EditText
@@ -142,7 +132,7 @@
                             android:labelFor="@+id/danar_stats_editTotalBaseBasal2"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="left"
+                            android:gravity="start"
                             android:layout_weight="1" />
 
                         <TextView
@@ -165,7 +155,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <LinearLayout
             android:orientation="vertical"
@@ -203,7 +194,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/mdtp_white"
                 android:background="@drawable/pillborder"
-                android:text="@string/danar_historyreload" />
+                android:text="@string/reload" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/core/src/main/res/layout/dialog_alert_custom.xml b/core/src/main/res/layout/dialog_alert_custom.xml
index f006387d28..312be67ac7 100644
--- a/core/src/main/res/layout/dialog_alert_custom.xml
+++ b/core/src/main/res/layout/dialog_alert_custom.xml
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="50dp"
+            android:layout_marginStart="2dp"
+            android:layout_marginEnd="50dp"
             android:layout_toEndOf="@id/alertdialog_icon"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index e2da43a067..ccf02258f9 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".dialogs.BolusProgressDialog"
+    tools:context="info.nightscout.androidaps.dialogs.BolusProgressDialog"
 >
 
     <RelativeLayout
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index c55ea7027c..d39364279e 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -5,7 +5,7 @@
     android:focusableInTouchMode="true"
     android:minWidth="300dp"
     android:orientation="vertical"
-    tools:context=".dialogs.ProfileViewerDialog">
+    tools:context="info.nightscout.androidaps.dialogs.ProfileViewerDialog">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/core/src/main/res/layout/okcancel.xml b/core/src/main/res/layout/okcancel.xml
index f1322fd566..c31941c21a 100644
--- a/core/src/main/res/layout/okcancel.xml
+++ b/core/src/main/res/layout/okcancel.xml
@@ -19,7 +19,7 @@
     android:layout_height="56dp"
     android:orientation="horizontal"
     android:background="@android:color/transparent"
-    android:gravity="end|right"
+    android:gravity="end"
     android:layout_gravity="center_vertical"
     android:paddingBottom="8dp">
 
@@ -27,18 +27,16 @@
         android:id="@+id/cancel"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
         style="@style/mdtp_ActionButton.Text"
-        android:text="@string/mdtp_cancel" />
+        android:text="@string/cancel" />
 
     <Button
         android:id="@+id/ok"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
         style="@style/mdtp_ActionButton.Text"
-        android:text="@string/mdtp_ok" />
+        android:text="@string/ok" />
 </LinearLayout>
     <!-- From: file:/Users/wdullaer/Documents/Programming%20Projects/MaterialDateTimePicker/library/src/main/res/layout/mdtp_done_button.xml -->
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index d122ed5158..e2f1c4af3e 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -3,6 +3,11 @@
     <color name="colorPrimary">#212121</color>
     <color name="colorPrimaryDark">#000000</color>
     <color name="colorAccent">#40bbaa</color>
+    <color name="mdtp_button_selected">#33969696</color>
+    <color name="mdtp_accent_color">#009688</color>
+    <color name="mdtp_button_color">@color/mdtp_accent_color</color>
+    <color name="mdtp_white">#ffffff</color>
+    <color name="mdtp_line_dark">#808080</color>
 
     <!--    Fragments-->
     <color name="colorInitializingBorder">#00695c</color>
@@ -36,4 +41,13 @@
     <!--    CareportalEvent-->
     <color name="notificationAnnouncement">#FF8C00</color>
 
+    <!--    Toasts-->
+    <color name="toastBorder">#666666</color>
+    <color name="toastBase">#ffffff</color>
+    <color name="toastOk">#77dd77</color>
+    <color name="toastError">#ff0400</color>
+    <color name="toastWarn">#FF8C00</color>
+    <color name="toastInfo">#03A9F4</color>
+
+
 </resources>
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..b650a33ce6
--- /dev/null
+++ b/core/src/main/res/values/dimens.xml
@@ -0,0 +1,8 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="compact_height">30dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="appbar_padding_top">8dp</dimen>
+</resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0139796eb5..cbddf818a8 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -51,6 +51,19 @@
     <string name="close">Close</string>
     <string name="please_wait">Please wait…</string>
     <string name="mute">Mute</string>
+    <string name="reload">Reload</string>
+    <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
+    <string name="overview_bolusprogress_stop">Stop</string>
+    <string name="carbs">Carbs</string>
+    <string name="invalidprofile">Invalid profile !!!</string>
+    <string name="noprofileset">NO PROFILE SET</string>
+    <string name="date">Date</string>
+    <string name="nsprofileview_units_label">Units</string>
+    <string name="nsprofileview_dia_label">DIA</string>
+    <string name="nsprofileview_ic_label">IC</string>
+    <string name="nsprofileview_isf_label">ISF</string>
+    <string name="nsprofileview_basal_label">Basal</string>
+    <string name="nsprofileview_target_label">Target</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index aabdcd6d8d..70c49c926e 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:ns2="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/colorPrimary</item>
@@ -34,5 +34,31 @@
         <item name="colorAccent">@color/errorAlertBackground</item>
     </style>
 
+    <!--    Buttons from MaterialDateTimePicker    -->
+    <dimen name="mdtp_material_button_height">48dp</dimen>
+    <dimen name="mdtp_material_button_textsize">14sp</dimen>
+    <dimen name="mdtp_material_button_minwidth">64dp</dimen>
+    <dimen name="mdtp_material_button_textpadding_horizontal">8dp</dimen>
+
+    <style name="mdtp_ActionButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">@dimen/mdtp_material_button_height</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:focusable">true</item>
+    </style>
+
+    <style name="mdtp_ActionButton.Text" ns2:ignore="NewApi">
+        <item name="android:textSize">@dimen/mdtp_material_button_textsize</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:gravity">center</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:background">@drawable/mdtp_material_button_background</item>
+        <item name="android:minWidth">@dimen/mdtp_material_button_minwidth</item>
+        <item name="android:paddingLeft">@dimen/mdtp_material_button_textpadding_horizontal</item>
+        <item name="android:paddingRight">@dimen/mdtp_material_button_textpadding_horizontal</item>
+        <item name="android:textColor">@color/mdtp_button_color</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
 
 </resources>
diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
index ea371daedb..5bf96bb3f0 100644
--- a/dana/src/main/res/layout/danar_historyactivity.xml
+++ b/dana/src/main/res/layout/danar_historyactivity.xml
@@ -88,6 +88,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:drawableStart="@drawable/icon_actions_refill"
-        android:text="@string/danar_historyreload" />
+        android:text="@string/reload" />
 
 </RelativeLayout>

From 8321ff31267492f572be7dbaf6cb3f8def054c85 Mon Sep 17 00:00:00 2001
From: Rob Kresha <rob.kresha@gmail.com>
Date: Sun, 10 May 2020 14:57:26 -0500
Subject: [PATCH 062/400] Extra doube-quote

Fix for #2624
---
 .../java/info/nightscout/androidaps/utils/DateUtil.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index 58e156d7a0..419729a126 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -340,13 +340,13 @@ public class DateUtil {
                 t = t / 60;
                 if (t != 1) unit = resourceHelper.gs(R.string.unit_hours);
                 if (t > 24) {
-                    unit = resourceHelper.gs(R.string.unit_day) + "\"";
+                    unit = resourceHelper.gs(R.string.unit_day);
                     t = t / 24;
-                    if (t != 1) unit = resourceHelper.gs(R.string.unit_days) + "\"";
+                    if (t != 1) unit = resourceHelper.gs(R.string.unit_days);
                     if (t > 28) {
-                        unit = resourceHelper.gs(R.string.unit_week) + "\"";
+                        unit = resourceHelper.gs(R.string.unit_week);
                         t = t / 7;
-                        if (t != 1) unit = resourceHelper.gs(R.string.unit_weeks) + "\"";
+                        if (t != 1) unit = resourceHelper.gs(R.string.unit_weeks);
                     }
                 }
             }

From 2375b159face4e7afac6eaf79f307d18c104af8f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 22:31:36 +0200
Subject: [PATCH 063/400] resources cleanup

---
 .../automation/actions/ActionSendSMS.kt       |   2 +-
 .../res/drawable-hdpi/icon_local_savehdpi.png | Bin 912 -> 0 bytes
 .../icon_local_activatexhdpi.png              | Bin 1700 -> 0 bytes
 .../drawable-xhdpi/icon_local_resetxhdpi.png  | Bin 1241 -> 0 bytes
 .../drawable-xhdpi/icon_local_savexhdpi.png   | Bin 1154 -> 0 bytes
 .../icon_local_activatexxhdpi.png             | Bin 2678 -> 0 bytes
 .../drawable-xxhdpi/icon_local_savexxhdpi.png | Bin 1694 -> 0 bytes
 .../icon_local_resetxxxhdpi.png               | Bin 2510 -> 0 bytes
 .../icon_local_activate.png}                  | Bin
 .../icon_local_reset.png}                     | Bin
 app/src/main/res/values/arrays.xml            |  11 ----
 app/src/main/res/values/strings.xml           |  59 ------------------
 app/src/main/res/values/styles.xml            |   4 --
 .../res/drawable-hdpi/icon_actions_refill.png | Bin
 .../res/drawable-hdpi/icon_danar_useropt.png  | Bin
 .../res/drawable-hdpi/icon_danarhistory.png   | Bin
 .../res/drawable-hdpi/icon_danarprofile.png   | Bin
 .../res/drawable-hdpi/icon_danarstats.png     | Bin
 .../res/drawable-hdpi/icon_local_save.png     | Bin
 .../res/drawable-mdpi/icon_actions_refill.png | Bin
 .../res/drawable-mdpi}/icon_danar_useropt.png | Bin
 .../res/drawable-mdpi/icon_danarhistory.png   | Bin
 .../res/drawable-mdpi/icon_danarprofile.png   | Bin
 .../res/drawable-mdpi/icon_danarstats.png     | Bin
 .../res/drawable-mdpi/icon_local_save.png     | Bin
 .../drawable-xhdpi/icon_actions_refill.png    | Bin
 .../res/drawable-xhdpi/icon_danar_useropt.png | Bin
 .../res/drawable-xhdpi/icon_danarhistory.png  | Bin
 .../res/drawable-xhdpi/icon_danarprofile.png  | Bin
 .../res/drawable-xhdpi/icon_danarstats.png    | Bin
 .../res/drawable-xhdpi/icon_local_save.png    | Bin
 .../drawable-xxhdpi/icon_actions_refill.png   | Bin
 .../drawable-xxhdpi/icon_danar_useropt.png    | Bin
 .../res/drawable-xxhdpi/icon_danarhistory.png | Bin
 .../res/drawable-xxhdpi/icon_danarprofile.png | Bin
 .../res/drawable-xxhdpi/icon_danarstats.png   | Bin
 .../res/drawable-xxhdpi/icon_local_save.png   | Bin
 .../drawable-xxxhdpi/icon_actions_refill.png  | Bin
 .../drawable-xxxhdpi/icon_danar_useropt.png   | Bin
 .../drawable-xxxhdpi/icon_danarhistory.png    | Bin
 .../drawable-xxxhdpi/icon_danarprofile.png    | Bin
 .../res/drawable-xxxhdpi/icon_danarstats.png  | Bin
 .../res/drawable-xxxhdpi/icon_local_save.png  | Bin
 .../main/res/drawable/icon_actions_refill.png | Bin
 .../main/res/drawable/icon_danar_useropt.png  | Bin
 .../src/main/res/drawable/icon_local_save.png | Bin
 core/src/main/res/values/strings.xml          |  22 +++++++
 core/src/main/res/values/styles.xml           |   4 ++
 dana/src/main/res/layout/danar_fragment.xml   |   2 +-
 .../main/res/layout/danar_historyactivity.xml |   2 +-
 .../layout/danar_user_options_activity.xml    |   2 +-
 dana/src/main/res/values/arrays.xml           |  15 +++++
 dana/src/main/res/values/strings.xml          |  26 ++++++++
 .../res/layout/danars_enter_pin_activity.xml  |   2 +-
 .../layout/danars_pairingprogressdialog.xml   |   2 +-
 danars/src/main/res/layout/okcancel.xml       |   4 +-
 56 files changed, 75 insertions(+), 82 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_local_savehdpi.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_local_activatexhdpi.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_local_resetxhdpi.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_local_savexhdpi.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_local_activatexxhdpi.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_local_savexxhdpi.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_local_resetxxxhdpi.png
 rename app/src/main/res/{drawable-xxxhdpi/icon_local_activatexxxhdpi.png => drawable/icon_local_activate.png} (100%)
 rename app/src/main/res/{drawable-xxhdpi/icon_local_resetxxhdpi.png => drawable/icon_local_reset.png} (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_actions_refill.png (100%)
 rename app/src/main/res/drawable-hdpi/icon_danar_useropthdpi.png => core/src/main/res/drawable-hdpi/icon_danar_useropt.png (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_danarhistory.png (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_danarprofile.png (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_danarstats.png (100%)
 rename {app => core}/src/main/res/drawable-hdpi/icon_local_save.png (100%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_actions_refill.png (100%)
 rename {app/src/main/res/drawable => core/src/main/res/drawable-mdpi}/icon_danar_useropt.png (100%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_danarhistory.png (100%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_danarprofile.png (100%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_danarstats.png (100%)
 rename {app => core}/src/main/res/drawable-mdpi/icon_local_save.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_actions_refill.png (100%)
 rename app/src/main/res/drawable-xhdpi/icon_danar_useroptxhdpi.png => core/src/main/res/drawable-xhdpi/icon_danar_useropt.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_danarhistory.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_danarprofile.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_danarstats.png (100%)
 rename {app => core}/src/main/res/drawable-xhdpi/icon_local_save.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_actions_refill.png (100%)
 rename app/src/main/res/drawable-xxhdpi/icon_danar_useroptxxhdpi.png => core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_danarhistory.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_danarprofile.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_danarstats.png (100%)
 rename {app => core}/src/main/res/drawable-xxhdpi/icon_local_save.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_actions_refill.png (100%)
 rename app/src/main/res/drawable-xxxhdpi/icon_danar_useroptxxxhdpi.png => core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_danarhistory.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_danarprofile.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_danarstats.png (100%)
 rename {app => core}/src/main/res/drawable-xxxhdpi/icon_local_save.png (100%)
 rename {app => core}/src/main/res/drawable/icon_actions_refill.png (100%)
 rename app/src/main/res/drawable-mdpi/icon_danar_useroptmdpi.png => core/src/main/res/drawable/icon_danar_useropt.png (100%)
 rename app/src/main/res/drawable-xxxhdpi/icon_local_savexxxhdpi.png => core/src/main/res/drawable/icon_local_save.png (100%)
 create mode 100644 dana/src/main/res/values/arrays.xml

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
index 5db3c14add..61f727c9a0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionSendSMS.kt
@@ -26,7 +26,7 @@ class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) {
 
     override fun doAction(callback: Callback) {
         val result = smsCommunicatorPlugin.sendNotificationToAllNumbers(text.value)
-        callback.result(PumpEnactResult(injector).success(result).comment(if (result) R.string.ok else R.string.danar_error))?.run()
+        callback.result(PumpEnactResult(injector).success(result).comment(if (result) R.string.ok else R.string.error))?.run()
     }
 
     override fun toJSON(): String {
diff --git a/app/src/main/res/drawable-hdpi/icon_local_savehdpi.png b/app/src/main/res/drawable-hdpi/icon_local_savehdpi.png
deleted file mode 100644
index e5c1d5cedc61cbdb3069090d90f1611cbb5da670..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp&H|6fVg?3**&xhV(m4mHg4xN_
z#WAFU@$H=Rxwj2O+T*+L-Jac-tKMPWVZOpVqe^&z^Jd3KypNh0Wao0e;+^FaP~D{F
zes>mU3`YeE&&(x1<mP*vtdLJom?$vw*BSYv_2+g!{>b4a@&0PCg;saNDWwIQI9BK|
zVPV$H@b#QIC3h=BgXq7n+caN^zuT%;b!}nJYE_0e3=fp$s+b#C!*3itCXjvQy>MWI
z{r!UVl_ztrh5c$0*Ib>mx|(4}(VTmQ>#GYl8Pt{cU4Ff6#rHee-8Q_ZxBY7IpYv|(
zo2|mhpRQht*!`$HqwAO5GM$T?PHl@yWDMpsTJw7m+oR)oH+TbM*+sr;Zxi6z6}9Qb
z)TO`w_CF4KeItt1FjvgY|4*lI$J%K-PJQBH;1|l55<Watz3M!}hbH~ZZ-3pYH0pc<
z|4-I%?pdQhE&1;99X*mk0g@HJa%U~7n^dL$a^2xvufPudx{GhGXkOZM#O|m-(9!b>
zTHd<~?1GM+H+U{rv+0Lqnx=N?AD+#VU3=xfvAfQgs<Wr?`kF@Vx;K$+cEzhB=k}cM
zD^CA-ct@P~-pWmuKQ^u1rFfiaw>bZmGS=lC^;UkjA3g8Z?p84c28Zsw7pC_P2rt!@
zlxW}e$bA3Ipg%49zw^ZlwiZ5mUKO=TGFFVQDqeSaQw#5r{JBbXZ6UmSR-3;SH50JE
ze&)IE{uy;aCtu|~cwq5d_*w7#$2)S(Tv}8%ZSai@YI&%$M!)V&E4$vwUy&k-XMXhh
zUGmFZv7wQ5!V8dK^@qko`z+6;cFtEkU7+qTqc`WHaf-CGQA=v~e8txevlMi)|M1*Q
zmt|^6?Vq106l@}w*sgixyur+$Yy2eiPX2fB?BBsQ)3&bd<Xg?$uBzFE(GB8v*ZMf5
z3I;^7gorT)My5vhnoW0EV6Xp8tu*oFtf^c5TY^vh-C4eIox9KVgWIN*hHn!+Quns`
z)Je94+kEyLUBkZ33+lNOzp|;PBiG%SyNqWe!)(q|mQQosi+L`_muTJ2vOgv@mm%GH
zR&r<FgN+Wss}rSVW^^lk6Sc}Y95&6pJgY33ci-3jGJ+T6Y#67y!rg+&T*z>sez%KJ
V0^^&Ve}P$y!PC{xWt~$(69DLjngjp<

diff --git a/app/src/main/res/drawable-xhdpi/icon_local_activatexhdpi.png b/app/src/main/res/drawable-xhdpi/icon_local_activatexhdpi.png
deleted file mode 100644
index 75e9af38ed98e928829a6f2a5dd78896bb8bfdb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1700
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
V0$TRMx;JkJMD;yJZaQ)@??0b02G{@q

diff --git a/app/src/main/res/drawable-xhdpi/icon_local_resetxhdpi.png b/app/src/main/res/drawable-xhdpi/icon_local_resetxhdpi.png
deleted file mode 100644
index 2813cb448d86b4f8186c955c0bf3ce3727e41214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmeAS@N?(olHy`uVBq!ia0vp^sX&~<!3HGfEBwm>Qk(@Ik;M!QVyYm_=ozH)fq{Xg
z+tbA{q=ND7+|z;5jsk7B_3j__3_rn;%c92o`1ZX9jx{_!Y;7D9@~pZz1O(SiVT}3y
zq?h6P4c+N`&b)E9?XQpd8=5QHy5z3w{9V=a9v!}YTUs-sCPcnsg@{84mx30nz*MFV
zFGiQ842yyo0yP^53!hm2|0(~<?oTZpX*F{`7+P1H;+Ajg{aG2cHcn=_x7RiAo>z<Z
zs3;Z32wZ$AxI80bg5@=hNt-4Ii9eMTyt}EV^Z8|a;fqO8YsKcBx9-YWB6DI#SHaHk
z;<X_~50)0JogsYjJIi$QqIJu!W(j{@bRp=~B9qoC+f8vZtTyI~ezQ%lIpel$Uv=M{
z`O0y{CL2J~7e6K+2$mN6zB_?m_u3pj{T*htk{^VGO{ZVZ+A3RA$2kG0D28W+?7gl}
zj$L!Uy96A5nWMWmO*|mz$Jw2)1veSz$934)JDu}A;l?m)$~ulri}m+ickoZXb!KnP
zyNW0SLxZ5ImNyo;Ea#uEt$wvS+qI**N#gga?oF%zf6U-2%28zNJGEYBshOEfXq=~<
zW@+Fou?v$QKYY3+D%O49((;1KHIG*q@6Oyh>+75(5l`h-?$z4*&KwKv1vfu^wz;>s
zuOxqoU;OsIzK4C$4h9=$NFV=urgquJlpqV$n$0#>3e<JI-dFP6xwUKio|HrK2Kq~S
zM8YqBlPaCpyz}Y3+S%Iw7Ib<lwRZ1b%l|=U*LIy&<r|@|_bj;+GEwMDKNoMmnoX2m
z@zcfIT&5q=)r+2=GINo>(t)pxyQa*ua9y$^&+28){fHg!ZZ2|_d8-i=m+Y@ndFY#?
z)zoDhM1pdP#SgMeIv?m2iuU%Ia%hp)%M7Du5~|fX-`~CZ%db?n<i-+{nW8_;wyEt|
zv0o^<OZWOSofetz^=G8E>{swOX<7O<I`Mtmx1G&3A{;>vj_v3>kiA9Or|9XteK9G*
znx`1R>2Jb~pk346X!N*s$?q}y8rmf=uS=j*?Dh%~%WI0FCs&k<Rm)W>d}b+`zo=Bp
zsmN*KlxtPXb31;1y;gMX7*BiyZ^A9B&P5BAGnf3?ynB_N*ZS^xy05#{Wef!hSmsB+
zb5%K7?pwK{`_k!E#~Q0cf*#NMC7RkJ&>E+s#;$nh)uyYHmzF3l3^{e_<8StRkL_kL
zMk@up>da1_Xi?j}<O5UA^chEQh&D5~#3<;bKW!D<c4h15jSMbx_E{bAsrY|P!Eh%>
zqFA5C$4&EYc>7N5I_b&r{vFq@C)ZvtTi9p5{o%Ko)XJRa8DT;TCagQ_d~e&W%G}zo
zE<L^+PnB8<Yvs@EJ<qrHyIP_DM|rMA0^-*5tAjPJG%N}5@pJkXU-sZ@Tyw9Gye3=h
ziCtUgWXL7S=>2&2KydG89i=A^q<=K^M!4VHWb5GLr>SibsJ62zXeL*tVD7Vvif*kD
z9age;gcdu=sQi=?n746HuwvPl{W;8wR!0(-#jzC#yh^`VUznc|*}CigU0_+o;OXk;
Jvd$@?2>{2kD+>Ss

diff --git a/app/src/main/res/drawable-xhdpi/icon_local_savexhdpi.png b/app/src/main/res/drawable-xhdpi/icon_local_savexhdpi.png
deleted file mode 100644
index 0cf81430cc21e8ef2d92fca605c7b4ef16cd2f99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^sX&~<!3HGfEBwm>Qk(@Ik;M!QVyYm_=ozH)fq{X=
z#M8wwq+-t7IR|rZI|#U{JH9LQvpKfzz{>-EtYPfeCNl7cX?esrK4E5*Tg&w*L|`TJ
zZsyk~X2&)*v8D+g6xiwg_RXh!i}xA9Dofq#iqhL_w%>m1aq!XJUk99*GAs&W2-Iv?
zA>t6irJ%(sFqNspi_rzU@RP$=>KhcN<Ze}2G<$FV9aGo66YllR)0{UYxAebT$HQeg
ztK~1<4$_pHl548G=yjj!e(!w$r4|~uU$u0+3(gB(y2H@P?wih6t-X#@FEJm#HZ^(U
z&M#$K->+uwTbq77a#Lp4ub`^iC-XW_Z!@yi|HsNynbGxYW3s5-M%B7$0dI_#=By4@
zGTPo_d|X_ndHJ#x`%B(zzj;5tulCn9k*`L_>fEh^Pi-@5UNwK?HT?qz7vK4umo4ng
zadc8q!jtY}x=A^aM;>>tm#udR*YeKDkzDv_@sHZ1J3{W(Yg;)w*Dk-|<YBe%$Dz7+
z5pPc3`Rb8Z&hWb7#-bY=Qz!0QCey=uEahYB`F<m*dCf=my`G?P>El)PR5mRZwQV{p
zPwCuVw&Hr{HdB!qH#RMq^l46pb@PLbB0f2hYS9z!tTy{H(PW!W@H(NxN2jGu3bNRy
zC)2IkuY3B*5{2W_QoGW*a)1g|RZX_}#IDa-y>H_Tj>!{+q@t^v&rG(c{?V^FS99UU
zRJ;F?74!L+E-RjNU-UE3=jH#SGFN>AyLqfwlTI%;Q)6op5!+N3oVZW#cGh9j&C?r7
zy^n?&1w6{W7x>BC{rjx?8OfZzYum5<Wz`5uv;A*vU-rmHV_VF8ady|P*S8AK@?N`F
zaqJqK<~ALTpqezL_O8OCeXALhEW@HjTBa;pah89_r-&=wJofV*%$inq_wL-PH~u0C
z$25Hd&#NB!&~f`~h0~RNYXcUr^*bfSqz8QgvLCp8QB2ywX<)L=jeXOZq8^DnrjpWB
zr{mLDw|y&Zneit1G*j#Z8Kq;3BRJ%v#eQggWH78v5saRu<Mq8UX;Y`Jx7lY+#w4+w
zN2aN+_FSiY<WF8#)s$bM95>I}@Ci(g&57JJhwqz+G5<^%>B%|IU&tnf#XLDPX^pgc
z#F@9V?eBlQzghKnp4hx4zg%46J74G=TRku6bNrt7zyz@3{C*y{`)5(p`INj#<_{x-
zJa;~LwnOK^%BOmZ?2FWOm#%l2cT`2V+^y{GYcp3{->MHc%0*(Q=BBb$cpup%a@t_;
z;qG~TGgN-dKE4{%FPCe#vuIk<A)RBUs=sdqv#$;@p7AK?hpf)RUcQVy%WQ5ex>H;D
zvPL-hu5v<r=hU1-I=6HU_pkr1ckP$(M%l-*sTbqL_J03xE_K!NY}Ok^$DbDUXr|US
nn=3@6;mVQNGpb{A$3Lb`36<>)F|KLALWRN8)z4*}Q$iB}G&v0a

diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_activatexxhdpi.png b/app/src/main/res/drawable-xxhdpi/icon_local_activatexxhdpi.png
deleted file mode 100644
index 600e6ee61c33f54be6ebc656cfe97ab182d9695d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2678
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_savexxhdpi.png b/app/src/main/res/drawable-xxhdpi/icon_local_savexxhdpi.png
deleted file mode 100644
index 20448e4bf98468272a5b298fae35794acb74ce3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1694
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_resetxxxhdpi.png b/app/src/main/res/drawable-xxxhdpi/icon_local_resetxxxhdpi.png
deleted file mode 100644
index ec5447914932b1946a725f0f4087ebc3414b3180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2510
zcmc&$`#%%<8#lM(+E^HJ8_Rb>TjD4r8)iF2J1&K?l(|I6osb>5w8Cc7v`KE0v<Q{^
z{Su`b+T=E+adK%Wx1@A-Uf)0B{P299&+~pRpXc*Dujlo8NH`ZKMLA75F)=YkEXKiA
z#9xSLKt@`0qL_WfA|`tU;}s<)X7b0s1c<vD?JUBGSO=tg{9PfR6ETTa>5n)fXi56W
zTeL$-l^P?+jpLP_ky57*AUu$)ePmZD`hjB6&DbSC>XqI#W~bSU2H>wvz|PNCK{m7-
z=8b;?cfc)=>nB5{eLIfB_I*I0#9=bB#d=U;Dn(50KNRAf0okV*;P5&VYku6!la0lL
z8)l0mY+<Z*;i<#Q{&=kuG7pOc6P!uuqE-CvqtrEn!Mc^SfegwK+~1C>8IE-SDB0)3
zVrMpRQt0j|%d?Ml_+WQv8kA}VR|94B*_900V0^0smUwaDbE<nG8WgU&?p(h;Vl&}k
zxBg$)_6!JA0=D+?sCuA5>yJs3LAueFpA41^)dDM8Pffc&8|=H>*39e-JOqIryW@ET
z|Hna-G?x9yC(oRxUj802>m0YB3}xz`fmysqRFdY;%-R-u%@6g-^h|xI>FtC=`MJfO
z&g|@0aRiAswV#_a$f6$_cE9Iaqef5+@E{<VoG9BRh*C!t92xnM=vL5lT-an3Z+wB_
zUWLMFQv3~gK5HyN!?X>DIA{_Nr(Jd3dF`+Ngv_bA<9a@wqW<FKwnye`X13(AAv((O
zyBjaiYUK!`C~%2a*RypigQA|7@Mm&vd+d7bmRXrF0Ok=qu(s!n<T=hLo2=b>$~_H=
zV}N=2+xEYO$C$1ugykn<gpmi2hxWKCs&e|LPC=jmE4dpxS6aCjJki=Js7PWGmToE$
z315>b^YJo%U2}^*hnOf<qDs7MePA`RvadZUGU_+&SF+h=FdIR8rg<$>n#F`4xi>M(
zR9L$A$J<&`@cL($;Q8TV!|@VFU4nr#`vrVA<fzIn;_Ty1+p-l!ix=|#c=OQ2<CgoW
zp4!IGX3yC+@JLfP(0?&mXnNx>{)h4{vq772$7?&7w+q!X4zn;rEm;yJ#wAXX38dXY
zgs>g=ZWM0q7d48{rx3a33NO*pN2f-+*Rj{UL6l9F%_D>JPIa-bt7h%>%gjexbOGaK
z7jSO~K6g)GEgM*jjiAq&N)$1F{FFwKPbJf*LMLCy!qYtaw{;2Hd!ywAtE;)@iF|Cm
zVeWpl_X_Zc#EP|tGdD_FhO6^JKud(tRN~k`sY}RPE+6Vgh2(n04C=RajFH+j7>o|{
z)^AlO7n^g>MX`~A$?i*8HdM1;VU355Vc(ASO<`|ZkTwAN=sIsIyro?0{nZ0oER<{F
z$U*M@ex+!8CYv6RU+`xyHyCunv@W;e%TS@b(L1HE?}nA>y{_|Mqv}N=Ew5tkxuEoS
z?0rGlIq6^KXCLPzwzCMg6TSq^_kOA^Xf@(N?|ZZQmpTW6Y0zNMxKL2kdA>qTgIMzW
z_^VO&15R&+E6qfqqhJc_lAAVa=u~UHTA9}CIzSuih?NXeFz}%locm;`3%V4XZi|Z<
zyfKPk-L==PXZE*_s)!N;yya@14ysCq0{b0vQ5ckb++iM#*-9<pS9A{EI$eOH{U8&2
zmAw=9Qf)CQ&}a?06Egytwxfl;6FM=A79@X?wFOqvFDO!(TBM`SyLsTL8u{xv4%Z%Z
z^;1cu>Y1QzH`==1Q^mo<1`+A>l)O2V8xT7W)rXJ<YF;)h%pj{+?JJ`x@!yBicPO_g
zRmIX4;}mtdCoi@&=kfEg&ewqwZZv{MnYV3P24PkCAPSYzE8np1mog|A1V`DUidgo4
z=AZGidVmcILn1LjVF_IkSBR-O*2Py^jE+J8Dru59groxO0ro@sWPv86YfNF6s0H~8
z%!Ly5*DHIvKDo)rmeQ(HQAJizD8_Zw;bK-<x2&v<jF6nR%;6cK#DOS#kbmFil6uM|
zAEDQ}uHQ5TS?^v|bUm_1dau<2`L5LN)x4j>rRfeXaPQHrMbov?i9>><%jc`j;14-p
z7Wz_lUH|S2Rn>~kv>AwGq4FpWm%?~1-N{Xim>8!f<F#(#&7u64t&J1Pl)#m7KTp*O
z?nG~M!X6z^B_60f9SKE7q%>AY&R+i-5{Ta;+(Ng@dv71RRj(SF#U$ul(L!zf3cnco
zOjjSF$ML+}R8U^2T7}M0rVicblDM$t)QbujwGiN>at*fzo8CK89SzQt26Qb)+E`=-
zJ04rLKx38_oc0FZOC8bIi=Ix23;V`@FlQN$na%MvDt={;^Ohv^RJM0ek&L0bN9bpz
z^z(TT-|e9k&GTxeFjEP$z<aZn;Eea#*RGT5P0F2dSDRUdRx&bAmMxxpLl58Gm@aq_
z(!i8<Y;SBcUi)~L82#pJdB?q~Gs9bgo9&&o7jU-g+A0jO9}^$SB?&;UimmBY5IFfL
zm`!YxDzCr%{3h`;BpEx{@h&+l&?z?JiTm^koD3%XO?IG;x079>U@?I@hJ@(-q>y^x
z8I~QJ?(}7y=9{W2;v>LI0bYg@md_y{r<;<@Y8`Q!ss{lJyxX;mXX}Vkk58Ll_!-FU
z5nnGWzye93<ShEhy?~|LY;V@r;1<4BW7bd2>AA=L8uj(i4kPhW%FJ~5^Zd3oGm+;t
zgB$mq;o_jenCQh3KfAix&-4)lELl%)=HzRW@WPGe;mby|dN4`Wae2-yJEvzWr+bT)
zlv;+eXKfSV?}kHNzz~s=K}ldQl6vOZNfu>OT@jtdN|X!&Y-_WVt((PZbUHi{>hhb6
z9N^NWdb~%^YQFXK+_jUyvZkW{4L`kOdOVF7jiKMSS)m?o7G8GJr9RpbJ@MlrsO4qc
z*t)*nx7UOm{Jba!No(iDB&wRIL}MY5ncvJs5xbByn}wH3D&pci0{ObU2tiV?MU41=
zt-B0UYUXo9q3%E<zK5BLkO1192%v{4*>^42bH6I6m;_~>wc96}EG3W~5+f${|1tZI
fgbx&x!Ck4RFve&6M)^C@f+mJ_baALg`KJB@ni6NI

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_activatexxxhdpi.png b/app/src/main/res/drawable/icon_local_activate.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_local_activatexxxhdpi.png
rename to app/src/main/res/drawable/icon_local_activate.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_resetxxhdpi.png b/app/src/main/res/drawable/icon_local_reset.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_local_resetxxhdpi.png
rename to app/src/main/res/drawable/icon_local_reset.png
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d11a14eefd..7ca80a7af9 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -81,17 +81,6 @@
         <item>@string/key_resistantadult</item>
     </string-array>
 
-    <string-array name="danaSpeedArray">
-        <item>12 s/U</item>
-        <item>30 s/U</item>
-        <item>60 s/U</item>
-    </string-array>
-    <string-array name="danaSpeedValues">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <string-array name="quickWizardYesNo">
         <item>@string/yes</item>
         <item>@string/no</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63a2c9a8e5..4a4595fab4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,8 +34,6 @@
     <string name="nav_resetdb">Reset Databases</string>
     <string name="reset_db_confirm">Do you really want to reset the databases?</string>
     <string name="nav_exit">Exit</string>
-    <string name="danar_useextended_title">Use extended boluses for >200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth device</string>
     <string name="ns_sync_use_absolute_title">Always use basal absolute values</string>
     <string name="alert_dialog_storage_permission_text">Please reboot your phone or restart AndroidAPS from the System Settings \notherwise Android APS will not have logging (important to track and verify that the algorithms are working correctly)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">This device does not appear to support battery optimization whitelisting - you may experience performance issues.</string>
@@ -91,11 +89,6 @@
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Run now</string>
     <string name="vitualpump_label">VIRTUAL PUMP</string>
-    <string name="pump_basebasalrate_label">Base basal rate</string>
-    <string name="pump_tempbasal_label">Temp basal</string>
-    <string name="virtualpump_extendedbolus_label">Extended bolus</string>
-    <string name="pump_battery_label">Battery</string>
-    <string name="pump_reservoir_label">Reservoir</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Last run</string>
     <string name="openapsma_inputparameters_label">Input parameters</string>
@@ -178,7 +171,6 @@
     <string name="bolusconstraintapplied">Bolus constraint applied</string>
     <string name="carbsconstraintapplied">Carbs constraint applied</string>
 
-    <string name="careportal_newnstreatment_eventtype">Event type</string>
     <string name="careportal_newnstreatment_other">Other</string>
     <string name="careportal_newnstreatment_meter">Meter</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -267,16 +259,11 @@
     <string name="exported_less_than_hour_ago">exported less than hour ago</string>
     <string name="in_directory" comment="placeholder is for exported file path">in directory: %1$s</string>
 
-    <string name="danar_pump_settings">Dana pump settings</string>
     <string name="end_user_license_agreement">End User License Agreement</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string>
     <string name="save">Save</string>
-    <string name="danar_iob_label">Pump IOB</string>
-    <string name="danar_dailyunits">Daily units</string>
-    <string name="pump_lastbolus_label">Last bolus</string>
     <string name="reloadprofile">Reload profile</string>
-    <string name="danar_viewprofile">View profile</string>
     <string name="smscommunicator">SMS Communicator</string>
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
@@ -304,19 +291,6 @@
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
     <string name="uploading">Uploading</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">error</string>
-    <string name="danar_refill">refill</string>
-    <string name="danar_basalhour">basal hour</string>
-    <string name="danar_glucose">glucose</string>
-    <string name="danar_carbohydrate">carbohydrate</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Total %1$d records uploaded</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danars_password_title">Pump password (v1 only)</string>
-    <string name="danar_password_title">Pump password</string>
     <string name="bolusstopped">Bolus stopped</string>
     <string name="bolusstopping">Stopping bolus</string>
     <string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
@@ -371,8 +345,6 @@
     <string name="button3">Button 3</string>
     <string name="units_colon">Units:</string>
     <string name="units">Units</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">Target range:</string>
     <string name="prefs_range_title">Range for Visualization</string>
@@ -405,7 +377,6 @@
     <string name="hypo">Hypo</string>
     <string name="activity">Activity</string>
     <string name="removerecord">Remove record</string>
-    <string name="initializing">Initializing ...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
@@ -422,7 +393,6 @@
     <string name="short_tabtitles">Shorten tab titles</string>
     <string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
-    <string name="advancedsettings_title">Advanced Settings</string>
     <string name="key_advancedsettings" translatable="false">key_advancedsettings</string>
     <string name="profile">Profile</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Default value: 3 This is a key OpenAPS safety cap. What this does is limit your basals to be 3x (in this people) your biggest basal rate. You likely will not need to change this, but you should be aware that’s what is discussed about “3x max daily; 4x current” for safety caps.</string>
@@ -559,9 +529,6 @@
     <string name="statuslights_bat_critical">Threshold critical battery level [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Last connection</string>
-    <string name="danar_bluetooth_status">Bluetooth status</string>
     <string name="nav_about">About</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="smscommunicator_missingphonestatepermission">Missing phone state permission</string>
@@ -574,8 +541,6 @@
     <string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string>
     <string name="key_ns_upload_only" translatable="false">ns_upload_only</string>
     <string name="key_ns_noupload" translatable="false">ns_noupload</string>
-    <string name="basal_step">Basal Step</string>
-    <string name="bolus_step">Bolus Step</string>
     <string name="overview_extendedbolus_cancel_button">Cancel Extended Bolus</string>
     <string name="careportal_sensorage_label">Sensor age</string>
     <string name="careportal_canulaage_label">Canula age</string>
@@ -617,7 +582,6 @@
     <string name="absorption_maxtime_title">Meal max absorption time [h]</string>
     <string name="absorption_maxtime_summary">Time in hours where is expected all carbs from meal will be absorbed</string>
     <string name="key_rangetodisplay" translatable="false">rangetodisplay</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualize extended bolus as %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -659,10 +623,6 @@
     <string name="dia_too_short">DIA of %1$f too short - using %2$f instead!</string>
     <string name="activate_profile">Activate profile</string>
     <string name="invalid">INVALID</string>
-    <string name="pairing">Pairing</string>
-    <string name="selectedpump">Selected pump</string>
-    <string name="bolusspeed">Bolus speed</string>
-    <string name="serialnumber">Serial number</string>
     <string name="key_wizard_include_cob" translatable="false">wizard_include_cob</string>
     <string name="key_wizard_include_trend_bg" translatable="false">wizard_include_trend_bg</string>
     <string name="careportal_newnstreatment_percentage_label">Percentage</string>
@@ -700,11 +660,6 @@
     <string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
     <string name="urgent_alarm">Urgent Alarm</string>
     <string name="info">INFO</string>
-    <string name="key_btwatchdog" translatable="false">bt_watchdog</string>
-    <string name="key_btwatchdog_lastbark" translatable="false">bt_watchdog_last</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes.</string>
     <string name="eversense">Eversense App (patched)</string>
     <string name="dexcomg5_nsupload_title">Upload BG data to NS</string>
     <string name="key_dexcomg5_nsupload" translatable="false">dexcomg5_nsupload</string>
@@ -762,7 +717,6 @@
     <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed.</string>
     <string name="combo_pump_connected_now">Now</string>
     <string name="combo_activity_reading_pump_history">Reading pump history</string>
-    <string name="danar_history">Pump history</string>
     <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
     <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
     <string name="combo_pump_battery_low_warrning">Pump battery is low</string>
@@ -983,8 +937,6 @@
     <string name="request">Request</string>
     <string name="insulinsourcesetup">Configure Insulin plugin</string>
     <string name="exit">Exit</string>
-    <string name="option_on">On</string>
-    <string name="option_off">Off</string>
     <string name="open_navigation">Open navigation</string>
     <string name="close_navigation">Close navigation</string>
     <string name="nav_plugin_preferences">Plugin preferences</string>
@@ -1518,8 +1470,6 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Tools</string>
     <string name="show_calculation">Show calcuation</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Automation event</string>
     <string name="alreadyset">Already set</string>
     <string name="clearqueueconfirm">Clear queue? All data in queue will be lost!</string>
@@ -1572,20 +1522,11 @@
     <string name="smscommunicator_otp_install_info">On each follower phone install Authenticator app that support RFC 6238 TOTP tokens. Popular free apps are:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
     <string name="smscommunicator_otp_provisioning_warning">DO NOT SHARE this code online!\nUse it only to setup Authenticator App on follower phones.</string>
     <string name="smscommunicator_otp_reset_warning">By reseting authenticator you make all already provisioned authenticators invalid. You will need to set up them again!</string>
-    <string name="pin1">PIN1</string>
-    <string name="pin2">PIN2</string>
-    <string name="press_ok_on_the_pump">Press OK on the pump\nand enter 2 displayed numbers\nKeep display on pump ON by pressing minus button until you finish entering code.</string>
-    <string name="num1pin">1: (12 digits)</string>
-    <string name="num2pin">2: (8 digits)</string>
     <string name="onconnect">On connect</string>
     <string name="ondisconnect">On disconnect</string>
     <string name="overview_show_predictions">Predictions</string>
     <string name="overview_show_deviationslope">Deviation slope</string>
     <string name="key_graphconfig" translatable="false">graphconfig</string>
-    <string name="rs_loginsulinchange_title">Log reservoir change</string>
-    <string name="rs_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
-    <string name="rs_logcanulachange_title">Log canula change</string>
-    <string name="rs_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
     <string name="authorizationfailed">Authorization failed</string>
     <string name="overview_show_absinsulin">Absolute insulin</string>
     <string name="master_password_summary">Master password is used for backup encryption and to override security in application. Remember it or store on a safe place.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 747db85115..3a8d62955b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -38,10 +38,6 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
-    <style name="ButtonSmallFontStyle">
-        <item name="android:textSize">10sp</item>
-    </style>
-
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="section_header_label">
diff --git a/app/src/main/res/drawable-hdpi/icon_actions_refill.png b/core/src/main/res/drawable-hdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_actions_refill.png
rename to core/src/main/res/drawable-hdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-hdpi/icon_danar_useropthdpi.png b/core/src/main/res/drawable-hdpi/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_danar_useropthdpi.png
rename to core/src/main/res/drawable-hdpi/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-hdpi/icon_danarhistory.png b/core/src/main/res/drawable-hdpi/icon_danarhistory.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_danarhistory.png
rename to core/src/main/res/drawable-hdpi/icon_danarhistory.png
diff --git a/app/src/main/res/drawable-hdpi/icon_danarprofile.png b/core/src/main/res/drawable-hdpi/icon_danarprofile.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_danarprofile.png
rename to core/src/main/res/drawable-hdpi/icon_danarprofile.png
diff --git a/app/src/main/res/drawable-hdpi/icon_danarstats.png b/core/src/main/res/drawable-hdpi/icon_danarstats.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_danarstats.png
rename to core/src/main/res/drawable-hdpi/icon_danarstats.png
diff --git a/app/src/main/res/drawable-hdpi/icon_local_save.png b/core/src/main/res/drawable-hdpi/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/icon_local_save.png
rename to core/src/main/res/drawable-hdpi/icon_local_save.png
diff --git a/app/src/main/res/drawable-mdpi/icon_actions_refill.png b/core/src/main/res/drawable-mdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_actions_refill.png
rename to core/src/main/res/drawable-mdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable/icon_danar_useropt.png b/core/src/main/res/drawable-mdpi/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable/icon_danar_useropt.png
rename to core/src/main/res/drawable-mdpi/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-mdpi/icon_danarhistory.png b/core/src/main/res/drawable-mdpi/icon_danarhistory.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_danarhistory.png
rename to core/src/main/res/drawable-mdpi/icon_danarhistory.png
diff --git a/app/src/main/res/drawable-mdpi/icon_danarprofile.png b/core/src/main/res/drawable-mdpi/icon_danarprofile.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_danarprofile.png
rename to core/src/main/res/drawable-mdpi/icon_danarprofile.png
diff --git a/app/src/main/res/drawable-mdpi/icon_danarstats.png b/core/src/main/res/drawable-mdpi/icon_danarstats.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_danarstats.png
rename to core/src/main/res/drawable-mdpi/icon_danarstats.png
diff --git a/app/src/main/res/drawable-mdpi/icon_local_save.png b/core/src/main/res/drawable-mdpi/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_local_save.png
rename to core/src/main/res/drawable-mdpi/icon_local_save.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_actions_refill.png
rename to core/src/main/res/drawable-xhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_danar_useroptxhdpi.png b/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_danar_useroptxhdpi.png
rename to core/src/main/res/drawable-xhdpi/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xhdpi/icon_danarhistory.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_danarhistory.png
rename to core/src/main/res/drawable-xhdpi/icon_danarhistory.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xhdpi/icon_danarprofile.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_danarprofile.png
rename to core/src/main/res/drawable-xhdpi/icon_danarprofile.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_danarstats.png b/core/src/main/res/drawable-xhdpi/icon_danarstats.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_danarstats.png
rename to core/src/main/res/drawable-xhdpi/icon_danarstats.png
diff --git a/app/src/main/res/drawable-xhdpi/icon_local_save.png b/core/src/main/res/drawable-xhdpi/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/icon_local_save.png
rename to core/src/main/res/drawable-xhdpi/icon_local_save.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_actions_refill.png
rename to core/src/main/res/drawable-xxhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_danar_useroptxxhdpi.png b/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_danar_useroptxxhdpi.png
rename to core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_danarhistory.png
rename to core/src/main/res/drawable-xxhdpi/icon_danarhistory.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_danarprofile.png
rename to core/src/main/res/drawable-xxhdpi/icon_danarprofile.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxhdpi/icon_danarstats.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_danarstats.png
rename to core/src/main/res/drawable-xxhdpi/icon_danarstats.png
diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_save.png b/core/src/main/res/drawable-xxhdpi/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/icon_local_save.png
rename to core/src/main/res/drawable-xxhdpi/icon_local_save.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
rename to core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_danar_useroptxxxhdpi.png b/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_danar_useroptxxxhdpi.png
rename to core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
rename to core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
rename to core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_danarstats.png
rename to core/src/main/res/drawable-xxxhdpi/icon_danarstats.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_save.png b/core/src/main/res/drawable-xxxhdpi/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_local_save.png
rename to core/src/main/res/drawable-xxxhdpi/icon_local_save.png
diff --git a/app/src/main/res/drawable/icon_actions_refill.png b/core/src/main/res/drawable/icon_actions_refill.png
similarity index 100%
rename from app/src/main/res/drawable/icon_actions_refill.png
rename to core/src/main/res/drawable/icon_actions_refill.png
diff --git a/app/src/main/res/drawable-mdpi/icon_danar_useroptmdpi.png b/core/src/main/res/drawable/icon_danar_useropt.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/icon_danar_useroptmdpi.png
rename to core/src/main/res/drawable/icon_danar_useropt.png
diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_savexxxhdpi.png b/core/src/main/res/drawable/icon_local_save.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/icon_local_savexxxhdpi.png
rename to core/src/main/res/drawable/icon_local_save.png
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index cbddf818a8..df08a3f162 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -20,6 +20,9 @@
     <string name="key_ns_create_announcements_from_errors" translatable="false">ns_create_announcements_from_errors</string>
     <string name="key_ns_logappstartedevent" translatable="false">ns_logappstartedevent</string>
     <string name="key_ns_uploadlocalprofile" translatable="false">ns_uploadlocalprofile</string>
+    <string name="key_btwatchdog" translatable="false">bt_watchdog</string>
+    <string name="key_btwatchdog_lastbark" translatable="false">bt_watchdog_last</string>
+    <string name="pairing">Pairing</string>
 
     <!--    General-->
     <string name="error">Error</string>
@@ -64,6 +67,25 @@
     <string name="nsprofileview_isf_label">ISF</string>
     <string name="nsprofileview_basal_label">Basal</string>
     <string name="nsprofileview_target_label">Target</string>
+    <string name="initializing">Initializing ...</string>
+    <string name="serialnumber">Serial number</string>
+    <string name="pump_battery_label">Battery</string>
+    <string name="pump_lastconnection_label">Last connection</string>
+    <string name="pump_lastbolus_label">Last bolus</string>
+    <string name="danar_dailyunits">Daily units</string>
+    <string name="pump_basebasalrate_label">Base basal rate</string>
+    <string name="pump_tempbasal_label">Temp basal</string>
+    <string name="virtualpump_extendedbolus_label">Extended bolus</string>
+    <string name="pump_reservoir_label">Reservoir</string>
+    <string name="danar_history">Pump history</string>
+    <string name="danar_viewprofile">View profile</string>
+    <string name="careportal_newnstreatment_eventtype">Event type</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Advanced Settings</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes.</string>
 
     <!--    Constraints-->
     <string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 70c49c926e..8c6ea8c019 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -34,6 +34,10 @@
         <item name="colorAccent">@color/errorAlertBackground</item>
     </style>
 
+    <style name="ButtonSmallFontStyle">
+        <item name="android:textSize">10sp</item>
+    </style>
+
     <!--    Buttons from MaterialDateTimePicker    -->
     <dimen name="mdtp_material_button_height">48dp</dimen>
     <dimen name="mdtp_material_button_textsize">14sp</dimen>
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index 0636472821..aa18472171 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="5dp"
-    tools:context=".plugins.pump.danaR.DanaRFragment">
+    tools:context="info.nightscout.androidaps.dana.DanaRFragment">
 
 
     <RelativeLayout
diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
index 5bf96bb3f0..8a54a3db38 100644
--- a/dana/src/main/res/layout/danar_historyactivity.xml
+++ b/dana/src/main/res/layout/danar_historyactivity.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
+    tools:context="info.nightscout.androidaps.dana.activities.DanaRHistoryActivity">
 
 
     <RelativeLayout
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 489e174fe6..ff1d1deb90 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -5,7 +5,7 @@
     android:fillViewport="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context=".plugins.pump.danaR.activities.DanaRUserOptionsActivity">
+    tools:context="info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity">
 
 
     <LinearLayout
diff --git a/dana/src/main/res/values/arrays.xml b/dana/src/main/res/values/arrays.xml
new file mode 100644
index 0000000000..dcff4dd285
--- /dev/null
+++ b/dana/src/main/res/values/arrays.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="danaSpeedArray">
+        <item>12 s/U</item>
+        <item>30 s/U</item>
+        <item>60 s/U</item>
+    </string-array>
+    <string-array name="danaSpeedValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index ada62ece9c..4d1c72d062 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -103,5 +103,31 @@
     <string name="danarv2pump">DanaRv2</string>
     <string name="danar_disableeasymode">Disable EasyUI mode in pump</string>
     <string name="profile_set_failed">Setting of basal profile failed</string>
+    <string name="danar_bluetooth_status">Bluetooth status</string>
+    <string name="danar_iob_label">Pump IOB</string>
+    <string name="basal_step">Basal Step</string>
+    <string name="bolus_step">Bolus Step</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Dana pump settings</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">On</string>
+    <string name="option_off">Off</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth device</string>
+    <string name="danars_password_title">Pump password (v1 only)</string>
+    <string name="danar_password_title">Pump password</string>
+    <string name="danar_useextended_title">Use extended boluses for >200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualize extended bolus as %%</string>
+    <string name="bolusspeed">Bolus speed</string>
+    <string name="selectedpump">Selected pump</string>
+    <string name="rs_loginsulinchange_title">Log reservoir change</string>
+    <string name="rs_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
+    <string name="rs_logcanulachange_title">Log canula change</string>
+    <string name="rs_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Press OK on the pump\nand enter 2 displayed numbers\nKeep display on pump ON by pressing minus button until you finish entering code.</string>
+    <string name="num1pin">1: (12 digits)</string>
+    <string name="num2pin">2: (8 digits)</string>
 
 </resources>
diff --git a/danars/src/main/res/layout/danars_enter_pin_activity.xml b/danars/src/main/res/layout/danars_enter_pin_activity.xml
index 0a232b6cc1..b56b13ae2e 100644
--- a/danars/src/main/res/layout/danars_enter_pin_activity.xml
+++ b/danars/src/main/res/layout/danars_enter_pin_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.pump.danaRS.activities.EnterPinActivity">
+    tools:context="info.nightscout.androidaps.danars.activities.EnterPinActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/danars/src/main/res/layout/danars_pairingprogressdialog.xml b/danars/src/main/res/layout/danars_pairingprogressdialog.xml
index 496c4a90f6..c95374f3cb 100644
--- a/danars/src/main/res/layout/danars_pairingprogressdialog.xml
+++ b/danars/src/main/res/layout/danars_pairingprogressdialog.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".plugins.pump.danaRS.dialogs.PairingProgressDialog" >
+    tools:context="info.nightscout.androidaps.danars.dialogs.PairingProgressDialog" >
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/danars/src/main/res/layout/okcancel.xml b/danars/src/main/res/layout/okcancel.xml
index f1322fd566..76fbf7c5f6 100644
--- a/danars/src/main/res/layout/okcancel.xml
+++ b/danars/src/main/res/layout/okcancel.xml
@@ -30,7 +30,7 @@
         android:layout_marginRight="8dp"
         android:layout_marginEnd="8dp"
         style="@style/mdtp_ActionButton.Text"
-        android:text="@string/mdtp_cancel" />
+        android:text="@string/cancel" />
 
     <Button
         android:id="@+id/ok"
@@ -39,6 +39,6 @@
         android:layout_marginRight="16dp"
         android:layout_marginEnd="16dp"
         style="@style/mdtp_ActionButton.Text"
-        android:text="@string/mdtp_ok" />
+        android:text="@string/ok" />
 </LinearLayout>
     <!-- From: file:/Users/wdullaer/Documents/Programming%20Projects/MaterialDateTimePicker/library/src/main/res/layout/mdtp_done_button.xml -->
\ No newline at end of file

From b24690c2fa3dacdf4358ee56988619300c287bc2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 10 May 2020 23:45:49 +0200
Subject: [PATCH 064/400] move RSCommModule

---
 .../dependencyInjection/ActivitiesModule.kt    |  5 ++---
 .../dependencyInjection/AppComponent.kt        |  5 ++++-
 .../dependencyInjection/AppModule.kt           | 18 ++++++++----------
 .../dependencyInjection/DanaRSCommModule.kt    |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename {app/src/main/java/info/nightscout/androidaps => danars/src/main/java/info/nightscout/androidaps/danars}/dependencyInjection/DanaRSCommModule.kt (99%)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 3979531280..a1c5f342d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -25,9 +25,8 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 @Suppress("unused")
 abstract class ActivitiesModule {
 
-    @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): info.nightscout.androidaps.dana.activities.DanaRHistoryActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
     @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index cb5e4bd8e7..ad1c3e435b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -7,13 +7,15 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.dependencyInjection.CoreModule
 import info.nightscout.androidaps.danars.dependencyInjection.DanaRSActivitiesModule
+import info.nightscout.androidaps.danars.dependencyInjection.DanaRSCommModule
 import javax.inject.Singleton
 
 @Singleton
 @Component(
     modules = [
         AndroidInjectionModule::class,
-        CoreModule::class,
+        PluginsModule::class,
+        SkinsModule::class,
         ActivitiesModule::class,
         FragmentsModule::class,
         AppModule::class,
@@ -30,6 +32,7 @@ import javax.inject.Singleton
         DataClassesModule::class,
         SMSModule::class,
         UIModule::class,
+        CoreModule::class,
         DanaRSCommModule::class,
         DanaRSActivitiesModule::class
     ]
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index cbf5dbb806..c6f1303866 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -26,9 +26,7 @@ import info.nightscout.androidaps.utils.storage.Storage
 import javax.inject.Singleton
 
 @Module(includes = [
-    AppModule.AppBindings::class,
-    PluginsModule::class,
-    SkinsModule::class
+    AppModule.AppBindings::class
 ])
 open class AppModule {
 
@@ -64,12 +62,12 @@ open class AppModule {
         @Binds fun bindContext(mainApp: MainApp): Context
         @Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
         @Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
-        @Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
-        @Binds fun configInterfaceProvider(config: Config): ConfigInterface
-        @Binds fun configBuilderInterfaceProvider(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
-        @Binds fun treatmentInterfaceProvider(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
-        @Binds fun provideDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
-        @Binds fun provideUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
-        @Binds fun provideNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
+        @Binds fun bindCommandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
+        @Binds fun bindConfigInterface(config: Config): ConfigInterface
+        @Binds fun bindConfigBuilderInterface(configBuilderPlugin: ConfigBuilderPlugin): ConfigBuilderInterface
+        @Binds fun bindTreatmentInterface(treatmentsPlugin: TreatmentsPlugin): TreatmentsInterface
+        @Binds fun bindDatabaseHelperInterface(databaseHelperProvider: DatabaseHelperProvider): DatabaseHelperInterface
+        @Binds fun bindUploadQueueInterface(uploadQueue: UploadQueue): UploadQueueInterface
+        @Binds fun bindNotificationHolderInterface(notificationHolder: NotificationHolder): NotificationHolderInterface
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
index 9c6f172262..b4bf2b4b43 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DanaRSCommModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.dependencyInjection
+package info.nightscout.androidaps.danars.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector

From 5b269f6156bd0df68806d3dca9576710a96e9165 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 01:41:58 +0200
Subject: [PATCH 065/400] cleanup resources

---
 app/src/main/res/values/colors.xml  | 2 --
 core/src/main/res/values/colors.xml | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a2b72f3f49..45a362c5de 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,7 +15,6 @@
     <color name="inrangebackground">#2800FF00</color>
     <color name="basebasal">#C83F51B5</color>
     <color name="graphgrid">#757575</color>
-    <color name="colorLightGray">#d8d8d8</color>
     <color name="warning">#ff1a1a</color>
     <color name="error_background">#66FC0000</color>
     <color name="ok_background">#323232</color>
@@ -30,7 +29,6 @@
 
     <color name="mdtp_accent_color">#40bbaa</color>
 
-    <color name="cardColorBackground">#121212</color>
     <color name="cardObjectiveText">#779ECB</color>
 
     <color name="linearBlockBackground">#3e3d3d</color>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index e2f1c4af3e..27e0e33010 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -8,6 +8,8 @@
     <color name="mdtp_button_color">@color/mdtp_accent_color</color>
     <color name="mdtp_white">#ffffff</color>
     <color name="mdtp_line_dark">#808080</color>
+    <color name="colorLightGray">#d8d8d8</color>
+    <color name="cardColorBackground">#121212</color>
 
     <!--    Fragments-->
     <color name="colorInitializingBorder">#00695c</color>

From add8b71ea3ba1883f068020069689fe58cb29d30 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 11 May 2020 21:51:32 +1200
Subject: [PATCH 066/400] Internationalisation

---
 .../nightscout/androidaps/plugins/aps/loop/LoopPlugin.java  | 6 +++---
 app/src/main/res/values/strings.xml                         | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index ea291ca6a5..4b70bb5ff9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -454,19 +454,19 @@ public class LoopPlugin extends PluginBase {
                             intentAction5m.putExtra("ignoreDuration", 5);
                             PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore5m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 5m", pendingIntent5m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore5m,"Ignore 5m"), pendingIntent5m);
 
                             Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction15m.putExtra("ignoreDuration", 15);
                             PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore15m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 15m", pendingIntent15m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore15m,"Ignore 15m"), pendingIntent15m);
 
                             Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction30m.putExtra("ignoreDuration", 30);
                             PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore30m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 30m", pendingIntent30m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore30m,"Ignore 30m"), pendingIntent30m);
 
                             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
                             builder.setSmallIcon(R.drawable.notif_icon)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 400c1b185b..6082ba7c94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -944,6 +944,10 @@
     <string name="insulin_increment_button_message">Amount of insulin to add when button is pressed</string>
     <string name="error_starting_cgm">Could not launch CGM application.  Make sure it is installed.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignore 5m</string>
+    <string name="ignore15m">Ignore 15m</string>
+    <string name="ignore30m">Ignore 30m</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">History browser</string>
     <string name="wear_notifysmb_title">Notify on SMB</string>
     <string name="wear_notifysmb_summary">Show SMB on the watch like a standard bolus.</string>

From a4f48949856dbf7ae469caaebeb99123fdf0c765 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 11 May 2020 21:54:32 +1200
Subject: [PATCH 067/400] fixes

---
 .../general/overview/OverviewFragment.kt      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 13bd366638..663bc52c6b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -187,10 +187,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_bggraph?.gridLabelRenderer?.reloadStyles()
         overview_bggraph?.gridLabelRenderer?.labelVerticalWidth = axisWidth
 
-        val carbicon = overview_carbs_icon;
-        carbAnimation = carbicon.background as AnimationDrawable
-        carbAnimation.setEnterFadeDuration(1200);
-        carbAnimation.setExitFadeDuration(1200);
+        carbAnimation = overview_carbs_icon.background as AnimationDrawable
+        carbAnimation.setEnterFadeDuration(1200)
+        carbAnimation.setExitFadeDuration(1200)
 
         rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6)
 
@@ -683,7 +682,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (activeTemp != null)
             overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
         else
-            overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
+            overview_basebasal_icon.setImageResource(R.drawable.icon_cp_basal_no_tbr)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
@@ -748,14 +747,14 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         val lastRun = loopPlugin.lastRun
         if (config.APS && lastRun?.constraintsProcessed != null && lastRun?.constraintsProcessed.carbsReq > 0) {
-            overview_cob?.text = cobText + " ("+lastRun?.constraintsProcessed.carbsReq + " req)"
-            if(!carbAnimation.isRunning)
+            overview_cob?.text = cobText + " *" + lastRun?.constraintsProcessed.carbsReq + " "+R.string.required+"*"
+            if (!carbAnimation.isRunning)
                 carbAnimation.start()
-        }else{
+        } else {
             overview_cob?.text = cobText
-            if(carbAnimation.isRunning)
+            if (carbAnimation.isRunning)
                 carbAnimation.stop()
-                carbAnimation.selectDrawable(0);
+            carbAnimation.selectDrawable(0);
         }
 
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT

From 28dd3dedac4b7ade1f668b37a4cac5a2fd033431 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Mon, 11 May 2020 13:34:10 +0200
Subject: [PATCH 068/400] fix Java -> Kotlin nullability issue

---
 .../plugins/general/persistentNotification/DummyService.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
index 8d4c605057..8a4524d9e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -50,9 +50,9 @@ class DummyService : DaggerService() {
         stopForeground(true)
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         startForeground(notificationHolder.notificationID, notificationHolder.notification)
         return Service.START_STICKY
     }
-}
\ No newline at end of file
+}

From 441e5fdf3e40bbe8c36c69dfbed262693206cf6b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 14:50:35 +0200
Subject: [PATCH 069/400] extend pump interface for neutral temps

---
 .../androidaps/interfaces/PumpInterface.java        |  4 ++++
 .../aps/openAPSSMB/DetermineBasalAdapterSMBJS.java  | 13 +++----------
 .../plugins/aps/openAPSSMB/SMBDefaults.java         |  3 +--
 .../plugins/pump/medtronic/MedtronicPumpPlugin.java |  4 ++++
 app/src/main/res/values/strings.xml                 |  6 +++---
 app/src/main/res/xml/pref_medtronic.xml             |  8 ++++----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
index d85a383752..3ad7ed6ab8 100644
--- a/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/interfaces/PumpInterface.java
@@ -122,4 +122,8 @@ public interface PumpInterface {
     default boolean isUnreachableAlertTimeoutExceeded(long alertTimeoutMilliseconds) {
         return false;
     }
+
+    default boolean setNeutralTempAtFullHour() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 16949fcb4c..f37f85d26b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -26,18 +26,16 @@ import info.nightscout.androidaps.data.IobTotal;
 import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.db.TemporaryBasal;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
+import info.nightscout.androidaps.plugins.aps.loop.ScriptReader;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin;
-import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.SafeParse;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -240,7 +238,6 @@ public class DetermineBasalAdapterSMBJS {
 
         String units = profile.getUnits();
         PumpInterface pump = activePluginProvider.getActivePump();
-        ManufacturerType manufacturer = pump.manufacturer();
         Double pumpbolusstep = pump.getPumpDescription().bolusStep;
         mProfile = new JSONObject();
 
@@ -269,11 +266,7 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
         mProfile.put("maxCOB", SMBDefaults.maxCOB);
-        if (!manufacturer.name().equals("Medtronic")) {
-            mProfile.put("skip_neutral_temps",SMBDefaults.skip_neutral_temps);
-        } else {
-            mProfile.put("skip_neutral_temps", sp.getBoolean(R.string.key_skip_neutral_temps, SMBDefaults.skip_neutral_temps_medtronic));
-        }
+        mProfile.put("skip_neutral_temps", !pump.setNeutralTempAtFullHour());
         // min_5m_carbimpact is not used within SMB determinebasal
         //if (mealData.usedMinCarbsImpact > 0) {
         //    mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
index 42eacdbce6..83ef09f89a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/SMBDefaults.java
@@ -37,8 +37,7 @@ public class SMBDefaults {
     // (If someone enters more carbs or stacks more; OpenAPS will just truncate dosing based on 120.
     // Essentially, this just limits AMA/SMB as a safety cap against excessive COB entry)
     public final static int maxCOB = 120;
-    public final static boolean skip_neutral_temps = true; // ***** default false in oref1 ***** if true, don't set neutral temps
-    public final static boolean skip_neutral_temps_medtronic = false;//if using a medtronic pump default to false so the pump doesnt beep on the hour
+    //public final static boolean skip_neutral_temps = true; // ***** default false in oref1 ***** if true, don't set neutral temps
     // unsuspend_if_no_temp:false // if true, pump will un-suspend after a zero temp finishes
     // bolussnooze_dia_divisor:2 // bolus snooze decays after 1/2 of DIA
     public final static double min_5m_carbimpact = 8d; // mg/dL per 5m (8 mg/dL/5m corresponds to 24g/hr at a CSF of 4 mg/dL/g (x/5*60/4))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 4bb5609f33..8f997b9b58 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -1558,6 +1558,10 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         this.hasTimeDateOrTimeZoneChanged = true;
     }
 
+    @Override public boolean setNeutralTempAtFullHour() {
+        return sp.getBoolean(R.string.key_set_neutral_temps, true);
+    }
+
 
     private void setEnableCustomAction(MedtronicCustomActionType customAction, boolean isEnabled) {
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1561f13835..8f84bd2b87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -958,9 +958,9 @@
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
     <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
     <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
-    <string name="key_skip_neutral_temps" translatable="false">skip_neutral_temps</string>
-    <string name="skip_neutral_temps_title">Skip neutral temp basals</string>
-    <string name="skip_neutral_temps_summary">If enabled, it skips setting basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
+    <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
+    <string name="set_neutral_temps_title">Set neutral temp basals</string>
+    <string name="set_neutral_temps_summary">If enabled, it sets basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
     <string name="enablesmbalways">Enable SMB always</string>
     <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
     <string name="enablesmbaftercarbs">Enable SMB after carbs</string>
diff --git a/app/src/main/res/xml/pref_medtronic.xml b/app/src/main/res/xml/pref_medtronic.xml
index c5f4562e1d..342250d046 100644
--- a/app/src/main/res/xml/pref_medtronic.xml
+++ b/app/src/main/res/xml/pref_medtronic.xml
@@ -99,10 +99,10 @@
         </Preference>
 
         <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_skip_neutral_temps"
-            android:summary="@string/skip_neutral_temps_summary"
-            android:title="@string/skip_neutral_temps_title" />
+            android:defaultValue="true"
+            android:key="@string/key_set_neutral_temps"
+            android:summary="@string/set_neutral_temps_summary"
+            android:title="@string/set_neutral_temps_title" />
 
     </PreferenceCategory>
 

From 5dea964b8918f383e57b4de6eafd579301380176 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 16:58:59 +0200
Subject: [PATCH 070/400] final dana renaming

---
 app/src/main/AndroidManifest.xml              |   4 +-
 .../dependencyInjection/APSModule.kt          |   2 -
 .../dependencyInjection/ActivitiesModule.kt   |   8 --
 .../dependencyInjection/AppComponent.kt       |  12 +-
 .../dependencyInjection/AppModule.kt          |  11 --
 .../dependencyInjection/CommandQueueModule.kt |   3 -
 .../dependencyInjection/DataClassesModule.kt  |  10 --
 .../dependencyInjection/FragmentsModule.kt    |   5 -
 .../dependencyInjection/ReceiversModule.kt    |   1 -
 .../dependencyInjection/ServicesModule.kt     |  10 --
 .../dependency-injection-todo.txt             |  16 ---
 .../androidaps/dialogs/TempBasalDialog.kt     |   6 +-
 .../androidaps/dialogs/TempTargetDialog.kt    |   3 +-
 .../general/overview/OverviewFragment.kt      |   6 +-
 .../plugins/general/overview/OverviewMenus.kt |  10 +-
 .../general/wear/ActionStringHandler.kt       |   6 +-
 .../profile/local/LocalProfileFragment.kt     |  22 ++--
 .../pump/insight/LocalInsightFragment.java    |   8 +-
 .../fragments/TreatmentsCareportalFragment.kt |   2 +-
 .../TreatmentsTemporaryBasalsFragment.kt      |   2 +-
 app/src/main/res/layout/actions_fragment.xml  |   2 +-
 .../careportal_newnstreatment_dialog.xml      |   2 +-
 .../main/res/layout/combopump_fragment.xml    |  12 +-
 app/src/main/res/layout/dialog_tempbasal.xml  |   4 +-
 app/src/main/res/layout/dialog_temptarget.xml |   2 +-
 .../main/res/layout/medtronic_fragment.xml    |  14 +-
 app/src/main/res/layout/omnipod_fragment.xml  |  10 +-
 .../res/layout/profileviewer_fragment.xml     |  12 +-
 .../main/res/layout/treatments_fragment.xml   |   2 +-
 .../main/res/layout/virtualpump_fragment.xml  |   8 +-
 .../danars/comm/DanaRSMessageHashTableTest.kt |   7 +-
 .../androidaps/danars/comm/DanaRSTestBase.kt  |   6 +-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |   2 +-
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |  11 +-
 .../DanaRS_Packet_Basal_Get_Basal_RateTest.kt |   6 +-
 ...Packet_Basal_Get_Profile_Basal_RateTest.kt |  12 +-
 ...aRS_Packet_Basal_Get_Profile_NumberTest.kt |   4 +-
 ...ket_Basal_Get_Temporary_Basal_StateTest.kt |   8 +-
 ...anaRS_Packet_Bolus_Get_Bolus_OptionTest.kt |  10 +-
 ...anaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt |   5 +-
 ...t_Bolus_Get_Calculation_InformationTest.kt |   2 +-
 ...arbohydrate_Calculation_InformationTest.kt |   2 +-
 .../DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt |   8 +-
 ...aRS_Packet_Bolus_Get_Extended_BolusTest.kt |   4 +-
 ...cket_Bolus_Get_Extended_Bolus_StateTest.kt |   4 +-
 ...olus_Get_Extended_Menu_Option_StateTest.kt |   6 +-
 ...et_Bolus_Get_Step_Bolus_InformationTest.kt |  12 +-
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |   4 +-
 ...RS_Packet_Bolus_Set_Step_Bolus_StopTest.kt |   4 +-
 ...Packet_General_Get_More_InformationTest.kt |  14 +-
 .../DanaRS_Packet_General_Get_PasswordTest.kt |   2 +-
 ...anaRS_Packet_General_Get_Pump_CheckTest.kt |   2 +-
 ...et_General_Get_Shipping_InformationTest.kt |   2 +-
 ...Packet_General_Get_Shipping_VerisonTest.kt |   4 +-
 ...et_General_Get_Today_Delivery_TotalTest.kt |   4 +-
 ..._General_Initial_Screen_InformationTest.kt |   4 +-
 ...aRS_Packet_Notify_Delivery_CompleteTest.kt |   6 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |   6 +-
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt |   4 +-
 ...anaRS_Packet_Option_Get_User_OptionTest.kt |   4 +-
 ...anaRS_Packet_Option_Set_User_OptionTest.kt |   4 +-
 ...RS_Packet_Review_Get_Pump_Dec_RatioTest.kt |   4 +-
 .../interfaces/ConstraintsCheckerTest.kt      |  16 +--
 .../plugins/pump/danaR/DanaRPluginTest.kt     |  12 +-
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  |   6 +-
 .../pump/danaR/comm/MessageHashTableRTest.kt  |   2 +-
 .../pump/danaR/comm/MsgBolusProgressTest.kt   |   8 +-
 .../pump/danaR/comm/MsgBolusStartTest.kt      |   2 +-
 .../danaR/comm/MsgBolusStartWithSpeedTest.kt  |   2 +-
 .../pump/danaR/comm/MsgBolusStopTest.kt       |   6 +-
 .../pump/danaR/comm/MsgCheckValueTest.kt      |   6 +-
 .../plugins/pump/danaR/comm/MsgErrorTest.kt   |   2 +-
 .../pump/danaR/comm/MsgHistoryAllDoneTest.kt  |   4 +-
 .../pump/danaR/comm/MsgHistoryDoneTest.kt     |   2 +-
 .../pump/danaR/comm/MsgHistoryNewDoneTest.kt  |   2 +-
 .../danaR/comm/MsgInitConnStatusBasicTest.kt  |   4 +-
 .../danaR/comm/MsgInitConnStatusBolusTest.kt  |   4 +-
 .../danaR/comm/MsgInitConnStatusOptionTest.kt |   4 +-
 .../danaR/comm/MsgInitConnStatusTimeTest.kt   |   2 +-
 .../pump/danaR/comm/MsgSetUserOptionsTest.kt  |   2 +-
 .../danaR/comm/MsgSettingActiveProfileTest.kt |   4 +-
 .../comm/MsgSettingBasalProfileAllTest.kt     |   2 +-
 .../pump/danaR/comm/MsgSettingBasalTest.kt    |   4 +-
 .../pump/danaR/comm/MsgSettingGlucoseTest.kt  |   4 +-
 .../danaR/comm/MsgSettingMaxValuesTest.kt     |   4 +-
 .../pump/danaR/comm/MsgSettingMealTest.kt     |   4 +-
 .../comm/MsgSettingProfileRatiosAllTest.kt    |   7 +-
 .../danaR/comm/MsgSettingProfileRatiosTest.kt |   7 +-
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |   7 +-
 .../danaR/comm/MsgSettingShippingInfoTest.kt  |   7 +-
 .../danaR/comm/MsgSettingUserOptionsTest.kt   |   8 +-
 .../pump/danaR/comm/MsgStatusBasicTest.kt     |   4 +-
 .../danaR/comm/MsgStatusBolusExtendedTest.kt  |   4 +-
 .../pump/danaR/comm/MsgStatusProfileTest.kt   |   7 +-
 .../pump/danaR/comm/MsgStatusTempBasalTest.kt |   6 +-
 .../plugins/pump/danaR/comm/MsgStatusTest.kt  |   4 +-
 .../pump/danaRKorean/DanaRKoreanPluginTest.kt |  12 +-
 .../comm/MessageHashTableRKoreanTest.kt       |   2 +-
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |   6 +-
 .../plugins/pump/danaRv2/DanaRv2PluginTest.kt |  12 +-
 .../danaRv2/comm/MessageHashTable_rv2Test.kt  |   4 +-
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt |   4 +-
 .../pump/danaRv2/comm/MsgStatusAPS_v2Test.kt  |   4 +-
 .../comm/MsgStatusBolusExtended_v2Test.kt     |   4 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2Test.kt |   6 +-
 .../activities/TDDStatsActivity.java          |  26 ++--
 .../core/di/CoreDataClassesModule.kt          |  28 ++++
 .../androidaps/core/di/CoreFragmentsModule.kt |  18 +++
 .../{dependencyInjection => di}/CoreModule.kt |  19 ++-
 .../androidaps/core/di/CoreReceiversModule.kt |  11 ++
 .../plugins/pump/common/ble/BlePreCheck.kt    |   4 +-
 .../plugins/pump/common/defs/PumpType.java    |   2 +-
 .../main/res/layout/danar_statsactivity.xml   |  12 +-
 .../main/res/layout/dialog_bolusprogress.xml  |   4 +-
 .../main/res/layout/dialog_profileviewer.xml  |  12 +-
 core/src/main/res/values/strings.xml          |  69 +++++-----
 .../{DanaRFragment.kt => DanaFragment.kt}     |  17 ++-
 .../dana/{DanaRPump.kt => DanaPump.kt}        |   2 +-
 ...toryActivity.kt => DanaHistoryActivity.kt} |   2 +-
 ...Activity.kt => DanaUserOptionsActivity.kt} |  70 +++++-----
 .../androidaps/dana/di/DanaModule.kt          |  17 +++
 dana/src/main/res/layout/danar_fragment.xml   |  22 ++--
 .../main/res/layout/danar_historyactivity.xml |   8 +-
 .../layout/danar_user_options_activity.xml    |   2 +-
 .../danaRKorean/DanaRKoreanPlugin.java        |  20 +--
 .../comm/MessageHashTableRKorean.kt           |  48 +++----
 .../danaRKorean/comm/MsgCheckValue_k.kt       |  20 +--
 .../comm/MsgInitConnStatusBasic_k.kt          |  20 +--
 .../comm/MsgInitConnStatusBolus_k.kt          |  18 +--
 .../comm/MsgInitConnStatusTime_k.kt           |   6 +-
 .../comm/MsgSettingBasalProfileAll_k.kt       |  18 +--
 .../danaRKorean/comm/MsgSettingBasal_k.kt     |  10 +-
 .../danaRKorean/comm/MsgStatusBasic_k.kt      |  14 +-
 .../danaRKorean/comm/MsgStatus_k.kt           |  24 ++--
 .../services/DanaRKoreanExecutionService.java |  90 ++++++-------
 .../androidaps/danaRv2/DanaRv2Plugin.java     |  16 +--
 .../danaRv2/comm/MessageHashTableRv2.kt       |  66 +++++-----
 .../danaRv2/comm/MsgCheckValue_v2.kt          |  28 ++--
 .../danaRv2/comm/MsgHistoryEvents_v2.kt       |  28 ++--
 .../danaRv2/comm/MsgStatusAPS_v2.kt           |   6 +-
 .../danaRv2/comm/MsgStatusBolusExtended_v2.kt |  18 +--
 .../danaRv2/comm/MsgStatusTempBasal_v2.kt     |  14 +-
 .../services/DanaRv2ExecutionService.java     | 122 +++++++++---------
 .../androidaps/danar/AbstractDanaRPlugin.java |  58 ++++-----
 .../androidaps/danar/DanaRPlugin.java         |  20 +--
 .../androidaps/danar/SerialIOThread.java      |  10 +-
 .../danar/comm/MessageHashTableR.kt           |  64 ++++-----
 .../androidaps/danar/comm/MsgBolusProgress.kt |  14 +-
 .../androidaps/danar/comm/MsgBolusStart.kt    |   6 +-
 .../danar/comm/MsgBolusStartWithSpeed.kt      |   6 +-
 .../androidaps/danar/comm/MsgBolusStop.kt     |  10 +-
 .../androidaps/danar/comm/MsgCheckValue.kt    |  20 +--
 .../androidaps/danar/comm/MsgError.kt         |   6 +-
 .../danar/comm/MsgHistoryAllDone.kt           |   8 +-
 .../androidaps/danar/comm/MsgHistoryDone.kt   |   8 +-
 .../danar/comm/MsgHistoryNewDone.kt           |   8 +-
 .../danar/comm/MsgInitConnStatusBasic.kt      |  58 ++++-----
 .../danar/comm/MsgInitConnStatusBolus.kt      |  18 +--
 .../danar/comm/MsgInitConnStatusOption.kt     |  10 +-
 .../danar/comm/MsgInitConnStatusTime.kt       |   6 +-
 .../danar/comm/MsgSetUserOptions.kt           |  26 ++--
 .../danar/comm/MsgSettingActiveProfile.kt     |   8 +-
 .../androidaps/danar/comm/MsgSettingBasal.kt  |  10 +-
 .../danar/comm/MsgSettingBasalProfileAll.kt   |  18 +--
 .../danar/comm/MsgSettingGlucose.kt           |  12 +-
 .../danar/comm/MsgSettingMaxValues.kt         |  16 +--
 .../androidaps/danar/comm/MsgSettingMeal.kt   |  22 ++--
 .../danar/comm/MsgSettingProfileRatios.kt     |  38 +++---
 .../danar/comm/MsgSettingProfileRatiosAll.kt  |  56 ++++----
 .../danar/comm/MsgSettingPumpTime.kt          |   8 +-
 .../danar/comm/MsgSettingShippingInfo.kt      |  16 +--
 .../danar/comm/MsgSettingUserOptions.kt       |  42 +++---
 .../androidaps/danar/comm/MsgStatus.kt        |  32 ++---
 .../androidaps/danar/comm/MsgStatusBasic.kt   |  34 ++---
 .../danar/comm/MsgStatusBolusExtended.kt      |  38 +++---
 .../androidaps/danar/comm/MsgStatusProfile.kt |  34 ++---
 .../danar/comm/MsgStatusTempBasal.kt          |  34 ++---
 .../danar/di/DanaRServicesModule.kt           |  18 +++
 .../AbstractDanaRExecutionService.java        |  16 +--
 .../danar/services/DanaRExecutionService.java | 112 ++++++++--------
 .../androidaps/danars/DanaRSPlugin.kt         | 110 ++++++++--------
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  42 +++---
 .../DanaRS_Packet_APS_Set_Event_History.kt    |   3 +-
 .../DanaRS_Packet_Basal_Get_Basal_Rate.kt     |  20 +--
 ...aRS_Packet_Basal_Get_Profile_Basal_Rate.kt |  10 +-
 .../DanaRS_Packet_Basal_Get_Profile_Number.kt |   8 +-
 ..._Packet_Basal_Get_Temporary_Basal_State.kt |  22 ++--
 .../DanaRS_Packet_Bolus_Get_Bolus_Option.kt   |  16 +--
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |  52 ++++----
 ...acket_Bolus_Get_Calculation_Information.kt |  30 ++---
 ...et_Carbohydrate_Calculation_Information.kt |   8 +-
 .../DanaRS_Packet_Bolus_Get_Dual_Bolus.kt     |  16 +--
 .../DanaRS_Packet_Bolus_Get_Extended_Bolus.kt |  16 +--
 ...S_Packet_Bolus_Get_Extended_Bolus_State.kt |  24 ++--
 ...et_Bolus_Get_Extended_Menu_Option_State.kt |   6 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |  24 ++--
 ...anaRS_Packet_Bolus_Set_Step_Bolus_Start.kt |  10 +-
 ...DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt |  10 +-
 ...aRS_Packet_General_Get_More_Information.kt |  28 ++--
 .../DanaRS_Packet_General_Get_Password.kt     |   8 +-
 .../DanaRS_Packet_General_Get_Pump_Check.kt   |  18 +--
 ...Packet_General_Get_Shipping_Information.kt |  16 +--
 ...aRS_Packet_General_Get_Shipping_Version.kt |   8 +-
 ...Packet_General_Get_Today_Delivery_Total.kt |  16 +--
 ...cket_General_Initial_Screen_Information.kt |  56 ++++----
 .../DanaRS_Packet_Notify_Delivery_Complete.kt |  12 +-
 ...aRS_Packet_Notify_Delivery_Rate_Display.kt |  12 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |   8 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |  48 +++----
 .../DanaRS_Packet_Option_Set_User_Option.kt   |  46 +++----
 ...DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt |   8 +-
 .../danars/di/DaanRSServicesModule.kt         |  11 ++
 .../DanaRSActivitiesModule.kt                 |   7 +-
 .../DanaRSCommModule.kt                       |   2 +-
 .../androidaps/danars/di/DanaRSModule.kt      |  10 ++
 .../androidaps/danars/services/BLEComm.kt     |  12 +-
 .../danars/services/DanaRSService.kt          |  76 ++++++-----
 217 files changed, 1675 insertions(+), 1620 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt
 create mode 100644 core/src/main/java/info/nightscout/androidaps/core/di/CoreDataClassesModule.kt
 create mode 100644 core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
 rename core/src/main/java/info/nightscout/androidaps/core/{dependencyInjection => di}/CoreModule.kt (55%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/core/di/CoreReceiversModule.kt
 rename dana/src/main/java/info/nightscout/androidaps/dana/{DanaRFragment.kt => DanaFragment.kt} (95%)
 rename dana/src/main/java/info/nightscout/androidaps/dana/{DanaRPump.kt => DanaPump.kt} (99%)
 rename dana/src/main/java/info/nightscout/androidaps/dana/activities/{DanaRHistoryActivity.kt => DanaHistoryActivity.kt} (99%)
 rename dana/src/main/java/info/nightscout/androidaps/dana/activities/{DanaRUserOptionsActivity.kt => DanaUserOptionsActivity.kt} (64%)
 create mode 100644 dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt
 create mode 100644 danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt
 rename danars/src/main/java/info/nightscout/androidaps/danars/{dependencyInjection => di}/DanaRSActivitiesModule.kt (55%)
 rename danars/src/main/java/info/nightscout/androidaps/danars/{dependencyInjection => di}/DanaRSCommModule.kt (99%)
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a3dd58566..98043e941c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,8 +64,8 @@
         <activity
             android:name=".activities.ErrorHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaRHistoryActivity" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaHistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity" />
         <activity android:name=".activities.TDDStatsActivity" />
         <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
             <intent-filter>
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
index 7315329ab2..0e55e30b85 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/APSModule.kt
@@ -17,12 +17,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
 abstract class APSModule {
 
     @ContributesAndroidInjector abstract fun loggerCallbackInjector(): LoggerCallback
-    @ContributesAndroidInjector abstract fun apsResultInjector(): APSResult
     @ContributesAndroidInjector abstract fun determineBasalResultSMBInjector(): DetermineBasalResultSMB
     @ContributesAndroidInjector abstract fun determineBasalResultAMAInjector(): DetermineBasalResultAMA
     @ContributesAndroidInjector abstract fun determineBasalAdapterAMAJSInjector(): DetermineBasalAdapterAMAJS
     @ContributesAndroidInjector abstract fun determineBasalAdapterSMBJSInjector(): DetermineBasalAdapterSMBJS
-    @ContributesAndroidInjector abstract fun autosensDataInjector(): AutosensData
     @ContributesAndroidInjector abstract fun iobCobThreadInjector(): IobCobThread
     @ContributesAndroidInjector abstract fun iobCobOref1ThreadInjector(): IobCobOref1Thread
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index a1c5f342d8..6174bcdf64 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -4,7 +4,6 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.MainActivity
 import info.nightscout.androidaps.activities.*
-import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImportListActivity
@@ -12,9 +11,6 @@ import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizar
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
-import info.nightscout.androidaps.dana.activities.DanaRHistoryActivity
-import info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity
-import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
@@ -25,10 +21,6 @@ import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 @Suppress("unused")
 abstract class ActivitiesModule {
 
-    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaRHistoryActivity
-    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaRUserOptionsActivity
-    @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
-    @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
     @ContributesAndroidInjector abstract fun contributesHistoryBrowseActivity(): HistoryBrowseActivity
     @ContributesAndroidInjector abstract fun contributesInsightAlertActivity(): InsightAlertActivity
     @ContributesAndroidInjector abstract fun contributesInsightPairingActivity(): InsightPairingActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index ad1c3e435b..24dadb14d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -5,9 +5,10 @@ import dagger.Component
 import dagger.android.AndroidInjectionModule
 import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.core.dependencyInjection.CoreModule
-import info.nightscout.androidaps.danars.dependencyInjection.DanaRSActivitiesModule
-import info.nightscout.androidaps.danars.dependencyInjection.DanaRSCommModule
+import info.nightscout.androidaps.core.di.CoreModule
+import info.nightscout.androidaps.dana.di.DanaModule
+import info.nightscout.androidaps.danar.di.DanaRServicesModule
+import info.nightscout.androidaps.danars.di.DanaRSModule
 import javax.inject.Singleton
 
 @Singleton
@@ -33,8 +34,9 @@ import javax.inject.Singleton
         SMSModule::class,
         UIModule::class,
         CoreModule::class,
-        DanaRSCommModule::class,
-        DanaRSActivitiesModule::class
+        DanaModule::class,
+        DanaRServicesModule::class,
+        DanaRSModule::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
index c6f1303866..4fb00e9bb5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt
@@ -10,17 +10,12 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.queue.CommandQueue
-import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.androidNotification.NotificationHolder
-import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.storage.FileStorage
 import info.nightscout.androidaps.utils.storage.Storage
 import javax.inject.Singleton
@@ -30,12 +25,6 @@ import javax.inject.Singleton
 ])
 open class AppModule {
 
-    @Provides
-    @Singleton
-    fun provideProfileFunction(injector: HasAndroidInjector, aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePluginProvider, fabricPrivacy: FabricPrivacy): ProfileFunction {
-        return ProfileFunctionImplementation(injector, aapsLogger, sp, resourceHelper, activePlugin, fabricPrivacy)
-    }
-
     @Provides
     fun providesPlugins(configInterface: ConfigInterface,
                         @PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
index b0850bacc2..e9339e187b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/CommandQueueModule.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.queue.CommandQueue
 import info.nightscout.androidaps.queue.commands.*
 
@@ -10,8 +9,6 @@ import info.nightscout.androidaps.queue.commands.*
 @Suppress("unused")
 abstract class CommandQueueModule {
 
-    @ContributesAndroidInjector abstract fun pumpEnactResultInjector(): PumpEnactResult
-
     @ContributesAndroidInjector abstract fun commandQueueInjector(): CommandQueue
     @ContributesAndroidInjector abstract fun commandBolusInjector(): CommandBolus
     @ContributesAndroidInjector abstract fun commandCancelExtendedBolusInjector(): CommandCancelExtendedBolus
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
index 536454413c..2441f34314 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
@@ -19,17 +19,7 @@ import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
 @Suppress("unused")
 abstract class DataClassesModule {
 
-    @ContributesAndroidInjector abstract fun profileInjector(): Profile
     @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus
-    @ContributesAndroidInjector abstract fun profileStoreInjector(): ProfileStore
-
-    // TODO move to Core
-    @ContributesAndroidInjector abstract fun bgReadingInjector(): BgReading
-    @ContributesAndroidInjector abstract fun treatmentInjector(): Treatment
-    @ContributesAndroidInjector abstract fun profileSwitchInjector(): ProfileSwitch
-    @ContributesAndroidInjector abstract fun temporaryBasalInjector(): TemporaryBasal
-    @ContributesAndroidInjector abstract fun careportalEventInjector(): CareportalEvent
-    @ContributesAndroidInjector abstract fun extendedBolusInjector(): ExtendedBolus
 
     @ContributesAndroidInjector abstract fun treatmentServiceInjector(): TreatmentService
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 9f65841adc..4535f6820b 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -32,7 +32,6 @@ import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
-import info.nightscout.androidaps.dana.DanaRFragment
 import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
@@ -58,7 +57,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector
     abstract fun contributesConfigBuilderFragment(): ConfigBuilderFragment
 
-    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaRFragment
     @ContributesAndroidInjector abstract fun contributesFoodFragment(): FoodFragment
     @ContributesAndroidInjector abstract fun contributesInsulinFragment(): InsulinFragment
     @ContributesAndroidInjector abstract fun contributesLocalProfileFragment(): LocalProfileFragment
@@ -87,8 +85,6 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesVirtualPumpFragment(): VirtualPumpFragment
 
-    @ContributesAndroidInjector abstract fun contributesPairingProgressDialog(): PairingProgressDialog
-    @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
     @ContributesAndroidInjector abstract fun contributesCalibrationDialog(): CalibrationDialog
     @ContributesAndroidInjector abstract fun contributesCarbsDialog(): CarbsDialog
     @ContributesAndroidInjector abstract fun contributesCareDialog(): CareDialog
@@ -99,7 +95,6 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector
     abstract fun contributesEditQuickWizardDialog(): EditQuickWizardDialog
 
-    @ContributesAndroidInjector abstract fun contributesErrorDialog(): ErrorDialog
     @ContributesAndroidInjector abstract fun contributesExtendedBolusDialog(): ExtendedBolusDialog
     @ContributesAndroidInjector abstract fun contributesFillDialog(): FillDialog
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
index 0921ed7cd0..a54665f8d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -14,7 +14,6 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
-    @ContributesAndroidInjector abstract fun contributesNetworkChangeReceiver(): NetworkChangeReceiver
     @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index 70258c66e5..f961c3a863 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -7,11 +7,6 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Dismiss
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
-import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService
-import info.nightscout.androidaps.danar.services.DanaRExecutionService
-import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
-import info.nightscout.androidaps.danars.services.DanaRSService
-import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
@@ -24,17 +19,12 @@ import info.nightscout.androidaps.services.LocationService
 @Suppress("unused")
 abstract class ServicesModule {
 
-    @ContributesAndroidInjector abstract fun contributesAbstractDanaRExecutionService(): info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService
     @ContributesAndroidInjector abstract fun contributesAlarmSoundService(): AlarmSoundService
     @ContributesAndroidInjector abstract fun contributesDataService(): DataService
     @ContributesAndroidInjector abstract fun contributesDismissNotificationService(): DismissNotificationService
     @ContributesAndroidInjector abstract fun contributesDummyService(): DummyService
     @ContributesAndroidInjector abstract fun contributesLocationService(): LocationService
     @ContributesAndroidInjector abstract fun contributesNSClientService(): NSClientService
-    @ContributesAndroidInjector abstract fun contributesDanaRSService(): DanaRSService
-    @ContributesAndroidInjector abstract fun contributesDanaRv2ExecutionService(): DanaRv2ExecutionService
-    @ContributesAndroidInjector abstract fun contributesDanaRExecutionService(): DanaRExecutionService
-    @ContributesAndroidInjector abstract fun contributesDanaRKoreanExecutionService(): DanaRKoreanExecutionService
     @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService
     @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt
deleted file mode 100644
index 6ee0c902dc..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/dependency-injection-todo.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-PreferenceActivity is an Example how to make an Activity injectable.
-We might undo that as we don't actually have us inject things.
-
-MyPreferencesFragment is an injectable Fragment. Here we actually have Dagger2 provide us an InsulinOrefFreePeakPlugin instance.
-
-If we use multiple Fragments, we should generate a base-class. Then we only have to add a "provides***Fragment" to the FragmentsModule and derive from that class.
-
-InsulinOrefFreePeakPlugin is an example how to get things injected via the constructor.
-You could call "new InsulinOrefFreePeakPlugin(new SPImpl(SPImpl(PreferenceManager.getDefaultSharedPreferences(context))), new ResourceHelper())"... but Dagger will resolve that for you in MainApp. :)
-
-SPImpl is an example how to bind an implementation to an Interface via Dagger.
-
-ResourceHelper is an example how to generate simple classes that Dagger can auto-resolve how to inject them. No need for a provider here.
-ResourceHelper might have a weak reference at some point and not a static dependency on MainApp... but at least we reduced the static dependencies within a plugin.
-
-In order to Test: Any dependency of InsulinOrefFreePeakPlugin is passed via the constructor. Instead of static mocking MainApp you now can Mock ResourceHelper with a very small interface.
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index 3e6a2c374e..14f0897cc5 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -89,19 +89,19 @@ class TempBasalDialog : DialogFragmentWithDate() {
         if (isPercentPump) {
             val basalPercentInput = SafeParse.stringToInt(actions_tempbasal_basalpercentinput.text)
             percent = constraintChecker.applyBasalPercentConstraints(Constraint(basalPercentInput), profile).value()
-            actions.add(resourceHelper.gs(R.string.pump_tempbasal_label) + ": $percent%")
+            actions.add(resourceHelper.gs(R.string.tempbasal_label) + ": $percent%")
             actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
             if (percent != basalPercentInput) actions.add(resourceHelper.gs(R.string.constraintapllied))
         } else {
             val basalAbsoluteInput = SafeParse.stringToDouble(actions_tempbasal_basalabsoluteinput.text)
             absolute = constraintChecker.applyBasalConstraints(Constraint(basalAbsoluteInput), profile).value()
-            actions.add(resourceHelper.gs(R.string.pump_tempbasal_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, absolute))
+            actions.add(resourceHelper.gs(R.string.tempbasal_label) + ": " + resourceHelper.gs(R.string.pump_basebasalrate, absolute))
             actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, durationInMinutes))
             if (abs(absolute - basalAbsoluteInput) > 0.01)
                 actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.constraintapllied) + "</font>")
         }
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.pump_tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
                 val callback: Callback = object : Callback() {
                     override fun run() {
                         if (!result.success) {
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index d2e9c0454f..a16c6ac471 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -16,7 +16,6 @@ import info.nightscout.androidaps.db.TempTarget
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
@@ -123,7 +122,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
         val duration = overview_temptarget_duration.value.toInt()
         if (target != 0.0 && duration != 0) {
             actions.add(resourceHelper.gs(R.string.reason) + ": " + reason)
-            actions.add(resourceHelper.gs(R.string.nsprofileview_target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + resourceHelper.gs(unitResId))
+            actions.add(resourceHelper.gs(R.string.target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + resourceHelper.gs(unitResId))
             actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
         } else {
             actions.add(resourceHelper.gs(R.string.stoptemptarget))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index bda7d5b249..c257431ebf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -346,7 +346,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                         val lastRun = loopPlugin.lastRun
                         loopPlugin.invoke("Accept temp button", false)
                         if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
-                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.pump_tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
+                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
                                 ?: "".toSpanned(), Runnable {
                                 aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
                                 overview_accepttempbutton?.visibility = View.GONE
@@ -664,9 +664,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_basebasal?.text = activeTemp?.let { if (resourceHelper.shortTextMode()) "T:" + activeTemp.toStringVeryShort() else activeTemp.toStringFull() }
             ?: resourceHelper.gs(R.string.pump_basebasalrate, profile.basal)
         overview_basal_llayout?.setOnClickListener {
-            var fullText = "${resourceHelper.gs(R.string.pump_basebasalrate_label)}: ${resourceHelper.gs(R.string.pump_basebasalrate, profile.basal)}"
+            var fullText = "${resourceHelper.gs(R.string.basebasalrate_label)}: ${resourceHelper.gs(R.string.pump_basebasalrate, profile.basal)}"
             if (activeTemp != null)
-                fullText += "\n" + resourceHelper.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull()
+                fullText += "\n" + resourceHelper.gs(R.string.tempbasal_label) + ": " + activeTemp.toStringFull()
             activity?.let {
                 OKDialog.show(it, resourceHelper.gs(R.string.basal), fullText)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index 69c6f84cb2..1cc60f0400 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -206,7 +206,7 @@ class OverviewMenus @Inject constructor(
 
             R.id.overview_activeprofile -> {
                 menu.setHeaderTitle(resourceHelper.gs(R.string.profile))
-                menu.add(resourceHelper.gs(R.string.danar_viewprofile))
+                menu.add(resourceHelper.gs(R.string.viewprofile))
                 if (activePlugin.activeProfileInterface.profile != null) {
                     menu.add(resourceHelper.gs(R.string.careportal_profileswitch))
                 }
@@ -341,18 +341,18 @@ class OverviewMenus @Inject constructor(
                 return true
             }
 
-            resourceHelper.gs(R.string.disconnectpumpfor3h)                           -> {
+            resourceHelper.gs(R.string.disconnectpumpfor3h)      -> {
                 aapsLogger.debug("USER ENTRY: DISCONNECT 3h")
                 loopPlugin.disconnectPump(180, profile)
                 rxBus.send(EventRefreshOverview("suspendmenu"))
                 return true
             }
 
-            resourceHelper.gs(R.string.careportal_profileswitch)                      -> {
+            resourceHelper.gs(R.string.careportal_profileswitch) -> {
                 ProfileSwitchDialog().show(manager, "Overview")
             }
 
-            resourceHelper.gs(R.string.danar_viewprofile)                             -> {
+            resourceHelper.gs(R.string.viewprofile)              -> {
                 val args = Bundle()
                 args.putLong("time", DateUtil.now())
                 args.putInt("mode", ProfileViewerDialog.Mode.RUNNING_PROFILE.ordinal)
@@ -361,7 +361,7 @@ class OverviewMenus @Inject constructor(
                 pvd.show(manager, "ProfileViewDialog")
             }
 
-            resourceHelper.gs(R.string.eatingsoon)                                    -> {
+            resourceHelper.gs(R.string.eatingsoon)               -> {
                 aapsLogger.debug("USER ENTRY: TEMP TARGET EATING SOON")
                 val target = Profile.toMgdl(defaultValueHelper.determineEatingSoonTT(), profileFunction.getUnits())
                 val tempTarget = TempTarget()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index 1fd3222cbf..29ed323ee1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.db.CareportalEvent
@@ -65,7 +65,7 @@ class ActionStringHandler @Inject constructor(
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
     private val danaRSPlugin: DanaRSPlugin,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val hardLimits: HardLimits,
     private val carbsGenerator: CarbsGenerator,
     private val dateUtil: DateUtil,
@@ -326,7 +326,7 @@ class ActionStringHandler @Inject constructor(
             message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n"
             message += "\n"
         } else if (pump is DanaRPlugin) {
-            val tdd = danaRPump.dailyTotalUnits
+            val tdd = danaPump.dailyTotalUnits
             message += "Today: " + DecimalFormatter.to2Decimal(tdd) + "U " + (DecimalFormatter.to0Decimal(100 * tdd / refTDD) + "%") + "\n"
             message += "\n"
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index ef64d4a690..057fe53ee0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -45,7 +45,7 @@ class LocalProfileFragment : DaggerFragment() {
 
     private val save = Runnable {
         doEdit()
-        basalView?.updateLabel(resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel())
+        basalView?.updateLabel(resourceHelper.gs(R.string.basal_label) + ": " + sumLabel())
     }
 
     private val textWatch = object : TextWatcher {
@@ -106,14 +106,14 @@ class LocalProfileFragment : DaggerFragment() {
         localprofile_name.addTextChangedListener(textWatch)
         localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, hardLimits.MINDIA, hardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
         localprofile_dia.tag = "LP_DIA"
-        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
         } else {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
         }
 
         // Spinner
@@ -190,10 +190,10 @@ class LocalProfileFragment : DaggerFragment() {
             localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
             localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
             localprofile_dia.tag = "LP_DIA"
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.nsprofileview_ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.nsprofileview_isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
-            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.nsprofileview_basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.nsprofileview_target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
+            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
             updateGUI()
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
index 2c1c9b6e91..cc4cdd9516 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java
@@ -269,7 +269,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
 
     private void getBatteryStatusItem(List<View> statusItems) {
         if (localInsightPlugin.getBatteryStatus() == null) return;
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_battery_label),
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.battery_label),
                 localInsightPlugin.getBatteryStatus().getBatteryAmount() + "%"));
     }
 
@@ -280,7 +280,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
         if (cartridgeStatus.isInserted())
             status = DecimalFormatter.to2Decimal(localInsightPlugin.getCartridgeStatus().getRemainingAmount()) + "U";
         else status = resourceHelper.gs(R.string.not_inserted);
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_reservoir_label), status));
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.reservoir_label), status));
     }
 
     private void getTDDItems(List<View> statusItems) {
@@ -294,14 +294,14 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick
     private void getBaseBasalRateItem(List<View> statusItems) {
         if (localInsightPlugin.getActiveBasalRate() == null) return;
         ActiveBasalRate activeBasalRate = localInsightPlugin.getActiveBasalRate();
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_basebasalrate_label),
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.basebasalrate_label),
                 DecimalFormatter.to2Decimal(activeBasalRate.getActiveBasalRate()) + " U/h (" + activeBasalRate.getActiveBasalProfileName() + ")"));
     }
 
     private void getTBRItem(List<View> statusItems) {
         if (localInsightPlugin.getActiveTBR() == null) return;
         ActiveTBR activeTBR = localInsightPlugin.getActiveTBR();
-        statusItems.add(getStatusItem(resourceHelper.gs(R.string.pump_tempbasal_label),
+        statusItems.add(getStatusItem(resourceHelper.gs(R.string.tempbasal_label),
                 resourceHelper.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration())));
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
index 191957a8f3..26165ec661 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
@@ -133,7 +133,7 @@ class TreatmentsCareportalFragment : DaggerFragment() {
                 remove.setOnClickListener { v: View ->
                     val careportalEvent = v.tag as CareportalEvent
                     activity?.let { activity ->
-                        val text = resourceHelper.gs(R.string.careportal_newnstreatment_eventtype) + ": " + translator.translate(careportalEvent.eventType) + "\n" +
+                        val text = resourceHelper.gs(R.string.eventtype) + ": " + translator.translate(careportalEvent.eventType) + "\n" +
                             resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + careportalEvent.notes + "\n" +
                             resourceHelper.gs(R.string.date) + ": " + dateUtil.dateAndTimeString(careportalEvent.date)
                         OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.removerecord), text, Runnable {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
index 8b8aee6b91..fed0ba1137 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
@@ -162,7 +162,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() {
                     context?.let {
                         showConfirmation(it, resourceHelper.gs(R.string.removerecord),
                             """
-                ${resourceHelper.gs(R.string.pump_tempbasal_label)}: ${tempBasal.toStringFull()}
+                ${resourceHelper.gs(R.string.tempbasal_label)}: ${tempBasal.toStringFull()}
                 ${resourceHelper.gs(R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.date)}
                 """.trimIndent(),
                             DialogInterface.OnClickListener { _: DialogInterface?, _: Int ->
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 588bde9ab8..0290c1cf8a 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -290,7 +290,7 @@
                 android:drawableTop="@drawable/icon_danarstats"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
-                android:text="@string/danar_stats_tdd"
+                android:text="@string/tdd"
 
                 app:layout_column="1"
                 app:layout_columnWeight="1"
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
index 4251efd3a2..a501e70a77 100644
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
@@ -233,7 +233,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/nsprofileview_target_label"
+                        android:text="@string/target_label"
                         android:width="120dp"
                         android:padding="10dp"
                         android:textAppearance="@android:style/TextAppearance.Material.Small"
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index af76a31a9d..c4a65feb36 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -121,7 +121,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_battery_label"
+                    android:text="@string/battery_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -167,7 +167,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_reservoir_label"
+                    android:text="@string/reservoir_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -212,7 +212,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_lastconnection_label"
+                    android:text="@string/lastconnection_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -257,7 +257,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_lastbolus_label"
+                    android:text="@string/lastbolus_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -302,7 +302,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_basebasalrate_label"
+                    android:text="@string/basebasalrate_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -347,7 +347,7 @@
                     android:layout_weight="1.5"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_tempbasal_label"
+                    android:text="@string/tempbasal_label"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index c748960c33..e13d7fc872 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -24,7 +24,7 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/pump_tempbasal_label"
+                android:contentDescription="@string/tempbasal_label"
                 android:src="@drawable/icon_cp_basal_start" />
 
             <TextView
@@ -34,7 +34,7 @@
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:text="@string/pump_tempbasal_label"
+                android:text="@string/tempbasal_label"
                 android:textAlignment="center"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
         </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index be4258ec5c..d03413a237 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -81,7 +81,7 @@
                 android:layout_gravity="center_vertical"
                 android:width="120dp"
                 android:padding="10dp"
-                android:text="@string/nsprofileview_target_label"
+                android:text="@string/target_label"
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/medtronic_fragment.xml b/app/src/main/res/layout/medtronic_fragment.xml
index a67872fa5d..af16dd26cb 100644
--- a/app/src/main/res/layout/medtronic_fragment.xml
+++ b/app/src/main/res/layout/medtronic_fragment.xml
@@ -164,7 +164,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_battery_label"
+                        android:text="@string/battery_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -211,7 +211,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastconnection_label"
+                        android:text="@string/lastconnection_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -256,7 +256,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastbolus_label"
+                        android:text="@string/lastbolus_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -302,7 +302,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_basebasalrate_label"
+                        android:text="@string/basebasalrate_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -347,7 +347,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_tempbasal_label"
+                        android:text="@string/tempbasal_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -393,7 +393,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_reservoir_label"
+                        android:text="@string/reservoir_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -511,7 +511,7 @@
                     android:drawableTop="@drawable/icon_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_history" />
+                    android:text="@string/pumphistory" />
 
                 <Button
                     android:id="@+id/medtronic_stats"
diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml
index 2068f90557..e5e450c141 100644
--- a/app/src/main/res/layout/omnipod_fragment.xml
+++ b/app/src/main/res/layout/omnipod_fragment.xml
@@ -242,7 +242,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastconnection_label"
+                        android:text="@string/lastconnection_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -287,7 +287,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastbolus_label"
+                        android:text="@string/lastbolus_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -333,7 +333,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_basebasalrate_label"
+                        android:text="@string/basebasalrate_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -378,7 +378,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_tempbasal_label"
+                        android:text="@string/tempbasal_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -424,7 +424,7 @@
                         android:layout_weight="1.5"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_reservoir_label"
+                        android:text="@string/reservoir_label"
                         android:textSize="14sp" />
 
                     <TextView
diff --git a/app/src/main/res/layout/profileviewer_fragment.xml b/app/src/main/res/layout/profileviewer_fragment.xml
index 8b75d4a57f..aaefa3ee49 100644
--- a/app/src/main/res/layout/profileviewer_fragment.xml
+++ b/app/src/main/res/layout/profileviewer_fragment.xml
@@ -135,7 +135,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_units_label"
+                android:text="@string/units_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -180,7 +180,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_dia_label"
+                android:text="@string/dia_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -225,7 +225,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_ic_label"
+                android:text="@string/ic_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -270,7 +270,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_isf_label"
+                android:text="@string/isf_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -315,7 +315,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_basal_label"
+                android:text="@string/basal_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -402,7 +402,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_target_label"
+                android:text="@string/target_label"
                 android:textSize="14sp" />
 
             <TextView
diff --git a/app/src/main/res/layout/treatments_fragment.xml b/app/src/main/res/layout/treatments_fragment.xml
index 1ab1bbe88e..316c9ea7c6 100644
--- a/app/src/main/res/layout/treatments_fragment.xml
+++ b/app/src/main/res/layout/treatments_fragment.xml
@@ -48,7 +48,7 @@
                 android:gravity="center_vertical|center_horizontal"
                 android:paddingLeft="5dp"
                 android:paddingRight="5dp"
-                android:text="@string/pump_tempbasal_label" />
+                android:text="@string/tempbasal_label" />
 
             <TextView
                 android:id="@+id/treatments_temptargets"
diff --git a/app/src/main/res/layout/virtualpump_fragment.xml b/app/src/main/res/layout/virtualpump_fragment.xml
index a01eb128fd..e7163b65aa 100644
--- a/app/src/main/res/layout/virtualpump_fragment.xml
+++ b/app/src/main/res/layout/virtualpump_fragment.xml
@@ -33,7 +33,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_basebasalrate_label"
+                    android:text="@string/basebasalrate_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -77,7 +77,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_tempbasal_label"
+                    android:text="@string/tempbasal_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -165,7 +165,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_battery_label"
+                    android:text="@string/battery_label"
                     android:textSize="14sp" />
 
                 <TextView
@@ -210,7 +210,7 @@
                     android:layout_weight="1"
                     android:gravity="end"
                     android:paddingRight="5dp"
-                    android:text="@string/pump_reservoir_label"
+                    android:text="@string/reservoir_label"
                     android:textSize="14sp" />
 
                 <TextView
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
index c3a29d7891..193f303aa8 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTableTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.junit.Assert
 import org.junit.Test
@@ -34,10 +33,10 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
                 it.constraintChecker = constraintChecker
             }
             if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
             if (it is DanaRS_Packet_APS_History_Events) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -47,7 +46,7 @@ class DanaRSMessageHashTableTest : DanaRSTestBase() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
-        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, 0, 0, 0)
+        val forTesting: DanaRS_Packet = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, 0, 0, 0)
         val testPacket: DanaRS_Packet = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.getOpCode().toLong())
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
index 74f6bbd89f..ed97c24a55 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRSTestBase.kt
@@ -4,7 +4,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
@@ -24,7 +24,7 @@ open class DanaRSTestBase : TestBaseWithProfile() {
         }
     }
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
@@ -55,6 +55,6 @@ open class DanaRSTestBase : TestBaseWithProfile() {
 
     @Before
     fun setup() {
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
+        danaPump = info.nightscout.androidaps.dana.DanaPump(aapsLogger, sp, injector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
index dc4447fc22..4716a22dca 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -34,7 +34,7 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
                 it.activePlugin = activePlugin
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
                 it.detailedBolusInfoStorage = detailedBolusInfoStorage
                 it.sp = sp
             }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index d38ee929b1..cdd68df473 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.utils.DateUtil
 import org.junit.Assert
 import org.junit.Test
@@ -27,23 +26,23 @@ class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
 
     @Test fun runTest() { // test for negative carbs
         val now = DateUtil.now()
-        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, -1, 0)
+        var historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, -1, 0)
         var testparams = historyTest.requestParams
         Assert.assertEquals(0.toByte(), testparams[8])
         // 5g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         // 150g carbs
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 150, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 150, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(150.toByte(), testparams[8])
         // test message generation
-        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaRPump.CARBS, now, 5, 0)
+        historyTest = DanaRS_Packet_APS_Set_Event_History(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, now, 5, 0)
         testparams = historyTest.requestParams
         Assert.assertEquals(5.toByte(), testparams[8])
         Assert.assertEquals(11, testparams.size)
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.CARBS.toByte(), testparams[0])
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.CARBS.toByte(), testparams[0])
         // test message decoding
         historyTest.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
         Assert.assertEquals(false, historyTest.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
index 98a92ddaef..935ea4d015 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_RateTest.kt
@@ -19,7 +19,7 @@ class DanaRS_Packet_Basal_Get_Basal_RateTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -32,8 +32,8 @@ class DanaRS_Packet_Basal_Get_Basal_RateTest : DanaRSTestBase() {
         putIntToArray(array, 0, (1.0 * 100).toInt())
         putByteToArray(array, 2, (0.05 * 100).toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(1.0, danaRPump.maxBasal, 0.0)
-        Assert.assertEquals(0.05, danaRPump.basalStep, 0.0)
+        Assert.assertEquals(1.0, danaPump.maxBasal, 0.0)
+        Assert.assertEquals(0.05, danaPump.basalStep, 0.0)
         Assert.assertTrue(packet.failed)
         Assert.assertEquals("BASAL__GET_BASAL_RATE", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
index 6bce045a98..2aa3293eaf 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_RateTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Basal_Get_Profile_Basal_RateTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Basal_Get_Profile_Basal_Rate) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -30,15 +30,15 @@ class DanaRS_Packet_Basal_Get_Profile_Basal_RateTest : DanaRSTestBase() {
         val params = testPacket.requestParams
         assertEquals(1.toByte(), params[0])
         testPacket.handleMessage(createArray(50, 0.toByte()))
-        assertEquals(0.0, danaRPump.pumpProfiles!![1][1], 0.0)
+        assertEquals(0.0, danaPump.pumpProfiles!![1][1], 0.0)
         testPacket.handleMessage(createArray(50, 1.toByte()))
-        assertEquals(basal01, danaRPump.pumpProfiles!![1][2], 0.0)
+        assertEquals(basal01, danaPump.pumpProfiles!![1][2], 0.0)
         testPacket.handleMessage(createArray(50, 5.toByte()))
-        assertEquals(basal05, danaRPump.pumpProfiles!![1][1], 0.0)
+        assertEquals(basal05, danaPump.pumpProfiles!![1][1], 0.0)
         testPacket.handleMessage(createArray(50, 12.toByte()))
-        assertEquals(basal12, danaRPump.pumpProfiles!![1][1], 0.0)
+        assertEquals(basal12, danaPump.pumpProfiles!![1][1], 0.0)
         testPacket.handleMessage(createArray(50, 120.toByte()))
-        assertEquals(basal120, danaRPump.pumpProfiles!![1][1], 0.0)
+        assertEquals(basal120, danaPump.pumpProfiles!![1][1], 0.0)
         assertEquals("BASAL__GET_PROFILE_BASAL_RATE", testPacket.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
index 7f53f69b19..8b430f9146 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_NumberTest.kt
@@ -16,7 +16,7 @@ class DanaRS_Packet_Basal_Get_Profile_NumberTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Basal_Get_Profile_Number) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -27,7 +27,7 @@ class DanaRS_Packet_Basal_Get_Profile_NumberTest : DanaRSTestBase() {
         val array = ByteArray(100)
         putByteToArray(array, 0, 1.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(1, danaRPump.activeProfile)
+        Assert.assertEquals(1, danaPump.activeProfile)
         Assert.assertEquals("BASAL__GET_PROFILE_NUMBER", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
index 57790f279c..3ac8c367f1 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest.kt
@@ -19,7 +19,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_Basal_Get_Temporary_Basal_State) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -35,9 +35,9 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_StateTest : DanaRSTestBase() {
         putIntToArray(array, 4, 1)
         packet.handleMessage(array)
         Assert.assertTrue(packet.failed)
-        Assert.assertTrue(danaRPump.isTempBasalInProgress)
-        Assert.assertEquals(300, danaRPump.tempBasalPercent)
-        Assert.assertEquals(15 * 60, danaRPump.tempBasalTotalSec)
+        Assert.assertTrue(danaPump.isTempBasalInProgress)
+        Assert.assertEquals(300, danaPump.tempBasalPercent)
+        Assert.assertEquals(15 * 60, danaPump.tempBasalTotalSec)
         Assert.assertEquals("BASAL__TEMPORARY_BASAL_STATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
index 6840435153..b5de343b51 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_OptionTest.kt
@@ -19,7 +19,7 @@ class DanaRS_Packet_Bolus_Get_Bolus_OptionTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -31,13 +31,13 @@ class DanaRS_Packet_Bolus_Get_Bolus_OptionTest : DanaRSTestBase() {
         packet.handleMessage(createArray(21, 1.toByte()))
         Assert.assertEquals(false, packet.failed)
         //Are options saved to pump
-        Assert.assertEquals(false, !danaRPump.isExtendedBolusEnabled)
-        Assert.assertEquals(1, danaRPump.bolusCalculationOption)
-        Assert.assertEquals(1, danaRPump.missedBolusConfig)
+        Assert.assertEquals(false, !danaPump.isExtendedBolusEnabled)
+        Assert.assertEquals(1, danaPump.bolusCalculationOption)
+        Assert.assertEquals(1, danaPump.missedBolusConfig)
         packet.handleMessage(createArray(21, 0.toByte()))
         Assert.assertEquals(true, packet.failed)
         //Are options saved to pump
-        Assert.assertEquals(true, !danaRPump.isExtendedBolusEnabled)
+        Assert.assertEquals(true, !danaPump.isExtendedBolusEnabled)
         Assert.assertEquals("BOLUS__GET_BOLUS_OPTION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
index 0d97178ae9..5b86df3888 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaRPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -15,7 +14,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_CIR_CF_Array) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -27,7 +26,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // are pump units MG/DL ???
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL, danaRPump.units)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL, danaPump.units)
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(34, 3.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
index d83edb311d..1149a2fccf 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_InformationTest.kt
@@ -16,7 +16,7 @@ class DanaRS_Packet_Bolus_Get_Calculation_InformationTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Calculation_Information) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
index b04fbd9dfb..fae26a11ae 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest.kt
@@ -16,7 +16,7 @@ class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_InformationTest : DanaRST
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
index 4f745638de..3af180017f 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_BolusTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Bolus_Get_Dual_BolusTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Dual_Bolus) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -31,9 +31,9 @@ class DanaRS_Packet_Bolus_Get_Dual_BolusTest : DanaRSTestBase() {
         putIntToArray(array, 5, (40.0 * 100).toInt())
         packet.handleMessage(array)
         Assert.assertTrue(packet.failed)
-        Assert.assertEquals(1.0, danaRPump.bolusStep, 0.0)
-        Assert.assertEquals(0.55, danaRPump.extendedBolusAbsoluteRate, 0.0)
-        Assert.assertEquals(40.0, danaRPump.maxBolus, 0.0)
+        Assert.assertEquals(1.0, danaPump.bolusStep, 0.0)
+        Assert.assertEquals(0.55, danaPump.extendedBolusAbsoluteRate, 0.0)
+        Assert.assertEquals(40.0, danaPump.maxBolus, 0.0)
 
         Assert.assertEquals("BOLUS__GET_DUAL_BOLUS", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
index b615090ac5..5f89ad8a8e 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_BolusTest.kt
@@ -16,7 +16,7 @@ class DanaRS_Packet_Bolus_Get_Extended_BolusTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -32,7 +32,7 @@ class DanaRS_Packet_Bolus_Get_Extended_BolusTest : DanaRSTestBase() {
         testValue = 1.0
         packet.handleMessage(createArray(10, testValue.toByte()))
         // is pump.bolustep set to 1
-        Assert.assertEquals(testValue / 100.0, danaRPump.bolusStep, 0.0)
+        Assert.assertEquals(testValue / 100.0, danaPump.bolusStep, 0.0)
         Assert.assertEquals(testValue != 0.0, packet.failed)
         Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
index 50326edff1..093ccbfa0c 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest.kt
@@ -16,7 +16,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Extended_Bolus_State) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -32,7 +32,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_StateTest : DanaRSTestBase() {
         testValue = 1.0
         packet.handleMessage(createArray(11, testValue.toByte()))
         // is extended bolus in progress
-        Assert.assertEquals(testValue == 1.0, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(testValue == 1.0, danaPump.isExtendedInProgress)
         Assert.assertEquals(testValue != 0.0, packet.failed)
         Assert.assertEquals("BOLUS__GET_EXTENDED_BOLUS_STATE", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
index f78c827ff2..550273e68d 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest : DanaRSTestBase()
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -25,10 +25,10 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_StateTest : DanaRSTestBase()
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // isExtendedinprogres should be false
-        Assert.assertEquals(false, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(false, danaPump.isExtendedInProgress)
         //        assertEquals(false, packet.failed);
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(true, danaPump.isExtendedInProgress)
         Assert.assertEquals("BOLUS__GET_EXTENDED_MENU_OPTION_STATE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
index 35c7928f24..66df970476 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest.kt
@@ -20,7 +20,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_Bolus_Get_Step_Bolus_Information) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -40,13 +40,13 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_InformationTest : DanaRSTestBase() {
 
         packet.handleMessage(array)
         Assert.assertTrue(packet.failed)
-        Assert.assertEquals(6.0, danaRPump.initialBolusAmount, 0.01)
-        val lastBolus = Date(danaRPump.lastBolusTime)
+        Assert.assertEquals(6.0, danaPump.initialBolusAmount, 0.01)
+        val lastBolus = Date(danaPump.lastBolusTime)
         Assert.assertEquals(13, lastBolus.hours)
         Assert.assertEquals(20, lastBolus.minutes)
-        Assert.assertEquals(12.5, danaRPump.lastBolusAmount, 0.01)
-        Assert.assertEquals(25.0, danaRPump.maxBolus, 0.01)
-        Assert.assertEquals(1.0, danaRPump.bolusStep, 0.01)
+        Assert.assertEquals(12.5, danaPump.lastBolusAmount, 0.01)
+        Assert.assertEquals(25.0, danaPump.maxBolus, 0.01)
+        Assert.assertEquals(1.0, danaPump.bolusStep, 0.01)
         Assert.assertEquals("BOLUS__GET_STEP_BOLUS_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 4da17b3646..349eeb673b 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -33,7 +33,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Bolus_Set_Step_Bolus_Start) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
                 it.constraintChecker = constraintChecker
             }
         }
@@ -55,7 +55,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
index 03c42168dc..b7a4238bd6 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest.kt
@@ -27,7 +27,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
@@ -41,7 +41,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StopTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(Mockito.anyInt())).thenReturn("SomeString")
 
-        danaRPump.bolusingTreatment = Treatment(packetInjector)
+        danaPump.bolusingTreatment = Treatment(packetInjector)
         val testPacket = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(packetInjector)
         // test message decoding
         testPacket.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
index df2503b270..61aa3e632c 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_InformationTest.kt
@@ -18,7 +18,7 @@ class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_General_Get_More_Information) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -41,14 +41,14 @@ class DanaRS_Packet_General_Get_More_InformationTest : DanaRSTestBase() {
 
         packet.handleMessage(array)
         Assert.assertFalse(packet.failed)
-        Assert.assertEquals(6.0, danaRPump.iob, 0.01)
-        Assert.assertEquals(12.5, danaRPump.dailyTotalUnits, 0.01)
-        Assert.assertTrue(danaRPump.isExtendedInProgress)
-        Assert.assertEquals(150, danaRPump.extendedBolusRemainingMinutes)
-        val lastBolus = Date(danaRPump.lastBolusTime)
+        Assert.assertEquals(6.0, danaPump.iob, 0.01)
+        Assert.assertEquals(12.5, danaPump.dailyTotalUnits, 0.01)
+        Assert.assertTrue(danaPump.isExtendedInProgress)
+        Assert.assertEquals(150, danaPump.extendedBolusRemainingMinutes)
+        val lastBolus = Date(danaPump.lastBolusTime)
         Assert.assertEquals(15, lastBolus.hours)
         Assert.assertEquals(25, lastBolus.minutes)
-        Assert.assertEquals(1.7, danaRPump.lastBolusAmount, 0.01)
+        Assert.assertEquals(1.7, danaPump.lastBolusAmount, 0.01)
 
         Assert.assertEquals("REVIEW__GET_MORE_INFORMATION", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
index 9f410bc69e..6968c7eff1 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_PasswordTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_General_Get_PasswordTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_General_Get_Password) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
index c9b9269cbc..5994d2d5d0 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_CheckTest.kt
@@ -19,7 +19,7 @@ class DanaRS_Packet_General_Get_Pump_CheckTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index eb40c21843..1b8ff9c3bc 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -17,7 +17,7 @@ class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_General_Get_Shipping_Information) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
index 88b9eb5afa..e66dea3dad 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_VerisonTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_General_Get_Shipping_VerisonTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_General_Get_Shipping_Version) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -25,7 +25,7 @@ class DanaRS_Packet_General_Get_Shipping_VerisonTest : DanaRSTestBase() {
         val ver = byteArrayOf((-78).toByte(), (-127).toByte(), (66).toByte(), (80).toByte(), (78).toByte(), (45).toByte(), (51).toByte(), (46).toByte(), (48).toByte(), (46).toByte(), (48).toByte())
         packet.handleMessage(ver)
         Assert.assertFalse(packet.failed)
-        Assert.assertEquals("BPN-3.0.0", danaRPump.bleModel)
+        Assert.assertEquals("BPN-3.0.0", danaPump.bleModel)
         Assert.assertEquals("GENERAL__GET_SHIPPING_VERSION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
index b24b19f5ea..bcb6c0987d 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_TotalTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_General_Get_Today_Delivery_TotalTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_General_Get_Today_Delivery_Total) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -30,7 +30,7 @@ class DanaRS_Packet_General_Get_Today_Delivery_TotalTest : DanaRSTestBase() {
         packet.handleMessage(createArray(18, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(15, 1.toByte()))
-        Assert.assertEquals(((1 and 0x000000FF shl 8) + (1 and 0x000000FF)) / 100.0, danaRPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(((1 and 0x000000FF shl 8) + (1 and 0x000000FF)) / 100.0, danaPump.dailyTotalUnits, 0.0)
         Assert.assertEquals("REVIEW__GET_TODAY_DELIVERY_TOTAL", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
index 9a8e5a588a..60a8a6d74d 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_InformationTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_General_Initial_Screen_InformationTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_General_Initial_Screen_Information) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -29,7 +29,7 @@ class DanaRS_Packet_General_Initial_Screen_InformationTest : DanaRSTestBase() {
         packet = DanaRS_Packet_General_Initial_Screen_Information(packetInjector)
         packet.handleMessage(createArray(17, 1.toByte()))
         Assert.assertEquals(false, packet.failed)
-        Assert.assertEquals(true, danaRPump.pumpSuspended)
+        Assert.assertEquals(true, danaPump.pumpSuspended)
         Assert.assertEquals("REVIEW__INITIAL_SCREEN_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
index c80419e165..6028dd0941 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_CompleteTest.kt
@@ -29,7 +29,7 @@ class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
@@ -43,13 +43,13 @@ class DanaRS_Packet_Notify_Delivery_CompleteTest : DanaRSTestBase() {
     @Test fun runTest() {
         `when`(resourceHelper.gs(anyInt(), anyDouble())).thenReturn("SomeString")
 
-        danaRPump.bolusingTreatment = Treatment(packetInjector)
+        danaPump.bolusingTreatment = Treatment(packetInjector)
         val packet = DanaRS_Packet_Notify_Delivery_Complete(packetInjector)
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
         packet.handleMessage(createArray(17, 0.toByte()))
-        Assert.assertEquals(true, danaRPump.bolusDone)
+        Assert.assertEquals(true, danaPump.bolusDone)
         Assert.assertEquals("NOTIFY__DELIVERY_COMPLETE", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 28ff206b5e..0ec1dd5911 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -39,7 +39,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
                 it.aapsLogger = aapsLogger
                 it.rxBus = rxBus
                 it.resourceHelper = resourceHelper
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
             if (it is Treatment) {
                 it.defaultValueHelper = defaultValueHelper
@@ -68,7 +68,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
-        danaRPump.bolusingTreatment = Treatment(packetInjector)
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaPump.bolusingTreatment = Treatment(packetInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index b0a2f04ec1..0cda0fa06c 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -18,7 +18,7 @@ class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_Option_Get_Pump_Time) {
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -34,7 +34,7 @@ class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
         putByteToArray(array, 5, 35) // second 35
 
         packet.handleMessage(array)
-        Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaRPump.pumpTime)
+        Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaPump.pumpTime)
         Assert.assertEquals("OPTION__GET_PUMP_TIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
index 9adab432df..8f5f8f0309 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_OptionTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Option_Get_User_OptionTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Option_Get_User_Option) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -28,7 +28,7 @@ class DanaRS_Packet_Option_Get_User_OptionTest : DanaRSTestBase() {
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
         packet.handleMessage(createArray(20, 5.toByte()))
-        Assert.assertEquals(5, danaRPump.lcdOnTimeSec)
+        Assert.assertEquals(5, danaPump.lcdOnTimeSec)
         Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("OPTION__GET_USER_OPTION", packet.friendlyName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
index ab0238d448..043fd13178 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_OptionTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Option_Set_User_OptionTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Option_Set_User_Option) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -23,7 +23,7 @@ class DanaRS_Packet_Option_Set_User_OptionTest : DanaRSTestBase() {
         val packet = DanaRS_Packet_Option_Set_User_Option(packetInjector)
         // test params
         val params = packet.requestParams
-        Assert.assertEquals((danaRPump.lcdOnTimeSec and 0xff).toByte(), params[3])
+        Assert.assertEquals((danaPump.lcdOnTimeSec and 0xff).toByte(), params[3])
         // test message decoding
         packet.handleMessage(createArray(3, 0.toByte()))
         Assert.assertEquals(false, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
index 615ed0da72..9c04fdf0c1 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_RatioTest.kt
@@ -14,7 +14,7 @@ class DanaRS_Packet_Review_Get_Pump_Dec_RatioTest : DanaRSTestBase() {
         AndroidInjector {
             if (it is DanaRS_Packet_Review_Get_Pump_Dec_Ratio) {
                 it.aapsLogger = aapsLogger
-                it.danaRPump = danaRPump
+                it.danaPump = danaPump
             }
         }
     }
@@ -25,7 +25,7 @@ class DanaRS_Packet_Review_Get_Pump_Dec_RatioTest : DanaRSTestBase() {
         val array = ByteArray(100)
         putByteToArray(array, 0, 4.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(20, danaRPump.decRatio)
+        Assert.assertEquals(20, danaPump.decRatio)
         Assert.assertEquals("REVIEW__GET_PUMP_DEC_RATIO", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 0f229116de..e4f2e86bbd 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
@@ -63,7 +63,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var uploadQueue: UploadQueue
 
     private var buildHelper = BuildHelper(Config())
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     lateinit var constraintChecker: ConstraintChecker
     private lateinit var safetyPlugin: SafetyPlugin
@@ -113,12 +113,12 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         constraintChecker = ConstraintChecker(activePlugin)
 
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
+        danaPump = DanaPump(aapsLogger, sp, injector)
         hardLimits = HardLimits(aapsLogger, rxBus, sp, resourceHelper, context, nsUpload)
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaRPump, dateUtil, fabricPrivacy)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
@@ -221,7 +221,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         // DanaR, RS
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
 
         // Insight
 //        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
@@ -248,7 +248,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         // DanaR, RS
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
 
         // Insight
 //        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
@@ -277,7 +277,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         // DanaR, RS
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBolus = 6.0
+        danaPump.maxBolus = 6.0
 
         // Insight
 //        insightPlugin.setPluginEnabled(PluginType.PUMP, true);
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
index 86f6e01c2a..7c46aa7f41 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/DanaRPluginTest.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -31,7 +31,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     private lateinit var danaRPlugin: DanaRPlugin
 
@@ -45,15 +45,15 @@ class DanaRPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaRPump, dateUtil, fabricPrivacy)
+        danaPump = info.nightscout.androidaps.dana.DanaPump(aapsLogger, sp, injector)
+        danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
     }
 
     @Test @Throws(Exception::class)
     fun basalRateShouldBeLimited() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHBASALRATE)
         danaRPlugin.applyBasalConstraints(c, validProfile)
         Assert.assertEquals(0.8, c.value(), 0.01)
@@ -65,7 +65,7 @@ class DanaRPluginTest : TestBaseWithProfile() {
     fun percentBasalRateShouldBeLimited() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
         danaRPlugin.applyBasalPercentConstraints(c, validProfile)
         Assert.assertEquals(200, c.value())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index c632b3eec0..44da056f3c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.interfaces.TreatmentsInterface
 import info.nightscout.androidaps.utils.DateUtil
@@ -40,7 +40,7 @@ open class DanaRTestBase : TestBase() {
         }
     }
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     fun createArray(length: Int, fillWith: Byte): ByteArray {
         val ret = ByteArray(length)
@@ -71,6 +71,6 @@ open class DanaRTestBase : TestBase() {
 
     @Before
     fun setup() {
-        danaRPump = info.nightscout.androidaps.dana.DanaRPump(aapsLogger, sp, injector)
+        danaPump = info.nightscout.androidaps.dana.DanaPump(aapsLogger, sp, injector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index bea0bc17e5..9aa7f2dad3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -39,7 +39,7 @@ class MessageHashTableRTest : DanaRTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, databaseHelper, dateUtil)
+        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, databaseHelper, dateUtil)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index dee4524a10..a6b6f246d9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -23,14 +23,14 @@ class MsgBolusProgressTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
-        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
-        danaRPump.bolusAmountToBeDelivered = 3.0
-        val packet = MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump)
+        danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
+        danaPump.bolusAmountToBeDelivered = 3.0
+        val packet = MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump)
 
         // test message decoding
         val array = ByteArray(100)
         putIntToArray(array, 0, 2 * 100)
         packet.handleMessage(array)
-        Assert.assertEquals(1.0, danaRPump.bolusingTreatment?.insulin!!, 0.0)
+        Assert.assertEquals(1.0, danaPump.bolusingTreatment?.insulin!!, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
index 8494fa1106..e5693f33a2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -19,7 +19,7 @@ class MsgBolusStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 1.0)
+        val packet = MsgBolusStart(aapsLogger, constraintChecker, danaPump, 1.0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index 3b43441b0a..bd4f6ca35c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -19,7 +19,7 @@ class MsgBolusStartWithSpeedTest : DanaRTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0)
+        val packet = MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 7f4f1c24e7..45281f2797 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -22,11 +22,11 @@ class MsgBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
-        danaRPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
-        val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump)
+        danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
+        val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump)
 
         // test message decoding
         packet.handleMessage(ByteArray(100))
-        Assert.assertEquals(true, danaRPump.bolusStopped)
+        Assert.assertEquals(true, danaPump.bolusStopped)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index 42a4a6ba59..3faa03b87e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -14,12 +14,12 @@ class MsgCheckValueTest : DanaRTestBase() {
     @Mock lateinit var danaRPlugin: DanaRPlugin
 
     @Test fun runTest() {
-        val packet = MsgCheckValue(aapsLogger, danaRPump, danaRPlugin)
+        val packet = MsgCheckValue(aapsLogger, danaPump, danaRPlugin)
 
         // test message decoding
         val array = ByteArray(100)
-        putByteToArray(array, 0, info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL.toByte())
+        putByteToArray(array, 0, info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index 37dcc2bb21..4ccc113fa4 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -22,7 +22,7 @@ class MsgErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
         PowerMockito.mockStatic(NSUpload::class.java)
-        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload)
+        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
index d4509345db..e9cb529359 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -10,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryAllDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryAllDone(aapsLogger, danaRPump)
+        val packet = MsgHistoryAllDone(aapsLogger, danaPump)
 
         // test message decoding
         packet.handleMessage(ByteArray(0))
-        Assert.assertEquals(true, danaRPump.historyDoneReceived)
+        Assert.assertEquals(true, danaPump.historyDoneReceived)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
index ee77380db4..50fa9b5b1d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDone(aapsLogger, danaRPump)
+        val packet = MsgHistoryDone(aapsLogger, danaPump)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
index 5f9f4a9896..3f350d3cb2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNewDone(aapsLogger, danaRPump)
+        val packet = MsgHistoryNewDone(aapsLogger, danaPump)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
index 4e3294ca69..070205489a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -10,13 +10,13 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgInitConnStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBasic(aapsLogger, danaRPump)
+        val packet = MsgInitConnStatusBasic(aapsLogger, danaPump)
 
         // test message decoding
         val array = ByteArray(100)
 
         putByteToArray(array, 0, 1)
         packet.handleMessage(array)
-        Assert.assertEquals(true, danaRPump.pumpSuspended)
+        Assert.assertEquals(true, danaPump.pumpSuspended)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
index 6e0e2718e4..8a4b42d3c9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -15,7 +15,7 @@ class MsgInitConnStatusBolusTest : DanaRTestBase() {
     @Mock lateinit var resourceHelper: ResourceHelper
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump)
+        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaPump)
 
         // test message decoding
         var array = ByteArray(100)
@@ -26,6 +26,6 @@ class MsgInitConnStatusBolusTest : DanaRTestBase() {
         array = ByteArray(20)
         putByteToArray(array, 0, 1)
         packet.handleMessage(array)
-        Assert.assertEquals(true, danaRPump.isExtendedBolusEnabled)
+        Assert.assertEquals(true, danaPump.isExtendedBolusEnabled)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
index a6364df74f..fc236fa9a7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -23,13 +23,13 @@ class MsgInitConnStatusOptionTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(activePlugin.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
-        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, activePlugin)
+        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, activePlugin)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
         Assert.assertEquals(true, packet.failed)
         // message smaller than 21
         packet.handleMessage(createArray(22, 1.toByte()))
-        Assert.assertEquals(false, danaRPump.isPasswordOK)
+        Assert.assertEquals(false, danaPump.isPasswordOK)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index ad33c1e690..813c8fa940 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -25,7 +25,7 @@ class MsgInitConnStatusTimeTest : DanaRTestBase() {
     @Mock lateinit var commandQueue: CommandQueueProvider
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil)
+        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
index f62d73b85e..69f814faf7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetUserOptions(aapsLogger, danaRPump)
+        val packet = MsgSetUserOptions(aapsLogger, danaPump)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
index 7978729ba6..56f7e96971 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingActiveProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingActiveProfile(aapsLogger, danaRPump)
+        val packet = MsgSettingActiveProfile(aapsLogger, danaPump)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaRPump.activeProfile)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaPump.activeProfile)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
index 015419579a..eddf05406e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingBasalProfileAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingBasalProfileAll(aapsLogger, danaRPump)
+        val packet = MsgSettingBasalProfileAll(aapsLogger, danaPump)
 
         // test message decoding
         packet.handleMessage(createArray(400, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
index dad9c144f5..dadb640d2d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -20,11 +20,11 @@ class MsgSettingBasalTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(danaRPlugin.getPumpDescription()).thenReturn(PumpDescription())
-        val packet = MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin)
+        val packet = MsgSettingBasal(aapsLogger, danaPump, danaRPlugin)
 
         // test message decoding
         packet.handleMessage(createArray(100, 1.toByte()))
         val expected = MessageBase.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
-        Assert.assertEquals(expected.toDouble() / 100.0, danaRPump.pumpProfiles!![danaRPump.activeProfile][1], 0.0)
+        Assert.assertEquals(expected.toDouble() / 100.0, danaPump.pumpProfiles!![danaPump.activeProfile][1], 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
index 498801d889..c69532df2d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -10,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingGlucose(aapsLogger, danaRPump)
+        val packet = MsgSettingGlucose(aapsLogger, danaPump)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(1, danaRPump.units)
+        Assert.assertEquals(1, danaPump.units)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
index 000bfa56ea..3d0ab552c0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingMaxValuesTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingMaxValues(aapsLogger, danaRPump)
+        val packet = MsgSettingMaxValues(aapsLogger, danaPump)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaRPump.maxBolus, 0.0)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaPump.maxBolus, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
index 949af62d60..9e3387d2ed 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -22,10 +22,10 @@ class MsgSettingMealTest : DanaRTestBase() {
     @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
 
     @Test fun runTest() {
-        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRKoreanPlugin)
+        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRKoreanPlugin)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaRPump.bolusStep, 0.0)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaPump.bolusStep, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index 01457d0669..dd574c4200 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll
 import org.junit.Assert
@@ -12,11 +11,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaRPump)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaPump)
+        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.morningCIR)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.morningCIR)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index 31c34db6ec..8e56b1defb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios
 import org.junit.Assert
@@ -12,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatios(aapsLogger, danaRPump)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatios(aapsLogger, danaPump)
+        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 57525da3bb..81f6f33b35 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime
 import org.junit.Assert
@@ -13,8 +12,8 @@ import java.util.*
 class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        val packet = MsgSettingPumpTime(aapsLogger, danaPump, dateUtil)
+        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
         // test message decoding
         val bytes = createArray(34, 7.toByte())
         val time = Date(
@@ -26,6 +25,6 @@ class MsgSettingPumpTimeTest : DanaRTestBase() {
             MessageBase.intFromBuff(bytes, 0, 1)
         ).time
         packet.handleMessage(bytes)
-        Assert.assertEquals(time, danaRPump.pumpTime)
+        Assert.assertEquals(time, danaPump.pumpTime)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index ef1a7402e1..200f6801c5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo
 import org.junit.Assert
@@ -12,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingShippingInfoTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingShippingInfo(aapsLogger, danaRPump)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        val packet = MsgSettingShippingInfo(aapsLogger, danaPump)
+        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaRPump.serialNumber)
+        Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaPump.serialNumber)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index 3c73bab86e..6b77343b60 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingUserOptions
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingUserOptions(aapsLogger, danaRPump)
-        danaRPump.units = DanaRPump.UNITS_MGDL
+        val packet = MsgSettingUserOptions(aapsLogger, danaPump)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(48, 7.toByte()))
-        Assert.assertEquals(7, danaRPump.lcdOnTimeSec)
+        Assert.assertEquals(7, danaPump.lcdOnTimeSec)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
index eba8672e28..e140a22205 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -11,9 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusBasic(aapsLogger, danaRPump)
+        val packet = MsgStatusBasic(aapsLogger, danaPump)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index bd12040a0c..4bda015615 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -19,11 +19,11 @@ class MsgStatusBolusExtendedTest : DanaRTestBase() {
     @Test
     fun runTest() {
         `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil)
+        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1)
         packet.handleMessage(array)
-        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+        Assert.assertEquals(true, danaPump.isExtendedInProgress)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index bbe5068aa7..df34e11c0f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgStatusProfile
 import org.junit.Assert
@@ -12,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusProfile(aapsLogger, danaRPump)
-        danaRPump.units = info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL
+        val packet = MsgStatusProfile(aapsLogger, danaPump)
+        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
index ae613c4685..e08bbeab66 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -21,13 +21,13 @@ class MsgStatusTempBasalTest : DanaRTestBase() {
 
     @Test fun runTest() {
         `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector)
+        val packet = MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector)
         // test message decoding
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        Assert.assertEquals(true, danaPump.isTempBasalInProgress)
         // passing an bigger number
         packet.handleMessage(createArray(34, 2.toByte()))
-        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+        Assert.assertEquals(false, danaPump.isTempBasalInProgress)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
index 9ef8ff10ce..9f86f604b3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -11,9 +11,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatus(aapsLogger, danaRPump)
+        val packet = MsgStatus(aapsLogger, danaPump)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
index 06c9376188..f5e463523a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/DanaRKoreanPluginTest.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -31,7 +31,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     @Mock lateinit var sp: SP
     @Mock lateinit var commandQueue: CommandQueueProvider
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     private lateinit var danaRPlugin: DanaRKoreanPlugin
 
@@ -45,15 +45,15 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
-        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaRPump, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, dateUtil, fabricPrivacy)
+        danaPump = DanaPump(aapsLogger, sp, injector)
+        danaRPlugin = DanaRKoreanPlugin(injector, aapsLogger, rxBus, danaPump, context, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, dateUtil, fabricPrivacy)
     }
 
     @Test @Throws(Exception::class)
     fun basalRateShouldBeLimited() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHBASALRATE)
         danaRPlugin.applyBasalConstraints(c, validProfile)
         Assert.assertEquals(0.8, c.value(), 0.01)
@@ -65,7 +65,7 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() {
     fun percentBasalRateShouldBeLimited() {
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
         danaRPlugin.applyBasalPercentConstraints(c, validProfile)
         Assert.assertEquals(200, c.value())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 28618f8281..3703dc4c3d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -36,7 +36,7 @@ class MessageHashTableRKoreanTest : DanaRSTestBase() {
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, databaseHelper, injector)
+        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, databaseHelper, injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index 371df0b44c..d33e3d565c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -39,7 +39,7 @@ class DanaRSPluginTest : DanaRSTestBase() {
     fun basalRateShouldBeLimited() {
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHBASALRATE)
         danaRSPlugin.applyBasalConstraints(c, validProfile)
         Assert.assertEquals(java.lang.Double.valueOf(0.8), c.value(), 0.0001)
@@ -51,7 +51,7 @@ class DanaRSPluginTest : DanaRSTestBase() {
     fun percentBasalRateShouldBeLimited() {
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
         danaRSPlugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
         danaRSPlugin.applyBasalPercentConstraints(c, validProfile)
         Assert.assertEquals(200, c.value())
@@ -65,6 +65,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaRPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
index dd1f284a63..ec4bee9761 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/DanaRv2PluginTest.kt
@@ -6,7 +6,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
@@ -31,7 +31,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     @Mock lateinit var commandQueue: CommandQueueProvider
     @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
 
-    lateinit var danaRPump: DanaRPump
+    lateinit var danaPump: DanaPump
 
     private lateinit var danaRv2Plugin: DanaRv2Plugin
 
@@ -45,15 +45,15 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.pumplimit)).thenReturn("pump limit")
         `when`(resourceHelper.gs(R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s")
         `when`(resourceHelper.gs(R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s")
-        danaRPump = DanaRPump(aapsLogger, sp, injector)
-        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaRPump, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, detailedBolusInfoStorage, dateUtil, fabricPrivacy)
+        danaPump = DanaPump(aapsLogger, sp, injector)
+        danaRv2Plugin = DanaRv2Plugin(injector, aapsLogger, rxBus, context, danaPump, resourceHelper, constraintChecker, activePluginProvider, sp, commandQueue, detailedBolusInfoStorage, dateUtil, fabricPrivacy)
     }
 
     @Test
     fun basalRateShouldBeLimited() {
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHBASALRATE)
         danaRv2Plugin.applyBasalConstraints(c, validProfile)
         org.junit.Assert.assertEquals(0.8, c.value(), 0.01)
@@ -65,7 +65,7 @@ class DanaRv2PluginTest : TestBaseWithProfile() {
     fun percentBasalRateShouldBeLimited() {
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
         danaRv2Plugin.setPluginEnabled(PluginType.PUMP, true)
-        danaRPump.maxBasal = 0.8
+        danaPump.maxBasal = 0.8
         val c = Constraint(Constants.REALLYHIGHPERCENTBASALRATE)
         danaRv2Plugin.applyBasalPercentConstraints(c, validProfile)
         org.junit.Assert.assertEquals(200, c.value())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index 53c454780d..096e20e2bc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -48,8 +48,8 @@ class MessageHashTable_rv2Test : DanaRTestBase() {
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, nsUpload, injector, DateUtil(context, resourceHelper), databaseHelper)
-        val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaRPump)
+        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, nsUpload, injector, DateUtil(context, resourceHelper), databaseHelper)
+        val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaPump)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
         // try putting another command
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index 0c6c105342..3d1af1fa52 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -30,9 +30,9 @@ class MsgCheckValue_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
+        val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL, danaRPump.hwModel)
+        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
index 268e8721c3..9f3685644c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -12,12 +12,12 @@ class MsgStatusAPS_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2(aapsLogger, danaRPump)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2(aapsLogger, danaPump)
         // test iob
         //TODO Find a way to mock treatments plugin
         val testArray = createArray(34, 7.toByte())
         val iob = MessageBase.intFromBuff(testArray, 0, 2) / 100.0
         packet.handleMessage(testArray)
-        Assert.assertEquals(iob, danaRPump.iob, 0.0)
+        Assert.assertEquals(iob, danaPump.iob, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
index 6a30acd7e4..ba93f8e707 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -12,9 +12,9 @@ class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2(aapsLogger, danaRPump)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2(aapsLogger, danaPump)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaRPump.extendedBolusAmount, 0.0)
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaPump.extendedBolusAmount, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
index a1cb55b1e2..7843fbb85c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -10,12 +10,12 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTempBasal_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil)
+        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil)
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        Assert.assertEquals(true, danaPump.isTempBasalInProgress)
         // passing an bigger number
         packet.handleMessage(createArray(34, 2.toByte()))
-        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+        Assert.assertEquals(false, danaPump.isTempBasalInProgress)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index da70f73124..5208898ddc 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -161,27 +161,27 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_date = new TextView(this);
-        label_date.setText(resourceHelper.gs(R.string.danar_stats_date));
+        label_date.setText(resourceHelper.gs(R.string.date));
         label_date.setTextColor(Color.WHITE);
         tr_head.addView(label_date);
 
         TextView label_basalrate = new TextView(this);
-        label_basalrate.setText(resourceHelper.gs(R.string.danar_stats_basalrate));
+        label_basalrate.setText(resourceHelper.gs(R.string.basalrate));
         label_basalrate.setTextColor(Color.WHITE);
         tr_head.addView(label_basalrate);
 
         TextView label_bolus = new TextView(this);
-        label_bolus.setText(resourceHelper.gs(R.string.danar_stats_bolus));
+        label_bolus.setText(resourceHelper.gs(R.string.bolus));
         label_bolus.setTextColor(Color.WHITE);
         tr_head.addView(label_bolus);
 
         TextView label_tdd = new TextView(this);
-        label_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
+        label_tdd.setText(resourceHelper.gs(R.string.tdd));
         label_tdd.setTextColor(Color.WHITE);
         tr_head.addView(label_tdd);
 
         TextView label_ratio = new TextView(this);
-        label_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
+        label_ratio.setText(resourceHelper.gs(R.string.ratio));
         label_ratio.setTextColor(Color.WHITE);
         tr_head.addView(label_ratio);
 
@@ -199,17 +199,17 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_cum_amount_days = new TextView(this);
-        label_cum_amount_days.setText(resourceHelper.gs(R.string.danar_stats_amount_days));
+        label_cum_amount_days.setText(resourceHelper.gs(R.string.amount_days));
         label_cum_amount_days.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_amount_days);
 
         TextView label_cum_tdd = new TextView(this);
-        label_cum_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
+        label_cum_tdd.setText(resourceHelper.gs(R.string.tdd));
         label_cum_tdd.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_tdd);
 
         TextView label_cum_ratio = new TextView(this);
-        label_cum_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
+        label_cum_ratio.setText(resourceHelper.gs(R.string.ratio));
         label_cum_ratio.setTextColor(Color.WHITE);
         ctr_head.addView(label_cum_ratio);
 
@@ -227,17 +227,17 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 TableLayout.LayoutParams.WRAP_CONTENT));
 
         TextView label_exp_weight = new TextView(this);
-        label_exp_weight.setText(resourceHelper.gs(R.string.danar_stats_weight));
+        label_exp_weight.setText(resourceHelper.gs(R.string.weight));
         label_exp_weight.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_weight);
 
         TextView label_exp_tdd = new TextView(this);
-        label_exp_tdd.setText(resourceHelper.gs(R.string.danar_stats_tdd));
+        label_exp_tdd.setText(resourceHelper.gs(R.string.tdd));
         label_exp_tdd.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_tdd);
 
         TextView label_exp_ratio = new TextView(this);
-        label_exp_ratio.setText(resourceHelper.gs(R.string.danar_stats_ratio));
+        label_exp_ratio.setText(resourceHelper.gs(R.string.ratio));
         label_exp_ratio.setTextColor(Color.WHITE);
         etr_head.addView(label_exp_ratio);
 
@@ -251,7 +251,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
                 reloadButton.setVisibility(View.GONE);
                 statusView.setVisibility(View.VISIBLE);
                 statsMessage.setVisibility(View.VISIBLE);
-                statsMessage.setText(resourceHelper.gs(R.string.danar_stats_warning_Message));
+                statsMessage.setText(resourceHelper.gs(R.string.warning_Message));
             });
             commandQueue.loadTDDs(new Callback() {
                 @Override
@@ -439,7 +439,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
 
             if (isOldData(historyList) && activePlugin.getActivePump().getPumpDescription().needsManualTDDLoad) {
                 statsMessage.setVisibility(View.VISIBLE);
-                statsMessage.setText(resourceHelper.gs(R.string.danar_stats_olddata_Message));
+                statsMessage.setText(resourceHelper.gs(R.string.olddata_Message));
 
             } else {
                 tl.setBackgroundColor(Color.TRANSPARENT);
diff --git a/core/src/main/java/info/nightscout/androidaps/core/di/CoreDataClassesModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreDataClassesModule.kt
new file mode 100644
index 0000000000..d17e1d0168
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreDataClassesModule.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.core.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.db.*
+import info.nightscout.androidaps.interfaces.ProfileStore
+import info.nightscout.androidaps.plugins.aps.loop.APSResult
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData
+
+@Module
+@Suppress("unused")
+abstract class CoreDataClassesModule {
+
+    @ContributesAndroidInjector abstract fun pumpEnactResultInjector(): PumpEnactResult
+    @ContributesAndroidInjector abstract fun apsResultInjector(): APSResult
+    @ContributesAndroidInjector abstract fun autosensDataInjector(): AutosensData
+
+    @ContributesAndroidInjector abstract fun profileInjector(): Profile
+    @ContributesAndroidInjector abstract fun profileStoreInjector(): ProfileStore
+    @ContributesAndroidInjector abstract fun bgReadingInjector(): BgReading
+    @ContributesAndroidInjector abstract fun treatmentInjector(): Treatment
+    @ContributesAndroidInjector abstract fun profileSwitchInjector(): ProfileSwitch
+    @ContributesAndroidInjector abstract fun temporaryBasalInjector(): TemporaryBasal
+    @ContributesAndroidInjector abstract fun careportalEventInjector(): CareportalEvent
+    @ContributesAndroidInjector abstract fun extendedBolusInjector(): ExtendedBolus
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
new file mode 100644
index 0000000000..51a308697b
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.core.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.dialogs.ErrorDialog
+
+@Module
+@Suppress("unused")
+abstract class CoreFragmentsModule {
+
+    @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
+
+    @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
+    @ContributesAndroidInjector abstract fun contributesErrorDialog(): ErrorDialog
+
+}
diff --git a/core/src/main/java/info/nightscout/androidaps/core/dependencyInjection/CoreModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreModule.kt
similarity index 55%
rename from core/src/main/java/info/nightscout/androidaps/core/dependencyInjection/CoreModule.kt
rename to core/src/main/java/info/nightscout/androidaps/core/di/CoreModule.kt
index 19e64742fc..013e0459c2 100644
--- a/core/src/main/java/info/nightscout/androidaps/core/dependencyInjection/CoreModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreModule.kt
@@ -1,21 +1,36 @@
-package info.nightscout.androidaps.core.dependencyInjection
+package info.nightscout.androidaps.core.di
 
 import android.content.Context
 import android.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.AAPSLoggerProduction
 import info.nightscout.androidaps.logging.L
+import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelperImplementation
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import info.nightscout.androidaps.utils.sharedPreferences.SPImplementation
 import javax.inject.Singleton
 
-@Module
+@Module(includes = [
+    CoreReceiversModule::class,
+    CoreFragmentsModule::class,
+    CoreDataClassesModule::class
+])
 open class CoreModule {
 
+    @Provides
+    @Singleton
+    fun provideProfileFunction(injector: HasAndroidInjector, aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePluginProvider, fabricPrivacy: FabricPrivacy): ProfileFunction {
+        return ProfileFunctionImplementation(injector, aapsLogger, sp, resourceHelper, activePlugin, fabricPrivacy)
+    }
+
     @Provides
     @Singleton
     fun provideResources(context: Context): ResourceHelper = ResourceHelperImplementation(context)
diff --git a/core/src/main/java/info/nightscout/androidaps/core/di/CoreReceiversModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreReceiversModule.kt
new file mode 100644
index 0000000000..a4284c6c0b
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreReceiversModule.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.core.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.receivers.NetworkChangeReceiver
+
+@Module
+abstract class CoreReceiversModule {
+
+    @ContributesAndroidInjector abstract fun contributesNetworkChangeReceiver(): NetworkChangeReceiver
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
index 497ec61fbc..6af48de667 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
@@ -27,7 +27,7 @@ class BlePreCheck @Inject constructor(
 
     fun prerequisitesCheck(activity: AppCompatActivity): Boolean {
         if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-            OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
+            OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.ble_not_supported))
             return false
         } else {
             // Use this check to determine whether BLE is supported on the device. Then
@@ -41,7 +41,7 @@ class BlePreCheck @Inject constructor(
             // Ensures Bluetooth is available on the device and it is enabled. If not,
             // displays a dialog requesting user permission to enable Bluetooth.
             if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled) {
-                OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.rileylink_scanner_ble_not_enabled))
+                OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.ble_not_enabled))
                 return false
             } else {
                 // Will request that GPS be enabled for devices running Marshmallow or newer.
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
index b52e1a1290..93e705c1a4 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.java
@@ -369,7 +369,7 @@ public enum PumpType {
         DoseSettings eb = getExtendedBolusSettings();
         DoseSettings tbr = getTbrSettings();
 
-        String extendedNote = hasExtendedBasals ? resourceHelper.gs(R.string.virtualpump_pump_def_extended_note) : "";
+        String extendedNote = hasExtendedBasals ? resourceHelper.gs(R.string.def_extended_note) : "";
 
         return String.format(i18nTemplate, //
                 getStep("" + getBolusSize(), getSpecialBolusSize()), //
diff --git a/core/src/main/res/layout/danar_statsactivity.xml b/core/src/main/res/layout/danar_statsactivity.xml
index d26170b128..3b19dcc30d 100644
--- a/core/src/main/res/layout/danar_statsactivity.xml
+++ b/core/src/main/res/layout/danar_statsactivity.xml
@@ -23,7 +23,7 @@
                 android:gravity="center_horizontal"
                 android:textColor="@color/mdtp_white"
                 android:background="@drawable/pillborder"
-                android:text="@string/danar_stats_tdd" />
+                android:text="@string/tdd" />
 
             <TableLayout
                 android:stretchColumns="0,1,2,3,4"
@@ -54,7 +54,7 @@
                         android:textColor="@color/mdtp_white"
                         android:background="@drawable/pillborder"
                         android:gravity="center_horizontal"
-                        android:text="@string/danar_stats_cumulative_tdd" />
+                        android:text="@string/cumulative_tdd" />
 
                     <TableLayout
                         android:stretchColumns="0,1,2"
@@ -83,7 +83,7 @@
                         android:gravity="center_horizontal"
                         android:textColor="@color/mdtp_white"
                         android:background="@drawable/pillborder"
-                        android:text="@string/danar_stats_expweight" />
+                        android:text="@string/expweight" />
 
                     <TableLayout
                         android:stretchColumns="0,1,2"
@@ -103,7 +103,7 @@
                         android:layout_height="match_parent">
 
                         <TextView
-                            android:text="@string/danar_stats_tbb"
+                            android:text="@string/tbb"
                             android:labelFor="@+id/danar_stats_editTotalBaseBasal"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                         android:layout_height="match_parent">
 
                         <TextView
-                            android:text="@string/danar_stats_tbb2"
+                            android:text="@string/tbb2"
                             android:labelFor="@+id/danar_stats_editTotalBaseBasal2"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -182,7 +182,7 @@
                 android:background="@drawable/pillborder"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:text="@string/danar_stats_warning_Message" />
+                android:text="@string/warning_Message" />
 
             <Space
                 android:layout_width="match_parent"
diff --git a/core/src/main/res/layout/dialog_bolusprogress.xml b/core/src/main/res/layout/dialog_bolusprogress.xml
index ccf02258f9..d6a2527288 100644
--- a/core/src/main/res/layout/dialog_bolusprogress.xml
+++ b/core/src/main/res/layout/dialog_bolusprogress.xml
@@ -54,7 +54,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
-        android:text="@string/overview_bolusprogress_stoppressed"
+        android:text="@string/stoppressed"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="#fd0101"
         android:textStyle="bold"
@@ -78,6 +78,6 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="30dp"
         android:layout_marginBottom="20dp"
-        android:text="@string/overview_bolusprogress_stop" />
+        android:text="@string/stop" />
 
 </LinearLayout>
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index d39364279e..9434d828f0 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -127,7 +127,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_units_label"
+                android:text="@string/units_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -172,7 +172,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_dia_label"
+                android:text="@string/dia_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -217,7 +217,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_ic_label"
+                android:text="@string/ic_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -262,7 +262,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_isf_label"
+                android:text="@string/isf_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -307,7 +307,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_basal_label"
+                android:text="@string/basal_label"
                 android:textSize="14sp" />
 
             <TextView
@@ -394,7 +394,7 @@
                 android:layout_weight="2"
                 android:gravity="end"
                 android:layout_marginEnd="5dp"
-                android:text="@string/nsprofileview_target_label"
+                android:text="@string/target_label"
                 android:textSize="14sp" />
 
             <TextView
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index df08a3f162..49248758d9 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -55,31 +55,31 @@
     <string name="please_wait">Please wait…</string>
     <string name="mute">Mute</string>
     <string name="reload">Reload</string>
-    <string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
+    <string name="stoppressed">STOP PRESSED</string>
+    <string name="stop">Stop</string>
     <string name="carbs">Carbs</string>
     <string name="invalidprofile">Invalid profile !!!</string>
     <string name="noprofileset">NO PROFILE SET</string>
     <string name="date">Date</string>
-    <string name="nsprofileview_units_label">Units</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Target</string>
+    <string name="units_label">Units</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Target</string>
     <string name="initializing">Initializing ...</string>
     <string name="serialnumber">Serial number</string>
-    <string name="pump_battery_label">Battery</string>
-    <string name="pump_lastconnection_label">Last connection</string>
-    <string name="pump_lastbolus_label">Last bolus</string>
-    <string name="danar_dailyunits">Daily units</string>
-    <string name="pump_basebasalrate_label">Base basal rate</string>
-    <string name="pump_tempbasal_label">Temp basal</string>
+    <string name="battery_label">Battery</string>
+    <string name="lastconnection_label">Last connection</string>
+    <string name="lastbolus_label">Last bolus</string>
+    <string name="dailyunits">Daily units</string>
+    <string name="basebasalrate_label">Base basal rate</string>
+    <string name="tempbasal_label">Temp basal</string>
     <string name="virtualpump_extendedbolus_label">Extended bolus</string>
-    <string name="pump_reservoir_label">Reservoir</string>
-    <string name="danar_history">Pump history</string>
-    <string name="danar_viewprofile">View profile</string>
-    <string name="careportal_newnstreatment_eventtype">Event type</string>
+    <string name="reservoir_label">Reservoir</string>
+    <string name="pumphistory">Pump history</string>
+    <string name="viewprofile">View profile</string>
+    <string name="eventtype">Event type</string>
     <string name="mgdl">mg/dl</string>
     <string name="mmol">mmol/l</string>
     <string name="advancedsettings_title">Advanced Settings</string>
@@ -103,8 +103,8 @@
     <string name="dismiss">DISMISS</string>
 
     <!--    BlePreCheck-->
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy not supported.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth not enabled.</string>
+    <string name="ble_not_supported">Bluetooth Low Energy not supported.</string>
+    <string name="ble_not_enabled">Bluetooth not enabled.</string>
     <string name="location_not_found_title">Location Is Not Enabled</string>
     <string name="location_not_found_message">For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful.</string>
 
@@ -139,7 +139,7 @@
     <string name="noprofileselected">No profile selected</string>
 
     <!--    PumpType-->
-    <string name="virtualpump_pump_def_extended_note">* Only discrete values no ranges are supported as granularity for basal/bolus in virtual pump.</string>
+    <string name="def_extended_note">* Only discrete values no ranges are supported as granularity for basal/bolus in virtual pump.</string>
 
     <!--    APSResult-->
     <string name="canceltemp">Cancel temp basal</string>
@@ -200,20 +200,19 @@
     <string name="smb_shortname">SMB</string>
 
     <!--    TDDStatsActivity-->
-    <string name="danar_stats">DanaR Stats</string>
-    <string name="danar_stats_cumulative_tdd">Cumulative TDD</string>
-    <string name="danar_stats_expweight">Exponentially Weighted TDD</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Date</string>
-    <string name="danar_stats_ratio">Ratio</string>
-    <string name="danar_stats_amount_days"># Days</string>
-    <string name="danar_stats_weight">Weight</string>
-    <string name="danar_stats_warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
-    <string name="danar_stats_olddata_Message">Old Data Please Press "RELOAD"</string>
-    <string name="danar_stats_tbb">Total Base Basal</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
+    <string name="stats">Stats</string>
+    <string name="cumulative_tdd">Cumulative TDD</string>
+    <string name="expweight">Exponentially Weighted TDD</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Ratio</string>
+    <string name="amount_days"># Days</string>
+    <string name="weight">Weight</string>
+    <string name="warning_Message">Possibly inaccurate if using boluses for priming/filling!</string>
+    <string name="olddata_Message">Old Data Please Press "RELOAD"</string>
+    <string name="tbb">Total Base Basal</string>
+    <string name="tbb2">TBB * 2</string>
 
     <!--    Ntp-->
     <string name="timedetection">Time detection</string>
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
similarity index 95%
rename from dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
index b71304dfaf..4585b80aa7 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaRFragment.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
@@ -8,7 +8,6 @@ import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.activities.TDDStatsActivity
-import info.nightscout.androidaps.dana.R
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventInitializationChanged
@@ -35,13 +34,13 @@ import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.danar_fragment.*
 import javax.inject.Inject
 
-class DanaRFragment : DaggerFragment() {
+class DanaFragment : DaggerFragment() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var sp: SP
     @Inject lateinit var warnColors: WarnColors
@@ -69,11 +68,11 @@ class DanaRFragment : DaggerFragment() {
 
         dana_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        danar_history.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaRHistoryActivity::class.java)) }
+        danar_history.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaHistoryActivity::class.java)) }
         danar_viewprofile.setOnClickListener {
-            val profile = danaRPump.createConvertedProfile()?.getDefaultProfile()
+            val profile = danaPump.createConvertedProfile()?.getDefaultProfile()
                 ?: return@setOnClickListener
-            val profileName = danaRPump.createConvertedProfile()?.getDefaultProfileName()
+            val profileName = danaPump.createConvertedProfile()?.getDefaultProfileName()
                 ?: return@setOnClickListener
             val args = Bundle()
             args.putLong("time", DateUtil.now())
@@ -86,10 +85,10 @@ class DanaRFragment : DaggerFragment() {
             pvd.show(childFragmentManager, "ProfileViewDialog")
         }
         danar_stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
-        danar_user_options.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity::class.java)) }
+        danar_user_options.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity::class.java)) }
         danar_btconnection.setOnClickListener {
             aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
-            danaRPump.lastConnection = 0
+            danaPump.lastConnection = 0
             commandQueue.readStatus("Clicked connect to pump", null)
         }
         if (activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRS)
@@ -163,7 +162,7 @@ class DanaRFragment : DaggerFragment() {
     @Synchronized
     fun updateGUI() {
         if (danar_dailyunits == null) return
-        val pump = danaRPump
+        val pump = danaPump
         val plugin: PumpInterface = activePlugin.activePump
         if (pump.lastConnection != 0L) {
             val agoMsec = System.currentTimeMillis() - pump.lastConnection
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
similarity index 99%
rename from dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index 519f713479..9d664faa06 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaRPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -19,7 +19,7 @@ import javax.inject.Singleton
  * Created by mike on 04.07.2016.
  */
 @Singleton
-class DanaRPump @Inject constructor(
+class DanaPump @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val sp: SP,
     private val injector: HasAndroidInjector
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
similarity index 99%
rename from dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index ef8d78b2f4..05dbba234c 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -37,7 +37,7 @@ import kotlinx.android.synthetic.main.danar_historyactivity.*
 import java.util.*
 import javax.inject.Inject
 
-class DanaRHistoryActivity : NoSplashAppCompatActivity() {
+class DanaHistoryActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var resourceHelper: ResourceHelper
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
similarity index 64%
rename from dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt
rename to dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
index 42f101283d..be38978236 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaRUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.dana.R
 import info.nightscout.androidaps.events.EventInitializationChanged
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -27,13 +27,13 @@ import javax.inject.Inject
 import kotlin.math.max
 import kotlin.math.min
 
-class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
+class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var context: Context
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var commandQueue: CommandQueueProvider
 
@@ -66,20 +66,20 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
         save_user_options.setOnClickListener { onSaveClick() }
 
         aapsLogger.debug(LTag.PUMP,
-            "UserOptionsLoaded:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
-                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
-                + "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
-                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
-                + "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
-                + "\nbackLight:" + danaRPump.backlightOnTimeSec
-                + "\npumpUnits:" + danaRPump.units
-                + "\nlowReservoir:" + danaRPump.lowReservoirRate)
+            "UserOptionsLoaded:" + (System.currentTimeMillis() - danaPump.lastConnection) / 1000 + " s ago"
+                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nbuttonScroll:" + danaPump.buttonScrollOnOff
+                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nlcdOnTimeSec:" + danaPump.lcdOnTimeSec
+                + "\nbackLight:" + danaPump.backlightOnTimeSec
+                + "\npumpUnits:" + danaPump.units
+                + "\nlowReservoir:" + danaPump.lowReservoirRate)
 
-        danar_screentimeout.setParams(danaRPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
-        danar_backlight.setParams(danaRPump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
-        danar_shutdown.setParams(danaRPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
-        danar_lowreservoir.setParams(danaRPump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
-        when (danaRPump.beepAndAlarm) {
+        danar_screentimeout.setParams(danaPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
+        danar_backlight.setParams(danaPump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
+        danar_shutdown.setParams(danaPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
+        danar_lowreservoir.setParams(danaPump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
+        when (danaPump.beepAndAlarm) {
             0x01  -> danar_pumpalarm_sound.isChecked = true
             0x02  -> danar_pumpalarm_vibrate.isChecked = true
             0x11  -> danar_pumpalarm_both.isChecked = true
@@ -99,20 +99,20 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
                 danar_beep.isChecked = true
             }
         }
-        if (danaRPump.lastSettingsRead == 0L)
+        if (danaPump.lastSettingsRead == 0L)
             aapsLogger.error(LTag.PUMP, "No settings loaded from pump!") else setData()
     }
 
     fun setData() {
         // in DanaRS timeDisplay values are reversed
-        danar_timeformat.isChecked = !isRS() && danaRPump.timeDisplayType != 0 || isRS() && danaRPump.timeDisplayType == 0
-        danar_buttonscroll.isChecked = danaRPump.buttonScrollOnOff != 0
-        danar_beep.isChecked = danaRPump.beepAndAlarm > 4
-        danar_screentimeout.value = danaRPump.lcdOnTimeSec.toDouble()
-        danar_backlight.value = danaRPump.backlightOnTimeSec.toDouble()
-        danar_units.isChecked = danaRPump.getUnits() == Constants.MMOL
-        danar_shutdown.value = danaRPump.shutdownHour.toDouble()
-        danar_lowreservoir.value = danaRPump.lowReservoirRate.toDouble()
+        danar_timeformat.isChecked = !isRS() && danaPump.timeDisplayType != 0 || isRS() && danaPump.timeDisplayType == 0
+        danar_buttonscroll.isChecked = danaPump.buttonScrollOnOff != 0
+        danar_beep.isChecked = danaPump.beepAndAlarm > 4
+        danar_screentimeout.value = danaPump.lcdOnTimeSec.toDouble()
+        danar_backlight.value = danaPump.backlightOnTimeSec.toDouble()
+        danar_units.isChecked = danaPump.getUnits() == Constants.MMOL
+        danar_shutdown.value = danaPump.shutdownHour.toDouble()
+        danar_lowreservoir.value = danaPump.lowReservoirRate.toDouble()
     }
 
     private fun onSaveClick() {
@@ -120,30 +120,30 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
         if (!isRS() && !isDanaR() && !isDanaRv2()) return
 
         if (isRS()) // displayTime on RS is reversed
-            danaRPump.timeDisplayType = if (danar_timeformat.isChecked) 0 else 1
+            danaPump.timeDisplayType = if (danar_timeformat.isChecked) 0 else 1
         else
-            danaRPump.timeDisplayType = if (danar_timeformat.isChecked) 1 else 0
+            danaPump.timeDisplayType = if (danar_timeformat.isChecked) 1 else 0
 
-        danaRPump.buttonScrollOnOff = if (danar_buttonscroll.isChecked) 1 else 0
-        danaRPump.beepAndAlarm = when {
+        danaPump.buttonScrollOnOff = if (danar_buttonscroll.isChecked) 1 else 0
+        danaPump.beepAndAlarm = when {
             danar_pumpalarm_sound.isChecked   -> 1
             danar_pumpalarm_vibrate.isChecked -> 2
             danar_pumpalarm_both.isChecked    -> 3
             else                              -> 1
         }
-        if (danar_beep.isChecked) danaRPump.beepAndAlarm += 4
+        if (danar_beep.isChecked) danaPump.beepAndAlarm += 4
 
         // step is 5 seconds, 5 to 240
-        danaRPump.lcdOnTimeSec = min(max(danar_screentimeout.value.toInt() / 5 * 5, 5), 240)
+        danaPump.lcdOnTimeSec = min(max(danar_screentimeout.value.toInt() / 5 * 5, 5), 240)
         // 1 to 60
-        danaRPump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), 1), 60)
+        danaPump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), 1), 60)
 
-        danaRPump.units = if (danar_units.isChecked) 1 else 0
+        danaPump.units = if (danar_units.isChecked) 1 else 0
 
-        danaRPump.shutdownHour = min(danar_shutdown.value.toInt(), 24)
+        danaPump.shutdownHour = min(danar_shutdown.value.toInt(), 24)
 
         // 10 to 50
-        danaRPump.lowReservoirRate = min(max(danar_lowreservoir.value.toInt() * 10 / 10, 10), 50)
+        danaPump.lowReservoirRate = min(max(danar_lowreservoir.value.toInt() * 10 / 10, 10), 50)
 
         commandQueue.setUserOptions(object : Callback() {
             override fun run() {
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt b/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt
new file mode 100644
index 0000000000..224838979b
--- /dev/null
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/di/DanaModule.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.dana.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.dana.DanaFragment
+import info.nightscout.androidaps.dana.activities.DanaHistoryActivity
+import info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity
+
+@Module
+@Suppress("unused")
+abstract class DanaModule {
+
+    @ContributesAndroidInjector abstract fun contributesDanaRFragment(): DanaFragment
+    @ContributesAndroidInjector abstract fun contributeDanaRHistoryActivity(): DanaHistoryActivity
+    @ContributesAndroidInjector abstract fun contributeDanaRUserOptionsActivity(): DanaUserOptionsActivity
+
+}
\ No newline at end of file
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index aa18472171..2720862609 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingTop="5dp"
-    tools:context="info.nightscout.androidaps.dana.DanaRFragment">
+    tools:context="info.nightscout.androidaps.dana.DanaFragment">
 
 
     <RelativeLayout
@@ -152,7 +152,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_battery_label"
+                        android:text="@string/battery_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -198,7 +198,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastconnection_label"
+                        android:text="@string/lastconnection_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -243,7 +243,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_lastbolus_label"
+                        android:text="@string/lastbolus_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -288,7 +288,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/danar_dailyunits"
+                        android:text="@string/dailyunits"
                         android:textSize="14sp" />
 
                     <TextView
@@ -333,7 +333,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_basebasalrate_label"
+                        android:text="@string/basebasalrate_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -378,7 +378,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_tempbasal_label"
+                        android:text="@string/tempbasal_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -468,7 +468,7 @@
                         android:layout_weight="1"
                         android:gravity="end"
                         android:paddingRight="5dp"
-                        android:text="@string/pump_reservoir_label"
+                        android:text="@string/reservoir_label"
                         android:textSize="14sp" />
 
                     <TextView
@@ -707,7 +707,7 @@
                     android:drawableTop="@drawable/icon_danarprofile"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_viewprofile" />
+                    android:text="@string/viewprofile" />
 
 
                 <Button
@@ -719,7 +719,7 @@
                     android:drawableTop="@drawable/icon_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_history" />
+                    android:text="@string/pumphistory" />
 
                 <Button
                     android:id="@+id/danar_stats"
@@ -730,7 +730,7 @@
                     android:drawableTop="@drawable/icon_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/danar_stats" />
+                    android:text="@string/stats" />
 
                 <Button
                     android:id="@+id/danar_user_options"
diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
index 8a54a3db38..5f723d56ed 100644
--- a/dana/src/main/res/layout/danar_historyactivity.xml
+++ b/dana/src/main/res/layout/danar_historyactivity.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    tools:context="info.nightscout.androidaps.dana.activities.DanaRHistoryActivity">
+    tools:context="info.nightscout.androidaps.dana.activities.DanaHistoryActivity">
 
 
     <RelativeLayout
@@ -19,7 +19,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/danar_history"
+            android:contentDescription="@string/pumphistory"
             android:src="@drawable/icon_danarhistory" />
 
         <TextView
@@ -29,7 +29,7 @@
             android:layout_gravity="center"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:text="@string/danar_history"
+            android:text="@string/pumphistory"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
             android:layout_marginEnd="20dp"
-            android:text="@string/careportal_newnstreatment_eventtype"
+            android:text="@string/eventtype"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <Spinner
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index ff1d1deb90..d9078576e7 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -5,7 +5,7 @@
     android:fillViewport="true"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    tools:context="info.nightscout.androidaps.dana.activities.DanaRUserOptionsActivity">
+    tools:context="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity">
 
 
     <LinearLayout
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
index d504b9a24a..1b77688dff 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
@@ -12,7 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
@@ -56,7 +56,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             HasAndroidInjector injector,
             AAPSLogger aapsLogger,
             RxBusWrapper rxBus,
-            DanaRPump danaRPump,
+            DanaPump danaPump,
             Context context,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
@@ -66,7 +66,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             DateUtil dateUtil,
             FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
+        super(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
@@ -145,7 +145,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0 && !danaRPump.isConfigUD() && !danaRPump.isEasyModeEnabled() && danaRPump.isExtendedBolusEnabled() && danaRPump.isPasswordOK();
+        return danaPump.getLastConnection() > 0 && danaPump.getMaxBasal() > 0 && !danaPump.isConfigUD() && !danaPump.isEasyModeEnabled() && danaPump.isExtendedBolusEnabled() && danaPump.isPasswordOK();
     }
 
     @Override
@@ -172,7 +172,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
+                result.comment = resourceHelper.gs(R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
@@ -294,16 +294,16 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             extendedRateToSet = Round.roundTo(extendedRateToSet, pumpDescription.extendedBolusStep * 2); // *2 because of halfhours
 
             // What is current rate of extended bolusing in u/h?
-            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaRPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaRPump.getExtendedBolusRemainingMinutes() + "min");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaPump.getExtendedBolusRemainingMinutes() + "min");
             aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
 
             // Compare with extended rate in progress
-            if (activeExtended != null && Math.abs(danaRPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
+            if (activeExtended != null && Math.abs(danaPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
                 // correct extended already set
                 result.success = true;
-                result.absolute = danaRPump.getExtendedBolusAbsoluteRate();
+                result.absolute = danaPump.getExtendedBolusAbsoluteRate();
                 result.enacted = false;
-                result.duration = danaRPump.getExtendedBolusRemainingMinutes();
+                result.duration = danaPump.getExtendedBolusRemainingMinutes();
                 result.isPercent = false;
                 result.isTempCancel = false;
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct extended already set");
@@ -357,7 +357,7 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!danaRPump.isTempBasalInProgress()) {
+        if (!danaPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
             result.comment = resourceHelper.gs(R.string.ok);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
index 2fff171f46..c5f46ff919 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.*
@@ -25,7 +25,7 @@ class MessageHashTableRKorean @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaPump: DanaPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     configBuilderPlugin: ConfigBuilderInterface,
@@ -40,23 +40,23 @@ class MessageHashTableRKorean @Inject constructor(
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic_k(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus_k(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic_k(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus_k(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
         put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
         put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
@@ -64,19 +64,19 @@ class MessageHashTableRKorean @Inject constructor(
         put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
         put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
         put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll_k(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll_k(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
         put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
         put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
         put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
     }
 
     override fun put(message: MessageBase) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 8cc5d40ae5..2161598069 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -8,7 +8,7 @@ import info.nightscout.androidaps.logging.LTag
 
 class MsgCheckValue_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 
 ) : MessageBase() {
@@ -19,17 +19,17 @@ class MsgCheckValue_k(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.isNewPump = true
+        danaPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
-        danaRPump.protocol = intFromBuff(bytes, 1, 1)
-        danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.DOMESTIC_MODEL) {
+        danaPump.hwModel = intFromBuff(bytes, 0, 1)
+        danaPump.protocol = intFromBuff(bytes, 1, 1)
+        danaPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaPump.hwModel != info.nightscout.androidaps.dana.DanaPump.DOMESTIC_MODEL) {
             danaRKoreanPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
-        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
-        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaPump.hwModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode))
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index 1a2b09eb95..4a578f2cb7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -15,7 +15,7 @@ class MsgInitConnStatusBasic_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -27,23 +27,23 @@ class MsgInitConnStatusBasic_k(
         if (bytes.size - 10 > 6) {
             return
         }
-        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        danaPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
         val isUtilityEnable = intFromBuff(bytes, 1, 1)
-        danaRPump.isEasyModeEnabled = intFromBuff(bytes, 2, 1) == 1
+        danaPump.isEasyModeEnabled = intFromBuff(bytes, 2, 1) == 1
         val easyUIMode = intFromBuff(bytes, 3, 1)
-        danaRPump.password = intFromBuff(bytes, 4, 2) xor 0x3463
-        aapsLogger.debug(LTag.PUMPCOMM, "isStatusSuspendOn: " + danaRPump.pumpSuspended)
+        danaPump.password = intFromBuff(bytes, 4, 2) xor 0x3463
+        aapsLogger.debug(LTag.PUMPCOMM, "isStatusSuspendOn: " + danaPump.pumpSuspended)
         aapsLogger.debug(LTag.PUMPCOMM, "isUtilityEnable: $isUtilityEnable")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is EasyUI Enabled: " + danaRPump.isEasyModeEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is EasyUI Enabled: " + danaPump.isEasyModeEnabled)
         aapsLogger.debug(LTag.PUMPCOMM, "easyUIMode: $easyUIMode")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.password)
-        if (danaRPump.isEasyModeEnabled) {
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaPump.password)
+        if (danaPump.isEasyModeEnabled) {
             val notification = Notification(Notification.EASYMODE_ENABLED, resourceHelper.gs(R.string.danar_disableeasymode), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.EASYMODE_ENABLED))
         }
-        if (!danaRPump.isPasswordOK) {
+        if (!danaPump.isPasswordOK) {
             val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index 243c5714d3..7a3e75114c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -16,7 +16,7 @@ class MsgInitConnStatusBolus_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
@@ -30,16 +30,16 @@ class MsgInitConnStatusBolus_k(
             return
         }
         val bolusConfig = intFromBuff(bytes, 0, 1)
-        danaRPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
-        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
-        danaRPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
+        danaPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
+        danaPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        danaPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
         //int bolusRate = intFromBuff(bytes, 4, 8);
         val deliveryStatus = intFromBuff(bytes, 12, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaRPump.bolusStep)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaRPump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaPump.bolusStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaPump.maxBolus)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery status: $deliveryStatus")
-        if (!danaRPump.isExtendedBolusEnabled) {
+        if (!danaPump.isExtendedBolusEnabled) {
             val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index feb7a292cd..f990fe8346 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.R
@@ -21,7 +21,7 @@ class MsgInitConnStatusTime_k(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderInterface,
@@ -44,7 +44,7 @@ class MsgInitConnStatusTime_k(
             danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, false)
             danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
             danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
-            danaRPump.reset() // mark not initialized
+            danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
             configBuilderPlugin.storeSettings("ChangingKoreanDanaDriver")
             rxBus.send(EventRebuildTabs())
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 463c7ffe04..4a2e6bb063 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -16,7 +16,7 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -25,14 +25,14 @@ class MsgSettingBasalProfileAll_k(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
-        if (danaRPump.basal48Enable) {
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        if (danaPump.basal48Enable) {
             for (profile in 0..3) {
                 val position = intFromBuff(bytes, 107 * profile, 1)
                 for (index in 0..47) {
                     var basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2)
                     if (basal < 10) basal = 0
-                    danaRPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
+                    danaPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
                 }
             }
         } else {
@@ -43,14 +43,14 @@ class MsgSettingBasalProfileAll_k(
                     var basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2)
                     if (basal < 10) basal = 0
                     aapsLogger.debug(LTag.PUMPCOMM, "position $position index $index")
-                    danaRPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
+                    danaPump.pumpProfiles!![position][index] = basal / 100 / 24.0 // in units/day
                 }
             }
         }
-        if (danaRPump.basal48Enable) {
+        if (danaPump.basal48Enable) {
             for (profile in 0..3) {
                 for (index in 0..23) {
-                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profile][index])
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![profile][index])
                 }
             }
         } else {
@@ -58,7 +58,7 @@ class MsgSettingBasalProfileAll_k(
                 for (index in 0..47) {
                     aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index / 2) +
                         ":" + String.format(Locale.ENGLISH, "%02d", index % 2 * 30) + " : " +
-                        danaRPump.pumpProfiles!![profile][index])
+                        danaPump.pumpProfiles!![profile][index])
                 }
             }
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
index c460a7f313..150099293d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -9,7 +9,7 @@ import java.util.*
 
 class MsgSettingBasal_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
@@ -19,13 +19,13 @@ class MsgSettingBasal_k(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         for (index in 0..23) {
             var basal = intFromBuff(bytes, 2 * index, 2)
             if (basal < danaRKoreanPlugin.pumpDescription.basalMinimumRate) basal = 0
-            danaRPump.pumpProfiles!![danaRPump.activeProfile][index] = basal / 100.0
+            danaPump.pumpProfiles!![danaPump.activeProfile][index] = basal / 100.0
         }
         for (index in 0..23)
-            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![danaPump.activeProfile][index])
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
index b01011af8b..2ac86a5085 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusBasic_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -21,11 +21,11 @@ class MsgStatusBasic_k(
         val reservoirRemainingUnits = intFromBuff(bytes, 3, 3) / 750.0
         val dailyTotalUnits = intFromBuff(bytes, 6, 3) / 750.0
         val maxDailyTotalUnits = intFromBuff(bytes, 9, 2) / 100
-        danaRPump.dailyTotalUnits = dailyTotalUnits
-        danaRPump.maxDailyTotalUnits = maxDailyTotalUnits
-        danaRPump.reservoirRemainingUnits = reservoirRemainingUnits
-        danaRPump.currentBasal = currentBasal
-        danaRPump.batteryRemaining = batteryRemaining
+        danaPump.dailyTotalUnits = dailyTotalUnits
+        danaPump.maxDailyTotalUnits = maxDailyTotalUnits
+        danaPump.reservoirRemainingUnits = reservoirRemainingUnits
+        danaPump.currentBasal = currentBasal
+        danaPump.batteryRemaining = batteryRemaining
         aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: $dailyTotalUnits")
         aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: $maxDailyTotalUnits")
         aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: $reservoirRemainingUnits")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
index 10d5a96473..b0f7004955 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatus_k(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -16,22 +16,22 @@ class MsgStatus_k(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
-        danaRPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
-        danaRPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
-        danaRPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
+        danaPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
+        danaPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
+        danaPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
+        danaPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
         //val lastBolusAmount = intFromBuff(bytes, 13, 2) / 100.0
         //if (lastBolusAmount != 0d) {
         //  pump.lastBolusTime = dateTimeFromBuff(bytes, 8);
         //  pump.lastBolusAmount = lastBolusAmount;
         //}
-        danaRPump.iob = intFromBuff(bytes, 15, 2) / 100.0
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaRPump.extendedBolusMinutes)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaRPump.extendedBolusAmount)
+        danaPump.iob = intFromBuff(bytes, 15, 2) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaPump.extendedBolusMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaPump.extendedBolusAmount)
         //aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + pump.lastBolusTime);
         //aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + pump.lastBolusAmount);
-        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaRPump.iob)
+        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaPump.iob)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 78e9e6256b..11edecc293 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -9,7 +9,7 @@ import java.util.Date;
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.danar.DanaRPlugin;
@@ -64,7 +64,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject ConstraintChecker constraintChecker;
-    @Inject DanaRPump danaRPump;
+    @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject CommandQueueProvider commandQueue;
@@ -115,7 +115,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRKorean, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRKorean, danaPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
@@ -128,12 +128,12 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
-            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaRPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil);
-            MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaRPump, danaRKoreanPlugin);
+            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaPump);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
+            MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin);
 
-            if (danaRPump.isNewPump()) {
+            if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -149,58 +149,58 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            danaRPump.setLastConnection(now);
+            danaPump.setLastConnection(now);
 
             Profile profile = profileFunction.getProfile();
-            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
                 if (!danaRKoreanPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
+            if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal_k(aapsLogger, danaRPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-                if (danaRPump.getPumpTime() == 0) {
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.reset();
+                    danaPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
                 }
-                long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                 aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
                     mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.setLastSettingsRead(now);
+                danaPump.setLastSettingsRead(now);
             }
 
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
             //NSUpload.uploadDeviceStatus();
-            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
-                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
+            if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -211,14 +211,14 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
+        if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -227,7 +227,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -236,7 +236,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -245,7 +245,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -260,29 +260,29 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (BolusProgressDialog.stopPressed) return false;
 
         mBolusingTreatment = t;
-        MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
-        danaRPump.setBolusStopped(false);
-        danaRPump.setBolusStopForced(false);
+        MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+        danaPump.setBolusStopped(false);
+        danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
             mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
         }
 
         if (amount > 0) {
-            danaRPump.setBolusingTreatment(t);
-            danaRPump.setBolusAmountToBeDelivered(amount);
+            danaPump.setBolusingTreatment(t);
+            danaPump.setBolusAmountToBeDelivered(amount);
 
-            if (!danaRPump.getBolusStopped()) {
+            if (!danaPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaRPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    danaRPump.setBolusStopped(true);
-                    danaRPump.setBolusStopForced(true);
+                if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaPump.setBolusStopped(true);
+                    danaPump.setBolusStopForced(true);
                     aapsLogger.debug(LTag.PUMP, "Communication stopped");
                 }
             }
@@ -315,10 +315,10 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
-        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, basal);
         mSerialIOThread.sendMessage(msgSet);
-        danaRPump.setLastSettingsRead(0); // force read full settings
+        danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index 2802bb5b0e..20fb735d93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -12,7 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
@@ -60,7 +60,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             AAPSLogger aapsLogger,
             RxBusWrapper rxBus,
             Context context,
-            DanaRPump danaRPump,
+            DanaPump danaPump,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
             ActivePluginProvider activePlugin,
@@ -70,7 +70,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             DateUtil dateUtil,
             FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
+        super(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
@@ -137,7 +137,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        return danaRPump.getLastConnection() > 0 && danaRPump.getMaxBasal() > 0 && danaRPump.isPasswordOK();
+        return danaPump.getLastConnection() > 0 && danaPump.getMaxBasal() > 0 && danaPump.isPasswordOK();
     }
 
     @Override
@@ -191,7 +191,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
@@ -296,7 +296,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
     @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         PumpEnactResult result = new PumpEnactResult(getInjector());
         percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
@@ -348,7 +348,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
     }
 
     private PumpEnactResult setHighTempBasalPercent(Integer percent, int durationInMinutes) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         PumpEnactResult result = new PumpEnactResult(getInjector());
         boolean connectionOK = sExecutionService.highTempBasal(percent, durationInMinutes);
         if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) {
@@ -378,7 +378,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!danaRPump.isTempBasalInProgress()) {
+        if (!danaPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
             result.comment = resourceHelper.gs(R.string.ok);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
index 004a1078af..f0e3f4570f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
@@ -27,7 +27,7 @@ class MessageHashTableRv2 @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaPump: DanaPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     danaRv2Plugin: DanaRv2Plugin,
@@ -44,25 +44,25 @@ class MessageHashTableRv2 @Inject constructor(
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil))        // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended_v2(aapsLogger, danaRPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil))        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended_v2(aapsLogger, danaPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
         put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
         put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
@@ -74,28 +74,28 @@ class MessageHashTableRv2 @Inject constructor(
         put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
         put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
         put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
-        put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
         put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
         put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
         put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
         put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgStatusAPS_v2(aapsLogger, danaRPump))              // 0xE001 CMD_PUMPSTATUS_APS
+        put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgStatusAPS_v2(aapsLogger, danaPump))              // 0xE001 CMD_PUMPSTATUS_APS
         put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
         put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
         put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 3144eec663..64d15af883 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
@@ -21,7 +21,7 @@ class MsgCheckValue_v2(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val danaRv2Plugin: DanaRv2Plugin,
@@ -36,13 +36,13 @@ class MsgCheckValue_v2(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.isNewPump = true
+        danaPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
-        danaRPump.protocol = intFromBuff(bytes, 1, 1)
-        danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != info.nightscout.androidaps.dana.DanaRPump.EXPORT_MODEL) {
-            danaRPump.reset()
+        danaPump.hwModel = intFromBuff(bytes, 0, 1)
+        danaPump.protocol = intFromBuff(bytes, 1, 1)
+        danaPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaPump.hwModel != info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL) {
+            danaPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRPlugin.disconnect("Wrong Model")
@@ -51,15 +51,15 @@ class MsgCheckValue_v2(
             danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, true)
             danaRPlugin.setPluginEnabled(PluginType.PUMP, false)
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
-            danaRPump.reset() // mark not initialized
+            danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
             configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
         }
-        if (danaRPump.protocol != 2) {
-            danaRPump.reset()
+        if (danaPump.protocol != 2) {
+            danaPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
             danaRKoreanPlugin.disconnect("Wrong Model")
@@ -74,8 +74,8 @@ class MsgCheckValue_v2(
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
-        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
-        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaPump.hwModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode))
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
index 29292f6256..13e5ed1e51 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -73,7 +73,7 @@ class MsgHistoryEvents_v2 constructor(
             .pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaRPump.TEMPSTART         -> {
+            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -81,13 +81,13 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.TEMPSTOP          -> {
+            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTART     -> {
+            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -95,13 +95,13 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTOP      -> {
+            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.BOLUS             -> {
+            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -113,7 +113,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALBOLUS         -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -125,7 +125,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTART -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -133,38 +133,38 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTOP  -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.SUSPENDON         -> {
+            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.SUSPENDOFF        -> {
+            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.REFILL            -> {
+            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.PRIME             -> {
+            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.PROFILECHANGE     -> {
+            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.CARBS             -> {
+            info.nightscout.androidaps.dana.DanaPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
index 88ee0eeec7..d09355299e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 
 class MsgStatusAPS_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -18,7 +18,7 @@ class MsgStatusAPS_v2(
     override fun handleMessage(bytes: ByteArray) {
         val iob = intFromBuff(bytes, 0, 2) / 100.0
         val deliveredSoFar = intFromBuff(bytes, 2, 2) / 100.0
-        danaRPump.iob = iob
+        danaPump.iob = iob
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered so far: $deliveredSoFar")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump IOB: $iob")
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
index e7d26326ff..425c5c0469 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -29,13 +29,13 @@ class MsgStatusBolusExtended_v2(
         val extendedBolusAbsoluteRate = if (isExtendedInProgress) extendedBolusAmount / extendedBolusMinutes * 60 else 0.0
         val extendedBolusStart = if (isExtendedInProgress) getDateFromSecAgo(extendedBolusSoFarInSecs) else 0
         val extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes
-        danaRPump.isExtendedInProgress = isExtendedInProgress
-        danaRPump.extendedBolusMinutes = extendedBolusMinutes
-        danaRPump.extendedBolusAmount = extendedBolusAmount
-        danaRPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
-        danaRPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
-        danaRPump.extendedBolusStart = extendedBolusStart
-        danaRPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
+        danaPump.isExtendedInProgress = isExtendedInProgress
+        danaPump.extendedBolusMinutes = extendedBolusMinutes
+        danaPump.extendedBolusAmount = extendedBolusAmount
+        danaPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
+        danaPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
+        danaPump.extendedBolusStart = extendedBolusStart
+        danaPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
         aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: $isExtendedInProgress")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: $extendedBolusMinutes")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: $extendedBolusAmount")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
index 38533d3ad5..cdd72aae2a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.danaRv2.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
@@ -27,11 +27,11 @@ class MsgStatusTempBasal_v2(
         val tempBasalRunningSeconds = intFromBuff(bytes, 3, 3)
         val tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60
         val tempBasalStart = if (isTempBasalInProgress) getDateFromTempBasalSecAgo(tempBasalRunningSeconds) else 0
-        danaRPump.isTempBasalInProgress = isTempBasalInProgress
-        danaRPump.tempBasalPercent = tempBasalPercent
-        danaRPump.tempBasalRemainingMin = tempBasalRemainingMin
-        danaRPump.tempBasalTotalSec = tempBasalTotalSec
-        danaRPump.tempBasalStart = tempBasalStart
+        danaPump.isTempBasalInProgress = isTempBasalInProgress
+        danaPump.tempBasalPercent = tempBasalPercent
+        danaPump.tempBasalRemainingMin = tempBasalRemainingMin
+        danaPump.tempBasalTotalSec = tempBasalTotalSec
+        danaPump.tempBasalStart = tempBasalStart
         aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: $isTempBasalInProgress")
         aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: $tempBasalPercent")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index f0138a3fba..e28e2804ee 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -13,7 +13,7 @@ import javax.inject.Inject;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
@@ -86,7 +86,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject ConstraintChecker constraintChecker;
-    @Inject DanaRPump danaRPump;
+    @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject DanaRv2Plugin danaRv2Plugin;
@@ -145,7 +145,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRv2, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableRv2, danaPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
@@ -157,13 +157,13 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
-            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil);
-            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaRPump);
-            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
+            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
+            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil);
+            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaPump);
+            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
 
-            if (danaRPump.isNewPump()) {
+            if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -178,29 +178,29 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)));
             mSerialIOThread.sendMessage(exStatusMsg);
 
-            danaRPump.setLastConnection(System.currentTimeMillis());
+            danaPump.setLastConnection(System.currentTimeMillis());
 
             Profile profile = profileFunction.getProfile();
             PumpInterface pump = activePlugin.getActivePump();
-            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-            if (danaRPump.getPumpTime() == 0) {
+            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+            if (danaPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
-                danaRPump.reset();
+                danaPump.reset();
                 rxBus.send(new EventDanaRNewStatus());
                 rxBus.send(new EventInitializationChanged());
                 return;
             }
-            long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+            long timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
             aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
             if (Math.abs(timeDiff) > 3) {
                 if (Math.abs(timeDiff) > 60 * 60 * 1.5) {
@@ -214,7 +214,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     context.startActivity(i);
 
                     //deinitialize pump
-                    danaRPump.reset();
+                    danaPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
@@ -222,27 +222,27 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
                     mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
             }
 
             long now = System.currentTimeMillis();
-            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
+            if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaRPump));
-                danaRPump.setLastSettingsRead(now);
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
+                danaPump.setLastSettingsRead(now);
             }
 
             loadEvents();
@@ -250,12 +250,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
             //NSUpload.uploadDeviceStatus();
-            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
-                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
+            if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -266,14 +266,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
+        if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -281,14 +281,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     public boolean highTempBasal(int percent, int durationInMinutes) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
+        if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -301,14 +301,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         }
 
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
+        if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -318,7 +318,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaRPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -328,7 +328,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -338,7 +338,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaRPump));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -353,36 +353,36 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
+            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, amount, preferencesSpeed);
-        danaRPump.setBolusStopped(false);
-        danaRPump.setBolusStopForced(false);
+            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+        danaPump.setBolusStopped(false);
+        danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
             MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, carbtime, carbs);
             mSerialIOThread.sendMessage(msg);
-            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaRPump.CARBS, carbtime, carbs, 0);
+            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
 
         final long bolusStart = System.currentTimeMillis();
         if (amount > 0) {
-            danaRPump.setBolusingTreatment(t);
-            danaRPump.setBolusAmountToBeDelivered(amount);
+            danaPump.setBolusingTreatment(t);
+            danaPump.setBolusAmountToBeDelivered(amount);
 
-            if (!danaRPump.getBolusStopped()) {
+            if (!danaPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaRPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    danaRPump.setBolusStopped(true);
-                    danaRPump.setBolusStopForced(true);
+                if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaPump.setBolusStopped(true);
+                    danaPump.setBolusStopForced(true);
                     aapsLogger.error("Communication stopped");
                 }
             }
@@ -419,7 +419,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             public void run() {
                 // load last bolus status
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-                mSerialIOThread.sendMessage(new MsgStatus(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgStatus(aapsLogger, danaPump));
                 bolusingEvent.setPercent(100);
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
@@ -431,7 +431,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, time, amount);
         mSerialIOThread.sendMessage(msg);
-        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaRPump.CARBS, time, amount, 0);
+        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
         lastHistoryFetched = Math.min(lastHistoryFetched, time - T.mins(1).msecs());
         return true;
@@ -460,19 +460,19 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             lastHistoryFetched = danaRv2Plugin.lastEventTimeLoaded - T.mins(1).msecs();
         else
             lastHistoryFetched = 0;
-        danaRPump.setLastConnection(System.currentTimeMillis());
+        danaPump.setLastConnection(System.currentTimeMillis());
         return new PumpEnactResult(injector).success(true);
     }
 
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
-        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.setLastSettingsRead(0); // force read full settings
+        danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -482,7 +482,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaRPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index 20403812b5..df191419c1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -10,8 +10,8 @@ import java.util.List;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.dana.DanaPumpInterface;
-import info.nightscout.androidaps.dana.DanaRFragment;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaFragment;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService;
 import info.nightscout.androidaps.data.Profile;
@@ -61,7 +61,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     protected boolean useExtendedBoluses = false;
 
     protected PumpDescription pumpDescription = new PumpDescription();
-    protected DanaRPump danaRPump;
+    protected DanaPump danaPump;
     protected ConstraintChecker constraintChecker;
     protected RxBusWrapper rxBus;
     protected ActivePluginProvider activePlugin;
@@ -70,7 +70,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     protected AbstractDanaRPlugin(
             HasAndroidInjector injector,
-            DanaRPump danaRPump,
+            DanaPump danaPump,
             ResourceHelper resourceHelper,
             ConstraintChecker constraintChecker,
             AAPSLogger aapsLogger,
@@ -82,14 +82,14 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.PUMP)
-                        .fragmentClass(DanaRFragment.class.getName())
+                        .fragmentClass(DanaFragment.class.getName())
                         .pluginName(R.string.danarspump)
                         .shortName(R.string.danarpump_shortname)
                         .preferencesId(R.xml.pref_danar)
                         .description(R.string.description_pump_dana_r),
                 injector, aapsLogger, resourceHelper, commandQueue
         );
-        this.danaRPump = danaRPump;
+        this.danaPump = danaPump;
         this.constraintChecker = constraintChecker;
         this.rxBus = rxBus;
         this.activePlugin = activePlugin;
@@ -102,14 +102,14 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         disposable.add(rxBus
                 .toObservable(EventConfigBuilderChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> danaRPump.reset())
+                .subscribe(event -> danaPump.reset())
         );
         disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
                     if (event.isChanged(getResourceHelper(), R.string.key_danar_bt_name)) {
-                        danaRPump.reset();
+                        danaPump.reset();
                         getCommandQueue().readStatus("DeviceChanged", null);
                     }
                 })
@@ -123,7 +123,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @Override
     public boolean isSuspended() {
-        return danaRPump.getPumpSuspended();
+        return danaPump.getPumpSuspended();
     }
 
     @Override
@@ -172,12 +172,12 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     public boolean isThisProfileSet(Profile profile) {
         if (!isInitialized())
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (danaRPump.getPumpProfiles() == null)
+        if (danaPump.getPumpProfiles() == null)
             return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        int basalValues = danaRPump.getBasal48Enable() ? 48 : 24;
-        int basalIncrement = danaRPump.getBasal48Enable() ? 30 * 60 : 60 * 60;
+        int basalValues = danaPump.getBasal48Enable() ? 48 : 24;
+        int basalIncrement = danaPump.getBasal48Enable() ? 30 * 60 : 60 * 60;
         for (int h = 0; h < basalValues; h++) {
-            Double pumpValue = danaRPump.getPumpProfiles()[danaRPump.getActiveProfile()][h];
+            Double pumpValue = danaPump.getPumpProfiles()[danaPump.getActiveProfile()][h];
             Double profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement);
             if (Math.abs(pumpValue - profileValue) > getPumpDescription().basalStep) {
                 getAapsLogger().debug(LTag.PUMP, "Diff found. Hour: " + h + " Pump: " + pumpValue + " Profile: " + profileValue);
@@ -189,22 +189,22 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @Override
     public long lastDataTime() {
-        return danaRPump.getLastConnection();
+        return danaPump.getLastConnection();
     }
 
     @Override
     public double getBaseBasalRate() {
-        return danaRPump.getCurrentBasal();
+        return danaPump.getCurrentBasal();
     }
 
     @Override
     public double getReservoirLevel() {
-        return danaRPump.getReservoirRemainingUnits();
+        return danaPump.getReservoirRemainingUnits();
     }
 
     @Override
     public int getBatteryLevel() {
-        return danaRPump.getBatteryRemaining();
+        return danaPump.getBatteryRemaining();
     }
 
     @Override
@@ -218,7 +218,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes, Profile profile, boolean enforceNew) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         PumpEnactResult result = new PumpEnactResult(getInjector());
         percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
@@ -266,7 +266,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         insulin = constraintChecker.applyExtendedBolusConstraints(new Constraint<>(insulin)).value();
         // needs to be rounded
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
@@ -315,7 +315,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!danaRPump.isExtendedInProgress()) {
+        if (!danaPump.isExtendedInProgress()) {
             result.success = true;
             result.comment = getResourceHelper().gs(R.string.ok);
             getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK");
@@ -332,8 +332,8 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     public void connect(String from) {
         if (sExecutionService != null) {
             sExecutionService.connect();
-            pumpDescription.basalStep = danaRPump.getBasalStep();
-            pumpDescription.bolusStep = danaRPump.getBolusStep();
+            pumpDescription.basalStep = danaPump.getBasalStep();
+            pumpDescription.bolusStep = danaPump.getBolusStep();
         }
     }
 
@@ -361,14 +361,14 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     public void getPumpStatus() {
         if (sExecutionService != null) {
             sExecutionService.getPumpStatus();
-            pumpDescription.basalStep = danaRPump.getBasalStep();
-            pumpDescription.bolusStep = danaRPump.getBolusStep();
+            pumpDescription.basalStep = danaPump.getBasalStep();
+            pumpDescription.bolusStep = danaPump.getBolusStep();
         }
     }
 
     @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profilename, String version) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         long now = System.currentTimeMillis();
         if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return new JSONObject();
@@ -422,7 +422,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public String serialNumber() {
-        return danaRPump.getSerialNumber();
+        return danaPump.getSerialNumber();
     }
 
     @NonNull @Override
@@ -445,7 +445,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, @NonNull Profile profile) {
-        absoluteRate.setIfSmaller(getAapsLogger(), danaRPump.getMaxBasal(), String.format(getResourceHelper().gs(R.string.limitingbasalratio), danaRPump.getMaxBasal(), getResourceHelper().gs(R.string.pumplimit)), this);
+        absoluteRate.setIfSmaller(getAapsLogger(), danaPump.getMaxBasal(), String.format(getResourceHelper().gs(R.string.limitingbasalratio), danaPump.getMaxBasal(), getResourceHelper().gs(R.string.pumplimit)), this);
         return absoluteRate;
     }
 
@@ -459,7 +459,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     @NonNull @Override
     public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
-        insulin.setIfSmaller(getAapsLogger(), danaRPump.getMaxBolus(), String.format(getResourceHelper().gs(R.string.limitingbolus), danaRPump.getMaxBolus(), getResourceHelper().gs(R.string.pumplimit)), this);
+        insulin.setIfSmaller(getAapsLogger(), danaPump.getMaxBolus(), String.format(getResourceHelper().gs(R.string.limitingbolus), danaPump.getMaxBolus(), getResourceHelper().gs(R.string.pumplimit)), this);
         return insulin;
     }
 
@@ -475,7 +475,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
 
     // Reply for sms communicator
     @NonNull public String shortStatus(boolean veryShort) {
-        DanaRPump pump = danaRPump;
+        DanaPump pump = danaPump;
         String ret = "";
         if (pump.getLastConnection() != 0) {
             long agoMsec = System.currentTimeMillis() - pump.getLastConnection();
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index 0f37479d47..ff467c3924 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -12,7 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
@@ -60,11 +60,11 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             ActivePluginProvider activePlugin,
             SP sp,
             CommandQueueProvider commandQueue,
-            DanaRPump danaRPump,
+            DanaPump danaPump,
             DateUtil dateUtil,
             FabricPrivacy fabricPrivacy
     ) {
-        super(injector, danaRPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
+        super(injector, danaPump, resourceHelper, constraintChecker, aapsLogger, commandQueue, rxBus, activePlugin, sp, dateUtil);
         this.aapsLogger = aapsLogger;
         this.context = context;
         this.resourceHelper = resourceHelper;
@@ -143,7 +143,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
     @Override
     public boolean isInitialized() {
-        return danaRPump.getLastConnection() > 0 && danaRPump.isExtendedBolusEnabled() && danaRPump.getMaxBasal() > 0 && danaRPump.isPasswordOK();
+        return danaPump.getLastConnection() > 0 && danaPump.isExtendedBolusEnabled() && danaPump.getMaxBasal() > 0 && danaPump.isPasswordOK();
     }
 
     @Override
@@ -170,7 +170,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             result.bolusDelivered = t.insulin;
             result.carbsDelivered = detailedBolusInfo.carbs;
             if (!result.success)
-                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaRPump.getBolusStartErrorCode());
+                result.comment = String.format(resourceHelper.gs(R.string.boluserrorcode), detailedBolusInfo.insulin, t.insulin, danaPump.getBolusStartErrorCode());
             else
                 result.comment = resourceHelper.gs(R.string.ok);
             aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered);
@@ -292,16 +292,16 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             extendedRateToSet = Round.roundTo(extendedRateToSet, pumpDescription.extendedBolusStep * 2); // *2 because of halfhours
 
             // What is current rate of extended bolusing in u/h?
-            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaRPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaRPump.getExtendedBolusRemainingMinutes() + "min");
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Extended bolus in progress: " + (activeExtended != null) + " rate: " + danaPump.getExtendedBolusAbsoluteRate() + "U/h duration remaining: " + danaPump.getExtendedBolusRemainingMinutes() + "min");
             aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Rate to set: " + extendedRateToSet + "U/h");
 
             // Compare with extended rate in progress
-            if (activeExtended != null && Math.abs(danaRPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
+            if (activeExtended != null && Math.abs(danaPump.getExtendedBolusAbsoluteRate() - extendedRateToSet) < getPumpDescription().extendedBolusStep) {
                 // correct extended already set
                 result.success = true;
-                result.absolute = danaRPump.getExtendedBolusAbsoluteRate();
+                result.absolute = danaPump.getExtendedBolusAbsoluteRate();
                 result.enacted = false;
-                result.duration = danaRPump.getExtendedBolusRemainingMinutes();
+                result.duration = danaPump.getExtendedBolusRemainingMinutes();
                 result.isPercent = false;
                 result.isTempCancel = false;
                 aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct extended already set");
@@ -355,7 +355,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             result.enacted = true;
             result.isTempCancel = true;
         }
-        if (!danaRPump.isTempBasalInProgress()) {
+        if (!danaPump.isTempBasalInProgress()) {
             result.success = true;
             result.isTempCancel = true;
             result.comment = resourceHelper.gs(R.string.ok);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
index 055090ca1e..18ab01053f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/SerialIOThread.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.danar.comm.MessageBase;
 import info.nightscout.androidaps.danar.comm.MessageHashTableBase;
 import info.nightscout.androidaps.logging.AAPSLogger;
@@ -29,12 +29,12 @@ public class SerialIOThread extends Thread {
 
     private MessageBase processedMessage;
     private MessageHashTableBase hashTable;
-    private DanaRPump danaRPump;
+    private DanaPump danaPump;
 
-    public SerialIOThread(AAPSLogger aapsLogger, BluetoothSocket rfcommSocket, MessageHashTableBase hashTable, DanaRPump danaRPump) {
+    public SerialIOThread(AAPSLogger aapsLogger, BluetoothSocket rfcommSocket, MessageHashTableBase hashTable, DanaPump danaPump) {
         super();
         this.hashTable = hashTable;
-        this.danaRPump = danaRPump;
+        this.danaPump = danaPump;
         this.aapsLogger = aapsLogger;
 
         mRfCommSocket = rfcommSocket;
@@ -169,7 +169,7 @@ public class SerialIOThread extends Thread {
             message.handleMessageNotReceived();
             aapsLogger.error(LTag.PUMPBTCOMM, "Reply not received " + message.getMessageName());
             if (message.getCommand() == 0xF0F1) {
-                danaRPump.setNewPump(false);
+                danaPump.setNewPump(false);
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Old firmware detected");
             }
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
index 54188ed836..9ecf8c8d12 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -24,7 +24,7 @@ class MessageHashTableR @Inject constructor(
     rxBus: RxBusWrapper,
     resourceHelper: ResourceHelper,
     constraintChecker: ConstraintChecker,
-    danaRPump: DanaRPump,
+    danaPump: DanaPump,
     danaRPlugin: DanaRPlugin,
     danaRKoreanPlugin: DanaRKoreanPlugin,
     configBuilderPlugin: ConfigBuilderInterface,
@@ -39,26 +39,26 @@ class MessageHashTableR @Inject constructor(
     var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaRPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaRPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaRPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaRPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaRPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
         // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaRPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaRPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaRPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))
+        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
         put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
         put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
         put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
         put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
         put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaRPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
         put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
         put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
         put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
@@ -70,30 +70,30 @@ class MessageHashTableR @Inject constructor(
         put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
         put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
         put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaRPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
         // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin))
+        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))
         // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin))
-        put(MsgSettingProfileRatios(aapsLogger, danaRPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaRPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaRPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaRPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaRPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaRPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaRPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaRPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))
+        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
         put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
         put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaRPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
         put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaRPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
         put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaRPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
         put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
         // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgCheckValue(aapsLogger, danaRPump, danaRPlugin))
+        put(MsgCheckValue(aapsLogger, danaPump, danaRPlugin))
     }
 
     override fun put(message: MessageBase) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index 05b1bfd39b..ecc27bed6a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -13,7 +13,7 @@ class MsgBolusProgress(
     private val aapsLogger: AAPSLogger,
     private val resourceHelper: ResourceHelper,
     private val rxBus: RxBusWrapper,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -22,13 +22,13 @@ class MsgBolusProgress(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        val deliveredInsulin = danaRPump.bolusAmountToBeDelivered - intFromBuff(bytes, 0, 2) / 100.0
-        danaRPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
-        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
+        val deliveredInsulin = danaPump.bolusAmountToBeDelivered - intFromBuff(bytes, 0, 2) / 100.0
+        danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
+        danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
-        bolusingEvent.t = danaRPump.bolusingTreatment
-        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
+        bolusingEvent.t = danaPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
         rxBus.send(bolusingEvent)
     }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index a4889bb28a..4ea0916bec 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -4,12 +4,12 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStart(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private var amount: Double
 ) : MessageBase() {
 
@@ -30,6 +30,6 @@ class MsgBolusStart(
             failed = false
             aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
         }
-        danaRPump.bolusStartErrorCode = errorCode
+        danaPump.bolusStartErrorCode = errorCode
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index 391ecb0794..a683851ae3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -4,12 +4,12 @@ import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStartWithSpeed(
     private val aapsLogger: AAPSLogger,
     constraintChecker: ConstraintChecker,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private var amount: Double,
     speed: Int
 ) : MessageBase() {
@@ -32,6 +32,6 @@ class MsgBolusStartWithSpeed(
             failed = false
             aapsLogger.debug(LTag.PUMPBTCOMM, "Messsage response: $errorCode OK")
         }
-        danaRPump.bolusStartErrorCode = errorCode
+        danaPump.bolusStartErrorCode = errorCode
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index 69c302256e..8d9ae93671 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -12,7 +12,7 @@ class MsgBolusStop(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -23,9 +23,9 @@ class MsgBolusStop(
     override fun handleMessage(bytes: ByteArray) {
         aapsLogger.debug(LTag.PUMPCOMM, "Messsage received")
         val bolusingEvent = EventOverviewBolusProgress
-        danaRPump.bolusStopped = true
-        if (!danaRPump.bolusStopForced) {
-            danaRPump.bolusingTreatment?.insulin = danaRPump.bolusAmountToBeDelivered
+        danaPump.bolusStopped = true
+        if (!danaPump.bolusStopForced) {
+            danaPump.bolusingTreatment?.insulin = danaPump.bolusAmountToBeDelivered
             bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
             bolusingEvent.percent = 100
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
index abdca3d96b..afc59a642c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.DanaRPlugin
 
 class MsgCheckValue(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
@@ -17,17 +17,17 @@ class MsgCheckValue(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.isNewPump = true
+        danaPump.isNewPump = true
         aapsLogger.debug(LTag.PUMPCOMM, "New firmware confirmed")
-        danaRPump.hwModel = intFromBuff(bytes, 0, 1)
-        danaRPump.protocol = intFromBuff(bytes, 1, 1)
-        danaRPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaRPump.hwModel != DanaRPump.EXPORT_MODEL) {
+        danaPump.hwModel = intFromBuff(bytes, 0, 1)
+        danaPump.protocol = intFromBuff(bytes, 1, 1)
+        danaPump.productCode = intFromBuff(bytes, 2, 1)
+        if (danaPump.hwModel != DanaPump.EXPORT_MODEL) {
             danaRPlugin.disconnect("Wrong Model")
             aapsLogger.debug(LTag.PUMPCOMM, "Wrong model selected")
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
-        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
-        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaPump.hwModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode))
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index 3a2114677e..2f451ee8ac 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -13,7 +13,7 @@ class MsgError(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val nsUpload: NSUpload
 ) : MessageBase() {
 
@@ -34,7 +34,7 @@ class MsgError(
         }
         if (errorCode < 8) { // bolus delivering stopped
             val bolusingEvent = EventOverviewBolusProgress
-            danaRPump.bolusStopped = true
+            danaPump.bolusStopped = true
             bolusingEvent.status = errorString
             rxBus.send(bolusingEvent)
             failed = true
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
index ea4a343466..c439f5af77 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
@@ -2,21 +2,21 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryAllDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
         SetCommand(0x41F1)
-        danaRPump.historyDoneReceived = false
+        danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.historyDoneReceived = true
+        danaPump.historyDoneReceived = true
         aapsLogger.debug(LTag.PUMPCOMM, "History all done received")
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
index 99525ee1d5..2279fd40d9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
@@ -2,21 +2,21 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
         SetCommand(0x31F1)
-        danaRPump.historyDoneReceived = false
+        danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.historyDoneReceived = true
+        danaPump.historyDoneReceived = true
         aapsLogger.debug(LTag.PUMPCOMM, "History done received")
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
index b24e661cad..ce9cd5ed89 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
@@ -2,21 +2,21 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryNewDone(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
         SetCommand(0x42F1)
-        danaRPump.historyDoneReceived = false
+        danaPump.historyDoneReceived = false
         aapsLogger.debug(LTag.PUMPCOMM, "New message")
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.historyDoneReceived = true
+        danaPump.historyDoneReceived = true
         aapsLogger.debug(LTag.PUMPCOMM, "History new done received")
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
index 66e417add6..0ec5675d8d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgInitConnStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -18,41 +18,41 @@ class MsgInitConnStatusBasic(
         if (bytes.size - 10 < 21) {
             return
         }
-        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
-        danaRPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
-        danaRPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
-        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
-        danaRPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
-        danaRPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
-        danaRPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
-        danaRPump.tempBasalPercent = intFromBuff(bytes, 13, 1)
-        danaRPump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1
-        danaRPump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1
+        danaPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        danaPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
+        danaPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
+        danaPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
+        danaPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
+        danaPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
+        danaPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
+        danaPump.tempBasalPercent = intFromBuff(bytes, 13, 1)
+        danaPump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1
+        danaPump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1
         val statusBasalUDOption = intFromBuff(bytes, 16, 1)
-        danaRPump.isDualBolusInProgress = intFromBuff(bytes, 17, 1) == 1
+        danaPump.isDualBolusInProgress = intFromBuff(bytes, 17, 1) == 1
         val extendedBolusRate = intFromBuff(bytes, 18, 2) / 100.0
-        danaRPump.batteryRemaining = intFromBuff(bytes, 20, 1)
+        danaPump.batteryRemaining = intFromBuff(bytes, 20, 1)
         val bolusConfig = intFromBuff(bytes, 21, 1)
-        val deliveryPrime = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_PRIME != 0
-        val deliveryStepBolus = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_STEP_BOLUS != 0
-        val deliveryBasal = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_BASAL != 0
-        val deliveryExtBolus = bolusConfig and info.nightscout.androidaps.dana.DanaRPump.DELIVERY_EXT_BOLUS != 0
+        val deliveryPrime = bolusConfig and info.nightscout.androidaps.dana.DanaPump.DELIVERY_PRIME != 0
+        val deliveryStepBolus = bolusConfig and info.nightscout.androidaps.dana.DanaPump.DELIVERY_STEP_BOLUS != 0
+        val deliveryBasal = bolusConfig and info.nightscout.androidaps.dana.DanaPump.DELIVERY_BASAL != 0
+        val deliveryExtBolus = bolusConfig and info.nightscout.androidaps.dana.DanaPump.DELIVERY_EXT_BOLUS != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery prime: $deliveryPrime")
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery step bolus: $deliveryStepBolus")
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery basal: $deliveryBasal")
         aapsLogger.debug(LTag.PUMPCOMM, "Delivery ext bolus: $deliveryExtBolus")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
-        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaRPump.calculatorEnabled)
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaRPump.maxDailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaRPump.bolusBlocked)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaRPump.tempBasalPercent)
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaPump.calculatorEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaPump.bolusBlocked)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaPump.currentBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaPump.isExtendedInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "statusBasalUDOption: $statusBasalUDOption")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is dual bolus running: " + danaRPump.isDualBolusInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is dual bolus running: " + danaPump.isDualBolusInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus rate: $extendedBolusRate")
-        aapsLogger.debug(LTag.PUMPCOMM, "Battery remaining: " + danaRPump.batteryRemaining)
+        aapsLogger.debug(LTag.PUMPCOMM, "Battery remaining: " + danaPump.batteryRemaining)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index e2b7aa0ccf..b53541a077 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -14,7 +14,7 @@ class MsgInitConnStatusBolus(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -29,14 +29,14 @@ class MsgInitConnStatusBolus(
         }
         failed = false
         val bolusConfig = intFromBuff(bytes, 0, 1)
-        danaRPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
-        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
-        danaRPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
+        danaPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
+        danaPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        danaPump.maxBolus = intFromBuff(bytes, 2, 2) / 100.0
         //int bolusRate = intFromBuff(bytes, 4, 8);
-        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaRPump.bolusStep)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaRPump.maxBolus)
-        if (!danaRPump.isExtendedBolusEnabled) {
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Extended bolus enabled: " + danaPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus increment: " + danaPump.bolusStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus max: " + danaPump.maxBolus)
+        if (!danaPump.isExtendedBolusEnabled) {
             val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index 755c61489f..e44fda8252 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
@@ -15,7 +15,7 @@ class MsgInitConnStatusOption(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val activePlugin: ActivePluginProvider
 ) : MessageBase() {
 
@@ -36,12 +36,12 @@ class MsgInitConnStatusOption(
         //int none = intFromBuff(bytes, 8, 1);
         if (bytes.size >= 21) {
             failed = false
-            danaRPump.password = intFromBuff(bytes, 9, 2) xor 0x3463
-            aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.password)
+            danaPump.password = intFromBuff(bytes, 9, 2) xor 0x3463
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaPump.password)
         } else {
             failed = true
         }
-        if (!danaRPump.isPasswordOK) {
+        if (!danaPump.isPasswordOK) {
             val notification = Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index 7d345d77e9..b03946d4ba 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.R
@@ -20,7 +20,7 @@ class MsgInitConnStatusTime(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRPlugin: DanaRPlugin,
     private val danaRKoreanPlugin: DanaRKoreanPlugin,
     private val configBuilderPlugin: ConfigBuilderInterface,
@@ -43,7 +43,7 @@ class MsgInitConnStatusTime(
             danaRKoreanPlugin.setFragmentVisible(PluginType.PUMP, true)
             danaRPlugin.setPluginEnabled(PluginType.PUMP, false)
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
-            danaRPump.reset() // mark not initialized
+            danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
             configBuilderPlugin.storeSettings("ChangingDanaDriver")
             rxBus.send(EventRebuildTabs())
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index 1a883b93df..ab69e4017c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -2,29 +2,29 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSetUserOptions(
     private val aapsLogger: AAPSLogger,
-    danaRPump: DanaRPump
+    danaPump: DanaPump
 ) : MessageBase() {
 
     init {
         SetCommand(0x330B)
-        if (danaRPump.userOptionsFrompump == null) {
+        if (danaPump.userOptionsFrompump == null) {
             // No options set -> Exiting
             aapsLogger.debug(LTag.PUMPCOMM, "NO USER OPTIONS LOADED EXITING!")
         } else {
-            danaRPump.userOptionsFrompump!![0] = (if (danaRPump.timeDisplayType == 1) 0 else 1).toByte()
-            danaRPump.userOptionsFrompump!![1] = danaRPump.buttonScrollOnOff.toByte()
-            danaRPump.userOptionsFrompump!![2] = danaRPump.beepAndAlarm.toByte()
-            danaRPump.userOptionsFrompump!![3] = danaRPump.lcdOnTimeSec.toByte()
-            danaRPump.userOptionsFrompump!![4] = danaRPump.backlightOnTimeSec.toByte()
-            danaRPump.userOptionsFrompump!![5] = danaRPump.selectedLanguage.toByte()
-            danaRPump.userOptionsFrompump!![8] = danaRPump.units.toByte()
-            danaRPump.userOptionsFrompump!![9] = danaRPump.shutdownHour.toByte()
-            danaRPump.userOptionsFrompump!![27] = danaRPump.lowReservoirRate.toByte()
-            for (element in danaRPump.userOptionsFrompump!!) {
+            danaPump.userOptionsFrompump!![0] = (if (danaPump.timeDisplayType == 1) 0 else 1).toByte()
+            danaPump.userOptionsFrompump!![1] = danaPump.buttonScrollOnOff.toByte()
+            danaPump.userOptionsFrompump!![2] = danaPump.beepAndAlarm.toByte()
+            danaPump.userOptionsFrompump!![3] = danaPump.lcdOnTimeSec.toByte()
+            danaPump.userOptionsFrompump!![4] = danaPump.backlightOnTimeSec.toByte()
+            danaPump.userOptionsFrompump!![5] = danaPump.selectedLanguage.toByte()
+            danaPump.userOptionsFrompump!![8] = danaPump.units.toByte()
+            danaPump.userOptionsFrompump!![9] = danaPump.shutdownHour.toByte()
+            danaPump.userOptionsFrompump!![27] = danaPump.lowReservoirRate.toByte()
+            for (element in danaPump.userOptionsFrompump!!) {
                 AddParamByte(element)
             }
             aapsLogger.debug(LTag.PUMPCOMM, "New message")
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
index cd1bcdb95d..dbc313ad4e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingActiveProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,8 +15,8 @@ class MsgSettingActiveProfile(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.activeProfile = intFromBuff(bytes, 0, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Active profile number: " + danaRPump.activeProfile)
+        danaPump.activeProfile = intFromBuff(bytes, 0, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Active profile number: " + danaPump.activeProfile)
     }
 
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
index 5984651836..ed377cb020 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
@@ -2,13 +2,13 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.DanaRPlugin
 import java.util.*
 
 class MsgSettingBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRPlugin: DanaRPlugin
 ) : MessageBase() {
 
@@ -18,14 +18,14 @@ class MsgSettingBasal(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        danaPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
         for (index in 0..23) {
             var basal = intFromBuff(bytes, 2 * index, 2)
             if (basal < danaRPlugin.pumpDescription.basalMinimumRate) basal = 0
-            danaRPump.pumpProfiles!![danaRPump.activeProfile][index] = basal / 100.0
+            danaPump.pumpProfiles!![danaPump.activeProfile][index] = basal / 100.0
         }
         for (index in 0..23) {
-            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![danaPump.activeProfile][index])
         }
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
index c87a05a006..b16cdff6b4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 /**
@@ -15,18 +15,18 @@ import java.util.*
  */
 class MsgSettingBasalProfileAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
-        if (danaRPump.basal48Enable) {
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        if (danaPump.basal48Enable) {
             for (profile in 0..3) {
                 val position = intFromBuff(bytes, 107 * profile, 1)
                 for (index in 0..47) {
                     var basal = intFromBuff(bytes, 107 * profile + 2 * index + 1, 2)
                     if (basal < 10) basal = 0
-                    danaRPump.pumpProfiles!![position][index] = basal / 100.0
+                    danaPump.pumpProfiles!![position][index] = basal / 100.0
                 }
             }
         } else {
@@ -36,14 +36,14 @@ class MsgSettingBasalProfileAll(
                     var basal = intFromBuff(bytes, 59 * profile + 2 * index + 1, 2)
                     if (basal < 10) basal = 0
                     aapsLogger.debug(LTag.PUMPCOMM, "position $position index $index")
-                    danaRPump.pumpProfiles!![position][index] = basal / 100.0
+                    danaPump.pumpProfiles!![position][index] = basal / 100.0
                 }
             }
         }
-        if (danaRPump.basal48Enable) {
+        if (danaPump.basal48Enable) {
             for (profile in 0..3) {
                 for (index in 0..47) {
-                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profile][index])
+                    aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![profile][index])
                 }
             }
         } else {
@@ -51,7 +51,7 @@ class MsgSettingBasalProfileAll(
                 for (index in 0..23) { //this is absurd  danaRPump.pumpProfiles[profile][index] returns nullPointerException
                     aapsLogger.debug(LTag.PUMPCOMM, "Basal profile " + profile + ": " + String.format(Locale.ENGLISH, "%02d", index / 2) +
                         ":" + String.format(Locale.ENGLISH, "%02d", index % 2 * 30) + " : " +
-                        danaRPump.pumpProfiles!![profile][index])
+                        danaPump.pumpProfiles!![profile][index])
                 }
             }
         }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
index a46584b16f..f5516d564c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 /**
  * Created by mike on 05.07.2016.
  */
 class MsgSettingGlucose(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -18,9 +18,9 @@ class MsgSettingGlucose(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.units = intFromBuff(bytes, 0, 1)
-        danaRPump.easyBasalMode = intFromBuff(bytes, 1, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaRPump.easyBasalMode)
+        danaPump.units = intFromBuff(bytes, 0, 1)
+        danaPump.easyBasalMode = intFromBuff(bytes, 1, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaPump.easyBasalMode)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
index a16de6951e..acf3578439 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingMaxValues(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,11 +15,11 @@ class MsgSettingMaxValues(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.maxBolus = intFromBuff(bytes, 0, 2) / 100.0
-        danaRPump.maxBasal = intFromBuff(bytes, 2, 2) / 100.0
-        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 4, 2) / 100
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus)
-        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaRPump.maxBasal)
-        aapsLogger.debug(LTag.PUMPCOMM, "Total daily max units: " + danaRPump.maxDailyTotalUnits)
+        danaPump.maxBolus = intFromBuff(bytes, 0, 2) / 100.0
+        danaPump.maxBasal = intFromBuff(bytes, 2, 2) / 100.0
+        danaPump.maxDailyTotalUnits = intFromBuff(bytes, 4, 2) / 100
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaPump.maxBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Total daily max units: " + danaPump.maxDailyTotalUnits)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 74ec24b32e..48ee127a37 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.PluginType
@@ -16,7 +16,7 @@ class MsgSettingMeal(
     private val aapsLogger: AAPSLogger,
     private val rxBus: RxBusWrapper,
     private val resourceHelper: ResourceHelper,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRKoreanPlugin: DanaRKoreanPlugin
 ) : MessageBase() {
 
@@ -26,29 +26,29 @@ class MsgSettingMeal(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.basalStep = intFromBuff(bytes, 0, 1) / 100.0
-        danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
+        danaPump.basalStep = intFromBuff(bytes, 0, 1) / 100.0
+        danaPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
         val bolusEnabled = intFromBuff(bytes, 2, 1) == 1
         val melodyTime = intFromBuff(bytes, 3, 1)
         val blockTime = intFromBuff(bytes, 4, 1)
-        danaRPump.isConfigUD = intFromBuff(bytes, 5, 1) == 1
-        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaRPump.basalStep)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep)
+        danaPump.isConfigUD = intFromBuff(bytes, 5, 1) == 1
+        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaPump.basalStep)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaPump.bolusStep)
         aapsLogger.debug(LTag.PUMPCOMM, "Bolus enabled: $bolusEnabled")
         aapsLogger.debug(LTag.PUMPCOMM, "Melody time: $melodyTime")
         aapsLogger.debug(LTag.PUMPCOMM, "Block time: $blockTime")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is Config U/d: " + danaRPump.isConfigUD)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is Config U/d: " + danaPump.isConfigUD)
         // DanaRKorean is not possible to set to 0.01 but it works when controlled from AAPS
         if (danaRKoreanPlugin.isEnabled(PluginType.PUMP)) {
-            danaRPump.basalStep = 0.01
+            danaPump.basalStep = 0.01
         }
-        if (danaRPump.basalStep != 0.01) {
+        if (danaPump.basalStep != 0.01) {
             val notification = Notification(Notification.WRONGBASALSTEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
             rxBus.send(EventDismissNotification(Notification.WRONGBASALSTEP))
         }
-        if (danaRPump.isConfigUD) {
+        if (danaPump.isConfigUD) {
             val notification = Notification(Notification.UD_MODE_ENABLED, resourceHelper.gs(R.string.danar_switchtouhmode), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
         } else {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
index ee3647e7e8..861660cd6d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingProfileRatios(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,24 +15,24 @@ class MsgSettingProfileRatios(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
-            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
-            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
-            danaRPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
-            danaRPump.currentAIDR = intFromBuff(bytes, 8, 1)
+        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+            danaPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
+            danaPump.currentAIDR = intFromBuff(bytes, 8, 1)
         } else {
-            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
-            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
-            danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
-            danaRPump.currentAIDR = intFromBuff(bytes, 8, 1)
+            danaPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
+            danaPump.currentAIDR = intFromBuff(bytes, 8, 1)
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaRPump.currentTarget)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaRPump.currentAIDR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaPump.currentAIDR)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
index 2ebc3776f6..ba199acfa6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingProfileRatiosAll(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,33 +15,33 @@ class MsgSettingProfileRatiosAll(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
-            danaRPump.morningCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
-            danaRPump.afternoonCIR = intFromBuff(bytes, 4, 2)
-            danaRPump.afternoonCF = intFromBuff(bytes, 6, 2).toDouble()
-            danaRPump.eveningCIR = intFromBuff(bytes, 8, 2)
-            danaRPump.eveningCF = intFromBuff(bytes, 10, 2).toDouble()
-            danaRPump.nightCIR = intFromBuff(bytes, 12, 2)
-            danaRPump.nightCF = intFromBuff(bytes, 14, 2).toDouble()
+        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+            danaPump.morningCIR = intFromBuff(bytes, 0, 2)
+            danaPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaPump.afternoonCIR = intFromBuff(bytes, 4, 2)
+            danaPump.afternoonCF = intFromBuff(bytes, 6, 2).toDouble()
+            danaPump.eveningCIR = intFromBuff(bytes, 8, 2)
+            danaPump.eveningCF = intFromBuff(bytes, 10, 2).toDouble()
+            danaPump.nightCIR = intFromBuff(bytes, 12, 2)
+            danaPump.nightCF = intFromBuff(bytes, 14, 2).toDouble()
         } else {
-            danaRPump.morningCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.morningCF = intFromBuff(bytes, 2, 2) / 100.0
-            danaRPump.afternoonCIR = intFromBuff(bytes, 4, 2)
-            danaRPump.afternoonCF = intFromBuff(bytes, 6, 2) / 100.0
-            danaRPump.eveningCIR = intFromBuff(bytes, 8, 2)
-            danaRPump.eveningCF = intFromBuff(bytes, 10, 2) / 100.0
-            danaRPump.nightCIR = intFromBuff(bytes, 12, 2)
-            danaRPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
+            danaPump.morningCIR = intFromBuff(bytes, 0, 2)
+            danaPump.morningCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaPump.afternoonCIR = intFromBuff(bytes, 4, 2)
+            danaPump.afternoonCF = intFromBuff(bytes, 6, 2) / 100.0
+            danaPump.eveningCIR = intFromBuff(bytes, 8, 2)
+            danaPump.eveningCF = intFromBuff(bytes, 10, 2) / 100.0
+            danaPump.nightCIR = intFromBuff(bytes, 12, 2)
+            danaPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaRPump.afternoonCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaRPump.eveningCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaRPump.eveningCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaRPump.nightCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaRPump.nightCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaPump.afternoonCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaPump.eveningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaPump.eveningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaPump.nightCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaPump.nightCF)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 553bce504c..88ecc856e4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -2,14 +2,14 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
 import java.util.*
 
 class MsgSettingPumpTime(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val dateUtil: DateUtil
 ) : MessageBase() {
 
@@ -28,10 +28,10 @@ class MsgSettingPumpTime(
             intFromBuff(bytes, 0, 1)
         ).millis
         aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + dateUtil.dateAndTimeString(time) + " Phone time: " + Date())
-        danaRPump.pumpTime = time
+        danaPump.pumpTime = time
     }
 
     override fun handleMessageNotReceived() {
-        danaRPump.pumpTime = 0
+        danaPump.pumpTime = 0
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
index 586f91515b..a0540c4524 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingShippingInfo(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,11 +15,11 @@ class MsgSettingShippingInfo(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.serialNumber = stringFromBuff(bytes, 0, 10)
-        danaRPump.shippingDate = dateFromBuff(bytes, 10)
-        danaRPump.shippingCountry = asciiStringFromBuff(bytes, 13, 3)
-        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaRPump.serialNumber)
-        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + danaRPump.shippingDate)
-        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaRPump.shippingCountry)
+        danaPump.serialNumber = stringFromBuff(bytes, 0, 10)
+        danaPump.shippingDate = dateFromBuff(bytes, 10)
+        danaPump.shippingCountry = asciiStringFromBuff(bytes, 13, 3)
+        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaPump.serialNumber)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + danaPump.shippingDate)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaPump.shippingCountry)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index 096547aa24..d687513c94 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 class MsgSettingUserOptions(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
 
@@ -18,34 +18,34 @@ class MsgSettingUserOptions(
 
     override fun handleMessage(packet: ByteArray) {
         val bytes = getDataBytes(packet, packet.size - 10)
-        danaRPump.userOptionsFrompump = Arrays.copyOf(bytes, bytes!!.size) // saving pumpDataBytes to use it in MsgSetUserOptions
+        danaPump.userOptionsFrompump = Arrays.copyOf(bytes, bytes!!.size) // saving pumpDataBytes to use it in MsgSetUserOptions
         for (pos in bytes.indices) {
             aapsLogger.debug(LTag.PUMPCOMM, "[" + pos + "]" + bytes[pos])
         }
-        danaRPump.timeDisplayType = if (bytes[0] == 1.toByte()) 0 else 1 // 1 -> 24h 0 -> 12h
-        danaRPump.buttonScrollOnOff = if (bytes[1] == 1.toByte()) 1 else 0 // 1 -> ON, 0-> OFF
-        danaRPump.beepAndAlarm = bytes[2].toInt() // 1 -> Sound on alarm 2-> Vibrate on alarm 3-> Both on alarm 5-> Sound + beep 6-> vibrate + beep 7-> both + beep Beep adds 4
-        danaRPump.lcdOnTimeSec = bytes[3].toInt() and 255
-        danaRPump.backlightOnTimeSec = bytes[4].toInt() and 255
-        danaRPump.selectedLanguage = bytes[5].toInt() // on DanaRv2 is that needed ?
-        danaRPump.units = bytes[8].toInt()
-        danaRPump.shutdownHour = bytes[9].toInt()
-        danaRPump.lowReservoirRate = bytes[32].toInt() and 255
+        danaPump.timeDisplayType = if (bytes[0] == 1.toByte()) 0 else 1 // 1 -> 24h 0 -> 12h
+        danaPump.buttonScrollOnOff = if (bytes[1] == 1.toByte()) 1 else 0 // 1 -> ON, 0-> OFF
+        danaPump.beepAndAlarm = bytes[2].toInt() // 1 -> Sound on alarm 2-> Vibrate on alarm 3-> Both on alarm 5-> Sound + beep 6-> vibrate + beep 7-> both + beep Beep adds 4
+        danaPump.lcdOnTimeSec = bytes[3].toInt() and 255
+        danaPump.backlightOnTimeSec = bytes[4].toInt() and 255
+        danaPump.selectedLanguage = bytes[5].toInt() // on DanaRv2 is that needed ?
+        danaPump.units = bytes[8].toInt()
+        danaPump.shutdownHour = bytes[9].toInt()
+        danaPump.lowReservoirRate = bytes[32].toInt() and 255
         /* int selectableLanguage1 = bytes[10];
         int selectableLanguage2 = bytes[11];
         int selectableLanguage3 = bytes[12];
         int selectableLanguage4 = bytes[13];
         int selectableLanguage5 = bytes[14];
         */
-        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaRPump.timeDisplayType)
-        aapsLogger.debug(LTag.PUMPCOMM, "Button scroll: " + danaRPump.buttonScrollOnOff)
-        aapsLogger.debug(LTag.PUMPCOMM, "BeepAndAlarm: " + danaRPump.beepAndAlarm)
-        aapsLogger.debug(LTag.PUMPCOMM, "screen timeout: " + danaRPump.lcdOnTimeSec)
-        aapsLogger.debug(LTag.PUMPCOMM, "BackLight: " + danaRPump.backlightOnTimeSec)
-        aapsLogger.debug(LTag.PUMPCOMM, "Selected language: " + danaRPump.selectedLanguage)
-        aapsLogger.debug(LTag.PUMPCOMM, "Units: " + danaRPump.getUnits())
-        aapsLogger.debug(LTag.PUMPCOMM, "Shutdown: " + danaRPump.shutdownHour)
-        aapsLogger.debug(LTag.PUMPCOMM, "Low reservoir: " + danaRPump.lowReservoirRate)
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "Button scroll: " + danaPump.buttonScrollOnOff)
+        aapsLogger.debug(LTag.PUMPCOMM, "BeepAndAlarm: " + danaPump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "screen timeout: " + danaPump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "BackLight: " + danaPump.backlightOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "Selected language: " + danaPump.selectedLanguage)
+        aapsLogger.debug(LTag.PUMPCOMM, "Units: " + danaPump.getUnits())
+        aapsLogger.debug(LTag.PUMPCOMM, "Shutdown: " + danaPump.shutdownHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "Low reservoir: " + danaPump.lowReservoirRate)
     }
 
     private fun getDataBytes(bytes: ByteArray?, len: Int): ByteArray? {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
index abe8e7f524..2160ba8616 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatus(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 
 ) : MessageBase() {
 
@@ -16,22 +16,22 @@ class MsgStatus(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
-        danaRPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
-        danaRPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
-        danaRPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
+        danaPump.dailyTotalUnits = intFromBuff(bytes, 0, 3) / 750.0
+        danaPump.isExtendedInProgress = intFromBuff(bytes, 3, 1) == 1
+        danaPump.extendedBolusMinutes = intFromBuff(bytes, 4, 2)
+        danaPump.extendedBolusAmount = intFromBuff(bytes, 6, 2) / 100.0
         val lastBolusAmount = intFromBuff(bytes, 13, 2) / 100.0
         if (lastBolusAmount != 0.0) {
-            danaRPump.lastBolusTime = dateTimeFromBuff(bytes, 8)
-            danaRPump.lastBolusAmount = lastBolusAmount
+            danaPump.lastBolusTime = dateTimeFromBuff(bytes, 8)
+            danaPump.lastBolusAmount = lastBolusAmount
         }
-        danaRPump.iob = intFromBuff(bytes, 15, 2) / 100.0
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaRPump.extendedBolusMinutes)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaRPump.extendedBolusAmount)
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + danaRPump.lastBolusTime)
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
-        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaRPump.iob)
+        danaPump.iob = intFromBuff(bytes, 15, 2) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: " + danaPump.extendedBolusMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus amount: " + danaPump.extendedBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + danaPump.lastBolusTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaPump.lastBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "IOB: " + danaPump.iob)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
index 41d40907f7..087eedeb77 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatusBasic(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,25 +15,25 @@ class MsgStatusBasic(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaRPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
-        danaRPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
-        danaRPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
-        danaRPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
-        danaRPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
-        danaRPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
-        danaRPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
+        danaPump.pumpSuspended = intFromBuff(bytes, 0, 1) == 1
+        danaPump.calculatorEnabled = intFromBuff(bytes, 1, 1) == 1
+        danaPump.dailyTotalUnits = intFromBuff(bytes, 2, 3) / 750.0
+        danaPump.maxDailyTotalUnits = intFromBuff(bytes, 5, 2) / 100
+        danaPump.reservoirRemainingUnits = intFromBuff(bytes, 7, 3) / 750.0
+        danaPump.bolusBlocked = intFromBuff(bytes, 10, 1) == 1
+        danaPump.currentBasal = intFromBuff(bytes, 11, 2) / 100.0
         // removed. info taken from tempstatus message
         //pump.tempBasalPercent = intFromBuff(bytes, 13, 1);
         //pump.isExtendedInProgress = intFromBuff(bytes, 14, 1) == 1;
         //pump.isTempBasalInProgress = intFromBuff(bytes, 15, 1) == 1;
-        danaRPump.batteryRemaining = intFromBuff(bytes, 20, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
-        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaRPump.calculatorEnabled)
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaRPump.maxDailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaRPump.bolusBlocked)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
+        danaPump.batteryRemaining = intFromBuff(bytes, 20, 1)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Calculator enabled: " + danaPump.calculatorEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily total units: " + danaPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus blocked: " + danaPump.bolusBlocked)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaPump.currentBasal)
         //aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + pump.tempBasalPercent);
         //aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + pump.isExtendedInProgress);
         //aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: " + pump.isTempBasalInProgress);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index 9ef8c39c9f..b6e707b96c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -6,14 +6,14 @@ import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended(
     private val injector: HasAndroidInjector,
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val activePlugin: ActivePluginProvider,
     private val dateUtil: DateUtil
 ) : MessageBase() {
@@ -36,13 +36,13 @@ class MsgStatusBolusExtended(
         val extendedBolusAbsoluteRate = if (isExtendedInProgress) extendedBolusAmount / extendedBolusMinutes * 60 else 0.0
         val extendedBolusStart = if (isExtendedInProgress) getDateFromSecAgo(extendedBolusSoFarInSecs) else 0
         val extendedBolusRemainingMinutes = extendedBolusMinutes - extendedBolusSoFarInMinutes
-        danaRPump.isExtendedInProgress = isExtendedInProgress
-        danaRPump.extendedBolusMinutes = extendedBolusMinutes
-        danaRPump.extendedBolusAmount = extendedBolusAmount
-        danaRPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
-        danaRPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
-        danaRPump.extendedBolusStart = extendedBolusStart
-        danaRPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
+        danaPump.isExtendedInProgress = isExtendedInProgress
+        danaPump.extendedBolusMinutes = extendedBolusMinutes
+        danaPump.extendedBolusAmount = extendedBolusAmount
+        danaPump.extendedBolusSoFarInMinutes = extendedBolusSoFarInMinutes
+        danaPump.extendedBolusAbsoluteRate = extendedBolusAbsoluteRate
+        danaPump.extendedBolusStart = extendedBolusStart
+        danaPump.extendedBolusRemainingMinutes = extendedBolusRemainingMinutes
         updateExtendedBolusInDB()
         aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: $isExtendedInProgress")
         aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus min: $extendedBolusMinutes")
@@ -61,16 +61,16 @@ class MsgStatusBolusExtended(
         val now = System.currentTimeMillis()
         val extendedBolus = activePlugin.activeTreatments.getExtendedBolusFromHistory(System.currentTimeMillis())
         if (extendedBolus != null) {
-            if (danaRPump.isExtendedInProgress) {
-                if (extendedBolus.absoluteRate() != danaRPump.extendedBolusAbsoluteRate) { // Close current extended
-                    val exStop = ExtendedBolus(injector, danaRPump.extendedBolusStart - 1000)
+            if (danaPump.isExtendedInProgress) {
+                if (extendedBolus.absoluteRate() != danaPump.extendedBolusAbsoluteRate) { // Close current extended
+                    val exStop = ExtendedBolus(injector, danaPump.extendedBolusStart - 1000)
                     exStop.source = Source.USER
                     activePlugin.activeTreatments.addToHistoryExtendedBolus(exStop)
                     // Create new
                     val newExtended = ExtendedBolus(injector)
-                        .date(danaRPump.extendedBolusStart)
-                        .insulin(danaRPump.extendedBolusAmount)
-                        .durationInMinutes(danaRPump.extendedBolusMinutes)
+                        .date(danaPump.extendedBolusStart)
+                        .insulin(danaPump.extendedBolusAmount)
+                        .durationInMinutes(danaPump.extendedBolusMinutes)
                         .source(Source.USER)
                     activePlugin.activeTreatments.addToHistoryExtendedBolus(newExtended)
                 }
@@ -81,11 +81,11 @@ class MsgStatusBolusExtended(
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(exStop)
             }
         } else {
-            if (danaRPump.isExtendedInProgress) { // Create new
+            if (danaPump.isExtendedInProgress) { // Create new
                 val newExtended = ExtendedBolus(injector)
-                    .date(danaRPump.extendedBolusStart)
-                    .insulin(danaRPump.extendedBolusAmount)
-                    .durationInMinutes(danaRPump.extendedBolusMinutes)
+                    .date(danaPump.extendedBolusStart)
+                    .insulin(danaPump.extendedBolusAmount)
+                    .durationInMinutes(danaPump.extendedBolusMinutes)
                     .source(Source.USER)
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(newExtended)
             }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
index 63e0eb0fc0..263cdf8b9b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
@@ -2,11 +2,11 @@ package info.nightscout.androidaps.danar.comm
 
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatusProfile(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump
+    private val danaPump: DanaPump
 ) : MessageBase() {
 
     init {
@@ -15,22 +15,22 @@ class MsgStatusProfile(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
-            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
-            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
-            danaRPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
+        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+            danaPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
+            danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaPump.currentTarget = intFromBuff(bytes, 6, 2).toDouble()
         } else {
-            danaRPump.currentCIR = intFromBuff(bytes, 0, 2)
-            danaRPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
-            danaRPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
-            danaRPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
+            danaPump.currentCIR = intFromBuff(bytes, 0, 2)
+            danaPump.currentCF = intFromBuff(bytes, 2, 2) / 100.0
+            danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
+            danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaRPump.currentCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaRPump.currentCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaRPump.currentAI)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaRPump.currentTarget)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaRPump.currentAIDR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump target: " + danaPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump AIDR: " + danaPump.currentAIDR)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
index 67ff7fadfb..d8791c83ab 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
@@ -6,12 +6,12 @@ import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import kotlin.math.ceil
 
 class MsgStatusTempBasal(
     private val aapsLogger: AAPSLogger,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector
 ) : MessageBase() {
@@ -30,11 +30,11 @@ class MsgStatusTempBasal(
         val tempBasalRunningSeconds = intFromBuff(bytes, 3, 3)
         val tempBasalRemainingMin = (tempBasalTotalSec - tempBasalRunningSeconds) / 60
         val tempBasalStart = if (isTempBasalInProgress) getDateFromTempBasalSecAgo(tempBasalRunningSeconds) else 0
-        danaRPump.isTempBasalInProgress = isTempBasalInProgress
-        danaRPump.tempBasalPercent = tempBasalPercent
-        danaRPump.tempBasalRemainingMin = tempBasalRemainingMin
-        danaRPump.tempBasalTotalSec = tempBasalTotalSec
-        danaRPump.tempBasalStart = tempBasalStart
+        danaPump.isTempBasalInProgress = isTempBasalInProgress
+        danaPump.tempBasalPercent = tempBasalPercent
+        danaPump.tempBasalRemainingMin = tempBasalRemainingMin
+        danaPump.tempBasalTotalSec = tempBasalTotalSec
+        danaPump.tempBasalStart = tempBasalStart
         updateTempBasalInDB()
         aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: $isTempBasalInProgress")
         aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
@@ -52,15 +52,15 @@ class MsgStatusTempBasal(
         val now = System.currentTimeMillis()
         if (activePlugin.activeTreatments.isInHistoryRealTempBasalInProgress) {
             val tempBasal = activePlugin.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())
-            if (danaRPump.isTempBasalInProgress) {
-                if (tempBasal.percentRate != danaRPump.tempBasalPercent) { // Close current temp basal
-                    val tempStop = TemporaryBasal(injector).date(danaRPump.tempBasalStart - 1000).source(Source.USER)
+            if (danaPump.isTempBasalInProgress) {
+                if (tempBasal.percentRate != danaPump.tempBasalPercent) { // Close current temp basal
+                    val tempStop = TemporaryBasal(injector).date(danaPump.tempBasalStart - 1000).source(Source.USER)
                     activePlugin.activeTreatments.addToHistoryTempBasal(tempStop)
                     // Create new
                     val newTempBasal = TemporaryBasal(injector)
-                        .date(danaRPump.tempBasalStart)
-                        .percent(danaRPump.tempBasalPercent)
-                        .duration(danaRPump.tempBasalTotalSec / 60)
+                        .date(danaPump.tempBasalStart)
+                        .percent(danaPump.tempBasalPercent)
+                        .duration(danaPump.tempBasalTotalSec / 60)
                         .source(Source.USER)
                     activePlugin.activeTreatments.addToHistoryTempBasal(newTempBasal)
                 }
@@ -69,11 +69,11 @@ class MsgStatusTempBasal(
                 activePlugin.activeTreatments.addToHistoryTempBasal(tempStop)
             }
         } else {
-            if (danaRPump.isTempBasalInProgress) { // Create new
+            if (danaPump.isTempBasalInProgress) { // Create new
                 val newTempBasal = TemporaryBasal(injector)
-                    .date(danaRPump.tempBasalStart)
-                    .percent(danaRPump.tempBasalPercent)
-                    .duration(danaRPump.tempBasalTotalSec / 60)
+                    .date(danaPump.tempBasalStart)
+                    .percent(danaPump.tempBasalPercent)
+                    .duration(danaPump.tempBasalTotalSec / 60)
                     .source(Source.USER)
                 activePlugin.activeTreatments.addToHistoryTempBasal(newTempBasal)
             }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt
new file mode 100644
index 0000000000..198592c13a
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRServicesModule.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.danar.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
+import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService
+import info.nightscout.androidaps.danar.services.AbstractDanaRExecutionService
+import info.nightscout.androidaps.danar.services.DanaRExecutionService
+
+@Module
+@Suppress("unused")
+abstract class DanaRServicesModule {
+
+    @ContributesAndroidInjector abstract fun contributesAbstractDanaRExecutionService(): AbstractDanaRExecutionService
+    @ContributesAndroidInjector abstract fun contributesDanaRv2ExecutionService(): DanaRv2ExecutionService
+    @ContributesAndroidInjector abstract fun contributesDanaRExecutionService(): DanaRExecutionService
+    @ContributesAndroidInjector abstract fun contributesDanaRKoreanExecutionService(): DanaRKoreanExecutionService
+}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 0d94d3797f..63174d70c4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -16,7 +16,7 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
 import info.nightscout.androidaps.danar.R;
 import info.nightscout.androidaps.danar.SerialIOThread;
@@ -62,7 +62,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     @Inject SP sp;
     @Inject Context context;
     @Inject ResourceHelper resourceHelper;
-    @Inject DanaRPump danaRPump;
+    @Inject DanaPump danaPump;
     @Inject FabricPrivacy fabricPrivacy;
     @Inject DateUtil dateUtil;
     @Inject DatabaseHelperInterface databaseHelper;
@@ -213,16 +213,16 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
 
     public void bolusStop() {
         aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
-        MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaRPump);
-        danaRPump.setBolusStopForced(true);
+        MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump);
+        danaPump.setBolusStopForced(true);
         if (isConnected()) {
             mSerialIOThread.sendMessage(stop);
-            while (!danaRPump.getBolusStopped()) {
+            while (!danaPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(stop);
                 SystemClock.sleep(200);
             }
         } else {
-            danaRPump.setBolusStopped(true);
+            danaPump.setBolusStopped(true);
         }
     }
 
@@ -259,11 +259,11 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
                 msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper);
                 break;
         }
-        danaRPump.setHistoryDoneReceived(false);
+        danaPump.setHistoryDoneReceived(false);
         mSerialIOThread.sendMessage(new MsgPCCommStart(aapsLogger));
         SystemClock.sleep(400);
         mSerialIOThread.sendMessage(msg);
-        while (!danaRPump.getHistoryDoneReceived() && mRfcommSocket.isConnected()) {
+        while (!danaPump.getHistoryDoneReceived() && mRfcommSocket.isConnected()) {
             SystemClock.sleep(100);
         }
         SystemClock.sleep(200);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index f7e52e9ff9..e5a8dd7644 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -10,7 +10,7 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.Constants;
-import info.nightscout.androidaps.dana.DanaRPump;
+import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
 import info.nightscout.androidaps.danar.DanaRPlugin;
@@ -72,7 +72,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject ConstraintChecker constraintChecker;
-    @Inject DanaRPump danaRPump;
+    @Inject DanaPump danaPump;
     @Inject DanaRPlugin danaRPlugin;
     @Inject DanaRKoreanPlugin danaRKoreanPlugin;
     @Inject CommandQueueProvider commandQueue;
@@ -124,7 +124,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 if (mSerialIOThread != null) {
                     mSerialIOThread.disconnect("Recreate SerialIOThread");
                 }
-                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableR, danaRPump);
+                mSerialIOThread = new SerialIOThread(aapsLogger, mRfcommSocket, messageHashTableR, danaPump);
                 mHandshakeInProgress = true;
                 rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.HANDSHAKING, 0));
             }
@@ -136,13 +136,13 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaRPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaRPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil);
-            MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaRPump, danaRPlugin);
+            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
+            MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaPump, danaRPlugin);
 
-            if (danaRPump.isNewPump()) {
+            if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
                 if (!checkValue.received) {
                     return;
@@ -158,60 +158,60 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
 
             long now = System.currentTimeMillis();
-            danaRPump.setLastConnection(now);
+            danaPump.setLastConnection(now);
 
             Profile profile = profileFunction.getProfile();
-            if (profile != null && Math.abs(danaRPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().basalStep) {
+            if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
                 if (!danaRPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
-            if (danaRPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
+            if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaRPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaRPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaRPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-                if (danaRPump.getPumpTime() == 0) {
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
-                    danaRPump.reset();
+                    danaPump.reset();
                     rxBus.send(new EventDanaRNewStatus());
                     rxBus.send(new EventInitializationChanged());
                     return;
                 }
-                long timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                long timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                 aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
                     mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date()));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaRPump, dateUtil));
-                    timeDiff = (danaRPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
-                danaRPump.setLastSettingsRead(now);
+                danaPump.setLastSettingsRead(now);
             }
 
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
             //NSUpload.uploadDeviceStatus();
-            if (danaRPump.getDailyTotalUnits() > danaRPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
-                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits());
+            if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     Notification reportFail = new Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT);
                     rxBus.send(new EventNewNotification(reportFail));
-                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.getDailyTotalUnits() + "/" + danaRPump.getMaxDailyTotalUnits() + "U");
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits() + "U");
                     lastApproachingDailyLimit = System.currentTimeMillis();
                 }
             }
@@ -222,14 +222,14 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
     public boolean tempBasal(int percent, int durationInHours) {
         if (!isConnected()) return false;
-        if (danaRPump.isTempBasalInProgress()) {
+        if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
             mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -238,7 +238,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
         mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -247,7 +247,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -256,7 +256,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
         mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaRPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -274,32 +274,32 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaRPump, amount);
+            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaRPump, amount, preferencesSpeed);
-        danaRPump.setBolusStopped(false);
-        danaRPump.setBolusStopForced(false);
+            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+        danaPump.setBolusStopped(false);
+        danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
             mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
         }
 
         if (amount > 0) {
-            danaRPump.setBolusingTreatment(t);
-            danaRPump.setBolusAmountToBeDelivered(amount);
+            danaPump.setBolusingTreatment(t);
+            danaPump.setBolusAmountToBeDelivered(amount);
             long bolusStart = System.currentTimeMillis();
 
-            if (!danaRPump.getBolusStopped()) {
+            if (!danaPump.getBolusStopped()) {
                 mSerialIOThread.sendMessage(start);
             } else {
                 t.insulin = 0d;
                 return false;
             }
-            while (!danaRPump.getBolusStopped() && !start.failed) {
+            while (!danaPump.getBolusStopped() && !start.failed) {
                 SystemClock.sleep(100);
-                if ((System.currentTimeMillis() - danaRPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
-                    danaRPump.setBolusStopped(true);
-                    danaRPump.setBolusStopForced(true);
+                if ((System.currentTimeMillis() - danaPump.getBolusProgressLastTimeStamp()) > 15 * 1000L) { // if i didn't receive status for more than 15 sec expecting broken comm
+                    danaPump.setBolusStopped(true);
+                    danaPump.setBolusStopForced(true);
                     aapsLogger.debug(LTag.PUMP, "Communication stopped");
                 }
             }
@@ -341,11 +341,11 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                     commandQueue.independentConnect("bolusingInterrupted", new Callback() {
                         @Override
                         public void run() {
-                            if (danaRPump.getLastBolusTime() > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
-                                t.insulin = danaRPump.getLastBolusAmount();
-                                aapsLogger.debug(LTag.PUMP, "Used bolus amount from history: " + danaRPump.getLastBolusAmount());
+                            if (danaPump.getLastBolusTime() > System.currentTimeMillis() - 60 * 1000L) { // last bolus max 1 min old
+                                t.insulin = danaPump.getLastBolusAmount();
+                                aapsLogger.debug(LTag.PUMP, "Used bolus amount from history: " + danaPump.getLastBolusAmount());
                             } else {
-                                aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + dateUtil.dateAndTimeString(danaRPump.getLastBolusTime()));
+                                aapsLogger.debug(LTag.PUMP, "Bolus amount in history too old: " + dateUtil.dateAndTimeString(danaPump.getLastBolusTime()));
                             }
                             synchronized (o) {
                                 o.notify();
@@ -385,12 +385,12 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean updateBasalsInPump(final Profile profile) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
-        Double[] basal = danaRPump.buildDanaRProfileRecord(profile);
+        Double[] basal = danaPump.buildDanaRProfileRecord(profile);
         MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
         MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
-        danaRPump.setLastSettingsRead(0); // force read full settings
+        danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -400,7 +400,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaRPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 96695dca2f..37aa73b877 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -9,7 +9,7 @@ import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPumpInterface
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -55,14 +55,14 @@ class DanaRSPlugin @Inject constructor(
     private val activePluginProvider: ActivePluginProvider,
     private val sp: SP,
     commandQueue: CommandQueueProvider,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val fabricPrivacy: FabricPrivacy,
     private val dateUtil: DateUtil,
     private val config: ConfigInterface
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
-    .fragmentClass(info.nightscout.androidaps.dana.DanaRFragment::class.java.name)
+    .fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name)
     .pluginName(R.string.danarspump)
     .shortName(R.string.danarspump_shortname)
     .preferencesId(R.xml.pref_danars)
@@ -98,7 +98,7 @@ class DanaRSPlugin @Inject constructor(
         disposable.add(rxBus
             .toObservable(EventConfigBuilderChange::class.java)
             .observeOn(Schedulers.io())
-            .subscribe { danaRPump.reset() }
+            .subscribe { danaPump.reset() }
         )
         disposable.add(rxBus
             .toObservable(EventDanaRSDeviceChange::class.java)
@@ -130,7 +130,7 @@ class DanaRSPlugin @Inject constructor(
     fun changePump() {
         mDeviceAddress = sp.getString(R.string.key_danars_address, "")
         mDeviceName = sp.getString(R.string.key_danars_name, "")
-        danaRPump.reset()
+        danaPump.reset()
         commandQueue.readStatus("DeviceChanged", null)
     }
 
@@ -138,7 +138,7 @@ class DanaRSPlugin @Inject constructor(
         aapsLogger.debug(LTag.PUMP, "RS connect from: $from")
         if (danaRSService != null && mDeviceAddress != "" && mDeviceName != "") {
             val success = danaRSService?.connect(from, mDeviceAddress) ?: false
-            if (!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
+            if (!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.ble_not_supported))
         }
     }
 
@@ -166,8 +166,8 @@ class DanaRSPlugin @Inject constructor(
 
     override fun getPumpStatus() {
         danaRSService?.readPumpStatus()
-        pumpDesc.basalStep = danaRPump.basalStep
-        pumpDesc.bolusStep = danaRPump.bolusStep
+        pumpDesc.basalStep = danaPump.basalStep
+        pumpDesc.bolusStep = danaPump.bolusStep
     }
 
     // DanaR interface
@@ -185,7 +185,7 @@ class DanaRSPlugin @Inject constructor(
 
     // Constraints interface
     override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
-        absoluteRate.setIfSmaller(aapsLogger, danaRPump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, danaRPump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        absoluteRate.setIfSmaller(aapsLogger, danaPump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, danaPump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
         return absoluteRate
     }
 
@@ -196,7 +196,7 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
-        insulin.setIfSmaller(aapsLogger, danaRPump.maxBolus, resourceHelper.gs(R.string.limitingbolus, danaRPump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        insulin.setIfSmaller(aapsLogger, danaPump.maxBolus, resourceHelper.gs(R.string.limitingbolus, danaPump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
         return insulin
     }
 
@@ -206,11 +206,11 @@ class DanaRSPlugin @Inject constructor(
 
     // Pump interface
     override fun isInitialized(): Boolean {
-        return danaRPump.lastConnection > 0 && danaRPump.maxBasal > 0 && danaRPump.isRSPasswordOK
+        return danaPump.lastConnection > 0 && danaPump.maxBasal > 0 && danaPump.isRSPasswordOK
     }
 
     override fun isSuspended(): Boolean {
-        return danaRPump.pumpSuspended
+        return danaPump.pumpSuspended
     }
 
     override fun isBusy(): Boolean {
@@ -247,11 +247,11 @@ class DanaRSPlugin @Inject constructor(
 
     override fun isThisProfileSet(profile: Profile): Boolean {
         if (!isInitialized) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        if (danaRPump.pumpProfiles == null) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
-        val basalValues = if (danaRPump.basal48Enable) 48 else 24
-        val basalIncrement = if (danaRPump.basal48Enable) 30 * 60 else 60 * 60
+        if (danaPump.pumpProfiles == null) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        val basalValues = if (danaPump.basal48Enable) 48 else 24
+        val basalIncrement = if (danaPump.basal48Enable) 30 * 60 else 60 * 60
         for (h in 0 until basalValues) {
-            val pumpValue = danaRPump.pumpProfiles!![danaRPump.activeProfile][h]
+            val pumpValue = danaPump.pumpProfiles!![danaPump.activeProfile][h]
             val profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement)
             if (abs(pumpValue - profileValue) > pumpDescription.basalStep) {
                 aapsLogger.debug(LTag.PUMP, "Diff found. Hour: $h Pump: $pumpValue Profile: $profileValue")
@@ -262,19 +262,19 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun lastDataTime(): Long {
-        return danaRPump.lastConnection
+        return danaPump.lastConnection
     }
 
     override fun getBaseBasalRate(): Double {
-        return danaRPump.currentBasal
+        return danaPump.currentBasal
     }
 
     override fun getReservoirLevel(): Double {
-        return danaRPump.reservoirRemainingUnits
+        return danaPump.reservoirRemainingUnits
     }
 
     override fun getBatteryLevel(): Int {
-        return danaRPump.batteryRemaining
+        return danaPump.batteryRemaining
     }
 
     @Synchronized
@@ -309,8 +309,8 @@ class DanaRSPlugin @Inject constructor(
             result.bolusDelivered = t.insulin
             result.carbsDelivered = detailedBolusInfo.carbs
             if (!result.success) {
-                var error = "" + danaRPump.bolusStartErrorCode
-                when (danaRPump.bolusStartErrorCode) {
+                var error = "" + danaPump.bolusStartErrorCode
+                when (danaPump.bolusStartErrorCode) {
                     0x10 -> error = resourceHelper.gs(R.string.maxbolusviolation)
                     0x20 -> error = resourceHelper.gs(R.string.commanderror)
                     0x40 -> error = resourceHelper.gs(R.string.speederror)
@@ -422,8 +422,8 @@ class DanaRSPlugin @Inject constructor(
             result.success = true
             result.isTempCancel = false
             result.comment = resourceHelper.gs(R.string.ok)
-            result.duration = danaRPump.tempBasalRemainingMin
-            result.percent = danaRPump.tempBasalPercent
+            result.duration = danaPump.tempBasalRemainingMin
+            result.percent = danaPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set")
             return result
@@ -436,13 +436,13 @@ class DanaRSPlugin @Inject constructor(
             val durationInHours = max(durationInMinutes / 60, 1)
             danaRSService?.tempBasal(percentAfterConstraint, durationInHours) ?: false
         }
-        if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percentAfterConstraint) {
+        if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percentAfterConstraint) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
-            result.duration = danaRPump.tempBasalRemainingMin
-            result.percent = danaRPump.tempBasalPercent
+            result.duration = danaPump.tempBasalRemainingMin
+            result.percent = danaPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: OK")
             return result
@@ -457,13 +457,13 @@ class DanaRSPlugin @Inject constructor(
     @Synchronized private fun setHighTempBasalPercent(percent: Int): PumpEnactResult {
         val result = PumpEnactResult(injector)
         val connectionOK = danaRSService?.highTempBasal(percent) ?: false
-        if (connectionOK && danaRPump.isTempBasalInProgress && danaRPump.tempBasalPercent == percent) {
+        if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percent) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
-            result.duration = danaRPump.tempBasalRemainingMin
-            result.percent = danaRPump.tempBasalPercent
+            result.duration = danaPump.tempBasalRemainingMin
+            result.percent = danaPump.tempBasalPercent
             result.isPercent = true
             aapsLogger.debug(LTag.PUMP, "setHighTempBasalPercent: OK")
             return result
@@ -487,23 +487,23 @@ class DanaRSPlugin @Inject constructor(
             result.enacted = false
             result.success = true
             result.comment = resourceHelper.gs(R.string.ok)
-            result.duration = danaRPump.extendedBolusRemainingMinutes
-            result.absolute = danaRPump.extendedBolusAbsoluteRate
+            result.duration = danaPump.extendedBolusRemainingMinutes
+            result.absolute = danaPump.extendedBolusAbsoluteRate
             result.isPercent = false
             result.isTempCancel = false
-            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + danaRPump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + danaPump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
             return result
         }
         val connectionOK = danaRSService?.extendedBolus(insulinAfterConstraint, durationInHalfHours)
             ?: false
-        if (connectionOK && danaRPump.isExtendedInProgress && abs(danaRPump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+        if (connectionOK && danaPump.isExtendedInProgress && abs(danaPump.extendedBolusAbsoluteRate - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
             result.enacted = true
             result.success = true
             result.comment = resourceHelper.gs(R.string.ok)
             result.isTempCancel = false
-            result.duration = danaRPump.extendedBolusRemainingMinutes
-            result.absolute = danaRPump.extendedBolusAbsoluteRate
-            result.bolusDelivered = danaRPump.extendedBolusAmount
+            result.duration = danaPump.extendedBolusRemainingMinutes
+            result.absolute = danaPump.extendedBolusAbsoluteRate
+            result.bolusDelivered = danaPump.extendedBolusAmount
             result.isPercent = false
             aapsLogger.debug(LTag.PUMP, "setExtendedBolus: OK")
             return result
@@ -524,7 +524,7 @@ class DanaRSPlugin @Inject constructor(
             result.enacted = true
             result.isTempCancel = true
         }
-        return if (!danaRPump.isTempBasalInProgress) {
+        return if (!danaPump.isTempBasalInProgress) {
             result.success = true
             result.isTempCancel = true
             result.comment = resourceHelper.gs(R.string.ok)
@@ -547,7 +547,7 @@ class DanaRSPlugin @Inject constructor(
             result.enacted = true
             result.isTempCancel = true
         }
-        return if (!danaRPump.isExtendedInProgress) {
+        return if (!danaPump.isExtendedInProgress) {
             result.success = true
             result.comment = resourceHelper.gs(R.string.ok)
             aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
@@ -562,7 +562,7 @@ class DanaRSPlugin @Inject constructor(
 
     override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
         val now = System.currentTimeMillis()
-        if (danaRPump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (danaPump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
             return JSONObject()
         }
         val pumpJson = JSONObject()
@@ -570,13 +570,13 @@ class DanaRSPlugin @Inject constructor(
         val status = JSONObject()
         val extended = JSONObject()
         try {
-            battery.put("percent", danaRPump.batteryRemaining)
-            status.put("status", if (danaRPump.pumpSuspended) "suspended" else "normal")
-            status.put("timestamp", DateUtil.toISOString(danaRPump.lastConnection))
+            battery.put("percent", danaPump.batteryRemaining)
+            status.put("status", if (danaPump.pumpSuspended) "suspended" else "normal")
+            status.put("timestamp", DateUtil.toISOString(danaPump.lastConnection))
             extended.put("Version", version)
-            if (danaRPump.lastBolusTime != 0L) {
-                extended.put("LastBolus", dateUtil.dateAndTimeString(danaRPump.lastBolusTime))
-                extended.put("LastBolusAmount", danaRPump.lastBolusAmount)
+            if (danaPump.lastBolusTime != 0L) {
+                extended.put("LastBolus", dateUtil.dateAndTimeString(danaPump.lastBolusTime))
+                extended.put("LastBolusAmount", danaPump.lastBolusAmount)
             }
             val tb = activePluginProvider.activeTreatments.getTempBasalFromHistory(now)
             if (tb != null) {
@@ -599,7 +599,7 @@ class DanaRSPlugin @Inject constructor(
             pumpJson.put("battery", battery)
             pumpJson.put("status", status)
             pumpJson.put("extended", extended)
-            pumpJson.put("reservoir", danaRPump.reservoirRemainingUnits.toInt())
+            pumpJson.put("reservoir", danaPump.reservoirRemainingUnits.toInt())
             pumpJson.put("clock", DateUtil.toISOString(now))
         } catch (e: JSONException) {
             aapsLogger.error("Unhandled exception", e)
@@ -616,7 +616,7 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override fun serialNumber(): String {
-        return danaRPump.serialNumber
+        return danaPump.serialNumber
     }
 
     override fun getPumpDescription(): PumpDescription {
@@ -625,13 +625,13 @@ class DanaRSPlugin @Inject constructor(
 
     override fun shortStatus(veryShort: Boolean): String {
         var ret = ""
-        if (danaRPump.lastConnection != 0L) {
-            val agoMillis = System.currentTimeMillis() - danaRPump.lastConnection
+        if (danaPump.lastConnection != 0L) {
+            val agoMillis = System.currentTimeMillis() - danaPump.lastConnection
             val agoMin = (agoMillis / 60.0 / 1000.0).toInt()
             ret += "LastConn: $agoMin minago\n"
         }
-        if (danaRPump.lastBolusTime != 0L)
-            ret += "LastBolus: ${DecimalFormatter.to2Decimal(danaRPump.lastBolusAmount)}U @${DateFormat.format("HH:mm", danaRPump.lastBolusTime)}"
+        if (danaPump.lastBolusTime != 0L)
+            ret += "LastBolus: ${DecimalFormatter.to2Decimal(danaPump.lastBolusAmount)}U @${DateFormat.format("HH:mm", danaPump.lastBolusTime)}"
 
         val activeTemp = activePluginProvider.activeTreatments.getRealTempBasalFromHistory(System.currentTimeMillis())
         if (activeTemp != null)
@@ -642,10 +642,10 @@ class DanaRSPlugin @Inject constructor(
             ret += "Extended: $activeExtendedBolus\n"
 
         if (!veryShort) {
-            ret += "TDD: ${DecimalFormatter.to0Decimal(danaRPump.dailyTotalUnits)} / ${danaRPump.maxDailyTotalUnits} U"
+            ret += "TDD: ${DecimalFormatter.to0Decimal(danaPump.dailyTotalUnits)} / ${danaPump.maxDailyTotalUnits} U"
         }
-        ret += "Reserv: ${DecimalFormatter.to0Decimal(danaRPump.reservoirRemainingUnits)} U"
-        ret += "Batt: ${danaRPump.batteryRemaining}"
+        ret += "Reserv: ${DecimalFormatter.to0Decimal(danaPump.reservoirRemainingUnits)} U"
+        ret += "Batt: ${danaPump.batteryRemaining}"
         return ret
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index a79143ca42..eb3f5529aa 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -13,7 +13,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -29,7 +29,7 @@ open class DanaRS_Packet_APS_History_Events(
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
     @Inject lateinit var sp: SP
     @Inject lateinit var nsUpload: NSUpload
@@ -56,7 +56,7 @@ open class DanaRS_Packet_APS_History_Events(
         min = cal[Calendar.MINUTE]
         sec = cal[Calendar.SECOND]
         aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(cal.timeInMillis))
-        danaRPump.historyDoneReceived = false
+        danaPump.historyDoneReceived = false
     }
 
     override fun getRequestParams(): ByteArray {
@@ -74,7 +74,7 @@ open class DanaRS_Packet_APS_History_Events(
         val recordCode = intFromBuff(data, 0, 1).toByte()
         // Last record
         if (recordCode == 0xFF.toByte()) {
-            danaRPump.historyDoneReceived = true
+            danaPump.historyDoneReceived = true
             aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
             return
         }
@@ -85,7 +85,7 @@ open class DanaRS_Packet_APS_History_Events(
         val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaRPump.TEMPSTART         -> {
+            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -93,13 +93,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.TEMPSTOP          -> {
+            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTART     -> {
+            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -107,13 +107,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.EXTENDEDSTOP      -> {
+            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.BOLUS             -> {
+            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -125,7 +125,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALBOLUS         -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -137,7 +137,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTART -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -145,42 +145,42 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.DUALEXTENDEDSTOP  -> {
+            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.SUSPENDON         -> {
+            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.SUSPENDOFF        -> {
+            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.REFILL            -> {
+            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.PRIME             -> {
+            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.PROFILECHANGE     -> {
+            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.CARBS             -> {
+            info.nightscout.androidaps.dana.DanaPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
@@ -191,17 +191,17 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaRPump.PRIMECANNULA      -> {
+            info.nightscout.androidaps.dana.DanaPump.PRIMECANNULA      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
-            else                                                        -> {
+            else                                                       -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
-        if (datetime > danaRPump.lastEventTimeLoaded) danaRPump.lastEventTimeLoaded = datetime
+        if (datetime > danaPump.lastEventTimeLoaded) danaPump.lastEventTimeLoaded = datetime
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
index bb9f14dd32..67d4643064 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -2,7 +2,6 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.util.*
 
@@ -16,7 +15,7 @@ class DanaRS_Packet_APS_Set_Event_History(
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
-        if ((packetType == info.nightscout.androidaps.dana.DanaRPump.CARBS || packetType == info.nightscout.androidaps.dana.DanaRPump.BOLUS) && param1 <= 0) this.param1 = 0
+        if ((packetType == info.nightscout.androidaps.dana.DanaPump.CARBS || packetType == info.nightscout.androidaps.dana.DanaPump.BOLUS) && param1 <= 0) this.param1 = 0
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + dateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
index e0fdc9080c..01390d85cd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Basal_Rate.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
@@ -19,7 +19,7 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_BASAL_RATE
@@ -29,24 +29,24 @@ class DanaRS_Packet_Basal_Get_Basal_Rate(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 2
-        danaRPump.maxBasal = byteArrayToInt(getBytes(data, DATA_START, dataSize)) / 100.0
+        danaPump.maxBasal = byteArrayToInt(getBytes(data, DATA_START, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.basalStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        danaPump.basalStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         var i = 0
         val size = 24
         while (i < size) {
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.pumpProfiles!![danaRPump.activeProfile][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.pumpProfiles!![danaPump.activeProfile][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             i++
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaRPump.maxBasal + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaRPump.basalStep + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max basal: " + danaPump.maxBasal + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Basal step: " + danaPump.basalStep + " U")
         for (index in 0..23)
-            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![danaRPump.activeProfile][index])
-        if (danaRPump.basalStep != 0.01) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![danaPump.activeProfile][index])
+        if (danaPump.basalStep != 0.01) {
             failed = true
             val notification = Notification(Notification.WRONGBASALSTEP, resourceHelper.gs(R.string.danar_setbasalstep001), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
index acfd4ed210..721479198c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Basal_Rate.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.util.*
 import javax.inject.Inject
@@ -12,7 +12,7 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
     private val profileNumber: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_BASAL_RATE
@@ -28,17 +28,17 @@ open class DanaRS_Packet_Basal_Get_Profile_Basal_Rate(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 2
-        danaRPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         var i = 0
         val size = 24
         while (i < size) {
-            danaRPump.pumpProfiles!![profileNumber][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.pumpProfiles!![profileNumber][i] = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
             i++
         }
         for (index in 0..23)
-            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaRPump.pumpProfiles!![profileNumber][index])
+            aapsLogger.debug(LTag.PUMPCOMM, "Basal " + String.format(Locale.ENGLISH, "%02d", index) + "h: " + danaPump.pumpProfiles!![profileNumber][index])
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
index 04deec02eb..399555e09d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Profile_Number.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Basal_Get_Profile_Number(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__GET_PROFILE_NUMBER
@@ -18,8 +18,8 @@ class DanaRS_Packet_Basal_Get_Profile_Number(
     }
 
     override fun handleMessage(data: ByteArray) {
-        danaRPump.activeProfile = byteArrayToInt(getBytes(data, DATA_START, 1))
-        aapsLogger.debug(LTag.PUMPCOMM, "Active profile: " + danaRPump.activeProfile)
+        danaPump.activeProfile = byteArrayToInt(getBytes(data, DATA_START, 1))
+        aapsLogger.debug(LTag.PUMPCOMM, "Active profile: " + danaPump.activeProfile)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
index 127a9c5331..1471af5478 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Basal_Get_Temporary_Basal_State.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 import kotlin.math.ceil
@@ -11,7 +11,7 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE
@@ -20,22 +20,22 @@ class DanaRS_Packet_Basal_Get_Temporary_Basal_State(
 
     override fun handleMessage(data: ByteArray) {
         val error = byteArrayToInt(getBytes(data, DATA_START, 1))
-        danaRPump.isTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x01
+        danaPump.isTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x01
         val isAPSTempBasalInProgress = byteArrayToInt(getBytes(data, DATA_START + 1, 1)) == 0x02
-        danaRPump.tempBasalPercent = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
-        if (danaRPump.tempBasalPercent > 200) danaRPump.tempBasalPercent = (danaRPump.tempBasalPercent - 200) * 10
+        danaPump.tempBasalPercent = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
+        if (danaPump.tempBasalPercent > 200) danaPump.tempBasalPercent = (danaPump.tempBasalPercent - 200) * 10
         val durationHour = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
-        if (durationHour == 150) danaRPump.tempBasalTotalSec = 15 * 60 else if (durationHour == 160) danaRPump.tempBasalTotalSec = 30 * 60 else danaRPump.tempBasalTotalSec = durationHour * 60 * 60
+        if (durationHour == 150) danaPump.tempBasalTotalSec = 15 * 60 else if (durationHour == 160) danaPump.tempBasalTotalSec = 30 * 60 else danaPump.tempBasalTotalSec = durationHour * 60 * 60
         val runningMin = byteArrayToInt(getBytes(data, DATA_START + 4, 2))
         if (error != 0) failed = true
-        val tempBasalRemainingMin = (danaRPump.tempBasalTotalSec - runningMin * 60) / 60
-        val tempBasalStart = if (danaRPump.isTempBasalInProgress) getDateFromTempBasalSecAgo(runningMin * 60) else 0
+        val tempBasalRemainingMin = (danaPump.tempBasalTotalSec - runningMin * 60) / 60
+        val tempBasalStart = if (danaPump.isTempBasalInProgress) getDateFromTempBasalSecAgo(runningMin * 60) else 0
         aapsLogger.debug(LTag.PUMPCOMM, "Error code: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: " + danaRPump.isTempBasalInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Is temp basal running: " + danaPump.isTempBasalInProgress)
         aapsLogger.debug(LTag.PUMPCOMM, "Is APS temp basal running: $isAPSTempBasalInProgress")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaRPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal percent: " + danaPump.tempBasalPercent)
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal remaining min: $tempBasalRemainingMin")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: " + danaRPump.tempBasalTotalSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal total sec: " + danaPump.tempBasalTotalSec)
         aapsLogger.debug(LTag.PUMPCOMM, "Current temp basal start: " + dateUtil.dateAndTimeString(tempBasalStart))
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
index ed706bb52b..433f782730 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Bolus_Option.kt
@@ -7,7 +7,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -18,7 +18,7 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION
@@ -28,13 +28,13 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 1
-        danaRPump.isExtendedBolusEnabled = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 1
+        danaPump.isExtendedBolusEnabled = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 1
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.bolusCalculationOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.bolusCalculationOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.missedBolusConfig = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.missedBolusConfig = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         val missedBolus01StartHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
@@ -83,15 +83,15 @@ class DanaRS_Packet_Bolus_Get_Bolus_Option(
         dataIndex += dataSize
         dataSize = 1
         val missedBolus04EndMin = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (!danaRPump.isExtendedBolusEnabled) {
+        if (!danaPump.isExtendedBolusEnabled) {
             val notification = Notification(Notification.EXTENDED_BOLUS_DISABLED, resourceHelper.gs(R.string.danar_enableextendedbolus), Notification.URGENT)
             rxBus.send(EventNewNotification(notification))
             failed = true
         } else {
             rxBus.send(EventDismissNotification(Notification.EXTENDED_BOLUS_DISABLED))
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus enabled: " + danaRPump.isExtendedBolusEnabled)
-        aapsLogger.debug(LTag.PUMPCOMM, "Missed bolus config: " + danaRPump.missedBolusConfig)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus enabled: " + danaPump.isExtendedBolusEnabled)
+        aapsLogger.debug(LTag.PUMPCOMM, "Missed bolus config: " + danaPump.missedBolusConfig)
         aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01StartHour: $missedBolus01StartHour")
         aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01StartMin: $missedBolus01StartMin")
         aapsLogger.debug(LTag.PUMPCOMM, "missedBolus01EndHour: $missedBolus01EndHour")
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index 53f0eba737..327c4c99be 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CIR_CF_ARRAY
@@ -23,87 +23,87 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         val language = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.morningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.morningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
         val cir02 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.afternoonCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.afternoonCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
         val cir04 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.eveningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.eveningCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
         val cir06 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.nightCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.nightCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         val cf02: Double
         val cf04: Double
         val cf06: Double
-        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) {
+        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            danaPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
             cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            danaPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
             cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            danaPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
             cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+            danaPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
         } else {
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
             cf02 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.afternoonCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
             cf04 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.eveningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
             cf06 = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
             dataIndex += dataSize
             dataSize = 2
-            danaRPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+            danaPump.nightCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         }
-        if (danaRPump.units < 0 || danaRPump.units > 1) failed = true
+        if (danaPump.units < 0 || danaPump.units > 1) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Language: $language")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaRPump.morningCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaRPump.morningCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaRPump.afternoonCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaRPump.afternoonCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaRPump.eveningCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaRPump.eveningCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaRPump.nightCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaRPump.nightCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CF: " + danaPump.afternoonCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CIR: " + danaPump.eveningCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump evening CF: " + danaPump.eveningCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CIR: " + danaPump.nightCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current pump night CF: " + danaPump.nightCF)
         aapsLogger.debug(LTag.PUMPCOMM, "cir02: $cir02")
         aapsLogger.debug(LTag.PUMPCOMM, "cir04: $cir04")
         aapsLogger.debug(LTag.PUMPCOMM, "cir06: $cir06")
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index cad921d048..a1fddcbea9 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CALCULATION_INFORMATION
@@ -29,33 +29,33 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         val carbohydrate = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.currentTarget = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        danaPump.currentTarget = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.currentCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
+        danaPump.currentCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MMOL) {
-            danaRPump.currentCF = danaRPump.currentCF / 100.0
-            danaRPump.currentTarget = danaRPump.currentTarget / 100.0
+        danaPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MMOL) {
+            danaPump.currentCF = danaPump.currentCF / 100.0
+            danaPump.currentTarget = danaPump.currentTarget / 100.0
             currentBG = currentBG / 100.0
         }
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current BG: $currentBG")
         aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbohydrate")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaRPump.currentTarget)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaRPump.currentCIR)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current CF: " + danaRPump.currentCF)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump IOB: " + danaRPump.iob)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaPump.currentTarget)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CF: " + danaPump.currentCF)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump IOB: " + danaPump.iob)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
index d1d521af1a..e51a25967d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_CARBOHYDRATE_CALCULATION_INFORMATION
@@ -26,11 +26,11 @@ class DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(
         val carbs = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.currentCIR = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
         aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbs")
-        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaRPump.currentCIR)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current CIR: " + danaPump.currentCIR)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
index e033733b6a..babe627091 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Dual_Bolus.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Dual_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_DUAL_BOLUS
@@ -19,15 +19,15 @@ class DanaRS_Packet_Bolus_Get_Dual_Bolus(
 
     override fun handleMessage(data: ByteArray) {
         val error = byteArrayToInt(getBytes(data, DATA_START, 1))
-        danaRPump.bolusStep = byteArrayToInt(getBytes(data, DATA_START + 1, 2)) / 100.0
-        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, DATA_START + 3, 2)) / 100.0
-        danaRPump.maxBolus = byteArrayToInt(getBytes(data, DATA_START + 5, 2)) / 100.0
+        danaPump.bolusStep = byteArrayToInt(getBytes(data, DATA_START + 1, 2)) / 100.0
+        danaPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, DATA_START + 3, 2)) / 100.0
+        danaPump.maxBolus = byteArrayToInt(getBytes(data, DATA_START + 5, 2)) / 100.0
         val bolusIncrement = byteArrayToInt(getBytes(data, DATA_START + 7, 1)) / 100.0
         failed = error != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: ${danaRPump.bolusStep} U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: ${danaRPump.extendedBolusAbsoluteRate} U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: ${danaPump.bolusStep} U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: ${danaPump.extendedBolusAbsoluteRate} U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus + " U")
         aapsLogger.debug(LTag.PUMPCOMM, "bolusIncrement: $bolusIncrement U")
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
index 0d7c5e9b89..8aae55b413 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS
@@ -23,18 +23,18 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus(
         val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.maxBolus = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.bolusStep = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         failed = error != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaRPump.extendedBolusAbsoluteRate + " U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaPump.extendedBolusAbsoluteRate + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaPump.bolusStep + " U")
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
index 701ce3c723..7c859ed743 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Bolus_State.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_BOLUS_STATE
@@ -23,26 +23,26 @@ class DanaRS_Packet_Bolus_Get_Extended_Bolus_State(
         val error = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
+        danaPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.extendedBolusMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize)) * 30
+        danaPump.extendedBolusMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize)) * 30
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.extendedBolusSoFarInMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.extendedBolusSoFarInMinutes = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.extendedBolusDeliveredSoFar = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.extendedBolusDeliveredSoFar = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         failed = error != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaRPump.isExtendedInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaRPump.extendedBolusAbsoluteRate + " U/h")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + danaRPump.extendedBolusMinutes + " min")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: " + danaRPump.extendedBolusSoFarInMinutes + " min")
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: " + danaRPump.extendedBolusDeliveredSoFar + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended bolus running: " + danaPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + danaPump.extendedBolusAbsoluteRate + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + danaPump.extendedBolusMinutes + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: " + danaPump.extendedBolusSoFarInMinutes + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: " + danaPump.extendedBolusDeliveredSoFar + " U")
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
index 3bae9a92d3..3757188d4a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_EXTENDED_MENU_OPTION_STATE
@@ -23,7 +23,7 @@ class DanaRS_Packet_Bolus_Get_Extended_Menu_Option_State(
         val extendedMenuOption = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
+        danaPump.isExtendedInProgress = byteArrayToInt(getBytes(data, dataIndex, dataSize)) == 0x01
         aapsLogger.debug(LTag.PUMPCOMM, "extendedMenuOption: $extendedMenuOption")
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index 984983a04f..d6d7801acc 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
@@ -11,7 +11,7 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_STEP_BOLUS_INFORMATION
@@ -21,21 +21,21 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
     override fun handleMessage(data: ByteArray) {
         val error = intFromBuff(data, 0, 1)
         val bolusType = intFromBuff(data, 1, 1)
-        danaRPump.initialBolusAmount = intFromBuff(data, 2, 2) / 100.0
+        danaPump.initialBolusAmount = intFromBuff(data, 2, 2) / 100.0
         val hours = intFromBuff(data, 4, 1)
         val minutes = intFromBuff(data, 5, 1)
-        danaRPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
-        danaRPump.lastBolusAmount = intFromBuff(data, 6, 2) / 100.0
-        danaRPump.maxBolus = intFromBuff(data, 8, 2) / 100.0
-        danaRPump.bolusStep = intFromBuff(data, 10, 1) / 100.0
+        danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        danaPump.lastBolusAmount = intFromBuff(data, 6, 2) / 100.0
+        danaPump.maxBolus = intFromBuff(data, 8, 2) / 100.0
+        danaPump.bolusStep = intFromBuff(data, 10, 1) / 100.0
         failed = error != 0
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
         aapsLogger.debug(LTag.PUMPCOMM, "BolusType: $bolusType")
-        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount: " + danaRPump.initialBolusAmount + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeString(danaRPump.lastBolusTime))
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
-        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaRPump.maxBolus + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaRPump.bolusStep + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Initial bolus amount: " + danaPump.initialBolusAmount + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeString(danaPump.lastBolusTime))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaPump.lastBolusAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max bolus: " + danaPump.maxBolus + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Bolus step: " + danaPump.bolusStep + " U")
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
index 9df37cef85..319e294895 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Start.kt
@@ -4,7 +4,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -14,7 +14,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     private var speed: Int = 0
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var constraintChecker: ConstraintChecker
 
     init {
@@ -35,12 +35,12 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_Start(
     }
 
     override fun handleMessage(data: ByteArray) {
-        danaRPump.bolusStartErrorCode = intFromBuff(data, 0, 1)
-        if (danaRPump.bolusStartErrorCode == 0) {
+        danaPump.bolusStartErrorCode = intFromBuff(data, 0, 1)
+        if (danaPump.bolusStartErrorCode == 0) {
             failed = false
             aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
         } else {
-            aapsLogger.error("Result Error: ${danaRPump.bolusStartErrorCode}")
+            aapsLogger.error("Result Error: ${danaPump.bolusStartErrorCode}")
             failed = true
         }
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
index 18eada935d..a8f1bc0084 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_Stop.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -16,7 +16,7 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_STEP_BOLUS_STOP
@@ -32,10 +32,10 @@ open class DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(
             failed = true
         }
         val bolusingEvent = EventOverviewBolusProgress
-        danaRPump.bolusStopped = true
-        if (!danaRPump.bolusStopForced) {
+        danaPump.bolusStopped = true
+        if (!danaPump.bolusStopForced) {
             // delivery ended without user intervention
-            danaRPump.bolusingTreatment?.insulin = danaRPump.bolusAmountToBeDelivered
+            danaPump.bolusingTreatment?.insulin = danaPump.bolusAmountToBeDelivered
             bolusingEvent.status = resourceHelper.gs(R.string.overview_bolusprogress_delivered)
             bolusingEvent.percent = 100
         } else {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
index ce7d36e8d4..4f9d15410e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_More_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_MORE_INFORMATION
@@ -23,22 +23,22 @@ class DanaRS_Packet_General_Get_More_Information(
             failed = true
             return
         }
-        danaRPump.iob = intFromBuff(data, 0, 2) / 100.0
-        danaRPump.dailyTotalUnits = intFromBuff(data, 2, 2) / 100.0
-        danaRPump.isExtendedInProgress = intFromBuff(data, 4, 1) == 0x01
-        danaRPump.extendedBolusRemainingMinutes = intFromBuff(data, 5, 2)
+        danaPump.iob = intFromBuff(data, 0, 2) / 100.0
+        danaPump.dailyTotalUnits = intFromBuff(data, 2, 2) / 100.0
+        danaPump.isExtendedInProgress = intFromBuff(data, 4, 1) == 0x01
+        danaPump.extendedBolusRemainingMinutes = intFromBuff(data, 5, 2)
         // val remainRate = intFromBuff(data, 7, 2) / 100.0
         val hours = intFromBuff(data, 9, 1)
         val minutes = intFromBuff(data, 10, 1)
-        danaRPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
-        danaRPump.lastBolusAmount = intFromBuff(data, 11, 2) / 100.0
+        danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        danaPump.lastBolusAmount = intFromBuff(data, 11, 2) / 100.0
         // On DanaRS DailyUnits can't be more than 160
-        if (danaRPump.dailyTotalUnits > 160) failed = true
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaRPump.dailyTotalUnits.toString() + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: " + danaRPump.isExtendedInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: " + danaRPump.extendedBolusRemainingMinutes)
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeAndSecondsString(danaRPump.lastBolusTime))
-        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaRPump.lastBolusAmount)
+        if (danaPump.dailyTotalUnits > 160) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total units: " + danaPump.dailyTotalUnits.toString() + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Is extended in progress: " + danaPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus remaining minutes: " + danaPump.extendedBolusRemainingMinutes)
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus time: " + dateUtil.dateAndTimeAndSecondsString(danaPump.lastBolusTime))
+        aapsLogger.debug(LTag.PUMPCOMM, "Last bolus amount: " + danaPump.lastBolusAmount)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
index 6c5785c358..34d9ce1238 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Password.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Password(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PASSWORD
@@ -26,8 +26,8 @@ class DanaRS_Packet_General_Get_Password(
         }
         var pass: Int = (data[DATA_START + 1].toInt() and 0x000000FF shl 8) + (data[DATA_START + 0].toInt() and 0x000000FF)
         pass = pass xor 3463
-        danaRPump.rsPassword = Integer.toHexString(pass)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.rsPassword)
+        danaPump.rsPassword = Integer.toHexString(pass)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaPump.rsPassword)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
index 6ff1ef656c..6c55bcee19 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Pump_Check.kt
@@ -6,7 +6,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -17,7 +17,7 @@ class DanaRS_Packet_General_Get_Pump_Check(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_CHECK
@@ -32,17 +32,17 @@ class DanaRS_Packet_General_Get_Pump_Check(
             failed = false
         var dataIndex = DATA_START
         var dataSize = 1
-        danaRPump.hwModel = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.hwModel = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.protocol = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaRPump.hwModel))
-        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaRPump.protocol))
-        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaRPump.productCode))
-        if (danaRPump.productCode < 2) {
+        danaPump.productCode = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaPump.hwModel))
+        aapsLogger.debug(LTag.PUMPCOMM, "Protocol: " + String.format("%02X ", danaPump.protocol))
+        aapsLogger.debug(LTag.PUMPCOMM, "Product Code: " + String.format("%02X ", danaPump.productCode))
+        if (danaPump.productCode < 2) {
             rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
         }
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index 3e30953062..c280f5f126 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Shipping_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_SHIPPING_INFORMATION
@@ -24,16 +24,16 @@ class DanaRS_Packet_General_Get_Shipping_Information(
         } else failed = false
         var dataIndex = DATA_START
         var dataSize = 10
-        danaRPump.serialNumber = stringFromBuff(data, dataIndex, dataSize)
+        danaPump.serialNumber = stringFromBuff(data, dataIndex, dataSize)
         dataIndex += dataSize
         dataSize = 3
-        danaRPump.shippingDate = dateFromBuff(data, dataIndex)
+        danaPump.shippingDate = dateFromBuff(data, dataIndex)
         dataIndex += dataSize
         dataSize = 3
-        danaRPump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize)
-        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaRPump.serialNumber)
-        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + dateUtil.dateAndTimeString(danaRPump.shippingDate))
-        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaRPump.shippingCountry)
+        danaPump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize)
+        aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaPump.serialNumber)
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + dateUtil.dateAndTimeString(danaPump.shippingDate))
+        aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaPump.shippingCountry)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
index ca023162f8..4a83192d39 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Version.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import java.nio.charset.Charset
 import javax.inject.Inject
@@ -11,7 +11,7 @@ class DanaRS_Packet_General_Get_Shipping_Version(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_GENERAL__GET_SHIPPING_VERSION
@@ -19,9 +19,9 @@ class DanaRS_Packet_General_Get_Shipping_Version(
     }
 
     override fun handleMessage(data: ByteArray) {
-        danaRPump.bleModel = data.copyOfRange(DATA_START, data.size).toString(Charset.forName("US-ASCII"))
+        danaPump.bleModel = data.copyOfRange(DATA_START, data.size).toString(Charset.forName("US-ASCII"))
         failed = false
-        aapsLogger.debug(LTag.PUMPCOMM, "BLE Model: " + danaRPump.bleModel)
+        aapsLogger.debug(LTag.PUMPCOMM, "BLE Model: " + danaPump.bleModel)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
index 471d1dbc0a..4eece3e5fe 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Today_Delivery_Total.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Get_Today_Delivery_Total(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_TODAY_DELIVERY_TOTAL
@@ -24,16 +24,16 @@ class DanaRS_Packet_General_Get_Today_Delivery_Total(
         } else failed = false
         var dataIndex = DATA_START
         var dataSize = 2
-        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.dailyTotalBasalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.dailyTotalBasalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.dailyTotalBolusUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaRPump.dailyTotalUnits + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total bolus: " + danaRPump.dailyTotalBolusUnits + " U")
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily total basal: " + danaRPump.dailyTotalBasalUnits + " U")
+        danaPump.dailyTotalBolusUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total: " + danaPump.dailyTotalUnits + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total bolus: " + danaPump.dailyTotalBolusUnits + " U")
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily total basal: " + danaPump.dailyTotalBasalUnits + " U")
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
index 920c597ffd..e077e30fe9 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_General_Initial_Screen_Information(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__INITIAL_SCREEN_INFORMATION
@@ -25,53 +25,53 @@ class DanaRS_Packet_General_Initial_Screen_Information(
         var dataIndex = DATA_START
         var dataSize = 1
         val status = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        danaRPump.pumpSuspended = status and 0x01 == 0x01
-        danaRPump.isTempBasalInProgress = status and 0x10 == 0x10
-        danaRPump.isExtendedInProgress = status and 0x04 == 0x04
-        danaRPump.isDualBolusInProgress = status and 0x08 == 0x08
+        danaPump.pumpSuspended = status and 0x01 == 0x01
+        danaPump.isTempBasalInProgress = status and 0x10 == 0x10
+        danaPump.isExtendedInProgress = status and 0x04 == 0x04
+        danaPump.isDualBolusInProgress = status and 0x08 == 0x08
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.dailyTotalUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.maxDailyTotalUnits = (byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0).toInt()
+        danaPump.maxDailyTotalUnits = (byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0).toInt()
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.reservoirRemainingUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.reservoirRemainingUnits = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.currentBasal = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.currentBasal = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.tempBasalPercent = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.tempBasalPercent = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.batteryRemaining = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.batteryRemaining = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.extendedBolusAbsoluteRate = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
+        danaPump.iob = byteArrayToInt(getBytes(data, dataIndex, dataSize)) / 100.0
         if (data.size >= 18) {
             //protocol 10+
             dataIndex += dataSize
             dataSize = 1
-            danaRPump.errorState = info.nightscout.androidaps.dana.DanaRPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
-                ?: info.nightscout.androidaps.dana.DanaRPump.ErrorState.NONE
-            aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaRPump.errorState.name)
+            danaPump.errorState = info.nightscout.androidaps.dana.DanaPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
+                ?: info.nightscout.androidaps.dana.DanaPump.ErrorState.NONE
+            aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaPump.errorState.name)
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaRPump.pumpSuspended)
-        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal in progress: " + danaRPump.isTempBasalInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended in progress: " + danaRPump.isExtendedInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Dual in progress: " + danaRPump.isDualBolusInProgress)
-        aapsLogger.debug(LTag.PUMPCOMM, "Daily units: " + danaRPump.dailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Max daily units: " + danaRPump.maxDailyTotalUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaRPump.reservoirRemainingUnits)
-        aapsLogger.debug(LTag.PUMPCOMM, "Battery: " + danaRPump.batteryRemaining)
-        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaRPump.currentBasal)
-        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal percent: " + danaRPump.tempBasalPercent)
-        aapsLogger.debug(LTag.PUMPCOMM, "Extended absolute rate: " + danaRPump.extendedBolusAbsoluteRate)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaPump.pumpSuspended)
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal in progress: " + danaPump.isTempBasalInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended in progress: " + danaPump.isExtendedInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Dual in progress: " + danaPump.isDualBolusInProgress)
+        aapsLogger.debug(LTag.PUMPCOMM, "Daily units: " + danaPump.dailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Max daily units: " + danaPump.maxDailyTotalUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Reservoir remaining units: " + danaPump.reservoirRemainingUnits)
+        aapsLogger.debug(LTag.PUMPCOMM, "Battery: " + danaPump.batteryRemaining)
+        aapsLogger.debug(LTag.PUMPCOMM, "Current basal: " + danaPump.currentBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "Temp basal percent: " + danaPump.tempBasalPercent)
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended absolute rate: " + danaPump.extendedBolusAbsoluteRate)
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
index 051a78b351..fd245226d3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Complete.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
@@ -27,12 +27,12 @@ class DanaRS_Packet_Notify_Delivery_Complete(
 
     override fun handleMessage(data: ByteArray) {
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
-        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
+        danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
-        bolusingEvent.t = danaRPump.bolusingTreatment
-        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
-        danaRPump.bolusDone = true
+        bolusingEvent.t = danaPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
+        danaPump.bolusDone = true
         rxBus.send(bolusingEvent)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin: $deliveredInsulin")
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
index 66a99aed58..8c54865d4a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_Display.kt
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
@@ -17,7 +17,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         type = BleEncryption.DANAR_PACKET__TYPE_NOTIFY
@@ -26,12 +26,12 @@ class DanaRS_Packet_Notify_Delivery_Rate_Display(
 
     override fun handleMessage(data: ByteArray) {
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
-        danaRPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
-        danaRPump.bolusingTreatment?.insulin = deliveredInsulin
+        danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
+        danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.status = resourceHelper.gs(R.string.bolusdelivering, deliveredInsulin)
-        bolusingEvent.t = danaRPump.bolusingTreatment
-        bolusingEvent.percent = min((deliveredInsulin / danaRPump.bolusAmountToBeDelivered * 100).toInt(), 100)
+        bolusingEvent.t = danaPump.bolusingTreatment
+        bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         failed = bolusingEvent.percent < 100
         rxBus.send(bolusingEvent)
         aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin")
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 1a7f475ad3..1b1daf30b7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
 import javax.inject.Inject
@@ -11,7 +11,7 @@ class DanaRS_Packet_Option_Get_Pump_Time(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME
@@ -38,12 +38,12 @@ class DanaRS_Packet_Option_Get_Pump_Time(
         dataSize = 1
         val sec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         val time = DateTime(2000 + year, month, day, hour, min, sec)
-        danaRPump.pumpTime = time.millis
+        danaPump.pumpTime = time.millis
         aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time.millis))
     }
 
     override fun handleMessageNotReceived() {
-        danaRPump.pumpTime = 0
+        danaPump.pumpTime = 0
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
index 46e1560868..65ca61945e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Option_Get_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_USER_OPTION
@@ -20,37 +20,37 @@ class DanaRS_Packet_Option_Get_User_Option(
     override fun handleMessage(data: ByteArray) {
         var dataIndex = DATA_START
         var dataSize = 1
-        danaRPump.timeDisplayType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.timeDisplayType = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.buttonScrollOnOff = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.beepAndAlarm = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.beepAndAlarm = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.lcdOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.lcdOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.backlightOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.backlightOnTimeSec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.selectedLanguage = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.selectedLanguage = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.shutdownHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.shutdownHour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
-        danaRPump.lowReservoirRate = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.lowReservoirRate = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.cannulaVolume = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.cannulaVolume = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 2
-        danaRPump.refillAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        danaPump.refillAmount = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         dataIndex += dataSize
         dataSize = 1
         val selectableLanguage1 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
@@ -67,17 +67,17 @@ class DanaRS_Packet_Option_Get_User_Option(
         dataSize = 1
         val selectableLanguage5 = byteArrayToInt(getBytes(data, dataIndex, dataSize))
         // Pump's screen on time can't be less than 5
-        failed = if (danaRPump.lcdOnTimeSec < 5) true else false
-        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaRPump.timeDisplayType)
-        aapsLogger.debug(LTag.PUMPCOMM, "buttonScrollOnOff: " + danaRPump.buttonScrollOnOff)
-        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm: " + danaRPump.beepAndAlarm)
-        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaRPump.lcdOnTimeSec)
-        aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaRPump.backlightOnTimeSec)
-        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaRPump.selectedLanguage)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaRPump.units == info.nightscout.androidaps.dana.DanaRPump.UNITS_MGDL) "MGDL" else "MMOL")
-        aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaRPump.shutdownHour)
-        aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaRPump.lowReservoirRate)
-        aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaRPump.refillAmount)
+        failed = if (danaPump.lcdOnTimeSec < 5) true else false
+        aapsLogger.debug(LTag.PUMPCOMM, "timeDisplayType: " + danaPump.timeDisplayType)
+        aapsLogger.debug(LTag.PUMPCOMM, "buttonScrollOnOff: " + danaPump.buttonScrollOnOff)
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm: " + danaPump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaPump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaPump.backlightOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaPump.selectedLanguage)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaPump.shutdownHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaPump.lowReservoirRate)
+        aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaPump.refillAmount)
         aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage1: $selectableLanguage1")
         aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage2: $selectableLanguage2")
         aapsLogger.debug(LTag.PUMPCOMM, "selectableLanguage3: $selectableLanguage3")
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
index 7ed2b082cf..c6572d6f60 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_User_Option.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Option_Set_User_Option(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_USER_OPTION
@@ -19,28 +19,28 @@ class DanaRS_Packet_Option_Set_User_Option(
 
     override fun getRequestParams(): ByteArray {
         aapsLogger.debug(LTag.PUMPCOMM,
-            "UserOptions:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
-                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
-                + "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
-                + "\ntimeDisplayType:" + danaRPump.timeDisplayType
-                + "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
-                + "\nbacklight:" + danaRPump.backlightOnTimeSec
-                + "\ndanaRPumpUnits:" + danaRPump.units
-                + "\nlowReservoir:" + danaRPump.lowReservoirRate)
+            "UserOptions:" + (System.currentTimeMillis() - danaPump.lastConnection) / 1000 + " s ago"
+                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nbuttonScroll:" + danaPump.buttonScrollOnOff
+                + "\ntimeDisplayType:" + danaPump.timeDisplayType
+                + "\nlcdOnTimeSec:" + danaPump.lcdOnTimeSec
+                + "\nbacklight:" + danaPump.backlightOnTimeSec
+                + "\ndanaRPumpUnits:" + danaPump.units
+                + "\nlowReservoir:" + danaPump.lowReservoirRate)
         val request = ByteArray(13)
-        request[0] = (danaRPump.timeDisplayType and 0xff).toByte()
-        request[1] = (danaRPump.buttonScrollOnOff and 0xff).toByte()
-        request[2] = (danaRPump.beepAndAlarm and 0xff).toByte()
-        request[3] = (danaRPump.lcdOnTimeSec and 0xff).toByte()
-        request[4] = (danaRPump.backlightOnTimeSec and 0xff).toByte()
-        request[5] = (danaRPump.selectedLanguage and 0xff).toByte()
-        request[6] = (danaRPump.units and 0xff).toByte()
-        request[7] = (danaRPump.shutdownHour and 0xff).toByte()
-        request[8] = (danaRPump.lowReservoirRate and 0xff).toByte()
-        request[9] = (danaRPump.cannulaVolume and 0xff).toByte()
-        request[10] = (danaRPump.cannulaVolume ushr 8 and 0xff).toByte()
-        request[11] = (danaRPump.refillAmount and 0xff).toByte()
-        request[12] = (danaRPump.refillAmount ushr 8 and 0xff).toByte()
+        request[0] = (danaPump.timeDisplayType and 0xff).toByte()
+        request[1] = (danaPump.buttonScrollOnOff and 0xff).toByte()
+        request[2] = (danaPump.beepAndAlarm and 0xff).toByte()
+        request[3] = (danaPump.lcdOnTimeSec and 0xff).toByte()
+        request[4] = (danaPump.backlightOnTimeSec and 0xff).toByte()
+        request[5] = (danaPump.selectedLanguage and 0xff).toByte()
+        request[6] = (danaPump.units and 0xff).toByte()
+        request[7] = (danaPump.shutdownHour and 0xff).toByte()
+        request[8] = (danaPump.lowReservoirRate and 0xff).toByte()
+        request[9] = (danaPump.cannulaVolume and 0xff).toByte()
+        request[10] = (danaPump.cannulaVolume ushr 8 and 0xff).toByte()
+        request[11] = (danaPump.refillAmount and 0xff).toByte()
+        request[12] = (danaPump.refillAmount ushr 8 and 0xff).toByte()
         return request
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
index 81f15ee543..990ffce54c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Review_Get_Pump_Dec_Ratio.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import javax.inject.Inject
 
@@ -10,7 +10,7 @@ class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
     injector: HasAndroidInjector
 ) : DanaRS_Packet(injector) {
 
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
 
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE_REVIEW__GET_PUMP_DEC_RATIO
@@ -18,9 +18,9 @@ class DanaRS_Packet_Review_Get_Pump_Dec_Ratio(
     }
 
     override fun handleMessage(data: ByteArray) {
-        danaRPump.decRatio = intFromBuff(data, 0, 1) * 5
+        danaPump.decRatio = intFromBuff(data, 0, 1) * 5
         failed = false
-        aapsLogger.debug(LTag.PUMPCOMM, "Dec ratio: ${danaRPump.decRatio}%")
+        aapsLogger.debug(LTag.PUMPCOMM, "Dec ratio: ${danaPump.decRatio}%")
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt
new file mode 100644
index 0000000000..e24db08b9d
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.danars.services.DanaRSService
+
+@Module
+@Suppress("unused")
+abstract class DanaRSServicesModule {
+    @ContributesAndroidInjector abstract fun contributesDanaRSService(): DanaRSService
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt
similarity index 55%
rename from danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt
index 5af5be0d62..ac539d7d5a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSActivitiesModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSActivitiesModule.kt
@@ -1,9 +1,11 @@
-package info.nightscout.androidaps.danars.dependencyInjection
+package info.nightscout.androidaps.danars.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.danars.activities.BLEScanActivity
+import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.danars.activities.PairingHelperActivity
+import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog
 
 @Module
 @Suppress("unused")
@@ -11,4 +13,7 @@ abstract class DanaRSActivitiesModule {
 
     @ContributesAndroidInjector abstract fun contributesBLEScanActivity(): BLEScanActivity
     @ContributesAndroidInjector abstract fun contributesPairingHelperActivity(): PairingHelperActivity
+    @ContributesAndroidInjector abstract fun contributeEnterPinActivity(): EnterPinActivity
+
+    @ContributesAndroidInjector abstract fun contributesPairingProgressDialog(): PairingProgressDialog
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
similarity index 99%
rename from danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
index b4bf2b4b43..cb7a0dcfcd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/dependencyInjection/DanaRSCommModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.danars.dependencyInjection
+package info.nightscout.androidaps.danars.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt
new file mode 100644
index 0000000000..3939007598
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSModule.kt
@@ -0,0 +1,10 @@
+package info.nightscout.androidaps.danars.di
+
+import dagger.Module
+
+@Module(includes = [
+    DanaRSCommModule::class,
+    DanaRSActivitiesModule::class,
+    DanaRSServicesModule::class
+])
+open class DanaRSModule
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 59d2bcad34..8577810291 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -15,7 +15,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.dana.DanaRPump
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.danars.activities.PairingHelperActivity
@@ -43,7 +43,7 @@ class BLEComm @Inject internal constructor(
     private val rxBus: RxBusWrapper,
     private val sp: SP,
     private val danaRSMessageHashTable: DanaRSMessageHashTable,
-    private val danaRPump: DanaRPump,
+    private val danaPump: DanaPump,
     private val danaRSPlugin: DanaRSPlugin,
     private val bleEncryption: BleEncryption,
     private val nsUpload: NSUpload
@@ -70,7 +70,7 @@ class BLEComm @Inject internal constructor(
         set(newValue) {
             bleEncryption.setEnhancedEncryption(newValue)
             field = newValue
-            danaRPump.v3RSPump = newValue
+            danaPump.v3RSPump = newValue
         }
     private var isEasyMode: Boolean = false
     private var isUnitUD: Boolean = false
@@ -557,9 +557,9 @@ class BLEComm @Inject internal constructor(
             val size = decryptedBuffer.size
             var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
             pass = pass xor 3463
-            danaRPump.rsPassword = Integer.toHexString(pass)
-            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaRPump.rsPassword)
-            if (!danaRPump.isRSPasswordOK) {
+            danaPump.rsPassword = Integer.toHexString(pass)
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaPump.rsPassword)
+            if (!danaPump.isRSPasswordOK) {
                 aapsLogger.error(LTag.PUMPBTCOMM, "Wrong pump password")
                 rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_PASSWORD, resourceHelper.gs(R.string.wrongpumppassword), Notification.URGENT)))
                 disconnect("WrongPassword")
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index 596aee5356..b062c0d21a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -31,9 +31,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaRPump
-import info.nightscout.androidaps.dana.comm.RecordTypes
-import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.comm.*
 import info.nightscout.androidaps.queue.Callback
@@ -59,7 +57,7 @@ class DanaRSService : DaggerService() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var context: Context
     @Inject lateinit var danaRSPlugin: DanaRSPlugin
-    @Inject lateinit var danaRPump: DanaRPump
+    @Inject lateinit var danaPump: DanaPump
     @Inject lateinit var danaRSMessageHashTable: DanaRSMessageHashTable
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var constraintChecker: ConstraintChecker
@@ -121,10 +119,10 @@ class DanaRSService : DaggerService() {
             sendMessage(DanaRS_Packet_Bolus_Get_Step_Bolus_Information(injector)) // last bolus, bolusStep, maxBolus
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingtempbasalstatus)))
             sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
-            danaRPump.lastConnection = System.currentTimeMillis()
+            danaPump.lastConnection = System.currentTimeMillis()
             val profile = profileFunction.getProfile()
             val pump = activePlugin.activePump
-            if (profile != null && abs(danaRPump.currentBasal - profile.basal) >= pump.pumpDescription.basalStep) {
+            if (profile != null && abs(danaPump.currentBasal - profile.basal) >= pump.pumpDescription.basalStep) {
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
                 sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
@@ -133,17 +131,17 @@ class DanaRSService : DaggerService() {
             }
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
             sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
-            var timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
-            if (danaRPump.pumpTime == 0L) {
+            var timeDiff = (danaPump.pumpTime - System.currentTimeMillis()) / 1000L
+            if (danaPump.pumpTime == 0L) {
                 // initial handshake was not successful
                 // de-initialize pump
-                danaRPump.reset()
+                danaPump.reset()
                 rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
                 rxBus.send(EventInitializationChanged())
                 return
             }
             val now = System.currentTimeMillis()
-            if (danaRPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
+            if (danaPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
                 sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
                 sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
@@ -153,7 +151,7 @@ class DanaRSService : DaggerService() {
                 sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
                 sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
                 sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
-                danaRPump.lastSettingsRead = now
+                danaPump.lastSettingsRead = now
             }
             aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
             if (abs(timeDiff) > 3) {
@@ -168,12 +166,12 @@ class DanaRSService : DaggerService() {
                     context.startActivity(i)
 
                     //de-initialize pump
-                    danaRPump.reset()
+                    danaPump.reset()
                     rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
                     rxBus.send(EventInitializationChanged())
                     return
                 } else {
-                    if (danaRPump.protocol >= 6) {
+                    if (danaPump.protocol >= 6) {
                         sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now()))
                     } else {
                         waitForWholeMinute() // Dana can set only whole minute
@@ -181,7 +179,7 @@ class DanaRSService : DaggerService() {
                         sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now() + T.secs(10).msecs()))
                     }
                     sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
-                    timeDiff = (danaRPump.pumpTime - System.currentTimeMillis()) / 1000L
+                    timeDiff = (danaPump.pumpTime - System.currentTimeMillis()) / 1000L
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
                 }
             }
@@ -189,12 +187,12 @@ class DanaRSService : DaggerService() {
             rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
             rxBus.send(EventInitializationChanged())
             //NSUpload.uploadDeviceStatus();
-            if (danaRPump.dailyTotalUnits > danaRPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
-                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits)
+            if (danaPump.dailyTotalUnits > danaPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits)
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
                     val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
                     rxBus.send(EventNewNotification(reportFail))
-                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaRPump.dailyTotalUnits + "/" + danaRPump.maxDailyTotalUnits + "U")
+                    nsUpload.uploadError(resourceHelper.gs(R.string.approachingdailylimit) + ": " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits + "U")
                     lastApproachingDailyLimit = System.currentTimeMillis()
                 }
             }
@@ -220,12 +218,12 @@ class DanaRSService : DaggerService() {
             aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched))
         }
         sendMessage(msg)
-        while (!danaRPump.historyDoneReceived && bleComm.isConnected) {
+        while (!danaPump.historyDoneReceived && bleComm.isConnected) {
             SystemClock.sleep(100)
         }
-        lastHistoryFetched = if (danaRPump.lastEventTimeLoaded != 0L) danaRPump.lastEventTimeLoaded - T.mins(1).msecs() else 0
+        lastHistoryFetched = if (danaPump.lastEventTimeLoaded != 0L) danaPump.lastEventTimeLoaded - T.mins(1).msecs() else 0
         aapsLogger.debug(LTag.PUMPCOMM, "Events loaded")
-        danaRPump.lastConnection = System.currentTimeMillis()
+        danaPump.lastConnection = System.currentTimeMillis()
         return PumpEnactResult(injector).success(true)
     }
 
@@ -240,32 +238,32 @@ class DanaRSService : DaggerService() {
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
         bolusingTreatment = t
         val preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0)
-        danaRPump.bolusingTreatment = t
-        danaRPump.bolusAmountToBeDelivered = insulin
-        danaRPump.bolusStopped = false
-        danaRPump.bolusStopForced = false
-        danaRPump.bolusProgressLastTimeStamp = DateUtil.now()
+        danaPump.bolusingTreatment = t
+        danaPump.bolusAmountToBeDelivered = insulin
+        danaPump.bolusStopped = false
+        danaPump.bolusStopForced = false
+        danaPump.bolusProgressLastTimeStamp = DateUtil.now()
         val start = DanaRS_Packet_Bolus_Set_Step_Bolus_Start(injector, insulin, preferencesSpeed)
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, info.nightscout.androidaps.dana.DanaRPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, info.nightscout.androidaps.dana.DanaPump.CARBS, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             lastHistoryFetched = min(lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
         val bolusStart = System.currentTimeMillis()
         if (insulin > 0) {
-            if (!danaRPump.bolusStopped) {
+            if (!danaPump.bolusStopped) {
                 sendMessage(start)
             } else {
                 t.insulin = 0.0
                 return false
             }
-            while (!danaRPump.bolusStopped && !start.failed && !danaRPump.bolusDone) {
+            while (!danaPump.bolusStopped && !start.failed && !danaPump.bolusDone) {
                 SystemClock.sleep(100)
-                if (System.currentTimeMillis() - danaRPump.bolusProgressLastTimeStamp > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
-                    danaRPump.bolusStopped = true
-                    danaRPump.bolusStopForced = true
+                if (System.currentTimeMillis() - danaPump.bolusProgressLastTimeStamp > 15 * 1000L) { // if i didn't receive status for more than 20 sec expecting broken comm
+                    danaPump.bolusStopped = true
+                    danaPump.bolusStopForced = true
                     aapsLogger.debug(LTag.PUMPCOMM, "Communication stopped")
                 }
             }
@@ -304,21 +302,21 @@ class DanaRSService : DaggerService() {
     fun bolusStop() {
         aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (bolusingTreatment == null) "" else bolusingTreatment?.insulin)
         val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector)
-        danaRPump.bolusStopForced = true
+        danaPump.bolusStopForced = true
         if (isConnected) {
             sendMessage(stop)
-            while (!danaRPump.bolusStopped) {
+            while (!danaPump.bolusStopped) {
                 sendMessage(stop)
                 SystemClock.sleep(200)
             }
         } else {
-            danaRPump.bolusStopped = true
+            danaPump.bolusStopped = true
         }
     }
 
     fun tempBasal(percent: Int, durationInHours: Int): Boolean {
         if (!isConnected) return false
-        if (danaRPump.isTempBasalInProgress) {
+        if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
@@ -333,7 +331,7 @@ class DanaRSService : DaggerService() {
     }
 
     fun highTempBasal(percent: Int): Boolean {
-        if (danaRPump.isTempBasalInProgress) {
+        if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
@@ -351,7 +349,7 @@ class DanaRSService : DaggerService() {
             aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param")
             return false
         }
-        if (danaRPump.isTempBasalInProgress) {
+        if (danaPump.isTempBasalInProgress) {
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
             sendMessage(DanaRS_Packet_Basal_Set_Cancel_Temporary_Basal(injector))
             SystemClock.sleep(500)
@@ -398,12 +396,12 @@ class DanaRSService : DaggerService() {
     fun updateBasalsInPump(profile: Profile): Boolean {
         if (!isConnected) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
-        val basal = danaRPump.buildDanaRProfileRecord(profile)
+        val basal = danaPump.buildDanaRProfileRecord(profile)
         val msgSet = DanaRS_Packet_Basal_Set_Profile_Basal_Rate(injector, 0, basal)
         sendMessage(msgSet)
         val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(injector, 0)
         sendMessage(msgActivate)
-        danaRPump.lastSettingsRead = 0 // force read full settings
+        danaPump.lastSettingsRead = 0 // force read full settings
         readPumpStatus()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true

From 3071d15a5f290bd4d1d6c0cd9cb1d86eb280fcd8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 17:06:49 +0200
Subject: [PATCH 071/400] bump 2.6.6

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6289c5f27b..16b564b67c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,7 +128,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.5-dev"
+        version "2.6.6-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From 14b9ee37981c4acb4a2fa49f9b50feb0bf89e736 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 17:32:02 +0200
Subject: [PATCH 072/400] update manifests

---
 app/src/main/AndroidManifest.xml              | 21 -------------------
 .../dependencyInjection/ActivitiesModule.kt   |  1 -
 .../dependencyInjection/FragmentsModule.kt    |  2 --
 app/src/main/res/values/styles.xml            |  8 -------
 core/src/main/AndroidManifest.xml             | 13 +++++++++++-
 .../androidaps/core/di/CoreFragmentsModule.kt |  8 +++++++
 core/src/main/res/values/styles.xml           |  8 +++++++
 dana/src/main/AndroidManifest.xml             |  8 ++++++-
 danars/src/main/AndroidManifest.xml           | 17 ++++++++++++++-
 9 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 98043e941c..5b4b5e4f74 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,15 +58,6 @@
             </intent-filter>
         </activity>
         <activity android:name=".activities.PreferencesActivity" />
-        <activity
-            android:name=".activities.BolusProgressHelperActivity"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity
-            android:name=".activities.ErrorHelperActivity"
-            android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaHistoryActivity" />
-        <activity android:name="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity" />
-        <activity android:name=".activities.TDDStatsActivity" />
         <activity android:name=".plugins.general.overview.activities.QuickWizardListActivity">
             <intent-filter>
                 <action android:name="info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity" />
@@ -74,18 +65,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity">
-            <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="info.nightscout.androidaps.danars.activities.PairingHelperActivity"
-            android:launchMode="singleTask" />
-        <activity android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
-            android:launchMode="singleTask" />
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 6174bcdf64..593d1e09e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -38,6 +38,5 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity
     @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
     @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
-    @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
     @ContributesAndroidInjector abstract fun contributesPrefImportListActivity(): PrefImportListActivity
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 4535f6820b..3fb97d8a32 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -100,10 +100,8 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesChooseActionDialog(): ChooseActionDialog
     @ContributesAndroidInjector abstract fun contributesChooseTriggerDialog(): ChooseTriggerDialog
     @ContributesAndroidInjector abstract fun contributesInsulinDialog(): InsulinDialog
-    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
     @ContributesAndroidInjector abstract fun contributesObjectivesExamDialog(): ObjectivesExamDialog
     @ContributesAndroidInjector abstract fun contributesProfileSwitchDialog(): ProfileSwitchDialog
-    @ContributesAndroidInjector abstract fun contributesProfileViewerDialog(): ProfileViewerDialog
     @ContributesAndroidInjector abstract fun contributesTempBasalDialog(): TempBasalDialog
     @ContributesAndroidInjector abstract fun contributesTempTargetDialog(): TempTargetDialog
     @ContributesAndroidInjector abstract fun contributesTreatmentDialog(): TreatmentDialog
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3a8d62955b..cd9e3d509c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,14 +16,6 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
-    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-    </style>
-
     <style name="InsightAlertDialog" parent="Theme.AppCompat.Dialog.MinWidth">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 0ff2fcd7b8..6d8a02d4c2 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,5 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.core" >
+    package="info.nightscout.androidaps.core">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.activities.TDDStatsActivity" />
+        <activity
+            android:name="info.nightscout.androidaps.activities.BolusProgressHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+        <activity
+            android:name="info.nightscout.androidaps.activities.ErrorHelperActivity"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
+    </application>
 </manifest>
diff --git a/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
index 51a308697b..43bfc39cca 100644
--- a/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
+++ b/core/src/main/java/info/nightscout/androidaps/core/di/CoreFragmentsModule.kt
@@ -2,17 +2,25 @@ package info.nightscout.androidaps.core.di
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.activities.BolusProgressHelperActivity
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.activities.TDDStatsActivity
 import info.nightscout.androidaps.dialogs.BolusProgressDialog
 import info.nightscout.androidaps.dialogs.ErrorDialog
+import info.nightscout.androidaps.dialogs.NtpProgressDialog
+import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 
 @Module
 @Suppress("unused")
 abstract class CoreFragmentsModule {
 
+    @ContributesAndroidInjector abstract fun contributesTDDStatsActivity(): TDDStatsActivity
+    @ContributesAndroidInjector abstract fun contributeBolusProgressHelperActivity(): BolusProgressHelperActivity
     @ContributesAndroidInjector abstract fun contributeErrorHelperActivity(): ErrorHelperActivity
 
     @ContributesAndroidInjector abstract fun contributesBolusProgressDialog(): BolusProgressDialog
     @ContributesAndroidInjector abstract fun contributesErrorDialog(): ErrorDialog
+    @ContributesAndroidInjector abstract fun contributesNtpProgressDialog(): NtpProgressDialog
+    @ContributesAndroidInjector abstract fun contributesProfileViewerDialog(): ProfileViewerDialog
 
 }
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 8c6ea8c019..bcfae4473e 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -10,6 +10,14 @@
         <item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
     </style>
 
+    <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+    </style>
+
     <style name="AppThemeWarningDialog" parent="AppTheme">
         <item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
         <item name="dialogTitleBackground">@color/warningAlertBackground</item>
diff --git a/dana/src/main/AndroidManifest.xml b/dana/src/main/AndroidManifest.xml
index 4701a95697..3503bdc49f 100644
--- a/dana/src/main/AndroidManifest.xml
+++ b/dana/src/main/AndroidManifest.xml
@@ -1,2 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.dana" />
+    package="info.nightscout.androidaps.dana">
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaHistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity" />
+    </application>
+</manifest>
diff --git a/danars/src/main/AndroidManifest.xml b/danars/src/main/AndroidManifest.xml
index 128d47771d..46526b1fa9 100644
--- a/danars/src/main/AndroidManifest.xml
+++ b/danars/src/main/AndroidManifest.xml
@@ -1,6 +1,21 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.danars" >
+    package="info.nightscout.androidaps.danars">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.danars.activities.BLEScanActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.PumpDanaRS.activities.BLEScanActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="info.nightscout.androidaps.danars.activities.PairingHelperActivity"
+            android:launchMode="singleTask" />
+        <activity
+            android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
+            android:launchMode="singleTask" />
+    </application>
 </manifest>

From 5368b5c1099aa845f0a492973cd75db923938c2f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 17:41:03 +0200
Subject: [PATCH 073/400] update manifests

---
 app/src/main/AndroidManifest.xml    | 16 ----------------
 danar/src/main/AndroidManifest.xml  | 15 +++++++++++++++
 danars/src/main/AndroidManifest.xml |  5 +++++
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5b4b5e4f74..17e85b8399 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -132,22 +132,6 @@
         <service
             android:name=".services.LocationService"
             android:exported="false" />
-        <service
-            android:name=".danar.services.DanaRExecutionService"
-            android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name=".danaRKorean.services.DanaRKoreanExecutionService"
-            android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name=".danaRv2.services.DanaRv2ExecutionService"
-            android:enabled="true"
-            android:exported="false" />
-        <service
-            android:name="info.nightscout.androidaps.danars.services.DanaRSService"
-            android:enabled="true"
-            android:exported="true" />
         <service
             android:name=".plugins.general.wear.wearintegration.WatchUpdaterService"
             android:exported="true">
diff --git a/danar/src/main/AndroidManifest.xml b/danar/src/main/AndroidManifest.xml
index 75256d3b75..f32d848875 100644
--- a/danar/src/main/AndroidManifest.xml
+++ b/danar/src/main/AndroidManifest.xml
@@ -2,4 +2,19 @@
     package="info.nightscout.androidaps.danar" >
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
+
+    <application>
+        <service
+            android:name="info.nightscout.androidaps.danar.services.DanaRExecutionService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name="info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService"
+            android:enabled="true"
+            android:exported="false" />
+    </application>
 </manifest>
diff --git a/danars/src/main/AndroidManifest.xml b/danars/src/main/AndroidManifest.xml
index 46526b1fa9..b560f7f9bd 100644
--- a/danars/src/main/AndroidManifest.xml
+++ b/danars/src/main/AndroidManifest.xml
@@ -17,5 +17,10 @@
         <activity
             android:name="info.nightscout.androidaps.danars.activities.EnterPinActivity"
             android:launchMode="singleTask" />
+
+        <service
+            android:name="info.nightscout.androidaps.danars.services.DanaRSService"
+            android:enabled="true"
+            android:exported="false" />
     </application>
 </manifest>

From 9e8124bc29f2477ac460de4c8320072455f40b43 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 20:05:12 +0200
Subject: [PATCH 074/400] fix dana bolusing dialog

---
 .../dependencyInjection/PluginsModule.kt          |  9 ++++++---
 .../services/DanaRKoreanExecutionService.java     |  5 +++--
 .../danaRv2/services/DanaRv2ExecutionService.java |  5 +++--
 .../services/AbstractDanaRExecutionService.java   |  4 +---
 .../danar/services/DanaRExecutionService.java     |  5 +++--
 .../androidaps/danars/services/DanaRSService.kt   | 15 +++++++--------
 settings.gradle                                   |  4 +---
 7 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index ed14d108c9..1e02c6100d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -4,6 +4,9 @@ import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntKey
 import dagger.multibindings.IntoMap
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
@@ -106,19 +109,19 @@ abstract class PluginsModule {
     @PumpDriver
     @IntoMap
     @IntKey(90)
-    abstract fun bindDanaRPlugin(plugin: info.nightscout.androidaps.danar.DanaRPlugin): PluginBase
+    abstract fun bindDanaRPlugin(plugin: DanaRPlugin): PluginBase
 
     @Binds
     @PumpDriver
     @IntoMap
     @IntKey(100)
-    abstract fun bindDanaRKoreanPlugin(plugin: info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin): PluginBase
+    abstract fun bindDanaRKoreanPlugin(plugin: DanaRKoreanPlugin): PluginBase
 
     @Binds
     @PumpDriver
     @IntoMap
     @IntKey(110)
-    abstract fun bindDanaRv2Plugin(plugin: info.nightscout.androidaps.danaRv2.DanaRv2Plugin): PluginBase
+    abstract fun bindDanaRv2Plugin(plugin: DanaRv2Plugin): PluginBase
 
     @Binds
     @PumpDriver
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 11edecc293..2bacae53cb 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -259,7 +259,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        mBolusingTreatment = t;
+        danaPump.setBolusingTreatment(t);
+        danaPump.setBolusDone(false);
         MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
@@ -288,7 +289,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             }
             SystemClock.sleep(300);
 
-            mBolusingTreatment = null;
+            danaPump.setBolusingTreatment(null);
             commandQueue.readStatus("bolusOK", null);
         }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index e28e2804ee..87d689530f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -349,7 +349,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (BolusProgressDialog.stopPressed) return false;
 
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)));
-        mBolusingTreatment = t;
+        danaPump.setBolusingTreatment(t);
+        danaPump.setBolusDone(false);
         final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
@@ -392,7 +393,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         bolusingEvent.setT(t);
         bolusingEvent.setPercent(99);
 
-        mBolusingTreatment = null;
+        danaPump.setBolusingTreatment(null);
         int speed = 12;
         switch (preferencesSpeed) {
             case 0:
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 63174d70c4..44f2950eb6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -74,8 +74,6 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     protected BluetoothSocket mRfcommSocket;
     protected BluetoothDevice mBTDevice;
 
-    protected Treatment mBolusingTreatment = null;
-
     protected boolean mConnectionInProgress = false;
     protected boolean mHandshakeInProgress = false;
 
@@ -212,7 +210,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
     }
 
     public void bolusStop() {
-        aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (mBolusingTreatment == null ? "" : mBolusingTreatment.insulin));
+        aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (danaPump.getBolusingTreatment() == null ? "" : danaPump.getBolusingTreatment().insulin));
         MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump);
         danaPump.setBolusStopForced(true);
         if (isConnected()) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index e5a8dd7644..fa95da936c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -270,7 +270,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (BolusProgressDialog.stopPressed) return false;
 
-        mBolusingTreatment = t;
+        danaPump.setBolusingTreatment(t);
+        danaPump.setBolusDone(false);
         int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
@@ -309,7 +310,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             bolusingEvent.setT(t);
             bolusingEvent.setPercent(99);
 
-            mBolusingTreatment = null;
+            danaPump.setBolusingTreatment(null);
 
             int speed = 12;
             switch (preferencesSpeed) {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index b062c0d21a..ad5023a849 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -10,7 +10,10 @@ import dagger.android.DaggerService
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.R
+import info.nightscout.androidaps.danars.comm.*
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.db.Treatment
@@ -31,9 +34,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.danars.comm.*
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.commands.Command
 import info.nightscout.androidaps.utils.DateUtil
@@ -69,7 +69,6 @@ class DanaRSService : DaggerService() {
 
     private val disposable = CompositeDisposable()
     private val mBinder: IBinder = LocalBinder()
-    private var bolusingTreatment: Treatment? = null
     private var lastHistoryFetched: Long = 0
     private var lastApproachingDailyLimit: Long = 0
 
@@ -236,8 +235,8 @@ class DanaRSService : DaggerService() {
         if (!isConnected) return false
         if (BolusProgressDialog.stopPressed) return false
         rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
-        bolusingTreatment = t
         val preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0)
+        danaPump.bolusDone = false
         danaPump.bolusingTreatment = t
         danaPump.bolusAmountToBeDelivered = insulin
         danaPump.bolusStopped = false
@@ -247,7 +246,7 @@ class DanaRSService : DaggerService() {
         if (carbs > 0) {
 //            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(carbTime, carbs); ####
 //            sendMessage(msg);
-            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, info.nightscout.androidaps.dana.DanaPump.CARBS, carbTime, carbs, 0)
+            val msgSetHistoryEntryV2 = DanaRS_Packet_APS_Set_Event_History(injector, DanaPump.CARBS, carbTime, carbs, 0)
             sendMessage(msgSetHistoryEntryV2)
             lastHistoryFetched = min(lastHistoryFetched, carbTime - T.mins(1).msecs())
         }
@@ -271,7 +270,7 @@ class DanaRSService : DaggerService() {
         val bolusingEvent = EventOverviewBolusProgress
         bolusingEvent.t = t
         bolusingEvent.percent = 99
-        bolusingTreatment = null
+        danaPump.bolusingTreatment = null
         var speed = 12
         when (preferencesSpeed) {
             0 -> speed = 12
@@ -300,7 +299,7 @@ class DanaRSService : DaggerService() {
     }
 
     fun bolusStop() {
-        aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (bolusingTreatment == null) "" else bolusingTreatment?.insulin)
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusStop >>>>> @ " + if (danaPump.bolusingTreatment == null) "" else danaPump.bolusingTreatment?.insulin)
         val stop = DanaRS_Packet_Bolus_Set_Step_Bolus_Stop(injector)
         danaPump.bolusStopForced = true
         if (isConnected) {
diff --git a/settings.gradle b/settings.gradle
index 15de48ff31..661d9ef66a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1 @@
-include ':app', ':wear', ':core', ':danars'
-include ':dana'
-include ':danar'
+include ':app', ':wear', ':core', ':dana', ':danar', ':danars'

From b0513be8bf3d2b86b2355dc9d5ce5f4161746837 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 20:15:35 +0200
Subject: [PATCH 075/400] remove crashing dump

---
 .../androidaps/plugins/treatments/TreatmentsPlugin.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 4d28d2dcdd..f273015441 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -307,13 +307,13 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
 
         long time = System.currentTimeMillis();
         synchronized (treatments) {
-            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: AllTreatmentsInDb: " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(treatments));
+//            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: AllTreatmentsInDb: " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(treatments));
 
             for (Treatment t : treatments) {
                 if (t.date <= time && t.date >= fromTimestamp)
                     in5minback.add(t);
             }
-            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={} " + fromTimestamp + " " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(in5minback));
+//            getAapsLogger().debug(MedtronicHistoryData.doubleBolusDebug, LTag.DATATREATMENTS, "DoubleBolusDebug: FilteredTreatments: AfterTime={}, Items={} " + fromTimestamp + " " + new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create().toJson(in5minback));
             return in5minback;
         }
     }

From 1bc2c406162e9dc6c64584b87cb81a3fe87dfb6f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 20:53:41 +0200
Subject: [PATCH 076/400] Update Crowdin configuration file

---
 crowdin.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crowdin.yml b/crowdin.yml
index ace938f2a1..c05ac5906a 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -15,3 +15,5 @@ files:
     translation: /app/src/main/res/values-%android_code%/validator.xml
   - source: /core/src/main/res/values/strings.xml
     translation: /core/src/main/res/values-%android_code%/strings.xml
+  - source: /dana/src/main/res/values/strings.xml
+    translation: /dana/src/main/res/values-%android_code%/strings.xml

From 2b6f30823201a269934f24dc0db0cddef0b0f0a3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 22:30:09 +0200
Subject: [PATCH 077/400] typo

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

diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index 4d1c72d062..b0fe53ee25 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="key_danars_address" translatable="false">danars_address</string>
     <string name="key_danars_name" translatable="false">danars_name</string>
     <string name="key_danar_password" translatable="false">danar_password</string>
-    <string name="key_danars_password">danars_password</string>
+    <string name="key_danars_password" translatable="false">danars_password</string>
     <string name="key_danars_bolusspeed" translatable="false">danars_bolusspeed</string>
     <string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
     <string name="key_danars_v3_randompairingkey" translatable="false">danars_v3_randompairing_key_</string>

From 205ab5220d9f98886ded14ef2f8e6780ea5fa9ee Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 11 May 2020 22:47:30 +0200
Subject: [PATCH 078/400] New Crowdin translations (#2611)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Romanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations protection.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations insight_alert_descriptions.xml (Italian)

* New translations insight_alert_titles.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Irish)

* New translations strings.xml (Russian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Finnish)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Irish)

* New translations strings.xml (Polish)

* New translations strings.xml (Greek)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Italian)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Finnish)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Japanese)

* New translations strings.xml (Croatian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Japanese)

* New translations strings.xml (Finnish)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_exceptions.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Czech)
---
 app/src/main/res/values-af-rZA/strings.xml    | 263 +-------
 app/src/main/res/values-bg-rBG/strings.xml    | 281 +--------
 app/src/main/res/values-cs-rCZ/strings.xml    | 362 +++--------
 app/src/main/res/values-de-rDE/strings.xml    | 395 ++++--------
 app/src/main/res/values-el-rGR/strings.xml    | 263 +-------
 app/src/main/res/values-es-rES/strings.xml    | 281 +--------
 app/src/main/res/values-fi-rFI/strings.xml    |   9 +
 app/src/main/res/values-fr-rFR/strings.xml    | 283 +--------
 app/src/main/res/values-ga-rIE/strings.xml    |  15 +-
 app/src/main/res/values-hr-rHR/strings.xml    |   9 +
 app/src/main/res/values-it-rIT/exam.xml       |  50 +-
 .../insight_alert_descriptions.xml            |   4 +-
 .../values-it-rIT/insight_alert_titles.xml    |   6 +-
 app/src/main/res/values-it-rIT/protection.xml |   2 +-
 app/src/main/res/values-it-rIT/strings.xml    | 578 +++++++-----------
 app/src/main/res/values-iw-rIL/strings.xml    |   9 +
 app/src/main/res/values-ja-rJP/strings.xml    |   9 +
 app/src/main/res/values-ko-rKR/strings.xml    | 281 +--------
 app/src/main/res/values-lt-rLT/strings.xml    | 282 +--------
 app/src/main/res/values-nl-rNL/strings.xml    | 281 +--------
 app/src/main/res/values-pl-rPL/strings.xml    | 381 ++++--------
 app/src/main/res/values-pl-rPL/validator.xml  |  21 +-
 app/src/main/res/values-pt-rBR/objectives.xml |   1 +
 app/src/main/res/values-pt-rBR/strings.xml    | 380 ++++--------
 app/src/main/res/values-pt-rPT/exam.xml       |   2 +-
 .../values-pt-rPT/insight_alert_titles.xml    |   4 +-
 .../res/values-pt-rPT/insight_exceptions.xml  |   4 +-
 app/src/main/res/values-pt-rPT/objectives.xml |   2 +-
 app/src/main/res/values-pt-rPT/strings.xml    | 436 ++++---------
 app/src/main/res/values-ro-rRO/strings.xml    | 263 +-------
 app/src/main/res/values-ru-rRU/strings.xml    | 394 ++++--------
 app/src/main/res/values-sk-rSK/strings.xml    | 283 +--------
 app/src/main/res/values-sl-rSI/strings.xml    |   9 +
 app/src/main/res/values-sv-rSE/strings.xml    | 417 +++++--------
 app/src/main/res/values-tr-rTR/strings.xml    | 231 +------
 app/src/main/res/values-zh-rCN/strings.xml    | 252 +-------
 core/src/main/res/values-af-rZA/strings.xml   |  20 +
 core/src/main/res/values-bg-rBG/strings.xml   |  20 +
 core/src/main/res/values-cs-rCZ/strings.xml   | 180 ++++++
 core/src/main/res/values-de-rDE/strings.xml   |  95 +++
 core/src/main/res/values-el-rGR/strings.xml   |  20 +
 core/src/main/res/values-es-rES/strings.xml   |  20 +
 core/src/main/res/values-fi-rFI/strings.xml   |  20 +
 core/src/main/res/values-fr-rFR/strings.xml   |  20 +
 core/src/main/res/values-ga-rIE/strings.xml   |  20 +
 core/src/main/res/values-hr-rHR/strings.xml   |  20 +
 core/src/main/res/values-it-rIT/strings.xml   |  95 +++
 core/src/main/res/values-iw-rIL/strings.xml   |  20 +
 core/src/main/res/values-ja-rJP/strings.xml   |  20 +
 core/src/main/res/values-ko-rKR/strings.xml   |  20 +
 core/src/main/res/values-lt-rLT/strings.xml   |  20 +
 core/src/main/res/values-nl-rNL/strings.xml   |  20 +
 core/src/main/res/values-pl-rPL/strings.xml   |  20 +
 core/src/main/res/values-pt-rBR/strings.xml   | 172 ++++++
 core/src/main/res/values-pt-rPT/strings.xml   | 172 ++++++
 core/src/main/res/values-ro-rRO/strings.xml   |  20 +
 core/src/main/res/values-ru-rRU/strings.xml   | 180 ++++++
 core/src/main/res/values-sk-rSK/strings.xml   |  20 +
 core/src/main/res/values-sl-rSI/strings.xml   |  20 +
 core/src/main/res/values-sv-rSE/strings.xml   |  95 +++
 core/src/main/res/values-tr-rTR/strings.xml   |  20 +
 core/src/main/res/values-zh-rCN/strings.xml   |  20 +
 dana/src/main/res/values-af-rZA/strings.xml   |   2 +
 dana/src/main/res/values-bg-rBG/strings.xml   |   2 +
 dana/src/main/res/values-cs-rCZ/strings.xml   | 119 ++++
 dana/src/main/res/values-de-rDE/strings.xml   |   2 +
 dana/src/main/res/values-el-rGR/strings.xml   |   2 +
 dana/src/main/res/values-es-rES/strings.xml   |   2 +
 dana/src/main/res/values-fi-rFI/strings.xml   |   2 +
 dana/src/main/res/values-fr-rFR/strings.xml   |   2 +
 dana/src/main/res/values-ga-rIE/strings.xml   |   2 +
 dana/src/main/res/values-hr-rHR/strings.xml   |   2 +
 dana/src/main/res/values-it-rIT/strings.xml   |   2 +
 dana/src/main/res/values-iw-rIL/strings.xml   |   2 +
 dana/src/main/res/values-ja-rJP/strings.xml   |   2 +
 dana/src/main/res/values-ko-rKR/strings.xml   |   2 +
 dana/src/main/res/values-lt-rLT/strings.xml   |   2 +
 dana/src/main/res/values-nl-rNL/strings.xml   |   2 +
 dana/src/main/res/values-pl-rPL/strings.xml   |   2 +
 dana/src/main/res/values-pt-rBR/strings.xml   |  66 ++
 dana/src/main/res/values-pt-rPT/strings.xml   |  66 ++
 dana/src/main/res/values-ro-rRO/strings.xml   |   2 +
 dana/src/main/res/values-ru-rRU/strings.xml   | 119 ++++
 dana/src/main/res/values-sk-rSK/strings.xml   |   2 +
 dana/src/main/res/values-sl-rSI/strings.xml   |   2 +
 dana/src/main/res/values-sv-rSE/strings.xml   |   2 +
 dana/src/main/res/values-tr-rTR/strings.xml   |   2 +
 dana/src/main/res/values-zh-rCN/strings.xml   |   2 +
 wear/src/main/res/values-bg-rBG/strings.xml   |  31 +-
 wear/src/main/res/values-it-rIT/strings.xml   |   8 +-
 wear/src/main/res/values-pl-rPL/strings.xml   |   1 +
 91 files changed, 3063 insertions(+), 5503 deletions(-)
 create mode 100644 core/src/main/res/values-af-rZA/strings.xml
 create mode 100644 core/src/main/res/values-bg-rBG/strings.xml
 create mode 100644 core/src/main/res/values-cs-rCZ/strings.xml
 create mode 100644 core/src/main/res/values-de-rDE/strings.xml
 create mode 100644 core/src/main/res/values-el-rGR/strings.xml
 create mode 100644 core/src/main/res/values-es-rES/strings.xml
 create mode 100644 core/src/main/res/values-fi-rFI/strings.xml
 create mode 100644 core/src/main/res/values-fr-rFR/strings.xml
 create mode 100644 core/src/main/res/values-ga-rIE/strings.xml
 create mode 100644 core/src/main/res/values-hr-rHR/strings.xml
 create mode 100644 core/src/main/res/values-it-rIT/strings.xml
 create mode 100644 core/src/main/res/values-iw-rIL/strings.xml
 create mode 100644 core/src/main/res/values-ja-rJP/strings.xml
 create mode 100644 core/src/main/res/values-ko-rKR/strings.xml
 create mode 100644 core/src/main/res/values-lt-rLT/strings.xml
 create mode 100644 core/src/main/res/values-nl-rNL/strings.xml
 create mode 100644 core/src/main/res/values-pl-rPL/strings.xml
 create mode 100644 core/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 core/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 core/src/main/res/values-ro-rRO/strings.xml
 create mode 100644 core/src/main/res/values-ru-rRU/strings.xml
 create mode 100644 core/src/main/res/values-sk-rSK/strings.xml
 create mode 100644 core/src/main/res/values-sl-rSI/strings.xml
 create mode 100644 core/src/main/res/values-sv-rSE/strings.xml
 create mode 100644 core/src/main/res/values-tr-rTR/strings.xml
 create mode 100644 core/src/main/res/values-zh-rCN/strings.xml
 create mode 100644 dana/src/main/res/values-af-rZA/strings.xml
 create mode 100644 dana/src/main/res/values-bg-rBG/strings.xml
 create mode 100644 dana/src/main/res/values-cs-rCZ/strings.xml
 create mode 100644 dana/src/main/res/values-de-rDE/strings.xml
 create mode 100644 dana/src/main/res/values-el-rGR/strings.xml
 create mode 100644 dana/src/main/res/values-es-rES/strings.xml
 create mode 100644 dana/src/main/res/values-fi-rFI/strings.xml
 create mode 100644 dana/src/main/res/values-fr-rFR/strings.xml
 create mode 100644 dana/src/main/res/values-ga-rIE/strings.xml
 create mode 100644 dana/src/main/res/values-hr-rHR/strings.xml
 create mode 100644 dana/src/main/res/values-it-rIT/strings.xml
 create mode 100644 dana/src/main/res/values-iw-rIL/strings.xml
 create mode 100644 dana/src/main/res/values-ja-rJP/strings.xml
 create mode 100644 dana/src/main/res/values-ko-rKR/strings.xml
 create mode 100644 dana/src/main/res/values-lt-rLT/strings.xml
 create mode 100644 dana/src/main/res/values-nl-rNL/strings.xml
 create mode 100644 dana/src/main/res/values-pl-rPL/strings.xml
 create mode 100644 dana/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 dana/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 dana/src/main/res/values-ro-rRO/strings.xml
 create mode 100644 dana/src/main/res/values-ru-rRU/strings.xml
 create mode 100644 dana/src/main/res/values-sk-rSK/strings.xml
 create mode 100644 dana/src/main/res/values-sl-rSI/strings.xml
 create mode 100644 dana/src/main/res/values-sv-rSE/strings.xml
 create mode 100644 dana/src/main/res/values-tr-rTR/strings.xml
 create mode 100644 dana/src/main/res/values-zh-rCN/strings.xml

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index b05923bba0..892dc8ef6b 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -12,12 +12,9 @@
     <string name="nav_resetdb">Herstel databasis</string>
     <string name="reset_db_confirm">Wil jy regtig die databasis herstel?</string>
     <string name="nav_exit">Gaan uit</string>
-    <string name="danar_useextended_title">Gebruik verlengde boluses vir &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth-toestel</string>
     <string name="ns_sync_use_absolute_title">Gebruik altyd absolute basale aardes</string>
     <string name="alert_dialog_storage_permission_text">Herlaai jou foon of herlaai AndroidAPS met die stelsel instellings \nanders sal AndroidAPS nie geskiedenis hê nie! (Belangrik om te spoor en te verifieer dat die algoritmes korrek werk)!</string>
     <string name="description_actions">\'n Paar knoppies vir vinnige algemene nutsfunskies</string>
-    <string name="description_careportal">Tik gevorderde log boek inskrywings.</string>
     <string name="description_config_builder">Gebruik vir die aktiewe plugins te konfigureer</string>
     <string name="description_objectives">Onderrig program</string>
     <string name="description_food">Vertoon kos-voorafinstellings soos omskryf in Nightscout</string>
@@ -35,10 +32,6 @@
     <string name="description_profile_nightscout">Bied die profiel wat jy het beskryf het in Nightscout</string>
     <string name="description_profile_simple">Definieer \'n profiel met net een tydblok.</string>
     <string name="description_pump_combo">Pomp Integrasie met Accu-Chek Combo pompe, vereis dat ruffy geïnstalleer is</string>
-    <string name="description_pump_dana_r">Pomp integrasie vir DANA Diabecare R pompe</string>
-    <string name="description_pump_dana_r_korean">Pomp integrasie vir Koreanse DANA Diabecare R pompe</string>
-    <string name="description_pump_dana_r_v2">Pomp integrasie vir DANA Diabecare R pompe met opgegradeerde firmware</string>
-    <string name="description_pump_dana_rs">Pomp integrasie vir DANA Diabecare RS pompe</string>
     <string name="description_pump_mdi">Pomp integrasie vir mense wat veelvoudige daaglikse inspuitings doen vir hul diabetes terapie/regime</string>
     <string name="description_pump_virtual">Pomp integrasie vir pompe wat nog nie enige drywer het nie (oop lus)</string>
     <string name="description_sensitivity_aaps">Sensitiwiteit word bereken op dieselfde manier as Oref0, maar jy kan die tydsraamwerk spesifiseer in die verlede. Minimale karb absorpsie is bereken uit maks karb absorpsie tyd vanaf voorkeure.</string>
@@ -52,13 +45,6 @@
     <string name="description_wear">Monitor en beheer AndroidAPS met jou WearOS horlosie.</string>
     <string name="description_xdrip_status_line">Wys informasie van jou loop op jou xDrip+ horlosie-gesig.</string>
     <string name="description_sms_communicator">Afstandbeheer AndroidAPS met SMS kodes.</string>
-    <string name="nsprofileview_units_label">Eenhede</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basale</string>
-    <string name="nsprofileview_target_label">Doelwit</string>
-    <string name="noprofileset">GEEN PROFIEL</string>
     <string name="treatments_insulin_label_string">Insulien:</string>
     <string name="treatments_carbs_label_string">Karbs:</string>
     <string name="treatments_iob_label_string">IAB:</string>
@@ -74,15 +60,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Karbs</string>
     <string name="treatments_wizard_correction_label">Corr</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Begin nou</string>
     <string name="vitualpump_label">VIRTUELE POMP</string>
-    <string name="pump_basebasalrate_label">Basis basale tempo</string>
-    <string name="pump_tempbasal_label">Tydelike basaal</string>
-    <string name="virtualpump_extendedbolus_label">Verlengde Bolus</string>
-    <string name="pump_battery_label">Battery</string>
-    <string name="pump_reservoir_label">Stoor</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Vorige lopie</string>
     <string name="openapsma_inputparameters_label">Insette parameters</string>
@@ -93,16 +73,11 @@
     <string name="openapsma_mealdata_label">Maaltyd data</string>
     <string name="result">Uitslag</string>
     <string name="openapsma_noglucosedata">Geen beskikbare glukose data</string>
-    <string name="nochangerequested">Geen verandering was versoek</string>
     <string name="openapsma_request_label">Versoek</string>
-    <string name="rate">Tempo</string>
-    <string name="duration">Tydsduur</string>
-    <string name="reason">Rede</string>
     <string name="glucose">Glukose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Konfigurasie bouer</string>
-    <string name="objectives">Doelstellings</string>
     <string name="overview">Oorsig</string>
     <string name="nsprofile">Ns Profiel</string>
     <string name="simpleprofile">Maklike profiel</string>
@@ -120,7 +95,6 @@
     <string name="configbuilder_general">Algemene</string>
     <string name="configbuilder_general_description">Hier is \'n paar algemene invoegtoepassings wat jy dalk nuttig sal vind.</string>
     <string name="configbuilder_constraints_description">Watter beperkings word toegepas?</string>
-    <string name="days">dae</string>
     <string name="constraints">Beperkings</string>
     <string name="loop">Lus</string>
     <string name="configbuilder_loop">Lus</string>
@@ -136,7 +110,6 @@
     <string name="openapsma_disabled">Plugin is gedeaktiveer</string>
     <string name="constraints_violation">Beperkings skending</string>
     <string name="treatmentdeliveryerror">Bolus aflewering fout</string>
-    <string name="tempbasaldeliveryerror">Tempbasal aflewering fout</string>
     <string name="setbasalquestion">Aanvaar nuwe tydelike basale:</string>
     <string name="overview_treatment_label">Behandeling</string>
     <string name="overview_calculator_label">Rekenaar</string>
@@ -146,7 +119,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale:</string>
-    <string name="carbs">Karbs</string>
     <string name="changeyourinput">Verander jou insette!</string>
     <string name="configbuilder_bgsource">BG bron</string>
     <string name="configbuilder_bgsource_description">Waarvandaan  moet AndroidAPS data kry?</string>
@@ -163,24 +135,6 @@
     <string name="treatments_wizard_basaliob_label">Basale IAB</string>
     <string name="bolusconstraintapplied">Bolus beperking toegepas</string>
     <string name="carbsconstraintapplied">Karbs beperking toegepas</string>
-    <string name="careportal_bgcheck">BG Toets</string>
-    <string name="careportal_announcement">Aankondiging</string>
-    <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Vraag</string>
-    <string name="careportal_exercise">Oefening</string>
-    <string name="careportal_pumpsitechange">Pomp ligging wysig</string>
-    <string name="careportal_cgmsensorinsert">CGM Sensor insetsel</string>
-    <string name="careportal_cgmsensorstart">CGM Sensor Begin</string>
-    <string name="careportal_insulincartridgechange">Insulien stoor verandering</string>
-    <string name="careportal_snackbolus">Peuselhappie Bolus</string>
-    <string name="careportal_mealbolus">Maaltyd Bolus</string>
-    <string name="careportal_correctionbolus">Regstelling Bolus</string>
-    <string name="careportal_combobolus">Kombo Bolus</string>
-    <string name="careportal_tempbasalstart">Temp Basale Begin</string>
-    <string name="careportal_tempbasalend">Temp Basale eind</string>
-    <string name="careportal_carbscorrection">Karbs regstelling</string>
-    <string name="careportal_openapsoffline">OpenAPS vanlynaf</string>
-    <string name="careportal_newnstreatment_eventtype">Gebeurtenis tipe</string>
     <string name="careportal_newnstreatment_other">Ander</string>
     <string name="careportal_newnstreatment_meter">Meter</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -210,34 +164,12 @@
     <string name="openapsma_maxbasal_summary">Die waarde word \"maks basal\" genoem in OpenAPS konteks</string>
     <string name="openapsma_maxiob_title">Maksimum basale IAB wat OpenAPS mag lewer [U]</string>
     <string name="openapsma_maxiob_summary">Hierdie waarde word Maks IAB genoem in OpenAPS konteks\nDit is die maksimum insulien in [U] wat APS op een slag kan lewer.</string>
-    <string name="dismiss">DISMISS</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Koppel</string>
-    <string name="connected">Gekoppel</string>
-    <string name="disconnected">Ontkoppel</string>
     <string name="end_user_license_agreement">Eindverbruiker Lisensie Ooreenkoms</string>
     <string name="end_user_license_agreement_text">MOET NIE GEBRUIK WORD OM MEDIESE BESLUITE TE MAAK NIE. DAAR IS GEEN WAARBORG DAT DIE PROGRAM, ONDERWORPE AAN TOEPASSELIKE WETTE EN WETGEWING. TENSY ANDERS GEMELD IN TEKS VOORSIEN DIE KOPIEREG-HOUERS EN / OF ANDER PARTYE DIE PROGRAM \"AS IS\" SONDER ËNIGE WAARBORG VAN ENIGE ORDE, UITDRUKKELIK OF IMPLISIET, INKLUSIEF, MAAR NIE BEPERK TOT DIE IMPLISIETE WAARBORG VAN TOEPAASBAARHEID OF NUT VIR EEN SPESIFIEKE DOEL. DIE TOTALE EN ALLE RISIKOVIR DIE KWALITEIT EN PRESTASIE VAN DIE PROGRAM RUS MET JOUSELF. VIR ENIGE PROGRAM DEFEKTIEWE OF FALINGS MOET JY PERSOONLIK DIE KOSTE EN REGSAANSPREEKLIKHEID DRA VAN ALLE NODIGE AKSIES, DIENS, REPARASIES OF KORREKSIES VIR USELF OF ENIGE DERDE PARTYE EN/OF AKSIES, DIENS, REPARASIES OF KORREKSIES WAT DEUR DIE PROGRAM GEDOEN WAS.</string>
     <string name="end_user_license_agreement_i_understand">EK VERSTAAN en STEM IN</string>
     <string name="save">Stoor</string>
-    <string name="nobtadapter">Geen bluetooth passtuk gevind</string>
-    <string name="devicenotfound">Geselekteerde toestel nie gevind nie</string>
-    <string name="connectionerror">Pomp verbindingsfout</string>
-    <string name="danar_iob_label">Pomp IAB</string>
-    <string name="danar_dailyunits">Daaglikse eenhede</string>
-    <string name="pump_lastbolus_label">Laaste bolus</string>
-    <string name="hoursago">%1$.1fh terug</string>
-    <string name="danar_invalidinput">Ongeldige invoer</string>
-    <string name="danar_valuenotsetproperly">Waarde nie behoorlik gestel</string>
     <string name="reloadprofile">Herlaai profiel</string>
-    <string name="danar_viewprofile">Bekyk profiel</string>
-    <string name="enacted">By hand gedoen</string>
-    <string name="comment">Kommentaar</string>
-    <string name="success">Sukses</string>
-    <string name="percent">Persentasie</string>
-    <string name="absolute">Absolute</string>
-    <string name="canceltemp">Kanselleer tydelike basale</string>
     <string name="smscommunicator">SMS Communicator</string>
-    <string name="waitingforpumpresult">Wag vir uitslag</string>
     <string name="smscommunicator_allowednumbers">Toegelate telefoon nommers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Om %1$.2fU bolus te lewer antwoord met kode %2$s</string>
@@ -246,52 +178,13 @@
     <string name="bolusdelivered">Bolus %1$.2fU suksesvol afgelewer</string>
     <string name="bolusrequested">Gaan %1$.2fU lewer</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU suksesvol afgelewer</string>
-    <string name="bolusdelivering">Lewering van %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Laat afstandbeheerde bevele toe via SMS</string>
-    <string name="glucosetype_finger">Vinger</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Per hand</string>
     <string name="danarprofile">DanaR profiel stellings</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duur van insulien aktiwiteit</string>
-    <string name="failedupdatebasalprofile">Kon nie die basale profiel bywerk nie</string>
-    <string name="danar_historyreload">Herlaai</string>
     <string name="uploading">Laai tans op</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">fout</string>
-    <string name="danar_refill">hervul</string>
-    <string name="danar_basalhour">basale uur</string>
-    <string name="danar_glucose">glukose</string>
-    <string name="danar_carbohydrate">karbohidraat</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Totale %1$d rekords opgelaai</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarms</string>
-    <string name="danar_history_basalhours">Basale ure</string>
-    <string name="danar_history_bolus">Boluses</string>
-    <string name="danar_history_carbohydrates">Karbohidrate</string>
-    <string name="danar_history_dailyinsulin">Daaglikse insulien</string>
-    <string name="danar_history_errors">Foute</string>
-    <string name="danar_history_glucose">Glukose</string>
-    <string name="danar_history_refill">Hervul</string>
-    <string name="danar_history_syspend">Opgeskort</string>
-    <string name="danar_history_connectingfor">Koppel vir %1$d s</string>
-    <string name="danar_password_title">Pomp wagwoord</string>
-    <string name="wrongpumppassword">Verkeerde pomp wagwoord!</string>
-    <string name="pumpbusy">Pomp is besig</string>
-    <string name="overview_bolusprogress_delivered">Gelewer</string>
-    <string name="overview_bolusprogress_stoped">Gestaak</string>
     <string name="bolusstopped">Bolus gestaak</string>
     <string name="bolusstopping">Staak bolus</string>
-    <string name="occlusion">Verstopping</string>
-    <string name="overview_bolusprogress_stop">Staak</string>
-    <string name="overview_bolusprogress_stoppressed">STAAK GEDRUK</string>
-    <string name="waitingforpump">Wag vir pomp</string>
-    <string name="overview_bolusprogress_goingtodeliver">Gaan %1$.2fU lewer</string>
-    <string name="youareonallowedlimit">Die toegelate limiet is bereik</string>
-    <string name="noprofileselected">Geen profiel gekies</string>
     <string name="smscommunicator_loophasbeendisabled">Loop is gedeaktiveer</string>
     <string name="smscommunicator_loophasbeenenabled">Loop is geaktiveerd</string>
     <string name="smscommunicator_loopisdisabled">Loop is gedeaktiveer</string>
@@ -328,11 +221,9 @@
     <string name="mealbolus">Maaltyd</string>
     <string name="correctionbous">Corr</string>
     <string name="actions">Aksies</string>
-    <string name="androidaps_start">AndroidAPS begin</string>
     <string name="ns_upload_only">NS laai net op (opgeskorte sinkro)</string>
     <string name="ns_upload_only_summary">NS oplaai net. Nie effektief op SGV tensy \'n plaaslike bron soos xDrip gekies is. Nie effektief op profiele terwyl NS-profiele gebruik word.</string>
     <string name="pumpNotInitialized">Pomp nie geïnisialiseer nie!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pomp nie geïnisialiseer, profiel nie opgestel nie!</string>
     <string name="primefill">Prima/vul</string>
     <string name="fillwarning">Maak asseblief seker dat die hoeveelheid ooreenstem met die spesifikasies van jou infusie stel!</string>
     <string name="othersettings_title">Ander</string>
@@ -340,8 +231,6 @@
     <string name="button1">Knoppie 1</string>
     <string name="button2">Knoppie 2</string>
     <string name="button3">Knoppie 3</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="target_range">Doelwit reeks:</string>
     <string name="prefs_range_title">Reeks vir visualisering</string>
     <string name="prefs_range_summary">Hoë en lae merke vir die diagramme in Overview en Smartwatch</string>
@@ -350,17 +239,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Stuur alle Data weer</string>
     <string name="open_settings_on_wear">Oop instellings op Wear</string>
-    <string name="pumperror">Pomp fout</string>
-    <string name="lowbattery">Battery laag</string>
-    <string name="pumpshutdown">Pomp afskakeling</string>
-    <string name="batterydischarged">Pomp Battery leeg</string>
-    <string name="danarkoreanpump">DanaR Koreaans</string>
     <string name="basal_rate">Basale waarde:</string>
-    <string name="profile_set_failed">Instelling van basale profiel het misluk</string>
-    <string name="profile_set_ok">Basale profiel in pomp bygewerk</string>
-    <string name="danar_disableeasymode">Versper EasyUI modus in pomp</string>
-    <string name="danar_enableextendedbolus">Uitgebreide boluses op pomp aktiveer</string>
-    <string name="danar_switchtouhmode">Verander in modus van U/d U/h op pomp</string>
     <string name="basalvaluebelowminimum">Basale waarde onder minimum. Profiel nie gestel nie!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Laaste BG:</string>
@@ -368,7 +247,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Voortgesette kennisgewing</string>
     <string name="old_data">OU DATA</string>
-    <string name="minago">%1$d min terug</string>
     <string name="sms_minago">%1$d min terug</string>
     <string name="localprofile">Plaaslike profiel</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -383,41 +261,22 @@
     <string name="eatingsoon">Eet binnekort</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Aktiwiteit</string>
-    <string name="danar_stats">DanaR Stats</string>
-    <string name="danar_stats_cumulative_tdd">Kumulatiewe TDD</string>
-    <string name="danar_stats_expweight">Eksponensiele geweegde TDD</string>
-    <string name="danar_stats_basalrate">Basale</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Datum</string>
-    <string name="danar_stats_ratio">Verhouding</string>
-    <string name="danar_stats_amount_days"># Dae</string>
-    <string name="danar_stats_weight">Gewig</string>
-    <string name="danar_stats_warning_Message">Moontlik onakkuraat as boluse gebruik word vir optop/vulling gebruik!</string>
-    <string name="danar_stats_olddata_Message">Ou Data Druk asseblief \"RELOAD\"</string>
-    <string name="danar_stats_tbb">Totale basis basale</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inisialiseer tans...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LUS</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">TUIS</string>
     <string name="virtualpump_shortname">VPOMP</string>
     <string name="profileviewer_shortname">NSPROFIEL</string>
     <string name="treatments_shortname">BEHANDEL</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Verkort oortjie titels</string>
     <string name="always_use_shortavg">Gebruik altyd kort gemiddelde delta in plaas van eenvoudige delta</string>
     <string name="always_use_shortavg_summary">Nuttig wanneer data van ongefiltreerde bronne soos xDrip baie raas.</string>
-    <string name="advancedsettings_title">Gevorderde instellings</string>
-    <string name="danar_model">Model: %1$02X Protokol: %2$02X Kode: %3$02X</string>
     <string name="profile">Profiel</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Verstek waarde: 3 dit is \'n sleutel OpenAPS veiligheidsdrumpels. Wat dit doen is om jou basale te berk tot 3 x (in hierdie mense) jou grootste basale koers. Jy sal waarskynlik nooit dit hoef te verander, maar jy moet bewus wees wat bespreek is oor \"3 x max daaglikse; 4 x huidige\"vir veiligheidsdrumpels.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Verstek waarde: 4 dit is die helfte van die sleutel OpenAPS veiligheid limiete, en die ander helfte van \"3 x maks daaglikse; 4 x huidige\"van die veiligheid limiet. Dit beteken jou basale, ongeag max basale stel op jou pomp, kan enige hoër wees as hierdie nommer tye die huidige vlak van jou basale. Dit is om te verhoed dat mense in gevaarlike gebied deur instelling buitensporig hoë max basals voor om te verstaan hoe die algoritme werk. Weer, die verstek is 4 x; die meeste mense sal nooit moet dit aanpas en is eerder meer geneig om te moet aanpas ander instellings as hulle voel hulle \"loop in\" hierdie veiligheid limiet.</string>
@@ -436,18 +295,9 @@
     <string name="smscommunicator_calibrationsent">Kalibrasie gestuur. Ontvang moet geaktiveer word in xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip ontvang nie kalibrasies</string>
     <string name="pumpsuspended">Pomp opgeskort</string>
-    <string name="gettingpumpstatus">Verkry pomp status</string>
-    <string name="settingtempbasal">Stel tydelike basale</string>
-    <string name="stoppingtempbasal">Stop tydelike basale</string>
-    <string name="settingextendedbolus">Stel verlengde bolus</string>
-    <string name="stoppingextendedbolus">Stop verlengde bolus</string>
-    <string name="updatingbasalrates">Outobywerking basale tariewe</string>
-    <string name="disconnecting">Ontkoppel</string>
     <string name="executing">Besig met uitvoering</string>
     <string name="virtualpump_settings">Virtuele pomp instellings</string>
     <string name="virtualpump_uploadstatus_title">Oplaaistatus aan NS</string>
-    <string name="wrongpassword">Verkeerde wagwoord</string>
-    <string name="approachingdailylimit">Naderende insulien daaglikse limiet</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -471,7 +321,6 @@
     <string name="wear_detailedIOB_title">Wys gedetailleerde IAB</string>
     <string name="wear_detailedIOB_summary">Breek af IAB in bolus en basale IAB op die watchface</string>
     <string name="nosuccess">nie suksesvol - Kontroleer asseblief foon</string>
-    <string name="notavailable">Nie beskikbaar nie</string>
     <string name="patientage">Pasiënt ouderdom</string>
     <string name="child">Kind</string>
     <string name="teenage">Tiener</string>
@@ -504,8 +353,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Log app begin na NS</string>
     <string name="restartingapp">Begin toepassing weer om instellings toe te pas.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulien</string>
     <string name="configbuilder_insulin_description">Watter tipe insulien gebruik jy?</string>
     <string name="fastactinginsulin">Vinnige aksie Insulien</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -518,9 +365,6 @@
     <string name="statuslights_res_critical">Drempel kritieke stoor vlak [U]</string>
     <string name="iob">IAB</string>
     <string name="cob">KOB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Laaste verbinding</string>
-    <string name="danar_bluetooth_status">Bluetooth status</string>
     <string name="nav_about">Omtrent</string>
     <string name="smscommunicator_missingsmspermission">Vermiste SMS toestemming</string>
     <string name="smscommunicator_missingphonestatepermission">Toestemming vir foon status nog nie gegee nie</string>
@@ -531,16 +375,11 @@
     <string name="wear_showbgi_summary">Voeg BGI by status lyn</string>
     <string name="ns_noupload">Geen oplaai na NS</string>
     <string name="ns_noupload_summary">Alle data na NS gestuur word laat val is gedaal. AAPS is gekoppel aan NS maar geen verandering in NS is gedoen</string>
-    <string name="basal_step">Basale Stap</string>
-    <string name="bolus_step">Bolus Stap</string>
     <string name="overview_extendedbolus_cancel_button">Kanselleer Verlengde Bolus</string>
     <string name="careportal_sensorage_label">Sensor ouderdom</string>
     <string name="careportal_canulaage_label">Canula tydsduur</string>
     <string name="careportal_insulinage_label">Insulien ouderdom</string>
-    <string name="hours">ure</string>
-    <string name="invalidprofile">Ongeldige profiel !!!</string>
     <string name="careportal_pbage_label">Pomp battery ouderdom</string>
-    <string name="careportal_pumpbatterychange">Pomp Battery Verander</string>
     <string name="ns_alarmoptions">Alarm Opsies</string>
     <string name="nsalarm_urgenthigh">Nood hoog</string>
     <string name="nsalarm_high">Hoog</string>
@@ -564,7 +403,6 @@
     <string name="absorptionsettings_title">Absorpsie instellings</string>
     <string name="absorption_maxtime_title">Maaltyd max\ks absorpsie tyd [h]</string>
     <string name="absorption_maxtime_summary">Tyd in ure waarna verwag word dat alle koolhidrate uit maaltyd geabsorbeer sal wees</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualiseer verlengde bolus as %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -588,7 +426,6 @@
     <string name="careportal_pump_label">POMP</string>
     <string name="careportal_newnstreatment_duration_min_label">Durasie [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Aktiveer UAM</string>
     <string name="enablesmb">Aktiveer SMB</string>
     <string name="enablesmb_summary">Gebruik Super Mikro Boluses in plaas van of tydelike basale vir vinniger resultate</string>
@@ -600,22 +437,7 @@
     <string name="ultrarapid_oref">Ultra-Snel Oref</string>
     <string name="dia_too_short">DIA van %1$f is te kort - %2$f in stede gebruik!</string>
     <string name="activate_profile">Aktiveer profiel</string>
-    <string name="date">Datum</string>
     <string name="invalid">ONGELDIG</string>
-    <string name="waitingforpairing">Wag vir paring op pomp</string>
-    <string name="pairingok">Paring OK</string>
-    <string name="pairingtimedout">Paring tyd verstreke</string>
-    <string name="danars_nodeviceavailable">Geen toestel gevind so ver</string>
-    <string name="emptyreservoir">Leë stoor</string>
-    <string name="bloodsugarmeasurementalert">Bloed suiker meting alarm</string>
-    <string name="remaininsulinalert">Oorblywende insulien vlak</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Geselekteerde pomp</string>
-    <string name="pairpump">Paar nuwe pomp</string>
-    <string name="bolusspeed">Bolus spoed</string>
-    <string name="danar_setbasalstep001">Stel basale stap tot 0.01 U/h</string>
-    <string name="serialnumber">Reeksnommer</string>
     <string name="careportal_newnstreatment_percentage_label">Persentasie</string>
     <string name="careportal_newnstreatment_timeshift_label">Tyd verskuiwing</string>
     <string name="default_temptargets">Verstek Tydelike-doelwitte</string>
@@ -625,31 +447,18 @@
     <string name="activity_target">aktiwiteit doelwit</string>
     <string name="hypo_duration">hipo duur</string>
     <string name="hypo_target">hipo doelwit</string>
-    <string name="danar_history_prime">Prima</string>
-    <string name="gettingextendedbolusstatus">Verkry verlengde bolus status</string>
-    <string name="gettingbolusstatus">Verkry bolus status</string>
-    <string name="gettingtempbasalstatus">Verkry tydelike basale status</string>
-    <string name="gettingpumpsettings">Kry pomp instellings</string>
-    <string name="gettingpumptime">Verkry pomp tyd</string>
     <string name="reuse">hergebruik</string>
     <string name="wearcontrol_title">Kontroles van horlosie</string>
     <string name="wearcontrol_summary">Stel tydeleike doelwitte en behandelings vanaf horlosie.</string>
-    <string name="connectiontimedout">Verbinding verstreke</string>
     <string name="food">Kos</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Vet</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Wag tans vir bolus se einde. Oorblywende %1$d sec.</string>
-    <string name="processinghistory">Verwerk gebeurtenis</string>
-    <string name="startingbolus">Begin bolus aflewering</string>
     <string name="executingrightnow">Opdrag word nou uitgevoer</string>
-    <string name="pumpdrivercorrected">Pomp drywer gekorrigeer</string>
     <string name="pump_unreachable">Pomp onbereikbaar</string>
     <string name="missed_bg_readings">Gemiste BG lesings</string>
     <string name="raise_notifications_as_android_notifications">Gebruik stelsel kennisgewings vir waarskuwings en kennisgewings</string>
@@ -659,21 +468,15 @@
     <string name="pump_unreachable_threshold">Pomp onbereikbaar drempel [min]</string>
     <string name="urgent_alarm">Dringende Alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Skakel asb die foon se bluetooth af vir een sekonde Indien geen verbinding met die pomp moontlik is nie. Dit mag help vir sommige selfone waar die bluetooth stapel vries.</string>
     <string name="eversense">Eversense App (bygewerk)</string>
     <string name="dexcomg5_nsupload_title">BG data oplaai na NS</string>
     <string name="bgsource_upload">BG oplaai instellings</string>
     <string name="wear_detailed_delta_title">Wys gedetailleerde delta</string>
     <string name="wear_detailed_delta_summary">Wys delta met een meer desimale plek</string>
     <string name="smbmaxminutes_summary">Maks minute van basale beperk SMB tot</string>
-    <string name="unsupportedfirmware">Onondersteunde pomp firmware</string>
     <string name="dexcomg5_xdripupload_title">Stuur BG data na xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Basale waarde vervang deur minimum ondersteunde waarde: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Basale waarde vervang deur maksimum ondersteunde waarde: %1$s</string>
     <string name="overview_editquickwizard_usebg">BG berekening</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IAB berekening</string>
     <string name="overview_editquickwizard_usebasaliob">Basale IAB berekening</string>
@@ -691,8 +494,6 @@
     <string name="closedmodeenabled">Geslote modus geaktiveer</string>
     <string name="maxiobset">Maksimum IAB behoorlik gestel</string>
     <string name="hasbgdata">BG beskikbaar vanaf geselekteerde bron</string>
-    <string name="basalprofilenotaligned">Basale waardes nie in lyn met ure: %1$s</string>
-    <string name="zerovalueinprofile">Ongeldige profiel: %1$s</string>
     <string name="combo_programming_bolus">Programmeer pomp vir bolusing</string>
     <string name="combo_refresh">Verfris</string>
     <string name="combo_pump_state_label">Staat</string>
@@ -731,7 +532,6 @@
     <string name="extendedbolusdeliveryerror">Verlengde bolus afleweringsfout</string>
     <string name="insightpump_shortname">Sig</string>
     <string name="ago">terug</string>
-    <string name="format_hours">%1$.2f h</string>
     <string name="enablesmbalways">Aktiveer SMB altyd</string>
     <string name="enablesmbalways_summary">Aktiveer SMB altyd onafhanklik van boluse. Slegs moonlik met BG source met goeie filter van data soos G5</string>
     <string name="enablesmbaftercarbs">Aktiveer SMB na koolhidrate</string>
@@ -742,8 +542,6 @@
     <string name="enablesmbwithtemptarget_summary">Aktiveer SMB wanneer daar tydelike doelwitte aktief is (eetgou, oefen)</string>
     <string name="enablesmbwithhightemptarget">Aktiveer SMB met hoë tydelike doelwitte</string>
     <string name="enablesmbwithhightemptarget_summary">Aktiveer SMB as daar hoë tydelike doelwitte aktief is (oefening)</string>
-    <string name="let_temp_basal_run">Laat tydelike basale, hardloop</string>
-    <string name="mute">Demp</string>
     <string name="overview_insulin_label">Insulien</string>
     <string name="overview_carbs_label">Karbs</string>
     <string name="overview_buttons_selection">Knoppies</string>
@@ -785,7 +583,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Veranderende ontwikkelende weergawe. Geslote lus is gedeaktiveerd.</string>
     <string name="engineering_mode_enabled">Ingenieurswese modus geaktiveer</string>
     <string name="not_eng_mode_or_release">Ingenieurswese modus ontsper nie en nie op publike vrylating tak</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lees basale profiel</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Die pomp geskiedenis het verander nadat die bolus berekening uitgevoer was. Die bolus was nie afgelewer nie. Herbereken asseblief of \'n bolus steeds nodig is.</string>
     <string name="combo_error_updating_treatment_record">Bolus suksesvol afgelewer, maar die behandeling inskrywing het gefaal. Dit kan gebeur as twee klein boluses van dieselfde grootte binne die laaste twee minute toegedien word. Kontroleer die pomp geskiedenis en behandeling inskrywings en gebruik die Careportal om vermiste inskrywings te voeg. Maak seker om nie enige inskrywings vir dieselfde minuut en dieselfde bedrag by te voeg.</string>
@@ -808,15 +605,10 @@
     <string name="smbdisabledinpreferences">SMB gedeaktiveer in voorkeure</string>
     <string name="uamdisabledinpreferences">UAM in voorkeure gedeaktiveer</string>
     <string name="uamdisabledoref1notselected">UAM versper omdat dit staatmaak op Oref1 sensitiwiteit plugin</string>
-    <string name="limitingbasalratio">Max basale koers beperk tot %1$.2f U/h as gevolg van %2$s</string>
-    <string name="pumplimit">pomp limiet</string>
-    <string name="itmustbepositivevalue">dit moet \'n positiewe waarde wees</string>
     <string name="maxbasalmultiplier">maks basale vermenigvuldiger</string>
     <string name="maxdailybasalmultiplier">maks daaglikse basale vermenigvuldiger</string>
     <string name="smb_frequency_exceeded">\'n Bolus was binne die laaste 3 minute afgelewer, SMB is oorgespring</string>
     <string name="basal_set_correctly">Basale reggestel</string>
-    <string name="limitingpercentrate">Beperk maks persentasie koers tot %1$d%% agv %2$s</string>
-    <string name="limitingbolus">Beperk bolus %1$.1f U as gevolg van %2$s</string>
     <string name="limitingextendedbolus">Verlengde bolus is beperk tot %1$.1f U as gevolg van %2$s</string>
     <string name="limitingmaxiob">Beperk maks IAB tot %1$.1f U agv %2$s</string>
     <string name="limitingcarbs">Beperk koolhidrate tot %1$d g agv %2$s</string>
@@ -831,7 +623,6 @@
     <string name="smbnotallowedinopenloopmode">SMB nie toegelaat in open lus modus</string>
     <string name="food_short">Kos</string>
     <string name="reset">herstel</string>
-    <string name="waitingfortimesynchronization">Wag vir tydsinkronisasie (%1$d sec)</string>
     <string name="loopdisconnectedfor">Ontkoppel (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Maksimum totale IAB OpenAPS kan nie oor [U] gaan</string>
     <string name="openapssmb_maxiob_summary">Hierdie waarde is Maks IAB genoem in OpenAPS kontekst\nOpenAPS sal nie meer insulien byvoeg as huidige IAB is groter as hierdie waarde</string>
@@ -847,7 +638,6 @@
     <string name="nav_setupwizard">Opstel Ghoeroe</string>
     <string name="setupwizard_finish">EINDIG</string>
     <string name="setupwizard_language_prompt">Kies u taal</string>
-    <string name="boluserrorcode">Versoek: %1$.2fU Gelewer: %2$.2fU Fout kode: %3$s</string>
     <string name="firstinsulinincrement">Eerste insulien inkrement</string>
     <string name="secondinsulinincrement">Tweede insulien inkrement</string>
     <string name="thirdinsulinincrement">Derde insulien inkrement</string>
@@ -870,7 +660,6 @@
     <string name="virtualpump_type">Virtuele Pomp</string>
     <string name="virtualpump_definition">Pomp definisie</string>
     <string name="virtualpump_pump_def">Bolus: Stap =%1$s\nVerlengde Bolus: [stap%2$s, duur = =%3$smin -%4$sh]\nBasal: stap =%5$s\nTBR: %6$s (deur %7$s), duur =%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Slegs diskrete waardes geen reekse word ondersteun as granulariteit vir basale/bolus in virtuele pomp.</string>
     <string name="ns_autobackfill_title">Autobackfill BG</string>
     <string name="wear_wizard_settings">Ghoeroe-instellings</string>
     <string name="wear_wizard_settings_summary">Berekeninge is ingesluit in die ghoeroe verslag:</string>
@@ -899,18 +688,6 @@
     <string name="request">Versoek</string>
     <string name="insulinsourcesetup">Konfigureer insulien plugin</string>
     <string name="exit">Uitgang</string>
-    <string name="danar_useroptions">Gebruiker opsies</string>
-    <string name="danar_timedisplay">Vertoon tyd formaat</string>
-    <string name="danar_buttonscroll">Knoppie rol</string>
-    <string name="danar_beep">Biep op knoppie druk</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Klank</string>
-    <string name="danar_pumpalarm_vibrate">Vibreer</string>
-    <string name="danar_pumpalarm_both">Beide</string>
-    <string name="danar_glucoseunits">Glukose eenhede</string>
-    <string name="danar_saveuseroptions">Stoor opsies te pomp</string>
-    <string name="option_on">Aan</string>
-    <string name="option_off">Af</string>
     <string name="open_navigation">Open navigasie</string>
     <string name="close_navigation">Sluit navigasie</string>
     <string name="nav_plugin_preferences">Plugin voorkeure</string>
@@ -926,8 +703,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Laer sensitiwiteit vir tydelike doelwitte < 100]]></string>
     <string name="combo_invalid_setup">Ongeldige pomp opstelling kontroleer die hulpdokumente en verifieer dat die vinnige inligting kieslys wel QUICK INFO benaam is met behulp van die 360 konfigurasie sagteware.</string>
     <string name="custom">Gepasmaak</string>
-    <string name="largetimedifftitle">Enorme tydsverskil</string>
-    <string name="largetimediff">Groot tydverskil: \nTyd in pomp is uit met meer as 1,5 uur. \nVerstel asb die tyd per hand op die pomp en maak seker dat lees die geskiedenis van die pomp nie onverwagte gedrag veroorsaak. \nAs moontlik, verwyder die geskiedenis vanaf die pomp voor die verandering van die tyd of versper die geslote lus vir een DIA na die laaste verkeerde geskiedenis inskrywing maar minimum een DIA van nou.</string>
     <string name="careportal_removestartedevents">Skoon AndroidAPS begin</string>
     <string name="storedsettingsfound">Gestoorde instellings gevind</string>
     <string name="allow_hardware_pump_text">Aandag: As jy aktiveer en koppel aan \'n hardeware pomp, AndroidAPS sal die basale instellings uit die profiel aan die pomp kopieer, die bestaande basale koers gestoor op die pomp sal oorskryf word. Maak seker jy het die korrekte basale instelling in AndroidAPS. As jy nie seker is of nie die basale instellings wil oorskryf op jou pomp, druk Kanselleer en herhaal oorskakel na die pomp op \'n later tyd.</string>
@@ -951,17 +726,10 @@
     <string name="setupwizard_preferred_aps_mode">Verkose APS modus</string>
     <string name="treatments_wizard_total_label">Totaal</string>
     <string name="calculation_short">Bereken</string>
-    <string name="handshaking">Handskudding</string>
     <string name="sendlogfiles">Stuur vandag se loglêers aan ontwikkelaars saam met hierdie tyd. Onverwagte situasie.</string>
-    <string name="maxbolusviolation">Max bolus skending</string>
-    <string name="commanderror">Opdrag fout</string>
-    <string name="speederror">Spoedfout</string>
-    <string name="insulinlimitviolation">Insulien limiet skending</string>
     <string name="loop_openmode_min_change">Minimale versoek verandering [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Oop lus sal nuwe verandering versoek as die %. Verstek waarde is 20%</string>
-    <string name="pairfirst">Verbind asseblief jou pomp met jou selfoon!</string>
     <string name="searching_for_devices">Soek vir toestelle…</string>
-    <string name="please_wait">Wag asseblief…</string>
     <string name="pairing_completed">Maats voltooi</string>
     <string name="code_compare">Stem die kodes gewys op hierdie toestel en op jou pomp saam?</string>
     <string name="insight_pairing">Insight maatjies</string>
@@ -1050,7 +818,6 @@
     <string name="isequalorgreater">is ewe of groter as</string>
     <string name="isgreater">is groter as</string>
     <string name="isnotavailable">is nie beskikbaar nie</string>
-    <string name="unknown">onbekend</string>
     <string name="glucoseisnotavailable">Glukose is nie beskikbaar nie</string>
     <string name="glucosecomparedmgdl">Glukose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glukose %1$s %2$.1f %3$s</string>
@@ -1067,23 +834,10 @@
     <string name="automation_short">Outo</string>
     <string name="automation">Outomatisasie</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Log sensor verander na NS</string>
     <string name="dexcom_lognssensorchange_summary">Skep geleentheid \"sensor verandering\" in NS automaties op sensor begin</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekonde</string>
-    <string name="unit_minute">minuut</string>
-    <string name="unit_hour">uur</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">sekondes</string>
-    <string name="unit_minutes">minute</string>
-    <string name="unit_hours">ure</string>
-    <string name="unit_days">dae</string>
-    <string name="unit_weeks">weke</string>
     <string name="summary_tidepool_username">JouTidepool login gebruiker, normaallweg \'n email adres</string>
     <string name="title_tidepool_username">Login Gebruiker Naam</string>
     <string name="summary_tidepool_password">Jou Tidepool login kode</string>
@@ -1123,7 +877,6 @@
     <string name="old_version">ou weergawe</string>
     <string name="very_old_version">baie ou weergawe</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">DexcomG App (opgedateerde)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Ontvang BG waardes vanaf die opgedateerde Dexcom app.</string>
@@ -1186,10 +939,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Verkose</string>
     <string name="rileylink_scanner_title">RileyLink Skan</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy word nie ondersteun.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth nie aan.</string>
-    <string name="location_not_found_title">Location nie aan</string>
-    <string name="location_not_found_message">Vir Bluetooth ontdek om te werk op nuwer toestelle, lokaliteit moet aan wees. AAPS speur nie jou lokaliteit en kan afgeskakel na paring.</string>
     <string name="location_yes">Aktiveer</string>
     <string name="location_no">Nee</string>
     <string name="rileylink_scanner_scanning">Skandeer</string>
@@ -1229,7 +978,6 @@
     <string name="rileylink_error_tuneup_failed">Opstel het gefaal</string>
     <string name="rileylink_error_pump_unreachable">Pomp onbereikbaar</string>
     <string name="rileylink_error_pod_unreachable">Pod onbereikbaar</string>
-    <string name="rileylink_error_address_not_set_short">Nie gestel nie</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1295,13 +1043,11 @@
     <string name="sendsmsactionlabel">Stuur\'n SMS: %1$s</string>
     <string name="sendsmsactiontext">Stuur\'n SMS met die teks</string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus beperking aangewend: %2$.2fU to %3$.2fU</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="loading">Laai tans...</string>
     <string name="snooze">Sluimer</string>
     <string name="time_range">Tyd reeks</string>
     <string name="timerange_value">Tyd is tussen %1$s en %2$s</string>
     <string name="between">Tussen </string>
-    <string name="close">Maak toe</string>
     <string name="smscommunicator_messagebody">Ongeldig boodskap teks</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
     <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
@@ -1310,4 +1056,13 @@
     <string name="boluswizard">Bolus slimjan</string>
     <string name="unit_minute_short">min</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 2811beea92..5da523fc0d 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Нулирай базата данни</string>
     <string name="reset_db_confirm">Сигурни ли сте че искате да изтриете всички данни?</string>
     <string name="nav_exit">Изход</string>
-    <string name="danar_useextended_title">Използвай удължени болуси при над  &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
     <string name="ns_sync_use_absolute_title">Използване на абсолютни стойности за базал</string>
     <string name="alert_dialog_storage_permission_text">Рестартирайте телефона или AndroidAPS от системните настройки или Android APS няма да записва проблемите (което е важно за работата на алгоритъма)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Вашият телефон не поддържа оптимизация на батерията - може да се появят проблеми!</string>
     <string name="description_actions">Бутони за бърз достъп до основни функции</string>
-    <string name="description_careportal">Въвеждане на разширени записи в логовете.</string>
     <string name="description_config_builder">За конфигурация на активните плъгини</string>
     <string name="description_objectives">Разучаване на програмата</string>
     <string name="description_food">Показва въведените в Nightscout храни</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Работа с профила, които сте дефинирали в Nightscout</string>
     <string name="description_profile_simple">Работа с профил със само една стойност за всички часове.</string>
     <string name="description_pump_combo">Поддръжка за Accu-Chek Combo помпи, изискваща инсталиран ruffy</string>
-    <string name="description_pump_dana_r">Поддръжка за Dana Diabecare R помпи</string>
-    <string name="description_pump_dana_r_korean">Поддръжка за корейски Dana Diabecare R помпи</string>
-    <string name="description_pump_dana_r_v2">Поддръжка за Dana Diabecare R помпи с обновен софтуер</string>
-    <string name="description_pump_dana_rs">Поддръжка за Dana Diabecare RS помпи</string>
     <string name="description_pump_mdi">Писалки - За хората, които правят множество ежедневни инжекции ( интензифицирано лечение с писалки)</string>
     <string name="description_pump_virtual">За помпи, който все още не работят с AndroidAPS(Open Loop)</string>
     <string name="description_sensitivity_aaps">Чувствителността се изчислява по същия начин като в Oref0, но можете да зададете времева рамка. Минимална въглехидрати абсорбция се изчислява от Макс време за усвояване на въглехидратите в опциите.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Наблюдавайте и контролирайте AndroidAPS, от вашия WearOS часовник.</string>
     <string name="description_xdrip_status_line">Покажи информация за вашия APS на xDrip + циферблат на часовник.</string>
     <string name="description_sms_communicator">Дистанционно управление AndroidAPS чрез използване на SMS команди.</string>
-    <string name="nsprofileview_units_label">Единици</string>
-    <string name="nsprofileview_dia_label">DIA (Време на действие на инсулина):</string>
-    <string name="nsprofileview_ic_label">IC (Инсулин/въглехидр.):</string>
-    <string name="nsprofileview_isf_label">ISF (Инс.чувствителност):</string>
-    <string name="nsprofileview_basal_label">Базал</string>
-    <string name="nsprofileview_target_label">Целeва КЗ:</string>
-    <string name="noprofileset">НЕ Е ЗАДАДЕН ПРОФИЛ</string>
     <string name="treatments_insulin_label_string">Инсулин:</string>
     <string name="treatments_carbs_label_string">Вълехидрати:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">Вр.цел</string>
     <string name="treatments_wizard_carbs_label">ВХ</string>
     <string name="treatments_wizard_correction_label">Корекция</string>
-    <string name="insulin_unit_shortname">Ед.</string>
     <string name="treatments_wizard_bolusiob_label">IOB от болуси</string>
     <string name="openapsma_run">Старт сега</string>
     <string name="vitualpump_label">ВИРТУАЛНА ПОМПА</string>
-    <string name="pump_basebasalrate_label">Базова базална стойност</string>
-    <string name="pump_tempbasal_label">Временен базал</string>
-    <string name="virtualpump_extendedbolus_label">Удължен болус</string>
-    <string name="pump_battery_label">Батерия</string>
-    <string name="pump_reservoir_label">Резервоар</string>
     <string name="virtualpump_resultok">ОК</string>
     <string name="openapsma_lastrun_label">Последно изпълнение</string>
     <string name="openapsma_inputparameters_label">Параметри на входа</string>
@@ -96,16 +76,11 @@
     <string name="result">Резултат</string>
     <string name="result_insulin_carbs">Резултат: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Няма данни за КЗ</string>
-    <string name="nochangerequested">Не се изисква промяна</string>
     <string name="openapsma_request_label">Искане</string>
-    <string name="rate">Стойност</string>
-    <string name="duration">Срок</string>
-    <string name="reason">Основание</string>
     <string name="glucose">Кръвна захар</string>
     <string name="delta">Изменение (Δ)</string>
     <string name="sms_delta">Изменение (делта):</string>
     <string name="configbuilder">Конфигурация</string>
-    <string name="objectives">Цели</string>
     <string name="overview">Общ</string>
     <string name="nsprofile">NS Профил</string>
     <string name="simpleprofile">Обикновен профил</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Общи</string>
     <string name="configbuilder_general_description">Това са някой общи функции, които може да са Ви от полза.</string>
     <string name="configbuilder_constraints_description">Кои ограничения да се прилагат?</string>
-    <string name="days">дни</string>
     <string name="constraints">Ограничения</string>
     <string name="loop">Кръг - Loop</string>
     <string name="configbuilder_loop">Режим на APS - Loop</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Модула е изключен</string>
     <string name="constraints_violation">Нарушено ограничение</string>
     <string name="treatmentdeliveryerror">Грешка при подаване на болус</string>
-    <string name="tempbasaldeliveryerror">Грешка при подаване на временен базал</string>
     <string name="overview_newtempbasal_basalpercent">Базална стойност [%]</string>
     <string name="setbasalquestion">Приложи нов временен базал:</string>
     <string name="overview_treatment_label">Болус</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Болус:</string>
     <string name="basal">Базал</string>
     <string name="sms_basal">Базал:</string>
-    <string name="carbs">Въглехидрати</string>
     <string name="changeyourinput">Променете данните!</string>
     <string name="configbuilder_bgsource">Източник на данни за КЗ</string>
     <string name="configbuilder_bgsource_description">От къде трябва да AndroidAPS да си взима данни?</string>
@@ -167,25 +139,6 @@
     <string name="treatments_wizard_basaliob_label">Базален IOB</string>
     <string name="bolusconstraintapplied">Приложено ограничение на болус</string>
     <string name="carbsconstraintapplied">Приложено ограничение на въглехидрати</string>
-    <string name="careportal_bgcheck">Проверка на КЗ</string>
-    <string name="careportal_announcement">Известие</string>
-    <string name="careportal_note">Бележка</string>
-    <string name="careportal_question">Въпрос</string>
-    <string name="careportal_exercise">Физ. активност</string>
-    <string name="careportal_pumpsitechange">Смяна на сет</string>
-    <string name="careportal_cgmsensorinsert">Смяна на сензор</string>
-    <string name="careportal_cgmsensorstart">Старт на сензор</string>
-    <string name="careportal_insulincartridgechange">Смяна на резервоар</string>
-    <string name="careportal_profileswitch">Смяна на профил</string>
-    <string name="careportal_snackbolus">Болус за закуска</string>
-    <string name="careportal_mealbolus">Болус за основно хранене</string>
-    <string name="careportal_correctionbolus">Болус корекция</string>
-    <string name="careportal_combobolus">Комбиниран болус</string>
-    <string name="careportal_tempbasalstart">Старт на временен базал</string>
-    <string name="careportal_tempbasalend">Край на временен базал</string>
-    <string name="careportal_carbscorrection">Корекция с въглехидрати</string>
-    <string name="careportal_openapsoffline">OpenAPS спрян</string>
-    <string name="careportal_newnstreatment_eventtype">Тип събитие</string>
     <string name="careportal_newnstreatment_other">Друго</string>
     <string name="careportal_newnstreatment_meter">Глюкомер</string>
     <string name="careportal_newnstreatment_sensor">Сензор</string>
@@ -217,35 +170,12 @@
     <string name="openapsma_maxbasal_summary">Макс. лимит на временен базал [Е/ч] </string>
     <string name="openapsma_maxiob_title">Максимален IOB</string>
     <string name="openapsma_maxiob_summary">Този параметър се нарича максимален IOB в OpenAPS и подразбиране е 0. След няколко дни или седмици можете да го увеличите.</string>
-    <string name="dismiss">Разбрах</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Свързване</string>
-    <string name="connected">Свързана</string>
-    <string name="disconnected">Не е сврзана</string>
-    <string name="danar_pump_settings">DanaR настройки</string>
     <string name="end_user_license_agreement">Лицензионно споразумение с краен потребител</string>
     <string name="end_user_license_agreement_text">НЕ ТРЯБВА ДА СЕ ИЗПОЛЗВА ЗА ВЗЕМАНЕ НА МЕДИЦИНСКИ РЕШЕНИЯ. НЯМА ГАРАНЦИЯ ЗА ПРОГРАМАТА, ДО СТЕПЕНТА, ПОЗВОЛЕНА ОТ ПРИЛОЖИМОТО ПРАВО. ОСВЕН КОГАТО Е ПОСОЧЕНО ДРУГО В ПИСМЕН ВИД, ПРИТЕЖАТЕЛИТЕ НА АВТОРСКОТО ПРАВО И/ИЛИ ДРУГИ СТРАНИ ПРЕДОСТАВЯТ ПРОГРАМАТА \"КАКТО Е\", БЕЗ ГАРАНЦИИ ОТ ВСЯКАКЪВ ВИД,  ИЗРАЗЕНИ ИЛИ ПОДРАЗБИРАЩИ СЕ, ВКЛЮЧИТЕЛНО, НО НЕ САМО, ПОДРАЗБИРАЩИ СЕ ГАРАНЦИИ ЗА ПРОДАВАЕМОСТ И ПРИГОДНОСТ ЗА  КОНКРЕТНА ЦЕЛ. ЦЕЛИЯ РИСК ПО ОТНОШЕНИЕ НА КАЧЕСТВОТО И ЕФЕКТИВНОСТТА НА ПРОГРАМАТА Е САМО ВАШ. АКО ПРОГРАМАТА НЕ СРАБОТИ, ВИЕ ПОЕМАТЕ  ВСИЧКИ НЕОБХОДИМИ РАЗХОДИ ЗА ОБСЛУЖВАНЕ, РЕМОНТ ИЛИ КОРЕКЦИЯ.</string>
     <string name="end_user_license_agreement_i_understand">Разбирам и приемам</string>
     <string name="save">Съхрани</string>
-    <string name="nobtadapter">Не е открит Bluetooth адаптер</string>
-    <string name="devicenotfound">Избраното устройство не е открито</string>
-    <string name="connectionerror">Грешка при свързване с помпата</string>
-    <string name="danar_iob_label">IOB на помпата</string>
-    <string name="danar_dailyunits">Инсулин за деня</string>
-    <string name="pump_lastbolus_label">Последен болус:</string>
-    <string name="hoursago">преди %1$.1fч</string>
-    <string name="danar_invalidinput">Грешни входящи данни</string>
-    <string name="danar_valuenotsetproperly">Неправилна стойност</string>
     <string name="reloadprofile">Презареди профил</string>
-    <string name="danar_viewprofile">Виж профил</string>
-    <string name="enacted">Приложено</string>
-    <string name="comment">Коментар</string>
-    <string name="success">Успешен</string>
-    <string name="percent">Процент</string>
-    <string name="absolute">Абсолютна</string>
-    <string name="canceltemp">Откажи временен базал</string>
     <string name="smscommunicator">SMS комуникатор</string>
-    <string name="waitingforpumpresult">Изчаква резултат от помпата</string>
     <string name="smscommunicator_allowednumbers">Разрешени телефонни номера</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">За да доставите болус от %1$.2fЕ отговорете с код %2$s</string>
@@ -266,54 +196,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Временна цел от %1$s за %2$d минути</string>
     <string name="smscommunicator_tt_set">Временна цел от %1$s за %2$d минути стартирана успешно</string>
     <string name="smscommunicator_tt_canceled">Временна цел успешно спряна</string>
-    <string name="bolusdelivering">Стартирам %1$.2fЕ</string>
     <string name="smscommunicator_remotecommandsallowed">Позволи отдалечени команди чрез SMS</string>
-    <string name="glucosetype_finger">Пръст</string>
-    <string name="glucosetype_sensor">Сензор</string>
-    <string name="manual">Друго</string>
-    <string name="careportal_temporarytarget">Временна цел</string>
-    <string name="careportal_temporarytargetcancel">Откажи временна цел</string>
     <string name="danarprofile">DanaR профил</string>
     <string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string>
     <string name="danarprofile_dia_summary">Време на действие на инсулина</string>
-    <string name="failedupdatebasalprofile">Неуспешно обновяване на базалния профил</string>
-    <string name="danar_historyreload">Презареди</string>
     <string name="uploading">Качване</string>
-    <string name="danar_ebolus">E болус</string>
-    <string name="danar_dsbolus">Двувълнов болус</string>
-    <string name="danar_debolus">Двоен разширен болус</string>
-    <string name="danar_error">грешка</string>
-    <string name="danar_refill">презареждане</string>
-    <string name="danar_basalhour">базал по часове</string>
-    <string name="danar_glucose">КЗ</string>
-    <string name="danar_carbohydrate">въглехидрати</string>
-    <string name="danar_alarm">аларма</string>
-    <string name="danar_totaluploaded">Общо %1$d записа качени</string>
-    <string name="danar_sbolus">Бърз болус</string>
-    <string name="danar_history_alarm">Аларми</string>
-    <string name="danar_history_basalhours">Базален по часове</string>
-    <string name="danar_history_bolus">Болуси</string>
-    <string name="danar_history_carbohydrates">Въглехидрати</string>
-    <string name="danar_history_dailyinsulin">Инсулин за деня</string>
-    <string name="danar_history_errors">Грешки</string>
-    <string name="danar_history_glucose">КЗ</string>
-    <string name="danar_history_refill">Презареждане</string>
-    <string name="danar_history_syspend">Спиране</string>
-    <string name="danar_history_connectingfor">Свързване %1$d сек</string>
-    <string name="danar_password_title">Парола за помпата</string>
-    <string name="wrongpumppassword">Грешна парола за помпата!</string>
-    <string name="pumpbusy">Помпата е заета</string>
-    <string name="overview_bolusprogress_delivered">Доставен</string>
-    <string name="overview_bolusprogress_stoped">Спрян</string>
     <string name="bolusstopped">Болусът е спрян</string>
     <string name="bolusstopping">Спиране на болус</string>
-    <string name="occlusion">Запушване</string>
-    <string name="overview_bolusprogress_stop">Спри</string>
-    <string name="overview_bolusprogress_stoppressed">Натиснат е СТОП!</string>
-    <string name="waitingforpump">Очаква помпата</string>
-    <string name="overview_bolusprogress_goingtodeliver">Ще стартира %1$.2fЕ болус</string>
-    <string name="youareonallowedlimit">Достигнахте лимита</string>
-    <string name="noprofileselected">Няма избран профил</string>
     <string name="smscommunicator_loophasbeendisabled">APS е деактивиран</string>
     <string name="smscommunicator_loophasbeenenabled">APS е активиран</string>
     <string name="smscommunicator_loopisdisabled">APS е изключен</string>
@@ -353,11 +242,9 @@
     <string name="mealbolus">Хранене</string>
     <string name="correctionbous">Корекция</string>
     <string name="actions">Действия</string>
-    <string name="androidaps_start">Стартиран AndroidAPS</string>
     <string name="ns_upload_only">Само качва данни в NS (изключва синхронизацията)</string>
     <string name="ns_upload_only_summary">Само качване на данните в NS. Няма ефект върху данните за КЗ ако локален източник като xDrip е избран. Няма ефект върху профила освен ако не е избран  NS-профил.</string>
     <string name="pumpNotInitialized">Помпата не е инициализирана!</string>
-    <string name="pumpNotInitializedProfileNotSet">Помпата не е инициализирана, профила не е зададен!</string>
     <string name="primefill">Пълнене на сет</string>
     <string name="fillwarning">Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB!</string>
     <string name="othersettings_title">Други</string>
@@ -367,8 +254,6 @@
     <string name="button3">Бутон 3</string>
     <string name="units_colon">Единици:</string>
     <string name="units">Единици</string>
-    <string name="mgdl">мг/дл</string>
-    <string name="mmol">ммол/л</string>
     <string name="dia">DIA</string>
     <string name="target_range">Целева КЗ:</string>
     <string name="prefs_range_title">Диапазон за визуализация</string>
@@ -378,17 +263,7 @@
     <string name="wear">Часовник</string>
     <string name="resend_all_data">Изпрати отново всички дани</string>
     <string name="open_settings_on_wear">Отвори настройките на часовника</string>
-    <string name="pumperror">Грешка в промпата</string>
-    <string name="lowbattery">Изтощена батерия</string>
-    <string name="pumpshutdown">Помпата е изключена</string>
-    <string name="batterydischarged">Батерията на помпата е изтощена</string>
-    <string name="danarkoreanpump">DanaR Корейска</string>
     <string name="basal_rate">Базал:</string>
-    <string name="profile_set_failed">Неуспешно задаване на базален профил</string>
-    <string name="profile_set_ok">Профила на помпата е обновен</string>
-    <string name="danar_disableeasymode">Забрани EasyUI режим в помпата</string>
-    <string name="danar_enableextendedbolus">Разрешете удължените болуси в настройките на помпата</string>
-    <string name="danar_switchtouhmode">Променете режима от U/d на U/h в помпата</string>
     <string name="basalvaluebelowminimum">Базалните стойности са под минимума. Не е зададен профил!</string>
     <string name="sms_actualbg">КЗ:</string>
     <string name="sms_lastbg">Последна КЗ:</string>
@@ -396,7 +271,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Текущи известия</string>
     <string name="old_data">СТАРИ ДАННИ</string>
-    <string name="minago">преди %1$d мин</string>
     <string name="sms_minago">преди %1$d мин</string>
     <string name="localprofile">Локален профил</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -412,41 +286,22 @@
     <string name="hypo">Хипоглекимия</string>
     <string name="activity">Физ.активност</string>
     <string name="removerecord">Премахни</string>
-    <string name="danar_stats">DanaR статистика</string>
-    <string name="danar_stats_cumulative_tdd">Комулативна TDD</string>
-    <string name="danar_stats_expweight">Експоненциално претеглена TDD</string>
-    <string name="danar_stats_basalrate">Базал</string>
-    <string name="danar_stats_bolus">Болус</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Дата</string>
-    <string name="danar_stats_ratio">Коефициент</string>
-    <string name="danar_stats_amount_days"># дни</string>
-    <string name="danar_stats_weight">Тегло</string>
-    <string name="danar_stats_warning_Message">Възможна неточност, ако сте използвали болус за презареждане!</string>
-    <string name="danar_stats_olddata_Message">Стари данни - натиснете \"ПРЕЗАРЕДИ\"</string>
-    <string name="danar_stats_tbb">Общо базален инсулин</string>
-    <string name="danar_stats_tbb2">ОБИ * 2</string>
-    <string name="initializing">Инициализация ...</string>
     <string name="actions_shortname">ДЕЙСТВ</string>
     <string name="configbuilder_shortname">КОНФ</string>
     <string name="loop_shortname">ЦИК</string>
     <string name="simpleprofile_shortname">ОПр</string>
     <string name="oaps_shortname">APS</string>
     <string name="localprofile_shortname">ЛПр</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ОСН</string>
     <string name="virtualpump_shortname">ВП</string>
     <string name="profileviewer_shortname">NSПр</string>
     <string name="treatments_shortname">Леч</string>
-    <string name="careportal_shortname">КП</string>
     <string name="objectives_shortname">Цел</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Използвай къси имена</string>
     <string name="always_use_shortavg">Използвай краткоср. Δ вместо разлика от последната КЗ</string>
     <string name="always_use_shortavg_summary">Полезно при данни за КЗ с много шум</string>
-    <string name="advancedsettings_title">Разширени настройки</string>
-    <string name="danar_model">Модел: %1$02X Протокол: %2$02X Код: %3$02X</string>
     <string name="profile">Профил</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">По подразбиране: 3 Това е основен параметър в сигурността на OpenAPS. Той ограничава максималният базал да бъде 3 пъти най-голямата стойност от дневните базали. Не би трябвало да има нужа от промяна, защото от опит сме проверили, че максимумите са “3x от най-високия дневен; 4x от текущия”.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от \"3x от най-високия дневен; 4x от текущия\". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри.</string>
@@ -465,18 +320,9 @@
     <string name="smscommunicator_calibrationsent">Неуспешно. Получаването трябва да е разрешено в xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip не получава калибрации</string>
     <string name="pumpsuspended">Помпата е спряна</string>
-    <string name="gettingpumpstatus">Получава статус на помпата</string>
-    <string name="settingtempbasal">Настройва временен базал</string>
-    <string name="stoppingtempbasal">Спира временен базал</string>
-    <string name="settingextendedbolus">Настойва удължен болус</string>
-    <string name="stoppingextendedbolus">Спира удължен болус</string>
-    <string name="updatingbasalrates">Обновява базални стойности</string>
-    <string name="disconnecting">Спира връзката</string>
     <string name="executing">Изпълнява</string>
     <string name="virtualpump_settings">Настойки Виртуална Помпа</string>
     <string name="virtualpump_uploadstatus_title">Качва статуса в NS</string>
-    <string name="wrongpassword">Грешна парола</string>
-    <string name="approachingdailylimit">Близо до максмалния дневен инсулин</string>
     <string name="nsclientinternal">Вътрешен NS клиент</string>
     <string name="nsclientinternal_shortname">NSКЛ</string>
     <string name="nsclientinternal_url">Nightscout aдрес:</string>
@@ -500,7 +346,6 @@
     <string name="wear_detailedIOB_title">Покажи подробен IOB</string>
     <string name="wear_detailedIOB_summary">Раздели IOB от болус и от базал на часовника</string>
     <string name="nosuccess">неуспешно - моля проверете телефона</string>
-    <string name="notavailable">Недостъпно</string>
     <string name="patientage">Възраст на потребителя</string>
     <string name="child">Дете</string>
     <string name="teenage">Тийнейджър</string>
@@ -533,8 +378,6 @@
     <string name="superbolus">Суперболус</string>
     <string name="ns_logappstartedevent">Записвай всяко стартиране на AndroidAPS в NS</string>
     <string name="restartingapp">Рестартиране за да се приложат новите настройки.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Инсулин</string>
     <string name="configbuilder_insulin_description">Кой тип на инсулин използвате?</string>
     <string name="fastactinginsulin">Бързодействащ инсулин</string>
     <string name="fastactinginsulincomment">Novorapid Novolog, Humalog</string>
@@ -549,9 +392,6 @@
     <string name="statuslights_bat_critical">Критично ниво на батерията под [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">СОВ</string>
-    <string name="virtualpump_firmware_label">Фърмуер</string>
-    <string name="pump_lastconnection_label">Последно свързване</string>
-    <string name="danar_bluetooth_status">Bluetooh статус</string>
     <string name="nav_about">За приложението</string>
     <string name="smscommunicator_missingsmspermission">SMS команда забранена</string>
     <string name="smscommunicator_missingphonestatepermission">Липсва разрешение до данни от телефона</string>
@@ -562,17 +402,12 @@
     <string name="wear_showbgi_summary">Добави BGI към статуса</string>
     <string name="ns_noupload">Без качване на данни в NS</string>
     <string name="ns_noupload_summary">Всички данни за NS се пропускат. AAPS е свързан с NS, но не прави промени в NS</string>
-    <string name="basal_step">Стъпка при базал</string>
-    <string name="bolus_step">Стъпка при болус</string>
     <string name="overview_extendedbolus_cancel_button">Спри удължен болус</string>
     <string name="careportal_sensorage_label">Възраст на сензора</string>
     <string name="careportal_canulaage_label">Възраст на канюла</string>
     <string name="careportal_insulinage_label">Възраст на инсулина</string>
-    <string name="hours">часа</string>
-    <string name="invalidprofile">Грешен профил !!!</string>
     <string name="doprofileswitch">Смени профил</string>
     <string name="careportal_pbage_label">Възраст на батерията на помпата</string>
-    <string name="careportal_pumpbatterychange">Смяна на батерия</string>
     <string name="ns_alarmoptions">Опции за аларми</string>
     <string name="nsalarm_urgenthigh">Много висока</string>
     <string name="nsalarm_high">Висока</string>
@@ -596,7 +431,6 @@
     <string name="absorptionsettings_title">Настройки за абсорбция</string>
     <string name="absorption_maxtime_title">Максимално време за усвояване на храненето [ч]</string>
     <string name="absorption_maxtime_summary">Брой часове, за които се очаква храненето да бъде напълно усвоено в организма</string>
-    <string name="danar_visualizeextendedaspercentage_title">Показвай удължените болуси като %%</string>
     <string name="careportal_sensorage_label_short">ВСенз</string>
     <string name="careportal_insulinage_label_short">ВИнс</string>
     <string name="careportal_canulaage_label_short">ВКан</string>
@@ -621,7 +455,6 @@
     <string name="careportal_pump_label">ПОМПА</string>
     <string name="careportal_newnstreatment_duration_min_label">Продължителност [мин.]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Разреши UAM</string>
     <string name="enablesmb">Разреши SMB</string>
     <string name="enablesmb_summary">Използвай супер микро болуси вместо временен базал за по бързо действие</string>
@@ -633,23 +466,7 @@
     <string name="ultrarapid_oref">Ултра бързодействащ по Oref</string>
     <string name="dia_too_short">DIA от %1$f е твърде кратка - използвай %2$f вместо това!</string>
     <string name="activate_profile">Активирай профила</string>
-    <string name="date">Дата</string>
     <string name="invalid">НЕВАЛИДНО</string>
-    <string name="waitingforpairing">Очаква сдвояване с помпа</string>
-    <string name="pairingok">Сдвояване - ОК</string>
-    <string name="pairingtimedout">Времето за сдвояване изтече</string>
-    <string name="pairing">Сдвояване</string>
-    <string name="danars_nodeviceavailable">Все още устройството не е намерено</string>
-    <string name="emptyreservoir">Празен резервоар</string>
-    <string name="bloodsugarmeasurementalert">Предупреждение за измерване на КЗ</string>
-    <string name="remaininsulinalert">Оставащ инсулин</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Избрана помпа</string>
-    <string name="pairpump">Сдвояване с нова помпа</string>
-    <string name="bolusspeed">Скорост на болус</string>
-    <string name="danar_setbasalstep001">Задайте стъпка на базала 0.01 Е/ч</string>
-    <string name="serialnumber">Сериен номер</string>
     <string name="careportal_newnstreatment_percentage_label">% от профила</string>
     <string name="careportal_newnstreatment_timeshift_label">Време на отместване</string>
     <string name="default_temptargets">Временна цел по подразбиране</string>
@@ -659,32 +476,18 @@
     <string name="activity_target">Целева КЗ при физ. активност</string>
     <string name="hypo_duration">Продължителност на вр. цел при хипоглекимия</string>
     <string name="hypo_target">Временна цел при хипоглекимия</string>
-    <string name="danar_history_prime">Пълнене</string>
-    <string name="gettingextendedbolusstatus">Получава статус на удължен болус</string>
-    <string name="gettingbolusstatus">Получава болус статус</string>
-    <string name="gettingtempbasalstatus">Получава статус на временен базал</string>
-    <string name="gettingpumpsettings">Получава настройките на помпата</string>
-    <string name="gettingpumptime">Получава времето на помпата</string>
     <string name="reuse">отново</string>
     <string name="wearcontrol_title">Контролиране от часовник</string>
     <string name="wearcontrol_summary">Задаване временни цели и въвеждане Лечения от часовник Android wear</string>
-    <string name="connectiontimedout">Времето за връзка изтече</string>
     <string name="food">Храна</string>
     <string name="shortgramm">гр.</string>
-    <string name="shortminute">мин.</string>
-    <string name="shorthour">ч.</string>
-    <string name="shortday">д</string>
     <string name="none"><![CDATA[<празно>]]></string>
     <string name="shortkilojoul">килодж.</string>
     <string name="shortenergy">Ен</string>
     <string name="shortprotein">Бел.</string>
     <string name="shortfat">Маз.</string>
     <string name="active"><![CDATA[<Активно>]]></string>
-    <string name="waitingforestimatedbolusend">Изчаква края на болуса. Остават %1$d сек.</string>
-    <string name="processinghistory">Обработва се събитие</string>
-    <string name="startingbolus">Стартира доставка на болус</string>
     <string name="executingrightnow">Командата се изпълнява в момента</string>
-    <string name="pumpdrivercorrected">Драйверът за помпата е коригиран</string>
     <string name="pump_unreachable">Помпата е недостъпна</string>
     <string name="missed_bg_readings">Липсват данни за КЗ</string>
     <string name="raise_notifications_as_android_notifications">Използвай системни известия за аларми и съобщения</string>
@@ -694,9 +497,6 @@
     <string name="pump_unreachable_threshold">Лимит за недостъпна помпа [мин]</string>
     <string name="urgent_alarm">Спешна аларма</string>
     <string name="info">ИНФО</string>
-    <string name="bluetooth">Блутуут</string>
-    <string name="btwatchdog_title">Блутуут ограничения</string>
-    <string name="btwatchdog_summary">Изключва Bluetooth на телефона за една секунда, ако няма връзка с помпата. Това може да помогне на някои телефони, където Bluetooth блокира.</string>
     <string name="eversense">Eversense приложение(модифицирано)</string>
     <string name="dexcomg5_nsupload_title">Качвай данните за КЗ в NS</string>
     <string name="bgsource_upload">Настройки при качване на КЗ към Nightscout</string>
@@ -704,12 +504,9 @@
     <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
     <string name="smbmaxminutes">Максимум минути СМБ</string>
     <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
-    <string name="unsupportedfirmware">Неподдържан фърмуер на помпата</string>
     <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
-    <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално поддържаната стойност %1$s</string>
-    <string name="maximumbasalvaluereplaced">Базалната стойност е заместена от максимално поддържаната стойност %1$s</string>
     <string name="overview_editquickwizard_usebg">Калкулиране на КЗ</string>
     <string name="overview_editquickwizard_usebolusiob">Калкулиране на Болус IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Калкулиране на базален IOB</string>
@@ -727,8 +524,6 @@
     <string name="closedmodeenabled">APS - Затворен кръг е позволен</string>
     <string name="maxiobset">Максимален IOB е зададен правилно</string>
     <string name="hasbgdata">Има данни за КЗ от избрания източник</string>
-    <string name="basalprofilenotaligned">Базалните стойности не са за кръгли часове: %1$s</string>
-    <string name="zerovalueinprofile">Грешен профил: %1$s</string>
     <string name="combo_programming_bolus">Програмиране на помпа за болус</string>
     <string name="combo_refresh">Обнови</string>
     <string name="combo_pump_state_label">Състояние</string>
@@ -749,7 +544,6 @@
     <string name="bolus_frequency_exceeded">Болуси с едно и също количество бяха поискани в последните две минути. За да се предотврати дублиране вече доставен болус, операцията е забранена.</string>
     <string name="combo_pump_connected_now">Сега</string>
     <string name="combo_activity_reading_pump_history">Чете историята на помпата</string>
-    <string name="danar_history">История</string>
     <string name="combo_activity_setting_basal_profile">Настройва базалният профил</string>
     <string name="combo_pump_cartridge_low_warrning">Ниско ниво на резервоар на помпа</string>
     <string name="combo_pump_battery_low_warrning">Батерията на помпата е слаба</string>
@@ -768,8 +562,6 @@
     <string name="extendedbolusdeliveryerror">Грешка при доставяне на удължен болус</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">преди</string>
-    <string name="format_hours">%1$.2f ч</string>
-    <string name="format_mins">%1$d мин</string>
     <string name="enablesmbalways">Разреши SMB постоянно</string>
     <string name="enablesmbalways_summary">Разрешава SMB постоянно и независимо от болусите. Възможно само с източник на КЗ с добра филтрация като G5  </string>
     <string name="enablesmbaftercarbs">Разреши SMB след въглехидрати</string>
@@ -780,8 +572,6 @@
     <string name="enablesmbwithtemptarget_summary">Разрешава SMB, когато има активна временна цел на КЗ</string>
     <string name="enablesmbwithhightemptarget">Разреши SMB с по-високи временни цели на КЗ</string>
     <string name="enablesmbwithhightemptarget_summary">Разрешава SMB когато има активна по-висока временна цел </string>
-    <string name="let_temp_basal_run">Нека текущия временен базал продължи</string>
-    <string name="mute">Заглушаване</string>
     <string name="overview_insulin_label">Инсулин</string>
     <string name="overview_carbs_label">Въглехидрати</string>
     <string name="overview_buttons_selection">Бутони</string>
@@ -823,7 +613,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Използвате dev версия. Затворения кръг е недостъпен за Вас.</string>
     <string name="engineering_mode_enabled">Режим за раработчици (Engineering mode) включен</string>
     <string name="not_eng_mode_or_release">Режим за раработчици (Engineering mode) не е активиран и не е release версия</string>
-    <string name="pump_basebasalrate">%1$.2f Е/ч</string>
     <string name="combo_actvity_reading_basal_profile">Прочита базалният профил</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Историята на помпата се промени след извършване на изчислението за болус. Болусът не беше доставен. Моля, преизчислете дали все още е необходим болус.</string>
     <string name="combo_error_updating_treatment_record">Болус успешно инжектиран, но добавянето на лечение в базата данни е неуспешно. Това може да се случи, ако два малки болуса със същия размер са направени в рамките на последните две минути. Проверете записите в историята на помпата и използвайте Careportal, за да добавите липсващи записи. Уверете се,че не добавяте еднакви записи за точно една и съща минута и същото количество инсулин.</string>
@@ -846,15 +635,10 @@
     <string name="smbdisabledinpreferences">SMB е забранен в настройките</string>
     <string name="uamdisabledinpreferences">UAM е забранен в настройките</string>
     <string name="uamdisabledoref1notselected">UAM изключен, защото му трябва Oref1 плъгин за чувствителност </string>
-    <string name="limitingbasalratio">Ограничаване на макс. базална стойност до %1$.2f Е/ч поради %2$s</string>
-    <string name="pumplimit">лимит на помпата</string>
-    <string name="itmustbepositivevalue">трябва да бъде положително число</string>
     <string name="maxbasalmultiplier">множител на макс. базал</string>
     <string name="maxdailybasalmultiplier">множител на макс. дневен базал</string>
     <string name="smb_frequency_exceeded">Има болус през последните 3 мин, пропускам SMB</string>
     <string name="basal_set_correctly">Базалът е зададен коректно</string>
-    <string name="limitingpercentrate">Ограничаване на максималната процентна стойност до %1$d%% поради %2$s</string>
-    <string name="limitingbolus">Ограничаване на болус до %1$.1f Е поради %2$s</string>
     <string name="limitingextendedbolus">Ограничение на удължен болус до %1$.1f Е поради %2$s</string>
     <string name="limitingmaxiob">Ограничаване на макс. IOB до %1$.1f Е поради %2$s</string>
     <string name="limitingcarbs">Ограничаване на въглехидрати до %1$d гр. поради %2$s</string>
@@ -869,7 +653,6 @@
     <string name="smbnotallowedinopenloopmode">SMB не е позволен в режим Отворен кръг</string>
     <string name="food_short">Храна</string>
     <string name="reset">нулиране</string>
-    <string name="waitingfortimesynchronization">Изчаква синхронизация на времето (%1$d сек)</string>
     <string name="loopdisconnectedfor">Разкачена помпа (%1$d мин)</string>
     <string name="openapssmb_maxiob_title">Максималният общ IOB OpenAPS не може да бъде повече от [U]</string>
     <string name="openapssmb_maxiob_summary">Тази стойност се нарича Max IOB в контекста на OpenAPS. OpenAPS няма да добавя инсулин, ако текущата IOB е по-голяма от тази стойност</string>
@@ -885,7 +668,6 @@
     <string name="nav_setupwizard">Съветник за настройване</string>
     <string name="setupwizard_finish">КРАЙ</string>
     <string name="setupwizard_language_prompt">Избиране на език</string>
-    <string name="boluserrorcode">Стартирано: %1$.2fЕ Доставено: %2$.2fЕ Код на грешка: %3$s</string>
     <string name="firstinsulinincrement">Стойност на първия бърз бутон [e]</string>
     <string name="secondinsulinincrement">Стойност на втория бърз бутон [e]</string>
     <string name="thirdinsulinincrement">Стойност на третия бърз бутон [e]</string>
@@ -908,7 +690,6 @@
     <string name="virtualpump_type">Виртуална помпа тип</string>
     <string name="virtualpump_definition">Описание на помпата</string>
     <string name="virtualpump_pump_def">Болус: Стъпка =%1$s\Удължен болус: [стъпка =%2$s, продължителност =%3$smin -%4$sh] \nБазал: стъпка =%5$s\ nTBR: %6$s (от %7$s), продължителност =%8$sмин -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Само конкретни стойности! Диапазони не се поддържат за базал/болус при виртуална помпа.</string>
     <string name="ns_autobackfill_title">Изтегляне КЗ от Найтскаут</string>
     <string name="wear_wizard_settings">Настройки на съветник</string>
     <string name="wear_wizard_settings_summary">Изчисления, включени в резултата на съветника:</string>
@@ -939,22 +720,6 @@
     <string name="request">Искане</string>
     <string name="insulinsourcesetup">Конфигуриране на модула за Инсулин</string>
     <string name="exit">Изход</string>
-    <string name="danar_useroptions">Потребителски опции</string>
-    <string name="danar_timedisplay">Формат на времето</string>
-    <string name="danar_buttonscroll">Превъртане при задъжане</string>
-    <string name="danar_beep">Звуков сигнал при натискане на бутон</string>
-    <string name="danar_pumpalarm">Тип аларма</string>
-    <string name="danar_pumpalarm_sound">Звукова</string>
-    <string name="danar_pumpalarm_vibrate">Вибрация</string>
-    <string name="danar_pumpalarm_both">И двете</string>
-    <string name="danar_screentimeout">Включен екран за [seconds]</string>
-    <string name="danar_backlight">Подсветка [seconds]</string>
-    <string name="danar_glucoseunits">Единици на КЗ</string>
-    <string name="danar_shutdown">Изключване след [hours]</string>
-    <string name="danar_lowreservoir">Минимален инсулин в резервоара [Units]</string>
-    <string name="danar_saveuseroptions">Запиши опциите в помпата</string>
-    <string name="option_on">Вкл</string>
-    <string name="option_off">Изкл</string>
     <string name="open_navigation">Отвори меню</string>
     <string name="close_navigation">Затвори меню</string>
     <string name="nav_plugin_preferences">Настройки на модул</string>
@@ -970,8 +735,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Да се понижава ли чувствителността при цели < 5.6 ммол/л?]]></string>
     <string name="combo_invalid_setup">Невалидни настройки на помпата, проверете wiki и се уверете че меню Quick Info се казва QUICK INFO, с помощта на 360 софтуера.</string>
     <string name="custom">По избор</string>
-    <string name="largetimedifftitle">Голяма времева разлика</string>
-    <string name="largetimediff">Голяма времева разлика: Помпата е изключена за повече от 1,5 часа. Моля, регулирайте ръчно времето на помпата и се уверете, че четенето на историята от помпата не води до неочаквано поведение. Ако е възможно, премахнете историята от помпата, преди да промените времето или да изключите затворения кръг за едно DIA след последното погрешно влизане в историята, но поне едно DIA отсега.</string>
     <string name="careportal_removestartedevents"> AndroidAPS стартира</string>
     <string name="storedsettingsfound">Открити са предишни настройки</string>
     <string name="allow_hardware_pump_text">Внимание: Ако активирате и свържете с хардуерна помпа, AndroidAPS ще копира основните настройки от профила в помпата, като презапише съществуващата базова скорост, съхранявана на помпата. Уверете се, че имате правилните основни настройки в AndroidAPS. Ако не сте сигурни или не искате да презапишете основните настройки на помпата, натиснете Cancel и повторете превключването към помпата по-късно.</string>
@@ -996,17 +759,10 @@
     <string name="setupwizard_preferred_aps_mode">Предпочитаният режим на APS</string>
     <string name="treatments_wizard_total_label">Общо</string>
     <string name="calculation_short">Калк</string>
-    <string name="handshaking">Сдвояване</string>
     <string name="sendlogfiles">Изпрати последните лог файлове на разработчиците. Непредвидена ситуация.</string>
-    <string name="maxbolusviolation">Превишавате макс болус</string>
-    <string name="commanderror">Грешка при команда</string>
-    <string name="speederror">Скорост грешка</string>
-    <string name="insulinlimitviolation">Нарушение на макс дневен инсулин</string>
     <string name="loop_openmode_min_change">Минимална стойност за промяна [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">AndroidAPS ще покаже запитването за промяна на базала само ако е по-голямо от тази стойност.(Стандартно 20%)</string>
-    <string name="pairfirst">Моля първо свържете помпата с телефона от Bluetooth настройките </string>
     <string name="searching_for_devices">Търсене на устройства...</string>
-    <string name="please_wait">Моля изчакайте...</string>
     <string name="pairing_completed">Сдвояване завършено</string>
     <string name="code_compare">Съвпадат ли кодовете, показани на това устройство и на Вашата помпа?</string>
     <string name="insight_pairing">Insight свързване</string>
@@ -1095,7 +851,6 @@
     <string name="isequalorgreater">е равно или по-голямо от</string>
     <string name="isgreater">е по-голяма от </string>
     <string name="isnotavailable">не е налично</string>
-    <string name="unknown">неизвестно</string>
     <string name="glucoseisnotavailable">КЗ не е достъпна</string>
     <string name="glucosecomparedmgdl">КЗ %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">КЗ %1$s %2$.1f %3$s</string>
@@ -1112,23 +867,10 @@
     <string name="automation_short">Автом</string>
     <string name="automation">Автоматизация</string>
     <string name="profile_total">Общо  %1$s Е</string>
-    <string name="profile_ins_units_per_hour">Е/ч</string>
-    <string name="profile_carbs_per_unit">гр/Е</string>
-    <string name="profile_per_unit">/Е</string>
     <string name="dexcom_lognssensorchange_title">Записвай смяната на сензор в NS</string>
     <string name="dexcom_lognssensorchange_summary">Създаване на събитие \"Смяна на сеснзор\" в NS автоматично при старт на сензор</string>
     <string name="tomato">Tomato(MяоМяо)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">секунда</string>
-    <string name="unit_minute">минута</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">ден</string>
-    <string name="unit_week">седмица</string>
-    <string name="unit_seconds">секунди</string>
-    <string name="unit_minutes">минути</string>
-    <string name="unit_hours">часове</string>
-    <string name="unit_days">дни</string>
-    <string name="unit_weeks">седмици</string>
     <string name="summary_tidepool_username">Потребителското Ви име за Tidepool, обикновено е Вашия имейл</string>
     <string name="title_tidepool_username">Потребителско име</string>
     <string name="summary_tidepool_password">Tidepool парола</string>
@@ -1171,7 +913,6 @@
     <string name="very_old_version">много стара версия</string>
     <string name="new_version_warning">Има нова версия от най-малко %1$d дни! Ще спре подаването на инсулин след %2$d дни, цикълът ще бъде изключен след %3$d дни</string>
     <string name="twohours">2ч</string>
-    <string name="formatinsulinunits">%1$.2fЕ</string>
     <string name="dexcom_app_patched">Dexcom приложение (модифицирано)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Да получава данни за КЗ от модифицираното приложение на Dexcom.</string>
@@ -1245,10 +986,6 @@
     <string name="rileylink_scanner_scan_stop">СТОП</string>
     <string name="rileylink_scanner_selected_device">Избрано</string>
     <string name="rileylink_scanner_title">RileyLink скенер</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy не се поддържа.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth не е включен.</string>
-    <string name="location_not_found_title">Локацията не е включена</string>
-    <string name="location_not_found_message">За да работи откриването на нови устройсва чрез Bluetooth, трябва да включите локацията. AAPS не проследява вашето местоположение и ще можете да я изключите след успешното свързване.</string>
     <string name="location_yes">Разреши</string>
     <string name="location_no">Не</string>
     <string name="rileylink_scanner_scanning">Сканиране</string>
@@ -1289,7 +1026,6 @@
     <string name="rileylink_error_tuneup_failed">Настройката се провали</string>
     <string name="rileylink_error_pump_unreachable">Помпата е недостъпна</string>
     <string name="rileylink_error_pod_unreachable">Pod е недостъпen</string>
-    <string name="rileylink_error_address_not_set_short">Не е зададен</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic помпа</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1359,7 +1095,6 @@
     <string name="insulinFromCob"><![CDATA[Въгл срещу АИ: <font color=\'%1$s\'>%2$+.2fг Е</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Ограничение на болуса: %2$.2fЕ на %3$.2fЕ</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Бавна абсорбция на въглехидрати: %2$d%% от времето. Проверете въведените данни. Може да има голяма грешка !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d Е</string>
     <string name="partialboluswizard">Стартирай част от резултата в калкулатора [%]</string>
     <string name="deliverpartofboluswizard">Калкулатора изчислява нужния инсулин, но само тази част ще бъде доставена. Полезно със SMB алгоритъма.</string>
     <string name="loading">Зареждане ...</string>
@@ -1367,7 +1102,6 @@
     <string name="time_range">Времеви диапазон</string>
     <string name="timerange_value">Часът е между %1$s и %2$s</string>
     <string name="between">Между </string>
-    <string name="close">Затвори</string>
     <string name="increasingmaxbasal">Повишавам максималната стойност на базал, защото тя е по-ниска от най-високата в базалния профил</string>
     <string name="smscommunicator_messagebody">Невалиден текст на съобщение</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1385,7 +1119,6 @@
     <string name="common_off">Изкл</string>
     <string name="objectives_button_unfinish">Изчисти приключение</string>
     <string name="objectives_button_unstart">Изчисти стартираните</string>
-    <string name="timedetection">Засичане на времето</string>
     <string name="doyouwantresetstart">Искате ли да нулирате прогреса си?</string>
     <string name="nopumpselected">Не е избрана помпа</string>
     <string name="setupwizard_units_prompt">Изберете единиците, в които искате да работите</string>
@@ -1411,7 +1144,6 @@
     <string name="nav_survey">Проучване</string>
     <string name="invalidage">Невалидна възраст</string>
     <string name="invalidweight">Невалидно тегло</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Бол: <b>%3$.2f</b> Баз: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Ниски: <b>%2$02d%%</b> В: <b>%3$02d%%</b> Вис: <b>%4$02d%%</b>]]></string>
     <string name="average">Средно</string>
     <string name="tdd">ТДД</string>
@@ -1424,12 +1156,8 @@
     <string name="randombg_short">КЗ</string>
     <string name="tools">Инструменти</string>
     <string name="show_calculation">Покажи изчисленията</string>
-    <string name="error">Грешка</string>
-    <string name="timeformat12h">12ч</string>
-    <string name="timeformat24h">24ч</string>
     <string name="automation_event">Събитие</string>
     <string name="alreadyset">Вече направено</string>
-    <string name="message">Съобщение</string>
     <string name="clearqueueconfirm">Изтрий опашка? Всички данни ще се загубят!</string>
     <string name="ebstopsloop">Използване на удължен болус ще спре режим затворен цикъл за времето на болуса. Сигурни ли сте?</string>
     <string name="closed_loop_disabled_with_eb">Затворен цикъл е недостъпен поради стартиран Удължен болус</string>
@@ -1442,4 +1170,13 @@
     <string name="loop_tbrrequest_time_label">Диапазон между временни базали</string>
     <string name="loop_tbrexecution_time_label">Продължителност на временни базали</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 52cdbe4638..9819565981 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Inicializovat databáze</string>
     <string name="reset_db_confirm">Opravdu resetovat všechny databáze?</string>
     <string name="nav_exit">Konec</string>
-    <string name="danar_useextended_title">Použít prodloužené bolusy pro &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth zařízení</string>
     <string name="ns_sync_use_absolute_title">Vždy použít absolutní hodnoty bazálu</string>
     <string name="alert_dialog_storage_permission_text">Prosím restartujte Váš telefon nebo restartujte AndroidAPS z nastavení systému\njinak nebudou zaznamenány ladící informace (důležité pro sledování a kontrolu, zda algoritmus pracuje správně)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Toto zařízení zřejmě neumožňuje vypnout optimalizaci baterie - může docházet k problémům s výkonem.</string>
     <string name="description_actions">Tlačítka k běžně používaným úkonům</string>
-    <string name="description_careportal">Zadávání událostí pro management diabetu.</string>
     <string name="description_config_builder">Nastavení konfigurace (povolování součástí systému)</string>
     <string name="description_objectives">Výukový program</string>
     <string name="description_food">Zobrazení jídel definovaných v NS</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Použití profilu definovaného v Nightscoutu</string>
     <string name="description_profile_simple">Jednoduchý profil s jedním časovým pásmem.</string>
     <string name="description_pump_combo">Ovladač pumpy pro Accu-Check Combo. Vyžaduje nainstalovanou aplikaci Ruffy</string>
-    <string name="description_pump_dana_r">Ovladač pumpy pro DanaR</string>
-    <string name="description_pump_dana_r_korean">Ovladač pumpy pro korejskou verzi DanaR</string>
-    <string name="description_pump_dana_r_v2">Ovladač pumpy pro DanaR s upgradovaným firmwarem</string>
-    <string name="description_pump_dana_rs">Ovladač pumpy pro DanaRS</string>
     <string name="description_pump_mdi">Ovladač pumpy pro uživatele inzulínových per</string>
     <string name="description_pump_virtual">Ovladač pumpy pro uživatele bez podporované pumpy (Otevřená smyčka)</string>
     <string name="description_sensitivity_aaps">Citlivost je počítána stejným způsobem jako v Oref0, ale je možné specifikovat dobu do minulosti. Minimální absorpce sacharidů je počítána dynamicky z maximální doby absorpce definované v nastavení.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Zobrazování stavu a řízení AndroidAPS z hodinek s WearOS</string>
     <string name="description_xdrip_status_line">Zobrazování informací o smyčce na xDrip+ watchface.</string>
     <string name="description_sms_communicator">Vzdálené řízení pomocí SMS příkazů</string>
-    <string name="nsprofileview_units_label">Jednotky</string>
-    <string name="nsprofileview_dia_label">Doba působnosti inzulínu</string>
-    <string name="nsprofileview_ic_label">Inzulínosacharidový poměr</string>
-    <string name="nsprofileview_isf_label">Citlivost</string>
-    <string name="nsprofileview_basal_label">Bazál</string>
-    <string name="nsprofileview_target_label">Cíl</string>
-    <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
     <string name="treatments_insulin_label_string">Inzulín:</string>
     <string name="treatments_carbs_label_string">Sacharidy:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">DC</string>
     <string name="treatments_wizard_carbs_label">Sacharidy</string>
     <string name="treatments_wizard_correction_label">Korekce</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolusové IOB</string>
     <string name="openapsma_run">Spustit teď</string>
     <string name="vitualpump_label">VIRTUÁLNÍ PUMPA</string>
-    <string name="pump_basebasalrate_label">Základní hodnota bazálu</string>
-    <string name="pump_tempbasal_label">Dočasný bazál</string>
-    <string name="virtualpump_extendedbolus_label">Prodloužený bolus</string>
-    <string name="pump_battery_label">Baterie</string>
-    <string name="pump_reservoir_label">Zásobník</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Poslední spuštění</string>
     <string name="openapsma_inputparameters_label">Vstupní parametry</string>
@@ -96,16 +76,11 @@
     <string name="result">Výsledek</string>
     <string name="result_insulin_carbs">Výsledek: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Nedostupná data o glykémiích</string>
-    <string name="nochangerequested">Změna nepožadována</string>
     <string name="openapsma_request_label">Požadavek</string>
-    <string name="rate">Hodnota</string>
-    <string name="duration">Trvání</string>
-    <string name="reason">Zdůvodnění</string>
     <string name="glucose">Glykémie</string>
     <string name="delta">Rozdíl</string>
     <string name="sms_delta">Rozdíl:</string>
     <string name="configbuilder">Konfigurace</string>
-    <string name="objectives">Cíle</string>
     <string name="overview">Přehled</string>
     <string name="nsprofile">NS profil</string>
     <string name="simpleprofile">Jednoduchý profil</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Obecné</string>
     <string name="configbuilder_general_description">Obecné pluginy, které by se Vám mohly hodit.</string>
     <string name="configbuilder_constraints_description">Jaká omezení byla použita?</string>
-    <string name="days">dnů</string>
     <string name="constraints">Omezení</string>
     <string name="loop">Smyčka</string>
     <string name="configbuilder_loop">Smyčka</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Modul zakázán</string>
     <string name="constraints_violation">Mimo povolený rozsah</string>
     <string name="treatmentdeliveryerror">Chyba podání bolusu</string>
-    <string name="tempbasaldeliveryerror">Chyba nastavování dočasného bazálu</string>
     <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%]</string>
     <string name="setbasalquestion">Spustit nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
-    <string name="carbs">Sacharidy</string>
     <string name="changeyourinput">Změňte zadání!</string>
     <string name="configbuilder_bgsource">Zdroj glykémie</string>
     <string name="configbuilder_bgsource_description">Odkud má získávat AndroidAPS glykémie?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">Typ smyčky</string>
     <string name="closedloop">Uzavřená smyčka</string>
     <string name="openloop">Otevřená smyčka</string>
+    <string name="lowglucosesuspend">Ochrana před nízkou glykémií</string>
     <string name="disabledloop">Smyčka zakázána</string>
     <string name="disableloop">Zakázat smyčku</string>
     <string name="enableloop">Povolit smyčku</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">Bazální IOB</string>
     <string name="bolusconstraintapplied">Aplikováno omezení bolusu</string>
     <string name="carbsconstraintapplied">Aplikováno omezení sacharidů</string>
-    <string name="careportal_bgcheck">Kontrola glykémie</string>
-    <string name="careportal_announcement">Oznámení</string>
-    <string name="careportal_note">Poznámka</string>
-    <string name="careportal_question">Otázka</string>
-    <string name="careportal_exercise">Cvičení</string>
-    <string name="careportal_pumpsitechange">Výměna setu</string>
-    <string name="careportal_cgmsensorinsert">Výměna senzoru</string>
-    <string name="careportal_cgmsensorstart">Znovu spuštění senzoru</string>
-    <string name="careportal_insulincartridgechange">Výměna inzulínu</string>
-    <string name="careportal_profileswitch">Přepnutí profilu</string>
-    <string name="careportal_snackbolus">Bolus na svačinu</string>
-    <string name="careportal_mealbolus">Bolus na jídlo</string>
-    <string name="careportal_correctionbolus">Korekční bolus</string>
-    <string name="careportal_combobolus">Kombinovaný bolus</string>
-    <string name="careportal_tempbasalstart">Dočasný bazál začátek</string>
-    <string name="careportal_tempbasalend">Dočasný bazál konec</string>
-    <string name="careportal_carbscorrection">Přídavek sacharidů</string>
-    <string name="careportal_openapsoffline">OpenAPS vypnuto</string>
-    <string name="careportal_newnstreatment_eventtype">Typ události</string>
     <string name="careportal_newnstreatment_other">Jiné</string>
     <string name="careportal_newnstreatment_meter">Glukoměr</string>
     <string name="careportal_newnstreatment_sensor">Senzor</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">Tato hodnota je v kontextu OpenAPS nazývána max basal</string>
     <string name="openapsma_maxiob_title">Maximální bazální IOB [U]</string>
     <string name="openapsma_maxiob_summary">Tato hodnota je v kontextu OpenAPS nazývána max IOB</string>
-    <string name="dismiss">POTVRDIT</string>
     <string name="password_preferences_encrypt_prompt">Zobrazí se výzva k zadání hlavního hesla, které bude použito k šifrování exportovaných předvoleb.</string>
     <string name="password_preferences_decrypt_prompt">Zobrazí se výzva k zadání hlavního hesla, které bude použito k dešifrování importovaných předvoleb.</string>
     <string name="preferences_export_canceled">Export zrušen! Předvolby NEBYLY exportovány!</string>
     <string name="preferences_import_canceled">Import zrušen! Předvolby NEBYLY importovány!</string>
+    <string name="preferences_import_list_title">Vyberte soubor, který chcete importovat</string>
     <string name="check_preferences_before_import">Před importem zkontrolujte předvolby:</string>
     <string name="check_preferences_cannot_import">Předvolby nelze importovat!</string>
     <string name="check_preferences_dangerous_import">Předvolby by neměly být importovány!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Používáte zastaralý formát od starých verzí AAPS, který není zabezpečený! Použijte jej pouze jako poslední možnost, pokud nemáte exporty v aktuálním formátu JSON.</string>
     <string name="metadata_warning_old_export">Importované předvolby jsou staré již %1$s dní! Možná máte aktualnější export nebo jste vybral špatný soubor? Nezapomeňte předvolby pravidelně exportovat!</string>
     <string name="metadata_warning_date_format">Neplatný formát datumu!</string>
+    <string name="metadata_warning_different_version">Nastavení z odlišné nižší verze aplikace. Je to v pořádku, pokud importujete po aktualizaci, po importu však zkontrolujte, zda jsou nastavení stálé správná!</string>
+    <string name="metadata_urgent_different_version">Nastavení z odlišné hlavní verze aplikace. Hlavní verze se výrazně liší a nemusejí mít kompatibilní nastavení. Po importu zkontrolujte, zda jsou nastavení stálé správná!</string>
     <string name="metadata_label_format">Formát souboru</string>
     <string name="metadata_label_created_at">Vytvořeno</string>
     <string name="metadata_label_aaps_version">Verze AAPS</string>
@@ -256,34 +212,17 @@
     <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrování, zadané heslo je neplatné, nebo byl soubor nastavení změněn! Může se stát, že importovaný soubor byl exportován s jiným hlavním heslem.</string>
     <string name="prefdecrypt_issue_wrong_format">Chybí konfigurace šifrování, formát nastavení je neplatný!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný nebo neurčený šifrovací algoritmus!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Připojuji</string>
-    <string name="connected">Připojeno</string>
-    <string name="disconnected">Odpojeno</string>
-    <string name="danar_pump_settings">Nastavení pumpy Dana</string>
+    <string name="exported_today">exportováno dnes</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportováno před %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportováno v %1$s</string>
+    <string name="exported_less_than_hour_ago">exportováno před méně než hodinou</string>
+    <string name="in_directory" comment="placeholder is for exported file path">v adresáři: %1$s</string>
     <string name="end_user_license_agreement">Licenční ujednání</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMÍM A POTVRZUJI</string>
     <string name="save">Uložit</string>
-    <string name="nobtadapter">Nenalezen Bluetooth adaptér</string>
-    <string name="devicenotfound">Vybrané zařízení nenalezeno</string>
-    <string name="connectionerror">Chyba připojování pumpy</string>
-    <string name="danar_iob_label">IOB z pumpy</string>
-    <string name="danar_dailyunits">Jednotek za den</string>
-    <string name="pump_lastbolus_label">Poslední bolus</string>
-    <string name="hoursago">před %1$.1fh</string>
-    <string name="danar_invalidinput">Chybná vstupní data</string>
-    <string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string>
     <string name="reloadprofile">Obnovit profil</string>
-    <string name="danar_viewprofile">Zobrazit profil</string>
-    <string name="enacted">Provedeno</string>
-    <string name="comment">Komentář</string>
-    <string name="success">Úspěch</string>
-    <string name="percent">Procent</string>
-    <string name="absolute">Absolutní</string>
-    <string name="canceltemp">Zrušit dočasný bazál</string>
     <string name="smscommunicator">SMS komunikátor</string>
-    <string name="waitingforpumpresult">Čekání na výsledek</string>
     <string name="smscommunicator_allowednumbers">Povolená tel. čísla</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">K potvrzení bolusu %1$.2fU odpověz SMS s kódem %2$s</string>
@@ -304,54 +243,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Cíl %1$s na %2$d minut</string>
     <string name="smscommunicator_tt_set">Cíl %1$s na %2$d minut byl úspěšně nastaven</string>
     <string name="smscommunicator_tt_canceled">Dočasný cíl byl úspěšně zrušen</string>
-    <string name="bolusdelivering">Aplikováno %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Povolit posílání příkazů přes SMS</string>
-    <string name="glucosetype_finger">Glukoměr</string>
-    <string name="glucosetype_sensor">Senzor</string>
-    <string name="manual">Jiný</string>
-    <string name="careportal_temporarytarget">Dočasný cíl</string>
-    <string name="careportal_temporarytargetcancel">Dočasný cíl konec</string>
     <string name="danarprofile">DanaR profil</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Celková doba aktivity inzulínu</string>
-    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního pprofilu</string>
-    <string name="danar_historyreload">Načíst</string>
     <string name="uploading">Nahrávám</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">chyba</string>
-    <string name="danar_refill">plnění</string>
-    <string name="danar_basalhour">hodinový bazál</string>
-    <string name="danar_glucose">glykémie</string>
-    <string name="danar_carbohydrate">sacharidy</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Celkem nahráno %1$d záznamů</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarmy</string>
-    <string name="danar_history_basalhours">Hodinové bazály</string>
-    <string name="danar_history_bolus">Bolusy</string>
-    <string name="danar_history_carbohydrates">Sacharidy</string>
-    <string name="danar_history_dailyinsulin">Denní inzulín</string>
-    <string name="danar_history_errors">Chyby</string>
-    <string name="danar_history_glucose">Glykémie</string>
-    <string name="danar_history_refill">Plnění</string>
-    <string name="danar_history_syspend">Vypnutí</string>
-    <string name="danar_history_connectingfor">Připojování %1$d sec</string>
-    <string name="danar_password_title">Heslo k pumpě</string>
-    <string name="wrongpumppassword">Špatné heslo k pumpě!</string>
-    <string name="pumpbusy">Pumpa je zaneprázdněna</string>
-    <string name="overview_bolusprogress_delivered">Podáno</string>
-    <string name="overview_bolusprogress_stoped">Zastaveno</string>
     <string name="bolusstopped">Bolus zastaven</string>
     <string name="bolusstopping">Zastavování bolusu</string>
-    <string name="occlusion">Okluze</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STISKNUTO STOP</string>
-    <string name="waitingforpump">Čekání na pumpu</string>
-    <string name="overview_bolusprogress_goingtodeliver">Podávání %1$.2fU inzulínu</string>
-    <string name="youareonallowedlimit">Dosaženo limitu</string>
-    <string name="noprofileselected">Není vybrán žádný profil</string>
     <string name="smscommunicator_loophasbeendisabled">Smyčka byla zakázána</string>
     <string name="smscommunicator_loophasbeenenabled">Smyčka byla povolena</string>
     <string name="smscommunicator_loopisdisabled">Smyčka je zakázána</string>
@@ -391,11 +289,9 @@
     <string name="mealbolus">Bolus</string>
     <string name="correctionbous">Korekce</string>
     <string name="actions">Akce</string>
-    <string name="androidaps_start">AndroidAPS restartován</string>
     <string name="ns_upload_only">Pouze nahrávání do NS (zakázaná synchronizace)</string>
     <string name="ns_upload_only_summary">Pouze nahrávání dat do NS. Neplatí pro glykémie, dokud není vybraný místní zdroj dat jako xDrip. Neplatí pro profily, pokud se používá NS profil.</string>
     <string name="pumpNotInitialized">Pumpa není inicializována!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pumpa není inicializována, profil nenastaven!</string>
     <string name="primefill">Plnění/doplňování</string>
     <string name="fillwarning">Prosím ujistěte se, že hodnota odpovídá specifikaci Vašeho setu!</string>
     <string name="othersettings_title">Jiné</string>
@@ -405,8 +301,6 @@
     <string name="button3">Tlačítko 3</string>
     <string name="units_colon">Jednotky:</string>
     <string name="units">Jednotky</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/L</string>
     <string name="dia">DIA</string>
     <string name="target_range">Cílový rozsah:</string>
     <string name="prefs_range_title">Rozsah pro zobrazení</string>
@@ -416,17 +310,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Znovu poslat všechna data</string>
     <string name="open_settings_on_wear">Otevřít nastavení na hodinkách Wear</string>
-    <string name="pumperror">Chyba pumpy</string>
-    <string name="lowbattery">Nízký stav baterie</string>
-    <string name="pumpshutdown">Pumpa vypnuta</string>
-    <string name="batterydischarged">Baterie v pumpě vybitá</string>
-    <string name="danarkoreanpump">Korejská DanaR</string>
     <string name="basal_rate">Bazál:</string>
-    <string name="profile_set_failed">Nastavení bazálního profilu selhalo</string>
-    <string name="profile_set_ok">Bazální profil aktualizován</string>
-    <string name="danar_disableeasymode">Zakázat EasyUI režim v pumpě</string>
-    <string name="danar_enableextendedbolus">Povolit kombo bolusy v pumpě</string>
-    <string name="danar_switchtouhmode">Změnit režim z U/d na U/h v pumpě</string>
     <string name="basalvaluebelowminimum">Hodnota bazálu pod povoleným minimem. Nenastaveno!</string>
     <string name="sms_actualbg">Glykémie:</string>
     <string name="sms_lastbg">Poslední glykémie:</string>
@@ -434,7 +318,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Průběžné oznámení</string>
     <string name="old_data">ZASTARALÉ</string>
-    <string name="minago">před %1$d min</string>
     <string name="sms_minago">před %1$d min</string>
     <string name="localprofile">Místní profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +333,22 @@
     <string name="hypo">Hypoglykémie</string>
     <string name="activity">Aktivita</string>
     <string name="removerecord">Odstranit záznam</string>
-    <string name="danar_stats">Statistika z pumpy</string>
-    <string name="danar_stats_cumulative_tdd">Kumulativní TDD</string>
-    <string name="danar_stats_expweight">Exponenciálně vážené TDD</string>
-    <string name="danar_stats_basalrate">Bazál</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">CDD</string>
-    <string name="danar_stats_date">Datum</string>
-    <string name="danar_stats_ratio">Koef</string>
-    <string name="danar_stats_amount_days">Dní</string>
-    <string name="danar_stats_weight">Váha</string>
-    <string name="danar_stats_warning_Message">Pravděpodobně nepřesné při používání bolusů k doplňování</string>
-    <string name="danar_stats_olddata_Message">Zastaralá data. Prosím načtěte je znovu</string>
-    <string name="danar_stats_tbb">Celk. denní bazál</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inicializuji ...</string>
     <string name="actions_shortname">AKCE</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">SMYČ</string>
     <string name="simpleprofile_shortname">JPRO</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">MPRF</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">PŘEH</string>
     <string name="virtualpump_shortname">VPUM</string>
     <string name="profileviewer_shortname">PROF</string>
     <string name="treatments_shortname">OŠET</string>
-    <string name="careportal_shortname">PÉČE</string>
     <string name="objectives_shortname">CÍLE</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Krátké názvy modulů</string>
     <string name="always_use_shortavg">Vždy používat krátkodobý průměrný rozdíl glykémií místo rozdílu posledních 2 hodnot</string>
     <string name="always_use_shortavg_summary">Výhodné, pokud data z xDripu obsahují velký šum.</string>
-    <string name="advancedsettings_title">Rozšířené nastavení</string>
-    <string name="danar_model">Model: %1$02X Protokol: %2$02X Kód: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Výchozí hodnota: 3 Toto je klíčová hodnota zabezpečení. Říká, že maximální nastavitelný bazál je trojnásobkem maximálního denního bazálu. Patrně to nebudete muset měnit, případně si přečtete o tématu \"3x max denní; 4x aktuální\".</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Výchozí hodnota: 4 Toto je druhá klíčová hodnota. Říká, že maximální hodnota dočasného bazálu nikdy nebude větší, než čtyřnásobek aktuálního bazálu. Je to proto, aby se lidé nedostali do nebezpečných hodnot dříve, než pochopí jak OpenAPS pracuje. Znovu, výchozí hodnota je 4 a většina lidí ji nikdy nebude muset změnit. Pokud nestačí, obvykle je problém někde jinde.</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">Kalibrace odeslána. Příjem musí být v xDripu povolený.</string>
     <string name="smscommunicator_calibrationfailed">xDrip nepřijímá kalibrace</string>
     <string name="pumpsuspended">Pumpa pozastavena</string>
-    <string name="gettingpumpstatus">Nahrávám stav pumpy</string>
-    <string name="settingtempbasal">Nastavuji dočasný bazál</string>
-    <string name="stoppingtempbasal">Zastavuji dočasný bazál</string>
-    <string name="settingextendedbolus">Nastavuji extended bolus</string>
-    <string name="stoppingextendedbolus">Zastavuji extended bolus</string>
-    <string name="updatingbasalrates">Aktualizuji bazály</string>
-    <string name="disconnecting">Odpojuji</string>
     <string name="executing">Provádím</string>
     <string name="virtualpump_settings">Nastavení virtuální pumpy</string>
     <string name="virtualpump_uploadstatus_title">Nahrávat status do NS</string>
-    <string name="wrongpassword">Chybné heslo</string>
-    <string name="approachingdailylimit">Blíží se denní limit inzulínu</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCl</string>
     <string name="nsclientinternal_url">Adresa URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">Zobrazit detailní IOB</string>
     <string name="wear_detailedIOB_summary">Rozepsat IOB do bolusového a bazálního na hodinkách</string>
     <string name="nosuccess">neúspěšně - zkontrolujte mobil</string>
-    <string name="notavailable">Nedostupný</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Stáří pacienta</string>
     <string name="child">Dítě</string>
     <string name="teenage">Dospívající</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Zaznamenávat spuštění aplikace do NS</string>
     <string name="restartingapp">Ukončuji aplikaci, aby se nastavení projevilo.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Inzulín</string>
     <string name="configbuilder_insulin_description">Jaký druh inzulínu používáte?</string>
     <string name="fastactinginsulin">Rychlý inzulín</string>
     <string name="fastactinginsulincomment">Novorapid</string>
@@ -598,9 +451,6 @@
     <string name="statuslights_bat_critical">Úroveň kritického varování stavu baterie [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Poslední spojení</string>
-    <string name="danar_bluetooth_status">Stav Bluetooth</string>
     <string name="nav_about">O aplikaci</string>
     <string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Chybí oprávnění pro zjišťování stavu telefonu</string>
@@ -611,17 +461,12 @@
     <string name="wear_showbgi_summary">Přidat BGI do stavové řádky</string>
     <string name="ns_noupload">Zakázat nahrávání do NS</string>
     <string name="ns_noupload_summary">Všechna data odeslaná do NS jsou zahozena. AAPS je připojen k NS, ale nedělá do něj žádné změny</string>
-    <string name="basal_step">Krok bazálu</string>
-    <string name="bolus_step">Krok bolusu</string>
     <string name="overview_extendedbolus_cancel_button">Zrušit prodloužený bolus</string>
     <string name="careportal_sensorage_label">Stáří senzoru</string>
     <string name="careportal_canulaage_label">Stáří kanyly</string>
     <string name="careportal_insulinage_label">Stáří inzulínu</string>
-    <string name="hours">hodin</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
     <string name="doprofileswitch">Proveďte přepnutí profilu</string>
     <string name="careportal_pbage_label">Stáří baterie v pumpě</string>
-    <string name="careportal_pumpbatterychange">Výměna baterie pumpy</string>
     <string name="ns_alarmoptions">Nastavení alarmů</string>
     <string name="nsalarm_urgenthigh">Urgentně vysoká</string>
     <string name="nsalarm_high">Vysoká</string>
@@ -645,7 +490,6 @@
     <string name="absorptionsettings_title">Nastavení absorpce sacharidů</string>
     <string name="absorption_maxtime_title">Max. doba absorpce sacharidů [h]</string>
     <string name="absorption_maxtime_summary">Čas v hodinách, ve kterém předpokládáme, že všechny sacharidy budou strávené</string>
-    <string name="danar_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %%</string>
     <string name="careportal_sensorage_label_short">SEN</string>
     <string name="careportal_insulinage_label_short">INZ</string>
     <string name="careportal_canulaage_label_short">KAN</string>
@@ -670,7 +514,6 @@
     <string name="careportal_pump_label">PUMPA</string>
     <string name="careportal_newnstreatment_duration_min_label">Trvání [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Povolit UAM</string>
     <string name="enablesmb">Povolit SMB</string>
     <string name="enablesmb_summary">Použít super mikro bolusy místo dočasných bazálů pro zrychlení účinku</string>
@@ -682,23 +525,7 @@
     <string name="ultrarapid_oref">Ultra rychlý - Oref</string>
     <string name="dia_too_short">DIA %1$f je příliš krátké - použito %2$f !</string>
     <string name="activate_profile">Aktivovat profil</string>
-    <string name="date">Datum</string>
     <string name="invalid">NEPLATNÝ</string>
-    <string name="waitingforpairing">Čekání na spárování na pumpě</string>
-    <string name="pairingok">Spárováno</string>
-    <string name="pairingtimedout">Vypršel časový limit pro párování</string>
-    <string name="pairing">Párování</string>
-    <string name="danars_nodeviceavailable">Prozatím žádné zařízení nenalezeno</string>
-    <string name="emptyreservoir">Prázdný zásobník</string>
-    <string name="bloodsugarmeasurementalert">Výstraha měření glykémie</string>
-    <string name="remaininsulinalert">Zbývající inzulín</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Vybraná pumpa</string>
-    <string name="pairpump">Párování pumpy</string>
-    <string name="bolusspeed">Rychlost bolusu</string>
-    <string name="danar_setbasalstep001">Nastavte bazální krok 0.01U/h</string>
-    <string name="serialnumber">Sériové číslo</string>
     <string name="careportal_newnstreatment_percentage_label">% změna</string>
     <string name="careportal_newnstreatment_timeshift_label">Posun času</string>
     <string name="default_temptargets">Výchozí nastavení dočasných cílů</string>
@@ -708,32 +535,18 @@
     <string name="activity_target">Cíl při aktivitě</string>
     <string name="hypo_duration">Trvání dočasného cíle při hypoglykémii</string>
     <string name="hypo_target">Cílová glykémie při hypoglykémii</string>
-    <string name="danar_history_prime">Doplňování</string>
-    <string name="gettingextendedbolusstatus">Nahrávám prodloužené bolusy</string>
-    <string name="gettingbolusstatus">Nahrávám bolusy</string>
-    <string name="gettingtempbasalstatus">Nahrávám dočasné bazály</string>
-    <string name="gettingpumpsettings">Nahrávám nastavení pumpy</string>
-    <string name="gettingpumptime">Nahrávám čas v pumpě</string>
     <string name="reuse">znovu použít</string>
     <string name="wearcontrol_title">Řízení z hodinek Wear</string>
     <string name="wearcontrol_summary">Nastavování dočasných cílů a vkládání ošetření na hodinkách Wear.</string>
-    <string name="connectiontimedout">Vypršel čas připojování</string>
     <string name="food">Jídlo</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<prázdný>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Tuk</string>
     <string name="active"><![CDATA[<Aktivní>]]></string>
-    <string name="waitingforestimatedbolusend">Čekání na konec bolusu. Zbývá %1$d sek.</string>
-    <string name="processinghistory">Zpracovávám</string>
-    <string name="startingbolus">Spouštím bolus</string>
     <string name="executingrightnow">Příkaz je právě prováděn</string>
-    <string name="pumpdrivercorrected">Ovladač pumpy opraven</string>
     <string name="pump_unreachable">Pumpa nedostupná</string>
     <string name="missed_bg_readings">Chybějící glykémie</string>
     <string name="raise_notifications_as_android_notifications">Používat systémové notifikace pro výstrahy a oznámení</string>
@@ -743,9 +556,6 @@
     <string name="pump_unreachable_threshold">Limit pro nedostupnost pumpy [min]</string>
     <string name="urgent_alarm">Urgentní alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Hlídač BT</string>
-    <string name="btwatchdog_summary">Vypne na 1 sek bluetooth v telefonu, pokud se nedaří připojit k pumpě. Může to pomoci u telefonů, které mají problémy s BT</string>
     <string name="eversense">Eversense aplikace (upravená)</string>
     <string name="dexcomg5_nsupload_title">Nahrávat data do NS</string>
     <string name="bgsource_upload">Nastavení nahrávání glykémií</string>
@@ -758,12 +568,9 @@
     <string name="uamsmbmaxminutes_summary">Maximální počet minut bazálu, ke kterým se limituje SMB pro UAM</string>
     <string name="carbsReqThreshold">Prahová hodnota doporučení sacharidů</string>
     <string name="carbsReqThreshold_summary">Po navržení sacharidů, kolik sacharidů vyvolá upozornění</string>
-    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpě</string>
     <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
-    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Hodnota bazálu nahrazena maximální možnou: %1$s</string>
     <string name="overview_editquickwizard_usebg">Kalkulace glykémie</string>
     <string name="overview_editquickwizard_usebolusiob">Kalkulace bolusového IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Kalkulace bazálního IOB</string>
@@ -781,8 +588,6 @@
     <string name="closedmodeenabled">Uzavřená smyčka povolena</string>
     <string name="maxiobset">Maximální IOB nastaveno správně</string>
     <string name="hasbgdata">Glykémie dostupné z vybraného zdroje</string>
-    <string name="basalprofilenotaligned">Bazální hodnoty nejsou zarovnané na celé hodiny: %1$s</string>
-    <string name="zerovalueinprofile">Chybný profil: %1$s</string>
     <string name="combo_programming_bolus">Programování pumpy pro bolus</string>
     <string name="combo_refresh">Obnovit</string>
     <string name="combo_pump_state_label">Stav</string>
@@ -803,7 +608,6 @@
     <string name="bolus_frequency_exceeded">Bolus stejné velikosti už byl během poslední minuty požadován. Jako preventivní ochrana před zdvojeným bolusem byla operace zakázána.</string>
     <string name="combo_pump_connected_now">Teď</string>
     <string name="combo_activity_reading_pump_history">Načítání historie pumpy</string>
-    <string name="danar_history">Historie pumpy</string>
     <string name="combo_activity_setting_basal_profile">Nastavení bazálního profilu</string>
     <string name="combo_pump_cartridge_low_warrning">V zásobníku je málo inzulínu</string>
     <string name="combo_pump_battery_low_warrning">Slabá baterie v pumpě</string>
@@ -822,9 +626,6 @@
     <string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">zpět</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Vždy povolit SMB</string>
     <string name="enablesmbalways_summary">Povolit SMB nezávisle na bolusech. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
     <string name="enablesmbaftercarbs">Povolit SMB po jídle</string>
@@ -835,8 +636,6 @@
     <string name="enablesmbwithtemptarget_summary">Povolit SMB, pokud je aktivní dočasný cíl (aktivita, blížící se jídlo)</string>
     <string name="enablesmbwithhightemptarget">Povolit SMB s vysokými dočasnými cíli</string>
     <string name="enablesmbwithhightemptarget_summary">Povolit SMB, pokud je aktivní vysoký dočasný cíl (aktivita)</string>
-    <string name="let_temp_basal_run">Nechat běžet aktuální dočasný bazál</string>
-    <string name="mute">Ztlumit</string>
     <string name="overview_insulin_label">Inzulín</string>
     <string name="overview_carbs_label">Sacharidy</string>
     <string name="overview_buttons_selection">Tlačítka</string>
@@ -878,7 +677,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Běží DEV verze. Uzavřená smyčka je zakázána.</string>
     <string name="engineering_mode_enabled">Expertní mód povolen</string>
     <string name="not_eng_mode_or_release">Expertní mód není povolen a neběží vydaná verze</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Načítám bazální profil</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Historie v pumpě se změnila po spočítání bolusu. Bolus nebyl proveden. Prosím spočítejte ho znovu, pokud je to stále potřeba.</string>
     <string name="combo_error_updating_treatment_record">Bolus úspěšně podán, ale zápis se nezdařil. To se může stát pokud jsou podány bolusy stejné velikosti během 2 minut. Zkontrolujte historii pumpy a zadejte chybějící položky do ošetření. Ujistěte se, že nezadáváte stejnou velikost v rámci 1 minuty.</string>
@@ -901,15 +699,10 @@
     <string name="smbdisabledinpreferences">SMB zakázáno v nastavení</string>
     <string name="uamdisabledinpreferences">UAM zakázáno v nastavení</string>
     <string name="uamdisabledoref1notselected">UAM zakázáno, protože není povolen Oref1 plugin</string>
-    <string name="limitingbasalratio">Max bazál omezen na %1$.2f U/h: %2$s</string>
-    <string name="pumplimit">limit pumpy</string>
-    <string name="itmustbepositivevalue">požadována kladná hodnota</string>
     <string name="maxbasalmultiplier">maximální násobek bazálu</string>
     <string name="maxdailybasalmultiplier">maximální násobek nejvyššího bazálu</string>
     <string name="smb_frequency_exceeded">Odeslán bolus během posledních 3 minut, SMB přeskočeno</string>
     <string name="basal_set_correctly">Bazál nastaven správně</string>
-    <string name="limitingpercentrate">Bazál omezen na %1$d%%: %2$s</string>
-    <string name="limitingbolus">Bolus omezen na %1$.1f U: %2$s</string>
     <string name="limitingextendedbolus">Prodloužený bolus omezen na %1$.1f U: %2$s</string>
     <string name="limitingmaxiob">Max IOB omezeno na %1$.1f U: %2$s</string>
     <string name="limitingcarbs">Sacharidy omezeny na %1$d g: %2$s</string>
@@ -924,7 +717,6 @@
     <string name="smbnotallowedinopenloopmode">SBM není povoleno v otevřené smyčce</string>
     <string name="food_short">Jídlo</string>
     <string name="reset">Resetovat</string>
-    <string name="waitingfortimesynchronization">Čekání na synchronizaci času (%1$d s)</string>
     <string name="loopdisconnectedfor">Odpojeno (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Maximální celková hodnota IOB, kterou OpenAPS nemůže překročit [U]</string>
     <string name="openapssmb_maxiob_summary">Tato hodnota je v kontextu OpenAPS nazývána Max IOB.\nOpenAPS nikdy nepřidá inzulín, pokud je současné IOB větší než tato hodnota</string>
@@ -940,7 +732,6 @@
     <string name="nav_setupwizard">Průvodce nastavením</string>
     <string name="setupwizard_finish">Dokončit</string>
     <string name="setupwizard_language_prompt">Vyberte jazyk</string>
-    <string name="boluserrorcode">Požadováno: %1$.2fU Doručeno: %2$.2fU Chyba: %3$s</string>
     <string name="firstinsulinincrement">První přídavek inzulínu</string>
     <string name="secondinsulinincrement">Druhý přídavek inzulínu</string>
     <string name="thirdinsulinincrement">Třetí přídavek inzulínu</string>
@@ -963,7 +754,6 @@
     <string name="virtualpump_type">Typ virtuální pumpy</string>
     <string name="virtualpump_definition">Definice pumpy</string>
     <string name="virtualpump_pump_def">Bolus: Krok =%1$s\nProdl. bolus: [Krok=%2$s, Délka=%3$smin-%4$sh]\nBazál: Krok=%5$s\nDoč. bazál: %6$s (%7$s), Délka=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Pouze diskrétní hodnoty a ne rozsahy jsou podporovány pro bazál/bolus ve virtuální pumpě.</string>
     <string name="ns_autobackfill_title">Doplňování glykémií z NS</string>
     <string name="wear_wizard_settings">Nastavení wizardu</string>
     <string name="wear_wizard_settings_summary">Kalkulace použité ve výsledku wizardu:</string>
@@ -994,22 +784,6 @@
     <string name="request">Požadavek</string>
     <string name="insulinsourcesetup">Nastavení inzulínu</string>
     <string name="exit">Konec</string>
-    <string name="danar_useroptions">Uživatelská nastavení</string>
-    <string name="danar_timedisplay">Formát času</string>
-    <string name="danar_buttonscroll">Posun při stisknutí tlačítka</string>
-    <string name="danar_beep">Zvuk při stisknutí tlačítka</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Zvuk</string>
-    <string name="danar_pumpalarm_vibrate">Vibrace</string>
-    <string name="danar_pumpalarm_both">Oboje</string>
-    <string name="danar_screentimeout">Čas před vypnutím displeje [sekundy]</string>
-    <string name="danar_backlight">Podsvícení [sekundy]</string>
-    <string name="danar_glucoseunits">Jednotky</string>
-    <string name="danar_shutdown">Vypnutí [hodiny]</string>
-    <string name="danar_lowreservoir">Nízký stav zásobníku [Jednotky]</string>
-    <string name="danar_saveuseroptions">Uložit do pumpy</string>
-    <string name="option_on">ZAP</string>
-    <string name="option_off">VYP</string>
     <string name="open_navigation">Otevřít menu</string>
     <string name="close_navigation">Zavřít menu</string>
     <string name="nav_plugin_preferences">Nastavení pluginu</string>
@@ -1029,8 +803,6 @@
     <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší cílovou hladinu glukózy</string>
     <string name="combo_invalid_setup">Chybné nastavení pumpy. Projděte si dokumentaci a přesvědčete se, že menu Quick Info se jmenuje QUICK INFO, za použití 360 configuration software.</string>
     <string name="custom">Volitelný</string>
-    <string name="largetimedifftitle">Velký rozdíl v času</string>
-    <string name="largetimediff">Velký rozdíl v času:\nČas v pumpě se liší minimálně o 1,5 h.\nProsím upravte čas v pumpě ručně a vymažte historii pumpy.\nPokud je to třeba, případně pozastavte smyčku alespoň na \"DIA\" hodin.</string>
     <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
     <string name="storedsettingsfound">Nalezeno uložené nastavení</string>
     <string name="allow_hardware_pump_text">POZOR: Pokud aktivuje a připojíte skutečnou pumpu, AndroidAPS nakopíruje (a bude udržovat) nastavení bazálu z aktivního profilu do pumpy. Nastavení bazálu v pumpě bude přepsáno. Pokud si nejste jistí nebo nechcete přepsat bazály v pumpě, stiskněte Zrušit a opakujte přepnutí na jinou pumpu později.</string>
@@ -1056,17 +828,10 @@
     <string name="setupwizard_preferred_aps_mode">Preferovaný režim APS</string>
     <string name="treatments_wizard_total_label">Výsledek</string>
     <string name="calculation_short">Kalk</string>
-    <string name="handshaking">Navazování spojení</string>
     <string name="sendlogfiles">Odešlete dnešní soubory protokolů vývojářům spolu s tímto časem. Neočekávaná situace.</string>
-    <string name="maxbolusviolation">Překročen maximální bolus</string>
-    <string name="commanderror">Chyba příkazu</string>
-    <string name="speederror">Chyba rychlosti</string>
-    <string name="insulinlimitviolation">Překročen limit inzulínu</string>
     <string name="loop_openmode_min_change">Minimální změna pro výzvu [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otevřená smyčka vytvoří novou žádost o změnu pouze v případě, že změna je větší než tato hodnota. Výchozí hodnota je 20 %</string>
-    <string name="pairfirst">Spárujte pumpu s telefonem!</string>
     <string name="searching_for_devices">Vyhledávání zařízení…</string>
-    <string name="please_wait">Počkejte prosím…</string>
     <string name="pairing_completed">Párování dokončeno</string>
     <string name="code_compare">Souhlasí kódy na tomto zařízení a na pumpě?</string>
     <string name="insight_pairing">Insight párování</string>
@@ -1155,7 +920,6 @@
     <string name="isequalorgreater">je rovno nebo větší než</string>
     <string name="isgreater">je větší než</string>
     <string name="isnotavailable">není k dispozici</string>
-    <string name="unknown">neznámý</string>
     <string name="glucoseisnotavailable">Glykémie není k dispozici</string>
     <string name="glucosecomparedmgdl">Glykémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémie %1$s %2$.1f %3$s</string>
@@ -1172,23 +936,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatizace</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Zaznamenávat výměnu senzoru do NS</string>
     <string name="dexcom_lognssensorchange_summary">Vytvořit událost \"Výměna senzoru\" v NS automaticky po spuštění senzoru</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minuta</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">den</string>
-    <string name="unit_week">týden</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">hodin</string>
-    <string name="unit_days">dnů</string>
-    <string name="unit_weeks">týdnů</string>
     <string name="summary_tidepool_username">Vaše uživatelské jméno na Tidepoolu, obvykle vaše e-mailová adresa</string>
     <string name="title_tidepool_username">Uživatelské jméno</string>
     <string name="summary_tidepool_password">Heslo na Tidepoolu</string>
@@ -1231,7 +982,6 @@
     <string name="very_old_version">velmi stará verze</string>
     <string name="new_version_warning">Nová verze je dostupná minimálně %1$d dní! Přepnutí na ochranu před nízkou glykémií po %2$d dnech, vypnutí smyčky po %3$d dnech</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Aplikace Dexcom (upravená)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Příjem hodnot glykémií z upravené aplikace Dexcom.</string>
@@ -1308,15 +1058,12 @@
     <string name="rileylink_scanner_scan_stop">ZASTAVIT</string>
     <string name="rileylink_scanner_selected_device">Vybráno</string>
     <string name="rileylink_scanner_title">Vyhledávání RileyLinku</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy nepodporováno.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth není povoleno.</string>
-    <string name="location_not_found_title">Zjišťování místa není povoleno</string>
-    <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat.</string>
     <string name="location_yes">Povolit</string>
     <string name="location_no">Ne</string>
     <string name="rileylink_scanner_scanning">Vyhledávání</string>
     <string name="rileylink_scanner_scanning_finished">Vyhledávání dokončeno</string>
     <string name="rileylink_scanner_scanning_error">Chyba při vyhledávání: %1$d</string>
+    <string name="common_never">Nikdy</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Nastavení</string>
     <string name="rileylink_settings_tab2">Historie</string>
@@ -1352,7 +1099,6 @@
     <string name="rileylink_error_tuneup_failed">Spojování selhalo</string>
     <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
     <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
-    <string name="rileylink_error_address_not_set_short">Nenastaveno</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omipod</string>
@@ -1422,7 +1168,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikováno omezení bolusu: %2$.2fU na %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Detekována pomalá absorbce sacharidů: %2$d%% času. Překontrolujte kalkulaci. COB může být nadhodnocené, a proto může být započítáno více inzulínu !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Podat tuto část z výsledku kalkulace [%]</string>
     <string name="deliverpartofboluswizard">Kalkulátor provede výpočet, ale dodána je pouze tato část inzulínu. Výhodné při používání SMB algoritmu.</string>
     <string name="loading">Načítání…</string>
@@ -1430,7 +1175,6 @@
     <string name="time_range">Časový rozsah</string>
     <string name="timerange_value">Čas je mezi %1$s a %2$s</string>
     <string name="between">Mezi </string>
-    <string name="close">Zavřít</string>
     <string name="increasingmaxbasal">Zvýšena hodnota maximálního bazálu, protože nastavení je nižší než Vaše maximální hodnota bazální profilu</string>
     <string name="smscommunicator_messagebody">Neplatné tělo zprávy</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1448,8 +1192,8 @@
     <string name="common_off">VYP</string>
     <string name="objectives_button_unfinish">Vymazat dokončeno</string>
     <string name="objectives_button_unstart">Vymazat start</string>
-    <string name="timedetection">Detekce času</string>
     <string name="doyouwantresetstart">Chcete resetovat začátek cíle? Můžete přijít o svůj pokrok.</string>
+    <string name="time_or_timezone_change">Změna času a/nebo časové zóny pumpy</string>
     <string name="nopumpselected">Nevybrána žádná pumpa</string>
     <string name="setupwizard_units_prompt">Vyberte jednotky, ve kterých chcete zobrazit hodnoty</string>
     <string name="ns_ploadlocalprofile">Odeslat změny lokálního profilu do NS</string>
@@ -1474,7 +1218,6 @@
     <string name="nav_survey">Průzkum</string>
     <string name="invalidage">Neplatná položka věku</string>
     <string name="invalidweight">Neplatná položka váhy</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Průměr</string>
     <string name="tdd">CDD</string>
@@ -1487,12 +1230,8 @@
     <string name="randombg_short">GLYK</string>
     <string name="tools">Nástroje</string>
     <string name="show_calculation">Zobrazit kalkulaci</string>
-    <string name="error">Chyba</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Událost automatizace</string>
     <string name="alreadyset">Již nastaveno</string>
-    <string name="message">Zpráva</string>
     <string name="clearqueueconfirm">Vymazat frontu? Všechna data ve frontě budou ztracena!</string>
     <string name="ebstopsloop">Použití funkce prodlouženého bolusu zastaví uzavřenou smyčku po dobu trvání prodlouženého bolusu. Opravdu to chcete?</string>
     <string name="closed_loop_disabled_with_eb">Uzavřená smyčka je zastavena kvůli běžícímu prodlouženému bolusu</string>
@@ -1536,4 +1275,81 @@
     <string name="statuslights">Stavové indikátory</string>
     <string name="statuslights_copy_ns">Zkopírovat nastavení z NS</string>
     <string name="copyexistingvalues">Zkopírovat nastavení NS (existuje-li)?</string>
+    <string name="classic_desrciption">Původní vzhled</string>
+    <string name="buttonson_desrciption">Tlačítka jsou vždy zobrazena v dolní části obrazovky</string>
+    <string name="skin">Vzhled</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integrace pumpy pro Omnipod, vyžaduje zařízení RileyLink (s firmwarem alespoň 2.0).</string>
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Pípnutí při bolusu povoleno</string>
+    <string name="omnipod_config_beep_basal_enabled">Pípnutí při bazálu povoleno</string>
+    <string name="omnipod_config_beep_smb_enabled">Pípnutí při SMB povoleno</string>
+    <string name="omnipod_config_beep_tbr_enabled">Pípnutí při TBR povoleno</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Možnosti ladění podu povoleny</string>
+    <string name="omnipod_config_timechange_enabled">Letní čas / Detekce časového pásma povoleny</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Správa Podu</string>
+    <string name="omnipod_pod_status">Stav Podu</string>
+    <string name="omnipod_reservoir_left">Zbývá %1$.2f U</string>
+    <string name="omnipod_reservoir_over50">Více než 50 U</string>
+    <string name="omnipod_pod_address">Adresa Podu</string>
+    <string name="omnipod_pod_expiry">Expirace Podu</string>
+    <string name="omnipod_pod_name_no_info">Žádné info</string>
+    <string name="omnipod_pod_no_pod_connected">Žádný Pod není připojen</string>
+    <string name="omnipod_pod_not_initalized">Není inicializován</string>
+    <string name="omnipod_pod_active_alerts">Výstrahy aktivního Podu</string>
+    <string name="omnipod_ack_short">Potrvdit upozornění</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat Omnipod, než bude možné tuto funkci použít.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operace není možná.\n\n Je třeba několik minut počkat, dokud se AAPS nepokusí poprvé nastavit profil.</string>
+    <string name="omnipod_error_illegal_init_action_type">Neplatný atribut PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Žádný aktivní Pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Ověření příkazu se nezdařilo.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočekávané chybě. Nahlaste ji! (typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Komunikace selhala: byly přijaty neplatné vstupní parametry.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Komunikace selhala: časový limit vypršel.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikace se nezdařila: došlo k neočekávané chybě. Prosím nahlašte!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Komunikace selhala: ověření integrity zprávy se nezdařilo.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Komunikace selhala: byly přijaty neplatné pakety z podu.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Komunikace selhala: Pod je v chybném stavu.</string>
+    <string name="omnipod_driver_error_invalid_response">Komunikace selhala: byla přijata neplatná odezva z Podu.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikace selhala: od Podu byla přijata zpráva s neplatným pořadovým číslem.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Komunikace selhala: od Podu byla přijata zpráva s neplatnou adresou.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Komunikace selhala: nepodařilo se dekódovat zprávu z Podu.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Komunikace selhala: opaková synchronizace hodnoty Nonce se nezdařila.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikace selhala: hodnota Nonce nebyla synchronizována.</string>
+    <string name="omnipod_driver_error_not_enough_data">Komunikace selhala: nedostatek dat přijatých z Podu.</string>
+    <string name="omnipod_driver_error_pod_fault">Byla zjištěna chyba Podu (%1$03d %2$s). Deaktivujte Pod a spusťte nový.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Komunikace selhala: Pod vrátil chybovou odezvu.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
+    <string name="omnipod_cmd_init_pod">Inicializovat Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Deaktivovat Pod</string>
+    <string name="omnipod_cmd_reset_pod">Resetovat Pod</string>
+    <string name="omnipod_cmd_pod_history">Historie Podu</string>
+    <string name="omnipod_cmd_set_bolus">Nastavit bolsu</string>
+    <string name="omnipod_cmd_cancel_bolus">Zrušit bolus</string>
+    <string name="omnipod_cmd_set_tbr">Nastavit dočasný bazál</string>
+    <string name="omnipod_cmd_cancel_tbr">Zrušit dočasný bazál (interně ovladačem)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Zrušit dočasný bazál (nuceně uživatelem)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Nastavit plán bazálu</string>
+    <string name="omnipod_cmd_get_pod_status">Zjistit stav Podu</string>
+    <string name="omnipod_cmd_get_pod_info">Zjistit informace o Podu</string>
+    <string name="omnipod_cmd_set_time">Nastavit čas</string>
+    <string name="omnipod_cmd_configure_alerts">Konfigurovat výstrahy</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Potvrdit výstrahy</string>
+    <string name="omnipod_cmd_suspend_delivery">Pozastavit dodávání inzulínu</string>
+    <string name="omnipod_cmd_resume_delivery">Obnovit dodávání inzulínu</string>
+    <string name="omnipod_cmd_unknown_entry">Neznámá položka</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, Sach=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Rychlost: %1$.1f U, doba trvání: %2$d min</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovat Pod</string>
+    <string name="omnipod_init_pod_set_basal_profile">Nastavit bazální profil</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivovat Pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index db4a75a29c..f496669e05 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Datenbanken zurücksetzen</string>
     <string name="reset_db_confirm">Möchtest du die Datenbank wirklich zurücksetzen?</string>
     <string name="nav_exit">Schließen</string>
-    <string name="danar_useextended_title">Benutze verzögerten Bolus für hohe TBR &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Blueetooth--Gerät</string>
     <string name="ns_sync_use_absolute_title">Verwende absolute statt prozentuale Basalwerte beim Upload zu NightScout.</string>
     <string name="alert_dialog_storage_permission_text">Bitte starte dein Telefon neu oder starte AndroidAPS in den System-Einstellungen neu.\nAndernfalls wird AndroidAPS nichts protokollieren (wichtig zum Nachverfolgen und Verifizieren, dass der Algorithmus korrekt funktioniert)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Dieses Gerät scheint keine Deaktivierung der Energieoptimierung zu unterstützen - das könnte zu Leistungsproblemen führen.</string>
     <string name="description_actions">Einige Schaltflächen, um auf häufig verwendete Funktionen zugreifen zu können.</string>
-    <string name="description_careportal">Gib erweiterte Tagebuch-Einträge ein.</string>
     <string name="description_config_builder">Dient zum Konfigurieren der aktiven Plugins</string>
     <string name="description_objectives">Das Programm kennenlernen</string>
     <string name="description_food">Zeigt die Essens-Vorlagen aus Nightscout an</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Stellt das Profil zur Verfügung, das in Nightscout definiert ist</string>
     <string name="description_profile_simple">Definiere ein Profil mit nur einem Zeitblock.</string>
     <string name="description_pump_combo">Pumpen-Integration für Accu-Chek Combo Pumpen; erfordert, dass ruffy installiert ist</string>
-    <string name="description_pump_dana_r">Pumpen-Integration für DANA Diabecare R Pumpen</string>
-    <string name="description_pump_dana_r_korean">Pumpen-Integration für koreanische DANA Diabecare R Pumpen</string>
-    <string name="description_pump_dana_r_v2">Pumpen-Integration für DANA Diabecare R Pumpen mit aktualisierter Firmware</string>
-    <string name="description_pump_dana_rs">Pumpen-Integration für Dana Diabecare RS Pumpen</string>
     <string name="description_pump_mdi">Pumpen-Integration für Personen, die täglich mehrere Injektionen für ihre Diabetestherapie vornehmen</string>
     <string name="description_pump_virtual">Pumpen-Integration für Pumpen, die noch nicht über einen Treiber verfügen (Open Loop)</string>
     <string name="description_sensitivity_aaps">Die Sensitivität wird genauso wie bei Oref0 berechnet, aber Du kannst dafür ein Zeitfenster bestimmen. Die minimale Kohlenhydrat-Absorptionsrate wird aus der maximalen Absorptionsdauer aus den Einstellungen abgeleitet.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Überwache und steuere AndroidAPS mit Deiner WearOS-Smartwatch.</string>
     <string name="description_xdrip_status_line">Zeige Loop-Informationen auf Deinem xDrip+-Watchface.</string>
     <string name="description_sms_communicator">Steuere AndroiAPS fern mittels SMS-Anweisungen.</string>
-    <string name="nsprofileview_units_label">Einheiten</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Ziel</string>
-    <string name="noprofileset">KEIN PROFIL GESETZT</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Kohlenhydrate:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Kohlenhydrate</string>
     <string name="treatments_wizard_correction_label">Korr</string>
-    <string name="insulin_unit_shortname">IE</string>
     <string name="treatments_wizard_bolusiob_label">Bolus-IOB</string>
     <string name="openapsma_run">Ausführen</string>
     <string name="vitualpump_label">VIRTUELLE PUMPE</string>
-    <string name="pump_basebasalrate_label">Basis-Basalrate</string>
-    <string name="pump_tempbasal_label">TBR</string>
-    <string name="virtualpump_extendedbolus_label">Verzögerter Bolus</string>
-    <string name="pump_battery_label">Batterie</string>
-    <string name="pump_reservoir_label">Reservoir</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Letzte Ausführung</string>
     <string name="openapsma_inputparameters_label">Eingabeparameter</string>
@@ -96,16 +76,11 @@
     <string name="result">Ergebnis</string>
     <string name="result_insulin_carbs">Ergebnis: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Keine BZ-Werte verfügbar</string>
-    <string name="nochangerequested">Keine Anpassung benötigt</string>
     <string name="openapsma_request_label">Anfrage</string>
-    <string name="rate">Rate</string>
-    <string name="duration">Dauer</string>
-    <string name="reason">Grund</string>
     <string name="glucose">Glukose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Konfiguration</string>
-    <string name="objectives">Zielsetzungen</string>
     <string name="overview">Übersicht</string>
     <string name="nsprofile">Nightscout-Profil</string>
     <string name="simpleprofile">Einfaches Profil</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Allgemein</string>
     <string name="configbuilder_general_description">Dies sind einige generelle Plugins, die Du vielleicht hilfreich findest.</string>
     <string name="configbuilder_constraints_description">Welche Beschränkungen werden angewendet?</string>
-    <string name="days">Tage</string>
     <string name="constraints">Beschränkungen</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Plugin ist deaktiviert</string>
     <string name="constraints_violation">Beschränkungen wurden verletzt oder Limit erreicht.</string>
     <string name="treatmentdeliveryerror">Bolus-Abgabefehler</string>
-    <string name="tempbasaldeliveryerror">TBR Abgabe-Fehler</string>
     <string name="overview_newtempbasal_basalpercent">Basal-Wert [%]</string>
     <string name="setbasalquestion">Akzeptiere neue TBR:</string>
     <string name="overview_treatment_label">Bolus</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Kohlenhydrate</string>
     <string name="changeyourinput">Ändere deine Eingabe!</string>
     <string name="configbuilder_bgsource">BZ-Quelle</string>
     <string name="configbuilder_bgsource_description">Woher soll AndroidAPS seine Blutzuckerwerte beziehen?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">APS-Modus</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
+    <string name="lowglucosesuspend">Unterbrechung bei niedrigem BZ (LGS)</string>
     <string name="disabledloop">Loop deaktiviert</string>
     <string name="disableloop">Deaktiviere Loop</string>
     <string name="enableloop">Aktiviere Loop</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">Basal-IOB</string>
     <string name="bolusconstraintapplied">Bolus-Beschränkung angewendet</string>
     <string name="carbsconstraintapplied">Kohlenhydrat-Beschränkung erreicht</string>
-    <string name="careportal_bgcheck">BZ Test</string>
-    <string name="careportal_announcement">Ankündigung</string>
-    <string name="careportal_note">Notiz</string>
-    <string name="careportal_question">Frage</string>
-    <string name="careportal_exercise">Bewegung</string>
-    <string name="careportal_pumpsitechange">Pumpenkatheter Wechsel</string>
-    <string name="careportal_cgmsensorinsert">CGM-Sensor gesetzt</string>
-    <string name="careportal_cgmsensorstart">CGM-Sensor Start</string>
-    <string name="careportal_insulincartridgechange">Insulinreservoir Wechsel</string>
-    <string name="careportal_profileswitch">Profilwechsel</string>
-    <string name="careportal_snackbolus">Snack Bolus</string>
-    <string name="careportal_mealbolus">Mahlzeiten Bolus</string>
-    <string name="careportal_correctionbolus">Korrektur Bolus</string>
-    <string name="careportal_combobolus">Combo Bolus</string>
-    <string name="careportal_tempbasalstart">TBR Start</string>
-    <string name="careportal_tempbasalend">TBR Ende</string>
-    <string name="careportal_carbscorrection">Kohlenhydrat Korrektur</string>
-    <string name="careportal_openapsoffline">OpenAPS offline</string>
-    <string name="careportal_newnstreatment_eventtype">Ereignistyp</string>
     <string name="careportal_newnstreatment_other">Anderes</string>
     <string name="careportal_newnstreatment_meter">Messgerät</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">Dieser Wert wird \"max basal\" in OpenAPS genannt.</string>
     <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
     <string name="openapsma_maxiob_summary">Maximale Menge von nicht Bolus-IOB, die OpenAPs abgeben kann.</string>
-    <string name="dismiss">VERWERFEN</string>
     <string name="password_preferences_encrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die exportierten Einstellungen verschlüsselt.</string>
     <string name="password_preferences_decrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die importierten Einstellungen entschlüsselt.</string>
     <string name="preferences_export_canceled">Export abgebrochen! Einstellungen wurden NICHT exportiert!</string>
     <string name="preferences_import_canceled">Import abgebrochen! Einstellungen wurden NICHT importiert!</string>
+    <string name="preferences_import_list_title">Wähle die zu importierende Datei</string>
     <string name="check_preferences_before_import">Überprüfe die Einstellungen vor dem Import:</string>
     <string name="check_preferences_cannot_import">Einstellungen können nicht importiert werden!</string>
     <string name="check_preferences_dangerous_import">Einstellungen sollten nicht importiert werden!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Du verwendest das veraltete Format einer alten AAPS-Version das nicht sicher ist! Verwende dieses nur als letzte Möglichkeit, wenn Du keinen Export im aktuellen JSON-Format hast.</string>
     <string name="metadata_warning_old_export">Die importierten Einstellungen sind bereits %1$s Tage alt! Hast Du aktuellere Einstellungen oder evtl. die falsche Datei gewählt? Denke daran, die Einstellungen regelmäßig zu exportieren.</string>
     <string name="metadata_warning_date_format">Ungültiges Datums-/Zeitformat!</string>
+    <string name="metadata_warning_different_version">Einstellungen stammen aus einer Vorgängerversion (Nebenversion). Du kannst diese importieren, prüfe aber unbedingt nach dem Import, ob diese noch korrekt sind!</string>
+    <string name="metadata_urgent_different_version">Einstellungen stammen aus einer Vorgängerversion (Hauptversion). Hauptversionen unterscheiden sich deutlich und die Einstellungen können daher nicht kompatibel sein! Prüfe nach dem Import unbedingt, ob diese noch korrekt sind!</string>
     <string name="metadata_label_format">Dateiformat</string>
     <string name="metadata_label_created_at">Erstellt am</string>
     <string name="metadata_label_aaps_version">AAPS-Version</string>
@@ -256,34 +212,17 @@
     <string name="prefdecrypt_issue_wrong_pass">Entschlüsselungsfehler. Das angegebene Passwort ist ungültig oder die Einstellungsdatei wurde verändert! Evtl. wurde die importierte Datei mit einem anderen Master-Passwort exportiert.</string>
     <string name="prefdecrypt_issue_wrong_format">Fehlende Verschlüsselungskonfiguration, Einstellungsformat ist ungültig!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nicht unterstützter oder nicht angegebener Verschlüsselungsalgorithmus!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Verbinden</string>
-    <string name="connected">Verbunden</string>
-    <string name="disconnected">Getrennt</string>
-    <string name="danar_pump_settings">Dana Pumpen-Einstellungen</string>
+    <string name="exported_today">Heute exportiert</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">Vor %1$s Tagen exportiert</string>
+    <string name="exported_at" comment="at placeholder we add export date">am %1$s exportiert</string>
+    <string name="exported_less_than_hour_ago">vor weniger als einer Stunde exportiert</string>
+    <string name="in_directory" comment="placeholder is for exported file path">in Verzeichnis: %1$s</string>
     <string name="end_user_license_agreement">Endbenutzervereinbarung</string>
     <string name="end_user_license_agreement_text">DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNEHMEN SIE ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN.</string>
     <string name="end_user_license_agreement_i_understand">Ich verstehe und stimme zu.</string>
     <string name="save">Speichern</string>
-    <string name="nobtadapter">Kein Bluetooth-Adapter gefunden</string>
-    <string name="devicenotfound">Ausgewähltes Gerät nicht gefunden</string>
-    <string name="connectionerror">Pumpen-Verbindungsfehler</string>
-    <string name="danar_iob_label">Pumpen-IOB</string>
-    <string name="danar_dailyunits">Tägliche Einheiten</string>
-    <string name="pump_lastbolus_label">Letzter Bolus:</string>
-    <string name="hoursago">vor %1$.1f Stunde</string>
-    <string name="danar_invalidinput">Ungültige Eingabedaten</string>
-    <string name="danar_valuenotsetproperly">Wert nicht korrekt gesetzt</string>
     <string name="reloadprofile">Profil neuladen</string>
-    <string name="danar_viewprofile">Profil anzeigen</string>
-    <string name="enacted">Ausgeführt</string>
-    <string name="comment">Kommentar</string>
-    <string name="success">Erfolgreich</string>
-    <string name="percent">Prozent</string>
-    <string name="absolute">Absolut</string>
-    <string name="canceltemp">TBR abbrechen</string>
     <string name="smscommunicator">SMS-Kommunikator</string>
-    <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smscommunicator_allowednumbers">Erlaubte Telefonnummern</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
@@ -304,54 +243,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Ziel %1$s für %2$d Minuten</string>
     <string name="smscommunicator_tt_set">Ziel %1$s für %2$d Minuten erfolgreich gesetzt.</string>
     <string name="smscommunicator_tt_canceled">Temporäres Ziel wurde erfolgreich abgebrochen</string>
-    <string name="bolusdelivering">Gebe %1$.2fIE ab</string>
     <string name="smscommunicator_remotecommandsallowed">Erlaube externe Befehle per SMS</string>
-    <string name="glucosetype_finger">Finger</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manuell</string>
-    <string name="careportal_temporarytarget">Temporäres Ziel</string>
-    <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
     <string name="danarprofile">DanaR Profil-Einstellungen</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Dauer der Insulinwirkung</string>
-    <string name="failedupdatebasalprofile">Fehler beim Aktualisieren des Basalprofils</string>
-    <string name="danar_historyreload">Neu laden</string>
     <string name="uploading">Hochladen</string>
-    <string name="danar_ebolus">E-Bolus</string>
-    <string name="danar_dsbolus">DS-Bolus</string>
-    <string name="danar_debolus">DE-Bolus</string>
-    <string name="danar_error">Fehler</string>
-    <string name="danar_refill">Befüllen</string>
-    <string name="danar_basalhour">Basal-Stunde</string>
-    <string name="danar_glucose">Glukose</string>
-    <string name="danar_carbohydrate">Kohlenhydrate</string>
-    <string name="danar_alarm">Alarm</string>
-    <string name="danar_totaluploaded">Insgesamt %1$d Einträge hochgeladen</string>
-    <string name="danar_sbolus">S-Bolus</string>
-    <string name="danar_history_alarm">Alarme</string>
-    <string name="danar_history_basalhours">Basal-Stunden</string>
-    <string name="danar_history_bolus">Boli</string>
-    <string name="danar_history_carbohydrates">Kohlenhydrate</string>
-    <string name="danar_history_dailyinsulin">Insulin-Tagesmengen</string>
-    <string name="danar_history_errors">Fehler</string>
-    <string name="danar_history_glucose">Glukose</string>
-    <string name="danar_history_refill">Füllmenge</string>
-    <string name="danar_history_syspend">Unterbrechungen</string>
-    <string name="danar_history_connectingfor">Verbindungsaufbau seit %1$d s</string>
-    <string name="danar_password_title">Pumpen-Passwort</string>
-    <string name="wrongpumppassword">Falsches Pumpen-Passwort!</string>
-    <string name="pumpbusy">Pumpe ist beschäftigt</string>
-    <string name="overview_bolusprogress_delivered">Abgegeben</string>
-    <string name="overview_bolusprogress_stoped">Gestoppt</string>
     <string name="bolusstopped">Bolus gestoppt</string>
     <string name="bolusstopping">Bolus wird gestoppt</string>
-    <string name="occlusion">Verstopfung</string>
-    <string name="overview_bolusprogress_stop">Stopp</string>
-    <string name="overview_bolusprogress_stoppressed">STOPP GEDRÜCKT</string>
-    <string name="waitingforpump">Warte auf Pumpe</string>
-    <string name="overview_bolusprogress_goingtodeliver">Werde %1$.2fIE abgeben</string>
-    <string name="youareonallowedlimit">Limit erreicht</string>
-    <string name="noprofileselected">Kein Profil ausgewählt</string>
     <string name="smscommunicator_loophasbeendisabled">Loop wurde deaktiviert.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop wurde aktiviert</string>
     <string name="smscommunicator_loopisdisabled">Loop ist deaktiviert.</string>
@@ -391,11 +289,9 @@
     <string name="mealbolus">Essensbolus</string>
     <string name="correctionbous">Korr</string>
     <string name="actions">Aktionen</string>
-    <string name="androidaps_start">AndroidAPS gestartet</string>
     <string name="ns_upload_only">Zu Nightscout nur hochladen (keine Synchronisation)</string>
     <string name="ns_upload_only_summary">Zu Nightscout nur hochladen. Nicht wirksam bei BZ-Werten, wenn nicht eine lokale Quelle wie z. B. xDrip gewählt wird; nicht wirksam bei Profilen, wenn Nightscout-Profile verwendet werden.</string>
     <string name="pumpNotInitialized">Pumpe nicht initialisiert!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pumpe nicht initialisiert, Profil nicht gesetzt!</string>
     <string name="primefill">Katheterwechsel</string>
     <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
     <string name="othersettings_title">Andere</string>
@@ -405,8 +301,6 @@
     <string name="button3">Schaltfläche 3</string>
     <string name="units_colon">Einheiten:</string>
     <string name="units">Einheiten</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">Zielbereich:</string>
     <string name="prefs_range_title">Zielbereich für die Grafikanzeige</string>
@@ -416,17 +310,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Alle Daten erneut senden</string>
     <string name="open_settings_on_wear">Öffne Einstellungen auf der Uhr</string>
-    <string name="pumperror">Pumpenfehler</string>
-    <string name="lowbattery">Niedriger Batteriestand</string>
-    <string name="pumpshutdown">Pumpe stoppen</string>
-    <string name="batterydischarged">Pumpenbatterie entladen</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Basalrate:</string>
-    <string name="profile_set_failed">Setzen des Basal-Profils fehlgeschlagen</string>
-    <string name="profile_set_ok">Basal-Profil in der Pumpe aktualisiert</string>
-    <string name="danar_disableeasymode">EasyUI-Modus in der Pumpe deaktivieren</string>
-    <string name="danar_enableextendedbolus">Aktiviere verzögerten Bolus in der Pumpe.</string>
-    <string name="danar_switchtouhmode">Wechsel den Modus von IE/d zu IE/h in der Pumpe</string>
     <string name="basalvaluebelowminimum">Wert der Basalrate unter Minimum. Profil nicht gesetzt!</string>
     <string name="sms_actualbg">BZ:</string>
     <string name="sms_lastbg">Letzter BZ:</string>
@@ -434,7 +318,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Anhaltende Benachrichtigung</string>
     <string name="old_data">VERALTETE DATEN</string>
-    <string name="minago">%1$d min her</string>
     <string name="sms_minago">%1$d\' her</string>
     <string name="localprofile">Lokales Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +333,22 @@
     <string name="hypo">Hypo</string>
     <string name="activity">Aktivität</string>
     <string name="removerecord">Eintrag löschen</string>
-    <string name="danar_stats">DanaR Statistiken</string>
-    <string name="danar_stats_cumulative_tdd">Kumulative TDD</string>
-    <string name="danar_stats_expweight">Exponentiell gewichtete TDD</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Datum</string>
-    <string name="danar_stats_ratio">Verhältnis</string>
-    <string name="danar_stats_amount_days"># Tage</string>
-    <string name="danar_stats_weight">Gewichtung</string>
-    <string name="danar_stats_warning_Message">Möglicherweise ungenau, wenn zum Befüllen ein Bolus verwendet wurde!</string>
-    <string name="danar_stats_olddata_Message">Veraltete Daten, bitte klicke auf \"NEU LADEN\"</string>
-    <string name="danar_stats_tbb">Tägl. Basalmenge</string>
-    <string name="danar_stats_tbb2">Tägl. Basalmenge * 2</string>
-    <string name="initializing">Initialisierung &#8230;</string>
     <string name="actions_shortname">AKT</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">EP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VP</string>
     <string name="profileviewer_shortname">PROF</string>
     <string name="treatments_shortname">BEH</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">ZIEL</string>
     <string name="wear_shortname">UHR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Kurze Tab-Überschriften</string>
     <string name="always_use_shortavg">Verwende immer das kurze durchschnittliche Delta statt des einfachen Deltas</string>
     <string name="always_use_shortavg_summary">Das ist sinnvoll, wenn die Daten von einer ungefilterten Quelle Signalrauschen haben.</string>
-    <string name="advancedsettings_title">Erweiterte Einstellungen</string>
-    <string name="danar_model">Modell: %1$02X Protokoll: %2$02X Code: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Standardwert: 3\nDies ist eine wichtige Sicherheitseinstellung. Sie begrenzt das maximale Basal-IOB auf die dreifache Menge (im Standardfall) deiner größten Basalrate. In der Regel solltest Du diesen Wert nicht ändern. Aber Du solltest wissen, was \"3x max daily, 4x current\" als Sicherheitseinstellung bedeutet.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt das Basal-IOB auf die (im Standardfall) vierfache Menge der aktuellen Basalrate. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">Kalibrierung gesendet. Das Empfangen von Kalbrierungen muss in xDrip+ aktiviert sein.</string>
     <string name="smscommunicator_calibrationfailed">xDrip+ hat die Kalbrierung nicht erhalten</string>
     <string name="pumpsuspended">Pumpe pausiert</string>
-    <string name="gettingpumpstatus">Pumpenstatus wird geladen</string>
-    <string name="settingtempbasal">TBR wird gesetzt</string>
-    <string name="stoppingtempbasal">TBR wird abgebrochen</string>
-    <string name="settingextendedbolus">Verzögerter Bolus wird gesetzt</string>
-    <string name="stoppingextendedbolus">Verzögerter Bolus wird abgebrochen</string>
-    <string name="updatingbasalrates">Basal-Profil wird aktualisiert</string>
-    <string name="disconnecting">Verbindung wird getrennt</string>
     <string name="executing">Wird ausgeführt</string>
     <string name="virtualpump_settings">Einstellungen der virtuellen Pumpe</string>
     <string name="virtualpump_uploadstatus_title">Status zu Nightscout hochladen</string>
-    <string name="wrongpassword">Falsches Passwort</string>
-    <string name="approachingdailylimit">Tagesinsulin-Limit wird bald erreicht</string>
     <string name="nsclientinternal">Nightscout-Client</string>
     <string name="nsclientinternal_shortname">NSCl</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">Zeige detailliertes IOB</string>
     <string name="wear_detailedIOB_summary">Differenziere IOB in Bolus- und Basal-IOB auf dem Watchface</string>
     <string name="nosuccess">Nicht erfolgreich - bitte Telefon prüfen</string>
-    <string name="notavailable">Nicht verfügbar</string>
+    <string name="notavailable">nicht verfügbar</string>
     <string name="patientage">Patientenalter</string>
     <string name="child">Kind</string>
     <string name="teenage">Teenager</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Logge App-Start in Nightscout</string>
     <string name="restartingapp">App wird beendet, um neue Einstellungen zu laden.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulin</string>
     <string name="configbuilder_insulin_description">Welchen Insulin-Typ verwendest Du?</string>
     <string name="fastactinginsulin">Schnell wirkendes Insulin</string>
     <string name="fastactinginsulincomment">NovoRapid, NovoLog, Humalog</string>
@@ -598,9 +451,6 @@
     <string name="statuslights_bat_critical">Warnschwelle kritischer Batteriestand [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Letzte Verbindung</string>
-    <string name="danar_bluetooth_status">Bluetooth-Status</string>
     <string name="nav_about">Über</string>
     <string name="smscommunicator_missingsmspermission">SMS-Steuerung nicht erlaubt</string>
     <string name="smscommunicator_missingphonestatepermission">Fehlende Berechtigung für den Zugriff auf den Telefonstatus</string>
@@ -611,17 +461,12 @@
     <string name="wear_showbgi_summary">Füge BGI zur Statuszeile hinzu.</string>
     <string name="ns_noupload">Kein Upload zu Nightscout</string>
     <string name="ns_noupload_summary">Alle an Nightscout gesendeten Daten werden verworfen. AAPS ist verbunden, aber Nightscout-Daten werden nicht geändert.</string>
-    <string name="basal_step">Basal-Schritt</string>
-    <string name="bolus_step">Bolus-Schritt</string>
     <string name="overview_extendedbolus_cancel_button">Verzögerten Bolus abbrechen</string>
     <string name="careportal_sensorage_label">Sensoralter</string>
     <string name="careportal_canulaage_label">Katheteralter</string>
     <string name="careportal_insulinage_label">Insulinalter</string>
-    <string name="hours">Stunden</string>
-    <string name="invalidprofile">Ungültiges oder defektes Profil!</string>
     <string name="doprofileswitch">Profilwechsel durchführen</string>
     <string name="careportal_pbage_label">Batteriealter</string>
-    <string name="careportal_pumpbatterychange">Pumpenbatterie Wechsel</string>
     <string name="ns_alarmoptions">Alarm-Optionen</string>
     <string name="nsalarm_urgenthigh">Sehr hoch</string>
     <string name="nsalarm_high">Hoch</string>
@@ -645,7 +490,6 @@
     <string name="absorptionsettings_title">Resorptions-Einstellungen</string>
     <string name="absorption_maxtime_title">Maximale Essens-Resorptionszeit [h]</string>
     <string name="absorption_maxtime_summary">Zeit in Stunden, in der zu erwarten ist, dass alle Kohlenhydrate resorbiert sein werden.</string>
-    <string name="danar_visualizeextendedaspercentage_title">Zeige verzögerten Bolus als %% an.</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -670,7 +514,6 @@
     <string name="careportal_pump_label">PUMPE</string>
     <string name="careportal_newnstreatment_duration_min_label">Dauer [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Aktiviere UAM</string>
     <string name="enablesmb">Aktiviere SMB</string>
     <string name="enablesmb_summary">Benutze Super-Mikro-Boli anstelle von temporären Basalraten, um eine schnellere Wirkung zu erreichen.</string>
@@ -682,23 +525,7 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">DIA von %1$f ist zu kurz - AAPS nutzt stattdessen %2$f!</string>
     <string name="activate_profile">Aktiviere Profil</string>
-    <string name="date">Datum</string>
     <string name="invalid">Ungültig</string>
-    <string name="waitingforpairing">Auf Verbindung warten</string>
-    <string name="pairingok">Pairing OK</string>
-    <string name="pairingtimedout">Zeitüberschreitung beim Pairing</string>
-    <string name="pairing">Koppeln</string>
-    <string name="danars_nodeviceavailable">Pumpe noch nicht gefunden</string>
-    <string name="emptyreservoir">Reservoir leer</string>
-    <string name="bloodsugarmeasurementalert">Alarm BZ-Messung</string>
-    <string name="remaininsulinalert">Restinsulin</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Ausgewählte Pumpe</string>
-    <string name="pairpump">Verbinde neue Pumpe</string>
-    <string name="bolusspeed">Bolus-Geschwindigkeit</string>
-    <string name="danar_setbasalstep001">Setze Basalschritt auf 0.01 IE/h</string>
-    <string name="serialnumber">Seriennummer</string>
     <string name="careportal_newnstreatment_percentage_label">Prozentsatz</string>
     <string name="careportal_newnstreatment_timeshift_label">Zeitverschiebung</string>
     <string name="default_temptargets">Vordefinierte temporäre Ziele</string>
@@ -708,32 +535,18 @@
     <string name="activity_target">Aktivitäts-Zielwert</string>
     <string name="hypo_duration">Hypo-Dauer</string>
     <string name="hypo_target">Hypo - Zielwert</string>
-    <string name="danar_history_prime">Füllen</string>
-    <string name="gettingextendedbolusstatus">Status des verzögerten Bolus wird ermittelt</string>
-    <string name="gettingbolusstatus">Status des Bolus wird ermittelt</string>
-    <string name="gettingtempbasalstatus">Status der TBR wird ermittelt</string>
-    <string name="gettingpumpsettings">Pumpen-Einstellungen werden ermittelt</string>
-    <string name="gettingpumptime">Zeiteinstellung der Pumpe wird ermittelt</string>
     <string name="reuse">Erneut verwenden</string>
     <string name="wearcontrol_title">Steuerung durch die Uhr</string>
     <string name="wearcontrol_summary">Setze temporäre Ziele und Behandlungen mit der Uhr</string>
-    <string name="connectiontimedout">Zeitüberschreitung der Verbindung</string>
     <string name="food">Essen</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">min</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<nichts>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Prot</string>
     <string name="shortfat">Ft</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
-    <string name="waitingforestimatedbolusend">Warte auf Ende der Bolus-Abgabe. %1$d sec verbleiben.</string>
-    <string name="processinghistory">Ereignis wird verarbeitet</string>
-    <string name="startingbolus">Bolus-Abgabe gestartet</string>
     <string name="executingrightnow">Befehl wird zurzeit ausgeführt</string>
-    <string name="pumpdrivercorrected">Pumpen-Treiber korrigiert</string>
     <string name="pump_unreachable">Pumpe ist nicht erreichbar</string>
     <string name="missed_bg_readings">BZ-Werte fehlen</string>
     <string name="raise_notifications_as_android_notifications">Benutze Systemmeldungen für Alarme und Meldungen</string>
@@ -743,9 +556,6 @@
     <string name="pump_unreachable_threshold">Grenzwert Pumpe ist nicht erreichbar [min]</string>
     <string name="urgent_alarm">Wichtiger Alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Deaktiviert Bluetooth kurzzeitig, falls keine Verbindung zur Pumpe besteht. Dies kann für Smartphones mit Verbindungsproblemen nützlich sein.</string>
     <string name="eversense">Eversense App (gepatcht)</string>
     <string name="dexcomg5_nsupload_title">Speichere BZ-Werte in Nightscout</string>
     <string name="bgsource_upload">BZ Upload Einstellungen</string>
@@ -757,12 +567,9 @@
     <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
     <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
     <string name="carbsReqThreshold">Schwellenwert für KH-Empfehlung</string>
-    <string name="unsupportedfirmware">Nicht unterstützte Pumpen-Firmware</string>
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
-    <string name="minimalbasalvaluereplaced">Basal-Wert wurde durch den kleinst möglichen Wert ersetzt: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Basal-Wert wurde durch größt möglichen Wert ersetzt: %1$s</string>
     <string name="overview_editquickwizard_usebg">BZ Berechnung</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus-IOB Berechnung</string>
     <string name="overview_editquickwizard_usebasaliob">Basal-IOB Berechnung</string>
@@ -780,8 +587,6 @@
     <string name="closedmodeenabled">Closed mode aktiviert</string>
     <string name="maxiobset">Maximales IOB richtig gesetzt</string>
     <string name="hasbgdata">BZ verfügbar von gewählter Quelle</string>
-    <string name="basalprofilenotaligned">Basalraten beginnen nicht zur vollen Stunde: %1$s</string>
-    <string name="zerovalueinprofile">Ungültiges Profil: %1$s</string>
     <string name="combo_programming_bolus">Bolusabgabe wird vorbereitet</string>
     <string name="combo_refresh">Aktualisieren</string>
     <string name="combo_pump_state_label">Status</string>
@@ -802,7 +607,6 @@
     <string name="bolus_frequency_exceeded">Ein gleich großer Bolus wurde in den letzten zwei Minuten angefordert. Dies ist nicht zulässig, um ungewollte Doppelboli zu verhindern und vor eventuellen Bugs zu schützen.</string>
     <string name="combo_pump_connected_now">Jetzt</string>
     <string name="combo_activity_reading_pump_history">Historie wird gelesen</string>
-    <string name="danar_history">Pumpen Historie</string>
     <string name="combo_activity_setting_basal_profile">BR-Profil wird aktualisiert.</string>
     <string name="combo_pump_cartridge_low_warrning">Das Reservoir in der Pumpe ist fast leer</string>
     <string name="combo_pump_battery_low_warrning">Die Batterie in der Pumpe ist fast leer</string>
@@ -821,9 +625,6 @@
     <string name="extendedbolusdeliveryerror">Fehler bei der Abgabe eines verzögerten Bolus</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">her</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d mins</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">SMB immer aktivieren</string>
     <string name="enablesmbalways_summary">Aktiviere SMB immer, unabhängig von Boli. Dies ist nur möglich, wenn eine BZ-Quelle genutzt wird, die die Daten besonders gut filtert wie z. B. G5.</string>
     <string name="enablesmbaftercarbs">Aktiviere SMB nach Mahlzeiten.</string>
@@ -834,8 +635,6 @@
     <string name="enablesmbwithtemptarget_summary">Aktiviere SMB, wenn ein temporäres Ziel aktiv ist (bald essen, Aktivität)</string>
     <string name="enablesmbwithhightemptarget">Aktiviere SMB bei temporären Zielen oberhalb des regulären Ziels</string>
     <string name="enablesmbwithhightemptarget_summary">Aktiviere SMB bei temporären Zielen oberhalb des regulären Ziels (Aktivität).</string>
-    <string name="let_temp_basal_run">Temporäre Basalrate aktiv lassen</string>
-    <string name="mute">Alarm stoppen</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Kohlenhydrate</string>
     <string name="overview_buttons_selection">Schaltflächen</string>
@@ -877,7 +676,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Entwickler-Version, Closed Loop ist nicht verfügbar.</string>
     <string name="engineering_mode_enabled">Entwickler-Modus aktiviert</string>
     <string name="not_eng_mode_or_release">Entwickler-Modus nicht aktiviert und keine Release-Version</string>
-    <string name="pump_basebasalrate">%1$.2f IE/h</string>
     <string name="combo_actvity_reading_basal_profile">Basalratenprofil wird gelesen</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Nach der Berechnung des Bolus hat sich die Pumpenhistorie geändert. Daher wurde kein Bolus abgegeben. Bitte prüfe, ob überhaupt noch ein Bolus benötigt wird.</string>
     <string name="combo_error_updating_treatment_record">Der Bolus wurde erfolgreich abgegeben, aber nicht als Behandlungseintrag gespeichert. Dies kann passieren, wenn zwei kleine, gleich große Boli innerhalb von zwei Minuten verabreicht werden. Bitte überprüfe die Pumpenhistorie und Behandlungseinträge. Verwende das Careportal, um fehlende Einträge hinzuzufügen. Stelle sicher, dass keine Einträge für genau dieselbe Minute und dieselbe Menge hinzugefügt werden.</string>
@@ -900,15 +698,10 @@
     <string name="smbdisabledinpreferences">SMB in Einstellungen deaktiviert</string>
     <string name="uamdisabledinpreferences">UAM in Einstellungen deaktiviert</string>
     <string name="uamdisabledoref1notselected">UAM deaktiviert, da diese auf die Oref1 Empfindlichkeitserkennung angewiesen sind.</string>
-    <string name="limitingbasalratio">Begrenzung der max. Basalrate auf %1$.2f IE/h wegen %2$s</string>
-    <string name="pumplimit">Limit der Pumpe</string>
-    <string name="itmustbepositivevalue">Es muss ein positiver Wert sein.</string>
     <string name="maxbasalmultiplier">max basal multiplier</string>
     <string name="maxdailybasalmultiplier">max daily basal multiplier</string>
     <string name="smb_frequency_exceeded">Aufgrund eines Bolus in den letzten 3 Minuten wird kein SMB abgegeben.</string>
     <string name="basal_set_correctly">Basalrate richtig eingestellt</string>
-    <string name="limitingpercentrate">Begrenzung des max. Prozentsatzes auf %1$d%% wegen %2$s</string>
-    <string name="limitingbolus">Begrenze Bolusmenge auf %1$.1f IE wegen %2$s</string>
     <string name="limitingextendedbolus">Begrenze verzögerten Bolus auf %1$.1f IE wegen %2$s</string>
     <string name="limitingmaxiob">Begrenze max. IOB auf %1$.1f IE wegen %2$s</string>
     <string name="limitingcarbs">Begrenze Kohlenhydrate auf %1$d g wegen %2$s</string>
@@ -923,7 +716,6 @@
     <string name="smbnotallowedinopenloopmode">SMB sind im Open Loop Modus nicht erlaubt</string>
     <string name="food_short">Essen</string>
     <string name="reset">Zurücksetzen</string>
-    <string name="waitingfortimesynchronization">Warte auf Zeitsynchronisierung (%1$d Sek.)</string>
     <string name="loopdisconnectedfor">Getrennt (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Maximales Gesamt-IOB, das nicht überschritten werden darf [IE]</string>
     <string name="openapssmb_maxiob_summary">Diesen Wert nennt OpenAPS MaxIOB.\nSolange dieser Wert überschritten wird, wird AndroidAPS kein Insulin abgeben.</string>
@@ -939,7 +731,6 @@
     <string name="nav_setupwizard">Einrichtungsassistent</string>
     <string name="setupwizard_finish">FERTIG</string>
     <string name="setupwizard_language_prompt">Wähle Deine Sprache.</string>
-    <string name="boluserrorcode">Angefragt: %1$.2f IE. Abgegeben: %2$.2f IE. Fehlercode: %3$s</string>
     <string name="firstinsulinincrement">Erste Insulin-Erhöhung</string>
     <string name="secondinsulinincrement">Zweite Insulin-Erhöhung</string>
     <string name="thirdinsulinincrement">Dritte Insulin-Erhöhung</string>
@@ -962,7 +753,6 @@
     <string name="virtualpump_type">Typ der virtuellen Pumpe</string>
     <string name="virtualpump_definition">Pumpen-Definition</string>
     <string name="virtualpump_pump_def">Bolus: Schritt=%1$s\nVerzögerter Bolus: [Schritt=%2$s, Dauer=%3$smin-%4$sh]\nBasal: Schritt=%5$s\nTBR: %6$s (bei %7$s), Dauer=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Bei der virtuellen Pumpe können nur einzelne Werte und keine Bereiche zur Festlegung der Basal/Bolus-Granularität gewählt werden.</string>
     <string name="ns_autobackfill_title">BZ automatisch auffüllen</string>
     <string name="wear_wizard_settings">Wizard-Einstellungen</string>
     <string name="wear_wizard_settings_summary">Berechnungen, die im Assistenten berücksichtigt werden:</string>
@@ -993,22 +783,6 @@
     <string name="request">Anfordern</string>
     <string name="insulinsourcesetup">Insulin-Plugin konfigurieren</string>
     <string name="exit">Verlassen</string>
-    <string name="danar_useroptions">Benutzerdefinierte Einstellungen</string>
-    <string name="danar_timedisplay">Zeitmodus</string>
-    <string name="danar_buttonscroll">Scrollfunktion</string>
-    <string name="danar_beep">Piepen (Tastentöne)</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Töne</string>
-    <string name="danar_pumpalarm_vibrate">Vibration</string>
-    <string name="danar_pumpalarm_both">Beides</string>
-    <string name="danar_screentimeout">LCD-Einschaltdauer [Sek.]</string>
-    <string name="danar_backlight">Einschaltdauer Hintergrundbeleuchtung [Sek.]</string>
-    <string name="danar_glucoseunits">BZ-Einheit</string>
-    <string name="danar_shutdown">Abschalten (Std.)</string>
-    <string name="danar_lowreservoir">Reservoir fast leer (IE)</string>
-    <string name="danar_saveuseroptions">In Pumpe speichern</string>
-    <string name="option_on">Ein</string>
-    <string name="option_off">Aus</string>
     <string name="open_navigation">Menü öffnen</string>
     <string name="close_navigation">Menü schließen</string>
     <string name="nav_plugin_preferences">Plugin-Einstellungen</string>
@@ -1028,8 +802,6 @@
     <string name="sensitivity_raises_target_summary">Wenn eine höhere Empfindlichkeit festgestellt wird, wird der Glukose-Zielwert erhöht.</string>
     <string name="combo_invalid_setup">Ungültige Pumpen-Einstellungen. Lies das Wiki und stelle mit der 360° Konfigurations-Software sicher, dass das Quick-Info-Menü \"QUICK INFO\" heißt.</string>
     <string name="custom">Benutzerdefiniert</string>
-    <string name="largetimedifftitle">Große Zeitdifferenz</string>
-    <string name="largetimediff">Großer Zeitunterschied:\nDie Zeit in der Pumpe weicht um mindestens 1,5 Stunden ab.\nPasse die Zeit auf der Pumpe manuell an und lösche zuvor - falls möglich - die Pumpenhistorie.\nAlternativ kannst Du den Loop für die Stunden der Insulinwirkzeit (DIA) deaktivieren.</string>
     <string name="careportal_removestartedevents">\"AndroidAPS gestartet\" Ereignisse löschen</string>
     <string name="storedsettingsfound">Gespeicherte Einstellungen gefunden</string>
     <string name="allow_hardware_pump_text">WARNUNG: Wenn Du eine echte Pumpe aktivierst und anschließt, kopiert AndroidAPS die Basaleinstellungen vom aktiven Profil zur Pumpe (und behält sie bei). Die Einstellungen in der Pumpe werden hierbei überschrieben. Wenn Du Dir nicht sicher bist oder die Basaleinstellungen in der Pumpe nicht überschreiben möchten, drücke \"Abbrechen\" und vollziehe den Wechsel zur Pumpe später.</string>
@@ -1055,18 +827,11 @@
     <string name="setupwizard_preferred_aps_mode">Bevorzugter APS-Modus</string>
     <string name="treatments_wizard_total_label">Gesamt</string>
     <string name="calculation_short">Berech.</string>
-    <string name="handshaking">Handshaking</string>
     <string name="sendlogfiles">Sende die heutigen Logdateien unter Angabe dieser Uhrzeit an die Entwickler.
 Unerwartetes Verhalten.</string>
-    <string name="maxbolusviolation">Max. Bolus überschritten</string>
-    <string name="commanderror">Fehler bei Befehl</string>
-    <string name="speederror">Geschwindigkeits-Fehler</string>
-    <string name="insulinlimitviolation">Insulin-Beschränkung verletzt</string>
     <string name="loop_openmode_min_change">Minimaler Wert zur Anfrage einer Änderung [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop schlägt neue Änderungen nur dann vor, wenn die Änderung größer als dieser Wert ist. Der Standard-Wert ist 20%.</string>
-    <string name="pairfirst">Bitte kopple deine Pumpe mit deinem Telefon!</string>
     <string name="searching_for_devices">Geräte werden gesucht…</string>
-    <string name="please_wait">Bitte warten…</string>
     <string name="pairing_completed">Pairing abgeschlossen</string>
     <string name="code_compare">Stimmen die Codes auf diesem Gerät und auf deiner Pumpe überein?</string>
     <string name="insight_pairing">Insight Pairing</string>
@@ -1155,7 +920,6 @@ Unerwartetes Verhalten.</string>
     <string name="isequalorgreater">ist gleich oder größer als</string>
     <string name="isgreater">ist größer als</string>
     <string name="isnotavailable">ist nicht verfügbar</string>
-    <string name="unknown">unbekannt</string>
     <string name="glucoseisnotavailable">Glukosewert nicht verfügbar</string>
     <string name="glucosecomparedmgdl">Glukosewert %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glukosewert %1$s %2$.1f %3$s</string>
@@ -1172,23 +936,10 @@ Unerwartetes Verhalten.</string>
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisierung</string>
     <string name="profile_total">== ∑  %1$s IE</string>
-    <string name="profile_ins_units_per_hour">IE/h</string>
-    <string name="profile_carbs_per_unit">g/IE</string>
-    <string name="profile_per_unit">/IE</string>
     <string name="dexcom_lognssensorchange_title">Speichere Sensor Wechsel in Nightscout</string>
     <string name="dexcom_lognssensorchange_summary">Ereignis \"Sensorwechsel\" bei Sensorstart automatisch in NS erstellen</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">Sekunde</string>
-    <string name="unit_minute">Minute</string>
-    <string name="unit_hour">Stunde</string>
-    <string name="unit_day">Tag</string>
-    <string name="unit_week">Woche</string>
-    <string name="unit_seconds">Sekunden</string>
-    <string name="unit_minutes">Minuten</string>
-    <string name="unit_hours">Stunden</string>
-    <string name="unit_days">Tage</string>
-    <string name="unit_weeks">Wochen</string>
     <string name="summary_tidepool_username">Dein Tidepool-Login-Benutzername, normalerweise deine E-Mail-Adresse</string>
     <string name="title_tidepool_username">Login-Benutzername</string>
     <string name="summary_tidepool_password">Dein Tidepool Anmeldekennwort</string>
@@ -1231,7 +982,6 @@ Unerwartetes Verhalten.</string>
     <string name="very_old_version">sehr alte Version</string>
     <string name="new_version_warning">Neue Version für mindestens %1$d Tage verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach %2$d Tagen, Loop wird nach  %3$d Tagen deaktiviert.</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2f IE</string>
     <string name="dexcom_app_patched">gepatchte Dexcom App</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Empfange Blutzucker-Werte von der gepatchten Dexcom App.</string>
@@ -1308,10 +1058,6 @@ Unerwartetes Verhalten.</string>
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Ausgewählt</string>
     <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth-Low-Energy nicht unterstützt.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth nicht aktiviert.</string>
-    <string name="location_not_found_title">Standortdienst ist nicht aktiviert</string>
-    <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>
     <string name="location_yes">Aktivieren</string>
     <string name="location_no">Nein</string>
     <string name="rileylink_scanner_scanning">Scannt</string>
@@ -1353,7 +1099,6 @@ Unerwartetes Verhalten.</string>
     <string name="rileylink_error_tuneup_failed">TuneUp fehlgeschlagen</string>
     <string name="rileylink_error_pump_unreachable">Pumpe ist nicht erreichbar</string>
     <string name="rileylink_error_pod_unreachable">Pod nicht erreichbar</string>
-    <string name="rileylink_error_address_not_set_short">Nicht angegeben</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pumpe</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1423,7 +1168,6 @@ Unerwartetes Verhalten.</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus-Einschränkung angewendet: %2$.2fIE zu %3$.2fIE</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Langsamer Kohlenhydrat-Abbau erkannt: %2$d%% der Zeit. Überprüfe Deine Berechnung. COB könnte zu hoch sein und deswegen zu viel Insulin abgegeben werden!!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d IE</string>
     <string name="partialboluswizard">Abgabe von [%] des Ergebnisses des Bolusrechners</string>
     <string name="deliverpartofboluswizard">Der Bolus-Assistent führt Berechnungen durch, aber nur dieser Teil der berechneten Insulin wird abgegeben. Nützlich mit SMB-Algorithmus.</string>
     <string name="loading">Lädt ...</string>
@@ -1431,7 +1175,6 @@ Unerwartetes Verhalten.</string>
     <string name="time_range">Zeitraum</string>
     <string name="timerange_value">Für die Zeit zwischen %1$s und %2$s</string>
     <string name="between">Zwischen </string>
-    <string name="close">Schließen</string>
     <string name="increasingmaxbasal">Der Wert max basal wird erhöht, weil Du ihn niedriger eingestellt hast als die höchste Basalrate in Deinem Profil.</string>
     <string name="smscommunicator_messagebody">Ungültiger Inhalt</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1449,7 +1192,6 @@ Unerwartetes Verhalten.</string>
     <string name="common_off">Aus</string>
     <string name="objectives_button_unfinish">Ziel erneut öffnen</string>
     <string name="objectives_button_unstart">Ziel neu starten</string>
-    <string name="timedetection">Zeiterkennung</string>
     <string name="doyouwantresetstart">Möchtest Du den Start der Ziele zurücksetzen? Du verlierst Deine Fortschritte.</string>
     <string name="time_or_timezone_change">Zeit- und/oder Zeitzonenänderung an der Pumpe</string>
     <string name="nopumpselected">Keine Pumpe ausgewählt</string>
@@ -1476,7 +1218,6 @@ Unerwartetes Verhalten.</string>
     <string name="nav_survey">Umfrage</string>
     <string name="invalidage">Ungültige Altersangabe</string>
     <string name="invalidweight">Ungültige Gewichtsangabe</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Durchschnitt</string>
     <string name="tdd">TDD</string>
@@ -1489,12 +1230,8 @@ Unerwartetes Verhalten.</string>
     <string name="randombg_short">BZ</string>
     <string name="tools">Tools</string>
     <string name="show_calculation">Berechnung anzeigen</string>
-    <string name="error">Fehler</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Automatisierungs-Ereignis</string>
     <string name="alreadyset">Bereits festgelegt</string>
-    <string name="message">Nachricht</string>
     <string name="clearqueueconfirm">Warteschlange löschen? Alle Daten in der Warteschlange gehen verloren!</string>
     <string name="ebstopsloop">Die Verwendung eines Verzögerungsbolus unterbricht dem Closed Loop Modus für die Dauer des Verzögerungsbolus. Willst Du das wirklich?</string>
     <string name="closed_loop_disabled_with_eb">Closed Loop wegen Verzögerungsbolus unterbrochen</string>
@@ -1538,4 +1275,116 @@ Unerwartetes Verhalten.</string>
     <string name="statuslights">Statusanzeige</string>
     <string name="statuslights_copy_ns">Einstellung aus NS kopieren</string>
     <string name="copyexistingvalues">NS-Einstellungen kopieren (falls vorhanden)?</string>
+    <string name="classic_desrciption">Ursprüngliches Erscheinungsbild</string>
+    <string name="buttonson_desrciption">Schaltflächen werden immer am unteren Rand des Bildschirms angezeigt</string>
+    <string name="skin">Erscheinungsbild</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Um den Omnipod nutzen zu können, brauchst Du einen RileyLink (mind. Firmware 2.0).</string>
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Bolus-Piep aktiviert</string>
+    <string name="omnipod_config_beep_basal_enabled">Basal-Piep aktiviert</string>
+    <string name="omnipod_config_beep_smb_enabled">SMB-Piep aktiviert</string>
+    <string name="omnipod_config_beep_tbr_enabled">TBR-Piep aktiviert</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Pod-Debugging-Optionen aktiviert</string>
+    <string name="omnipod_config_timechange_enabled">Sommerzeit/Zeitzonen-Erkennung aktiviert</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_pod_status">Pod Status</string>
+    <string name="omnipod_reservoir_left">%1$.2f IE übrig</string>
+    <string name="omnipod_reservoir_over50">über 50 IE</string>
+    <string name="omnipod_pod_address">Pod Adresse</string>
+    <string name="omnipod_pod_expiry">Pod läuft ab</string>
+    <string name="omnipod_pod_name_no_info">Keine Info</string>
+    <string name="omnipod_pod_no_pod_connected">Kein Pod verbunden</string>
+    <string name="omnipod_pod_not_initalized">Nicht initialisiert</string>
+    <string name="omnipod_pod_active_alerts">Aktive Pod-Warnungen</string>
+    <string name="omnipod_ack_short">Alarm bestätigen</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Aktion ist nicht möglich.\n\n Du musst zuerst den Omnipod konfigurieren, bevor Du diese Operation verwenden kannst.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Aktion ist nicht möglich.\n\n Du musst ein paar Minuten warten bis AAPS versucht, das Profil zum ersten Mal zu setzen.</string>
+    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Kein aktiver Pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandoprüfung fehlgeschlagen</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Es ist ein unerwarteter Fehler aufgetreten. Bitte melden! (Typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Kommunikation fehlgeschlagen: Ungültige Eingabeparameter empfangen.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Keine Verbindung: Zeitüberschreitung</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Keine Verbindung: Es ist ein unerwarteter Fehler aufgetreten. Bitte melden!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Kommunikation fehlgeschlagen: Die Überprüfung der Nachrichtenintegrität ist fehlgeschlagen.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Kommunikation fehlgeschlagen: Es wurde ein ungültiges Paket vom Pod empfangen.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Kommunikation fehlgeschlagen: Der Pod befindet sich in einem falschen Status.</string>
+    <string name="omnipod_driver_error_invalid_response">Kommunikation fehlgeschlagen: Es wurde eine ungültige Antwort vom Pod empfangen.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikation fehlgeschlagen: Ungültige Zeichenfolge vom Pod empfangen.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Kommunikation fehlgeschlagen: Ungültige Adresse vom Pod empfangen.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Kommunikation fehlgeschlagen: Nachricht vom Pod konnte nicht decodiert werden.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikation fehlgeschlagen: Nonce resync fehlgeschlagen.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikation fehlgeschlagen: Nonce nicht synchronisiert</string>
+    <string name="omnipod_driver_error_not_enough_data">Kommunikation fehlgeschlagen: Nicht genügend Daten vom Pod empfangen.</string>
+    <string name="omnipod_driver_error_pod_fault">Ein Pod-Fehler (%1$03d %2$s) wurde festgestellt. Bitte deaktiviere den Pod und starte einen neuen.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikation fehlgeschlagen: Fehlerhafte Antwort vom Pod.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Pod Management</string>
+    <string name="omnipod_cmd_init_pod">Init Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Pod deaktivieren</string>
+    <string name="omnipod_cmd_reset_pod">Pod zurücksetzen</string>
+    <string name="omnipod_cmd_pod_history">Pod Historie</string>
+    <string name="omnipod_cmd_set_bolus">Setze Bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Bolus abbrechen</string>
+    <string name="omnipod_cmd_set_tbr">Setze Temporäre Basalrate</string>
+    <string name="omnipod_cmd_cancel_tbr">Temporäre Basalrate abbrechen (intern über den Treiber)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Temporäre Basalrate abbrechen (vom Benutzer erzwungen)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Basalrate festlegen</string>
+    <string name="omnipod_cmd_get_pod_status">Pod-Status abrufen</string>
+    <string name="omnipod_cmd_get_pod_info">Pod-Info abrufen</string>
+    <string name="omnipod_cmd_set_time">Zeit einstellen</string>
+    <string name="omnipod_cmd_configure_alerts">Warnungen konfigurieren</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Alarme bestätigen</string>
+    <string name="omnipod_cmd_suspend_delivery">Abgabe abbrechen</string>
+    <string name="omnipod_cmd_resume_delivery">Abgabe wieder aufnehmen</string>
+    <string name="omnipod_cmd_unknown_entry">Unbekannte Eingabe</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f IE</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f IE, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Rate: %1$.1f IE, Dauer: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Wenn Du <b>OK</b> klickst, wird die Verbindung zum Pod zwangsweise getrennt und Du wirst Dich nicht mehr mit ihm verbinden können.
+Mache das nur, wenn AAPS nicht mehr mit dem Pod kommunizieren kann. Wenn dies noch geht, nutze stattdessen die Option <b>Deaktiviere Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Pod Historie derzeit nicht verfügbar.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Befülle den Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nBefülle den neuen Pod mit ausreichend Insulin für 3 Tage.\n\nAchte auch zwei Pieptöne vom Pod während des Füllens. Diese zeigen an, dass der Pod mit der Mindestmenge von 85 IE befüllt wurde. Leere die Spritze komplett, auch wenn Du die beiden Pieptöne gehört hast.\n\nKlicke <b>Weiter</b> nachdem Du den Pod befüllt hast.\n\n<b>Hinweis:</b> Entferne den Nadelschutz des Pods noch nicht.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Befüllen</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Versuche Dich mit dem neuen Pod zu verbinden und befülle ihn.\n\nWenn alle Anzeigen angehakt sind, kannst Du <b>Weiter</b> klicken.\n\n<b>Hinweis:</b> Pod und RileyLink müssen dabei sehr nah beieinander sein.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Befestige den Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nBereite die Infusionsstelle vor. Entferne den Nadelschutz des Pods und die Schutzfolie über dem Kleber. Klebe dann den Pod an die gewünschte Körperstelle.\n\nFalls die Kanüle herausragt, klicke <b>Abbrechen</b> und verwirf den Pod.\n\nKlicke <b>Weiter</b>; um die Kanüle zu setzen und die Insulinabgabe zu beginnen.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Kanüle setzen</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Erste Basalrate und Kanüle werden nun gesetzt.\n\nWenn alle Häkchen gesetzt sind, kannst Du <b>Weiter</b> klicken.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDer Pod ist jetzt aktiv.\n\nDeine Basalrate ist programmiert und die Kanüle wurde gesetzt.\n\nBitte überprüfe, ob die Kanüle korrekt gesetzt wurde und ersetze den Pod, wenn Du das Gefühl hast, dass dies nicht erfolgreich war.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Pod deaktivieren</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nDrücke <b>Weiter</b> um den Pod zu deaktivieren.\n\n<b>Hinweis:</b> Dies unterbricht die gesamte Insulinabgabe und deaktiviert den Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Deaktiviere den Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktiviere den Pod.\n\nWenn alle Häkchen gesetzt sind, kannst Du <b>Weiter</b>drücken.\n\n<b>Hinweis:</b> Wenn das Deaktivieren fortwährend fehlschlägt, drücke bitte <b>Abbrechen</b> und verwende die Option <b>Reset Pod</b>, um den Pod Status zwangsweise zurückzusetzen.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktiviert.\n\nBitte entferne den Pod von Deinem Körper und entsorge ihn.</string>
+    <string name="omnipod_init_pod_pair_pod">Pod verbinden</string>
+    <string name="omnipod_init_pod_prime_pod">Pod befüllen</string>
+    <string name="omnipod_init_pod_fill_cannula">Kanüle befüllen</string>
+    <string name="omnipod_init_pod_set_basal_profile">Basalprofil setzen</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Abgabe abbrechen</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Pod deaktivieren</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integration für Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Erinnerung Kopplung beendet</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Erinnerung Setup beendet</string>
+    <string name="omnipod_alert_expiration">Pod läuft in Kürze ab</string>
+    <string name="omnipod_alert_expiration_advisory">Pod läuft in Kürze ab</string>
+    <string name="omnipod_alert_shutdown_imminent">Herunterfahren steht unmittelbar bevor</string>
+    <string name="omnipod_alert_low_reservoir">Niedriger Reservoirstand</string>
+    <string name="omnipod_alert_unknown_alert">Unbekannter Alarm</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Das Festlegen der Basalrate evtl. fehlgeschlagen. Insulinabgabe wird evtl. ausgesetzt! Aktualisiere den Pod-Status.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Das Festlegen der temporären Basalrate evtl. fehlgeschlagen. Sofern eine temporäre Basalrate bestand, wurde diese ggf. beendet! Aktualisiere den Pod-Status.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Das Festlegen der Zeit evtl. fehlgeschlagen. Insulinabgabe wird evtl. ausgesetzt! Aktualisiere den Pod-Status.</string>
+    <string name="omnipod_bolus_failed_uncertain">Erfolgreiche Bolusabgabe konnte nicht sicher ermittelt werden. Stelle sicher, dass der Pod Insulin abgibt oder brich den Bolus ab.</string>
+    <string name="omnipod_rl_stats">RL Stats</string>
+    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index df59b1b91a..b40f6e7b2e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Επαναφορά Βάσεων Δεδομένων</string>
     <string name="reset_db_confirm">Θέλετε πραγματικά να επαναφέρετε την βάση δεδομένων;</string>
     <string name="nav_exit">Έξοδος</string>
-    <string name="danar_useextended_title">Χρησιμοποιήστε Εκτεταμένο bolus για &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR συσκευή Bluetooth</string>
     <string name="ns_sync_use_absolute_title">Χρησιμοποιείτε πάντα απόλυτες τιμές βασικού</string>
     <string name="alert_dialog_storage_permission_text">Παρακαλώ κάντε επανεκίνηση στο τηλέφώνο ή restart στο AndroidAPS από τις Ρυθμίσεις Συστήματος, \nαλλιώς το AndroidAPS δεν θα έχει καταγραφή (επαληθεύστε ότι οι αλγόριθμοι δουλεύουν σωστά)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Αυτή η συσκευή δεν φαίνεται να υποστηρίζει τη λίστα κατάτμησης βελτιστοποίησης μπαταρίας - ενδέχεται να αντιμετωπίσετε προβλήματα απόδοσης.</string>
     <string name="description_actions">Ορισμένα πλήκτρα για γρήγορη πρόσβαση σε κοινά χαρακτηριστικά</string>
-    <string name="description_careportal">Εισάγετε καταχωρήσεις ημερολογίου.</string>
     <string name="description_config_builder">Χρησιμοποιείται για ρύθμιση ενεργών συνδέσεων</string>
     <string name="description_objectives">Πρόγραμμα εκμάθησης</string>
     <string name="description_food">Εμφανίζει τις επιλογές τροφίμων που ορίζεται στο Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Παρέχει το προφίλ που έχετε ορίσει στο Nightscout</string>
     <string name="description_profile_simple">Ορίστε ένα προφίλ με μόνο μία χρονική περίοδο.</string>
     <string name="description_pump_combo">Η ολοκλήρωση της αντλίας, για τις αντλίες Accu-Check Combo, απαιτεί να έχετε εγκαταστήσει ruffy</string>
-    <string name="description_pump_dana_r">Ολοκλήρωση αντλίας για τις αντλίες Dana Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Ολοκλήρωση αντλίας για τις εγχώριες αντλίες Dana Diabecare R</string>
-    <string name="description_pump_dana_r_v2">Ολοκλήρωση αντλίας για τις αντλίες Dana Diabecare R με αναβαθμισμένο λογισμικό</string>
-    <string name="description_pump_dana_rs">Ολοκλήρωση αντλίας για τις αντλίες Dana Diabecare RS</string>
     <string name="description_pump_mdi">Ολοκλήρωση αντλίας για ανθρώπους που κάνουν εντατικοποιημένο σχήμα ενέσεων για την θεραπεία τους</string>
     <string name="description_pump_virtual">Ολοκλήρωση αντλίας για αντλίες που δεν έχουν κανέναν οδηγό ακόμα (Ανοιχτό Κύκλωμα)</string>
     <string name="description_sensitivity_aaps">Η ευαισθησία υπολογίζεται με τον ίδιο τρόπο όπως το Oref0, αλλά μπορείτε να καθορίσετε το χρονικό διάστημα στο παρελθόν. Η ελάχιστη απορρόφηση υδατανθράκων υπολογίζεται από την μέγιστη απορρόφηση υδατανθράκων από τις επιλογές.</string>
@@ -53,13 +46,6 @@
     <string name="description_wear">Παρακολουθεί και ελέγχει το AndroidAPS χρησιμοποιώντας το ρολόι σας WearOS.</string>
     <string name="description_xdrip_status_line">Δείτε πληροφορίες σχετικά με το κύκλωμά σας στην πρόσοψη xDrip +.</string>
     <string name="description_sms_communicator">Ελεγξτε απομακρυσμένα το AndroidAPS χρησιμοποιώντας τις εντολές SMS.</string>
-    <string name="nsprofileview_units_label">Μονάδες</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Βασικός ρυθμός</string>
-    <string name="nsprofileview_target_label">Στόχος</string>
-    <string name="noprofileset">Δεν ορίστηκε προφίλ</string>
     <string name="treatments_insulin_label_string">Ινσουλίνη:</string>
     <string name="treatments_carbs_label_string">Υδατάνθρακες:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,15 +61,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Υδατάνθρακες</string>
     <string name="treatments_wizard_correction_label">Διόρθωση</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Έναρξη τώρα</string>
     <string name="vitualpump_label">ΕΙΚΟΝΙΚΗ ΑΝΤΛΙΑ</string>
-    <string name="pump_basebasalrate_label">Βάση Βασικού Ρυθμού</string>
-    <string name="pump_tempbasal_label">Προσωρινός Ρυθμός</string>
-    <string name="virtualpump_extendedbolus_label">Εκτεταμμένο bolus</string>
-    <string name="pump_battery_label">Μπαταρία</string>
-    <string name="pump_reservoir_label">Αμπούλα</string>
     <string name="virtualpump_resultok">ΟΚ</string>
     <string name="openapsma_lastrun_label">Τελευταίος Υπολογισμός</string>
     <string name="openapsma_inputparameters_label">Εισαγωγή Παραμέτρων</string>
@@ -95,16 +75,11 @@
     <string name="result">Αποτέλεσμα</string>
     <string name="result_insulin_carbs">Αποτέλεσμα: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Μη διαθέσιμα δεδομένα γλυκόζης</string>
-    <string name="nochangerequested">Δεν απαιτείται αλλαγή</string>
     <string name="openapsma_request_label">Αίτημα</string>
-    <string name="rate">Τιμή</string>
-    <string name="duration">Διάρκεια</string>
-    <string name="reason">Αιτιολογία</string>
     <string name="glucose">Γλυκόζη</string>
     <string name="delta">Διαφορά</string>
     <string name="sms_delta">Διαφορά:</string>
     <string name="configbuilder">Διαμόρφωση</string>
-    <string name="objectives">Βήματα</string>
     <string name="overview">Επισκόπηση</string>
     <string name="nsprofile">Προφίλ NS</string>
     <string name="simpleprofile">Απλό Προφίλ</string>
@@ -122,7 +97,6 @@
     <string name="configbuilder_general">Γενικά</string>
     <string name="configbuilder_general_description">Αυτά είναι μερικά πρόσθετα που μπορεί να βρείτε χρήσιμα.</string>
     <string name="configbuilder_constraints_description">Ποιοι περιορισμοί έχουν εφαρμοστεί;</string>
-    <string name="days">ημέρες</string>
     <string name="constraints">Περιορισμοί</string>
     <string name="loop">Κύκλωμα</string>
     <string name="configbuilder_loop">Κύκλωμα</string>
@@ -138,7 +112,6 @@
     <string name="openapsma_disabled">Προσθήκη απενεργοποιημένη</string>
     <string name="constraints_violation">Παραβίαση Περιορισμών</string>
     <string name="treatmentdeliveryerror">Σφάλμα παράδοσης Bolus</string>
-    <string name="tempbasaldeliveryerror">Σφάλμα παράδοσης Προσ Ρυθμού</string>
     <string name="setbasalquestion">Αποδοχή νέου Προσ Ρυθμού:</string>
     <string name="overview_treatment_label">Θεραπεία</string>
     <string name="overview_calculator_label">Υπολογιστής</string>
@@ -148,7 +121,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Βασικός Ρυθμός</string>
     <string name="sms_basal">Βασικός Ρυθμός:</string>
-    <string name="carbs">Υδατάνθρακες</string>
     <string name="changeyourinput">Αλλάξτε αυτό που εισάγατε!</string>
     <string name="configbuilder_bgsource">Πηγή BG</string>
     <string name="configbuilder_bgsource_description">Από πού πρέπει το AndroidAPS να πάρει τα δεδομένα του;</string>
@@ -165,24 +137,6 @@
     <string name="treatments_wizard_basaliob_label">Βασική ΙΟΒ</string>
     <string name="bolusconstraintapplied">Ενεργός Περιορισμός Bolus</string>
     <string name="carbsconstraintapplied">Ενεργός περιορισμός Υδατανθράκων</string>
-    <string name="careportal_bgcheck">Έλεγχος BG</string>
-    <string name="careportal_announcement">Ανακοίνωση</string>
-    <string name="careportal_note">Σημείωση</string>
-    <string name="careportal_question">Ερώτηση</string>
-    <string name="careportal_exercise">Άσκηση</string>
-    <string name="careportal_pumpsitechange">Αντικατάσταση Αντλίας</string>
-    <string name="careportal_cgmsensorinsert">Εισαγωγή Αισθητήρα CGM</string>
-    <string name="careportal_cgmsensorstart">Έναρξη Αισθητήρα CGM</string>
-    <string name="careportal_insulincartridgechange">Αλλαγή Αμπούλας Ινσουλίνης</string>
-    <string name="careportal_snackbolus">Bolus για σνακ</string>
-    <string name="careportal_mealbolus">Bolus Γεύματος</string>
-    <string name="careportal_correctionbolus">Διορθωτικό Bolus</string>
-    <string name="careportal_combobolus">Συνδυαστικό Bolus</string>
-    <string name="careportal_tempbasalstart">Έναρξη Προσ Ρυθμού</string>
-    <string name="careportal_tempbasalend">Τέλος Προσ Ρυθμού</string>
-    <string name="careportal_carbscorrection">Διόρθωση Υδατανθράκων</string>
-    <string name="careportal_openapsoffline">OpenAPS εκτός σύνδεσης</string>
-    <string name="careportal_newnstreatment_eventtype">Τύπος Συμβάντος</string>
     <string name="careportal_newnstreatment_other">Άλλο</string>
     <string name="careportal_newnstreatment_meter">Μετρητής</string>
     <string name="careportal_newnstreatment_sensor">Αισθητήρας</string>
@@ -213,34 +167,12 @@
     <string name="openapsma_maxbasal_summary">Αυτή η τιμή ονομάζεται μέγιστο βασικού ρυθμού στο περιεχόμενο του OpenAPS</string>
     <string name="openapsma_maxiob_title">Μέγιστο βασικής IOB που το OpenAPS μπορεί να δώσει [U]</string>
     <string name="openapsma_maxiob_summary">Αυτή η τιμή ονομάζεται μέγιστο IOB στο OpenAPS \nΑυτή είναι η μέγιστη ινσουλίνη [U] που το APS μπορεί να δώσει με την μία.</string>
-    <string name="dismiss">ΑΠΟΡΡΙΨΗ</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Συνδέεται</string>
-    <string name="connected">Συνδέθηκε</string>
-    <string name="disconnected">Αποσυνδέθηκε</string>
     <string name="end_user_license_agreement">Άδεια χρήσης τελικού χρήστη</string>
     <string name="end_user_license_agreement_text">ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ. ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ/Ή ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ.</string>
     <string name="end_user_license_agreement_i_understand">ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ</string>
     <string name="save">Αποθήκευση</string>
-    <string name="nobtadapter">Δεν βρέθηκε προσαρμογέας Bluetooth</string>
-    <string name="devicenotfound">Δεν βρέθηκε η επιλεγμένη συσκευή</string>
-    <string name="connectionerror">Λάθος σύνδεσης αντλίας</string>
-    <string name="danar_iob_label">IOB αντλίας</string>
-    <string name="danar_dailyunits">Μονάδες ανά ημέρα </string>
-    <string name="pump_lastbolus_label">Τελευταίο Bolus:</string>
-    <string name="hoursago">%1$.1fώρες πριν</string>
-    <string name="danar_invalidinput">Μη έγκυρα δεδομένα</string>
-    <string name="danar_valuenotsetproperly">Η τιμή δεν μπήκε σωστά</string>
     <string name="reloadprofile">Ξαναφορτώστε το προφίλ</string>
-    <string name="danar_viewprofile">Δείτε το προφίλ</string>
-    <string name="enacted">Ενεργοποιήθηκε</string>
-    <string name="comment">Σχόλιο</string>
-    <string name="success">Επιτυχία</string>
-    <string name="percent">Ποσοστό</string>
-    <string name="absolute">Απόλυτο</string>
-    <string name="canceltemp">Ακύρωση Προσωρινού Ρυθμού</string>
     <string name="smscommunicator">SMS Επικοινωνία</string>
-    <string name="waitingforpumpresult">Περιμένετε για αποτέλεσμα</string>
     <string name="smscommunicator_allowednumbers">Επιτρεπτά τηλεφωνικά νούμερα</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Για έγχυση bolus %1$.2fU στείλτε με κωδικό %2$s</string>
@@ -249,52 +181,13 @@
     <string name="bolusdelivered">Bolus %1$.2fU δόθηκε επιτυχώς</string>
     <string name="bolusrequested">Προς έγχυση %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU δόθηκε επιτυχώς</string>
-    <string name="bolusdelivering">Εγχύεται %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Άδεια για απομακρυσμένες εντολές μέσω SMS</string>
-    <string name="glucosetype_finger">Δάκτυλο</string>
-    <string name="glucosetype_sensor">Αισθητήρας</string>
-    <string name="manual">Χειροκίνητα</string>
     <string name="danarprofile">Ρυθμίσεις προφίλ DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Διάρκεια Δράσης Ινσουλίνης</string>
-    <string name="failedupdatebasalprofile">Αποτυχία αναβάθμισης βασικού προφίλ</string>
-    <string name="danar_historyreload">Γέμισμα</string>
     <string name="uploading">Ανέβασμα</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">Διφασικό άμεσο bolus</string>
-    <string name="danar_debolus">Διφασικό εκτεταμένο bolus</string>
-    <string name="danar_error">σφάλμα</string>
-    <string name="danar_refill">ξαναγέμισμα</string>
-    <string name="danar_basalhour">ώρα βασικού</string>
-    <string name="danar_glucose">γλυκόζη</string>
-    <string name="danar_carbohydrate">υδατάνθρακες</string>
-    <string name="danar_alarm">συναγερμός</string>
-    <string name="danar_totaluploaded">Ανέβηκαν συνολικά %1$d εγγραφές</string>
-    <string name="danar_sbolus">Άμεσο bolus</string>
-    <string name="danar_history_alarm">Συναγερμοί</string>
-    <string name="danar_history_basalhours">Ώρες Βασικού</string>
-    <string name="danar_history_bolus">Bolus</string>
-    <string name="danar_history_carbohydrates">Υδατάνθρακες</string>
-    <string name="danar_history_dailyinsulin">Ημερήσια Ινσουλίνη</string>
-    <string name="danar_history_errors">Σφάλματα</string>
-    <string name="danar_history_glucose">Γλυκόζη</string>
-    <string name="danar_history_refill">Ξαναγέμισμα</string>
-    <string name="danar_history_syspend">Αναστολή</string>
-    <string name="danar_history_connectingfor">Σύνδεση για %1$d δευτερόλεπτα</string>
-    <string name="danar_password_title">Κωδικός αντλίας</string>
-    <string name="wrongpumppassword">Λάθος κωδικός αντλίας!</string>
-    <string name="pumpbusy">Αντλία απασχολημένη</string>
-    <string name="overview_bolusprogress_delivered">Παραδόθηκε</string>
-    <string name="overview_bolusprogress_stoped">Σταμάτησε</string>
     <string name="bolusstopped">Το bolus σταμάτησε</string>
     <string name="bolusstopping">Το bolus σταματάει</string>
-    <string name="occlusion">Έμφραξη</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">Πιέστε STOP</string>
-    <string name="waitingforpump">Αναμονή για αντλία</string>
-    <string name="overview_bolusprogress_goingtodeliver">Προς έγχυση %1$.2fU</string>
-    <string name="youareonallowedlimit">Φτάσατε το επιτρεπτό όριο</string>
-    <string name="noprofileselected">Δεν επηλέχθηκε προφίλ</string>
     <string name="smscommunicator_loophasbeendisabled">Το κύκλωμα απενεργοποιήθηκε</string>
     <string name="smscommunicator_loophasbeenenabled">Το κύκλωμα ενεργοποιήθηκε</string>
     <string name="smscommunicator_loopisdisabled">Κύκλωμα απενεργοποιημένο</string>
@@ -331,11 +224,9 @@
     <string name="mealbolus">Γεύμα</string>
     <string name="correctionbous">Διορθ</string>
     <string name="actions">Ενέργειες</string>
-    <string name="androidaps_start">AndroidAPS ξεκίνησε</string>
     <string name="ns_upload_only">NS φορτώνεται μόνο (απενεργοποίηση συγχρ)</string>
     <string name="ns_upload_only_summary">NS φορτώνεται μόνο. Δεν είναι αποτελεσματικό στο SGV εκτός εάν έχει επιλεγεί μία τοπική πηγή όπως το xDrip. Δεν είναι αποτελεσματικό στα Προφίλ ενώ χρησιμοποιείται το NS-Profiles.</string>
     <string name="pumpNotInitialized">Η αντλία δεν έχει ρυθμιστεί!</string>
-    <string name="pumpNotInitializedProfileNotSet">Η αντλία δεν έχει ρυθμιστεί, δεν ορίστηκε προφίλ!</string>
     <string name="primefill">Πλήρωση/Γέμισμα</string>
     <string name="fillwarning">Παρακαλώ ελέγξτε ότι η ποσότητα ταιριάζει με τις προδιαγραφές του σετ έγχυσης!</string>
     <string name="othersettings_title">Άλλο</string>
@@ -343,8 +234,6 @@
     <string name="button1">Πλήκτρο 1</string>
     <string name="button2">Πλήκτρο 2</string>
     <string name="button3">Πλήκτρο 3</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="target_range">Εύρος στόχου:</string>
     <string name="prefs_range_title">Εύρος εμφάνισης</string>
     <string name="prefs_range_summary">Υψηλό και Χαμηλό σημείο για την γραφική στην Επισκόπηση και Smartwatch</string>
@@ -353,17 +242,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Ξαναστείλτε όλα τα Δεδομένα</string>
     <string name="open_settings_on_wear">Ρυθμίσεις στο Wear</string>
-    <string name="pumperror">Σφάλμα Αντλίας</string>
-    <string name="lowbattery">Χαμηλή Μπαταρία</string>
-    <string name="pumpshutdown">Αντλία κλειστή</string>
-    <string name="batterydischarged">Μπαταρία αντλίας Αποφορτίστηκε</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Βασικός Ρυθμός:</string>
-    <string name="profile_set_failed">Αποτυχία ρύθμισης βασικού προφίλ</string>
-    <string name="profile_set_ok">Το Βασικό προφίλ στην αντλία ενημερώθηκε</string>
-    <string name="danar_disableeasymode">Απενεργοποιήστε την λειτουργία EasyUI στην αντλία</string>
-    <string name="danar_enableextendedbolus">Ενεργοποιήστε εκτεταμμένο bolus στην αντλία</string>
-    <string name="danar_switchtouhmode">Αλλάξτε την επιλογή από U/d σε U/h στην αντλία</string>
     <string name="basalvaluebelowminimum">Τιμή βασικού κάτω από το ελάχιστο. Δεν έχει ρυθμιστεί το προφίλ!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Τελευταία BG:</string>
@@ -371,7 +250,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Συνεχής Ειδοποίηση</string>
     <string name="old_data">Παλιά Δεδομένα</string>
-    <string name="minago">πριν από %1$d λεπτά</string>
     <string name="sms_minago">πριν από %1$d λεπτά</string>
     <string name="localprofile">Τοπικό Προφίλ</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -386,41 +264,22 @@
     <string name="eatingsoon">Γεύμα Σύντομα</string>
     <string name="hypo">Υπογλυκαιμία</string>
     <string name="activity">Άσκηση</string>
-    <string name="danar_stats">Στατιστικά DanaR</string>
-    <string name="danar_stats_cumulative_tdd">Άθροισμα TDD</string>
-    <string name="danar_stats_expweight">Εκθετικά Σταθμισμένο TDD</string>
-    <string name="danar_stats_basalrate">Βασικός Ρυθμός</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Ημερομηνία</string>
-    <string name="danar_stats_ratio">Αναλογία</string>
-    <string name="danar_stats_amount_days"># Ημέρες</string>
-    <string name="danar_stats_weight">Βάρος</string>
-    <string name="danar_stats_warning_Message">Πιθανώς ανακριβής όταν χρησιμοποιείτε bolus για πλήρωση/γέμισμα!</string>
-    <string name="danar_stats_olddata_Message">Παλιά Δεδομένα Παρακαλώ Πατήστε \"Ξαναφόρτωση\"</string>
-    <string name="danar_stats_tbb">Συνολικός Βασικός Ρυθμός</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Παραμετροποίηση...</string>
     <string name="actions_shortname">ΔΡΑΣΗ</string>
     <string name="configbuilder_shortname">Διαμόρφωση</string>
     <string name="loop_shortname">ΚΥΚΛΩΜΑ</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ΑΡΧΙΚΗ</string>
     <string name="virtualpump_shortname">Εικ. αντλία</string>
     <string name="profileviewer_shortname">NSPROFILE</string>
     <string name="treatments_shortname">ΘΕΡΑΠ</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">ΣΤΟΧΟΙ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Συντομογραφίες ενοτήτων</string>
     <string name="always_use_shortavg">Χρησιμοποιείτε πάντα τη βραχυπρόθεσμη μέση διαφορά αντί της απλής διαφοράς</string>
     <string name="always_use_shortavg_summary">Χρήσιμο όταν δεδομένα από μη φιλτραρισμένες πηγές όπως το xDrip αποκτούν θόρυβο.</string>
-    <string name="advancedsettings_title">Ρυθμίσεις για Προχωρημένους</string>
-    <string name="danar_model">Μοντέλο: %1$02X Πρωτόκολλο: %2$02X Κωδικός: %3$02X</string>
     <string name="profile">Προφίλ</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Προεπιλεγμένη τιμή: 3 Αυτό είναι ένα κλειδί ασφαλείας του OpenAPS. Αυτό περιορίζει την αύξηση του βασικού x3 (σε αυτούς τους ανθρώους) από την μεγαλύτερη τιμή του. Συνήθως δεν χρειάζεται να το αλλάξετε, αλλά πρέπει να ξέρετε τι σημαίνει “3x μέγιστο ημερήσιο; 4x τρέχων” για λόγους ασφαλείας.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Προεπιλεγμένη τιμή: 4 Αυτό είναι το μισό του θέματος ασφαλείας του OpenAPS, και το άλλο μισό του «3 x μέγιστο ημέρας: 4 x τρέχων» των θεμάτων ασφαλείας. Αυτό σημαίνει ότι ο βασικός ρυθμός, ανεξάρτητα από την μέγιστη τιμή βασικού ρυθμού στην αντλία σας, δεν μπορεί να είναι υψηλότερος από το πολλαπλάσιο αυτού του αριθμού. Αυτό γίνεται για να αποτρέψει τους ανθρώπους από το να μπουν σε επικίνδυνες καταστάσεις θέτωντας υψηλό βασικό πριν κατανοήσουν πλήρως πώς λειτουργεί ο αλγόριθμος. Και πάλι, η προεπιλεγμένη τιμή είναι 4x: οι περισσότεροι άνθρωποι ποτέ δεν θα χρειαστεί να το προσαρμόσουν και αντίθετα είναι πιο πιθανό να χρειαστεί να προσαρμόσουν άλλες ρυθμίσεις αν αισθάνονται ότι κινούνται με ασφάλεια.</string>
@@ -439,18 +298,9 @@
     <string name="smscommunicator_calibrationsent">Το καλιμπράρισμα στάλθηκε. Η λήψη πρέπει να είναι ενεργοποιημένη στο xDrip.</string>
     <string name="smscommunicator_calibrationfailed">το xDrip δεν λαμβάνει καλιμπραρίσματα</string>
     <string name="pumpsuspended">Η αντλία είναι σε παύση</string>
-    <string name="gettingpumpstatus">Φόρτωση κατάστασης αντλίας</string>
-    <string name="settingtempbasal">Ρύθμιση Προσ Ρυθμού</string>
-    <string name="stoppingtempbasal">Σταμάτημα Προσ Ρυθμού</string>
-    <string name="settingextendedbolus">Ρύθμιση εκτεταμμένου bolus</string>
-    <string name="stoppingextendedbolus">Σταμάτημα εκτεταμμένου bolus</string>
-    <string name="updatingbasalrates">Ενημέρωση Βασικού ρυθμού</string>
-    <string name="disconnecting">Αποσυνδέεται</string>
     <string name="executing">Εκτελείτε</string>
     <string name="virtualpump_settings">Ρυθμίσεις Εικονικής αντλίας</string>
     <string name="virtualpump_uploadstatus_title">Φόρτωση κατάστασης στο NS</string>
-    <string name="wrongpassword">Λάθος κωδικός</string>
-    <string name="approachingdailylimit">Φτάνετε το ημερήσιο όριο ινσουλίνης</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -474,7 +324,6 @@
     <string name="wear_detailedIOB_title">Δείξε αναλυτικά IOB</string>
     <string name="wear_detailedIOB_summary">Χώρισε την IOB σε bolus και βασικό στο ρολόι</string>
     <string name="nosuccess">αποτυχία - ελέγξτε τηλέφωνο</string>
-    <string name="notavailable">Μη διαθέσιμο</string>
     <string name="patientage">Ηλικία χρήστη</string>
     <string name="child">Παιδί</string>
     <string name="teenage">Έφηβος</string>
@@ -507,8 +356,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Η εφαρμογή καταγραφής ξεκινά από το NS</string>
     <string name="restartingapp">Έξοδος από το application για την εφαρμογή των ρυθμίσεων</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Ινσουλίνη</string>
     <string name="configbuilder_insulin_description">Ποιο τύπο ινσουλίνης χρησιμοποιείτε;</string>
     <string name="fastactinginsulin">Γρήγορη Ινσουλίνη</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -523,9 +370,6 @@
     <string name="statuslights_bat_critical">Όριο προειδοποίησης πολύ χαμηλής μπαταρίας [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Έκδοση</string>
-    <string name="pump_lastconnection_label">Τελευταία σύνδεση</string>
-    <string name="danar_bluetooth_status">Κατάσταση Bluetooth</string>
     <string name="nav_about">Σχετικά με</string>
     <string name="smscommunicator_missingsmspermission">Απουσία δικαιωμάτων SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Λείπει η άδεια κατάστασης τηλεφώνου</string>
@@ -536,16 +380,11 @@
     <string name="wear_showbgi_summary">Πρόσθεσε BGI στην γραμμή κατάστασης</string>
     <string name="ns_noupload">Μη φόρτωση στο NS</string>
     <string name="ns_noupload_summary">Όλα τα δεδομένα που αποστέλλονται στην NS έχουν καταργηθεί. Το AAPS συνδέεται με NS, αλλά δεν γίνεται καμία αλλαγή στα NS</string>
-    <string name="basal_step">Βήμα Βασικού</string>
-    <string name="bolus_step">Βήμα Bolus</string>
     <string name="overview_extendedbolus_cancel_button">Ακύρωση Εκτεταμμένου bolus</string>
     <string name="careportal_sensorage_label">Χρόνος ζωής Αισθητήρα</string>
     <string name="careportal_canulaage_label">Χρόνος ζωής Κάνουλας</string>
     <string name="careportal_insulinage_label">Χρόνος ζωής Ινσουλίνης</string>
-    <string name="hours">ώρες</string>
-    <string name="invalidprofile">Μη έγκυρο προφίλ!!!</string>
     <string name="careportal_pbage_label">Χρόνος ζωής μπαταρίας αντλίας</string>
-    <string name="careportal_pumpbatterychange">Αλλαγή μπαταρίας αντλίας</string>
     <string name="ns_alarmoptions">Επιλογές συναγερμού</string>
     <string name="nsalarm_urgenthigh">Επείγον υψηλό</string>
     <string name="nsalarm_high">Υψηλό</string>
@@ -569,7 +408,6 @@
     <string name="absorptionsettings_title">Ρύθμιση απορρόφησης</string>
     <string name="absorption_maxtime_title">Μέγιστος χρόνος απορρόφησης γεύματος [h]</string>
     <string name="absorption_maxtime_summary">Χρόνος σε ώρες που περιμένουμε να απορροφηθούν όλοι οι υδατάνθρακες ενός γεύματος</string>
-    <string name="danar_visualizeextendedaspercentage_title">Εμφάνιση εκτεταμένου bolus σε %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -594,7 +432,6 @@
     <string name="careportal_pump_label">ΑΝΤΛΙΑ</string>
     <string name="careportal_newnstreatment_duration_min_label">Διάρκεια [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Ενεργοποίηση UAM</string>
     <string name="enablesmb">Ενεργοποίηση SMB</string>
     <string name="enablesmb_summary">Χρησιμοποιήστε Super Micro Boluses αντί προσωρινού ρυθμού για ταχύτερα αποτελέσματα</string>
@@ -606,22 +443,7 @@
     <string name="ultrarapid_oref">Έξτρα Γρήγορη δράση - Oref</string>
     <string name="dia_too_short">DIA για %1$f πολύ μικρή - χρησιμοποιήστε %2$f! </string>
     <string name="activate_profile">Ενεργοποίηση προφίλ</string>
-    <string name="date">Ημερομηνία</string>
     <string name="invalid">ΜΗ ΕΓΚΥΡΟ</string>
-    <string name="waitingforpairing">Περιμένετε για σύζευξη με αντλία</string>
-    <string name="pairingok">Σύζευξη ΟΚ</string>
-    <string name="pairingtimedout">Τέλος χρόνου σύζευξης</string>
-    <string name="danars_nodeviceavailable">Δεν βρέθηκε συσκευή ακόμα</string>
-    <string name="emptyreservoir">Άδεια αμπούλα</string>
-    <string name="bloodsugarmeasurementalert">Ειδοποίηση υψηλής τιμής σακχάρου</string>
-    <string name="remaininsulinalert">Υπόλοιπο Ινσουλίνης</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Επιλεγμένη αντλία</string>
-    <string name="pairpump">Σύζευξη νέας αντλίας</string>
-    <string name="bolusspeed">Ταχύτητα Bolus</string>
-    <string name="danar_setbasalstep001">Ρυθμίστε το βήμα βασικού στο 0.01 U/h</string>
-    <string name="serialnumber">Serial number</string>
     <string name="careportal_newnstreatment_percentage_label">Ποσοστό</string>
     <string name="careportal_newnstreatment_timeshift_label">Αλλαγή της ώρας</string>
     <string name="default_temptargets">Προκαθορισμένος Στόχος-Προσ Ρυθμού</string>
@@ -631,31 +453,18 @@
     <string name="activity_target">στόχος άσκησης</string>
     <string name="hypo_duration">διάρκεια υπογλυκαιμίας</string>
     <string name="hypo_target">στόχος υπογλυκαιμίας</string>
-    <string name="danar_history_prime">Πλήρωση</string>
-    <string name="gettingextendedbolusstatus">Κατάσταση εκτεταμένου bolus</string>
-    <string name="gettingbolusstatus">Κατάσταση bolus</string>
-    <string name="gettingtempbasalstatus">Λήψη κατάστασης Προσ Ρυθμού</string>
-    <string name="gettingpumpsettings">Λήψη ρυθμίσεων αντλίας</string>
-    <string name="gettingpumptime">Λήψη ώρας αντλίας</string>
     <string name="reuse">επαναχρησιμοποίηση</string>
     <string name="wearcontrol_title">Έλεγχος από ρολόι</string>
     <string name="wearcontrol_summary">Ρυθμίστε Στόχους-Προσ Ρυθμού και βάλτε Θεραπείες από το ρολόι.</string>
-    <string name="connectiontimedout">Ο χρόνος σύνδεσης έληξε</string>
     <string name="food">Γεύμα</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
     <string name="none"><![CDATA[<κενό>]]></string>
     <string name="shortkilojoul">kj</string>
     <string name="shortenergy">Ενέργεια</string>
     <string name="shortprotein">Πρωτεΐνες</string>
     <string name="shortfat">Λίπος</string>
     <string name="active"><![CDATA[<Ενεργή>]]></string>
-    <string name="waitingforestimatedbolusend">Αναμονή για το τέλος του bolus. Απομένουν %1$d δευτερόλεπτα.</string>
-    <string name="processinghistory">Επεξεργασία συμβάντος</string>
-    <string name="startingbolus">Έναρξη bolus</string>
     <string name="executingrightnow">Η εντολή εκτελείται τώρα</string>
-    <string name="pumpdrivercorrected">Ο οδηγός αντλίας διορθώθηκε</string>
     <string name="pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
     <string name="missed_bg_readings">Χαμένες μετρήσεις BG</string>
     <string name="raise_notifications_as_android_notifications">Χρησιμοποιήστε ειδοποιήσεις συστήματος για ειδοποιήσεις και συναγερμούς</string>
@@ -665,21 +474,15 @@
     <string name="pump_unreachable_threshold">Όριο για μη διαθεσιμότητα της αντλίας [λεπτά]</string>
     <string name="urgent_alarm">Συναγερμός έκτακτης ανάγκης</string>
     <string name="info">Πληροφορίες</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Απενεργοποιεί το bluetooth του τηλεφώνου για ένα δευτερόλεπτο αν δεν είναι δυνατή η σύνδεση με την αντλία. Αυτό μπορεί να βοηθήσει σε ορισμένα τηλέφωνα όπου το bluetooth παγώνει.</string>
     <string name="eversense">Eversense App (τροποποιημένη)</string>
     <string name="dexcomg5_nsupload_title">Ανέβασμα δεδομένων BG στο NS</string>
     <string name="bgsource_upload">Ανέβασμα ρυθμίσεων BG</string>
     <string name="wear_detailed_delta_title">Εμφάνιση λεπτομερών στατιστικών</string>
     <string name="wear_detailed_delta_summary">Δείξτε τη διαφορά με ένα επιπλέον δεκαδικό ψηφίο</string>
     <string name="smbmaxminutes_summary">Τα μέγιστα λεπτά του βασικού ρυθμού που περιορίζουν το SMB να</string>
-    <string name="unsupportedfirmware">Μη υποστηριζόμενη έκδοση στην αντλία</string>
     <string name="dexcomg5_xdripupload_title">Αποστολή δεδομένων BG στο xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Στο xDrip+, επιλέξτε την πηγή δεδομένων 640g / Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Η τιμή του βασικού αντικαταστάθηκε από την ελάχιστη υποστηριζόμενη τιμή: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Η τιμή του βασικού αντικαταστάθηκε από την μέγιστη υποστηριζόμενη τιμή: %1$s</string>
     <string name="overview_editquickwizard_usebg">Υπολογισμός BG</string>
     <string name="overview_editquickwizard_usebolusiob">Υπολογισμός του IOB bolus</string>
     <string name="overview_editquickwizard_usebasaliob">Υπολογισμός βασικού IOB</string>
@@ -697,8 +500,6 @@
     <string name="closedmodeenabled">Ενεργοποιήθηκε η κλειστή λειτουργία</string>
     <string name="maxiobset">Το μέγιστο IOB έχει ρυθμιστεί σωστά</string>
     <string name="hasbgdata">BG διαθέσιμη από επιλεγμένη πηγή</string>
-    <string name="basalprofilenotaligned">Οι τιμές του βασικού ρυθμού δεν αντιστοιχούν σε ώρες: %1$s</string>
-    <string name="zerovalueinprofile">Μη έγκυρο προφίλ: %1$s</string>
     <string name="combo_programming_bolus">Προγραμματισμός της αντλίας για bolus</string>
     <string name="combo_refresh">Ανανέωση</string>
     <string name="combo_pump_state_label">Κατάσταση</string>
@@ -737,7 +538,6 @@
     <string name="extendedbolusdeliveryerror">Σφάλμα έγχυσης εκτεταμένου bolus</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">πριν</string>
-    <string name="format_hours">%1$.2f h</string>
     <string name="enablesmbalways">Πάντα ενεργό SMB</string>
     <string name="enablesmbalways_summary">Ενεργοποιήστε τις ΜΜΕ ανεξάρτητα από τα bolus. Πιθανόν μόνο με πηγές BG με καλό φιλτράρισμα δεδομένων, όπως το G5</string>
     <string name="enablesmbaftercarbs">Ενεργοποίηση SMB μετά από υδατάνθρακες</string>
@@ -748,8 +548,6 @@
     <string name="enablesmbwithtemptarget_summary">Ενεργοποίηση του SMB όταν υπάρχει ενεργός προσωρινός στόχος (τρώω σύντομα, άσκηση)</string>
     <string name="enablesmbwithhightemptarget">Ενεργοποίηση SMB με υψηλούς προσωρινούς στόχους</string>
     <string name="enablesmbwithhightemptarget_summary">Ενεργοποίηση SMB όταν υπάρχει ενεργός υψηλός προσωρινός στόχος (άσκηση)</string>
-    <string name="let_temp_basal_run">Αφήστε τον προσωρινό ρυθμό ενεργό</string>
-    <string name="mute">Σίγαση</string>
     <string name="overview_insulin_label">Ινσουλίνη</string>
     <string name="overview_carbs_label">Υδατάνθρακες</string>
     <string name="overview_buttons_selection">Πλήκτρα</string>
@@ -791,7 +589,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Εκτελείται έκδοση Dev. Το κλειστό κύκλωμα είναι απενεργοποιημένο.</string>
     <string name="engineering_mode_enabled">Μηχανική λειτουργία ενεργοποιημένη</string>
     <string name="not_eng_mode_or_release">Η μηχανική λειτουργία δεν είναι ενεργοποιημένη και δεν είναι ελευθερωμένη</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Ανάγνωση βασικού προφίλ</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Το ιστορικό της αντλίας έχει αλλάξει μετά την εκτέλεση του υπολογισμού του bolus. Το bolus δεν εκτελέστηκε. Παρακαλούμε να υπολογίσετε ξανά αν είναι ακόμα απαραίτητο.</string>
     <string name="combo_error_updating_treatment_record">Το bolus εκτελέστηκε με επιτυχία, αλλά η καταχώριση στην θεραπεία απέτυχε. Αυτό μπορεί να συμβεί εάν χορηγηθούν δύο bolus ίδιου μεγέθους μέσα σε 2 λεπτά. Ελέγξτε το ιστορικό της αντλίας και το ιστορικό στο μενού Θεραπείες και χρησιμοποιείστε το Careportal για να εισαγάγετε τα στοιχεία που λείπουν. Βεβαιωθείτε ότι δεν εισάγετε το ίδιο μέγεθος στον ακριβώς ίδιο χρόνο.</string>
@@ -814,15 +611,10 @@
     <string name="smbdisabledinpreferences">Το SMB απενεργοποιήθηκε στις Επιλογές</string>
     <string name="uamdisabledinpreferences">Το UAM απενεργοποιήθηκε στις Επιλογές</string>
     <string name="uamdisabledoref1notselected">Το UAM απενεργοποιήθηκε επειδή είναι ενεργοποιημένο στην προσθήκη ευαισθησία στο Oref1</string>
-    <string name="limitingbasalratio">Ο μέγιστος βασικός ρυθμός περιορίζεται σε %1$.2f U/h λόγω ότι %2$s</string>
-    <string name="pumplimit">όριο αντλίας</string>
-    <string name="itmustbepositivevalue">πρέπει να είναι θετική τιμή</string>
     <string name="maxbasalmultiplier">πολλαπλασιαστής μέγιστου βασικού</string>
     <string name="maxdailybasalmultiplier">πολλαπλασιαστής ημερήσιου μέγιστου βασικού</string>
     <string name="smb_frequency_exceeded">Ένα bolus παραδόθηκε μέσα στα τελευταία 3 λεπτά, παράκαμψη SMB</string>
     <string name="basal_set_correctly">Ο βασικός ρυθμός ορίστηκε σωστά</string>
-    <string name="limitingpercentrate">Περιορίζεται το μέγιστο επί τοις εκατό ποσοστό σε %1$d%% λόγω %2$s</string>
-    <string name="limitingbolus">Περιορίζεται το bolus σε %1$.1f U λόγω %2$s</string>
     <string name="limitingextendedbolus">Περιορίζεται το εκτεταμένο bolus σε %1$.1f U λόγω %2$s</string>
     <string name="limitingmaxiob">Περιορίζεται η μέγιστη IOB σε %1$.1f U λόγω %2$s</string>
     <string name="limitingcarbs">Περιορίζονται οι υδατάνθρακες σε %1$d g λόγω %2$s</string>
@@ -837,7 +629,6 @@
     <string name="smbnotallowedinopenloopmode">To SMB δεν επιτρέπεται σε λειτουργία ανοιχτού κυκλώματος</string>
     <string name="food_short">Φαγητό</string>
     <string name="reset">επαναφορά</string>
-    <string name="waitingfortimesynchronization">Αναμονή για συγχρονισμό ώρας (%1$d δευτ)</string>
     <string name="loopdisconnectedfor">Αποσυνδέθηκε (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Μέγιστη συνολική IOB το OpenAPS δεν μπορεί να πάει πάνω από [U]</string>
     <string name="openapssmb_maxiob_summary">Αυτή η τιμή ονομάζεται μέγιστη IOB στο OpenAPS\nTο OpenAPS δεν θα προσθέσει περισσότερη ινσουλίνη αν η τρέχουσα IOB είναι μεγαλύτερη από αυτή την τιμή</string>
@@ -853,7 +644,6 @@
     <string name="nav_setupwizard">Οδηγός εγκατάστασης</string>
     <string name="setupwizard_finish">ΤΕΛΟΣ</string>
     <string name="setupwizard_language_prompt">Επιλέξτε τη γλώσσα σας</string>
-    <string name="boluserrorcode">Απαιτείται: %1$.2fU Παραδόθηκε: %2$.2fU Κωδικός σφάλματος: %3$s</string>
     <string name="firstinsulinincrement">Πρώτη αύξηση ινσουλίνης</string>
     <string name="secondinsulinincrement">Δεύτερη αύξηση ινσουλίνης</string>
     <string name="thirdinsulinincrement">Τρίτη αύξηση ινσουλίνης</string>
@@ -876,7 +666,6 @@
     <string name="virtualpump_type">Τύπος εικονικής αντλίας</string>
     <string name="virtualpump_definition">Ορισμός Αντλίας</string>
     <string name="virtualpump_pump_def">Bolus: Άμεσο=%1$s\nΕκτεταμένο Bolus: [Άμεσο=%2$s, Διάρκεια=%3$smin-%4$sh]\nΒασικός: Άμεσο=%5$s\nTBR: %6$s (με %7$s), Διάρκεια=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Υποστηρίζονται μόνο διακριτές τιμές και όχι εύρος τιμών για βασικό/bolus στην εικονική αντλία.</string>
     <string name="ns_autobackfill_title">Αυτόματη φόρτωση BG</string>
     <string name="wear_wizard_settings">Ρυθμίσεις Γρήγορου Οδηγού</string>
     <string name="wear_wizard_settings_summary">Υπολογισμοί που περιλαμβάνονται στο αποτέλεσμα του γρήγορου οδηγού:</string>
@@ -906,18 +695,6 @@
     <string name="request">Αίτημα</string>
     <string name="insulinsourcesetup">Ρυθμίστε την προσθήκη ινσουλίνης</string>
     <string name="exit">Έξοδος</string>
-    <string name="danar_useroptions">Ρυθμίσεις χρήστη</string>
-    <string name="danar_timedisplay">Μορφή ώρας</string>
-    <string name="danar_buttonscroll">Πλήκτρα κύλισης</string>
-    <string name="danar_beep">Ήχος πλήκτρων</string>
-    <string name="danar_pumpalarm">Συναγερμός</string>
-    <string name="danar_pumpalarm_sound">Ήχος</string>
-    <string name="danar_pumpalarm_vibrate">Δόνηση</string>
-    <string name="danar_pumpalarm_both">Και τα δύο</string>
-    <string name="danar_glucoseunits">Μονάδες γλυκόζης</string>
-    <string name="danar_saveuseroptions">Αποθήκευση ρυθμίσεων στην αντλία</string>
-    <string name="option_on">Ενεργό</string>
-    <string name="option_off">Ανενεργό</string>
     <string name="open_navigation">Άνοιγμα μενού πλοήγησης</string>
     <string name="close_navigation">Κλείσιμο μενού πλοήγησης</string>
     <string name="nav_plugin_preferences">Επιλογές προσθήκης</string>
@@ -933,8 +710,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Χαμηλότερη ευαισθησία για προσωρινό στόχο < 100]]></string>
     <string name="combo_invalid_setup">Εσφαλμένη ρύθμιση αντλίας. Ελέγξτε τα κείμενα και βεβαιωθείτε ότι η Quick Info ονομάζεται QUICK INFO χρησιμοποιώντας το λογισμικό διαμόρφωσης 360.</string>
     <string name="custom">Προσαρμογή</string>
-    <string name="largetimedifftitle">Μεγάλη χρονική διαφορά</string>
-    <string name="largetimediff">Μεγάλη χρονική διαφορά:\nΗ ώρα στην αντλία διαφέρει περισσότερο από 1,5 ώρες. \nΠαρακαλώ ρυθμίστε την ώρα χειροκίνητα στην αντλία και βεβαιωθείτε ότι η ανάγνωση του ιστορικού από την αντλία δεν προκαλεί απροσδόκητη συμπεριφορά. \nΑν είναι δυνατόν, αφαιρέστε το ιστορικό από την αντλία πριν την αλλαγή της ώρας ή κλείστε το κλειστό κύκλωμα για μία DIA μετά την τελευταία λάθος καταχώρηση ιστορικού αλλά κατ΄ελάχιστο μία DIA από τώρα.</string>
     <string name="careportal_removestartedevents">Ξεκίνησε το AndroidAPS καθαρό</string>
     <string name="storedsettingsfound">Βρέθηκαν αποθηκευμένες ρυθμίσεις</string>
     <string name="allow_hardware_pump_text">Προσοχή: Εάν ενεργοποιήσετε και συνδεθείτε με μια αντλία, το AndroidAPS θα αντιγράψει τις ρυθμίσεις βασικού από το προφίλ στην αντλία, αντικαθιστώντας τον υπάρχων βασικό ρυθμό της αντλίας. Βεβαιωθείτε ότι έχετε τον σωστό βασικό ρυθμό στο AndroidAPS. Εάν δεν είστε βέβαιοι ή δεν θέλετε να αντικαταστήσετε τον βασικό ρυθμό στην αντλία σας, πατήστε Άκυρο και επαναλάβετε εναλλαγή προς την αντλία σε μεταγενέστερο χρόνο.</string>
@@ -958,17 +733,10 @@
     <string name="setupwizard_preferred_aps_mode">Προτιμώμενη λειτουργία APS</string>
     <string name="treatments_wizard_total_label">Σύνολο</string>
     <string name="calculation_short">Υπολογ</string>
-    <string name="handshaking">Δημιουργία σύνδεσης</string>
     <string name="sendlogfiles">Στείλτε τα αρχεία καταγραφής της ημέρας στους προγραμματιστές μαζί με αυτή τη φορά. Απροσδόκητη κατάσταση.</string>
-    <string name="maxbolusviolation">Υπέρβαση μέγιστου bolus</string>
-    <string name="commanderror">Σφάλμα εντολής</string>
-    <string name="speederror">Σφάλμα ταχύτητας</string>
-    <string name="insulinlimitviolation">Υπέρβαση του ορίου ινσουλίνης</string>
     <string name="loop_openmode_min_change">Ελάχιστο αίτημα για αλλαγή [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Το Ανοιχτό κύκλωμα θα εμφανίσει νέο μήνυμα αλλαγής μόνο αν η αλλαγή είναι μεγαλύτερη από αυτήν τη τιμή %. Προεπιλεγμένη τιμή 20%</string>
-    <string name="pairfirst">Παρακαλώ συνδέστε την αντλία στο τηλέφωνο!</string>
     <string name="searching_for_devices">Αναζήτηση συσκευών…</string>
-    <string name="please_wait">Περιμένετε…</string>
     <string name="pairing_completed">Σύζευξη ολοκληρώθηκε</string>
     <string name="code_compare">Ταιριάζουν οι εμφανιζόμενοι κωδικοί με αυτούς της αντλίας;</string>
     <string name="insight_pairing">Σύζευξη Insight</string>
@@ -1057,7 +825,6 @@
     <string name="isequalorgreater">είναι ίσο ή μεγαλύτερο από</string>
     <string name="isgreater">είναι μεγαλύτερο από</string>
     <string name="isnotavailable">δεν είναι διαθέσιμο</string>
-    <string name="unknown">άγνωστο</string>
     <string name="glucoseisnotavailable">Γλυκόζη δεν είναι διαθέσιμη</string>
     <string name="glucosecomparedmgdl">Γλυκόζη %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Γλυκόζη %1$s %2$.1f %3$s</string>
@@ -1074,23 +841,10 @@
     <string name="automation_short">Αυτόματο</string>
     <string name="automation">Αυτοματισμός</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Αλλαγή αρχείου αισθητήρα σε NS</string>
     <string name="dexcom_lognssensorchange_summary">Δημιουργία συμβάντος «Αλλαγή αισθητήρα» στο NS αυτόματα με έναρξη αισθητήρα</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">δευτερόλεπτο</string>
-    <string name="unit_minute">λεπτό</string>
-    <string name="unit_hour">ώρα</string>
-    <string name="unit_day">ημέρα</string>
-    <string name="unit_week">εβδομάδα</string>
-    <string name="unit_seconds">δευτερόλεπτα</string>
-    <string name="unit_minutes">λεπτά</string>
-    <string name="unit_hours">ώρες</string>
-    <string name="unit_days">ημέρες</string>
-    <string name="unit_weeks">εβδομάδες</string>
     <string name="summary_tidepool_username">Το όνομα χρήστη του Tidepool, συνήθως το mail σας</string>
     <string name="title_tidepool_username">Όνομα Χρήστη</string>
     <string name="summary_tidepool_password">Το συνθηματικό του Tidepool</string>
@@ -1130,7 +884,6 @@
     <string name="old_version">παλιά έκδοση</string>
     <string name="very_old_version">πολύ παλιά έκδοση</string>
     <string name="twohours">2ώρες</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Εφαρμογή Dexcom (τροποποιημένη)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Λάβετε τις τιμές BG από την εφαρμογή του Dexcom.</string>
@@ -1194,10 +947,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Επιλεγμένο</string>
     <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="rileylink_scanner_ble_not_supported">Χαμηλή ενέργεια Bluetooth δεν υποστηρίζεται.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth μη ενεργοποιημένο.</string>
-    <string name="location_not_found_title">Τοποθεσία μη ενεργοποιημένη</string>
-    <string name="location_not_found_message">Για την εύρεση Bluetooth σε νεότερες συσκευές, η τοποθεσία πρέπει να είναι ενεργοποιημένη. Το AAPS δεν παρακολουθεί την τοποθεσία σας και μπορεί να απενεργοποιηθεί μετά την επιτυχή σύζευξη.</string>
     <string name="location_yes">Ενεργοποίηση</string>
     <string name="location_no">Όχι</string>
     <string name="rileylink_scanner_scanning">Σάρωση</string>
@@ -1238,7 +987,6 @@
     <string name="rileylink_error_tuneup_failed">TuneUp απέτυχε</string>
     <string name="rileylink_error_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
     <string name="rileylink_error_pod_unreachable">Το Pod δεν είναι διαθέσιμο</string>
-    <string name="rileylink_error_address_not_set_short">Μη ορισμένο</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Αντλία Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1306,7 +1054,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus constraint applied: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Μικρή απορρόφηση υδατανθράκων ανιχνεύτηκε: %2$d%% της ώρας. Τσεκάρετε τους υπολογισμούς σας. COB μπορεί να υπερεκτιμήθηκε και να δόθηκε περισσότερη ινσουλίνη!!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Χορήγηση του αποτελέσματος αυτού του μέρους του υπολογισμού bolus [%]</string>
     <string name="deliverpartofboluswizard">Ο Υπολογισμός Bolus κάνει υπολογισμούς αλλά μόνο αυτό το μέρος της υπολογίσημης ινσουλίνης χορηγείται. Χρήσιμο με τον αλγόριθμο SMB.</string>
     <string name="loading">Φόρτωση ...</string>
@@ -1314,7 +1061,6 @@
     <string name="time_range">Εύρος χρόνου</string>
     <string name="timerange_value">Ο χρόνος είναι μεταξύ %1$s και %2$s</string>
     <string name="between">Ανάμεσα </string>
-    <string name="close">Κλείσιμο</string>
     <string name="increasingmaxbasal">Αυξείστε την μέγιστη βασική τιμή, επειδή η ρύθμιση είναι χαμηλότερη από τη μέγιστη βασική στο προφίλ σας</string>
     <string name="smscommunicator_messagebody">Μη έγκυρο μήνυμα</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1325,4 +1071,13 @@
     <string name="unit_minute_short">min</string>
     <string name="format_carbs">%1$dg</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b7498bed57..2193c826d8 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Restablecer las bases de datos</string>
     <string name="reset_db_confirm">¿Realmente quiere restablecer las bases de datos?</string>
     <string name="nav_exit">Salir</string>
-    <string name="danar_useextended_title">Usar bolos extendidos para &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Usar siempre valores basales absolutos</string>
     <string name="alert_dialog_storage_permission_text">Por favor reinicia el teléfono o AndroidAPS desde ajustes de sistema, sino AndroidAPS no guardará registros (importante para trazar y verificar que el algoritmo funcione correctamente)</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Este dispositivo no parece soportar la optimización de la batería por los ajustes - pueden ocurrir problemas de funcionamiento.</string>
     <string name="description_actions">Algunos botones para acceder rápidamente a funciones comunes</string>
-    <string name="description_careportal">Insertar notas de registro avanzadas.</string>
     <string name="description_config_builder">Utilizado para configurar complementos activos</string>
     <string name="description_objectives">Programa de aprendizaje</string>
     <string name="description_food">Muestra los ajustes preestablecidos de alimentos definidos en Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Proporciona el perfil definido en Nightscout</string>
     <string name="description_profile_simple">Definir un perfil con un solo bloque de tiempo.</string>
     <string name="description_pump_combo">Integración de bombas de insulina Accu-Check Combo, necesita tener ruffy instalado</string>
-    <string name="description_pump_dana_r">Integración de bombas de insulina de DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Integración de bombas de insulina domésticas de DANA Diabecare R</string>
-    <string name="description_pump_dana_r_v2">Integración para bombas de insulina DANA Diabecare R con el firmware actualizado</string>
-    <string name="description_pump_dana_rs">Integración de bombas de insulina de DANA Diabecare RS</string>
     <string name="description_pump_mdi">Integración de bomba de insulina para personas que usan varias inyecciones diarias para su terapia de diabetes</string>
     <string name="description_pump_virtual">Integración para bombas de insulina que aún no tienen ningún controlador/driver (lazo abierto)</string>
     <string name="description_sensitivity_aaps">Sensibilidad calculada de la misma manera que Oref0, pero puede especificarse el rango de tiempo. Absorción de carbohidratos mínima se calcula con el máximo tiempo de absorción de carbohidratos en preferencias.</string>
@@ -53,13 +46,6 @@
     <string name="description_wear">Usar tu reloj WearOS para observar y controlar AndroidAPS.</string>
     <string name="description_xdrip_status_line">Mostrar información sobre tu lazo en tu esfera xDrip+.</string>
     <string name="description_sms_communicator">Control remoto de AndroidAPS mediante comandos SMS.</string>
-    <string name="nsprofileview_units_label">Unidades</string>
-    <string name="nsprofileview_dia_label">DIA (Duración Insulina Activa)</string>
-    <string name="nsprofileview_ic_label">IC (Ratio Insulina/Carbohidratos)</string>
-    <string name="nsprofileview_isf_label">ISF (Factor Sensibilidad Insulina)</string>
-    <string name="nsprofileview_basal_label">Dosis Basal</string>
-    <string name="nsprofileview_target_label">Objetivo</string>
-    <string name="noprofileset">NINGÚN PERFIL ACTIVO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">Carbohidratos:</string>
     <string name="treatments_iob_label_string">IOB (Insulina Activa):</string>
@@ -75,15 +61,9 @@
     <string name="treatments_wizard_tt_label">OT</string>
     <string name="treatments_wizard_carbs_label">Carbohidratos</string>
     <string name="treatments_wizard_correction_label">Corrección</string>
-    <string name="insulin_unit_shortname">Uds</string>
     <string name="treatments_wizard_bolusiob_label">Bolo IOB</string>
     <string name="openapsma_run">Ejecutar ahora</string>
     <string name="vitualpump_label">BOMBA VIRTUAL</string>
-    <string name="pump_basebasalrate_label">Dosis Basal Base</string>
-    <string name="pump_tempbasal_label">Basal Temporal</string>
-    <string name="virtualpump_extendedbolus_label">Bolo extendido</string>
-    <string name="pump_battery_label">Batería</string>
-    <string name="pump_reservoir_label">Depósito</string>
     <string name="virtualpump_resultok">Ok</string>
     <string name="openapsma_lastrun_label">Última acción</string>
     <string name="openapsma_inputparameters_label">Parámetros de entrada</string>
@@ -95,16 +75,11 @@
     <string name="result">Resultado</string>
     <string name="result_insulin_carbs">Resultado: %1$s %2$ss</string>
     <string name="openapsma_noglucosedata">No hay disponibles datos de glucosa</string>
-    <string name="nochangerequested">Ninguna acción requerida</string>
     <string name="openapsma_request_label">Solicitud</string>
-    <string name="rate">Dosis</string>
-    <string name="duration">Duración</string>
-    <string name="reason">Motivo</string>
     <string name="glucose">Glucosa</string>
     <string name="delta">Variación</string>
     <string name="sms_delta">Variación:</string>
     <string name="configbuilder">Tabla de configuraciones</string>
-    <string name="objectives">Objetivos</string>
     <string name="overview">Inicio</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simple</string>
@@ -122,7 +97,6 @@
     <string name="configbuilder_general">Ajustes generales</string>
     <string name="configbuilder_general_description">Complementos genéricos que pueden serte útiles.</string>
     <string name="configbuilder_constraints_description">¿Qué restricciones se aplican?</string>
-    <string name="days">días</string>
     <string name="constraints">Restricciones</string>
     <string name="loop">Lazo</string>
     <string name="configbuilder_loop">Lazo</string>
@@ -138,7 +112,6 @@
     <string name="openapsma_disabled">Complemento desactivado</string>
     <string name="constraints_violation">Violación restricciones</string>
     <string name="treatmentdeliveryerror">Error de administración del bolo</string>
-    <string name="tempbasaldeliveryerror">Basal Temporal no emitida</string>
     <string name="overview_newtempbasal_basalpercent">Valor basal [%]</string>
     <string name="setbasalquestion">Aceptar nueva basal temporal:</string>
     <string name="overview_treatment_label">Tratamiento</string>
@@ -149,7 +122,6 @@
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Dosis Basal</string>
     <string name="sms_basal">Dosis Basal:</string>
-    <string name="carbs">Carbohidratos</string>
     <string name="changeyourinput">¡Cambiar datos!</string>
     <string name="configbuilder_bgsource">Origen BG</string>
     <string name="configbuilder_bgsource_description">¿De donde debe AndroidAPS obtener sus datos?</string>
@@ -166,25 +138,6 @@
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Restricción aplicada en bolo</string>
     <string name="carbsconstraintapplied">Restricción aplicada en carbohidratos</string>
-    <string name="careportal_bgcheck">MEDIR GLUCOSA</string>
-    <string name="careportal_announcement">ANUNCIO</string>
-    <string name="careportal_note">NOTA</string>
-    <string name="careportal_question">Pregunta</string>
-    <string name="careportal_exercise">Ejercicio</string>
-    <string name="careportal_pumpsitechange">Cambio Lugar Bomba</string>
-    <string name="careportal_cgmsensorinsert">Insertar sensor</string>
-    <string name="careportal_cgmsensorstart">Iniciar sensor</string>
-    <string name="careportal_insulincartridgechange">Cambio Cartucho insulina</string>
-    <string name="careportal_profileswitch">Cambio de perfil</string>
-    <string name="careportal_snackbolus">Bolo de aperitivo</string>
-    <string name="careportal_mealbolus">Bolo de comida</string>
-    <string name="careportal_correctionbolus">Bolo de corrección</string>
-    <string name="careportal_combobolus">Combo bolo</string>
-    <string name="careportal_tempbasalstart">Basal Temporal Inicio</string>
-    <string name="careportal_tempbasalend">Basal Temporal Fin</string>
-    <string name="careportal_carbscorrection">Corrección Carbohidratos</string>
-    <string name="careportal_openapsoffline">OpenAPS sin conexión</string>
-    <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
     <string name="careportal_newnstreatment_other">Otro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -216,7 +169,6 @@
     <string name="openapsma_maxbasal_summary">Este valor es llamado max basal en OpenAPS</string>
     <string name="openapsma_maxiob_title">Max IOB basal que OpenAPs puede emitir [U]</string>
     <string name="openapsma_maxiob_summary">Este valor es llamado Max Iob en el OpenAPS\nEsta es la máxima insulina en [U] que APS puede entregar a la vez.</string>
-    <string name="dismiss">DESCARTAR</string>
     <string name="password_preferences_encrypt_prompt">Se le solicitará la contraseña maestra, que se utilizará para cifrar las preferencias exportadas.</string>
     <string name="password_preferences_decrypt_prompt">Se le solicitará la contraseña maestra, que es necesaria para descifrar las preferencias importadas.</string>
     <string name="preferences_export_canceled">¡Exportación cancelada! ¡Las preferencias NO se han exportado!</string>
@@ -247,34 +199,12 @@
     <string name="prefdecrypt_issue_modified">¡El archivo se ha modificado tras la exportación!</string>
     <string name="prefdecrypt_issue_parsing">Error de descifrado, ¡el análisis de las preferencias ha fallado!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">¡Algoritmo de cifrado no soportado o no especificado!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Conectando</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnected">Desconectado</string>
-    <string name="danar_pump_settings">Ajustes de la bomba Dana</string>
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
     <string name="end_user_license_agreement_text">NO DEBE UTILIZARSE PARA TOMAR DECISIONES MÉDICAS. NO HAY NINGUNA GARANTÍA PARA EL PROGRAMA, EN LA MEDIDA PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE LO CONTRARIO POR ESCRITO, LOS TITULARES DE LOS DERECHOS DE AUTOR Y/O OTRAS PARTES PROPORCIONAN EL PROGRAMA \"TAL CUAL\" SIN GARANTÍA DE NINGÚN TIPO, YA SEA EXPRESA O IMPLÍCITA, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDAD Y ADECUACIÓN PARA UN PROPÓSITO EN PARTICULAR. TODO EL RIESGO EN CUANTO A LA CALIDAD Y EL RENDIMIENTO DEL PROGRAMA ES SUYA. SI EL PROGRAMA TUVIERA UN ERROR, USTED ASUME EL COSTE DE TODO SERVICIO, REPARACIÓN O CORRECCIÓN NECESARIOS.</string>
     <string name="end_user_license_agreement_i_understand">ENTIENDO Y ACEPTO</string>
     <string name="save">Guardar</string>
-    <string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
-    <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
-    <string name="connectionerror">Error de conexión de la bomba</string>
-    <string name="danar_iob_label">Bomba IOB</string>
-    <string name="danar_dailyunits">Unidades diarias</string>
-    <string name="pump_lastbolus_label">Último bolo</string>
-    <string name="hoursago">Hace %1$.1fh</string>
-    <string name="danar_invalidinput">Datos inválidos</string>
-    <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
     <string name="reloadprofile">Recargar Perfil</string>
-    <string name="danar_viewprofile">Ver perfil</string>
-    <string name="enacted">Aprobado</string>
-    <string name="comment">Comentario</string>
-    <string name="success">Correcto</string>
-    <string name="percent">Porciento</string>
-    <string name="absolute">Absoluto</string>
-    <string name="canceltemp">Cancelar basal temporal</string>
     <string name="smscommunicator">Comunicador SMS</string>
-    <string name="waitingforpumpresult">Esperando resultado</string>
     <string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para entregar bolo %1$.2fU responder con código %2$s</string>
@@ -295,54 +225,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Objetivo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Objetivo %1$s para %2$d minutos establecido correctamente</string>
     <string name="smscommunicator_tt_canceled">Objetivo temporal cancelado con éxito</string>
-    <string name="bolusdelivering">Infundiendo %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos vía SMS</string>
-    <string name="glucosetype_finger">Dedo</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manualmente</string>
-    <string name="careportal_temporarytarget">Objetivo temporal</string>
-    <string name="careportal_temporarytargetcancel">Cancelar Objetivo temporal</string>
     <string name="danarprofile">Configuración perfil DanaR</string>
     <string name="danarprofile_dia">Tiempo de acción de la insulina [h]</string>
     <string name="danarprofile_dia_summary">Duración de actividad de insulina</string>
-    <string name="failedupdatebasalprofile">No se pudo actualizar el perfil basal</string>
-    <string name="danar_historyreload">Recargar</string>
     <string name="uploading">Subiendo</string>
-    <string name="danar_ebolus">E bolo</string>
-    <string name="danar_dsbolus">bolo DS</string>
-    <string name="danar_debolus">DE bolo</string>
-    <string name="danar_error">error</string>
-    <string name="danar_refill">rellenar</string>
-    <string name="danar_basalhour">basal hora</string>
-    <string name="danar_glucose">glucosa</string>
-    <string name="danar_carbohydrate">carbohidratos</string>
-    <string name="danar_alarm">alarma</string>
-    <string name="danar_totaluploaded">Total %1$d registros cargados</string>
-    <string name="danar_sbolus">S bolo</string>
-    <string name="danar_history_alarm">Alarmas</string>
-    <string name="danar_history_basalhours">Basal Horas</string>
-    <string name="danar_history_bolus">Bolos</string>
-    <string name="danar_history_carbohydrates">Carbohidratos</string>
-    <string name="danar_history_dailyinsulin">Insulina Diaria</string>
-    <string name="danar_history_errors">Errores</string>
-    <string name="danar_history_glucose">Glucosa</string>
-    <string name="danar_history_refill">Rellenar</string>
-    <string name="danar_history_syspend">Suspender</string>
-    <string name="danar_history_connectingfor">Conexión por %1$d s</string>
-    <string name="danar_password_title">Contraseña de la bomba</string>
-    <string name="wrongpumppassword">¡Contraseña de la bomba incorrecta!</string>
-    <string name="pumpbusy">Bomba ocupada</string>
-    <string name="overview_bolusprogress_delivered">Entregado</string>
-    <string name="overview_bolusprogress_stoped">Detenido</string>
     <string name="bolusstopped">Bolo interrumpido</string>
     <string name="bolusstopping">Deteniendo bolo</string>
-    <string name="occlusion">Oclusión</string>
-    <string name="overview_bolusprogress_stop">Detener</string>
-    <string name="overview_bolusprogress_stoppressed">DETENER PULSADO</string>
-    <string name="waitingforpump">Esperando bomba</string>
-    <string name="overview_bolusprogress_goingtodeliver">Se van a infundir %1$.2fU</string>
-    <string name="youareonallowedlimit">Alcanzado el límite permitido</string>
-    <string name="noprofileselected">Sin perfil seleccionado</string>
     <string name="smscommunicator_loophasbeendisabled">Lazo se ha desactivado</string>
     <string name="smscommunicator_loophasbeenenabled">Lazo se ha activado</string>
     <string name="smscommunicator_loopisdisabled">Lazo inactivo</string>
@@ -382,11 +271,9 @@
     <string name="mealbolus">Bolo Comida</string>
     <string name="correctionbous">Corrección</string>
     <string name="actions">Acciones</string>
-    <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="ns_upload_only">NS solo subida (sinc. inactiva)</string>
     <string name="ns_upload_only_summary">NS solo subida. No efectivo con SGV salvo que este seleccionada una fuente local como xDrip. No efectivo en perfiles usando perfiles NS.</string>
     <string name="pumpNotInitialized">¡Bomba no iniciada!</string>
-    <string name="pumpNotInitializedProfileNotSet">Bomba no iniciada, ¡perfil no ajustado!</string>
     <string name="primefill">Rellenar/Llenar</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
     <string name="othersettings_title">Otros</string>
@@ -396,8 +283,6 @@
     <string name="button3">Botón 3</string>
     <string name="units_colon">Unidades:</string>
     <string name="units">Unidades</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">Tiempo de acción de la insulina</string>
     <string name="target_range">Rango Objetivo:</string>
     <string name="prefs_range_title">Rango de visualización</string>
@@ -407,17 +292,7 @@
     <string name="wear">Reloj</string>
     <string name="resend_all_data">Reenviar todos los datos</string>
     <string name="open_settings_on_wear">Abrir ajustes en reloj</string>
-    <string name="pumperror">Error en bomba</string>
-    <string name="lowbattery">Batería Baja</string>
-    <string name="pumpshutdown">Apagar Bomba</string>
-    <string name="batterydischarged">Batería de la bomba descargada</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Ratio Basal:</string>
-    <string name="profile_set_failed">Error al activar perfil basal</string>
-    <string name="profile_set_ok">Perfil basal actualizado en bomba</string>
-    <string name="danar_disableeasymode">Inhabilitar modo EasyUI en bomba</string>
-    <string name="danar_enableextendedbolus">Habilitar bolos extendidos en bomba</string>
-    <string name="danar_switchtouhmode">Cambio de modo de U/d a U/h en bomba</string>
     <string name="basalvaluebelowminimum">Valor Basal por debajo del mínimo. Perfil NO aplicado!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Último BG:</string>
@@ -425,7 +300,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Avisos permanentes</string>
     <string name="old_data">DATOS CADUCADOS</string>
-    <string name="minago">%1$d min antes</string>
     <string name="sms_minago">hace %1$d min</string>
     <string name="localprofile">Perfil Local</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -441,41 +315,22 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Actividad</string>
     <string name="removerecord">Eliminar registro</string>
-    <string name="danar_stats">Estadísticas de DanaR</string>
-    <string name="danar_stats_cumulative_tdd">TDD acumulativa</string>
-    <string name="danar_stats_expweight">TDD ampliada exponencialmente</string>
-    <string name="danar_stats_basalrate">Basales</string>
-    <string name="danar_stats_bolus">Bolo</string>
-    <string name="danar_stats_tdd">Dosis diaria</string>
-    <string name="danar_stats_date">Fecha</string>
-    <string name="danar_stats_ratio">Ratio</string>
-    <string name="danar_stats_amount_days"># Días</string>
-    <string name="danar_stats_weight">Peso</string>
-    <string name="danar_stats_warning_Message">Probablemente impreciso si se usan bolos para llenar/rellenar!</string>
-    <string name="danar_stats_olddata_Message">Datos caducados por favor pulsa RELOAD</string>
-    <string name="danar_stats_tbb">Basal total</string>
-    <string name="danar_stats_tbb2">Basal diaria *2</string>
-    <string name="initializing">Inicializando...</string>
     <string name="actions_shortname">ACC</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LAZO</string>
     <string name="simpleprofile_shortname">PERFSIM</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">PERFLOC</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">INICIO</string>
     <string name="virtualpump_shortname">BOMBAV</string>
     <string name="profileviewer_shortname">NSPERF</string>
     <string name="treatments_shortname">TRAT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">RELOJ</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Título corto en pestaña</string>
     <string name="always_use_shortavg">Usa siempre delta media corto en vez de delta simple</string>
     <string name="always_use_shortavg_summary">Útil cuando los datos de fuentes sin filtrar como los de xDrip son inestables.</string>
-    <string name="advancedsettings_title">Ajustes avanzados</string>
-    <string name="danar_model">Modelo: %1$02X Protocolo: %2$02X Codigo: %3$02X</string>
     <string name="profile">Perfiles</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valor predeterminado: 3 Esta es una protección de seguridad en OpenAPS. Lo que esto hace es limitar tus basales a 3x (en este caso) tu mayor índice basal. Probablemente no necesites cambiar esto, pero debes tener en cuenta las discusiones sobre \"3x max diaria; 4x actual\" para protecciones de seguridad.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de la protección de seguridad de \"3x max diaria, 4x actual\". Esto significa, que tu basal, independientemente de tu máxima basal ajustada en la bomba, no puede ser mas alta que este número de veces el actual nivel de basal. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la basal sin entender como trabaja el algoritmo. El ajuste por defecto es 4x; la mayoría de las personas nunca tendrá que cambiar estos ajustes, sino que debe modificar otros ajustes en la terapia si se encuentran cerca de este límite de seguridad.</string>
@@ -494,18 +349,9 @@
     <string name="smscommunicator_calibrationsent">Calibración enviada. La recepción debe estar habilitada en xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip no recibe calibraciones</string>
     <string name="pumpsuspended">Bomba parada</string>
-    <string name="gettingpumpstatus">Recibir estado de bomba</string>
-    <string name="settingtempbasal">Ajustando basal temporal</string>
-    <string name="stoppingtempbasal">Parando basal temporal</string>
-    <string name="settingextendedbolus">Iniciando bolo extendido</string>
-    <string name="stoppingextendedbolus">Parando bolo extendido</string>
-    <string name="updatingbasalrates">Actualizando dosis basales</string>
-    <string name="disconnecting">Desconectando</string>
     <string name="executing">Ejecutando</string>
     <string name="virtualpump_settings">Ajustes bomba virtual</string>
     <string name="virtualpump_uploadstatus_title">Subir estado a NS</string>
-    <string name="wrongpassword">Contraseña incorrecta</string>
-    <string name="approachingdailylimit">Alcanzando el limite de insulina diario</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -529,7 +375,6 @@
     <string name="wear_detailedIOB_title">Mostrar detalles IOB</string>
     <string name="wear_detailedIOB_summary">Separar IOB en bolo y base en el reloj</string>
     <string name="nosuccess">sin efecto - por favor verificar en móvil</string>
-    <string name="notavailable">No disponible</string>
     <string name="patientage">Edad paciente</string>
     <string name="child">Menor de edad</string>
     <string name="teenage">Adolescente</string>
@@ -565,8 +410,6 @@
     <string name="superbolus">Superbolo</string>
     <string name="ns_logappstartedevent">Registrar el inicio de la aplicación en NS</string>
     <string name="restartingapp">Saliendo de la aplicación para aplicar ajustes.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">¿Qué tipo de insulina está utilizando?</string>
     <string name="fastactinginsulin">Insulina acción rápida</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -581,9 +424,6 @@
     <string name="statuslights_bat_critical">Umbral crítico de nivel de batería [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Última conexión</string>
-    <string name="danar_bluetooth_status">Estado de bluetooth</string>
     <string name="nav_about">Acerca de</string>
     <string name="smscommunicator_missingsmspermission">Falta permiso SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permiso de estado del teléfono</string>
@@ -594,17 +434,12 @@
     <string name="wear_showbgi_summary">Agregar BGI a línea de estado</string>
     <string name="ns_noupload">Datos no mandados a NS</string>
     <string name="ns_noupload_summary">Todos los datos mandados a NS son borrados. AAPS esta conectado a NS pero no hay cambios en NS</string>
-    <string name="basal_step">Nivel base</string>
-    <string name="bolus_step">Nivel bolo</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar bolo extendido</string>
     <string name="careportal_sensorage_label">Edad sensor</string>
     <string name="careportal_canulaage_label">Edad cánula</string>
     <string name="careportal_insulinage_label">Edad insulina</string>
-    <string name="hours">horas</string>
-    <string name="invalidprofile">Perfil invalido !!!</string>
     <string name="doprofileswitch">Cambio de perfil</string>
     <string name="careportal_pbage_label">Edad batería bomba</string>
-    <string name="careportal_pumpbatterychange">Cambio batería bomba</string>
     <string name="ns_alarmoptions">Opciones alarma</string>
     <string name="nsalarm_urgenthigh">Urgente alto</string>
     <string name="nsalarm_high">Alto</string>
@@ -628,7 +463,6 @@
     <string name="absorptionsettings_title">Ajustes absorción</string>
     <string name="absorption_maxtime_title">Tiempo max absorción comida [h]</string>
     <string name="absorption_maxtime_summary">Tiempo en horas en el que se espera que todos los carbohidratos hayan sido absorbidos</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizar el bolo extendido como %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -653,7 +487,6 @@
     <string name="careportal_pump_label">BOMBA</string>
     <string name="careportal_newnstreatment_duration_min_label">Duración [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activar UAM</string>
     <string name="enablesmb">Activar SMB</string>
     <string name="enablesmb_summary">Usar Super Micro Bolus en lugar de Basal Temporal para una acción más rápida</string>
@@ -665,23 +498,7 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">DIA de %1$f demasiado corto - usando %2$f!</string>
     <string name="activate_profile">ACTIVAR PERFIL</string>
-    <string name="date">Fecha</string>
     <string name="invalid">INVALIDO</string>
-    <string name="waitingforpairing">Esperando para conectar con bomba</string>
-    <string name="pairingok">Conexión OK</string>
-    <string name="pairingtimedout">Tiempo de Vinculación agotado</string>
-    <string name="pairing">Emparejando</string>
-    <string name="danars_nodeviceavailable">Aparato no encontrado</string>
-    <string name="emptyreservoir">Deposito vacío</string>
-    <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
-    <string name="remaininsulinalert">Insulina restante en deposito</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Bomba seleccionada</string>
-    <string name="pairpump">Conectar bomba nueva</string>
-    <string name="bolusspeed">Velocidad bolo</string>
-    <string name="danar_setbasalstep001">Ajustar paso basal a 0.01 U/h</string>
-    <string name="serialnumber">Número de serie</string>
     <string name="careportal_newnstreatment_percentage_label">Porcentaje</string>
     <string name="careportal_newnstreatment_timeshift_label">Cambio de tiempo</string>
     <string name="default_temptargets">Objetivo temporal por defecto</string>
@@ -691,32 +508,18 @@
     <string name="activity_target">objetivo actividad</string>
     <string name="hypo_duration">Duración Hipo</string>
     <string name="hypo_target">Objetivo Hipo</string>
-    <string name="danar_history_prime">Cebado</string>
-    <string name="gettingextendedbolusstatus">Recibiendo estado de bolo extendido</string>
-    <string name="gettingbolusstatus">Recibiendo estado bolo</string>
-    <string name="gettingtempbasalstatus">Recibiendo estado bolo temporal</string>
-    <string name="gettingpumpsettings">Recibiendo ajustes bomba</string>
-    <string name="gettingpumptime">Recibiendo hora bomba</string>
     <string name="reuse">usar otra vez</string>
     <string name="wearcontrol_title">Control desde reloj</string>
     <string name="wearcontrol_summary">Editar y emitir objetivos temp. y tratamientos desde reloj.</string>
-    <string name="connectiontimedout">Fuera tiempo conexión</string>
     <string name="food">Comida</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<ninguno>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Grasa</string>
     <string name="active"><![CDATA[<Activo>]]></string>
-    <string name="waitingforestimatedbolusend">Esperando terminar bolo. Faltan %1$d seg.</string>
-    <string name="processinghistory">Procesando evento</string>
-    <string name="startingbolus">Iniciando emisión bolo</string>
     <string name="executingrightnow">Orden se esta efectuando en este momento</string>
-    <string name="pumpdrivercorrected">Control de la bomba corregido</string>
     <string name="pump_unreachable">Bomba no alcanzable</string>
     <string name="missed_bg_readings">Faltan lecturas BG</string>
     <string name="raise_notifications_as_android_notifications">Usa avisos del sistema para alarmas y avisos</string>
@@ -726,9 +529,6 @@
     <string name="pump_unreachable_threshold">Bomba no alcanzable durante [min]</string>
     <string name="urgent_alarm">Alarma urgente</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Vigilante de BT</string>
-    <string name="btwatchdog_summary">Apaga el bluetooth del móvil por un segundo si no hay conexión con la bomba. Esto ayuda con algunos móviles con problemas de establecer conexión bluetooth estable.</string>
     <string name="eversense">Eversense App (parcheada)</string>
     <string name="dexcomg5_nsupload_title">Subir datos BG a NS</string>
     <string name="bgsource_upload">Ajuste de subida de datos de glucosa</string>
@@ -740,12 +540,9 @@
     <string name="uamsmbmaxminutes">Minutos máximos de UAM SMB</string>
     <string name="uamsmbmaxminutes_summary">Minutos máximos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Umbral de sugerencia de Carbohidratos</string>
-    <string name="unsupportedfirmware">Firmware de la bomba no soportado</string>
     <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
     <string name="overview_editquickwizard_usebg">Cálculo BG</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo bolo IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo basal IOB</string>
@@ -763,8 +560,6 @@
     <string name="closedmodeenabled">Lazo cerrado activado</string>
     <string name="maxiobset">Máximo IOB ajustado correctamente</string>
     <string name="hasbgdata">BG disponible desde la fuente seleccionada</string>
-    <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
-    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <string name="combo_programming_bolus">Programando bomba para emitir bolo</string>
     <string name="combo_refresh">Actualizar</string>
     <string name="combo_pump_state_label">Estado</string>
@@ -785,7 +580,6 @@
     <string name="bolus_frequency_exceeded">Un bolo de mismo valor ha sido dado durante el pasado minuto. Para evitar bolos dobles y prevenir fallos de programa esto no está permitido.</string>
     <string name="combo_pump_connected_now">Ahora</string>
     <string name="combo_activity_reading_pump_history">Leyendo historia bomba</string>
-    <string name="danar_history">Historial de la bomba</string>
     <string name="combo_activity_setting_basal_profile">Activando perfil base</string>
     <string name="combo_pump_cartridge_low_warrning">Nivel del depósito bajo</string>
     <string name="combo_pump_battery_low_warrning">Batería casi agotada</string>
@@ -804,8 +598,6 @@
     <string name="extendedbolusdeliveryerror">Error al emitir bolo extendido</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">hace</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
     <string name="enablesmbalways">Habilitar SMB siempre</string>
     <string name="enablesmbalways_summary">Habilitar SMB siempre de forma independiente a los Bolos. Solo posible con fuente BG con buen filtrado de datos como G5</string>
     <string name="enablesmbaftercarbs">Habilitar SMB después de Carbohidratos</string>
@@ -816,8 +608,6 @@
     <string name="enablesmbwithtemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) activo (ComerPronto, Actividad)</string>
     <string name="enablesmbwithhightemptarget">Habilitar SMB con Objetivo Temporal Alto</string>
     <string name="enablesmbwithhightemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) ALTO  activo (Actividad)</string>
-    <string name="let_temp_basal_run">Dejar Basal Temporal correr</string>
-    <string name="mute">Silenciar</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carbohidratos</string>
     <string name="overview_buttons_selection">Botones</string>
@@ -859,7 +649,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Ejecutando versión dev. Lazo cerrado no disponible.</string>
     <string name="engineering_mode_enabled">Modo de ingeniería activado</string>
     <string name="not_eng_mode_or_release">Modo de ingeniería no está activado y no disponible en esta rama</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Leyendo perfil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">El historial de la bomba ha cambiado después de que se realizó el cálculo del bolo. El bolo no fue entregado. Por favor, vuelva a calcular si aún se necesita un bolo.</string>
     <string name="combo_error_updating_treatment_record">El bolo se administró con éxito, pero falló la incorporación de la entrada del tratamiento. Esto puede suceder si se administran dos bolos pequeños del mismo tamaño en los últimos dos minutos. Verifique el historial de la bomba y las entradas de tratamiento y use el portal de tratamientos para agregar entradas faltantes. Asegúrese de no agregar ninguna entrada para el mismo minuto exacto y la misma cantidad.</string>
@@ -882,15 +671,10 @@
     <string name="smbdisabledinpreferences">SMB deshabilitado en preferencias</string>
     <string name="uamdisabledinpreferences">UAM, comidas no previstas, no habilitadas en las preferencias</string>
     <string name="uamdisabledoref1notselected">UAM deshabilitado al usar el plugin de sensibilidad Oref1</string>
-    <string name="limitingbasalratio">Limitando max basal rate a %1$.2f U/h debido a %2$s</string>
-    <string name="pumplimit">límite de la bomba</string>
-    <string name="itmustbepositivevalue">tiene que ser un valor positivo</string>
     <string name="maxbasalmultiplier">Multiplicador basal máximo</string>
     <string name="maxdailybasalmultiplier">Multiplicador diario basal máximo</string>
     <string name="smb_frequency_exceeded">Un Bolo ha sido entregado en los últimos 3 minutos, omitiendo SMB</string>
     <string name="basal_set_correctly">Basal establecida correctamente</string>
-    <string name="limitingpercentrate">Limitando porcentaje máximo de dosis a %1$d%% debido a %2$s</string>
-    <string name="limitingbolus">Limitando el bolo a %1$.1f U debido a %2$s</string>
     <string name="limitingextendedbolus">Limitando el bolo extendido a %1$.1f U debido a %2$s</string>
     <string name="limitingmaxiob">Limitando max IOB a %1$.1f U debido a %2$s</string>
     <string name="limitingcarbs">Limitando carbohidratos a %1$d g debido a %2$s</string>
@@ -905,7 +689,6 @@
     <string name="smbnotallowedinopenloopmode">SMB no permitido en modo de lazo abierto</string>
     <string name="food_short">Comida</string>
     <string name="reset">reestablecer</string>
-    <string name="waitingfortimesynchronization">Esperando para sincronización de tiempo (%1$d sec)</string>
     <string name="loopdisconnectedfor">Desconectado (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Máximo IOB total que OpenAPS no puede superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor se denomina IOB máx. En el contexto de OpenAPS\nOpenAPS no agregará más insulina si el IOB actual es mayor que este valor</string>
@@ -921,7 +704,6 @@
     <string name="nav_setupwizard">Asistente de configuración</string>
     <string name="setupwizard_finish">FINALIZAR</string>
     <string name="setupwizard_language_prompt">Selecciona tu idioma</string>
-    <string name="boluserrorcode">Solicitado: %1$.2fU Entregado: %2$.2fU Código de error: %3$s</string>
     <string name="firstinsulinincrement">Primer incremento insulina</string>
     <string name="secondinsulinincrement">Segundo incremento insulina</string>
     <string name="thirdinsulinincrement">Tercer incremento insulina</string>
@@ -944,7 +726,6 @@
     <string name="virtualpump_type">Bomba virtual</string>
     <string name="virtualpump_definition">Definición de la bomba</string>
     <string name="virtualpump_pump_def">Bolo: Paso =%1$s\nBolo Extendido: [paso =%2$s, duración =%3$smin -%4$sh] \nBasal: paso =%5$s\nTBR: %6$s ( %7$s), duración =%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Sólo se soportan valores discretos, no rangos, como entrada de datos para basal/bolo en la bomba virtual.</string>
     <string name="ns_autobackfill_title">Auto Rellenar mediciones perdidas</string>
     <string name="wear_wizard_settings">Configuración del Asistente</string>
     <string name="wear_wizard_settings_summary">Cálculos incluidos en el resultado del asistente:</string>
@@ -974,22 +755,6 @@
     <string name="request">Solicitar</string>
     <string name="insulinsourcesetup">Configurar complemento de insulina</string>
     <string name="exit">Salir</string>
-    <string name="danar_useroptions">Opciones de usuario</string>
-    <string name="danar_timedisplay">Mostrar formato de tiempo</string>
-    <string name="danar_buttonscroll">Botones de desplazamiento</string>
-    <string name="danar_beep">Señal sonora de pulsación</string>
-    <string name="danar_pumpalarm">Alarma</string>
-    <string name="danar_pumpalarm_sound">Sonido</string>
-    <string name="danar_pumpalarm_vibrate">Vibrar</string>
-    <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">Tiempo de encendido de LCD [seconds]</string>
-    <string name="danar_backlight">Tiempo de luz fondo encendida [seconds]</string>
-    <string name="danar_glucoseunits">Unidades de glucosa</string>
-    <string name="danar_shutdown">Apagar [hours]</string>
-    <string name="danar_lowreservoir">Depósito bajo [Units]</string>
-    <string name="danar_saveuseroptions">Guardar las opciones en la bomba</string>
-    <string name="option_on">Activado</string>
-    <string name="option_off">Desactivado</string>
     <string name="open_navigation">Abrir navegación</string>
     <string name="close_navigation">Cerrar navegación</string>
     <string name="nav_plugin_preferences">Preferencias del complemento</string>
@@ -1006,8 +771,6 @@
     <string name="sensitivity_raises_target_title">Sensibilidad aumenta objetivo</string>
     <string name="combo_invalid_setup">Configuración de la bomba incorrecta, leer la documentación y comprobar que el menú de Quick Info se llama QUICK INFO usando el software de configuración 360.</string>
     <string name="custom">Personalizado</string>
-    <string name="largetimedifftitle">Diferencia de tiempo grande</string>
-    <string name="largetimediff">Gran diferencia de tiempo: \nLa bomba esta desincronizada más de 1,5 horas. \npor favor ajusta la hora manualmente en la bomba y asegúrate de que la lectura del histórico de la bomba no causa comportamiento inesperado. \nSi es posible, borra la historia de la bomba antes de cambiar la hora o desactiva el lazo cerrado durante un DIA (duracion insulina activa) después de la última entrada errónea del histórico pero mínimo un DIA a partir de ahora.</string>
     <string name="careportal_removestartedevents">Limpiar eventos AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Ajustes guardados encontrados</string>
     <string name="allow_hardware_pump_text">Atención: si activas y conectas al hardware de la bomba, AndroidAPS copiará los ajustes basales del perfil de la bomba, sobrescribiendo el actual perfil basal de la bomba. Comprueba que tengas el perfil basal correcto en AndroidAPS. Si no estás seguro o no quieres sobrescribir los ajustes basales en la bomba, presiona cancelar y repite cambio de la bomba más tarde.</string>
@@ -1033,17 +796,10 @@
     <string name="setupwizard_preferred_aps_mode">Modo preferido de APS</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Cálculo</string>
-    <string name="handshaking">De acuerdo</string>
     <string name="sendlogfiles">Enviar los archivos de registro de hoy a los desarrolladores. Situación inesperada.</string>
-    <string name="maxbolusviolation">Violación de bolo Max</string>
-    <string name="commanderror">Error de comando</string>
-    <string name="speederror">Error de velocidad</string>
-    <string name="insulinlimitviolation">Violación del límite de insulina</string>
     <string name="loop_openmode_min_change">Valor mínimo de cambio [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">El lazo abierto sólo mostrará una demanda de cambio si el cambio es mayor a este valor. El valor predeterminado es el 20 %</string>
-    <string name="pairfirst">Por favor, empareje su bomba con su teléfono!</string>
     <string name="searching_for_devices">Buscando dispositivos…</string>
-    <string name="please_wait">Por favor, espere…</string>
     <string name="pairing_completed">Sincronización completada</string>
     <string name="code_compare">¿Coinciden los códigos mostrados en este dispositivo y en su infusor?</string>
     <string name="insight_pairing">Insight sincronizada</string>
@@ -1132,7 +888,6 @@
     <string name="isequalorgreater">es igual o mayor que</string>
     <string name="isgreater">es mayor que</string>
     <string name="isnotavailable">no está disponible</string>
-    <string name="unknown">desconocido</string>
     <string name="glucoseisnotavailable">El valor de glucosa no está disponible</string>
     <string name="glucosecomparedmgdl">Glucosa %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucosa %1$s %2$.1f %3$s</string>
@@ -1149,23 +904,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatización</string>
     <string name="profile_total">== ∑%1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registro de cambio de sensor a NS</string>
     <string name="dexcom_lognssensorchange_summary">Crear evento \"Cambio sensor\" en la automatización NS al iniciar el sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">día</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">días</string>
-    <string name="unit_weeks">semanas</string>
     <string name="summary_tidepool_username">Tu nombre de usuario de Tidepool, normalmente tu dirección de correo electrónico</string>
     <string name="title_tidepool_username">Nombre de usuario</string>
     <string name="summary_tidepool_password">Tu contraseña de acceso a Tidepool</string>
@@ -1208,7 +950,6 @@
     <string name="very_old_version">versión muy antigua</string>
     <string name="new_version_warning">Nueva versión desde al menos %1$d dias disponible! Respaldo a LGS después de %2$d días, se deshabilitará el lazo después de %3$d días</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">DexcomG App (parcheada)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Recibir valores de glucosa de la app parcheada de Dexcom.</string>
@@ -1285,10 +1026,6 @@
     <string name="rileylink_scanner_scan_stop">DETENER</string>
     <string name="rileylink_scanner_selected_device">Seleccionado</string>
     <string name="rileylink_scanner_title">Escaneo de RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth de baja energía no soportado.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth no activado.</string>
-    <string name="location_not_found_title">La ubicación no está habilitada</string>
-    <string name="location_not_found_message">Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de la realizada la vinculación.</string>
     <string name="location_yes">Habilitar</string>
     <string name="location_no">No</string>
     <string name="rileylink_scanner_scanning">Buscando</string>
@@ -1329,7 +1066,6 @@
     <string name="rileylink_error_tuneup_failed">Error al configurar</string>
     <string name="rileylink_error_pump_unreachable">Infusora no alcanzable</string>
     <string name="rileylink_error_pod_unreachable">Infusora no alcanzable</string>
-    <string name="rileylink_error_address_not_set_short">Sin configurar</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Infusora Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1399,7 +1135,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricción de bolo aplicada: %2$.2fU a %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>! Se ha detectado una absorción lenta de hidratos de carbono: %2$d%% de tiempo. Compruebe de nuevo su calculo. Los COB se pueden sobrestimar, por lo que ¡se podría administrar más insulina de la cuenta!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f/%2$dU</string>
     <string name="partialboluswizard">Administrar esta parte del resultado del asistente de bolos [%]</string>
     <string name="deliverpartofboluswizard">El asistente de bolos realiza el cálculo, pero solo se entrega esta parte de la insulina calculada. Útil con el algoritmo SMB.</string>
     <string name="loading">Cargando...</string>
@@ -1407,7 +1142,6 @@
     <string name="time_range">Intervalo de tiempo</string>
     <string name="timerange_value">El tiempo está entre %1$s y %2$s</string>
     <string name="between">Entre </string>
-    <string name="close">Cerrar</string>
     <string name="increasingmaxbasal">Aumentar el valor basal máximo porque el ajuste es inferior a tu base máxima en el perfil</string>
     <string name="smscommunicator_messagebody">El cuerpo del mensaje es inválido</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1425,7 +1159,6 @@
     <string name="common_off">Desactivado</string>
     <string name="objectives_button_unfinish">Limpieza finalizada</string>
     <string name="objectives_button_unstart">Limpieza iniciada</string>
-    <string name="timedetection">Detección de tiempo</string>
     <string name="doyouwantresetstart">¿Desea reiniciar el objetivo? Puedes perder tu progreso.</string>
     <string name="nopumpselected">Ninguna bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione las unidades en las que desea visualizar los valores</string>
@@ -1451,7 +1184,6 @@
     <string name="nav_survey">Encuesta</string>
     <string name="invalidage">Entrada de edad no válida</string>
     <string name="invalidweight">Peso no válido</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Promedio</string>
     <string name="tdd">TDD</string>
@@ -1464,12 +1196,8 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Herramientas</string>
     <string name="show_calculation">Mostrar cálculo</string>
-    <string name="error">Error</string>
-    <string name="timeformat12h">12 h</string>
-    <string name="timeformat24h">24 h</string>
     <string name="automation_event">Automatización de eventos</string>
     <string name="alreadyset">Set listo</string>
-    <string name="message">Mensaje</string>
     <string name="clearqueueconfirm">¿Borrar cola? ¡Se perderán todos los datos de la cola!</string>
     <string name="ebstopsloop">El uso de la función de bolo extendido detendrá el modo de bucle cerrado durante el tiempo de ejecución del bolo extendido. ¿Realmente quieres esto?</string>
     <string name="closed_loop_disabled_with_eb">Bucle cerrado inhabilitado debido a la ejecución del bolo extendido</string>
@@ -1489,4 +1217,13 @@
     <string name="onconnect">Al conectar</string>
     <string name="ondisconnect">Al desconectar</string>
     <string name="overview_show_predictions">Predicciones</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index f2c7564cc4..70cc9c5d48 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -17,4 +17,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 92b4ec3892..df9a0e04fa 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Réinitialiser les Bases de Données </string>
     <string name="reset_db_confirm">Voulez-vous vraiment réinitialiser les bases de données ?</string>
     <string name="nav_exit">Quitter</string>
-    <string name="danar_useextended_title">Utiliser les bolus étendus pour &gt; 200%%</string>
-    <string name="danar_bt_name_title">Dispositif Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Utiliser toujours les valeurs absolues du basal</string>
     <string name="alert_dialog_storage_permission_text">Redémarrez votre smartphone ou redémarrez AndroidAPS depuis les paramètres système \nsinon AndroidAPS ne sera pas connecté aux journaux (il est important de suivre et vérifier que les algorithmes fonctionnent correctement)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Ce périphérique ne semble pas permettre l\'optimisation de la batterie par une liste blanche - vous pourriez rencontrer des problèmes de performance.</string>
     <string name="description_actions">Quelques boutons pour accéder rapidement aux fonctions communes</string>
-    <string name="description_careportal">Entrer les données du journal de gestion du diabète.</string>
     <string name="description_config_builder">Utilisé pour configurer les plugins actifs</string>
     <string name="description_objectives">Programme d’apprentissage</string>
     <string name="description_food">Affiche les aliments définis par défaut dans Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Fournit le profil que vous avez défini dans Nightscout</string>
     <string name="description_profile_simple">Définir un profil avec un seul bloc de temps.</string>
     <string name="description_pump_combo">Intégration des pompes Accu-Chek Combo il faut avoir Ruffy installé</string>
-    <string name="description_pump_dana_r">Intégration pour les pompes Diabecare DANA R</string>
-    <string name="description_pump_dana_r_korean">Intégration pour les pompes coréennes de Diabecare DANA RS</string>
-    <string name="description_pump_dana_r_v2">Intégration pour les pompes de DANA Diabecare R avec firmware mis à jour</string>
-    <string name="description_pump_dana_rs">Intégration pour les pompes Diabecare DANA RS</string>
     <string name="description_pump_mdi">Intégration pompe pour les personnes qui font des injections quotidiennes multiples pour le traitement de leur diabète</string>
     <string name="description_pump_virtual">Intégration pour les pompes qui n’ont pas encore de pilote (Boucle Ouverte)</string>
     <string name="description_sensitivity_aaps">La sensibilité est calculée de la même manière que Oref0, mais vous pouvez spécifier la période concernée. L\'absorption minimale des glucides est calculée à partir des temps d’absorption max des glucides du menu préférences.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Surveillez et contrôlez AndroidAPS en utilisant votre montre WearOS.</string>
     <string name="description_xdrip_status_line">Afficher les informations de votre Boucle sur votre écran de montre xDrip+.</string>
     <string name="description_sms_communicator">Commander à distance AndroidAPS en utilisant les commandes SMS.</string>
-    <string name="nsprofileview_units_label">Unités</string>
-    <string name="nsprofileview_dia_label">DAI</string>
-    <string name="nsprofileview_ic_label">G/I (g/U)</string>
-    <string name="nsprofileview_isf_label">SI Sensibilité Insuline</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Cible</string>
-    <string name="noprofileset">PAS DE PROFIL PRÉDÉFINI</string>
     <string name="treatments_insulin_label_string">Insuline:</string>
     <string name="treatments_carbs_label_string">Glucides :</string>
     <string name="treatments_iob_label_string">IA: </string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Glucides</string>
     <string name="treatments_wizard_correction_label">Corr</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IA</string>
     <string name="openapsma_run">Exécuter maintenant</string>
     <string name="vitualpump_label">POMPE VIRTUELLE</string>
-    <string name="pump_basebasalrate_label">Taux du débit Basal</string>
-    <string name="pump_tempbasal_label">Basal temporaire</string>
-    <string name="virtualpump_extendedbolus_label">Bolus étendu</string>
-    <string name="pump_battery_label">Niveau batterie</string>
-    <string name="pump_reservoir_label">Niveau réservoir</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Dernière exécution</string>
     <string name="openapsma_inputparameters_label">Paramètres de saisie</string>
@@ -96,16 +76,11 @@
     <string name="result">Résultats</string>
     <string name="result_insulin_carbs">Résultat: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Pas de données glycémiques disponibles</string>
-    <string name="nochangerequested">Pas de changement demandé</string>
     <string name="openapsma_request_label">Requête</string>
-    <string name="rate">Taux</string>
-    <string name="duration">Durée</string>
-    <string name="reason">Raison</string>
     <string name="glucose">Glucose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Générateur de configuration</string>
-    <string name="objectives">Objectifs</string>
     <string name="overview">Aperçu</string>
     <string name="nsprofile">Profil NS</string>
     <string name="simpleprofile">Profil simple</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Général</string>
     <string name="configbuilder_general_description">Quelques modules d\'extension que vous pourriez trouver utiles.</string>
     <string name="configbuilder_constraints_description">Quelles restrictions sont appliquées ?</string>
-    <string name="days">jours</string>
     <string name="constraints">Restrictions</string>
     <string name="loop">Boucle</string>
     <string name="configbuilder_loop">Boucle</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Plugin désactivé</string>
     <string name="constraints_violation">Violation des restrictions</string>
     <string name="treatmentdeliveryerror">Erreur injection bolus</string>
-    <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
     <string name="overview_newtempbasal_basalpercent">Valeur Basal [%]</string>
     <string name="setbasalquestion">Accepter nouveau basal temporaire :</string>
     <string name="overview_treatment_label">Traitement</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Glucides</string>
     <string name="changeyourinput">Changez vos entrées !</string>
     <string name="configbuilder_bgsource">Source des glycémies</string>
     <string name="configbuilder_bgsource_description">Quelle source de données doit être utilisée par AndroidAPS ?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">Mode APS</string>
     <string name="closedloop">Boucle Fermée</string>
     <string name="openloop">Boucle Ouverte</string>
+    <string name="lowglucosesuspend">Arrêt Glycémie Basse</string>
     <string name="disabledloop">Boucle désactivée</string>
     <string name="disableloop">Désactiver la Boucle</string>
     <string name="enableloop">Activer la Boucle</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">Basal IA</string>
     <string name="bolusconstraintapplied">Restriction du Bolus appliquée</string>
     <string name="carbsconstraintapplied">Restriction des Glucides appliquée</string>
-    <string name="careportal_bgcheck">Contrôle Glycémie</string>
-    <string name="careportal_announcement">Notification</string>
-    <string name="careportal_note">Remarque</string>
-    <string name="careportal_question">Question</string>
-    <string name="careportal_exercise">Activité Physique</string>
-    <string name="careportal_pumpsitechange">Changement Zone D\'insertion</string>
-    <string name="careportal_cgmsensorinsert">Insertion Capteur MGC</string>
-    <string name="careportal_cgmsensorstart">Début Capteur MGC</string>
-    <string name="careportal_insulincartridgechange">Changement du Réservoir</string>
-    <string name="careportal_profileswitch">Changement de profil</string>
-    <string name="careportal_snackbolus">Bolus Goûter</string>
-    <string name="careportal_mealbolus">Bolus Repas</string>
-    <string name="careportal_correctionbolus">Bolus de correction</string>
-    <string name="careportal_combobolus">Bolus Combiné</string>
-    <string name="careportal_tempbasalstart">Lancer Débit Temporaire</string>
-    <string name="careportal_tempbasalend">Fin du Débit Temporaire</string>
-    <string name="careportal_carbscorrection">Ressucrage</string>
-    <string name="careportal_openapsoffline">OpenAPS hors ligne</string>
-    <string name="careportal_newnstreatment_eventtype">Type d\'évènement</string>
     <string name="careportal_newnstreatment_other">Autre</string>
     <string name="careportal_newnstreatment_meter">Lecteur</string>
     <string name="careportal_newnstreatment_sensor">Capteur</string>
@@ -217,7 +171,6 @@
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
     <string name="openapsma_maxiob_title">IA basale max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
-    <string name="dismiss">FERMER</string>
     <string name="password_preferences_encrypt_prompt">Le mot de passe principal vous sera demandé pour crypter les préférences exportées.</string>
     <string name="password_preferences_decrypt_prompt">Le mot de passe principal vous sera demandé pour décrypter les préférences exportées.</string>
     <string name="preferences_export_canceled">Export annulé ! Les préférences n\'ont PAS été exportées !</string>
@@ -256,35 +209,13 @@
     <string name="prefdecrypt_issue_wrong_pass">Erreur de décryptage, le mot de passe fourni est invalide ou le fichier de paramètres à été modifié ! Cela peut arriver si le fichier a été exporté avec un mot de passe principal différent.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuration du cryptage manquant, format des paramètres invalide !</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algorithme de cryptage non pris en charge ou non spécifié !</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Connection en cours</string>
-    <string name="connected">Connectée</string>
-    <string name="disconnected">Déconnectée</string>
-    <string name="danar_pump_settings">Paramètres de la pompe Dana</string>
     <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
     <string name="end_user_license_agreement_text">NE DOIT PAS ÊTRE UTILISÉ POUR PRENDRE DES DÉCISIONS MÉDICALES. IL N\'Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LA LIMITE PERMISE PAR LA LOI APPLICABLE. SAUF S\'IL EST INDIQUÉ LE CONTRAIRE PAR ÉCRIT. LES TITULAIRES DU DROIT D\'AUTEUR ET / OU D\'AUTRES PARTIES FOURNISSENT LE PROGRAMME «EN L\'ÉTAT» SANS GARANTIE D\'AUCUNE SORTE, EXPLICITE OU IMPLICITE, Y COMPRIS MAIS NON SEULEMENT AUX GARANTIES IMPLICITES DE QUALITÉ MARCHANDE ET D\'ADÉQUATION À UN USAGE PARTICULIER
 L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME SONT DE VOTRE RESPONSABILITÉ. SI LE PROGRAMME EST DÉFECTUEUX, VOUS ASSUMEZ LE COÛT DE TOUS LES SERVICES, RÉPARATIONS OU CORRECTIONS NÉCESSAIRES.</string>
     <string name="end_user_license_agreement_i_understand">JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT</string>
     <string name="save">Sauvegarder</string>
-    <string name="nobtadapter">L\'adaptateur bluetooth est introuvable</string>
-    <string name="devicenotfound">L\'appareil sélectionné est introuvable</string>
-    <string name="connectionerror">Erreur connection pompe</string>
-    <string name="danar_iob_label">Insuline Active pompe</string>
-    <string name="danar_dailyunits">Unités journalières</string>
-    <string name="pump_lastbolus_label">Dernier bolus</string>
-    <string name="hoursago">il y a %1$.1fh</string>
-    <string name="danar_invalidinput">Données saisies invalides</string>
-    <string name="danar_valuenotsetproperly">Valeur pas correctement définie</string>
     <string name="reloadprofile">Actualiser le profil</string>
-    <string name="danar_viewprofile">Consulter le profil</string>
-    <string name="enacted">Activé</string>
-    <string name="comment">Commentaire</string>
-    <string name="success">Succès</string>
-    <string name="percent">Pourcentage</string>
-    <string name="absolute">Absolu</string>
-    <string name="canceltemp">Annuler le basal temporaire</string>
     <string name="smscommunicator">Communicateur SMS</string>
-    <string name="waitingforpumpresult">Attente de résultat</string>
     <string name="smscommunicator_allowednumbers">Numéros de tél autorisés</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Renvoyer le code %2$s pour injecter le bolus %1$.2fU</string>
@@ -305,54 +236,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_mealbolusdelivered_tt">Cible %1$s pendant %2$d minutes</string>
     <string name="smscommunicator_tt_set">Cible %1$s pendant %2$d minutes définie avec succès</string>
     <string name="smscommunicator_tt_canceled">Cible Temp annulée avec succès</string>
-    <string name="bolusdelivering">En train d\'injecter %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Autoriser les commandes à distance par SMS</string>
-    <string name="glucosetype_finger">Doigt</string>
-    <string name="glucosetype_sensor">Capteur</string>
-    <string name="manual">Manuel</string>
-    <string name="careportal_temporarytarget">Cible temp.</string>
-    <string name="careportal_temporarytargetcancel">Annuler Cible Temporaire</string>
     <string name="danarprofile">Paramètres du profil DanaR</string>
     <string name="danarprofile_dia">Durée d\'Action [h] </string>
     <string name="danarprofile_dia_summary">Durée d\'Action de l\'Insuline</string>
-    <string name="failedupdatebasalprofile">La mise à jour du profil basal a échouée</string>
-    <string name="danar_historyreload">Actualiser</string>
     <string name="uploading">Téléchargement en cours</string>
-    <string name="danar_ebolus">E Bolus</string>
-    <string name="danar_dsbolus">Bolus DS</string>
-    <string name="danar_debolus">Bolus DE</string>
-    <string name="danar_error">Erreur</string>
-    <string name="danar_refill">Remplir</string>
-    <string name="danar_basalhour">Heure basal</string>
-    <string name="danar_glucose">glycémie</string>
-    <string name="danar_carbohydrate">glucides</string>
-    <string name="danar_alarm">alarme</string>
-    <string name="danar_totaluploaded">Total %1$d enregistrements téléchargés</string>
-    <string name="danar_sbolus">Bolus S</string>
-    <string name="danar_history_alarm">Alarmes</string>
-    <string name="danar_history_basalhours">Heures Basal</string>
-    <string name="danar_history_bolus">Bolus</string>
-    <string name="danar_history_carbohydrates">Glucides</string>
-    <string name="danar_history_dailyinsulin">Insuline quotidienne</string>
-    <string name="danar_history_errors">Erreurs</string>
-    <string name="danar_history_glucose">Glycémie</string>
-    <string name="danar_history_refill">Remplir</string>
-    <string name="danar_history_syspend">Arrêter</string>
-    <string name="danar_history_connectingfor">Connexion à %1$d s en cours</string>
-    <string name="danar_password_title">Mot de passe pompe</string>
-    <string name="wrongpumppassword">Mot de passe pompe incorrect !</string>
-    <string name="pumpbusy">Pompe occupée</string>
-    <string name="overview_bolusprogress_delivered">Injecté</string>
-    <string name="overview_bolusprogress_stoped">Arrêté</string>
     <string name="bolusstopped">Bolus arrêté</string>
     <string name="bolusstopping">Arrêter bolus</string>
-    <string name="occlusion">Occlusion</string>
-    <string name="overview_bolusprogress_stop">Arrêt</string>
-    <string name="overview_bolusprogress_stoppressed">BOUTON ARRÊT ACTIVÉ</string>
-    <string name="waitingforpump">Attente connection pompe</string>
-    <string name="overview_bolusprogress_goingtodeliver">%1$.2fU vont être injectées</string>
-    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
-    <string name="noprofileselected">Aucun profil séléctionné</string>
     <string name="smscommunicator_loophasbeendisabled">La Boucle a été désactivée</string>
     <string name="smscommunicator_loophasbeenenabled">La Boucle a été activée</string>
     <string name="smscommunicator_loopisdisabled">La Boucle est désactivée</string>
@@ -392,11 +282,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="mealbolus">Repas</string>
     <string name="correctionbous">Corr</string>
     <string name="actions">Actions</string>
-    <string name="androidaps_start">AndroidAPS est lancé</string>
     <string name="ns_upload_only">Remonter uniquement vers NS (sync désactivée)</string>
     <string name="ns_upload_only_summary">Uniquement téléchargement NS. Ceci n’est pas opérationnel pour les SGV à moins qu’une source locale comme xDrip ne soit sélectionnée. Ceci n’est pas opérationnel sur les profils lorsque les profils NS sont utilisés.</string>
     <string name="pumpNotInitialized">Pompe non initialisée !</string>
-    <string name="pumpNotInitializedProfileNotSet">Pompe non initialisée, profil non prédéfini !</string>
     <string name="primefill">Amorcer/Remplir</string>
     <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
     <string name="othersettings_title">Autres</string>
@@ -406,8 +294,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="button3">Bouton 3</string>
     <string name="units_colon">Unités :</string>
     <string name="units">Unités</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DAI</string>
     <string name="target_range">Fourchette cible :</string>
     <string name="prefs_range_title">Fourchette de visualisation</string>
@@ -417,17 +303,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear">Wear</string>
     <string name="resend_all_data">Renvoyer toutes les données</string>
     <string name="open_settings_on_wear">Afficher les Paramètres sur la Montre</string>
-    <string name="pumperror">Erreur Pompe</string>
-    <string name="lowbattery">Piles Faibles</string>
-    <string name="pumpshutdown">Arrêt de la Pompe</string>
-    <string name="batterydischarged">Batterie Pompe Déchargée</string>
-    <string name="danarkoreanpump">DanaR Coréenne</string>
     <string name="basal_rate">Débit Basal :</string>
-    <string name="profile_set_failed">L\'enregistrement du profil Basal a échoué</string>
-    <string name="profile_set_ok">Profil Basal mise à jour dans la pompe</string>
-    <string name="danar_disableeasymode">Désactiver le mode FacileUI (EasyUI) de la pompe</string>
-    <string name="danar_enableextendedbolus">Activer les bolus étendus dans la pompe</string>
-    <string name="danar_switchtouhmode">Changer le mode de U/d en U/h sur la pompe</string>
     <string name="basalvaluebelowminimum">Le débit Basal est inférieur au minimum autorisé. Profil non accepté !</string>
     <string name="sms_actualbg">G:</string>
     <string name="sms_lastbg">Dernière G:</string>
@@ -435,7 +311,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="MM640g">Medtronic 640g</string>
     <string name="ongoingnotificaction">Notification en cours</string>
     <string name="old_data">DONNÉES ANCIENNES</string>
-    <string name="minago">%1$d min passées</string>
     <string name="sms_minago">il y a %1$d min</string>
     <string name="localprofile">Profil Local</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -451,41 +326,22 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="hypo">Hypo</string>
     <string name="activity">Activité</string>
     <string name="removerecord">Supprimer l\'enregistrement</string>
-    <string name="danar_stats">Dana Stats</string>
-    <string name="danar_stats_cumulative_tdd">DTI cumulé</string>
-    <string name="danar_stats_expweight">DTI avec Pondération Exponentielle</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">DTI</string>
-    <string name="danar_stats_date">Date</string>
-    <string name="danar_stats_ratio">Ratio</string>
-    <string name="danar_stats_amount_days">Nb Jours</string>
-    <string name="danar_stats_weight">Pondération</string>
-    <string name="danar_stats_warning_Message">Peut être inexact si des bolus sont utilisés pour l’amorçage et le remplissage !</string>
-    <string name="danar_stats_olddata_Message">Pour les anciennes données, appuyez svp sur \"Actualiser\"</string>
-    <string name="danar_stats_tbb">Débit Total Basal</string>
-    <string name="danar_stats_tbb2">DTB*2</string>
-    <string name="initializing">En cours d\'initialisation...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">BOUCLE</string>
     <string name="simpleprofile_shortname">P.S.</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">PL</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ACCUEIL</string>
     <string name="virtualpump_shortname">POMPEV</string>
     <string name="profileviewer_shortname">P.NS</string>
     <string name="treatments_shortname">TRAIT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Raccourcir les titres des onglets</string>
     <string name="always_use_shortavg">Utiliser delta basé sur moyenne courte</string>
     <string name="always_use_shortavg_summary">Utiliser toujours un delta basé sur une moyenne courte au lieu d’une moyenne normale. Utile lorsque les données provenant de sources non filtrées comme xDrip devient incohérentes.</string>
-    <string name="advancedsettings_title">Paramètres Avancés</string>
-    <string name="danar_model">Modèle: %1$02X Protocole: %2$02X Code: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valeur par défaut : 3 Ceci est un paramètre important de sécurité de l’OpenAPS. Ceci va limiter vos débits basal à 3 fois votre débit Basal maximum. Il est probable que vous n’aurez pas besoin de changer cela, mais vous devez être conscient de ce qui est discuté pour les limites de sécurité dans “3x max daily; 4x current”.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
@@ -504,18 +360,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_calibrationsent">Étalonnage envoyé. La réception doit être activée dans xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip ne reçoit pas les étalonnages</string>
     <string name="pumpsuspended">Pompe arrêtée</string>
-    <string name="gettingpumpstatus">Obtenir l\'état de pompe</string>
-    <string name="settingtempbasal">Définir le basal temporaire</string>
-    <string name="stoppingtempbasal">Arrêter basal temporaire</string>
-    <string name="settingextendedbolus">Définir bolus étendu</string>
-    <string name="stoppingextendedbolus">Arrêter le bolus étendu</string>
-    <string name="updatingbasalrates">Mise à jour des débits basals</string>
-    <string name="disconnecting">Déconnexion en cours</string>
     <string name="executing">Exécution en cours</string>
     <string name="virtualpump_settings">Paramètres pompe virtuelle</string>
     <string name="virtualpump_uploadstatus_title">Remontée des informations vers NS</string>
-    <string name="wrongpassword">Mauvais mot de passe</string>
-    <string name="approachingdailylimit">L\'insuline journalière s\'approche de la limite</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL :</string>
@@ -539,7 +386,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear_detailedIOB_title">Afficher l\'IA détaillée</string>
     <string name="wear_detailedIOB_summary">Sur la montre, décomposer l’IA en IA bolus et IA basal</string>
     <string name="nosuccess">Sans succès - vérifiez votre téléphone</string>
-    <string name="notavailable">Non disponible</string>
     <string name="patientage">Age du patient</string>
     <string name="child"> Enfant</string>
     <string name="teenage">Adolescent</string>
@@ -575,8 +421,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Démarrage AAPS entré dans NS</string>
     <string name="restartingapp">Sortir de l’application pour appliquer les nouveaux paramètres.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insuline</string>
     <string name="configbuilder_insulin_description">Quel type d\'insuline utilisez-vous ?</string>
     <string name="fastactinginsulin">Insuline à action rapide</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog, Apidra</string>
@@ -599,9 +443,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights_bat_critical">Seuil critique du niveau de la batterie [%]</string>
     <string name="iob">IA</string>
     <string name="cob">GA</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Dernière connexion</string>
-    <string name="danar_bluetooth_status">État Bluetooth</string>
     <string name="nav_about">À propos</string>
     <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorisation du téléphone manquante</string>
@@ -612,17 +453,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear_showbgi_summary">Ajouter l’IG sur la vue générale</string>
     <string name="ns_noupload">Pas de téléchargement vers NS</string>
     <string name="ns_noupload_summary">Toutes les données envoyées à NS sont abandonnées. AAPS est connecté à NS mais aucun changement n’est fait dans NS</string>
-    <string name="basal_step">Incrément Basal</string>
-    <string name="bolus_step">Incrément Bolus</string>
     <string name="overview_extendedbolus_cancel_button">Annuler Bolus étendu</string>
     <string name="careportal_sensorage_label">Age Capteur</string>
     <string name="careportal_canulaage_label">Age Cathéter</string>
     <string name="careportal_insulinage_label">Age Insuline</string>
-    <string name="hours">heures</string>
-    <string name="invalidprofile">Profil incorrect !!!</string>
     <string name="doprofileswitch">Changer de profil</string>
     <string name="careportal_pbage_label">Age batterie pompe</string>
-    <string name="careportal_pumpbatterychange">Nouvelle Batterie Pompe</string>
     <string name="ns_alarmoptions">Options d\'alarme</string>
     <string name="nsalarm_urgenthigh">Haute urgent</string>
     <string name="nsalarm_high">Haute</string>
@@ -646,7 +482,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="absorptionsettings_title">Paramètres d’absorption</string>
     <string name="absorption_maxtime_title">Durée max d’absorption d\'un repas [h]</string>
     <string name="absorption_maxtime_summary">Le temps estimé en heures pour une absorbption totale des glucides d’un repas</string>
-    <string name="danar_visualizeextendedaspercentage_title">Afficher le bolus étendu en %%</string>
     <string name="careportal_sensorage_label_short">AgeC</string>
     <string name="careportal_insulinage_label_short">AgeI</string>
     <string name="careportal_canulaage_label_short">AgeC</string>
@@ -671,7 +506,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="careportal_pump_label">POMPE</string>
     <string name="careportal_newnstreatment_duration_min_label">Durée [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activer RNS</string>
     <string name="enablesmb">Activer SMB</string>
     <string name="enablesmb_summary">Utiliser les Super Micro Bolus au lieu des débits de base temporaires pour une action rapide</string>
@@ -683,23 +517,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ultrarapid_oref">Insuline Ultra Rapide Oref</string>
     <string name="dia_too_short">Durée d’Action pour %1$f trop courte - utiliser %2$f à la place !</string>
     <string name="activate_profile">Activer le profil</string>
-    <string name="date"> Date</string>
     <string name="invalid">INVALIDE</string>
-    <string name="waitingforpairing">Attente de l\'appairage de la pompe</string>
-    <string name="pairingok">Appairage OK</string>
-    <string name="pairingtimedout">Temps d\'appairage dépassé</string>
-    <string name="pairing">Appairage</string>
-    <string name="danars_nodeviceavailable">Jusqu\'à présent aucun appareil n\'a été trouvé</string>
-    <string name="emptyreservoir">Réservoir vide</string>
-    <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
-    <string name="remaininsulinalert">Niveau d\'insuline restant</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Pompe sélectionnée</string>
-    <string name="pairpump">Appairer une nouvelle pompe</string>
-    <string name="bolusspeed">Vitesse bolus</string>
-    <string name="danar_setbasalstep001">Régler incrément basal à 0.01 U/h</string>
-    <string name="serialnumber">Numéro de série</string>
     <string name="careportal_newnstreatment_percentage_label">Pourcentage</string>
     <string name="careportal_newnstreatment_timeshift_label">Décalage horaire</string>
     <string name="default_temptargets">Cibles Temporaires par défaut</string>
@@ -709,32 +527,18 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="activity_target">Cible Glycémie pour l\'activité</string>
     <string name="hypo_duration">durée hypo [min]</string>
     <string name="hypo_target">Cible Glycémie pendant l’hypo</string>
-    <string name="danar_history_prime">Amorcer</string>
-    <string name="gettingextendedbolusstatus">Obtenir l\'état du bolus étendu</string>
-    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
-    <string name="gettingtempbasalstatus">Obtenir l\'état du basal temporaire</string>
-    <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
-    <string name="gettingpumptime">Obtenir l\'heure de la pompe</string>
     <string name="reuse">réutiliser</string>
     <string name="wearcontrol_title">Commandes depuis la montre</string>
     <string name="wearcontrol_summary">Définir les Cibles Temp et entrer les Traitements depuis la montre</string>
-    <string name="connectiontimedout">Connexion interrompue</string>
     <string name="food">Aliments</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">j</string>
     <string name="none"><![CDATA[<aucune>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Protéines</string>
     <string name="shortfat">Gras (Lipides)</string>
     <string name="active"><![CDATA[<Actives>]]></string>
-    <string name="waitingforestimatedbolusend">Bolus en cours. %1$d sec. restantes.</string>
-    <string name="processinghistory">Traitement d\'événement</string>
-    <string name="startingbolus">Injection du bolus initiée</string>
     <string name="executingrightnow">Commande exécutée à l\'instant</string>
-    <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
     <string name="pump_unreachable">Pompe hors de portée</string>
     <string name="missed_bg_readings">Valeurs de glycémie manquantes</string>
     <string name="raise_notifications_as_android_notifications">Utiliser les notifications système pour les alertes et notifications</string>
@@ -744,9 +548,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="pump_unreachable_threshold">Seuil alerte pompe hors de portée [min]</string>
     <string name="urgent_alarm">Alarme d\'urgence</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Ceci va arrêter le Bluetooth du téléphone pour une seconde si la connexion pompe n’est pas possible. Cela peut assister certains téléphones dont la connexion Bluetooth se bloque.</string>
     <string name="eversense">App Eversense (patché)</string>
     <string name="dexcomg5_nsupload_title">Remonter les Gly vers NS</string>
     <string name="bgsource_upload">Paramètres de téléchargement des glycémies</string>
@@ -759,12 +560,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="uamsmbmaxminutes_summary">Minutes de basal max pour limiter les SMB des RNS</string>
     <string name="carbsReqThreshold">Seuil de suggestionde glucides</string>
     <string name="carbsReqThreshold_summary">Quantité de glucides à partir de laquelle une notification est envoyée</string>
-    <string name="unsupportedfirmware">Firmware pompe incompatible </string>
     <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
     <string name="nsclientbg">Glycémie NSClient</string>
-    <string name="minimalbasalvaluereplaced">Valeur de basal remplacée par la valeur minimale autorisée : %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valeur de basal remplacée par la valeur maximale autorisée : %1$s</string>
     <string name="overview_editquickwizard_usebg">Calcul de Glycémie</string>
     <string name="overview_editquickwizard_usebolusiob">Calcul IA du Bolus</string>
     <string name="overview_editquickwizard_usebasaliob">Calcul IA du Basal</string>
@@ -782,8 +580,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="closedmodeenabled">Mode boucle fermée activé</string>
     <string name="maxiobset">Maximum IA réglé correctement</string>
     <string name="hasbgdata">Glycémie disponible depuis la source sélectionnée</string>
-    <string name="basalprofilenotaligned">Valeurs des débits de basal non alignées sur des heures: %1$s</string>
-    <string name="zerovalueinprofile">Profile incorrect : %1$s</string>
     <string name="combo_programming_bolus">Programmer la pompe pour injecter un bolus</string>
     <string name="combo_refresh">Actualiser</string>
     <string name="combo_pump_state_label">État</string>
@@ -804,7 +600,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="bolus_frequency_exceeded">Un bolus avec la même quantité d’insuline a été demandé au cours de la dernière minute. Pour prévenir l’administration accidentelle de deux bolus à la fois et pour protéger contre les bugs, ceci (bolus) n\'est pas autorisé.</string>
     <string name="combo_pump_connected_now">Maintenant</string>
     <string name="combo_activity_reading_pump_history">Lecture historique pompe</string>
-    <string name="danar_history">Historique pompe</string>
     <string name="combo_activity_setting_basal_profile">Définir le profil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Niveau réservoir pompe bas</string>
     <string name="combo_pump_battery_low_warrning">Pile pompe faible</string>
@@ -823,9 +618,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="extendedbolusdeliveryerror">Erreur administration bolus étendu</string>
     <string name="insightpump_shortname">AC-I</string>
     <string name="ago">passé(e)s</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Activer en permanence les SMB</string>
     <string name="enablesmbalways_summary">Activer toujours SMB de manière autonome pour les bolus. Ceci est possible uniquement avec une source de glycémie ayant un très bon filtrage de données comme le G5</string>
     <string name="enablesmbaftercarbs">Activer SMB après ingestion de glucides</string>
@@ -836,8 +628,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enablesmbwithtemptarget_summary">Activer SMB lorsqu\'il y a une cible temporaire active (repas imminent, exercise)</string>
     <string name="enablesmbwithhightemptarget">Activer SMB avec cibles temp. hautes</string>
     <string name="enablesmbwithhightemptarget_summary">Activer SMB lorsqu\'il y a une cible temporaire haute (activités, exercice,..)</string>
-    <string name="let_temp_basal_run">Laisser démarrer le Basal temporaire</string>
-    <string name="mute">Coupure du son</string>
     <string name="overview_insulin_label">Insuline</string>
     <string name="overview_carbs_label">Glucides</string>
     <string name="overview_buttons_selection">Boutons</string>
@@ -879,7 +669,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="closed_loop_disabled_on_dev_branch">Version Dev. La Boucle Fermée est désactivée.</string>
     <string name="engineering_mode_enabled">Mode ingénierie actif</string>
     <string name="not_eng_mode_or_release">Le mode Ingénierie n\'est pas activé et n\'existe pas sur cette version</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lecture du profil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">L\'historique de la pompe a été modifié depuis le calcul du bolus. Le bolus n\'a pas été administré. Merci de recalculer le bolus s\'il est toujours nécessaire.</string>
     <string name="combo_error_updating_treatment_record">Le bolus a été délivré mais il n\'a pas pu être ajouté à l\'historique des traitements. Ceci peut se produire lorsque deux petits bolus de la même taille sont gérés dans les deux dernières minutes. Merci de vérifier l\'historique de la pompe et les entrées de traitements puis utilisez le Careportal pour y ajouter les entrées manquantes. Assurez-vous de ne pas ajouter des entrées au cours de la même minute et pour la même quantité d\'insuline.</string>
@@ -902,15 +691,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smbdisabledinpreferences">SMB désactivée dans les préférences</string>
     <string name="uamdisabledinpreferences">Repas Non Signalé (UAM) désactivé dans les préférences</string>
     <string name="uamdisabledoref1notselected">Repas Non Signalé (UAM) désactivé car il utilise le plugin Sensibilité de Oref1</string>
-    <string name="limitingbasalratio">Limiter le taux basal max à %1$.2f U/h en raison de %2$s</string>
-    <string name="pumplimit">Limite de la pompe</string>
-    <string name="itmustbepositivevalue">la valeur doit être positive</string>
     <string name="maxbasalmultiplier">multiplicateur max basal</string>
     <string name="maxdailybasalmultiplier">multiplicateur max basal quotidien</string>
     <string name="smb_frequency_exceeded">Un bolus a été délivré dans les 3 dernières minutes, SMB ignoré</string>
     <string name="basal_set_correctly">Basal correctement configuré</string>
-    <string name="limitingpercentrate">Limiter les taux de pourcentage maximum à %1$d%% en raison de %2$s</string>
-    <string name="limitingbolus">Limiter le Bolus à %1$.1f U à cause de %2$s</string>
     <string name="limitingextendedbolus">Limiter les bolus prolongé à %1$.1f U à cause de %2$s</string>
     <string name="limitingmaxiob">Limiter l’IA max %1$.1f U en raison de %2$s</string>
     <string name="limitingcarbs">Limiter les glucides %1$d g à cause de %2$s</string>
@@ -925,7 +709,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smbnotallowedinopenloopmode">SMB non autorisé en mode Boucle Ouverte</string>
     <string name="food_short">Aliments</string>
     <string name="reset">réinitialiser</string>
-    <string name="waitingfortimesynchronization">En attente de synchronisation de l\'heure (%1$d sec)</string>
     <string name="loopdisconnectedfor">Déconnecté (%1$d m)</string>
     <string name="openapssmb_maxiob_title">IA totale maximale pour OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contaxte OpenAPS\nOpenAPS n’ajoutera pas plus d’insuline si l\'IA (Insuline Active) actuelle est supérieure à cette valeur</string>
@@ -941,7 +724,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="nav_setupwizard">Assistant de configuration</string>
     <string name="setupwizard_finish">TERMINER</string>
     <string name="setupwizard_language_prompt">Sélectionnez votre langue</string>
-    <string name="boluserrorcode">Demandé : %1$.2fU Injecté : %2$.2fU code d’erreur: %3$s</string>
     <string name="firstinsulinincrement">Premier incrément d\'insuline</string>
     <string name="secondinsulinincrement">Deuxième incrément d\'insuline</string>
     <string name="thirdinsulinincrement">Troisième incrément d\'insuline</string>
@@ -964,7 +746,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="virtualpump_type">Type de pompe virtuelle</string>
     <string name="virtualpump_definition">Définition de pompe</string>
     <string name="virtualpump_pump_def">Bolus : Étape =%1$s\nExtended Bolus : [Étape =%2$s, Durée =%3$smin -%4$sh]\nBasal : Étape =%5$s\nTBR : %6$s (par %7$s), Durée =%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Uniquement les valeurs discrètes sont acceptées. Les plages ou fourchettes basal-bolus ne sont pas pris en charge par les pompes virtuelles (granularité).</string>
     <string name="ns_autobackfill_title">Remplissage automatique G</string>
     <string name="wear_wizard_settings">Paramètres de l’Assistant</string>
     <string name="wear_wizard_settings_summary">Calculs inclus dans le résultat de l’Assistant :</string>
@@ -995,22 +776,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="request">Demande</string>
     <string name="insulinsourcesetup">Configurer le plugin d\'insuline</string>
     <string name="exit">Quitter</string>
-    <string name="danar_useroptions">Options utilisateur</string>
-    <string name="danar_timedisplay">Format de l\'affichage de l\'heure</string>
-    <string name="danar_buttonscroll">Bouton défiler</string>
-    <string name="danar_beep">Bip lors de l\'appui bouton</string>
-    <string name="danar_pumpalarm">Alarme</string>
-    <string name="danar_pumpalarm_sound">Son</string>
-    <string name="danar_pumpalarm_vibrate">Vibration</string>
-    <string name="danar_pumpalarm_both">Les deux</string>
-    <string name="danar_screentimeout">Durée affichage LCD [secondes]</string>
-    <string name="danar_backlight">Rétro-éclairage [secondes]</string>
-    <string name="danar_glucoseunits">Unités glycémie</string>
-    <string name="danar_shutdown">Éteindre [heures]</string>
-    <string name="danar_lowreservoir">Réservoir faible [Unités]</string>
-    <string name="danar_saveuseroptions">Enregistrer les options sur la pompe</string>
-    <string name="option_on">Activé</string>
-    <string name="option_off">Désactivé</string>
     <string name="open_navigation">Ouvrir navigation</string>
     <string name="close_navigation">Fermer navigation</string>
     <string name="nav_plugin_preferences">Préférences des plugins</string>
@@ -1030,8 +795,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="sensitivity_raises_target_summary">Quand une sensibilité est détectée, augmentation de la glycémie cible</string>
     <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
     <string name="custom">Personnalisé</string>
-    <string name="largetimedifftitle">Différence horaire importante</string>
-    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
     <string name="careportal_removestartedevents">Réinitialiser AndroidAPS</string>
     <string name="storedsettingsfound">Paramètres sauvegardés trouvés</string>
     <string name="allow_hardware_pump_text">ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure.</string>
@@ -1057,17 +820,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="setupwizard_preferred_aps_mode">Mode APS préféré</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Poignée de main</string>
     <string name="sendlogfiles">Envoi des fichiers des journaux aux développeurs. Cas imprévu.</string>
-    <string name="maxbolusviolation">Violation de bolus Max</string>
-    <string name="commanderror">Erreur de commande</string>
-    <string name="speederror">Erreur de vitesse</string>
-    <string name="insulinlimitviolation">Violation d\'une limite d\'insuline</string>
     <string name="loop_openmode_min_change">Changement minimum [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Le fonctionnement de la Boucle demandera une confirmation uniquement si le changement est supérieur à cette valeur en %. Par défaut, la valeur est 20%</string>
-    <string name="pairfirst">Appairez SVP votre pompe avec votre téléphone !</string>
     <string name="searching_for_devices">Recherche d\'appareils en cours…</string>
-    <string name="please_wait">Merci de patienter...</string>
     <string name="pairing_completed">Appairage terminé</string>
     <string name="code_compare">Les codes affichés sur cet appareil et sur la pompe sont-ils identiques ?</string>
     <string name="insight_pairing">Appairage de Insight</string>
@@ -1156,7 +912,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="isequalorgreater">est supérieur ou égal à</string>
     <string name="isgreater">est supérieur à</string>
     <string name="isnotavailable">n\'est pas disponible</string>
-    <string name="unknown">inconnu</string>
     <string name="glucoseisnotavailable">La glycémie n\'est pas disponible</string>
     <string name="glucosecomparedmgdl">Glycémie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glycémie %1$s %2$.1f %3$s</string>
@@ -1173,23 +928,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisation</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Enreg. du changement de capteur sur NS</string>
     <string name="dexcom_lognssensorchange_summary">Créer automatiquement sur NS un événement \"Changement de capteur\" au démarrage du capteur</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minute</string>
-    <string name="unit_hour">heure</string>
-    <string name="unit_day">jour</string>
-    <string name="unit_week">semaine</string>
-    <string name="unit_seconds">secondes</string>
-    <string name="unit_minutes">minutes</string>
-    <string name="unit_hours">heures</string>
-    <string name="unit_days">jours</string>
-    <string name="unit_weeks">semaines</string>
     <string name="summary_tidepool_username">Votre nom d\'utilisateur Tidepool, normalement votre adresse e-mail</string>
     <string name="title_tidepool_username">Nom d\'utilisateur</string>
     <string name="summary_tidepool_password">Mot de passe de connexion Tidepool</string>
@@ -1232,7 +974,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="very_old_version">très ancienne version</string>
     <string name="new_version_warning">Nouvelle version disponible depuis %1$d jours ! Retour à Arrêt Glycémie Basse (AGB) dans %2$d jours, la boucle sera désactivée dans %3$d jours</string>
     <string name="twohours">2 h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">App Dexcom (patchée)</string>
     <string name="dexcom_short">Dexcom</string>
     <string name="description_source_dexcom">Recevoir les valeurs de glycémie de l’application Dexcom patchée.</string>
@@ -1309,10 +1050,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="rileylink_scanner_scan_stop">ARRÊT</string>
     <string name="rileylink_scanner_selected_device">Sélectionné</string>
     <string name="rileylink_scanner_title">Scanner RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy non pris en charge.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Le Bluetooth n\'est pas activé.</string>
-    <string name="location_not_found_title">La localisation n\'est pas activée</string>
-    <string name="location_not_found_message">La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après le succès de l\'appairage.</string>
     <string name="location_yes">Activer</string>
     <string name="location_no">Non</string>
     <string name="rileylink_scanner_scanning">Recherche en cours</string>
@@ -1354,7 +1091,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
     <string name="rileylink_error_pump_unreachable">Pompe hors de portée</string>
     <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
-    <string name="rileylink_error_address_not_set_short">Non configuré</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompe Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1424,7 +1160,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insulinFromCob"><![CDATA[GA vs IA : <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Contraintes de Bolus appliquées : %2$.2fU à %3$.2f</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Injecter cette partie de Bolus calculée par l’assistant [%]</string>
     <string name="deliverpartofboluswizard">L\'assistant Bolus effectue le calcul mais seulement cette partie de l\'insuline calculée est délivrée. Utile avec l\'algorithme SMB.</string>
     <string name="loading">Chargement ...</string>
@@ -1432,7 +1167,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="time_range">Plage horaire</string>
     <string name="timerange_value">L\'heure est comprise entre %1$s et %2$s</string>
     <string name="between">Entre </string>
-    <string name="close">Fermer</string>
     <string name="increasingmaxbasal">Augmentation de la valeur du débit Basal max parce que ce paramètre est inférieur au débit Basal max de votre profil</string>
     <string name="smscommunicator_messagebody">Message invalide</string>
     <string name="format_bg_isf">%1$s SI: %2$.1f</string>
@@ -1450,7 +1184,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="common_off">Off</string>
     <string name="objectives_button_unfinish">Refaire l\'objectif</string>
     <string name="objectives_button_unstart">Suppression démarrée</string>
-    <string name="timedetection">Détection de temps</string>
     <string name="doyouwantresetstart">Voulez-vous réinitialiser le début de l\'objectif ? Vous risquez de perdre vos progrès.</string>
     <string name="time_or_timezone_change">Heure et/ou fuseau horaire changé sur la pompe</string>
     <string name="nopumpselected">Aucune pompe sélectionnée</string>
@@ -1477,7 +1210,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="nav_survey">Sondage</string>
     <string name="invalidage">Âge invalide</string>
     <string name="invalidweight">Poids invalide</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Cible: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
     <string name="tdd">DTI</string>
@@ -1490,12 +1222,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="randombg_short">Gly</string>
     <string name="tools">Outils</string>
     <string name="show_calculation">Afficher le calcul</string>
-    <string name="error">Erreur</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Evénement d\'automatisation</string>
     <string name="alreadyset">Déjà configuré</string>
-    <string name="message">Message</string>
     <string name="clearqueueconfirm">Effacer la file d\'attente ? Toutes les données en file d\'attente seront perdues !</string>
     <string name="ebstopsloop">L\'utilisation du bolus étendu arrètera la boucle fermée pour la durée d\'exécution du bolus étendu. Voulez-vous vraiment le faire ?</string>
     <string name="closed_loop_disabled_with_eb">Boucle fermée désactivée à cause du bolus étendu</string>
@@ -1539,4 +1267,13 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights">Voyants d\'état</string>
     <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
     <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index 197046af2c..d862204934 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -6,20 +6,16 @@
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
     <string name="nav_preferences">Sainroghanna</string>
     <string name="reset_db_confirm">An bhfuil tú cinnte gur mian leat an bhunachair sonraí a athshocrú?</string>
+    <string name="nav_exit">Scoir</string>
     <string name="alert_dialog_storage_permission_text">Le do thoil atosaigh do ghuthán nó atosaigh AndroidAPS ó Socruithe an Chórais \nmura dhéanann tú é seo, ní bheidh logáil ag na appana AndroidAPS (tá sé tábhachtach na halgartaim a rianú agus a fhíorú go bhfuil siad ag obair i gceart)!</string>
     <string name="description_source_mm640g">Luachanna BG a fháil ón 600SeriesAndroidUploader.</string>
     <string name="description_source_ns_client">Sonraí a íoslódáil ó Nightscout</string>
     <string name="description_source_xdrip">Luachanna BG a fháil ó xDrip.</string>
-    <string name="nsprofileview_target_label">Cuspóir</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/l</string>
     <string name="MM640g">MM640g</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="careportal_pbage_label_short">PBAGE</string>
     <string name="openaps_short">OAPS</string>
-    <string name="smb_shortname">SMB</string>
     <!-- Pump Abstract -->
     <!-- Medtronic (MDT) - Base -->
     <!-- MDT Configuration -->
@@ -33,4 +29,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index f2c7564cc4..70cc9c5d48 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -17,4 +17,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 746936afe5..9859eec532 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
-    <string name="dia_label">Argomento: Durata dell\'Azione dell\'Insulina</string>
+    <string name="dia_label">Argomento: durata dell\'azione dell\'insulina</string>
     <string name="dia_minimumis3h">Il valore minimo è 3 ore.</string>
     <string name="dia_minimumis5h">Il valore minimo è 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -13,16 +13,16 @@
     <string name="hypott_preventoversmb">Per evitare che AAPS somministri troppa insulina dopo un aumento di glicemia causato da carboidrati a veloce assorbimento usati per trattare una glicemia bassa.</string>
     <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Quale profilo può essere usato e configurato offline?</string>
-    <string name="offlineprofile_label">Argomento: Profilo offline</string>
+    <string name="offlineprofile_label">Argomento: profilo offline</string>
     <string name="offlineprofile_nsprofile">Il profilo NS può essere utilizzato, ma non configurato.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Argomento: Disconnessione dal micro</string>
+    <string name="pumpdisconnect_label">Argomento: disconnessione dal micro</string>
     <string name="pumpdisconnect_whattodo">Cosa dovrebbe essere fatto quando si disconnette il micro?</string>
     <string name="pumpdisconnect_letknow">Click su \'Disconnetti micro\' cosicché AAPS sappia che non viene erogata alcuna insulina.</string>
     <string name="pumpdisconnect_suspend">Click su \'Sospendi loop\' cosicché AAPS stoppi l\'attività di loop mentre il micro è disconnesso.</string>
     <string name="pumpdisconnect_dontchnage">Non cambiare alcunché in AAPS, solo disconnettere il micro.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Argomento: Impostazioni di AndroidAPS</string>
+    <string name="objectives_label">Argomento: impostazioni di AndroidAPS</string>
     <string name="objectives_howtosave">Quali sono le migliori pratiche per il backup delle impostazioni?</string>
     <string name="objectives_exportsettings">Esportarle localmente dal menu Manutenzione.</string>
     <string name="objectives_storeelsewhere">Salvare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
@@ -32,7 +32,7 @@
     <string name="objectives_doexportafterfirtssettings">Esportarle quando termini le configurazioni iniziali.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
-    <string name="noisycgm_label">Argomento: Letture CGM \"rumorose\" (noisy)</string>
+    <string name="noisycgm_label">Argomento: letture CGM \"rumorose\" (noisy)</string>
     <string name="noisycgm_whattodo">Cosa dovrebbe essere fatto se i dati CGM sono \"rumorosi\"?</string>
     <string name="nothing">Nulla, AAPS se ne occuperà.</string>
     <string name="noisycgm_pause">Disabilitare il loop per evitare il sovradosaggio.</string>
@@ -40,7 +40,7 @@
     <string name="noisycgm_turnoffphone">Spegnere il telefono.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verificare che la tua app CGM faccia lo smoothing dei dati della glicemia.</string>
-    <string name="exercise_label">Argomento: Esercizio fisico</string>
+    <string name="exercise_label">Argomento: esercizio fisico</string>
     <string name="exercise_whattodo">Come puoi aiutare il sistema a gestire l\'esercizio fisico?</string>
     <string name="exercise_setactivitytt">Utilizzo della funzione temp-target.</string>
     <string name="exercise_switchprofilebelow100">Fare un cambio profilo sotto il 100%.</string>
@@ -49,19 +49,19 @@
     <string name="exercise_doitbeforestart">Impostare un temp-target \"attività fisica\" prima dell\'inizio dell\'esercizio fisico.</string>
     <string name="exercise_afterstart">L\'impostazione di un temp-target \"attività fisica\" dopo l\'inizio dell\'esercizio fisico porta a risultati peggiori rispetto all\'avviarlo prima dell\'inizio dell\'esercizio.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Argomento: Loop Disabilitato/Sospeso</string>
+    <string name="suspendloop_label">Argomento: loop disabilitato/sospeso</string>
     <string name="suspendloop_doigetinsulin">Ricevo insulina quando il loop è disabilitato/sospeso?</string>
     <string name="suspendloop_yes">Sì, l\'insulina basale continua a essere erogata.</string>
     <string name="suspendloop_no">No, l\'erogazione di insulina è interrotta.</string>
-    <string name="basaltest_label">Argomento: Basale, ISF e Test IC</string>
+    <string name="basaltest_label">Argomento: basale, ISF e test IC</string>
     <string name="basaltest_when">Quando dovrei verificare i valori di basali, ISF e IC?</string>
     <string name="basaltest_beforeloop">Prima che io inizi l\'attività di loop.</string>
     <string name="basaltest_havingregularhypo">Quando si verificano frequentemente glicemie basse.</string>
     <string name="basaltest_havingregularhyper">Quando si verificano frequentemente glicemie alte.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
-    <string name="prerequisites_label">Argomento: Prerequisiti</string>
+    <string name="prerequisites_label">Argomento: prerequisiti</string>
     <string name="prerequisites_what">Di cosa ho bisogno?</string>
-    <string name="prerequisites_determinedcorrectprofile">Informazioni profilo convalidate (Basale, IC, ISF, DIA).</string>
+    <string name="prerequisites_determinedcorrectprofile">Informazioni profilo convalidate (basale, IC, ISF, DIA).</string>
     <string name="prerequisites_computer">Un computer per creare un APK.</string>
     <string name="prerequisites_phone">Un telefono supportato.</string>
     <string name="prerequisites_car">Un\'auto.</string>
@@ -74,7 +74,7 @@
     <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Uno smartwatch.</string>
     <string name="prerequisites_supportedcgm">Un CGM Supportato.</string>
-    <string name="update_label">Argomento: Aggiornamento di AndroidAPS</string>
+    <string name="update_label">Argomento: aggiornamento di AndroidAPS</string>
     <string name="whatistrue">Cosa è vero?</string>
     <string name="update_git">Hai bisogno di avere Git installato.</string>
     <string name="update_asap">Aggiornare appena la nuova versione viene rilasciata e avere abbastanza tempo per farlo.</string>
@@ -82,9 +82,9 @@
     <string name="update_neverupdate">Non aggiornare mai se il sistema funziona bene.</string>
     <string name="update_askfriend">Chiedere al tuo amico il nuovo APK.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Argomento: Risoluzione dei problemi</string>
+    <string name="troubleshooting_label">Argomento: risoluzione dei problemi</string>
     <string name="troubleshooting_wheretoask">Dove cercare aiuto?</string>
-    <string name="troubleshooting_fb">Entrare nel gruppo Facebook di AndroidAPS.</string>
+    <string name="troubleshooting_fb">Entrare nel gruppo facebook di AndroidAPS.</string>
     <string name="troubleshooting_wiki">Leggere la documentazione di AndroidAPS.</string>
     <string name="troubleshooting_gitter">Visitare la Gitter Room di AndroidAPS.</string>
     <string name="troubleshooting_googlesupport">Visitare il supporto Google di AndroidAPS</string>
@@ -92,28 +92,28 @@
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/aapsitalia/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Argomento: Plugin Insulina</string>
+    <string name="insulin_label">Argomento: plugin insulina</string>
     <string name="insulin_ultrarapid">Quale marca di insulina può essere usata con il plugin \'Ultra-Rapid-Oref\'?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®</string>
     <string name="insulin_humalog">Humalog®</string>
     <string name="insulin_actrapid">Actrapid®</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Argomento: Plugin di Sensibilità</string>
+    <string name="sensitivity_label">Argomento: plugin di sensibilità</string>
     <string name="sensitivity_which">Quale algoritmo di sensibilità ha un intervallo di tempo configurabile?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="sensitivityuam_which">Quale plugin di sensibilità deve essere utilizzato per la funzione UAM?</string>
-    <string name="wrongcarbs_label">Argomento: Errori di immissione carboidrati</string>
+    <string name="wrongcarbs_label">Argomento: errori di immissione carboidrati</string>
     <string name="wrongcarbs_whattodo">Cosa dovresti fare se hai fatto un inserimento non corretto di carboidrati?</string>
     <string name="wrongcarbs_treatmentstab">Nella sezione Trattamenti, eliminare la voce carboidrati non corretta. Inserire nuovi carboidrati.</string>
     <string name="wrongcarbs_addfakeinsulin">Aggiungere insulina fittizia usando la funzione di riempimento</string>
-    <string name="extendedcarbs_label">Argomento: Cibo con Grassi e Proteine</string>
+    <string name="extendedcarbs_label">Argomento: cibo con grassi e proteine</string>
     <string name="extendedcarbs_handling">Cosa fare se il tuo cibo contiene una grande quantità di grassi e/o proteine?</string>
     <string name="extendedcarbs_useextendedcarbs">Convertire grassi e proteine in carboidrati e utilizzare la funzione \"carboidrati estesi\" (eCarbs).</string>
     <string name="extendedcarbs_add">Convertire grassi e proteine in carboidrati e aggiungerli al calcolo del bolo.</string>
     <string name="extendedcarbs_useextendedbolus">Utilizzare il bolo esteso per coprire grassi e proteine.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Argomento: Monitoraggio remoto</string>
+    <string name="nsclient_label">Argomento: monitoraggio remoto</string>
     <string name="nsclient_howcanyou">Come puoi monitorare AAPS del tuo bambino in remoto?</string>
     <string name="nsclient_nightscout">Usando un sito Nightscout.</string>
     <string name="nsclient_dexcomfollow">L\'app Dexcom Follow se stai usando l\'app originale Dexcom (solo glicemia).</string>
@@ -122,22 +122,22 @@
     <string name="nsclient_looponiphone">App Loop su iPhone.</string>
     <string name="nsclient_spikeiphone">App Spike su iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Argomento: Fattore di Sensibilità all\'Insulina</string>
+    <string name="isf_label">Argomento: fattore di sensibilità all\'insulina</string>
     <string name="isf_increasingvalue">Valori ISF più alti portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
     <string name="isf_decreasingvalue">Valori ISF più bassi portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
     <string name="isf_noeffect">Cambiare i valori di ISF non ha alcun effetto sulla quantità di insulina erogata quando AAPS corregge glicemie alte.</string>
-    <string name="isf_preferences">Devi inserire ISF nelle Preferenze.</string>
+    <string name="isf_preferences">Devi inserire ISF in Preferenze.</string>
     <string name="isf_profile">Cambiare il valore ISF nel tuo profilo è sufficiente per applicare la modifica.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Argomento: Il Rapporto IC</string>
+    <string name="ic_label">Argomento: il rapporto IC</string>
     <string name="ic_increasingvalue">Rapporti IC più alti portano a una minore insulina erogata per una data quantità di carboidrati.</string>
     <string name="ic_decreasingvalue">Rapporti IC più bassi portano a una minore insulina erogata per una data quantità di carboidrati.</string>
     <string name="ic_noeffect">Se hai 0 COB, cambiare il rapporto IC porterà a una differente quantità di insulina necessaria a correggere una determinata glicemia.</string>
     <string name="ic_different">IC sarà diverso se consideri l\'unità di pane (BE) come 10g o 12g.</string>
-    <string name="ic_meaning">Il significato di IC è: Quante unità di pane (BE) sono coperte da 1U di insulina.</string>
+    <string name="ic_meaning">Il significato di IC è: quante unità di pane (BE) sono coperte da 1U di insulina.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
-    <string name="profileswitch_label">Argomento: Cambio profilo</string>
+    <string name="profileswitch_label">Argomento: cambio profilo</string>
     <string name="profileswitch_pctwillchange"> Quando si specifica il 90% nel cambio profilo…</string>
     <string name="profileswitch_basalhigher">Le basali saranno il 10% più alte.</string>
     <string name="profileswitch_basallower">Le basali saranno il 10% più basse.</string>
@@ -157,12 +157,12 @@
     <string name="profileswitchtime_60">Avviare un cambio profilo con un timeshift di 60</string>
     <string name="profileswitchtime__60">Avviare un cambio profilo con un timeshift di -60</string>
     <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
-    <string name="basalhelp_label">Argomento: Aiuto le con velocità basali</string>
+    <string name="basalhelp_label">Argomento: aiuto le con velocità basali</string>
     <string name="basalhelp_where">Dove andare per avere aiuto con le velocità basali e il resto.</string>
     <string name="basalhelp_diabetesteam">Il tuo team diabetologico</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Altri Medicinali</string>
+    <string name="other_medication_label">Altri medicinali</string>
     <string name="other_medication_text">AAPS riduce la velocità basale per aumentare la glicemia. Farmaci appartenenti al gruppo degli inibitori dell\'SGLT2 (gliflozine) possono ostacolare l\'aumento previsto della glicemia e, quindi, provocare una pericolosa carenza di insulina (DKA).
 \nI marchi più comuni sono: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nCon ciò prometto che non prenderò tali farmaci durante l\'utilizzo di AAPS o disattiverò il loop prima di usare questi farmaci.</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml b/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
index c2081e281f..38cba201f6 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_descriptions.xml
@@ -11,13 +11,13 @@
     <string name="alert_m21_description">Cambia cartuccia.</string>
     <string name="alert_m22_description">Cambia la batteria.</string>
     <string name="alert_m23_description">Controlla lo stato del micro.</string>
-    <string name="alert_m24_description">Cambia set infusione.</string>
+    <string name="alert_m24_description">Cambia set di infusione.</string>
     <string name="alert_m25_description">Contatta il supporto Accu-Chek.</string>
     <string name="alert_m26_description">Cambia cartuccia.</string>
     <string name="alert_m27_description">Riavvia il download dei dati.</string>
     <string name="alert_m28_description">Controlla lo stato del micro.</string>
     <string name="alert_m29_description">Imposta il tipo di batteria.</string>
-    <string name="alert_m30_description">Imposta tipo di cartuccia.</string>
+    <string name="alert_m30_description">Imposta il tipo di cartuccia.</string>
     <string name="alert_e6_description">Cambia batteria e cartuccia.</string>
     <string name="alert_e10_description">Cambia cartuccia.</string>
     <string name="alert_e13_description">Cambia lingua.</string>
diff --git a/app/src/main/res/values-it-rIT/insight_alert_titles.xml b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
index 123334b48d..a73e53f864 100644
--- a/app/src/main/res/values-it-rIT/insight_alert_titles.xml
+++ b/app/src/main/res/values-it-rIT/insight_alert_titles.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="alert_r1_title">Eroga bolo</string>
-    <string name="alert_r2_title">Bolo perso</string>
+    <string name="alert_r2_title">Bolo mancante</string>
     <string name="alert_r3_title">Sveglia</string>
-    <string name="alert_r4_title">Cambia set infusione</string>
+    <string name="alert_r4_title">Cambia set di infusione</string>
     <string name="alert_r7_title">TBR completato</string>
     <string name="alert_w31_title">Cartuccia quasi vuota</string>
     <string name="alert_w32_title">Batteria quasi scarica</string>
@@ -11,7 +11,7 @@
     <string name="alert_w34_title">Fine della garanzia</string>
     <string name="alert_w36_title">TBR cancellato</string>
     <string name="alert_w38_title">Bolo cancellato</string>
-    <string name="alert_w39_title">Avviso di prestito</string>
+    <string name="alert_w39_title">Avviso prestito</string>
     <string name="alert_m20_title">Cartuccia non inserita</string>
     <string name="alert_m21_title">Cartuccia vuota</string>
     <string name="alert_m22_title">Batteria scarica</string>
diff --git a/app/src/main/res/values-it-rIT/protection.xml b/app/src/main/res/values-it-rIT/protection.xml
index bb153b84e7..6696bb44c4 100644
--- a/app/src/main/res/values-it-rIT/protection.xml
+++ b/app/src/main/res/values-it-rIT/protection.xml
@@ -14,7 +14,7 @@
     <string name="custom_password">Password personalizzata</string>
     <string name="noprotection">Nessuna protezione</string>
     <string name="protection">Protezione</string>
-    <string name="master_password_missing">La password master non è impostata!\n\nImposta la tua password Master in Preferenze (%1$s &#8594; %2$s)</string>
+    <string name="master_password_missing">La password master non è impostata!\n\nImposta la tua password master in Preferenze (%1$s &#8594; %2$s)</string>
     <string name="password_set">Password impostata!</string>
     <string name="password_not_set">Password non impostata</string>
     <string name="password_not_changed">Password non modificata</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index cc4b846a9b..d1ef20a32e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -12,38 +12,31 @@
     <string name="nav_resetdb">Resetta database</string>
     <string name="reset_db_confirm">Vuoi davvero resettare i database?</string>
     <string name="nav_exit">Esci</string>
-    <string name="danar_useextended_title">Usa boli estesi per &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
     <string name="description_actions">Alcuni tasti per accedere rapidamente alle funzioni comuni</string>
-    <string name="description_careportal">Inserisci voci di registro avanzate.</string>
     <string name="description_config_builder">Utilizzato per configurare i plugin attivi</string>
     <string name="description_objectives">Programma di apprendimento</string>
-    <string name="description_food">Visualizza l\'elenco dei cibi definiti in Nightscout</string>
-    <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid</string>
+    <string name="description_food">Visualizza i preset dei cibi definiti in Nightscout</string>
+    <string name="description_insulin_rapid">Preset per insulina Humalog e NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Preset per insulina Fiasp</string>
     <string name="description_insulin_free_peak">Ti consente di definire il picco di attività dell\'insulina e deve essere utilizzato solo dagli utenti avanzati</string>
-    <string name="description_loop">Attiva o disattiva l\'implementazione del loop.</string>
+    <string name="description_loop">Attiva o disattiva l\'implementazione per la gestione del loop.</string>
     <string name="description_ns_client">Sincronizza i tuoi dati con Nightscout</string>
     <string name="description_ma">Stato dell\'algoritmo nel 2016</string>
     <string name="description_ama">Stato dell\'algoritmo nel 2017</string>
-    <string name="description_smb">Algoritmo più recente per gli utenti avanzati</string>
+    <string name="description_smb">Algoritmo più recente per utenti avanzati</string>
     <string name="description_overview">Visualizza lo stato corrente del tuo loop e i tasti per le azioni più comuni</string>
-    <string name="description_persistent_notification">Mostra una notifica con una breve panoramica di ciò che sta facendo il tuo loop</string>
-    <string name="description_profile_local">Definisci un profilo disponibile offline.</string>
-    <string name="description_profile_nightscout">Fornisce il profilo definito in Nightscout</string>
-    <string name="description_profile_simple">Imposta un profilo con un solo intervallo temporale.</string>
+    <string name="description_persistent_notification">Mostra una notifica persistente con una breve panoramica di ciò che sta facendo il tuo loop</string>
+    <string name="description_profile_local">Definisci un profilo che è disponibile offline.</string>
+    <string name="description_profile_nightscout">Fornisce il profilo che hai definito in Nightscout</string>
+    <string name="description_profile_simple">Definisci un profilo con un solo blocco temporale.</string>
     <string name="description_pump_combo">Integrazione del microinfusore Accu-Chek Combo, è necessario avere ruffy installato</string>
-    <string name="description_pump_dana_r">Integrazione del microinfusore DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Integrazione del microinfusore DANA Diabecare R Korean</string>
-    <string name="description_pump_dana_r_v2">Integrazione del microinfusore DANA Diabecare R con firmware aggiornato</string>
-    <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
     <string name="description_pump_mdi">Per le persone in terapia multi-iniettiva</string>
     <string name="description_pump_virtual">Per microinfusori che non hanno ancora alcun driver (Loop aperto)</string>
     <string name="description_sensitivity_aaps">La sensibilità è calcolata allo stesso modo di Oref0, ma puoi specificare l\'intervallo di tempo al passato. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze.</string>
-    <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h o 24h (utilizzando tra i due periodi il più sensibile) e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il Plugin calcola anche UAM.</string>
+    <string name="description_sensitivity_oref1">La sensibilità è calcolata dai dati delle ultime 8h o 24h (utilizzando tra i due periodi il più sensibile) e i carboidrati (se non assorbiti) vengono tagliati fuori dopo il tempo specificato nelle preferenze. Il plugin calcola anche UAM.</string>
     <string name="description_sensitivity_weighted_average">La sensibilità è calcolata come media ponderata dalle deviazioni. Le deviazioni più recenti hanno peso maggiore. L\'assorbimento minimo dei carboidrati è calcolato da \'max tempo assorbimento pasto\' nelle preferenze. Questo algoritmo è il più veloce nel seguire i cambiamenti di sensibilità.</string>
     <string name="description_source_eversense">Ricevi valori glicemia dall\'app Eversense modificata.</string>
     <string name="description_source_glimp">Ricevi valori glicemia da Glimp.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Monitora e controlla AndroidAPS usando il tuo smartwatch WearOS.</string>
     <string name="description_xdrip_status_line">Mostra le informazioni del loop sulla watchface di xDrip+.</string>
     <string name="description_sms_communicator">Controlla AndroidAPS in remoto utilizzando i comandi SMS.</string>
-    <string name="nsprofileview_units_label">Unità</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basale</string>
-    <string name="nsprofileview_target_label">Target</string>
-    <string name="noprofileset">NESSUN PROFILO IMPOSTATO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">CHO:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,16 +61,10 @@
     <string name="treatments_wizard_bg_label">BG</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">CHO</string>
-    <string name="treatments_wizard_correction_label">Correzione</string>
-    <string name="insulin_unit_shortname">U</string>
+    <string name="treatments_wizard_correction_label">Corr</string>
     <string name="treatments_wizard_bolusiob_label">IOB da bolo</string>
     <string name="openapsma_run">Esegui ora</string>
     <string name="vitualpump_label">MICRO VIRTUALE</string>
-    <string name="pump_basebasalrate_label">Velocità basale originale</string>
-    <string name="pump_tempbasal_label">Basale temporanea</string>
-    <string name="virtualpump_extendedbolus_label">Bolo esteso</string>
-    <string name="pump_battery_label">Batteria</string>
-    <string name="pump_reservoir_label">Serbatoio</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Ultima esecuzione</string>
     <string name="openapsma_inputparameters_label">Parametri di input</string>
@@ -93,24 +73,19 @@
     <string name="openapsma_iobdata_label">Dati IOB</string>
     <string name="openapsma_profile_label">Profilo</string>
     <string name="openapsma_mealdata_label">Dati pasto</string>
-    <string name="result">Esito</string>
+    <string name="result">Risultato</string>
     <string name="result_insulin_carbs">Risultato: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Dati glicemia non disponibili</string>
-    <string name="nochangerequested">Nessun cambiamento richiesto</string>
     <string name="openapsma_request_label">Richiesta</string>
-    <string name="rate">Tasso</string>
-    <string name="duration">Durata</string>
-    <string name="reason">Motivo</string>
     <string name="glucose">Glicemia</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Configuratore strutturale</string>
-    <string name="objectives">Obiettivi</string>
     <string name="overview">Panoramica</string>
     <string name="nsprofile">Profilo NS</string>
     <string name="simpleprofile">Profilo semplice</string>
     <string name="treatments">Trattamenti</string>
-    <string name="virtualpump">Micro Virtuale</string>
+    <string name="virtualpump">Micro virtuale</string>
     <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Micro</string>
     <string name="configbuilder_pump_description">Quale microinfusore desideri utilizzare con AndroidAPS?</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Generale</string>
     <string name="configbuilder_general_description">Questi sono alcuni plugin generali che potresti trovare utili.</string>
     <string name="configbuilder_constraints_description">Quali vincoli sono applicati?</string>
-    <string name="days">giorni</string>
     <string name="constraints">Vincoli</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -136,10 +110,9 @@
     <string name="cancel">Annulla</string>
     <string name="noapsselected">NESSUN APS SELEZIONATO O RISULTATO FORNITO</string>
     <string name="safety">Sicurezza</string>
-    <string name="openapsma_disabled">Il Plugin è disabilitato</string>
+    <string name="openapsma_disabled">Il plugin è disabilitato</string>
     <string name="constraints_violation">Violazione dei vincoli</string>
     <string name="treatmentdeliveryerror">Errore erogazione bolo</string>
-    <string name="tempbasaldeliveryerror">Errore erogazione basale temporanea</string>
     <string name="overview_newtempbasal_basalpercent">Valore basale [%]</string>
     <string name="setbasalquestion">Accetta nuova basale temporanea:</string>
     <string name="overview_treatment_label">Trattamento</string>
@@ -149,8 +122,7 @@
     <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Basale</string>
-    <string name="sms_basal">Basale</string>
-    <string name="carbs">CHO</string>
+    <string name="sms_basal">Basale:</string>
     <string name="changeyourinput">Cambia il tuo input!</string>
     <string name="configbuilder_bgsource">Origine BG</string>
     <string name="configbuilder_bgsource_description">Da dove AndroidAPS dovrebbe ottenere i suoi dati?</string>
@@ -158,34 +130,16 @@
     <string name="apsmode_title">Modalità APS</string>
     <string name="closedloop">Loop chiuso</string>
     <string name="openloop">Loop aperto</string>
+    <string name="lowglucosesuspend">Sospensione a glicemia bassa (LGS)</string>
     <string name="disabledloop">Loop disabilitato</string>
-    <string name="disableloop">Disabilita Loop</string>
-    <string name="enableloop">Abilita Loop</string>
+    <string name="disableloop">Disabilita loop</string>
+    <string name="enableloop">Abilita loop</string>
     <string name="openloop_newsuggestion">Nuovo suggerimento disponibile</string>
     <string name="unsupportednsversion">Versione non supportata di Nightscout</string>
     <string name="loopdisabled">LOOP DISABILITATO DAI VINCOLI</string>
     <string name="treatments_wizard_basaliob_label">IOB da basale</string>
     <string name="bolusconstraintapplied">Vincolo bolo applicato</string>
     <string name="carbsconstraintapplied">Vincolo CHO applicato</string>
-    <string name="careportal_bgcheck">Controllo BG</string>
-    <string name="careportal_announcement">Annuncio</string>
-    <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Domanda</string>
-    <string name="careportal_exercise">Esercizio fisico</string>
-    <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
-    <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
-    <string name="careportal_cgmsensorstart">Avvio Sensore</string>
-    <string name="careportal_insulincartridgechange">Cambio serbatoio insulina</string>
-    <string name="careportal_profileswitch">Cambio profilo</string>
-    <string name="careportal_snackbolus">Bolo spuntino</string>
-    <string name="careportal_mealbolus">Bolo pasto</string>
-    <string name="careportal_correctionbolus">Bolo di correzione</string>
-    <string name="careportal_combobolus">Bolo combo</string>
-    <string name="careportal_tempbasalstart">Inizio basale temporanea</string>
-    <string name="careportal_tempbasalend">Fine basale temporanea</string>
-    <string name="careportal_carbscorrection">Correzione con CHO</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Tipo di evento</string>
     <string name="careportal_newnstreatment_other">Altro</string>
     <string name="careportal_newnstreatment_meter">Glucometro</string>
     <string name="careportal_newnstreatment_sensor">Sensore</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">Questo valore è chiamato max basale nel contesto OpenAPS</string>
     <string name="openapsma_maxiob_title">Max IOB da basale a cui limitare OpenAPS [U]</string>
     <string name="openapsma_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nIndica l\'insulina massima in [U] che APS può erogare in contemporanea.</string>
-    <string name="dismiss">RIMUOVI</string>
     <string name="password_preferences_encrypt_prompt">Ti verrà richiesta la password principale, che verrà utilizzata per crittografare le preferenze esportate.</string>
     <string name="password_preferences_decrypt_prompt">Ti verrà chiesta la password master, che è necessaria per decrittare le preferenze importate.</string>
     <string name="preferences_export_canceled">Esportazione annullata! Le preferenze NON sono state esportate!</string>
     <string name="preferences_import_canceled">Importazione annullata! Le preferenze NON sono state importate!</string>
+    <string name="preferences_import_list_title">Seleziona il file da importare</string>
     <string name="check_preferences_before_import">Verifica le preferenze prima dell\'importazione:</string>
     <string name="check_preferences_cannot_import">Le preferenze non possono essere importate!</string>
     <string name="check_preferences_dangerous_import">Le preferenze non dovrebbero essere importate!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Stai utilizzando il formato precedente (obsoleto) delle vecchie versioni di APPS, che non è sicuro! Utilizzalo solo come ultima risorsa, se non hai un\'esportazione nel corrente formato JSON.</string>
     <string name="metadata_warning_old_export">Le preferenze importate hanno già %1$s giorni! Forse hai preferenze più aggiornate. Hai scelto il file sbagliato? Ricorda di esportare le preferenze regolarmente!</string>
     <string name="metadata_warning_date_format">Formato data-ora non valido!</string>
+    <string name="metadata_warning_different_version">Le preferenze arrivano da una differente versione secondaria dell\'applicazione (minor). Va bene se le stai importando dopo l\'aggiornamento, ma controlla che, dopo l\'importazione, le preferenze siano ancora corrette!</string>
+    <string name="metadata_urgent_different_version">Le preferenze arrivano da una differente versione principale dell\'applicazione (major). Le versioni principali differiscono in modo significativo e potrebbero avere preferenze incompatibili! Assicurati che, dopo l\'importazione, le preferenze siano ancora corrette!</string>
     <string name="metadata_label_format">Formato file</string>
     <string name="metadata_label_created_at">Creato:</string>
     <string name="metadata_label_aaps_version">Versione AAPS</string>
@@ -256,106 +212,48 @@
     <string name="prefdecrypt_issue_wrong_pass">Errore decrittazione, la password fornita è errata o il file delle impostazioni è stato modificato! È possibile che il file importato sia stato esportato con una diversa password master.</string>
     <string name="prefdecrypt_issue_wrong_format">Configurazione crittografia mancante, il formato delle impostazioni non è valido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo di crittografia non supportato o non specificato!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Connessione</string>
-    <string name="connected">Connesso</string>
-    <string name="disconnected">Disconnesso</string>
-    <string name="danar_pump_settings">Impostazioni micro Dana</string>
+    <string name="exported_today">esportato oggi</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">esportato %1$s fa</string>
+    <string name="exported_at" comment="at placeholder we add export date">esportato il %1$s</string>
+    <string name="exported_less_than_hour_ago">esportato meno di un\'ora fa</string>
+    <string name="in_directory" comment="placeholder is for exported file path">nella directory: %1$s</string>
     <string name="end_user_license_agreement">Contratto di licenza per l\'utente</string>
     <string name="end_user_license_agreement_text">NON DEVE ESSERE UTILIZZATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI.</string>
     <string name="end_user_license_agreement_i_understand">COMPRENDO E ACCETTO</string>
     <string name="save">Salva</string>
-    <string name="nobtadapter">Nessun adattatore bluetooth trovato</string>
-    <string name="devicenotfound">Dispositivo selezionato non trovato</string>
-    <string name="connectionerror">Errore connessione microinfusore</string>
-    <string name="danar_iob_label">IOB microinfusore</string>
-    <string name="danar_dailyunits">Unità giornaliere</string>
-    <string name="pump_lastbolus_label">Ultimo bolo</string>
-    <string name="hoursago">%1$.1fh fa</string>
-    <string name="danar_invalidinput">Dati di input non validi</string>
-    <string name="danar_valuenotsetproperly">Valore non impostato correttamente</string>
     <string name="reloadprofile">Ricarica profilo</string>
-    <string name="danar_viewprofile">Visualizza profilo</string>
-    <string name="enacted">Attivato</string>
-    <string name="comment">Commento</string>
-    <string name="success">OK</string>
-    <string name="percent">Percentuale</string>
-    <string name="absolute">Assoluto</string>
-    <string name="canceltemp">Cancella basale temporanea</string>
     <string name="smscommunicator">Comunicazioni SMS</string>
-    <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smscommunicator_allowednumbers">Numeri di telefono consentiti</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Per erogare il bolo di %1$.2fU rispondi col codice %2$s</string>
     <string name="smscommunicator_mealbolusreplywithcode">Per erogare il bolo pasto di %1$.2fU rispondi col codice %2$s</string>
     <string name="smscommunicator_temptargetwithcode">Per impostare il Temp-Target %1$s rispondi con il codice %2$s</string>
     <string name="smscommunicator_temptargetcancel">Per cancellare il Temp-Target rispondi col codice %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">Per disabilitare il Servizio di Controllo Remoto tramite SMS rispondi col codice %1$s.\n\nRicorda che potrai riattivarlo solo in maniera diretta dallo smartphone master in cui è installato AAPS.</string>
-    <string name="smscommunicator_stoppedsms">Servizio di Controllo Remoto tramite SMS stoppato. Per riattivarlo, usa lo smartphone master in cui è installato AAPS.</string>
+    <string name="smscommunicator_stopsmswithcode">Per disabilitare il servizio di controllo remoto tramite SMS rispondi col codice %1$s.\n\nRicorda che potrai riattivarlo solo in maniera diretta dallo smartphone master in cui è installato AAPS.</string>
+    <string name="smscommunicator_stoppedsms">Servizio di controllo remoto tramite SMS stoppato. Per riattivarlo, usa lo smartphone master in cui è installato AAPS.</string>
     <string name="smscommunicator_calibrationreplywithcode">Per inviare la calibrazione %1$.2f rispondi col codice %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolo fallito</string>
     <string name="smscommunicator_remotebolusmindistance_summary">Numero minimo di minuti che devono trascorrere tra un bolo remoto e il successivo</string>
     <string name="smscommunicator_remotebolusmindistance">Quanti minuti devono trascorrere, almeno, tra un bolo e il successivo</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Per la tua sicurezza, per modificare questa preferenza hai bisogno di aggiungere almeno 2 numeri di telefono.</string>
     <string name="bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
-    <string name="bolusrequested">A erogare %1$.2fU</string>
+    <string name="bolusrequested">Sto per erogare %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolo di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered">Bolo pasto di %1$.2fU erogato con successo</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Target %1$s per %2$d minuti</string>
     <string name="smscommunicator_tt_set">Target %1$s per %2$d minuti impostato con successo</string>
     <string name="smscommunicator_tt_canceled">Temp-Target cancellato con successo</string>
-    <string name="bolusdelivering">Erogazione di %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Consenti comandi remoti tramite SMS</string>
-    <string name="glucosetype_finger">Dito</string>
-    <string name="glucosetype_sensor">Sensore</string>
-    <string name="manual">Manuale</string>
-    <string name="careportal_temporarytarget">Target temporaneo</string>
-    <string name="careportal_temporarytargetcancel">Cancella target temporaneo</string>
     <string name="danarprofile">Impostazioni profilo DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
-    <string name="danarprofile_dia_summary">Durata Azione dell\'Insulina</string>
-    <string name="failedupdatebasalprofile">Impossibile aggiornare il profilo basale</string>
-    <string name="danar_historyreload">Ricarica</string>
+    <string name="danarprofile_dia_summary">Durata azione dell\'Insulina</string>
     <string name="uploading">Caricamento</string>
-    <string name="danar_ebolus">Bolo E</string>
-    <string name="danar_dsbolus">Bolo DS</string>
-    <string name="danar_debolus">Bolo DE</string>
-    <string name="danar_error">errore</string>
-    <string name="danar_refill">ricarica</string>
-    <string name="danar_basalhour">ora basale</string>
-    <string name="danar_glucose">glicemia</string>
-    <string name="danar_carbohydrate">carboidrato</string>
-    <string name="danar_alarm">allarme</string>
-    <string name="danar_totaluploaded">%1$d record totali caricati</string>
-    <string name="danar_sbolus">Bolo S</string>
-    <string name="danar_history_alarm">Allarmi</string>
-    <string name="danar_history_basalhours">Ore basali</string>
-    <string name="danar_history_bolus">Boli</string>
-    <string name="danar_history_carbohydrates">Carboidrati</string>
-    <string name="danar_history_dailyinsulin">Insulina giornaliera</string>
-    <string name="danar_history_errors">Errori</string>
-    <string name="danar_history_glucose">Glicemia</string>
-    <string name="danar_history_refill">Ricarica</string>
-    <string name="danar_history_syspend">Sospensione</string>
-    <string name="danar_history_connectingfor">In connessione per %1$d s</string>
-    <string name="danar_password_title">Password microinfusore</string>
-    <string name="wrongpumppassword">Password micro errata!</string>
-    <string name="pumpbusy">Il micro è occupato</string>
-    <string name="overview_bolusprogress_delivered">Erogato</string>
-    <string name="overview_bolusprogress_stoped">Stoppato</string>
     <string name="bolusstopped">Bolo stoppato</string>
     <string name="bolusstopping">Stop del bolo in corso</string>
-    <string name="occlusion">Occlusione</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STOP PREMUTO</string>
-    <string name="waitingforpump">In attesa del micro</string>
-    <string name="overview_bolusprogress_goingtodeliver">Sto per erogare %1$.2fU</string>
-    <string name="youareonallowedlimit">Hai raggiunto il limite consentito</string>
-    <string name="noprofileselected">Nessun profilo selezionato</string>
-    <string name="smscommunicator_loophasbeendisabled">Il Loop è stato disabilitato</string>
-    <string name="smscommunicator_loophasbeenenabled">Il Loop è stato abilitato</string>
-    <string name="smscommunicator_loopisdisabled">Il Loop è disabilitato</string>
-    <string name="smscommunicator_loopisenabled">Il Loop è abilitato</string>
+    <string name="smscommunicator_loophasbeendisabled">Il loop è stato disabilitato</string>
+    <string name="smscommunicator_loophasbeenenabled">Il loop è stato abilitato</string>
+    <string name="smscommunicator_loopisdisabled">Il loop è disabilitato</string>
+    <string name="smscommunicator_loopisenabled">Il loop è abilitato</string>
     <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
     <string name="valueoutofrange">Il valore %1$s è fuori limite massimo</string>
     <string name="smscommunicator_remotecommandnotallowed">Il comando da remoto non è permesso</string>
@@ -380,8 +278,8 @@
     <string name="smscommunicator_tempbasalcancelfailed">Basale temporanea: cancellazione fallita</string>
     <string name="smscommunicator_extendedcancelfailed">Bolo esteso: cancellazione fallita</string>
     <string name="smscommunicator_unknowncommand">Comando sconosciuto o risposta errata</string>
-    <string name="quickwizard">Calcolatore Rapido</string>
-    <string name="quickwizardsettings">Impostazioni Calcolatore Rapido</string>
+    <string name="quickwizard">Calcolatore rapido</string>
+    <string name="quickwizardsettings">Impostazioni Calcolatore rapido</string>
     <string name="overview_editquickwizard_buttontext">Testo:</string>
     <string name="overview_editquickwizard_carbs">CHO:</string>
     <string name="overview_editquickwizard_valid">Valido:</string>
@@ -389,13 +287,11 @@
     <string name="overview_quickwizard_item_edit_button">Modifica</string>
     <string name="overview_quickwizard_item_remove_button">Rimuovi</string>
     <string name="mealbolus">Pasto</string>
-    <string name="correctionbous">Correzione</string>
+    <string name="correctionbous">Corr</string>
     <string name="actions">Azioni</string>
-    <string name="androidaps_start">AndroidAPS avviato</string>
     <string name="ns_upload_only">NS: solo upload (sincron. disabilitata)</string>
-    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui Profili durante l\'utilizzo dei profili NS.</string>
+    <string name="ns_upload_only_summary">NS: solo upload. Non ha effetto su SGV a meno che non sia selezionata una fonte locale come xDrip. Non ha effetto sui profili durante l\'utilizzo dei profili NS.</string>
     <string name="pumpNotInitialized">Micro non inizializzato!</string>
-    <string name="pumpNotInitializedProfileNotSet">Micro non inizializzato, profilo non impostato!</string>
     <string name="primefill">Carica/Riempi</string>
     <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
     <string name="othersettings_title">Altro</string>
@@ -405,36 +301,23 @@
     <string name="button3">Tasto 3</string>
     <string name="units_colon">Unità:</string>
     <string name="units">Unità</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">Intervallo target:</string>
     <string name="prefs_range_title">Intervallo di visualizzazione</string>
-    <string name="prefs_range_summary">Limite alto e basso per i grafici nella sezione Panoramica e sullo Smartwatch</string>
+    <string name="prefs_range_summary">Limite alto e basso per i grafici nella sezione Panoramica e sullo smartwatch</string>
     <string name="low_mark">Limite BASSO</string>
     <string name="high_mark">Limite ALTO</string>
     <string name="wear">Smartwatch</string>
     <string name="resend_all_data">Invia di nuovo tutti i dati</string>
     <string name="open_settings_on_wear">Apri impostazioni sullo smartwatch</string>
-    <string name="pumperror">Errore micro</string>
-    <string name="lowbattery">Livello batteria basso</string>
-    <string name="pumpshutdown">Arresto micro</string>
-    <string name="batterydischarged">Batteria del micro scarica</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Velocità basale:</string>
-    <string name="profile_set_failed">Impostazione profilo basale fallita</string>
-    <string name="profile_set_ok">Profilo basale aggiornato nel micro</string>
-    <string name="danar_disableeasymode">Disabilita la modalità EasyUI nel micro</string>
-    <string name="danar_enableextendedbolus">Abilita bolo esteso sul micro</string>
-    <string name="danar_switchtouhmode">Cambia la modalità da U/d a U/h nel micro</string>
     <string name="basalvaluebelowminimum">Valore basale inferiore al minimo. Profilo non impostato!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Ultimo BG:</string>
     <string name="mdi">MDI</string>
     <string name="MM640g">MM640g</string>
-    <string name="ongoingnotificaction">Notifica in corso</string>
+    <string name="ongoingnotificaction">Notifica persistente</string>
     <string name="old_data">DATI VECCHI</string>
-    <string name="minago">%1$d min fa</string>
     <string name="sms_minago">%1$dmin fa</string>
     <string name="localprofile">Profilo locale</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,46 +333,27 @@
     <string name="hypo">Ipoglicemia</string>
     <string name="activity">Attività fisica</string>
     <string name="removerecord">Rimuovi record</string>
-    <string name="danar_stats">Statistiche DanaR</string>
-    <string name="danar_stats_cumulative_tdd">TDD cumulativo</string>
-    <string name="danar_stats_expweight">TDD esponenzialmente ponderato</string>
-    <string name="danar_stats_basalrate">Basale</string>
-    <string name="danar_stats_bolus">Bolo</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Rapporto</string>
-    <string name="danar_stats_amount_days"># Giorni</string>
-    <string name="danar_stats_weight">Peso</string>
-    <string name="danar_stats_warning_Message">Probabilmente inaccurato se si usano i boli per il caricamento/riempimento al posto dell\'apposita funzione!</string>
-    <string name="danar_stats_olddata_Message">Dati vecchi, premi \"RICARICA\"</string>
-    <string name="danar_stats_tbb">Basale originale totale</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inizializzazione...</string>
     <string name="actions_shortname">AZN</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">PS</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">PL</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">MICROV</string>
     <string name="profileviewer_shortname">PROFILONS</string>
     <string name="treatments_shortname">TRATT</string>
-    <string name="careportal_shortname">PT</string>
     <string name="objectives_shortname">OBT</string>
     <string name="wear_shortname">SMWA</string>
     <string name="smscommunicator_shortname">SMS</string>
-    <string name="short_tabtitles">Abbrevia i titoli delle schede</string>
+    <string name="short_tabtitles">Accorcia titoli schede</string>
     <string name="always_use_shortavg">Utilizza sempre il delta medio ridotto</string>
     <string name="always_use_shortavg_summary">Utile quando i dati provenienti da sorgenti non filtrate come xDrip diventano \"rumorosi\" (instabili).</string>
-    <string name="advancedsettings_title">Impostazioni avanzate</string>
-    <string name="danar_model">Modello:%1$02X Protocollo:%2$02X Codice:%3$02X</string>
     <string name="profile">Profilo</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">[Valore predefinito: 3] Questo è un parametro di sicurezza chiave in OpenAPS. Ciò che fa è limitare le tue basali a essere 3 volte, al più, la tua velocità basale massima. Probabilmente non avrai bisogno di cambiare questo valore, ma dovresti essere consapevole di cosa significa il gruppo di parametri \"3x max giornaliera; 4x corrente\" e per quali motivi di sicurezza siano stati impostati tali valori.</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">[Valore predefinito: 4] Questo è un ulteriore parametro di sicurezza chiave in OpenAPS. La tua basale temporanea, indipendentemente dalla basale massima impostata sul micro, non può mai essere più alta di questo valore moltiplicato per tua basale corrente in ogni specifico momento. Questo serve a impedire alle persone di addentrarsi in \"territori pericolosi\" impostando basali massime eccessivamente alte prima di aver capito come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; la maggior parte delle persone non avrà bisogno di modificare questo valore e avrà, invece, maggiori probabilità di dover regolare le altre impostazioni.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">[Valore predefinito: 4] Questo è un ulteriore parametro di sicurezza chiave in OpenAPS. La tua basale temporanea, indipendentemente dalla basale massima impostata sul micro, non può mai essere più alta di questo valore moltiplicato per la tua basale corrente in ogni specifico momento. Questo serve a impedire alle persone di addentrarsi in \"territori pericolosi\" impostando basali massime eccessivamente alte prima di aver capito come funziona l\'algoritmo. Ancora una volta, il valore predefinito è 4x; la maggior parte delle persone non avrà bisogno di modificare questo valore e avrà, invece, maggiori probabilità di dover regolare altre impostazioni se ha la sensazione di \"scontrarsi\" con questo limite di sicurezza.</string>
     <string name="openapsama_autosens_max_summary">[Valore predefinito: 1.2]\nQuesto è un moltiplicatore di sicurezza per autosens (e presto autotune) per impostare un limite massimo del 20%% (col valore predefinito) su quanto alto può essere il rapporto di autosens, che a sua volta determina quanto in alto autosens può regolare le basali, quanto in basso può regolare ISF e quanto in basso può impostare il target glicemico.</string>
-    <string name="openapsama_autosens_min_summary">[Valore predefinito: 0.7]\nUn altro limite di sicurezza di autosens, imposta un blocco a quanto in basso autosens può regolare le basali e a quanto in alto può regolare ISF e i target glicemici.</string>
+    <string name="openapsama_autosens_min_summary">[Valore predefinito: 0.7]\nUn altro limite di sicurezza di autosens, imposta un blocco a quanto in basso autosens può regolare le basali e a quanto in alto può regolare ISF e target glicemici.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens regola anche i target</string>
     <string name="openapsama_autosens_adjusttargets_summary">[Valore predefinito: vero]\nViene utilizzato per consentire ad autosens di regolare i target glicemici, in aggiunta a ISF e basali.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">[Valore predefinito: 2]\nBolus snooze è attivato dopo un bolo pasto per fare in modo che il loop non imposti basali temporanee basse quando hai appena mangiato. AndroidAPS non imposterà velocità basali troppo basse nel periodo corrispondente a DIA diviso il parametro bolus snooze - divisore DIA. Con DIA di 3 ore \"bolus snooze\" durerà 1.5 ore (3/2).</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">Calibrazione inviata. La ricezione deve essere abilitata in xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip non sta ricevendo calibrazioni</string>
     <string name="pumpsuspended">Micro sospeso</string>
-    <string name="gettingpumpstatus">Ricezione stato micro</string>
-    <string name="settingtempbasal">Impostazione basale temporanea</string>
-    <string name="stoppingtempbasal">Stop basale temporanea</string>
-    <string name="settingextendedbolus">Impostazione bolo esteso</string>
-    <string name="stoppingextendedbolus">Stop bolo esteso</string>
-    <string name="updatingbasalrates">Aggiornamento velocità basali</string>
-    <string name="disconnecting">Disconnessione</string>
     <string name="executing">Esecuzione</string>
     <string name="virtualpump_settings">Impostazioni micro virtuale</string>
     <string name="virtualpump_uploadstatus_title">Carica stato in NS</string>
-    <string name="wrongpassword">Password Errata</string>
-    <string name="approachingdailylimit">Si avvicina il limite giornaliero di insulina</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">Mostra IOB dettagliato</string>
     <string name="wear_detailedIOB_summary">Dividi IOB in bolo e basale sulla watchface</string>
     <string name="nosuccess">non riuscito - controlla il telefono</string>
-    <string name="notavailable">Non disponibile</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Età del paziente</string>
     <string name="child">Bambino</string>
     <string name="teenage">Adolescente</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">Superbolo</string>
     <string name="ns_logappstartedevent">Registra l\'avvio dell\'app in NS</string>
     <string name="restartingapp">Uscita dall\'applicazione per applicare le impostazioni.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">Quale tipo di insulina stai usando?</string>
     <string name="fastactinginsulin">Insulina Fast Acting</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -598,9 +451,6 @@
     <string name="statuslights_bat_critical">Soglia livello batteria critico [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Ultima connessione</string>
-    <string name="danar_bluetooth_status">Stato bluetooth</string>
     <string name="nav_about">Informazioni su</string>
     <string name="smscommunicator_missingsmspermission">Autorizzazione SMS mancante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorizzazione stato telefono mancante</string>
@@ -611,17 +461,12 @@
     <string name="wear_showbgi_summary">Aggiungi BGI alla statusline</string>
     <string name="ns_noupload">Nessun caricamento in NS</string>
     <string name="ns_noupload_summary">Tutti i dati inviati a NS vengono rifiutati. AAPS è connesso a NS, ma non vengono apportate modifiche</string>
-    <string name="basal_step">Incremento basale</string>
-    <string name="bolus_step">Incremento bolo</string>
     <string name="overview_extendedbolus_cancel_button">Cancella bolo esteso</string>
     <string name="careportal_sensorage_label">Età sensore</string>
     <string name="careportal_canulaage_label">Età cannula</string>
     <string name="careportal_insulinage_label">Età insulina</string>
-    <string name="hours">ore</string>
-    <string name="invalidprofile">Profilo non valido !!!</string>
     <string name="doprofileswitch">Cambia profilo</string>
     <string name="careportal_pbage_label">Età batteria micro</string>
-    <string name="careportal_pumpbatterychange">Cambio batteria micro</string>
     <string name="ns_alarmoptions">Opzioni allarme</string>
     <string name="nsalarm_urgenthigh">Molto alto</string>
     <string name="nsalarm_high">Alto</string>
@@ -645,7 +490,6 @@
     <string name="absorptionsettings_title">Impostazioni assorbimento</string>
     <string name="absorption_maxtime_title">Max tempo assorbimento pasto [h]</string>
     <string name="absorption_maxtime_summary">Tempo in ore in cui è previsto che tutti i carboidrati del pasto vengano assorbiti</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizzare bolo esteso come %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -670,35 +514,18 @@
     <string name="careportal_pump_label">MICRO</string>
     <string name="careportal_newnstreatment_duration_min_label">Durata [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Abilita UAM</string>
     <string name="enablesmb">Abilita SMB</string>
-    <string name="enablesmb_summary">Utilizza Super Micro Boli al posto della basale temporanea per un\'azione più veloce</string>
-    <string name="enableuam_summary">Rilevazione dei pasti Non Annunciati</string>
+    <string name="enablesmb_summary">Utilizza super-micro-boli al posto della basale temporanea per un\'azione più veloce</string>
+    <string name="enableuam_summary">Rilevamento dei pasti non annunciati</string>
     <string name="insulin_oref_peak">Tempo picco Curva IOB</string>
     <string name="insulin_peak_time">Tempo del picco [min]</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
-    <string name="dia_too_short">DIA di %1$f troppo breve - al suo posto, utilizzo %2$f.</string>
+    <string name="dia_too_short">DIA di %1$f troppo breve - utilizzo %2$f.</string>
     <string name="activate_profile">Attiva profilo</string>
-    <string name="date">Data</string>
     <string name="invalid">NON VALIDO</string>
-    <string name="waitingforpairing">In attesa di associare il micro</string>
-    <string name="pairingok">Associazione OK</string>
-    <string name="pairingtimedout">Time out associazione</string>
-    <string name="pairing">Accoppiamento</string>
-    <string name="danars_nodeviceavailable">Nessun dispositivo trovato finora</string>
-    <string name="emptyreservoir">Serbatoio vuoto</string>
-    <string name="bloodsugarmeasurementalert">Avviso misurazione glicemia</string>
-    <string name="remaininsulinalert">Livello insulina rimanente</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Micro selezionato</string>
-    <string name="pairpump">Associa nuovo micro</string>
-    <string name="bolusspeed">Velocità bolo</string>
-    <string name="danar_setbasalstep001">Imposta incremento basale a 0.01 U/h</string>
-    <string name="serialnumber">Numero seriale</string>
     <string name="careportal_newnstreatment_percentage_label">Percentuale</string>
     <string name="careportal_newnstreatment_timeshift_label">Time shift</string>
     <string name="default_temptargets">Temp-Target predefiniti</string>
@@ -708,62 +535,42 @@
     <string name="activity_target">target \"attività fisica\"</string>
     <string name="hypo_duration">target \"ipoglicemia\" - durata</string>
     <string name="hypo_target">target \"ipoglicemia\"</string>
-    <string name="danar_history_prime">Riempimento</string>
-    <string name="gettingextendedbolusstatus">Ricezione stato bolo esteso</string>
-    <string name="gettingbolusstatus">Ricezione stato bolo</string>
-    <string name="gettingtempbasalstatus">Ricezione stato basale temporanea</string>
-    <string name="gettingpumpsettings">Ricezione stato micro</string>
-    <string name="gettingpumptime">Ricezione ora micro</string>
     <string name="reuse">riutilizzo</string>
     <string name="wearcontrol_title">Controlli da smartwatch</string>
-    <string name="wearcontrol_summary">Imposta Temp-Target e inserisci Trattamenti dallo smartwatch.</string>
-    <string name="connectiontimedout">Time out connessione</string>
+    <string name="wearcontrol_summary">Imposta Temp-Target e inserisci trattamenti dallo smartwatch.</string>
     <string name="food">Cibo</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">g</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">Enr</string>
     <string name="shortprotein">Prt</string>
     <string name="shortfat">Grs</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Attesa per la fine del bolo. Rimangono %1$d sec.</string>
-    <string name="processinghistory">Evento di elaborazione</string>
-    <string name="startingbolus">Avvio erogazione bolo</string>
     <string name="executingrightnow">Il comando sarà eseguito ora</string>
-    <string name="pumpdrivercorrected">Driver del micro corretto</string>
     <string name="pump_unreachable">Micro irraggiungibile</string>
     <string name="missed_bg_readings">Letture BG mancanti</string>
     <string name="raise_notifications_as_android_notifications">Usa le notifiche di sistema per gli avvisi</string>
-    <string name="localalertsettings_title">Allarmi locali</string>
-    <string name="enable_missed_bg_readings_alert">Allarme se non si ricevono dati BG</string>
-    <string name="enable_pump_unreachable_alert">Allarme se il micro non è raggiungibile</string>
+    <string name="localalertsettings_title">Avvisi locali</string>
+    <string name="enable_missed_bg_readings_alert">Avviso se non si ricevono dati BG</string>
+    <string name="enable_pump_unreachable_alert">Avviso se il micro è irraggiungibile</string>
     <string name="pump_unreachable_threshold">Soglia micro irraggiungibile [min]</string>
     <string name="urgent_alarm">Allarme urgente</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Spegne il bluetooth del telefono per qualche secondo se non è possibile alcuna connessione al micro. Questo può essere utile su alcuni telefoni.</string>
     <string name="eversense">Eversense app (modificata)</string>
     <string name="dexcomg5_nsupload_title">Carica dati BG su NS</string>
     <string name="bgsource_upload">Impostazioni caricamento BG</string>
     <string name="wear_detailed_delta_title">Mostra delta dettagliato</string>
     <string name="wear_detailed_delta_summary">Mostra delta con una cifra decimale in più</string>
-    <string name="smbinterval_summary">Frequenza di erogazione SMB (min)</string>
+    <string name="smbinterval_summary">Frequenza erogazione SMB (min)</string>
     <string name="smbmaxminutes">Max minuti SMB</string>
     <string name="smbmaxminutes_summary">Max minuti di basale a cui limitare SMB</string>
     <string name="uamsmbmaxminutes">SMB UAM max minuti</string>
     <string name="uamsmbmaxminutes_summary">Max minuti di basale a cui limitare SMB per UAM</string>
     <string name="carbsReqThreshold">Soglia proposta CHO</string>
     <string name="carbsReqThreshold_summary">Quando vengono proposti carboidrati, la quantità minima per la quale verrà mostrata una notifica</string>
-    <string name="unsupportedfirmware">Firmware del micro non supportato</string>
     <string name="dexcomg5_xdripupload_title">Invia dati BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
     <string name="nsclientbg">BG NSClient</string>
-    <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valore basale sostituito dal massimo valore supportato: %1$s</string>
     <string name="overview_editquickwizard_usebg">Calcolo BG</string>
     <string name="overview_editquickwizard_usebolusiob">Calcolo IOB da bolo</string>
     <string name="overview_editquickwizard_usebasaliob">Calcolo IOB da basale</string>
@@ -781,14 +588,12 @@
     <string name="closedmodeenabled">Modalità chiusa abilitata</string>
     <string name="maxiobset">Max IOB impostata correttamente</string>
     <string name="hasbgdata">BG disponibile da sorgente selezionata</string>
-    <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
-    <string name="zerovalueinprofile">Profilo non valido: %1$s</string>
     <string name="combo_programming_bolus">Programmazione micro per erogazione</string>
     <string name="combo_refresh">Ricarica</string>
     <string name="combo_pump_state_label">Stato</string>
     <string name="combo_pump_activity_label">Attività</string>
     <string name="combo_no_pump_connection">Nessuna connessione per %1$d min</string>
-    <string name="combo_tbr_remaining">%1$d%% (%2$d min restanti)</string>
+    <string name="combo_tbr_remaining">%1$d%% (%2$d min rimanenti)</string>
     <string name="combo_pump_state_initializing">Inizializzazione</string>
     <string name="combo_pump_state_suspended_due_to_error">Sospeso a causa di un errore</string>
     <string name="combo_pump_state_suspended_by_user">Sospeso dall\'utente</string>
@@ -798,14 +603,13 @@
     <string name="combo_pump_action_bolusing">Erogazione bolo (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Aggiornamento</string>
     <string name="combo_pump_unsupported_operation">Operazione richiesta non supportata dal micro</string>
-    <string name="combo_low_suspend_forced_notification">Utilizzo non sicuro: sono attivi boli estesi o multiwave. Il loop è stato messo in modalità di sola sospensione dell\'erogazione di insulina in caso di valori bassi, per 6 ore. In modalità loop sono supportati solo boli normali</string>
-    <string name="combo_force_disabled_notification">Utilizzo non sicuro: il micro utilizza un profilo della velocità basale diverso dal primo in elenco tra le sue impostazioni. Il loop è stato disabilitato. Selezionare sul microinfusore il profilo basale numero 1.</string>
+    <string name="combo_low_suspend_forced_notification">Utilizzo non sicuro: sono attivi boli estesi o multiwave. Il loop è stato messo in modalità di sola sospensione dell\'erogazione di insulina a glicemia bassa (LGS), per 6 ore. In modalità loop sono supportati solo boli normali</string>
+    <string name="combo_force_disabled_notification">Utilizzo non sicuro: il micro utilizza un profilo della velocità basale diverso dal primo in elenco tra le sue impostazioni. Il loop è stato disabilitato. Selezionare sul micro il profilo basale numero 1.</string>
     <string name="bolus_frequency_exceeded">Un bolo con la stessa quantità è stato richiesto negli ultimi due minuti. Questo non è consentito al fine di evitare boli doppi accidentali e a protezione di eventuali \"bug\".</string>
     <string name="combo_pump_connected_now">Adesso</string>
     <string name="combo_activity_reading_pump_history">Lettura storico micro</string>
-    <string name="danar_history">Storico micro</string>
     <string name="combo_activity_setting_basal_profile">Impostazione profilo basale</string>
-    <string name="combo_pump_cartridge_low_warrning">Livello serbatoio basso</string>
+    <string name="combo_pump_cartridge_low_warrning">Livello cartuccia basso</string>
     <string name="combo_pump_battery_low_warrning">Livello batteria basso</string>
     <string name="combo_is_in_error_state">Il micro sta mostrando l\'errore E%1$d: %2$s</string>
     <string name="combo_reservoir_low">Basso</string>
@@ -817,14 +621,11 @@
     <string name="combo_error_no_connection_no_bolus_delivered">Il micro potrebbe non essere raggiungibile. Nessun bolo erogato</string>
     <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controlla il micro per evitare un doppio bolo e se è tutto ok, erogalo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
     <string name="combo_error_partial_bolus_delivered">Solo la quantità di %1$.2f U del bolo richiesto di %2$.2f U è stata erogata a causa di un errore. Controlla il micro per verificare quanto accaduto e intraprendi le azioni necessarie.</string>
-    <string name="combo_error_bolus_verification_failed">Erogazione del bolo e verifica dello storico del micro fallite, si prega di controllare il micro. Se è stato erogato un bolo, sarà aggiunto ai trattamenti durante la successiva connessione al micro.</string>
+    <string name="combo_error_bolus_verification_failed">Erogazione del bolo e verifica dello storico del micro fallite. Controllare il micro. Se è stato erogato un bolo, sarà aggiunto ai trattamenti durante la successiva connessione al micro.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Insulina nel serbatoio insufficiente per erogare il bolo</string>
     <string name="extendedbolusdeliveryerror">Errore erogazione bolo esteso</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">fa</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Abilita SMB sempre</string>
     <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
     <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
@@ -835,8 +636,6 @@
     <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività fisica)</string>
     <string name="enablesmbwithhightemptarget">Abilita SMB con target temporanei \"alti\"</string>
     <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando è attivo un target temporaneo \"alto\"</string>
-    <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
-    <string name="mute">Muto</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">CHO</string>
     <string name="overview_buttons_selection">Tasti</string>
@@ -856,7 +655,7 @@
     <string name="data_choices">Scelta dei dati</string>
     <string name="fabric_upload">Invio a fabric.io</string>
     <string name="allow_automated_crash_reporting">Consenti la segnalazione automatica degli errori e l\'invio dei dati di utilizzo delle funzioni dell\'app agli sviluppatori tramite il servizio fabric.io.</string>
-    <string name="g5appnotdetected">Aggiorna la tua app Dexcom ad una versione supportata</string>
+    <string name="g5appnotdetected">Aggiorna la tua app Dexcom a una versione supportata</string>
     <string name="dexcom_app_not_installed">App Dexcom non installata.</string>
     <string name="start_activity_tt">Avvia TT Attività fisica</string>
     <string name="start_eating_soon_tt">Avvia TT Pasto a breve</string>
@@ -878,17 +677,16 @@
     <string name="closed_loop_disabled_on_dev_branch">Versione sviluppatore in esecuzione. Loop chiuso disabilitato.</string>
     <string name="engineering_mode_enabled">Engineering mode abilitata</string>
     <string name="not_eng_mode_or_release">Engineering mode non abilitata e non su \'release branch\'</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lettura profilo basale</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Lo storico del micro è cambiato dopo il calcolo del bolo. Il bolo non è stato erogato. Ricalcolare se un bolo è ancora necessario.</string>
     <string name="combo_error_updating_treatment_record">Bolo erogato con successo, ma non è possibile aggiungere la voce ai trattamenti. Questo può accadere se due piccoli boli della stessa quantità sono stati somministrati negli ultimi due minuti. Verifica lo storico del micro e le voci della sezione Trattamenti e utilizza la sezione Portale per aggiungere eventuali voci mancanti. Assicurati di non aggiungere voci che si riferiscano al medesimo minuto e alla stessa quantità.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rifiuto basale temporanea \"alta\" in quanto il calcolo non ha considerato i cambiamenti recenti allo storico del micro</string>
     <string name="combo_activity_checking_pump_state">Aggiornamento stato micro</string>
-    <string name="combo_warning_pump_basal_rate_changed">La velocità basale nel micro è cambiata e verrà aggiornata a breve</string>
+    <string name="combo_warning_pump_basal_rate_changed">La velocità basale sul micro è cambiata e verrà aggiornata a breve</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Velocità basale cambiata sul micro, ma la sua lettura è fallita</string>
     <string name="combo_activity_checking_for_history_changes">Controllo modifiche allo storico</string>
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Sono appena stati importati più boli con la stessa quantità nello stesso minuto. Solo un record può essere aggiunto ai trattamenti. Controlla il micro e aggiungi manualmente un record di bolo utilizzando la sezione Portale. Assicurati di creare un bolo con un\'ora non utilizzata da nessun altro bolo.</string>
-    <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
+    <string name="about_link_urls">\n\nhttp://www.androidaps.org\n\nfacebook:\nhttp://facebook.androidaps.org</string>
     <string name="combo_check_date">L\'ultimo bolo è più vecchio di 24 ore o ha una data nel futuro. Controlla che la data sul micro sia impostata correttamente.</string>
     <string name="combo_suspious_bolus_time">L\'ora/la data del bolo erogato sul micro sembra errata, IOB probabilmente non è corretto. Controlla l\'ora e/o la data del micro.</string>
     <string name="profileswitch_ismissing">Nessun cambio profilo. Effettua un cambio profilo o premi \"Attiva profilo\" nella sezione Profilo locale.</string>
@@ -901,15 +699,10 @@
     <string name="smbdisabledinpreferences">SMB disabilitato nelle preferenze</string>
     <string name="uamdisabledinpreferences">UAM disabilitato nelle preferenze</string>
     <string name="uamdisabledoref1notselected">UAM disabilitato perché il plugin di sensibilità Oref1, dal quale UAM dipende, non è abilitato</string>
-    <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
-    <string name="pumplimit">limite micro</string>
-    <string name="itmustbepositivevalue">deve essere un valore positivo</string>
     <string name="maxbasalmultiplier">moltiplicatore max basale</string>
     <string name="maxdailybasalmultiplier">moltiplicatore max basale giornaliera</string>
     <string name="smb_frequency_exceeded">Un bolo è stato erogato negli ultimi 3 minuti, SMB ignorato</string>
     <string name="basal_set_correctly">Basale impostata correttamente</string>
-    <string name="limitingpercentrate">Limitazione max tasso percentuale a %1$d%% a causa di: %2$s</string>
-    <string name="limitingbolus">Limitazione bolo a %1$.1f U a causa di: %2$s</string>
     <string name="limitingextendedbolus">Limitazione bolo esteso a %1$.1f U a causa di: %2$s</string>
     <string name="limitingmaxiob">Limitazione max IOB a %1$.1f U a causa di: %2$s</string>
     <string name="limitingcarbs">Limitazione carboidrati a %1$d g a causa di: %2$s</string>
@@ -919,12 +712,11 @@
     <string name="unsafeusage">utilizzo non sicuro</string>
     <string name="readstatusfailed">Lettura stato fallita</string>
     <string name="record_pump_site_change">Registra cambio posizione cannula</string>
-    <string name="record_insulin_cartridge_change">Registra cambio serbatoio insulina</string>
+    <string name="record_insulin_cartridge_change">Registra cambio cartuccia insulina</string>
     <string name="smbalwaysdisabled">Le funzioni \"SMB sempre\" e \"SMB dopo i CHO\" sono disabilitate perché l\'attuale sorgente delle glicemie non supporta il filtraggio avanzato</string>
     <string name="smbnotallowedinopenloopmode">SMB non consentito in modalità loop aperto</string>
     <string name="food_short">Cibo</string>
     <string name="reset">reset</string>
-    <string name="waitingfortimesynchronization">In attesa della sincronizzazione dell\'ora (%1$d sec)</string>
     <string name="loopdisconnectedfor">Disconnesso (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Max IOB totale a cui limitare OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Questo valore è chiamato Max IOB nel contesto OpenAPS\nOpenAPS non aggiungerà ulteriore insulina se IOB corrente è maggiore di questo valore</string>
@@ -940,7 +732,6 @@
     <string name="nav_setupwizard">Configurazione guidata</string>
     <string name="setupwizard_finish">FINE</string>
     <string name="setupwizard_language_prompt">Seleziona la tua lingua</string>
-    <string name="boluserrorcode">Chiesto: %1$.2fU Erogato: %2$.2fU Codice errore: %3$s</string>
     <string name="firstinsulinincrement">Primo incremento di insulina</string>
     <string name="secondinsulinincrement">Secondo incremento di insulina</string>
     <string name="thirdinsulinincrement">Terzo incremento di insulina</string>
@@ -960,10 +751,9 @@
     <string name="openapsama_max_daily_safety_multiplier">Moltiplicatore di sicurezza max basale giornaliera</string>
     <string name="openapsama_current_basal_safety_multiplier">Moltiplicatore di sicurezza basale corrente</string>
     <string name="value_unavailable_short">n/a</string>
-    <string name="virtualpump_type">Micro virtuale</string>
+    <string name="virtualpump_type">Tipo micro virtuale</string>
     <string name="virtualpump_definition">Definizione micro</string>
     <string name="virtualpump_pump_def">Bolo: Step=%1$s\nBolo Esteso: [Step=%2$s, Durata=%3$smin-%4$sh]\nBasale: Step=%5$s\nTBR: %6$s (di %7$s), Durata=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Sono supportati solo valori discreti, non intervalli di valori, come incrementi per basale/bolo nel micro virtuale.</string>
     <string name="ns_autobackfill_title">Riempimento automatico BG</string>
     <string name="wear_wizard_settings">Impostazioni Calcolatore</string>
     <string name="wear_wizard_settings_summary">Calcoli inclusi nel risultato del Calcolatore:</string>
@@ -971,17 +761,17 @@
     <string name="wear_general_settings">Impostazioni generali</string>
     <string name="enable_nsclient">Abilita NSClient</string>
     <string name="welcometosetupwizard">Benvenuto nella configurazione guidata. Ti seguirò durante tutto il processo.\n</string>
-    <string name="pumpsetup">Setup Micro</string>
+    <string name="pumpsetup">Configurazione micro</string>
     <string name="readstatus">Lettura stato</string>
     <string name="adjustprofileinns">Le modifiche devono essere fatte in NS</string>
     <string name="exitwizard">Salta configurazione guidata</string>
     <string name="setupwizard_loop_description">Premi il tasto in basso per permettere ad AndroidAPS di proporre/fare modifiche alla basale</string>
     <string name="apssetup">Configura il plugin APS</string>
-    <string name="sensitivitysetup">Configura il plugin di Sensibilità</string>
-    <string name="setupwizard_sensitivity_description">Il plugin di Sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
+    <string name="sensitivitysetup">Configura il plugin di sensibilità</string>
+    <string name="setupwizard_sensitivity_description">Il plugin di sensibilità è utilizzato per il rilevamento della sensibilità all\'insulina e il calcolo di COB. Per ulteriori informazioni visita:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
     <string name="nsclientinfotext">NSClient gestisce la connessione a Nightscout. Puoi saltare questa parte ora, ma non sarai in grado di superare gli obiettivi fino a quando non ne porterai a termine la configurazione.</string>
-    <string name="diawarning">Ricorda: i nuovi profili di insulina richiedono una DIA di almeno 5h. DIA di 5 - 6h sui nuovi profili sono uguali a DIA di 3h sui vecchi profili di insulina.</string>
+    <string name="diawarning">Ricorda: i nuovi profili di insulina richiedono una DIA di almeno 5h. DIA di 5-6h sui nuovi profili sono uguali a DIA di 3h sui vecchi profili di insulina.</string>
     <string name="bgsourcesetup">Configura sorgente BG</string>
     <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino dovresti utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio profilo\"</string>
     <string name="setupwizard_aps_description">Seleziona uno degli algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente e più aggressivo. Pertanto, se sei un nuovo utente, probabilmente dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
@@ -989,27 +779,11 @@
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
     <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
-    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per eseguire lo scan bluetooth</string>
+    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per eseguire la scansione bluetooth</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
     <string name="insulinsourcesetup">Configura il plugin Insulina</string>
     <string name="exit">Esci</string>
-    <string name="danar_useroptions">Opzioni utente</string>
-    <string name="danar_timedisplay">Formato dell\'ora</string>
-    <string name="danar_buttonscroll">Tasto di scorrimento</string>
-    <string name="danar_beep">Suono alla pressione del tasto</string>
-    <string name="danar_pumpalarm">Allarme</string>
-    <string name="danar_pumpalarm_sound">Suono</string>
-    <string name="danar_pumpalarm_vibrate">Vibrazione</string>
-    <string name="danar_pumpalarm_both">Entrambi</string>
-    <string name="danar_screentimeout">LCD attivo [seconds]</string>
-    <string name="danar_backlight">Retroilluminazione attiva [seconds]</string>
-    <string name="danar_glucoseunits">Unità glucosio</string>
-    <string name="danar_shutdown">Spegnimento [hours]</string>
-    <string name="danar_lowreservoir">Livello serbatoio basso [Units]</string>
-    <string name="danar_saveuseroptions">Salva opzioni nel micro</string>
-    <string name="option_on">On</string>
-    <string name="option_off">Off</string>
     <string name="open_navigation">Apri navigazione</string>
     <string name="close_navigation">Chiudi navigazione</string>
     <string name="nav_plugin_preferences">Preferenze plugin</string>
@@ -1029,8 +803,6 @@
     <string name="sensitivity_raises_target_summary">Quando viene rilevata sensibilità, aumentare la glicemia target</string>
     <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
     <string name="custom">Personalizzato</string>
-    <string name="largetimedifftitle">Grande differenza oraria</string>
-    <string name="largetimediff">Grande differenza oraria:\nL\'ora nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella la cronologia del micro prima di cambiare l\'ora oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
     <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
     <string name="storedsettingsfound">Trovate impostazioni salvate</string>
     <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
@@ -1041,7 +813,7 @@
     <string name="maintenance_amount">Numero di log da inviare</string>
     <string name="maintenance">Manutenzione</string>
     <string name="maintenance_shortname">MANUT</string>
-    <string name="description_maintenance">Fornisce numerose funzioni per la manutenzione (ad es. invio log, eliminazione log).</string>
+    <string name="description_maintenance">Fornisce numerose funzioni per la manutenzione (es. invio log, eliminazione log).</string>
     <string name="send_all_logs">Invia log via Email</string>
     <string name="delete_logs">Elimina log</string>
     <string name="error_adding_treatment_message">Un trattamento (insulina: %1$.2f, carboidrati: %2$d, a: %3$s) non può essere aggiunto ai trattamenti. Controlla e aggiungi il record necessario.</string>
@@ -1056,17 +828,10 @@
     <string name="setupwizard_preferred_aps_mode">Modalità APS preferita</string>
     <string name="treatments_wizard_total_label">Totale</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Connessione</string>
     <string name="sendlogfiles">Invia agli sviluppatori i file log di oggi e di questo momento. Situazione inaspettata.</string>
-    <string name="maxbolusviolation">Violazione bolo massimo</string>
-    <string name="commanderror">Errore comando</string>
-    <string name="speederror">Errore velocità</string>
-    <string name="insulinlimitviolation">Violazione limite insulina</string>
     <string name="loop_openmode_min_change">Richiesta minima di modifica [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Il loop aperto mostrerà una nuova richiesta di modifica solo se la modifica è maggiore di questo valore in %. Il valore predefinito è 20%</string>
-    <string name="pairfirst">Associa il micro con il tuo telefono!</string>
     <string name="searching_for_devices">Ricerca dispositivi…</string>
-    <string name="please_wait">Attendi…</string>
     <string name="pairing_completed">Associazione completata</string>
     <string name="code_compare">I codici mostrati su questo dispositivo e sul micro combaciano?</string>
     <string name="insight_pairing">Associazione Insight</string>
@@ -1077,7 +842,7 @@
     <string name="pump_time_updated">Ora del micro aggiornata</string>
     <string name="confirm">Conferma</string>
     <string name="mute_alert">Muto</string>
-    <string name="pump_alert">Avviso microinfusore</string>
+    <string name="pump_alert">Avviso micro</string>
     <string name="log_site_changes">Registra cambi posizione</string>
     <string name="log_reservoir_changes">Registra cambi serbatoio</string>
     <string name="log_tube_changes">Registra cambi catetere</string>
@@ -1088,7 +853,7 @@
     <string name="enable_tbr_emulation_summary">Usa i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
     <string name="disconnect_delay">Ritardo disconnessione [s]</string>
     <string name="serial_number">Numero seriale</string>
-    <string name="release_software_version">Versione software di rilascio</string>
+    <string name="release_software_version">Versione Release software</string>
     <string name="ui_processor_software_version">Versione UI processor software</string>
     <string name="pc_processor_software_version">Versione PC processor software</string>
     <string name="md_tel_processor_software_version">Versione MD tel processor software</string>
@@ -1118,7 +883,7 @@
     <string name="enable_tbr_over_notification">Abilita notifica di fine TBR\n(impostazione micro)</string>
     <string name="disable_tbr_over_notification">Disabilita notifica di fine TBR\n(impostazione micro)</string>
     <string name="refresh">Ricarica</string>
-    <string name="description_pump_insight_local">Integrazione microinfusore Accu-Chek Insight</string>
+    <string name="description_pump_insight_local">Integrazione del microinfusore Accu-Chek Insight</string>
     <string name="not_inserted">Non inserito</string>
     <string name="short_status_last_connected">Ultima conn: %1$d min fa</string>
     <string name="short_status_tbr">TBR: %1$d%% per %2$d / %3$d min</string>
@@ -1127,10 +892,10 @@
     <string name="short_status_tdd">TDD: %1$.2f</string>
     <string name="short_status_reservoir">Serb.: %1$.2fU</string>
     <string name="short_status_battery">Batt: %1$d%%</string>
-    <string name="max_recovery_duration">Durata massima recupero [s]</string>
-    <string name="min_recovery_duration">Durata minima recupero [s]</string>
+    <string name="max_recovery_duration">Max. durata recupero [s]</string>
+    <string name="min_recovery_duration">Min. durata recupero [s]</string>
     <string name="recovery_duration">Durata recupero</string>
-    <string name="timeout_during_handshake">Timeout durante la comunicazione - riavvia il bluetooth</string>
+    <string name="timeout_during_handshake">Timeout durante la connessione - riavvia il bluetooth</string>
     <string name="weekday_sunday_short">Dom</string>
     <string name="weekday_saturday_short">Sab</string>
     <string name="weekday_friday_short">Ven</string>
@@ -1155,7 +920,6 @@
     <string name="isequalorgreater">è uguale o maggiore di</string>
     <string name="isgreater">è maggiore di</string>
     <string name="isnotavailable">non è disponibile</string>
-    <string name="unknown">sconosciuto</string>
     <string name="glucoseisnotavailable">Glicemia non disponibile</string>
     <string name="glucosecomparedmgdl">Glicemia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicemia %1$s %2$.1f %3$s</string>
@@ -1165,30 +929,17 @@
     <string name="or">O (OR)</string>
     <string name="xor">O (esclusivo - XOR)</string>
     <string name="atspecifiedtime">A %1$s</string>
-    <string name="use_network_location">Usa posizione di rete</string>
-    <string name="use_gps_location">Usa posizione GPS</string>
-    <string name="use_passive_location">Usa posizione passiva</string>
+    <string name="use_network_location">Usa localizzazione di rete</string>
+    <string name="use_gps_location">Usa localizzazione GPS</string>
+    <string name="use_passive_location">Usa localizzazione passiva</string>
     <string name="locationservice">Servizio di localizzazione</string>
     <string name="automation_short">Auto</string>
     <string name="automation">Automazione</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registra cambio sensore in NS</string>
     <string name="dexcom_lognssensorchange_summary">Crea evento \"Cambio Sensore\" in NS all\'avvio del sensore</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">secondo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">ora</string>
-    <string name="unit_day">giorno</string>
-    <string name="unit_week">settimana</string>
-    <string name="unit_seconds">secondi</string>
-    <string name="unit_minutes">minuti</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">giorni</string>
-    <string name="unit_weeks">settimane</string>
     <string name="summary_tidepool_username">Il tuo nome utente per l\'accesso a Tidepool, generalmente il tuo indirizzo email</string>
     <string name="title_tidepool_username">Nome utente</string>
     <string name="summary_tidepool_password">La tua password di Tidepool</string>
@@ -1198,9 +949,9 @@
     <string name="title_tidepool_dev_servers">Usa server integrativi (test)</string>
     <string name="tidepool">Tidepool</string>
     <string name="tidepool_shortname">TDP</string>
-    <string name="description_tidepool">Carica dati in Tidepool</string>
+    <string name="description_tidepool">Carica dati su Tidepool</string>
     <string name="tidepool_upload_cgm">Carica dati CGM</string>
-    <string name="tidepool_upload_bolus">Carica trattamenti (insulina, carboidrati)</string>
+    <string name="tidepool_upload_bolus">Carica trattamenti (insulina, CHO)</string>
     <string name="tidepool_upload_tbr">Carica basali temporanee</string>
     <string name="tidepool_upload_profile">Carica cambi profilo, target temporanei</string>
     <string name="tidepool_upload_bg">Carica test BG</string>
@@ -1224,14 +975,13 @@
     <string name="add_short">AGG</string>
     <string name="copy_short">COPIA</string>
     <string name="addnew">Aggiungi nuovo</string>
-    <string name="versionChecker">Controllo Versione</string>
+    <string name="versionChecker">Controllo versione</string>
     <string name="signature_verifier">Verificatore firma</string>
     <string name="running_invalid_version">Abbiamo rilevato che stai eseguendo una versione non valida. Loop disabilitato!</string>
     <string name="old_version">versione datata</string>
     <string name="very_old_version">versione molto datata</string>
     <string name="new_version_warning">Nuova versione disponibile per almeno %1$d giorni! Ritorno a LGS dopo %2$d giorni, disattivazione del loop dopo %3$d giorni</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Dexcom app (modificata)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Ricevi valori glicemia dall\'app Dexcom modificata.</string>
@@ -1277,12 +1027,12 @@
     <string name="remove_label">RIMUOVI</string>
     <string name="preconditions">Presupposti:</string>
     <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal microinfusore e/o dal driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal microinfusore.</string>
+    <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal micro e/o dal driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
     <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integrazione del micro Medtronic, richiede un dispositivo RileyLink e uno specifico modello di micro</string>
+    <string name="description_pump_medtronic">Integrazione del microinfusore Medtronic, richiede un dispositivo RileyLink e uno specifico modello di microinfusore</string>
     <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Numero Seriale micro</string>
+    <string name="medtronic_serial_number">Numero seriale micro</string>
     <string name="medtronic_pump_type">Tipo micro</string>
     <string name="medtronic_pump_frequency">Frequenza micro</string>
     <string name="medtronic_pump_bolus_delay">Ritardo prima che il Bolo sia avviato (s)</string>
@@ -1308,10 +1058,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Selezionato</string>
     <string name="rileylink_scanner_title">Scansione RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy non supportato.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth disabilitato.</string>
-    <string name="location_not_found_title">La posizione è disabilitata</string>
-    <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui nuovi dispositivi, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
     <string name="location_yes">Abilita</string>
     <string name="location_no">No</string>
     <string name="rileylink_scanner_scanning">Scansione</string>
@@ -1334,10 +1080,10 @@
     <string name="rileylink_device_model">Modello dispositivo</string>
     <string name="rileylink_last_used_frequency">Ultima frequenza utilizzata</string>
     <string name="rileylink_last_device_contact">Ultimo contatto dispositivo</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
+    <string name="rileylink_firmware_version">RL firmware</string>
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Inizializzazione bluetooth…</string>
-    <string name="rileylink_state_bt_error">Errore Bluetooth</string>
+    <string name="rileylink_state_bt_error">Errore bluetooth</string>
     <string name="rileylink_state_bt_ready">Bluetooth pronto</string>
     <string name="rileylink_state_not_started">Non avviato</string>
     <string name="rileylink_state_rl_init">Inializzazione RileyLink…</string>
@@ -1353,7 +1099,6 @@
     <string name="rileylink_error_tuneup_failed">Sintonizzazione fallita</string>
     <string name="rileylink_error_pump_unreachable">Micro irraggiungibile</string>
     <string name="rileylink_error_pod_unreachable">Pod irraggiungibile</string>
-    <string name="rileylink_error_address_not_set_short">Non impostato</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Micro Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1368,10 +1113,10 @@
     <string name="medtronic_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Il tipo di micro rilevato non è uguale al tipo configurato.</string>
     <string name="medtronic_error_pump_basal_profiles_not_enabled">L\'impostazione di modelli/profili basali non è abilitata sul micro. Abilitala sul micro.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato nel micro non è corretto (deve essere STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato nel micro (deve essere Assoluto).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato nel micro (deve essere %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata nel micro (deve essere %1$.2f).</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato sul micro non è corretto (deve essere STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato sul micro (deve essere Assoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato sul micro (deve essere %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata sul micro (deve essere %1$.2f).</string>
     <string name="medtronic_error_operation_not_possible_no_configuration">Operazione non possibile.\n\n Devi prima configurare il micro Medtronic.</string>
     <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica oraria di oltre 24h.</string>
     <!-- MDT History -->
@@ -1381,7 +1126,7 @@
     <string name="medtronic_history_group_statistic">Statistiche</string>
     <string name="medtronic_history_group_unknown">Sconosciuti</string>
     <string name="medtronic_history_group_all">Tutto</string>
-    <string name="medtronic_pump_history">Storico del micro Medtronic</string>
+    <string name="medtronic_pump_history">Storico micro Medtronic</string>
     <!-- MDT Pump Status -->
     <string name="medtronic_pump_status_never_contacted">Mai connesso</string>
     <string name="medtronic_pump_status_waking_up">Risveglio</string>
@@ -1392,7 +1137,7 @@
     <string name="medtronic_pump_status_active">Attivo</string>
     <string name="medtronic_pump_status_sleeping">In sospensione</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Hai cancellato il bolo, dopo che era già stato impostato sul microinfusore. Dal momento che il micro Medtronic non supporta la cancellazione, avrai bisogno di cancellare il bolo manualmente. Metti il micro in modalità sospensione e poi fallo ripartire (se vuoi ancora cancellare il bolo). L\'applicazione rileverà le modifiche al prossimo aggiornamento (in meno di 5 minuti).</string>
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Hai cancellato il bolo, dopo che era già stato impostato sul micro. Dal momento che il micro Medtronic non supporta la cancellazione, avrai bisogno di cancellare il bolo manualmente. Metti il micro in modalità sospensione e poi fallo ripartire (se vuoi ancora cancellare il bolo). L\'applicazione rileverà le modifiche al prossimo aggiornamento (in meno di 5 minuti).</string>
     <string name="medtronic_cmd_cant_read_tbr">Impossibile leggere il TBR corrente.</string>
     <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossibile cancellare il TBR corrente. Arresto dell\'operazione.</string>
     <string name="medtronic_cmd_set_profile_pattern_overflow">Impostazione del profilo fallita. A causa dei seguenti pattern, hai una velocità basale troppo grande: %1$s</string>
@@ -1423,7 +1168,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Vincolo Bolo applicato: %2$.2fU a %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Rilevato assorbimento lento dei carboidrati: %2$d%% del tempo. Ricontrolla il tuo calcolo. COB potrebbero essere sovrastimati e potrebbe essere somministrata più insulina !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Eroga parte del risultato del calcolatore [%]</string>
     <string name="deliverpartofboluswizard">Il calcolatore esegue il calcolo, ma solo questa parte dell\'insulina calcolata è erogata. Utile con algoritmo SMB.</string>
     <string name="loading">Caricamento ...</string>
@@ -1431,7 +1175,6 @@
     <string name="time_range">Intervallo di tempo</string>
     <string name="timerange_value">L\'intervallo di tempo è compreso tra %1$s e %2$s</string>
     <string name="between">Tra </string>
-    <string name="close">Chiudi</string>
     <string name="increasingmaxbasal">Aumento del valore max basale perché l\'impostazione è inferiore alla tua basale massima nel profilo</string>
     <string name="smscommunicator_messagebody">Corpo del messaggio non valido</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1449,7 +1192,6 @@
     <string name="common_off">Off</string>
     <string name="objectives_button_unfinish">Cancella completamento</string>
     <string name="objectives_button_unstart">Cancella avvio</string>
-    <string name="timedetection">Rilevazione tempo</string>
     <string name="doyouwantresetstart">Vuoi resettare l\'avvio dell\'obiettivo? Potresti perdere i tuoi progressi.</string>
     <string name="time_or_timezone_change">Cambio di ora e/o fuso orario sul micro</string>
     <string name="nopumpselected">Nessun micro selezionato</string>
@@ -1476,7 +1218,6 @@
     <string name="nav_survey">Sondaggio</string>
     <string name="invalidage">Inserimento età non valido</string>
     <string name="invalidweight">Inserimento peso non valido</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Basso: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Alto: <b>%4$02d%%</b>]]></string>
     <string name="average">Media</string>
     <string name="tdd">TDD</string>
@@ -1489,12 +1230,8 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Strumenti</string>
     <string name="show_calculation">Mostra calcolo</string>
-    <string name="error">Errore</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Evento di automazione</string>
     <string name="alreadyset">Già impostato</string>
-    <string name="message">Messaggio</string>
     <string name="clearqueueconfirm">Cancellare la coda? Tutti i dati in coda andranno persi!</string>
     <string name="ebstopsloop">L\'uso della funzione bolo esteso interromperà la modalità loop chiuso per il tempo di esecuzione del bolo esteso. Lo vuoi davvero?</string>
     <string name="closed_loop_disabled_with_eb">Loop chiuso disabilitato a causa dell\'esecuzione di un bolo esteso</string>
@@ -1508,23 +1245,23 @@
     <string name="loop_tbrexecution_time_label">Esecuzione basale temporanea (momento)</string>
     <string name="insight_alert_notification_channel">Avvisi micro Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
-    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">da app Autenticatore per: %1$s</string>
-    <string name="smscommunicator_otp_enabled">Abilita Autenticatore</string>
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">da app autenticatore per: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Abilita autenticatore</string>
     <string name="smscommunicator_otp_enabled_summary">Autentica i comandi utilizzando OTP (One Time Password) generate da Google Authenticator o app 2FA simili.</string>
     <string name="smscommunicator_otp_pin">PIN aggiuntivo a fine token</string>
     <string name="smscommunicator_otp_pin_summary">Cifre aggiuntive che devono essere memorizzate e incollate alla fine di ogni OTP generata</string>
-    <string name="smscomunicator_tab_otp_label">Configurazione Autenticatore</string>
+    <string name="smscomunicator_tab_otp_label">Configurazione autenticatore</string>
     <string name="smscommunicator_otp_verify_label">OTP per verifica:</string>
-    <string name="smscommunicator_otp_reset_btn">Resetta Autenticatori</string>
-    <string name="smscommunicator_otp_reset_title">Resetta Chiave Autenticatore</string>
-    <string name="smscommunicator_otp_reset_prompt">Sei sicuro di resettare la chiave Autenticatore? Renderà non validi tutti gli Autenticatori attualmente configurati e sarà necessario configurarli nuovamente.</string>
-    <string name="smscommunicator_otp_reset_successful">La nuova Chiave Autenticatore è stata generata! Utilizza il QRCode aggiornato per fornire gli autenticatori.</string>
-    <string name="smscommunicator_otp_step1_install_header">1. Installa l\'Autenticatore</string>
+    <string name="smscommunicator_otp_reset_btn">Resetta autenticatori</string>
+    <string name="smscommunicator_otp_reset_title">Resetta chiave autenticatore</string>
+    <string name="smscommunicator_otp_reset_prompt">Sei sicuro di resettare la chiave autenticatore? Renderà non validi tutti gli autenticatori attualmente configurati e sarà necessario configurarli nuovamente.</string>
+    <string name="smscommunicator_otp_reset_successful">La nuova chiave autenticatore è stata generata! Utilizza il QRCode aggiornato per fornire gli autenticatori.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installa l\'autenticatore</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Scansione il codice per configurare i codici OTP di AndroidAPS</string>
     <string name="smscommunicator_otp_step3_test_header">3. Testa OTP</string>
-    <string name="smscommunicator_otp_reset_header">Resetta Autenticatori</string>
-    <string name="smscommunicator_otp_install_info">Su ogni telefono follower installa una app Autenticatore che supporta i token RFC 6238 TOTP. App gratuite popolari sono:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
-    <string name="smscommunicator_otp_provisioning_warning">NON CONDIVIDERE questo codice online!\nUtilizzalo solo per configurare l\'app Autenticatore sui telefoni follower.</string>
+    <string name="smscommunicator_otp_reset_header">Resetta autenticatori</string>
+    <string name="smscommunicator_otp_install_info">Su ogni telefono follower installa una app autenticatore che supporta i token RFC 6238 TOTP. App gratuite popolari sono:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NON CONDIVIDERE questo codice online!\nUtilizzalo solo per configurare l\'app autenticatore sui telefoni follower.</string>
     <string name="smscommunicator_otp_reset_warning">Resettando l\'autenticatore rendi non validi tutti gli autenticatori già forniti. Dovrai configurarli di nuovo!</string>
     <string name="onconnect">Alla connessione</string>
     <string name="ondisconnect">Alla disconnessione</string>
@@ -1538,4 +1275,115 @@
     <string name="statuslights">Indicatori di stato</string>
     <string name="statuslights_copy_ns">Copia impostazioni da NS</string>
     <string name="copyexistingvalues">Copiare impostazioni NS (se esiste)?</string>
+    <string name="classic_desrciption">Tema originale</string>
+    <string name="buttonson_desrciption">I tasti vengono sempre visualizzati nella parte inferiore dello schermo</string>
+    <string name="skin">Tema</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integrazione del microinfusore Omnipod, richiede un dispositivo RileyLink (con almeno il firmware 2.0).</string>
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">BIP bolo abilitato</string>
+    <string name="omnipod_config_beep_basal_enabled">BIP basale abilitato</string>
+    <string name="omnipod_config_beep_smb_enabled">BIP SMB abilitato</string>
+    <string name="omnipod_config_beep_tbr_enabled">BIP TBR abilitato</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Opzioni debug pod abilitate</string>
+    <string name="omnipod_config_timechange_enabled">Rilevamento ora legale/fuso orario abilitato</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">GSTN pod</string>
+    <string name="omnipod_pod_status">Stato pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U rimanenti</string>
+    <string name="omnipod_reservoir_over50">Oltre 50 U</string>
+    <string name="omnipod_pod_address">Indirizzo pod</string>
+    <string name="omnipod_pod_expiry">Scadenza pod</string>
+    <string name="omnipod_pod_name_no_info">No info</string>
+    <string name="omnipod_pod_no_pod_connected">Nessun pod connesso</string>
+    <string name="omnipod_pod_not_initalized">Non inizializzato</string>
+    <string name="omnipod_pod_active_alerts">Attiva avvisi pod</string>
+    <string name="omnipod_ack_short">Conferma avvisi</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operazione non possibile.\n\nDevi prima configurare Omnipod.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operazione non possibile.\n\n Devi attendere qualche minuto che AAPS imposti il profilo per la prima volta.</string>
+    <string name="omnipod_error_illegal_init_action_type">Illegal PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Nessun pod attivo.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Verifica comando fallita.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Si è verificato un errore imprevisto. Segnalalo! (%1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Comunicazione fallita: ricevuti parametri di input non validi.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Comunicazione fallita: timeout.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicazione fallita: si è verificato un errore imprevisto. Segnalalo!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Comunicazione fallita: verifica dell\'integrità del messaggio fallita.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Comunicazione fallita: ricevuto un pacchetto non valido dal pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Comunicazione fallita: il pod è in uno stato non corretto.</string>
+    <string name="omnipod_driver_error_invalid_response">Comunicazione fallita: ricevuta una risposta non valida dal pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicazione fallita: ricevuto dal pod un messaggio con una sequenza numerica non valida.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Comunicazione fallita: ricevuto dal pod un messaggio con un indirizzo non valido.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Comunicazione fallita: non si è riuscito a decodificare il messaggio dal pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Comunicazione fallita: risincronizzazione \'nonce\' non riuscita.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicazione fallita: \'nonce\' non sincronizzato.</string>
+    <string name="omnipod_driver_error_not_enough_data">Comunicazione fallita: non abbastanza dati ricevuti dal pod.</string>
+    <string name="omnipod_driver_error_pod_fault">È stato rilevato un guasto al pod (%1$03d %2$s). Disattiva il tuo pod e avviane uno nuovo.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Comunicazione fallita: il pod ha restituito una risposta di errore.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestione pod</string>
+    <string name="omnipod_cmd_init_pod">Inizializza pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Disattiva pod</string>
+    <string name="omnipod_cmd_reset_pod">Resetta pod</string>
+    <string name="omnipod_cmd_pod_history">Storico pod</string>
+    <string name="omnipod_cmd_set_bolus">Imposta bolo</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancella bolo</string>
+    <string name="omnipod_cmd_set_tbr">Imposta basale temporanea</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancella basale temporanea (internamente dal driver)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancella basale temporanea (forzato da utente)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Imposta piano basale</string>
+    <string name="omnipod_cmd_get_pod_status">Ottieni stato pod</string>
+    <string name="omnipod_cmd_get_pod_info">Ottieni info pod</string>
+    <string name="omnipod_cmd_set_time">Imposta ora</string>
+    <string name="omnipod_cmd_configure_alerts">Configurazione avvisi</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Conferma avvisi</string>
+    <string name="omnipod_cmd_suspend_delivery">Sospendi erogazione</string>
+    <string name="omnipod_cmd_resume_delivery">Riprendi erogazione</string>
+    <string name="omnipod_cmd_unknown_entry">Inserimento sconosciuto</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Tasso: %1$.1f U, Durata: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Se premi <b>OK</b>, lo stato del pod verrà resettato forzatamente e non potrai più comunicare con il pod. Fallo solo se non riesci più a comunicare con il pod. Se puoi ancora a comunicare con il pod, utilizza l\'opzione <b>Disattiva pod</b> .</string>
+    <string name="omnipod_cmd_pod_history_na">Storico pod non disponibile al momento.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Riempi il pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nRiempi il nuovo pod con abbastanza insulina per 3 giorni.\n\nResta in ascolto di due bip dal pod durante il processo di riempimento. Questi indicano che è stata inserita la quantità minima di 85U. Assicurati di svuotare completamente la siringa di riempimento, anche dopo aver sentito i due segnali acustici.\n\nDopo il riempimento del pod, premi <b>Avanti</b>.\n\n<b>Nota:</b> non rimuovere la protezione dell\'ago del pod in questo momento.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Caricamento</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Prova associazione nuovo pod e caricamento.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> mantieni il pod molto vicino al RileyLink in questo momento.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Collega il pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepara il sito di infusione. Rimuovi la protezione dell\'ago del pod e il supporto adesivo e attacca il pod al sito di infusione.\n\nSe la cannula fuoriesce premi <b>Annulla</b> e cambia il tuo pod.\n\nPremi <b>Avanti</b> per inserire la cannula e iniziare l\'erogazione della basale.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Inserimento cannula</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Prova impostazione piano basale iniziale e inserimento cannula.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Info pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nIl pod è adesso attivo.\n\nIl tuo piano basale è stato programmato e la cannula è stata inserita.\n\nVerifica che la cannula sia stata inserita correttamente e sostituisci il tuo pod se avverti il contrario.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Disattiva pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nPremi <b>Avanti</b> per disattivare il pod.\n\n<b>Nota:</b> Questo sospenderà tutta l\'erogazione di insulina e disattiverà il pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Disattivazione del pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Disattivazione del pod.\n\nQuando tutti gli elementi sono stati controllati, puoi premere <b>Avanti</b>.\n\n<b>Nota:</b> Se la disattivazione fallisce continuamente, premi <b>Annulla</b> e usa l\'opzione <b>Resetta pod</b> per resettare forzatamente lo stato del pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod disattivato.\n\nRimuovi il pod dal tuo corpo e gettalo.</string>
+    <string name="omnipod_init_pod_pair_pod">Associa pod</string>
+    <string name="omnipod_init_pod_prime_pod">Carica pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Riempi cannula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Imposta profilo basale</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancella erogazione</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Disattiva pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integrazione del microinfusore Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Fine promemoria associazione</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Fine promemoria configurazione</string>
+    <string name="omnipod_alert_expiration">Il pod scadrà presto</string>
+    <string name="omnipod_alert_expiration_advisory">Il pod scadrà presto</string>
+    <string name="omnipod_alert_shutdown_imminent">L\'arresto è imminente</string>
+    <string name="omnipod_alert_low_reservoir">Livello serbatoio basso</string>
+    <string name="omnipod_alert_unknown_alert">Avviso sconosciuto</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">L\'impostazione del profilo basale potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Ricarica lo stato del pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">L\'impostazione della basale temporanea potrebbe essere fallita. Se era già in esecuzione una basale temporanea, questa potrebbe essere stata cancellata! Ricarica lo stato del pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">L\'impostazione dell\'ora potrebbe essere fallita. L\'erogazione potrebbe essere sospesa! Ricarica lo stato del pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Impossibile verificare che il bolo sia riuscito. Verifica che il tuo pod stia erogando il bolo oppure cancellalo.</string>
+    <string name="omnipod_rl_stats">Statistiche RL</string>
+    <string name="omnipod_read_pulse_log_short">Log impulsi</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index a3b1b0bc3c..c11f8ba5f6 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -24,4 +24,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index f2c7564cc4..70cc9c5d48 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -17,4 +17,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 414d29fbd6..0c04ecd8ab 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">데이터베이스 초기화</string>
     <string name="reset_db_confirm">데이터 베이스를 정말 초기화하시겠습니까?</string>
     <string name="nav_exit">종료</string>
-    <string name="danar_useextended_title">200%%이상 주입 위해 확장 Bolus 사용</string>
-    <string name="danar_bt_name_title">다나R 블루투스</string>
     <string name="ns_sync_use_absolute_title">Basal 절대값 사용하기</string>
     <string name="alert_dialog_storage_permission_text">폰을 재부팅하거나 AndroidAPS를 재시작하세요 \n그렇지 않으면 로그 기록이 되지 않습니다.(알고리즘이 정상적인 작동하는지 확인하기 위해 로그가 필요합니다.)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">이 장치는 배터리 최적화 화이트리스트를 지원하지 않습니다 - 성능 문제가 발생할 수 있습니다.</string>
     <string name="description_actions">일반 기능을 빠르게 실행시킬 버튼</string>
-    <string name="description_careportal">고급 로그 항목을 입력합니다.</string>
     <string name="description_config_builder">활성화된 플러그인을 구성하는 데 사용됩니다.</string>
     <string name="description_objectives">프로그램 배우기</string>
     <string name="description_food">Nightscout에서 정의된 음식 설정을 표시합니다.</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Nightscout에서 정의한 프로필을 사용합니다.</string>
     <string name="description_profile_simple">하나의 시간대만 설정 가능한 단순 프로파일</string>
     <string name="description_pump_combo">아큐-첵 Combo 펌프와 연동, ruffy 설치 필요</string>
-    <string name="description_pump_dana_r">다나R 펌프와 연동(다나 RN)</string>
-    <string name="description_pump_dana_r_korean">내수용 다나R 펌프와 연동(다나 R)</string>
-    <string name="description_pump_dana_r_v2">업그레이드 펌웨어가 설치된 다나R 펌프와 연동</string>
-    <string name="description_pump_dana_rs">다나RS 펌프와 연동</string>
     <string name="description_pump_mdi">다회요법으로 관리하는 사용자를 위한 설정</string>
     <string name="description_pump_virtual">가상용 펌프를 위한 설정(Open Loop)</string>
     <string name="description_sensitivity_aaps">Oref0와 동일한 방법으로 민감도가 계산되지만, 과거 시간을 지정할 수 있습니다. 최소 탄수화물 흡수는 설정에서 최대 탄수화물 흡수 시간으로 부터 계산됩니다.</string>
@@ -53,13 +46,6 @@
     <string name="description_wear">WearOS 워치를 이용하여 AndroidAPS를 모니터하고 제어합니다.</string>
     <string name="description_xdrip_status_line">xDrip+ 워치페이스에서 Loop정보 보여주기</string>
     <string name="description_sms_communicator">SMS 전송을 이용하여 AndroidAPS를 원격 제어합니다.</string>
-    <string name="nsprofileview_units_label">단위</string>
-    <string name="nsprofileview_dia_label">인슐린활동시간(DIA):</string>
-    <string name="nsprofileview_ic_label">인슐린 대 탄수화물 비율(IC):</string>
-    <string name="nsprofileview_isf_label">인슐린 민감도(ISF):</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">목표:</string>
-    <string name="noprofileset">프로파일이 설정되지 않았습니다.</string>
     <string name="treatments_insulin_label_string">인슐린:</string>
     <string name="treatments_carbs_label_string">탄수화물:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,15 +61,9 @@
     <string name="treatments_wizard_tt_label">임시목표</string>
     <string name="treatments_wizard_carbs_label">탄수화물</string>
     <string name="treatments_wizard_correction_label">교정</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">지금 실행</string>
     <string name="vitualpump_label">가상 펌프</string>
-    <string name="pump_basebasalrate_label">기본 Basal양</string>
-    <string name="pump_tempbasal_label">임시Basal</string>
-    <string name="virtualpump_extendedbolus_label">확장Bolus</string>
-    <string name="pump_battery_label">배터리</string>
-    <string name="pump_reservoir_label">인슐린 잔량</string>
     <string name="virtualpump_resultok">네</string>
     <string name="openapsma_lastrun_label">최근 실행</string>
     <string name="openapsma_inputparameters_label">입력 변수</string>
@@ -95,16 +75,11 @@
     <string name="result">결과</string>
     <string name="result_insulin_carbs">결과: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">혈당 데이터 없음</string>
-    <string name="nochangerequested">변경사항 없음</string>
     <string name="openapsma_request_label">요청</string>
-    <string name="rate">주입량</string>
-    <string name="duration">기간</string>
-    <string name="reason">근거</string>
     <string name="glucose">혈당</string>
     <string name="delta">증분</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">구성 관리자</string>
-    <string name="objectives">목표</string>
     <string name="overview">홈</string>
     <string name="nsprofile">NS 프로파일</string>
     <string name="simpleprofile">Simple 프로파일</string>
@@ -122,7 +97,6 @@
     <string name="configbuilder_general">일반</string>
     <string name="configbuilder_general_description">유용한 여러가지 플러그인</string>
     <string name="configbuilder_constraints_description">어떤 제약을 적용합니까?</string>
-    <string name="days">일</string>
     <string name="constraints">제한</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -138,7 +112,6 @@
     <string name="openapsma_disabled">플러그인이 사용불가능 합니다</string>
     <string name="constraints_violation">제한 위반</string>
     <string name="treatmentdeliveryerror">Bolus 주입 에러</string>
-    <string name="tempbasaldeliveryerror">임시Basal 주입 에러</string>
     <string name="overview_newtempbasal_basalpercent">Basal 값 [%]</string>
     <string name="setbasalquestion">새 임시Basal 적용:</string>
     <string name="overview_treatment_label">관리</string>
@@ -149,7 +122,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">탄수화물</string>
     <string name="changeyourinput">입력값을 변경하세요!</string>
     <string name="configbuilder_bgsource">혈당 출처</string>
     <string name="configbuilder_bgsource_description">AndroidAPS가 어디에서 데이터를 가져옵니까?</string>
@@ -166,25 +138,6 @@
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Bolus 제한이 적용되었습니다</string>
     <string name="carbsconstraintapplied">탄수화물 제한이 적용되었습니다</string>
-    <string name="careportal_bgcheck">혈당 체크</string>
-    <string name="careportal_announcement">알림</string>
-    <string name="careportal_note">노트</string>
-    <string name="careportal_question">의문</string>
-    <string name="careportal_exercise">운동</string>
-    <string name="careportal_pumpsitechange">펌프 위치 변경</string>
-    <string name="careportal_cgmsensorinsert">CGM 센서 삽입</string>
-    <string name="careportal_cgmsensorstart">CGM 센서 시작</string>
-    <string name="careportal_insulincartridgechange">인슐린 카트리지 교체</string>
-    <string name="careportal_profileswitch">프로파일 변경</string>
-    <string name="careportal_snackbolus">간식Bolus</string>
-    <string name="careportal_mealbolus">Meal Bolus</string>
-    <string name="careportal_correctionbolus">교정Bolus</string>
-    <string name="careportal_combobolus">콤보Bolus</string>
-    <string name="careportal_tempbasalstart">임시Basal 시작</string>
-    <string name="careportal_tempbasalend">임시Basal 종료</string>
-    <string name="careportal_carbscorrection">탄수화물 교정</string>
-    <string name="careportal_openapsoffline">OpenAPS 오프라인</string>
-    <string name="careportal_newnstreatment_eventtype">이벤트 종류</string>
     <string name="careportal_newnstreatment_other">기타</string>
     <string name="careportal_newnstreatment_meter">측정기</string>
     <string name="careportal_newnstreatment_sensor">센서</string>
@@ -216,35 +169,12 @@
     <string name="openapsma_maxbasal_summary">이 값은 OpenAPS에서 Max Basal(최대 Basal)로 설정되는 값입니다</string>
     <string name="openapsma_maxiob_title">OpenAPS가 주입할수 있는 최대 Basal IOB [U]</string>
     <string name="openapsma_maxiob_summary">이 값은 OpenAPS에서 Max IOB라고 부르는 값입니다\n기본값은 0으로 설정되어 있습니다. 몇일 혹은 몇주 정도 사용 후 적절한 값으로 변경할 수 있습니다.</string>
-    <string name="dismiss">무시</string>
-    <string name="danarpump">다나R</string>
-    <string name="connecting">연결중</string>
-    <string name="connected">연결됨</string>
-    <string name="disconnected">연결 끊김</string>
-    <string name="danar_pump_settings">다나 펌프 설정</string>
     <string name="end_user_license_agreement">최종 사용자 라이선스 동의서</string>
     <string name="end_user_license_agreement_text">이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">모두 이해하였고 동의합니다.</string>
     <string name="save">저장</string>
-    <string name="nobtadapter">블루투스 어댑터를 찾지 못했습니다</string>
-    <string name="devicenotfound">선택된 기기를 찾지 못했습니다</string>
-    <string name="connectionerror">펌프 연결 에러</string>
-    <string name="danar_iob_label">펌프 IOB</string>
-    <string name="danar_dailyunits">일 인슐린 총량</string>
-    <string name="pump_lastbolus_label">최근 Bolus:</string>
-    <string name="hoursago">%1$.1f시간 전</string>
-    <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>
-    <string name="danar_valuenotsetproperly">값이 제대로 설정되지 않았습니다</string>
     <string name="reloadprofile">프로파일 새로고침</string>
-    <string name="danar_viewprofile">프로파일 보기</string>
-    <string name="enacted">실행</string>
-    <string name="comment">의견</string>
-    <string name="success">성공</string>
-    <string name="percent">퍼센트</string>
-    <string name="absolute">절대값</string>
-    <string name="canceltemp">임시Basal 취소하기</string>
     <string name="smscommunicator">SMS 통신기</string>
-    <string name="waitingforpumpresult">결과 기다리는 중</string>
     <string name="smscommunicator_allowednumbers">허가된 전화번호</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU 을 주입하려면 %2$s 를 입력하고 답장하세요</string>
@@ -265,54 +195,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">%2$d 분 동안 목표 %1$s</string>
     <string name="smscommunicator_tt_set">%2$d 분 동안 목표 %1$s 설정이 완료되었습니다</string>
     <string name="smscommunicator_tt_canceled">임시 목표 취소가 완료되었습니다</string>
-    <string name="bolusdelivering">%1$.2fU 주입중</string>
     <string name="smscommunicator_remotecommandsallowed">SMS 원격 명령 사용하기</string>
-    <string name="glucosetype_finger">채혈</string>
-    <string name="glucosetype_sensor">센서</string>
-    <string name="manual">수동</string>
-    <string name="careportal_temporarytarget">임시 목표</string>
-    <string name="careportal_temporarytargetcancel">임시 목표 취소</string>
     <string name="danarprofile">DanaR 프로파일 설정</string>
     <string name="danarprofile_dia">인슐린활동시간(DIA) [h]</string>
     <string name="danarprofile_dia_summary">인슐린 활동 기간</string>
-    <string name="failedupdatebasalprofile">Basal 프로파일 갱신 실패</string>
-    <string name="danar_historyreload">새로고침</string>
     <string name="uploading">업로드중</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">에러</string>
-    <string name="danar_refill">교체</string>
-    <string name="danar_basalhour">Basal 시간</string>
-    <string name="danar_glucose">혈당</string>
-    <string name="danar_carbohydrate">탄수화물</string>
-    <string name="danar_alarm">알람</string>
-    <string name="danar_totaluploaded">총 %1$d 기록들이 업로드되었습니다.</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">알람</string>
-    <string name="danar_history_basalhours">Basal 시간</string>
-    <string name="danar_history_bolus">Boluses</string>
-    <string name="danar_history_carbohydrates">탄수화물</string>
-    <string name="danar_history_dailyinsulin">일일 인슐린</string>
-    <string name="danar_history_errors">에러</string>
-    <string name="danar_history_glucose">혈당</string>
-    <string name="danar_history_refill">교체</string>
-    <string name="danar_history_syspend">중지</string>
-    <string name="danar_history_connectingfor">%1$d 초 동안 연결중</string>
-    <string name="danar_password_title">펌프 비밀번호</string>
-    <string name="wrongpumppassword">펌프 비밀번호가 잘못되었습니다!</string>
-    <string name="pumpbusy">펌프가 바쁩니다</string>
-    <string name="overview_bolusprogress_delivered">주입됨</string>
-    <string name="overview_bolusprogress_stoped">정지됨</string>
     <string name="bolusstopped">Bolus 중지됨</string>
     <string name="bolusstopping">Bolus 중지중</string>
-    <string name="occlusion">막힘</string>
-    <string name="overview_bolusprogress_stop">정지</string>
-    <string name="overview_bolusprogress_stoppressed">정지 누름</string>
-    <string name="waitingforpump">펌프를 기다리는 중</string>
-    <string name="overview_bolusprogress_goingtodeliver">%1$.2fU을 주입합니다</string>
-    <string name="youareonallowedlimit">허용된 제한값에 도달하였습니다</string>
-    <string name="noprofileselected">프로파일이 선택되지 않았습니다</string>
     <string name="smscommunicator_loophasbeendisabled">Loop가 중지되었습니다.</string>
     <string name="smscommunicator_loophasbeenenabled">Loop가 실행되었습니다.</string>
     <string name="smscommunicator_loopisdisabled">Loop가 중지중입니다.</string>
@@ -352,11 +241,9 @@
     <string name="mealbolus">Meal</string>
     <string name="correctionbous">교정주입</string>
     <string name="actions">실행</string>
-    <string name="androidaps_start">AndroidAPS 시작</string>
     <string name="ns_upload_only">NS에 업로드만 하기(동기화 안됨)</string>
     <string name="ns_upload_only_summary">NS에 업로드만 하기. xDrip같은 로컬 혈당 출처가 선택되지 않다면 SGV에는 효력이 없습니다. NS프로파일이 사용중이라면 프로파일에는 효력이 없습니다.</string>
     <string name="pumpNotInitialized">펌프가 초기화 되지 않았습니다!</string>
-    <string name="pumpNotInitializedProfileNotSet">펌프가 초기화와 프로파일 설정이 되지 않았습니다!</string>
     <string name="primefill">교체/채움</string>
     <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
     <string name="othersettings_title">기타</string>
@@ -366,8 +253,6 @@
     <string name="button3">버튼3</string>
     <string name="units_colon">단위:</string>
     <string name="units">단위</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">목표 범위:</string>
     <string name="prefs_range_title">차트 표시 범위</string>
@@ -377,17 +262,7 @@
     <string name="wear">워치</string>
     <string name="resend_all_data">모든 데이터 다시 보내기</string>
     <string name="open_settings_on_wear">워치에서 설정 열기</string>
-    <string name="pumperror">펌프 에러</string>
-    <string name="lowbattery">배터리 부족</string>
-    <string name="pumpshutdown">펌프 종료</string>
-    <string name="batterydischarged">펌프배터리 방전</string>
-    <string name="danarkoreanpump">다나R 한글</string>
     <string name="basal_rate">Basal양:</string>
-    <string name="profile_set_failed">Basal 프로파일 설정이 실패하였습니다</string>
-    <string name="profile_set_ok">Basal 프로파일이 펌프에 업데이트 되었습니다</string>
-    <string name="danar_disableeasymode">펌프에서 이지모드(EasyUI)를 해제하세요</string>
-    <string name="danar_enableextendedbolus">펌프에서 확장Bolus를 활성화 하세요</string>
-    <string name="danar_switchtouhmode">펌프에서 U/d에서 U/h로 모드를 변경하세요</string>
     <string name="basalvaluebelowminimum">Basal값이 최소값 이하입니다. 프로파일이 설정되지 않습니다!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Last BG:</string>
@@ -395,7 +270,6 @@
     <string name="MM640g">미니메드640g</string>
     <string name="ongoingnotificaction">연속 알림</string>
     <string name="old_data">오래된 데이터</string>
-    <string name="minago">%d분전</string>
     <string name="sms_minago">%dmin ago</string>
     <string name="localprofile">로컬 프로파일</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -411,41 +285,22 @@
     <string name="hypo">저혈당</string>
     <string name="activity">활동</string>
     <string name="removerecord">기록 삭제</string>
-    <string name="danar_stats">DanaR 통계</string>
-    <string name="danar_stats_cumulative_tdd">누적 일총량</string>
-    <string name="danar_stats_expweight">지수가중 일총량</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">일총량</string>
-    <string name="danar_stats_date">날짜</string>
-    <string name="danar_stats_ratio">비율</string>
-    <string name="danar_stats_amount_days">#일</string>
-    <string name="danar_stats_weight">가중</string>
-    <string name="danar_stats_warning_Message">교체/채움을 위해 Bolus를 사용한 경우 부정확할 수 있습니다!!</string>
-    <string name="danar_stats_olddata_Message">오래된 데이터입니다. \"새로고침\"을 누르세요.</string>
-    <string name="danar_stats_tbb">총 기본 Basal</string>
-    <string name="danar_stats_tbb2">총기초량 * 2</string>
-    <string name="initializing">초기화중 ...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">홈</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFILE</string>
     <string name="treatments_shortname">TREAT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">탭 이름 단축</string>
     <string name="always_use_shortavg">단순증분값 대신 단기평균증분값을 항상 사용합니다.</string>
     <string name="always_use_shortavg_summary">xDrip의 혈당데이터에 노이즈가 심할경우 유용합니다.</string>
-    <string name="advancedsettings_title">고급 설정</string>
-    <string name="danar_model">모델: %1$02X 프로토콜: %2$02X 코드: %3$02X</string>
     <string name="profile">프로파일</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">기본값: 3\n이 값은 중요한 OpenAPS 안전장치입니다. 이 값의 역할은 펌프에 설정되어 있는 최대Basal보다 3배를 초과할 수 없게 제한하는 것입니다. 이 값을 변경할 필요는 없을 것이지만, 안전을 위해 \"3x max daily; 4x current\"이 의미하는 바를 알고 있어야 합니다.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 \"3x max daily; 4x current\"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이것은, 펌프에 설정된 최대 Basal과는 관계없이, Basal이 설정된 현재시간의 Basal에 이 값을 곱한 양을 초과할 수 없다는 것을 의미합니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
@@ -464,18 +319,9 @@
     <string name="smscommunicator_calibrationsent">보정 전송됨. xDrip에서 수신이 되도록 설정되어 있어야 합니다.</string>
     <string name="smscommunicator_calibrationfailed">xDrip에서 보정을 받지 못합니다.</string>
     <string name="pumpsuspended">펌프 일시중지됨</string>
-    <string name="gettingpumpstatus">펌프 상태 가져오는중</string>
-    <string name="settingtempbasal">임시Basal 설정중</string>
-    <string name="stoppingtempbasal">임시Basal 취소중</string>
-    <string name="settingextendedbolus">확장Bolus 설정중</string>
-    <string name="stoppingextendedbolus">확장Bolus 취소중</string>
-    <string name="updatingbasalrates">Basal양 업데이트중</string>
-    <string name="disconnecting">연결끊기중</string>
     <string name="executing">실행중</string>
     <string name="virtualpump_settings">가상펌프 설정</string>
     <string name="virtualpump_uploadstatus_title">NS에 상태 업로드하기</string>
-    <string name="wrongpassword">잘못된 비밀번호</string>
-    <string name="approachingdailylimit">인슐린 일 허용량에 근접중</string>
     <string name="nsclientinternal">내장 NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -499,7 +345,6 @@
     <string name="wear_detailedIOB_title">IOB 자세하게 보여주기</string>
     <string name="wear_detailedIOB_summary">워치페이스에 IOB를 Bolus IOB와 Basal IOB로 나누어서 보여줍니다.</string>
     <string name="nosuccess">성공하지 못했습니다. 폰을 확인하세요</string>
-    <string name="notavailable">알수없음</string>
     <string name="patientage">나이</string>
     <string name="child">어린이</string>
     <string name="teenage">청소년</string>
@@ -532,8 +377,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">앱시작을 NS에 기록하기</string>
     <string name="restartingapp">설정을 적용하기위해 앱을 종료합니다.</string>
-    <string name="danarv2pump">다나R v2</string>
-    <string name="configbuilder_insulin">인슐린</string>
     <string name="configbuilder_insulin_description">어떤 종류의 인슐린을 사용합니까?</string>
     <string name="fastactinginsulin">초속형 인슐린</string>
     <string name="fastactinginsulincomment">노보래피드, 휴마로그, 에피드라</string>
@@ -548,9 +391,6 @@
     <string name="statuslights_bat_critical">배터리 잔량 위험값 [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">펌웨어</string>
-    <string name="pump_lastconnection_label">마지막 접속</string>
-    <string name="danar_bluetooth_status">블루투스 상태</string>
     <string name="nav_about">버전정보</string>
     <string name="smscommunicator_missingsmspermission">SMS 권한 누락</string>
     <string name="smscommunicator_missingphonestatepermission">전화 상태 권한이 허가되지 않았습니다</string>
@@ -561,17 +401,12 @@
     <string name="wear_showbgi_summary">BGI를 상태라인에 추가하기</string>
     <string name="ns_noupload">NS에 업로드하지 않기</string>
     <string name="ns_noupload_summary">NS로 보낼 모든 데이터가 버려집니다. AAPS는 NS에 연결되어 있지만 NS에는 변화가 없을것입니다.</string>
-    <string name="basal_step">Basal 단위</string>
-    <string name="bolus_step">Bolus 단위</string>
     <string name="overview_extendedbolus_cancel_button">확장Bolus 취소</string>
     <string name="careportal_sensorage_label">센서 사용기간</string>
     <string name="careportal_canulaage_label">캐뉼라 사용기간</string>
     <string name="careportal_insulinage_label">인슐린 사용기간</string>
-    <string name="hours">시간</string>
-    <string name="invalidprofile">프로파일이 유효하지 않습니다!!!</string>
     <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
-    <string name="careportal_pumpbatterychange">펌프 배터리 교체</string>
     <string name="ns_alarmoptions">알람 옵션</string>
     <string name="nsalarm_urgenthigh">위험 고혈당</string>
     <string name="nsalarm_high">고혈당</string>
@@ -595,7 +430,6 @@
     <string name="absorptionsettings_title">흡수 설정</string>
     <string name="absorption_maxtime_title">식사 최대 흡수 시간 [h]</string>
     <string name="absorption_maxtime_summary">식사로 섭취한 탄수화물이 모두 흡수될기까지 예상되는 시간</string>
-    <string name="danar_visualizeextendedaspercentage_title">확장Bolus를 %%로 표시하기</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -620,7 +454,6 @@
     <string name="careportal_pump_label">펌프</string>
     <string name="careportal_newnstreatment_duration_min_label">기간 [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">UAM 활성화하기</string>
     <string name="enablesmb">SMB 활성화하기</string>
     <string name="enablesmb_summary">더 빠른 작용을 위해 임시Basal 대신 Super Micro Bolus 사용</string>
@@ -632,23 +465,7 @@
     <string name="ultrarapid_oref">초-초속효성 Oref</string>
     <string name="dia_too_short">DIA %1$f는 너무 짧습니다. 대신 %2$f을 사용하세요!</string>
     <string name="activate_profile">프로파일 활성화하기</string>
-    <string name="date">날짜</string>
     <string name="invalid">유효하지 않음</string>
-    <string name="waitingforpairing">펌프연동 대기중</string>
-    <string name="pairingok">연동완료</string>
-    <string name="pairingtimedout">연동시간초과</string>
-    <string name="pairing">동기화</string>
-    <string name="danars_nodeviceavailable">현재까지 발견된 기기가 없습니다.</string>
-    <string name="emptyreservoir">빈 주사기</string>
-    <string name="bloodsugarmeasurementalert">혈당측정알람</string>
-    <string name="remaininsulinalert">남은 인슐린 양</string>
-    <string name="danarspump">다나RS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">선택된 펌프</string>
-    <string name="pairpump">새 펌프와 연동</string>
-    <string name="bolusspeed">Bolus 속도</string>
-    <string name="danar_setbasalstep001">Basal 단위를 0.01 U/h로 설정하세요</string>
-    <string name="serialnumber">시리얼번호</string>
     <string name="careportal_newnstreatment_percentage_label">퍼센트</string>
     <string name="careportal_newnstreatment_timeshift_label">시간 이동</string>
     <string name="default_temptargets">임시목표 기본값</string>
@@ -658,32 +475,18 @@
     <string name="activity_target">활동 목표</string>
     <string name="hypo_duration">저혈당 기간</string>
     <string name="hypo_target">저혈당 목표</string>
-    <string name="danar_history_prime">교체</string>
-    <string name="gettingextendedbolusstatus">확장Bolus 상태 가져오는중</string>
-    <string name="gettingbolusstatus">Bolus 상태 가져오는중</string>
-    <string name="gettingtempbasalstatus">임시Basal 상태 가져오는중</string>
-    <string name="gettingpumpsettings">펌프설정 가져오는중</string>
-    <string name="gettingpumptime">펌프시간 가져오는중</string>
     <string name="reuse">재사용</string>
     <string name="wearcontrol_title">워치로 제어하기</string>
     <string name="wearcontrol_summary">임시목표와 관리입력을 워치로 설정합니다.</string>
-    <string name="connectiontimedout">연결시간초과</string>
     <string name="food">음식</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">분</string>
-    <string name="shorthour">시간</string>
-    <string name="shortday">일</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">단백질</string>
     <string name="shortfat">지방</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Bolus 종료를 기다리고 있습니다. %d초 남았습니다.</string>
-    <string name="processinghistory">이벤트 처리중</string>
-    <string name="startingbolus">Bolus 주입을 시작합니다.</string>
     <string name="executingrightnow">명령을 지금 실행합니다.</string>
-    <string name="pumpdrivercorrected">펌프 드라이버가 수정되었습니다.</string>
     <string name="pump_unreachable">펌프에 연결할 수 없습니다.</string>
     <string name="missed_bg_readings">혈당 읽기가 누락되었습니다.</string>
     <string name="raise_notifications_as_android_notifications">경고와 알림시 시스템 알림 사용하기</string>
@@ -693,9 +496,6 @@
     <string name="pump_unreachable_threshold">펌프 연결불가 기준시간 [min]</string>
     <string name="urgent_alarm">긴급 알람</string>
     <string name="info">정보</string>
-    <string name="bluetooth">블루투스</string>
-    <string name="btwatchdog_title">블루투스 감시기능</string>
-    <string name="btwatchdog_summary">펌프에 연결이 되지 않을때 폰의 블루투스를 1초간 껐다 켭니다. 블루투스 스택이 정지되는 일부폰에 이 기능이 도움이 됩니다.</string>
     <string name="eversense">Eversense 앱(패치버전)</string>
     <string name="dexcomg5_nsupload_title">NS에 혈당데이터 업로드하기</string>
     <string name="bgsource_upload">혈당 업로드 설정</string>
@@ -703,12 +503,9 @@
     <string name="wear_detailed_delta_summary">소수점 자리 추가된 증분값 보여주기</string>
     <string name="smbmaxminutes">SMB 최대 분</string>
     <string name="smbmaxminutes_summary">SMB가 Basal을 제한할 수 있는 최대 시간(분)</string>
-    <string name="unsupportedfirmware">지원되지 않는 펌프 펌웨어</string>
     <string name="dexcomg5_xdripupload_title">혈당 데이터를 xDrip+에 전송하기</string>
     <string name="dexcomg5_xdripupload_summary">xDrip+ 데이터 소스에서 640g/Eversense을 선택하세요</string>
     <string name="nsclientbg">NSClient 혈당</string>
-    <string name="minimalbasalvaluereplaced">지원되는 최소값으로 Basal값이 대체되었습니다:%1$s</string>
-    <string name="maximumbasalvaluereplaced">지원되는 최대값으로 Basal값이 대체되었습니다:%1$s</string>
     <string name="overview_editquickwizard_usebg">혈당 계산</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB 계산</string>
     <string name="overview_editquickwizard_usebasaliob">Basal IOB 계산</string>
@@ -726,8 +523,6 @@
     <string name="closedmodeenabled">Closed 모드가 활성화됨</string>
     <string name="maxiobset">최대 IOB가 바르게 설정됨</string>
     <string name="hasbgdata">선택한 소스에서 혈당이 들어옵니다.</string>
-    <string name="basalprofilenotaligned">Basal값이 시간단위로 설정되지 않았습니다: %1$s</string>
-    <string name="zerovalueinprofile">유효하지 않은 프로파일: %1$s</string>
     <string name="combo_programming_bolus">Bolus 주입을 위한 펌프 프로그래밍</string>
     <string name="combo_refresh">새로고침</string>
     <string name="combo_pump_state_label">상태</string>
@@ -748,7 +543,6 @@
     <string name="bolus_frequency_exceeded">2개의 동일한 양의 Bolus 주입이 요청되었습니다. 이중으로 Bolus가 주입 되는 사고를 막고 버그로부터 보호하기 위하여 이는 금지됩니다.</string>
     <string name="combo_pump_connected_now">현재</string>
     <string name="combo_activity_reading_pump_history">펌프 이력 읽기</string>
-    <string name="danar_history">펌프 이력</string>
     <string name="combo_activity_setting_basal_profile">Basal 프로파일 설정</string>
     <string name="combo_pump_cartridge_low_warrning">펌프 카트리지 레벨이 낮습니다.</string>
     <string name="combo_pump_battery_low_warrning">펌프배터리가 부족합니다.</string>
@@ -767,8 +561,6 @@
     <string name="extendedbolusdeliveryerror">확장Bolus 주입 에러</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">전</string>
-    <string name="format_hours">%1$.2f 시간</string>
-    <string name="format_mins">%1$d 분</string>
     <string name="enablesmbalways">항상 SMB 사용하기</string>
     <string name="enablesmbalways_summary">Bolus와 독립적으로 항상 SMB를 사용합니다. G5처럼 잘 필터된 혈당출처와만 사용이 가능합니다.</string>
     <string name="enablesmbaftercarbs">탄수화물 이후 SMB를 사용합니다.</string>
@@ -779,8 +571,6 @@
     <string name="enablesmbwithtemptarget_summary">활성화된 임시 목표(식사직전, 운동)가 있으면 SMB를 사용합니다.</string>
     <string name="enablesmbwithhightemptarget">높은 임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithhightemptarget_summary">활성화된 높은 임시 목표(운동)가 있으면 SMB를 사용합니다.</string>
-    <string name="let_temp_basal_run">임시Basal 허용</string>
-    <string name="mute">음소거</string>
     <string name="overview_insulin_label">인슐린</string>
     <string name="overview_carbs_label">탄수화물</string>
     <string name="overview_buttons_selection">버튼</string>
@@ -822,7 +612,6 @@
     <string name="closed_loop_disabled_on_dev_branch">개발자버전을 실행중입니다. Closed Loop는 비활성화 됩니다.</string>
     <string name="engineering_mode_enabled">전문가 모드 사용</string>
     <string name="not_eng_mode_or_release">전문가 모드가 활성화되어 있지 않고 Release 버전이 실행되고 있지 않습니다.</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Basal 프로파일 읽는중</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Bolus 계산이 수행된 후 펌프 이력이 변경되었습니다. Bolus가 주입되지 않았습니다. Bolus가 여전히 필요하다면 다시 계산하세요.</string>
     <string name="combo_error_updating_treatment_record">Bolus가 성공적으로 주입되었지만, 관리 항목에 추가하지 못했습니다. 이것은 동일한 양의 소량의 2개의 Bolus가 최근 2 분 이내에 주입되는 경우에 발생할 수 있습니다. 펌프 이력과 관리 항목을 확인하고 손실된 항목을 추가하기위해 케어포털을 이용하세요. 동일한 시간과 인슐린양의 항목을 추가하지 마세요.</string>
@@ -845,15 +634,10 @@
     <string name="smbdisabledinpreferences">설정에서 SMB가 비활성화 되었습니다.</string>
     <string name="uamdisabledinpreferences">설정에서 UAM이 비활성화 되었습니다.</string>
     <string name="uamdisabledoref1notselected">Oref1 민감도 플러그인이 필요하므로 UAM이 비활성화 되었습니다.</string>
-    <string name="limitingbasalratio">%2$s로 인해 최대 Basal양이 %1$.2f U/h으로 제한됩니다.</string>
-    <string name="pumplimit">펌프 제한</string>
-    <string name="itmustbepositivevalue">양의 값이어야 합니다.</string>
     <string name="maxbasalmultiplier">최대 Basal 승수</string>
     <string name="maxdailybasalmultiplier">최대 일 Basal 승수</string>
     <string name="smb_frequency_exceeded">최근 3분 이내에 Bolus가 주입되었습니다. SMB를 건너뜁니다.</string>
     <string name="basal_set_correctly">Basal이 정상적으로 설정되었습니다.</string>
-    <string name="limitingpercentrate">%2$s로 인해 최대 비율이 %1$d%%로 제한됩니다.</string>
-    <string name="limitingbolus">%2$s로 인해 Bolus가 %1$.1f U로 제한됩니다.</string>
     <string name="limitingextendedbolus">%2$s로 인해 확장Bolus가 %1$.1f U로 제한됩니다.</string>
     <string name="limitingmaxiob">%2$s로 인해 최대 IOB가 %1$.1f U로 제한됩니다.</string>
     <string name="limitingcarbs">%2$s로 인해 탄수화물이 %1$d g로 제한됩니다.</string>
@@ -868,7 +652,6 @@
     <string name="smbnotallowedinopenloopmode">Open Loop모드에선 SMB가 허용되지 않습니다.</string>
     <string name="food_short">Food</string>
     <string name="reset">재설정</string>
-    <string name="waitingfortimesynchronization">시간 동기화 대기중 (%1$d 초)</string>
     <string name="loopdisconnectedfor">연결 끊어짐 (%1$d분)</string>
     <string name="openapssmb_maxiob_title">OpenAPS가 초과 할 수 없는 총 IOB의 최대량 [U]</string>
     <string name="openapssmb_maxiob_summary">이 값은 OpenAPS에서 Max IOB라고 합니다\n현재 IOB가 이 값보다 크면 OpenAPS는 인슐린을 추가로 주입하지 않습니다.</string>
@@ -884,7 +667,6 @@
     <string name="nav_setupwizard">설정 마법사</string>
     <string name="setupwizard_finish">완료</string>
     <string name="setupwizard_language_prompt">언어를 선택하세요</string>
-    <string name="boluserrorcode">요청: %1$.2fU 전송: %2$.2fU 에러코드: %3$s</string>
     <string name="firstinsulinincrement">1차 인슐린 증분</string>
     <string name="secondinsulinincrement">2차 인슐린 증분</string>
     <string name="thirdinsulinincrement">3차 인슐린 증분</string>
@@ -907,7 +689,6 @@
     <string name="virtualpump_type">가성펌프 종류</string>
     <string name="virtualpump_definition">펌프 정의</string>
     <string name="virtualpump_pump_def">Bolus: 스텝=%1$s\n확장Bolus: [Step=%2$s, 기간=%3$s분-%4$s시]\nBasal: 스텝=%5$s\n임시Basal: %6$s (by %7$s), 기간=%8$s분-%9$s시\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* 가상 펌프에서는 Basal/Bolus에 대해 범위로 지정이 될 수 없고, 이산값(discrete values)만 지원 됩니다.</string>
     <string name="ns_autobackfill_title">혈당 자동채움</string>
     <string name="wear_wizard_settings">마법사 설정</string>
     <string name="wear_wizard_settings_summary">마법사 결과에 사용 된 계산:</string>
@@ -938,22 +719,6 @@
     <string name="request">요청</string>
     <string name="insulinsourcesetup">인슐린 플러그인 설정하기</string>
     <string name="exit">종료</string>
-    <string name="danar_useroptions">사용자 옵션</string>
-    <string name="danar_timedisplay">시간형식</string>
-    <string name="danar_buttonscroll">버튼 스크롤</string>
-    <string name="danar_beep">버튼 누르면 소리가 납니다.</string>
-    <string name="danar_pumpalarm">알람</string>
-    <string name="danar_pumpalarm_sound">소리</string>
-    <string name="danar_pumpalarm_vibrate">진동</string>
-    <string name="danar_pumpalarm_both">모두</string>
-    <string name="danar_screentimeout">LCD 시간 [seconds]</string>
-    <string name="danar_backlight">화면조명 시간 [seconds]</string>
-    <string name="danar_glucoseunits">혈당 단위</string>
-    <string name="danar_shutdown">종료 [hours]</string>
-    <string name="danar_lowreservoir">낮은 주사기량 [Units]</string>
-    <string name="danar_saveuseroptions">펌프로 옵션 저장</string>
-    <string name="option_on">켜짐</string>
-    <string name="option_off">꺼짐</string>
     <string name="open_navigation">메뉴 열기</string>
     <string name="close_navigation">메뉴 닫기</string>
     <string name="nav_plugin_preferences">플러그인 설정</string>
@@ -969,8 +734,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[임시목표 100미만을 위해 민감도를 낮춥니다.]]></string>
     <string name="combo_invalid_setup">유효하지 않은 펌프 설정, 문서를 확인하고 360 구성 소프트웨어를 사용하여 Quick Info menu의 이름이 QUICK INFO인지 확인하십시오.</string>
     <string name="custom">사용자 정의</string>
-    <string name="largetimedifftitle">큰 시간 차이</string>
-    <string name="largetimediff">큰 시간 차이:\n펌프의 시간과 1.5시간 이상 차이가 납니다.\n펌프의 이력에서 잘못된 시간을 읽어들임으로써 예상치 못한 행동이 발생하지 않도록 펌프의 시간을 수동으로 변경하세요.\n가능하면 시간을 변경하기 전에 펌프의 이력을 삭제하거나, 설정된 DIA 시간동안 Closed Loop를 비활성화 하세요.</string>
     <string name="careportal_removestartedevents">\"AndroidAPS 시작\" 기록 삭제하기</string>
     <string name="storedsettingsfound">저장된 설정이 있습니다.</string>
     <string name="allow_hardware_pump_text">주의: 활성화하고 펌프에 연결하게되면, AndroidAPS는 프로파일의 Basal설정을 복사해서 기존에 펌프에 저장되어 있던 Basal설정을 덮어쓰게 될것입니다. AndroidAPS의 Basal설정이 올바른지 반드시 확인하세요. 만약 확실치 않거나 Basal설정을 덮어씌우길 원치않는다면, 취소버튼을 누르고 나중에 다시 연결하세요.</string>
@@ -994,17 +757,10 @@
     <string name="setupwizard_preferred_aps_mode">선호하는 APS 모드</string>
     <string name="treatments_wizard_total_label">합계</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">통신 확인</string>
     <string name="sendlogfiles">예상치 못한 상황 보고를 위해 오늘의 로그 파일을 개발자에게 전송합니다.</string>
-    <string name="maxbolusviolation">최대 Bolus 위반</string>
-    <string name="commanderror">명령 오류</string>
-    <string name="speederror">속도 오류</string>
-    <string name="insulinlimitviolation">인슐린 제한 위반</string>
     <string name="loop_openmode_min_change">최소 요청 변화 [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop가 %단위로 이 값보다 변화가 더 클 경우에만 새 변경 요청을 팝업합니다. 기본값은 20 %입니다</string>
-    <string name="pairfirst">펌프를 폰과 동기화 하십시오</string>
     <string name="searching_for_devices">장치 검색중...</string>
-    <string name="please_wait">잠시 기다려 주세요...</string>
     <string name="pairing_completed">동기화 완료</string>
     <string name="code_compare">이 장치에서 보여지는 코드와 펌프에서 보여지는 코드가 동일한가요?</string>
     <string name="insight_pairing">Insight와 동기화</string>
@@ -1093,7 +849,6 @@
     <string name="isequalorgreater">같거나 큰</string>
     <string name="isgreater">보다 큰</string>
     <string name="isnotavailable">이용할 수 없음</string>
-    <string name="unknown">알수없음</string>
     <string name="glucoseisnotavailable">혈당을 사용할 수 없습니다.</string>
     <string name="glucosecomparedmgdl">혈당 %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">혈당 %1$s %2$.1f %3$s</string>
@@ -1110,23 +865,10 @@
     <string name="automation_short">자동</string>
     <string name="automation">자동화</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">센서 교체 NS에 기록하기</string>
     <string name="dexcom_lognssensorchange_summary">센서교체시 NS에 자동으로 \"센서 교체\" 이벤트를 생성합니다.</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">초</string>
-    <string name="unit_minute">분</string>
-    <string name="unit_hour">시</string>
-    <string name="unit_day">일</string>
-    <string name="unit_week">주</string>
-    <string name="unit_seconds">초</string>
-    <string name="unit_minutes">분</string>
-    <string name="unit_hours">시</string>
-    <string name="unit_days">일</string>
-    <string name="unit_weeks">주</string>
     <string name="summary_tidepool_username">Tidepool 사용자명, 보통 이메일 주소입니다.</string>
     <string name="title_tidepool_username">로그인 사용자명</string>
     <string name="summary_tidepool_password">Tidepool 로그인 비밀번호</string>
@@ -1169,7 +911,6 @@
     <string name="very_old_version">아주 오래된 버전</string>
     <string name="new_version_warning">최소 %1$d일 새버전이 가능합니다! %2$d일 후엔 LGS(저혈당주입중지)으로 복귀되며, %3$d일이후엔 Loop가 비활성화 될 것입니다</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Dexcom 앱(패치버전)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">패치된 Dexcom 앱에서 혈당값 받기</string>
@@ -1243,10 +984,6 @@
     <string name="rileylink_scanner_scan_stop">중지</string>
     <string name="rileylink_scanner_selected_device">선택됨</string>
     <string name="rileylink_scanner_title">RileyLink 스캔</string>
-    <string name="rileylink_scanner_ble_not_supported">BLE(블루투스 저전력) 지원되지 않음</string>
-    <string name="rileylink_scanner_ble_not_enabled">블루투스가 활성화되지 않았습니다.</string>
-    <string name="location_not_found_title">위치가 활성화되지 않았습니다.</string>
-    <string name="location_not_found_message">최신 스마트폰에서 블루투스 검색이 작동하려면 위치가 활성화되어 있어야합니다. AAPS는 당신의 위치를 추적하지 않으며 페어링에 성공한 후 비활성화 할 수 있습니다.</string>
     <string name="location_yes">활성화</string>
     <string name="location_no">아니오</string>
     <string name="rileylink_scanner_scanning">스캔중</string>
@@ -1287,7 +1024,6 @@
     <string name="rileylink_error_tuneup_failed">튜닝 실패</string>
     <string name="rileylink_error_pump_unreachable">펌프에 연결할 수 없습니다.</string>
     <string name="rileylink_error_pod_unreachable">포드에 연결할 수 없습니다.</string>
-    <string name="rileylink_error_address_not_set_short">설정되지 않음</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">메드트로닉 펌프</string>
     <string name="rileylink_target_device_omnipod">옴니포드</string>
@@ -1357,7 +1093,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus 제약 적용: %2$.2fU 에서 %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! 느린 탄수화물 흡수 감지: %2$d%% of time. 계산을 다시 확인하십시오. COB를 과대하게 측정하여 더 많은 인슐린이 주입될 수 있습니다 !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Bolus 마법사 결과의 이 부분 주입[%]</string>
     <string name="deliverpartofboluswizard">Bolus 마법사는 계산을 수행하지만 계산된 인슐린의 이 부분만 주입됩니다. SMB 알고리즘에 유용합니다.</string>
     <string name="loading">불러오는 중…</string>
@@ -1365,7 +1100,6 @@
     <string name="time_range">시간 범위</string>
     <string name="timerange_value">시간은 %1$s 와 %2$s사이입니다</string>
     <string name="between">사이 </string>
-    <string name="close">닫기</string>
     <string name="increasingmaxbasal">설정이 프로파일에서의 최대 Basal보다 낮은 이유로 최대 Basal을 올립니다</string>
     <string name="smscommunicator_messagebody">잘못된 메시지 내용</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1383,7 +1117,6 @@
     <string name="common_off">끄기</string>
     <string name="objectives_button_unfinish">완료 초기화</string>
     <string name="objectives_button_unstart">시작 초기화</string>
-    <string name="timedetection">시간 감지</string>
     <string name="doyouwantresetstart">목표를 초기화하시겠습니까? 진행상황이 삭제됩니다.</string>
     <string name="nopumpselected">펌프가 선택되지 않음</string>
     <string name="setupwizard_units_prompt">사용하시는 혈당 단위를 선택하세요</string>
@@ -1409,7 +1142,6 @@
     <string name="nav_survey">조사</string>
     <string name="invalidage">유효하지 않은 나이입니다</string>
     <string name="invalidweight">유효하지 않은 몸무게입니다</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">평균</string>
     <string name="tdd">TDD</string>
@@ -1422,12 +1154,8 @@
     <string name="randombg_short">BG</string>
     <string name="tools">도구</string>
     <string name="show_calculation">계산 표시</string>
-    <string name="error">에러</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">자동화 이벤트</string>
     <string name="alreadyset">이미 설정됨</string>
-    <string name="message">메시지</string>
     <string name="clearqueueconfirm">대기열을 삭제하시겠습니까? 대기열에 있는 모든 데이터가 삭제됩니다!</string>
     <string name="ebstopsloop">확장 Bolus 기능을 사용하는 동안에는 Closed Loop 모드가 중지됩니다. 정말 원하십니까?</string>
     <string name="closed_loop_disabled_with_eb">확장 Bolus 사용으로 인해 Closed Loop가 비활성화됨</string>
@@ -1440,4 +1168,13 @@
     <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
     <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 31c388d786..6445d65195 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Iš naujo nustatyti duomenų bazę</string>
     <string name="reset_db_confirm">Ar tikrai norite iš naujo nustatyti duomenų bazę?</string>
     <string name="nav_exit">Išeiti</string>
-    <string name="danar_useextended_title">Naudoti ištęstinį bolusą &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth įrenginys</string>
     <string name="ns_sync_use_absolute_title">Visada naudoti bazės absoliučias vertes</string>
     <string name="alert_dialog_storage_permission_text">Prašome iš naujo paleisti telefoną arba sistemos nustatymuose iš naujo paleisti AndroidAPS \nkitaip AndroidAPS negalės registruoti prisijungimų (svarbu stebėti ir tikrinti ar algoritmai veikia tinkamai)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Šis įrenginys nepalaiko baterijos optimizavimo išimčių - galite patirti veikimo nesklandumų.</string>
     <string name="description_actions">Mygtukai greitesniam pagrindinių funkcijų paleidimui</string>
-    <string name="description_careportal">Papildomų įrašų žurnalas.</string>
     <string name="description_config_builder">Naudojama aktyvių įskiepių konfigūravimui</string>
     <string name="description_objectives">Mokymosi programa</string>
     <string name="description_food">Rodyti maisto ruošinius iš Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Nustato profilį, kuris įvestas Nightscout puslapyje</string>
     <string name="description_profile_simple">Nustato profilį su vieninteliu laiko bloku.</string>
     <string name="description_pump_combo">Accu-Chek Combo pompos integracija, reikalinga Ruffy programėlė</string>
-    <string name="description_pump_dana_r">DANA Diabecare R pompos integracija</string>
-    <string name="description_pump_dana_r_korean">DANA Diabecare R pompos, skirtos vietinei P. Korėjos rinkai, integracija</string>
-    <string name="description_pump_dana_r_v2">DANA Diabecare R pompos su atnaujinta programine-aparatine įranga integracija</string>
-    <string name="description_pump_dana_rs">DANA Diabecare RS pompos integracija</string>
     <string name="description_pump_mdi">Integracija žmonėms, naudojantiems insulino injektorius</string>
     <string name="description_pump_virtual">Integracija pompoms, kurios dar neturi reikalingo valdiklio (Atviras Ciklas)</string>
     <string name="description_sensitivity_aaps">Jautrumas insulinui apskaičiuojamas taip pat kaip ir Oref0, tačiau jūs galite nustatyti, koks praeities laikotarpis bus naudojamas. Minimalus angliavandenių įsisavinimo greitis apskaičiuojamas remiantis maksimaliu angliavandenių įsisavinimo greičiu, kuris įvestas Nustatymuose.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Stebėti ir kontroliuoti AndroidAPS naudojant WearOS laikrodį.</string>
     <string name="description_xdrip_status_line">Rodyti Ciklo informaciją laikrodyje, xDrip+ pradžios ekrane.</string>
     <string name="description_sms_communicator">Nuotolinis AndroidAPS valdymas naudojant SMS komandas.</string>
-    <string name="nsprofileview_units_label">Vienetai</string>
-    <string name="nsprofileview_dia_label">IVT</string>
-    <string name="nsprofileview_ic_label">IA</string>
-    <string name="nsprofileview_isf_label">JIF</string>
-    <string name="nsprofileview_basal_label">Valandinė bazė</string>
-    <string name="nsprofileview_target_label">Tikslas</string>
-    <string name="noprofileset">Nenustatytas profilis</string>
     <string name="treatments_insulin_label_string">Insulinas:</string>
     <string name="treatments_carbs_label_string">AV:</string>
     <string name="treatments_iob_label_string">AIO:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">LT</string>
     <string name="treatments_wizard_carbs_label">AV</string>
     <string name="treatments_wizard_correction_label">Korekcija</string>
-    <string name="insulin_unit_shortname">V</string>
     <string name="treatments_wizard_bolusiob_label">Bolusų AIO</string>
     <string name="openapsma_run">Paleisti dabar</string>
     <string name="vitualpump_label">Virtuali pompa</string>
-    <string name="pump_basebasalrate_label">Pagrindinis bazės dydis</string>
-    <string name="pump_tempbasal_label">Laikina bazė</string>
-    <string name="virtualpump_extendedbolus_label">Ištęstas bolusas</string>
-    <string name="pump_battery_label">Baterija</string>
-    <string name="pump_reservoir_label">Rezervuaras</string>
     <string name="virtualpump_resultok">Gerai</string>
     <string name="openapsma_lastrun_label">Paskutinis veiksmas</string>
     <string name="openapsma_inputparameters_label">Įvesties parametrai</string>
@@ -96,16 +76,11 @@
     <string name="result">Rezultatas</string>
     <string name="result_insulin_carbs">Rezultatas: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Nėra gliukozės duomenų</string>
-    <string name="nochangerequested">Pakeitimai nereikalingi</string>
     <string name="openapsma_request_label">Užklausa</string>
-    <string name="rate">Vertė</string>
-    <string name="duration">Trukmė</string>
-    <string name="reason">Priežastis</string>
     <string name="glucose">Gliukozė</string>
     <string name="delta">Pokytis</string>
     <string name="sms_delta">Pokytis:</string>
     <string name="configbuilder">Konfigūracija</string>
-    <string name="objectives">Tikslai</string>
     <string name="overview">Apžvalga</string>
     <string name="nsprofile">NS profilis</string>
     <string name="simpleprofile">Paprastas profilis</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Bendrieji</string>
     <string name="configbuilder_general_description">Bendrieji įskiepiai, kurie gali praversti.</string>
     <string name="configbuilder_constraints_description">Kokie apribojimai taikomi?</string>
-    <string name="days">d.</string>
     <string name="constraints">Apribojimai</string>
     <string name="loop">Ciklas</string>
     <string name="configbuilder_loop">Ciklas</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Įskiepis išjungtas</string>
     <string name="constraints_violation">Apribojimų pažeidimas</string>
     <string name="treatmentdeliveryerror">Boluso suleidimo klaida</string>
-    <string name="tempbasaldeliveryerror">Laikinos bazės suleidimo klaida</string>
     <string name="overview_newtempbasal_basalpercent">Valandinė bazė [%]</string>
     <string name="setbasalquestion">Patvirtinti naują laikiną bazę:</string>
     <string name="overview_treatment_label">Terapija</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolusas:</string>
     <string name="basal">Valandinė bazė</string>
     <string name="sms_basal">Valandinė bazė:</string>
-    <string name="carbs">AV</string>
     <string name="changeyourinput">Pakeiskite įvestus duomenis!</string>
     <string name="configbuilder_bgsource">Glikemijos šaltinis</string>
     <string name="configbuilder_bgsource_description">Iš kur AndroidAPS gaus duomenis?</string>
@@ -167,25 +139,6 @@
     <string name="treatments_wizard_basaliob_label">Bazės AIO</string>
     <string name="bolusconstraintapplied">Pritaikytas boluso apribojimas</string>
     <string name="carbsconstraintapplied">Pritaikytas AV apribojimas</string>
-    <string name="careportal_bgcheck">KG testas</string>
-    <string name="careportal_announcement">Pranešimas</string>
-    <string name="careportal_note">Pastaba</string>
-    <string name="careportal_question">Klausimas</string>
-    <string name="careportal_exercise">Fizinis aktyvumas</string>
-    <string name="careportal_pumpsitechange">Kateterio keitimas</string>
-    <string name="careportal_cgmsensorinsert">NGJ įvedimas</string>
-    <string name="careportal_cgmsensorstart">NGJ paleidimas</string>
-    <string name="careportal_insulincartridgechange">Rezervuaro keitimas</string>
-    <string name="careportal_profileswitch">Profilio keitimas</string>
-    <string name="careportal_snackbolus">Bolusas užkandžiui</string>
-    <string name="careportal_mealbolus">Bolusas valgiui</string>
-    <string name="careportal_correctionbolus">Bolusas korekcijai</string>
-    <string name="careportal_combobolus">Kombinuotas bolusas</string>
-    <string name="careportal_tempbasalstart">Pradėta laikina bazė</string>
-    <string name="careportal_tempbasalend">Užbaigta laikina bazė</string>
-    <string name="careportal_carbscorrection">AV korekcijai</string>
-    <string name="careportal_openapsoffline">OpenAPS neprisijungus</string>
-    <string name="careportal_newnstreatment_eventtype">Įvykio tipas</string>
     <string name="careportal_newnstreatment_other">Kiti</string>
     <string name="careportal_newnstreatment_meter">Matuoklis</string>
     <string name="careportal_newnstreatment_sensor">Sensorius</string>
@@ -217,7 +170,6 @@
     <string name="openapsma_maxbasal_summary">Šis skaičius OpenAPS kontekste vadinamas maks. valandine baze</string>
     <string name="openapsma_maxiob_title">Didžiausias valandinės bazės insulino kiekis, kurį gali suleisti OpenAPS [U]</string>
     <string name="openapsma_maxiob_summary">Ši vertė OpenAPS kontekste vadinama Maks AIO\nTai maksimalus insulino vienetų [U] skaičius, kurį DKS gali suleisti vienu metu.</string>
-    <string name="dismiss">ATMESTI</string>
     <string name="password_preferences_encrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas užšifruojant eksportuojamus nustatymus.</string>
     <string name="password_preferences_decrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas atšifruojant importuotus nustatymus.</string>
     <string name="preferences_export_canceled">Eksportas nutrauktas! Nustatymai NE eksportuoti!</string>
@@ -256,34 +208,12 @@
     <string name="prefdecrypt_issue_wrong_pass">Iššifravimas klaida, slaptažodis yra neteisingas arba nustatymų failas buvo pakeistas! Taip nutinka, jei importuotas failas buvo eksportuotas su kitu slaptažodžiu.</string>
     <string name="prefdecrypt_issue_wrong_format">Trūksta šifravimo sąrankos parametrų, nustatymų formatas yra neteisingas!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepalaikomas arba nepatikslintas šifravimo algoritmas!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Jungiamasi</string>
-    <string name="connected">Prisijungta</string>
-    <string name="disconnected">Atsijungta</string>
-    <string name="danar_pump_settings">Dana pompos nustatymai</string>
     <string name="end_user_license_agreement">Licencinė sutartis su vartotoju</string>
     <string name="end_user_license_agreement_text">PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI.</string>
     <string name="end_user_license_agreement_i_understand">SUPRATAU IR SUTINKU</string>
     <string name="save">Išsaugoti</string>
-    <string name="nobtadapter">Bluetooth adapteris nerastas</string>
-    <string name="devicenotfound">Pasirinktas įrenginys nerastas</string>
-    <string name="connectionerror">Pompos prisijungimo klaida</string>
-    <string name="danar_iob_label">Pompos AIO</string>
-    <string name="danar_dailyunits">Paros insulinas</string>
-    <string name="pump_lastbolus_label">Paskutinis bolusas</string>
-    <string name="hoursago">Prieš %1$.1f val.</string>
-    <string name="danar_invalidinput">Neteisingai įvesti duomenys</string>
-    <string name="danar_valuenotsetproperly">Vertė nėra tinkamai nustatyta</string>
     <string name="reloadprofile">Atnaujinti profilį</string>
-    <string name="danar_viewprofile">Peržiūrėti profilį</string>
-    <string name="enacted">Vykdoma</string>
-    <string name="comment">Komentaras</string>
-    <string name="success">Atlikta</string>
-    <string name="percent">Procentai</string>
-    <string name="absolute">Absoliutus</string>
-    <string name="canceltemp">Atšaukti laikiną bazę</string>
     <string name="smscommunicator">SMS komunikatorius</string>
-    <string name="waitingforpumpresult">Laukiama rezultato</string>
     <string name="smscommunicator_allowednumbers">Leidžiami telefono numeriai</string>
     <string name="smscommunicator_allowednumbers_summary">+370XXXXXXXX; +370YYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Norėdami suleisti %1$.2fvv bolusą, atsakykite kodu %2$s</string>
@@ -304,54 +234,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Tikslas %1$s %2$d min.</string>
     <string name="smscommunicator_tt_set">Tikslas %1$s %2$d min. nustatytas sėkmingai</string>
     <string name="smscommunicator_tt_canceled">Laikinas tikslas atšauktas sėkmingai</string>
-    <string name="bolusdelivering">Leidžiama %1$.2fvv</string>
     <string name="smscommunicator_remotecommandsallowed">Leisti nuotolines komandas SMS žinutėmis</string>
-    <string name="glucosetype_finger">Iš piršto</string>
-    <string name="glucosetype_sensor">Iš sensoriaus</string>
-    <string name="manual">Rankiniu būdu</string>
-    <string name="careportal_temporarytarget">Laikinas tikslas</string>
-    <string name="careportal_temporarytargetcancel">Laikino tikslo atšaukimas</string>
     <string name="danarprofile">DanaR profilio nustatymai</string>
     <string name="danarprofile_dia">IVT [h]</string>
     <string name="danarprofile_dia_summary">Insulino veikimo trukmė</string>
-    <string name="failedupdatebasalprofile">Nepavyko atnaujinti bazės profilio</string>
-    <string name="danar_historyreload">Atnaujinti</string>
     <string name="uploading">Siunčiama</string>
-    <string name="danar_ebolus">Ištęstas bolusas</string>
-    <string name="danar_dsbolus">Paprastas bolusas dvibangiame</string>
-    <string name="danar_debolus">Ištęstas bolusas dvibangiame</string>
-    <string name="danar_error">klaida</string>
-    <string name="danar_refill">užpildymas</string>
-    <string name="danar_basalhour">valandinė bazė</string>
-    <string name="danar_glucose">gliukozė</string>
-    <string name="danar_carbohydrate">AV</string>
-    <string name="danar_alarm">aliarmas</string>
-    <string name="danar_totaluploaded">Įkelta %1$d įrašų</string>
-    <string name="danar_sbolus">Paprastas bolusas</string>
-    <string name="danar_history_alarm">Aliarmai</string>
-    <string name="danar_history_basalhours">Valandinė bazė</string>
-    <string name="danar_history_bolus">Bolusai</string>
-    <string name="danar_history_carbohydrates">AV</string>
-    <string name="danar_history_dailyinsulin">Paros insulinas</string>
-    <string name="danar_history_errors">Klaidos</string>
-    <string name="danar_history_glucose">Gliukozė</string>
-    <string name="danar_history_refill">Užpildymas</string>
-    <string name="danar_history_syspend">Sustabdyta</string>
-    <string name="danar_history_connectingfor">Jungiamasi %1$d s</string>
-    <string name="danar_password_title">Pompos slaptažodis</string>
-    <string name="wrongpumppassword">Neteisingas pompos slaptažodis!</string>
-    <string name="pumpbusy">Pompa šiuo metu veikia</string>
-    <string name="overview_bolusprogress_delivered">Suleista</string>
-    <string name="overview_bolusprogress_stoped">Sustabdyta</string>
     <string name="bolusstopped">Bolusas sustabdytas</string>
     <string name="bolusstopping">Bolusas stabdomas</string>
-    <string name="occlusion">Užsikimšimas</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">Paspausta STOP</string>
-    <string name="waitingforpump">Laukiama ryšio su pompa</string>
-    <string name="overview_bolusprogress_goingtodeliver">Bus suleista %1$.2fvv</string>
-    <string name="youareonallowedlimit">Pasiekėte leistiną ribą</string>
-    <string name="noprofileselected">Nepasirinktas profilis</string>
     <string name="smscommunicator_loophasbeendisabled">Ciklas buvo išjungtas</string>
     <string name="smscommunicator_loophasbeenenabled">Ciklas buvo įjungtas</string>
     <string name="smscommunicator_loopisdisabled">Ciklas išjungtas</string>
@@ -391,11 +280,9 @@
     <string name="mealbolus">Maistas</string>
     <string name="correctionbous">Korekcija</string>
     <string name="actions">Veiksmai</string>
-    <string name="androidaps_start">AndroidAPS paleista</string>
     <string name="ns_upload_only">Tik įkelti duomenis į NS (ne sinchronizuoti)</string>
     <string name="ns_upload_only_summary">Duomenys tik perkeliami į Nightscout. Gliukozės duomenys perkeliami tik tada, kai naudojama lokali programa, pvz.: xDrip. Naudojant NS-profilį, kiti profiliai neaktyvūs.</string>
     <string name="pumpNotInitialized">Pompa neprijungta!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pompa neprijungta, profilis nepasirinktas!</string>
     <string name="primefill">Užpildymas</string>
     <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
     <string name="othersettings_title">Kita</string>
@@ -405,8 +292,6 @@
     <string name="button3">Mygtukas 3</string>
     <string name="units_colon">Vienetai:</string>
     <string name="units">Vienetai</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">IVT</string>
     <string name="target_range">Tikslinis diapazonas:</string>
     <string name="prefs_range_title">Vizualizacijos diapazonas</string>
@@ -416,17 +301,7 @@
     <string name="wear">Išmanieji laikrodžiai</string>
     <string name="resend_all_data">Pakartotinai siųsti visus duomenis</string>
     <string name="open_settings_on_wear">Atidaryti išmaniojo laikrodžio nustatymus</string>
-    <string name="pumperror">Pompos klaida</string>
-    <string name="lowbattery">Senka akumuliatorius</string>
-    <string name="pumpshutdown">Pompa išsijungė</string>
-    <string name="batterydischarged">Pompos baterija išsikrovusi</string>
-    <string name="danarkoreanpump">DanaR Korean</string>
     <string name="basal_rate">Valandinė bazė:</string>
-    <string name="profile_set_failed">Nepavyko nustatyti bazės profilio</string>
-    <string name="profile_set_ok">Bazės profilis pompoje atnaujintas</string>
-    <string name="danar_disableeasymode">Išjungti pompos EasyUI režimą</string>
-    <string name="danar_enableextendedbolus">Aktyvuoti ištęstinius bolusus pompoje</string>
-    <string name="danar_switchtouhmode">Pakeisti pompoje vv/d režimą į vv/val</string>
     <string name="basalvaluebelowminimum">Valandinės bazės vertė mažesnė už minimalią. Profilis nenustatytas!</string>
     <string name="sms_actualbg">KG:</string>
     <string name="sms_lastbg">Paskutinė KG:</string>
@@ -434,7 +309,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Nuolatinis pranešimas</string>
     <string name="old_data">SENI DUOMENYS</string>
-    <string name="minago">Prieš %1$d min</string>
     <string name="sms_minago">prieš %1$dmin</string>
     <string name="localprofile">Vietinis profilis</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +324,22 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Aktyvumas</string>
     <string name="removerecord">Ištrinti įrašą</string>
-    <string name="danar_stats">DanaR statistika</string>
-    <string name="danar_stats_cumulative_tdd">BPD viso</string>
-    <string name="danar_stats_expweight">Eksponentiškai svertinė BPD</string>
-    <string name="danar_stats_basalrate">Valandinė bazė</string>
-    <string name="danar_stats_bolus">Bolusas</string>
-    <string name="danar_stats_tdd">BPD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Koeficientas</string>
-    <string name="danar_stats_amount_days"># d.</string>
-    <string name="danar_stats_weight">Svoris</string>
-    <string name="danar_stats_warning_Message">Duomenys netikslūs, jei bolusai naudojami kateterių užpildymui!</string>
-    <string name="danar_stats_olddata_Message">Duomenys seni, spauskite \"ATNAUJINTI\"</string>
-    <string name="danar_stats_tbb">Pagrindinė bazė (PB)</string>
-    <string name="danar_stats_tbb2">PB * 2</string>
-    <string name="initializing">Inicijuojama ...</string>
     <string name="actions_shortname">VEIKS</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">CIKLAS</string>
     <string name="simpleprofile_shortname">PP</string>
     <string name="oaps_shortname">AtvCiklas</string>
     <string name="localprofile_shortname">VP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">PRADŽIA</string>
     <string name="virtualpump_shortname">VPompa</string>
     <string name="profileviewer_shortname">NSprofilis</string>
     <string name="treatments_shortname">ĮRAŠ</string>
-    <string name="careportal_shortname">PRIEŽ</string>
     <string name="objectives_shortname">TIKSL</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Naudoti sutrumpintus skirtukų pavadinimus</string>
     <string name="always_use_shortavg">Visada naudoti trumpo laikotarpio vidutinį pokyti vietoj paprasto pokyčio</string>
     <string name="always_use_shortavg_summary">Naudinga, kai duomenys, gaunami iš nefiltruoto šaltinio, tokio kaip xDrip, tampa nestabilūs.</string>
-    <string name="advancedsettings_title">Papildomi nustatymai</string>
-    <string name="danar_model">Modelis: %1$02X Protokolas: %2$02X Kodas: %3$02X</string>
     <string name="profile">Profilis</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Numatytoji reikšmė: 3 tai pagrindinis OpenAPS saugiklis. Jis apriboja Jūsų valandinę bazę iki trigubos maksimalios valandinės bazės (standartiniu atveju). Jums greičiausiai neprireiks šios reikšmės keisti, tačiau turėtumėte žinoti, kad ji naudojama kaip saugiklis apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\".</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Numatytoji reikšmė: 4 tai antras pagrindinis OpenAPS saugiklis, apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\". Jis reiškia, kad jūsų valandinė bazė, nepriklausomai nuo to, kokia maksimali valandinė bazė suprogramuota pompoje, negali būti didesnė, nei keturguba dabartinė valandinė bazė. Tai apsaugo Jus nuo pavojingų situacijų, kai nustatoma pernelyg didelė valandinė bazė, pilnai nesuprantant, kaip veikia algoritmas. Numatytoji reikšmė yra 4x; daugumai vartotojų niekada neprireikia šio skaičiaus keisti, o pajutus, kad \"atsitrenkiama\" į saugiklį, rekomenduojama peržiūrėti kitus nustatymus.</string>
@@ -503,18 +358,9 @@
     <string name="smscommunicator_calibrationsent">Kalibracija išsiųsta. xDrip programoje turi būti įgalintas gavimas.</string>
     <string name="smscommunicator_calibrationfailed">xDrip negauna kalibracijų</string>
     <string name="pumpsuspended">Pompa sustabdyta</string>
-    <string name="gettingpumpstatus">Gaunamas pompos statusas</string>
-    <string name="settingtempbasal">Laikinos bazės nustatymas</string>
-    <string name="stoppingtempbasal">Laikinos bazės sustabdymas</string>
-    <string name="settingextendedbolus">Ištęsto boluso nustatymas</string>
-    <string name="stoppingextendedbolus">Ištęsto boluso sustabdymas</string>
-    <string name="updatingbasalrates">Bazė naujinama</string>
-    <string name="disconnecting">Atsijungiama</string>
     <string name="executing">Vykdoma</string>
     <string name="virtualpump_settings">Virtualios pompos nustatymai</string>
     <string name="virtualpump_uploadstatus_title">Perduoti būsenos duomenis į NS</string>
-    <string name="wrongpassword">Neteisingas slaptažodis</string>
-    <string name="approachingdailylimit">Artėja paros insulino limitas</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -538,7 +384,6 @@
     <string name="wear_detailedIOB_title">Rodyti AIO detaliai</string>
     <string name="wear_detailedIOB_summary">Rodyti laikrodyje bazės ir bolusų AIO</string>
     <string name="nosuccess">Bandymas nesėkmingas - pasitikrinkite telefoną</string>
-    <string name="notavailable">Negalimas</string>
     <string name="patientage">Paciento amžius</string>
     <string name="child">Vaikas</string>
     <string name="teenage">Paauglys</string>
@@ -574,8 +419,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Siųsti programos paleidimo žymę į NS</string>
     <string name="restartingapp">Uždarant aplikaciją, taikyti nustatymus.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulinas</string>
     <string name="configbuilder_insulin_description">Kokio tipo insuliną naudojate?</string>
     <string name="fastactinginsulin">Greito veikimo insulinas</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -590,9 +433,6 @@
     <string name="statuslights_bat_critical">Įspėjimo apie kritiškai žemą baterijos įkrovimo lygį riba [%]</string>
     <string name="iob">AIO</string>
     <string name="cob">AAO</string>
-    <string name="virtualpump_firmware_label">Programinė įranga</string>
-    <string name="pump_lastconnection_label">Paskutinis prisijungimas</string>
-    <string name="danar_bluetooth_status">Bluetooth statusas</string>
     <string name="nav_about">Apie</string>
     <string name="smscommunicator_missingsmspermission">Trūksta leidimo SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Trūksta telefono būsenos leidimo</string>
@@ -603,17 +443,12 @@
     <string name="wear_showbgi_summary">Pridėti KG prie statuso linijos</string>
     <string name="ns_noupload">Nėra įkėlimų į NS</string>
     <string name="ns_noupload_summary">Visi duomenys, kurie gali būti siunčiami į NS, paliekami. AAPS yra susieta su NS, bet jokie pokyčiai NS nedaromi</string>
-    <string name="basal_step">Bazės žingsnis</string>
-    <string name="bolus_step">Boluso žingsnis</string>
     <string name="overview_extendedbolus_cancel_button">Atšaukti ištęstą bolusą</string>
     <string name="careportal_sensorage_label">Sensorius</string>
     <string name="careportal_canulaage_label">Kateteris</string>
     <string name="careportal_insulinage_label">Insulinas</string>
-    <string name="hours">val.</string>
-    <string name="invalidprofile">Netinkamas profilis!!!</string>
     <string name="doprofileswitch">Profilio keitimas</string>
     <string name="careportal_pbage_label">Baterija</string>
-    <string name="careportal_pumpbatterychange">Baterijos keitimas</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
     <string name="nsalarm_urgenthigh">Kritiškai aukštas</string>
     <string name="nsalarm_high">Aukštas</string>
@@ -637,7 +472,6 @@
     <string name="absorptionsettings_title">Angliavandenių įsisavinimo parametrai</string>
     <string name="absorption_maxtime_title">Maksimalus angliavandenių įsisavinimo laikas [h]</string>
     <string name="absorption_maxtime_summary">Laikas, per kurį visi maisto angliavandeniai, tikėtina, bus įsisavinti</string>
-    <string name="danar_visualizeextendedaspercentage_title">Rodyti ištęstinį boliusą kaip %%</string>
     <string name="careportal_sensorage_label_short">SAMŽ</string>
     <string name="careportal_insulinage_label_short">IAMŽ</string>
     <string name="careportal_canulaage_label_short">KAMŽ</string>
@@ -662,7 +496,6 @@
     <string name="careportal_pump_label">POMPA</string>
     <string name="careportal_newnstreatment_duration_min_label">Trukmė [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Įjungti NDM</string>
     <string name="enablesmb">Įjungti SMB</string>
     <string name="enablesmb_summary">Naudoti Super Mikro Bolusus vietoj laikinos bazės greitesniam veikimui</string>
@@ -674,23 +507,7 @@
     <string name="ultrarapid_oref">Staigaus veikimo Oref</string>
     <string name="dia_too_short">IVT %1$f per trumpa - bus naudojama %2$f!</string>
     <string name="activate_profile">Aktyvuoti profilį</string>
-    <string name="date">Data</string>
     <string name="invalid">KLAIDA</string>
-    <string name="waitingforpairing">Laukiama ryšio su pompa</string>
-    <string name="pairingok">Sujungta</string>
-    <string name="pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
-    <string name="pairing">Sujungiama</string>
-    <string name="danars_nodeviceavailable">Nerasta jokio prietaiso</string>
-    <string name="emptyreservoir">Rezervuaras tuščias</string>
-    <string name="bloodsugarmeasurementalert">Gliukozės kiekio kraujyje matavimo perspėjimas</string>
-    <string name="remaininsulinalert">Likusio insulino kiekis</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Pasirinkta pompa</string>
-    <string name="pairpump">Susieti naują pompą</string>
-    <string name="bolusspeed">Boluso greitis</string>
-    <string name="danar_setbasalstep001">Nustatyti bazės žingsnį 0.01 vv/val</string>
-    <string name="serialnumber">Serijos numeris</string>
     <string name="careportal_newnstreatment_percentage_label">Procentais</string>
     <string name="careportal_newnstreatment_timeshift_label">Laiko perstūmimas</string>
     <string name="default_temptargets">Numatyti Laikini Tikslai</string>
@@ -700,32 +517,18 @@
     <string name="activity_target">\"Aktyvumas\" tikslas</string>
     <string name="hypo_duration">\"Hipo\" trukmė</string>
     <string name="hypo_target">\"Hipo\" tikslas</string>
-    <string name="danar_history_prime">Užpildyti sistemą</string>
-    <string name="gettingextendedbolusstatus">Gaunamas ištęstinio boluso statusas</string>
-    <string name="gettingbolusstatus">Gaunamas boluso statusas</string>
-    <string name="gettingtempbasalstatus">Gaunamas laikinos bazės statusas</string>
-    <string name="gettingpumpsettings">Gaunami pompos nustatymai</string>
-    <string name="gettingpumptime">Gaunamas pompos laikas</string>
     <string name="reuse">naudoti pakartotinai</string>
     <string name="wearcontrol_title">Laikrodžio valdikliai</string>
     <string name="wearcontrol_summary">Nustatyti Laikinus Tikslus ir įvesti terapinius įrašus iš laikrodžio.</string>
-    <string name="connectiontimedout">Prijungimo laikas baigėsi</string>
     <string name="food">Maistas</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">min.</string>
-    <string name="shorthour">val</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">Energ. vertė</string>
     <string name="shortprotein">Balt.</string>
     <string name="shortfat">Rieb</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Laukiama boluso pabaigos. Liko %1$d s.</string>
-    <string name="processinghistory">Apdorojama</string>
-    <string name="startingbolus">Pradedamas bolusas</string>
     <string name="executingrightnow">Komanda vykdoma</string>
-    <string name="pumpdrivercorrected">Pompos valdiklis pakoreguotas</string>
     <string name="pump_unreachable">Pompa nepasiekiama</string>
     <string name="missed_bg_readings">Negauti KG duomenys</string>
     <string name="raise_notifications_as_android_notifications">Naudoti sistemos perspėjimus aliarmams ir įspėjimams</string>
@@ -735,9 +538,6 @@
     <string name="pump_unreachable_threshold">Perspėjimo apie nepasiekiamą pompą riba [min]</string>
     <string name="urgent_alarm">Kritiniai perspėjimai</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Vienai sekundei išjungia telefono bluetooth, jei ryšys su pompa nutrūksta. Gali būti veiksminga kai kuriems telefonų modeliams, turintiems BT problemų.</string>
     <string name="eversense">Eversense programėlė (modifikuota)</string>
     <string name="dexcomg5_nsupload_title">Perduoti KG duomenis į NS</string>
     <string name="bgsource_upload">KG duomenų perdavimo nustatymai</string>
@@ -750,12 +550,9 @@
     <string name="uamsmbmaxminutes_summary">NDM SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
     <string name="carbsReqThreshold">Angliavandenių pasiūlymo riba</string>
     <string name="carbsReqThreshold_summary">Kai angliavandeniai yra siūlomi, kaip gramų angliavandenių aktyvuos pranešimą</string>
-    <string name="unsupportedfirmware">Pompos programinės įrangos versija nepalaikoma</string>
     <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
     <string name="nsclientbg">NSClient KG</string>
-    <string name="minimalbasalvaluereplaced">Valandinė bazė pakeista mažiausia palaikoma verte: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valandinė bazė pakeista didžiausia palaikoma verte: %1$s</string>
     <string name="overview_editquickwizard_usebg">KG apskaičiavimas</string>
     <string name="overview_editquickwizard_usebolusiob">Bolusų AIO apskaičiavimas</string>
     <string name="overview_editquickwizard_usebasaliob">Bazės AIO apskaičiavimas</string>
@@ -773,8 +570,6 @@
     <string name="closedmodeenabled">Uždaras ciklas aktyvus</string>
     <string name="maxiobset">Maksimalus AIO nustatytas tinkamai</string>
     <string name="hasbgdata">KG šaltinis pasirinktas teisingai</string>
-    <string name="basalprofilenotaligned">Bazės reikšmės nesuderintos su valandomis: %1$s</string>
-    <string name="zerovalueinprofile">Netinkamas profilis: %1$s</string>
     <string name="combo_programming_bolus">Programuojamas bolusas</string>
     <string name="combo_refresh">Atnaujinti</string>
     <string name="combo_pump_state_label">Būsena</string>
@@ -795,7 +590,6 @@
     <string name="bolus_frequency_exceeded">Tokio paties dydžio bolusas buvo nustatytas per paskutines dvi minutes. Siekiant išvengti atsitiktinio perdozavimo ir programos klaidų, veiksmas neleidžiamas.</string>
     <string name="combo_pump_connected_now">Dabar</string>
     <string name="combo_activity_reading_pump_history">Skaitoma pompos istorija</string>
-    <string name="danar_history">Pompos istorija</string>
     <string name="combo_activity_setting_basal_profile">Nustatyti bazės profilį</string>
     <string name="combo_pump_cartridge_low_warrning">Pompos rezervuaras beveik tuščias</string>
     <string name="combo_pump_battery_low_warrning">Pompos baterija baigia išsikrauti</string>
@@ -814,9 +608,6 @@
     <string name="extendedbolusdeliveryerror">Ištęstinio boluso suleidimo klaida</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">prieš</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min.</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Leisti SMB visada</string>
     <string name="enablesmbalways_summary">Leisti SMB visada, nepriklausomai nuo bolusų. Įmanoma tik naudojant patikimų, filtruotų KG duomenų šaltinį, pvz.: Dexcom G5</string>
     <string name="enablesmbaftercarbs">Leisti SMB po angliavandenių įvedimo</string>
@@ -827,8 +618,6 @@
     <string name="enablesmbwithtemptarget_summary">Įjungti SMB, kai laikinas tikslas aktyvuotas (Netrukus valgysiu, Aktyvumas)</string>
     <string name="enablesmbwithhightemptarget">Įjungti SMB su intensyviais laikinais tikslais</string>
     <string name="enablesmbwithhightemptarget_summary">Įjungti SMB, kai intensyvūs laikini tikslai yra aktyvūs (sportuosite)</string>
-    <string name="let_temp_basal_run">Paleisti laikinąją bazę</string>
-    <string name="mute">Nutildyti</string>
     <string name="overview_insulin_label">Insulinas</string>
     <string name="overview_carbs_label">AV</string>
     <string name="overview_buttons_selection">Mygtukai</string>
@@ -870,7 +659,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Naudojama neužbaigta versija. Uždaras ciklas neaktyvus.</string>
     <string name="engineering_mode_enabled">Inžinerinis režimas įjungtas</string>
     <string name="not_eng_mode_or_release">Inžinerinis režimas negalimas vartotojo atšakoje</string>
-    <string name="pump_basebasalrate">%1$.2f vv/val</string>
     <string name="combo_actvity_reading_basal_profile">Nuskaitomas bazės profilis</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Skaičiuojant bolusą pasikeitė pompos istorija. Bolusas nesuleistas. Prašome perskaičiuoti, jei boluso vis dar reikia.</string>
     <string name="combo_error_updating_treatment_record">Bolusas sėkmingai suleistas, tačiau įrašas žurnale neįvestas. Taip gali nutikti, jei du vienodi nedideli bolusai suleisti per pastarąsias 2 min. Patikrinkite pompos istoriją ir įrašų žurnalą bei naudodamiesi Careportal įveskite trūkstamus įrašus. Patikrinkite, ar įvedamas įrašas neturi tokios pat laiko žymos ir insulino kiekio, kaip jau egzistuojantis.</string>
@@ -893,15 +681,10 @@
     <string name="smbdisabledinpreferences">SMB išjungti nustatymuose</string>
     <string name="uamdisabledinpreferences">NDM nustatymas išjungtas nustatymuose</string>
     <string name="uamdisabledoref1notselected">NDM neveikia, nes priklauso nuo Oref1 jautrumo įskiepio</string>
-    <string name="limitingbasalratio">Ribojamas maksimalus bazės greitis %1$.2f vv/val dėl %2$s</string>
-    <string name="pumplimit">pompos limitas</string>
-    <string name="itmustbepositivevalue">reikšmė turi būti teigiama</string>
     <string name="maxbasalmultiplier">maksimalus bazės daugiklis</string>
     <string name="maxdailybasalmultiplier">maksimalus paros bazės daugiklis</string>
     <string name="smb_frequency_exceeded">Bolusas buvo suleistas per paskutines 3 minutes, SMB praleidžiamas</string>
     <string name="basal_set_correctly">Bazė nustatyta teisingai</string>
-    <string name="limitingpercentrate">Ribojamas maks procentų kiekis %1$d%%, nes %2$s</string>
-    <string name="limitingbolus">Bolusas ribojamas iki %1$.1f vv dėl %2$s</string>
     <string name="limitingextendedbolus">Ištęstinis bolusas ribojamas iki %1$.1f vv dėl %2$s</string>
     <string name="limitingmaxiob">Ribojamas maks AIO iki %1$.1f vv dėl %2$s</string>
     <string name="limitingcarbs">Ribojami angliavandeniai iki %1$d g dėl %2$s</string>
@@ -916,7 +699,6 @@
     <string name="smbnotallowedinopenloopmode">SMB neleidžiami atviro ciklo režime</string>
     <string name="food_short">Maistas</string>
     <string name="reset">atstatyti</string>
-    <string name="waitingfortimesynchronization">Laukiama laiko sinchronizavimo (%1$d sek.)</string>
     <string name="loopdisconnectedfor">Nesujungta (%1$d min.)</string>
     <string name="openapssmb_maxiob_title">Maksimalus bendras AIO, kurio negali viršyti OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Ši vertė yra vadinama Maks AIO OpenAPS kontekste\nOpenAPS nepridės daugiau insulino, jei dabartinis AIO yra didesnis už šią vertę</string>
@@ -932,7 +714,6 @@
     <string name="nav_setupwizard">Sąrankos vedlys</string>
     <string name="setupwizard_finish">UŽBAIGTI</string>
     <string name="setupwizard_language_prompt">Pasirinkite kalbą</string>
-    <string name="boluserrorcode">Įvesta: %1$.2fvv Suleista: %2$.2fvv Klaidos kodas: %3$s</string>
     <string name="firstinsulinincrement">Pirmas insulino dozės žingsnis</string>
     <string name="secondinsulinincrement">Antras insulino dozės žingsnis</string>
     <string name="thirdinsulinincrement">Trečias insulino dozės žingsnis</string>
@@ -955,7 +736,6 @@
     <string name="virtualpump_type">Virtualios pompos tipas</string>
     <string name="virtualpump_definition">Pompos nustatymas</string>
     <string name="virtualpump_pump_def">Bolusas: Žingsnis=%1$s\nIštęstinis bolusas: [Žingsnis=%2$s, Trukmė=%3$smin-%4$sh]\nBazė: Žingsnis=%5$s\nLDB: %6$s (iš %7$s), Trukmė=%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Virtualioje pompoje palaikomos tik atskiros vertės, o ne diapazonas detalumui užtikrinti.</string>
     <string name="ns_autobackfill_title">Automatiškai užpildyti trūkstamus KG duomenis</string>
     <string name="wear_wizard_settings">Išmaniojo laikrodžio nustatymai</string>
     <string name="wear_wizard_settings_summary">Skaičiavimai, įtraukti į Patarėjo rezultatą:</string>
@@ -986,22 +766,6 @@
     <string name="request">Užklausa</string>
     <string name="insulinsourcesetup">Konfigūruoti insulino įskiepį</string>
     <string name="exit">Išeiti</string>
-    <string name="danar_useroptions">Vartotojo parinktys</string>
-    <string name="danar_timedisplay">Rodyti laiko formatą</string>
-    <string name="danar_buttonscroll">Mygtukų slinkties funkcija</string>
-    <string name="danar_beep">Pypsėjimas spaudžiant mygtukus</string>
-    <string name="danar_pumpalarm">Aliarmas</string>
-    <string name="danar_pumpalarm_sound">Garsas</string>
-    <string name="danar_pumpalarm_vibrate">Vibravimas</string>
-    <string name="danar_pumpalarm_both">Abu</string>
-    <string name="danar_screentimeout">Ekrano aktyvumo laikas [seconds]</string>
-    <string name="danar_backlight">Ekrano apšvietimo laikas [seconds]</string>
-    <string name="danar_glucoseunits">KG vienetai</string>
-    <string name="danar_shutdown">Išjungimas [hours]</string>
-    <string name="danar_lowreservoir">Žemas rezervuaro lygis [Units]</string>
-    <string name="danar_saveuseroptions">Išsaugoti nustatymus pompoje</string>
-    <string name="option_on">Įjungti</string>
-    <string name="option_off">Išjungti</string>
     <string name="open_navigation">Atidaryti meniu</string>
     <string name="close_navigation">Uždaryti meniu</string>
     <string name="nav_plugin_preferences">Įskiepių nustatymai</string>
@@ -1020,8 +784,6 @@
     <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
     <string name="combo_invalid_setup">Netinkami pompos nustatymai, patikrinkite dokumentaciją ir įsitikinkite, kad Quick info meniu yra pavadintas QUICK INFO, naudojant 360 configuration software.</string>
     <string name="custom">Pasirinktinis</string>
-    <string name="largetimedifftitle">Didelis laiko neatitikimas</string>
-    <string name="largetimediff">Didelis laiko skirtumas:\nLaikas pompoje skiriasi daugiau nei 1,5 val.\nNustatykite laiką pompoje rankiniu būdu ir įsitikinkite, kad įrašai iš pompos istorijos nesukelia netikėtų sistemos veiksmų.\nJei įmanoma, ištrinkite istoriją pompoje prieš keisdami laiką arba atjunkite uždarąjį ciklą vienai IVT po paskutinio neteisingo istorijos įrašo ar mažiausiai vienai IVT nuo dabar.</string>
     <string name="careportal_removestartedevents">Ištrinti \"AndroidAPS paleista\" įrašus</string>
     <string name="storedsettingsfound">Rasti išsaugoti nustatymai</string>
     <string name="allow_hardware_pump_text">Dėmesio: jei aktyvuosite ir prijungsite prie aparatinės pompos, AndroidAPS nukopijuos bazės nustatymus iš profilio į pompą, pakeisdamas esančius nustatymus pompoje. Įsitikinkite, kad turimi bazės nustatymai AndroidAPS yra teisingi. Jei nesate tikri arba nenorite iš naujo keisti bazės nustatymų jūsų pompoje, paspauskite atšaukti ir pakartokite prijungimą prie pompos kitą kartą.</string>
@@ -1046,17 +808,10 @@
     <string name="setupwizard_preferred_aps_mode">Pageidaujamas DKS režimas</string>
     <string name="treatments_wizard_total_label">Viso</string>
     <string name="calculation_short">Skaič.</string>
-    <string name="handshaking">Ryšio užmezgimas</string>
     <string name="sendlogfiles">Siųsti šios dienos žurnalo įrašus kūrėjams dabar. Netikėta situacija.</string>
-    <string name="maxbolusviolation">Pažeistas maks boluso limitas</string>
-    <string name="commanderror">Komandos klaida</string>
-    <string name="speederror">Greičio klaida</string>
-    <string name="insulinlimitviolation">Pažeistas insulino dozės limitas</string>
     <string name="loop_openmode_min_change">Minimalaus pokyčio užklausa [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Atviras Ciklas parodys naujų pakeitimų užklausą tik tada, kai pokytis bus didesnis nei ši vertė %. Numatytoji vertė yra 20%</string>
-    <string name="pairfirst">Atnaujinkite pompos ir telefono ryšį!</string>
     <string name="searching_for_devices">Ieškoma įrenginių…</string>
-    <string name="please_wait">Palaukite…</string>
     <string name="pairing_completed">Sujungimas sėkmingas</string>
     <string name="code_compare">Ar kodas, kurį matote įrenginyje, sutampa su pompos kodu?</string>
     <string name="insight_pairing">Insight sujungimas</string>
@@ -1145,7 +900,6 @@
     <string name="isequalorgreater">yra lygus arba didesnis nei</string>
     <string name="isgreater">didesnis nei</string>
     <string name="isnotavailable">negalimas</string>
-    <string name="unknown">nežinoma</string>
     <string name="glucoseisnotavailable">Glikemija nepasiekiama</string>
     <string name="glucosecomparedmgdl">Glikemija %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glikemija %1$s %2$.1f %3$s</string>
@@ -1162,23 +916,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatiškai</string>
     <string name="profile_total">== ∑  %1$s vv</string>
-    <string name="profile_ins_units_per_hour">Vv/val</string>
-    <string name="profile_carbs_per_unit">g/vv</string>
-    <string name="profile_per_unit">/vv</string>
     <string name="dexcom_lognssensorchange_title">Registruoti sensoriaus keitimą NS</string>
     <string name="dexcom_lognssensorchange_summary">Sukurti įvykį \"Sensoriaus keitimas\" NS automatiškai, startavus sensorių</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekundė</string>
-    <string name="unit_minute">min.</string>
-    <string name="unit_hour">val.</string>
-    <string name="unit_day">d.</string>
-    <string name="unit_week">savaitė</string>
-    <string name="unit_seconds">sekundės</string>
-    <string name="unit_minutes"> min.</string>
-    <string name="unit_hours">val.</string>
-    <string name="unit_days">d.</string>
-    <string name="unit_weeks">savaičių</string>
     <string name="summary_tidepool_username">Jūsų Tidepool vartotojo vardas, įprastai jūsų el. pašto adresas</string>
     <string name="title_tidepool_username">Vartotojo vardas</string>
     <string name="summary_tidepool_password">Jūsų Tidepool prisijungimo slaptažodis</string>
@@ -1221,7 +962,6 @@
     <string name="very_old_version">labai sena versija</string>
     <string name="new_version_warning">Nauja versija pasiekiama mažiausiai %1$d d.! Po %2$d grįšite prie stabdymo prie žemo, po %3$d ciklas bus išjungtas</string>
     <string name="twohours">2 val</string>
-    <string name="formatinsulinunits">%1$.2fV</string>
     <string name="dexcom_app_patched">Dexcom programėlė (modifikuota)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Gauti kraujo gliukozės reikšmes iš modifikuotos Dexcom programėlės.</string>
@@ -1295,10 +1035,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Parinkta</string>
     <string name="rileylink_scanner_title">RileyLink skanavimas</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy nepalaikoma.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth neįjungta.</string>
-    <string name="location_not_found_title">Vietovės nustatymas neįjungtas</string>
-    <string name="location_not_found_message">Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo.</string>
     <string name="location_yes">Įjungti</string>
     <string name="location_no">Ne</string>
     <string name="rileylink_scanner_scanning">Skanuojama</string>
@@ -1339,7 +1075,6 @@
     <string name="rileylink_error_tuneup_failed">TuneUp klaida</string>
     <string name="rileylink_error_pump_unreachable">Pompa nepasiekiama</string>
     <string name="rileylink_error_pod_unreachable">Pod nepasiekiamas</string>
-    <string name="rileylink_error_address_not_set_short">Nenustatyta</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1409,7 +1144,6 @@
     <string name="insulinFromCob"><![CDATA[AAO palyginus su AIO: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Pritaikyti boluso apribojimai: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Nustatytas lėtas angliavandenių įsisavinimas: %2$d%% laiko. Dar karą patikrinkite savo skaičiavimus. AAO gali būti pervertinti, todėl gali būti suleista per daug insulino!!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d vv</string>
     <string name="partialboluswizard">Suleisti šią boluso skaičiuoklės rezultato dalį [%]</string>
     <string name="deliverpartofboluswizard">Boluso skaičiuoklė atlieka skaičiavimus, tačiau tik dalis apskaičiuoto insulino yra suleidžiama. Naudinga kartu su SMB algoritmu.</string>
     <string name="loading">Kraunama...</string>
@@ -1417,7 +1151,6 @@
     <string name="time_range">Laiko intervalas</string>
     <string name="timerange_value">Laikas yra tarp %1$s ir %2$s</string>
     <string name="between">Tarp </string>
-    <string name="close">Uždaryti</string>
     <string name="increasingmaxbasal">Didinama maksimali valandinės bazės reikšmė, nes nustatytoji reikšmė yra mažesnė nei profilio maksimali val. bazės reikšmė</string>
     <string name="smscommunicator_messagebody">Neteisingas pranešimas</string>
     <string name="format_bg_isf">%1$s JIF: %2$.1f</string>
@@ -1435,7 +1168,6 @@
     <string name="common_off">Išjungta</string>
     <string name="objectives_button_unfinish">Išvalyti užbaigtus</string>
     <string name="objectives_button_unstart">Išvalyti pradėtus</string>
-    <string name="timedetection">Laiko apibrėžimas</string>
     <string name="doyouwantresetstart">Ar norite iš naujo nustatyti tikslų pradžią? Jūs galite prarasti jau pasiektus.</string>
     <string name="nopumpselected">Pompa nepasirinkta</string>
     <string name="setupwizard_units_prompt">Pasirinkite vienetus, kurių vertes norite parodyti</string>
@@ -1461,7 +1193,6 @@
     <string name="nav_survey">Apklausa</string>
     <string name="invalidage">Neteisingas amžiaus įrašas</string>
     <string name="invalidweight">Neteisingas svorio įrašas</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bolusas: <b>%3$.2f</b> Bazinis: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Žemas: <b>%2$02d%%</b> Norma: <b>%3$02d%%</b> Aukštas: <b>%4$02d%%</b>]]></string>
     <string name="average">Vidutinis</string>
     <string name="tdd">BPD</string>
@@ -1474,12 +1205,8 @@
     <string name="randombg_short">KG</string>
     <string name="tools">Įrankiai</string>
     <string name="show_calculation">Rodyti skaičiavimą</string>
-    <string name="error">Klaida</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Automatizuotas įvykis</string>
     <string name="alreadyset">Jau nustatyta</string>
-    <string name="message">Pranešimas</string>
     <string name="clearqueueconfirm">Išvalyti eilę? Visi eilės duomenys bus prarasti!</string>
     <string name="ebstopsloop">Ištęsto boluso funkcija sustabdys uždaro ciklo režimą ištęsto boluso veikimo metu. Ar tikrai norite patvirtinti savo pasirinkimą?</string>
     <string name="closed_loop_disabled_with_eb">Uždara ciklas išjungtas dėl ištęsto boluso veikimo</string>
@@ -1493,4 +1220,13 @@
     <string name="loop_tbrexecution_time_label">Laikinos bazės įvykdymo laikas</string>
     <string name="insight_alert_notification_channel">Insight pompos aliarmai</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 1b2d56b27f..3c4f8dbd28 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Reset database</string>
     <string name="reset_db_confirm">Wil je echt de database wissen?</string>
     <string name="nav_exit">Afsluiten</string>
-    <string name="danar_useextended_title">Gebruik vertraagde bolussen voor &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth apparaat</string>
     <string name="ns_sync_use_absolute_title">Gebruik altijd absolute basale waarden</string>
     <string name="alert_dialog_storage_permission_text">Herstart je telefoon of herstart AndroidAPS vanuit de systeem instellingen a. u. b. \nanders zal AndroidAPS geen logboek hebben (Belangrijk om te controleren of de algoritmes correct werken)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Dit apparaat lijkt geen ondersteuning te bieden voor whitelisten voor batterijoptimalisatie - u kunt prestatieproblemen ervaren.</string>
     <string name="description_actions">Een aantal knoppen voor snelle toegang tot algemene functies</string>
-    <string name="description_careportal">Voer geavanceerde logboekitems in.</string>
     <string name="description_config_builder">Gebruikt om actieve plugins te configureren</string>
     <string name="description_objectives">Leerprogramma</string>
     <string name="description_food">Toon de instellingen voor Voeding in Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Gebruik profiel(en) die je hebt aangemaakt in Nightscout</string>
     <string name="description_profile_simple">Maak een profiel met slechts één tijdsblok.</string>
     <string name="description_pump_combo">Pomp integratie voor Accu-Chek Combo pompen, vereist dat ruffy geïnstalleerd is</string>
-    <string name="description_pump_dana_r">Pomp integratie voor DANA Diabecare R pompen</string>
-    <string name="description_pump_dana_r_korean">Pomp integratie voor inheemse DANA Diabecare R pompen</string>
-    <string name="description_pump_dana_r_v2">Pomp integratie voor DANA Diabecare R pompen met geupgrade firmware</string>
-    <string name="description_pump_dana_rs">Pomp integratie voor DANA Diabecare RS pompen</string>
     <string name="description_pump_mdi">Pomp integratie voor mensen met pen-therapie (meerdere dagelijkse injecties)</string>
     <string name="description_pump_virtual">Pomp integratie voor pompen, waar nog geen driver voor is (Open Loop)</string>
     <string name="description_sensitivity_aaps">Gevoeligheid wordt berekend op dezelfde manier als Oref0, maar u kunt een tijdframe naar het verleden specificeren. Minimale koolhydraat absorptie is berekend op basis van max koolhydraat absorptie tijd van de voorkeursinstellingen.</string>
@@ -53,13 +46,6 @@
     <string name="description_wear">AndroidAPS controleren en bedienen met behulp van uw WearOS-horloge.</string>
     <string name="description_xdrip_status_line">Toon informatie over de Loop op jouw xDrip+ wijzerplaat.</string>
     <string name="description_sms_communicator">Bedien AndroidAPS op afstand met SMS commando\'s.</string>
-    <string name="nsprofileview_units_label">Eénheden</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">KH ratio</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basaal</string>
-    <string name="nsprofileview_target_label">Streefdoel</string>
-    <string name="noprofileset">Geen profiel ingesteld</string>
     <string name="treatments_insulin_label_string">Insuline:</string>
     <string name="treatments_carbs_label_string">Koolhydraten:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,15 +61,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Koolhydraten</string>
     <string name="treatments_wizard_correction_label">Correctie</string>
-    <string name="insulin_unit_shortname">E</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Nu uitvoeren</string>
     <string name="vitualpump_label">VIRTUELE POMP</string>
-    <string name="pump_basebasalrate_label">Basis basale dosis</string>
-    <string name="pump_tempbasal_label">Tijdelijk basaal</string>
-    <string name="virtualpump_extendedbolus_label">Vertraagde bolus</string>
-    <string name="pump_battery_label">Batterij</string>
-    <string name="pump_reservoir_label">Reservoir</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Laatste berekening</string>
     <string name="openapsma_inputparameters_label">Invoerparameters</string>
@@ -95,16 +75,11 @@
     <string name="result">Resultaat</string>
     <string name="result_insulin_carbs">Resultaat: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Geen BG gegevens beschikbaar</string>
-    <string name="nochangerequested">Geen aanpassing noodzakelijk</string>
     <string name="openapsma_request_label">Voorstel</string>
-    <string name="rate">Dosis</string>
-    <string name="duration">Periode</string>
-    <string name="reason">Reden</string>
     <string name="glucose">Glucose</string>
     <string name="delta">Verschil</string>
     <string name="sms_delta">Verschil:</string>
     <string name="configbuilder">Configurator</string>
-    <string name="objectives">Doelen</string>
     <string name="overview">Overzicht</string>
     <string name="nsprofile">NS Profiel</string>
     <string name="simpleprofile">Eenvoudig profiel</string>
@@ -122,7 +97,6 @@
     <string name="configbuilder_general">Algemeen</string>
     <string name="configbuilder_general_description">Dit zijn enkele algemene plugins die handig kunnen zijn.</string>
     <string name="configbuilder_constraints_description">Welke beperkingen worden toegepast?</string>
-    <string name="days">dagen</string>
     <string name="constraints">Beperkingen</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -138,7 +112,6 @@
     <string name="openapsma_disabled">Plugin is gedeactiveerd</string>
     <string name="constraints_violation">In strijd met beperkingen</string>
     <string name="treatmentdeliveryerror">Bolus toedien storing</string>
-    <string name="tempbasaldeliveryerror">Tijdelijk basaal toedien storing</string>
     <string name="overview_newtempbasal_basalpercent">Basaal waarde [%]</string>
     <string name="setbasalquestion">Accepteer nieuw tijdelijk basaal:</string>
     <string name="overview_treatment_label">Bolus</string>
@@ -149,7 +122,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basaal</string>
     <string name="sms_basal">Basaal:</string>
-    <string name="carbs">Koolhydraten</string>
     <string name="changeyourinput">Wijzig het ingegevene!</string>
     <string name="configbuilder_bgsource">BG bron</string>
     <string name="configbuilder_bgsource_description">Waar moet de AndroidAPS zijn gegevens vandaan halen?</string>
@@ -166,25 +138,6 @@
     <string name="treatments_wizard_basaliob_label">Basaal IOB</string>
     <string name="bolusconstraintapplied">Bolus limiet ingesteld</string>
     <string name="carbsconstraintapplied">KH limiet ingesteld</string>
-    <string name="careportal_bgcheck">BG Controle</string>
-    <string name="careportal_announcement">Mededeling</string>
-    <string name="careportal_note">Notitie</string>
-    <string name="careportal_question">Vraag</string>
-    <string name="careportal_exercise">Sport</string>
-    <string name="careportal_pumpsitechange">Infuus wissel</string>
-    <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
-    <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
-    <string name="careportal_insulincartridgechange">Insuline ampul wissel</string>
-    <string name="careportal_profileswitch">Profiel wissel</string>
-    <string name="careportal_snackbolus">Snack bolus</string>
-    <string name="careportal_mealbolus">Maaltijd bolus</string>
-    <string name="careportal_correctionbolus">Correctie bolus</string>
-    <string name="careportal_combobolus">Combinatie-Bolus</string>
-    <string name="careportal_tempbasalstart">Start tijd. basaal</string>
-    <string name="careportal_tempbasalend">Einde tijd. basaal</string>
-    <string name="careportal_carbscorrection">Koolhydraten correctie</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Gebeurtenis type</string>
     <string name="careportal_newnstreatment_other">Andere</string>
     <string name="careportal_newnstreatment_meter">Meter</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -216,35 +169,12 @@
     <string name="openapsma_maxbasal_summary">Dit is de maximale waarde waarop het basaal door OpenAPS ingesteld kan worden</string>
     <string name="openapsma_maxiob_title">Maximale basaal IOB, dat OpenAPS kan toedienen [E]</string>
     <string name="openapsma_maxiob_summary">Deze waarde wordt de Max IOB genoemd in OpenAPS context\nDit is de maximale insuline hoeveelheid in [E] dat APS in één keer kan toedienen.</string>
-    <string name="dismiss">NEGEER</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Verbinden</string>
-    <string name="connected">Verbonden</string>
-    <string name="disconnected">Niet verbonden</string>
-    <string name="danar_pump_settings">Dana pomp instellingen</string>
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
     <string name="save">Opslaan</string>
-    <string name="nobtadapter">Geen bluetooth adapter gevonden</string>
-    <string name="devicenotfound">Geselecteerd toestel niet gevonden</string>
-    <string name="connectionerror">Pomp verbindingsstoring</string>
-    <string name="danar_iob_label">Pomp IOB</string>
-    <string name="danar_dailyunits">Dag totaal</string>
-    <string name="pump_lastbolus_label">Laatste bolus</string>
-    <string name="hoursago">%1$.1fu geleden</string>
-    <string name="danar_invalidinput">Verkeerde ingave</string>
-    <string name="danar_valuenotsetproperly">Waarde niet correct ingesteld</string>
     <string name="reloadprofile">Herlaad profiel</string>
-    <string name="danar_viewprofile">Profiel bekijken</string>
-    <string name="enacted">Uitgevoerd</string>
-    <string name="comment">Commentaar</string>
-    <string name="success">Succes</string>
-    <string name="percent">Procent</string>
-    <string name="absolute">Absoluut</string>
-    <string name="canceltemp">Annuleer tijdelijk basaal</string>
     <string name="smscommunicator">SMS Commando\'s</string>
-    <string name="waitingforpumpresult">Wacht op het resultaat</string>
     <string name="smscommunicator_allowednumbers">Geautoriseerde telefoon nummers</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Om de bolus %1$.2fU toe te dienen antwoord met de code %2$s</string>
@@ -265,54 +195,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Streefdoel %1$s gedurende %2$d minuten</string>
     <string name="smscommunicator_tt_set">Streefdoel %1$s gedurende %2$d minuten succesvol ingesteld</string>
     <string name="smscommunicator_tt_canceled">Tijdelijk streefdoel is geannuleerd</string>
-    <string name="bolusdelivering">Toedienen van %1$.2fE</string>
     <string name="smscommunicator_remotecommandsallowed">Sta SMS commando\'s toe</string>
-    <string name="glucosetype_finger">Vingerprik</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manueel</string>
-    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
-    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
     <string name="danarprofile">DanaR profiel instellingen</string>
     <string name="danarprofile_dia">DIA [uur]</string>
     <string name="danarprofile_dia_summary">Duur van insuline activiteit</string>
-    <string name="failedupdatebasalprofile">Update basaal profiel mislukt</string>
-    <string name="danar_historyreload">Vernieuw</string>
     <string name="uploading">Uploaden</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">storing</string>
-    <string name="danar_refill">hervullen</string>
-    <string name="danar_basalhour">basaal uur</string>
-    <string name="danar_glucose">glucose</string>
-    <string name="danar_carbohydrate">koolhydraten</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Totaal %1$d gegevens geupload</string>
-    <string name="danar_sbolus">S Bolus</string>
-    <string name="danar_history_alarm">Alarm</string>
-    <string name="danar_history_basalhours">Basale uren</string>
-    <string name="danar_history_bolus">Bolussen</string>
-    <string name="danar_history_carbohydrates">Koolhydraten</string>
-    <string name="danar_history_dailyinsulin">Dagtotaal insuline</string>
-    <string name="danar_history_errors">Storing</string>
-    <string name="danar_history_glucose">Glucose</string>
-    <string name="danar_history_refill">Hervullen</string>
-    <string name="danar_history_syspend">Onderbreken</string>
-    <string name="danar_history_connectingfor">Verbonden gedurende %1$d s</string>
-    <string name="danar_password_title">Pomp wachtwoord</string>
-    <string name="wrongpumppassword">Verkeerd pomp wachtwoord!</string>
-    <string name="pumpbusy">Pomp is in gebruik</string>
-    <string name="overview_bolusprogress_delivered">Toegediend</string>
-    <string name="overview_bolusprogress_stoped">Gestopt</string>
     <string name="bolusstopped">Bolus gestopt</string>
     <string name="bolusstopping">Stoppen van bolus</string>
-    <string name="occlusion">Afsluiting</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STOP INGEDRUKT</string>
-    <string name="waitingforpump">Wacht op pomp</string>
-    <string name="overview_bolusprogress_goingtodeliver">Er worden %1$.2fE toegediend</string>
-    <string name="youareonallowedlimit">Limiet bereikt</string>
-    <string name="noprofileselected">Geen profiel geselecteerd</string>
     <string name="smscommunicator_loophasbeendisabled">Loop was uitgeschakeld</string>
     <string name="smscommunicator_loophasbeenenabled">Loop was ingeschakeld</string>
     <string name="smscommunicator_loopisdisabled">Loop is uitgeschakeld</string>
@@ -352,11 +241,9 @@
     <string name="mealbolus">Maaltijd bolus</string>
     <string name="correctionbous">Correctie</string>
     <string name="actions">Acties</string>
-    <string name="androidaps_start">AndroidAPS gestart</string>
     <string name="ns_upload_only">Alleen NS upload (sync. gedeactiveerd)</string>
     <string name="ns_upload_only_summary">Alleen NS upload. Heeft geen effect op de SGV behalve als een lokale bron zoals xDipp geselecteerd is. Heeft geen effect op de profielen wanneer het NS profiel is gekozen.</string>
     <string name="pumpNotInitialized">Pomp niet geïnitialiseerd!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pomp niet geïnitialiseerd, profiel niet gekozen!</string>
     <string name="primefill">Ontlucht/vul</string>
     <string name="fillwarning">Verzeker u dat de vulhoeveelheid overeenkomt met de infusieset!</string>
     <string name="othersettings_title">Andere</string>
@@ -366,8 +253,6 @@
     <string name="button3">Knop 3</string>
     <string name="units_colon">Eenheden:</string>
     <string name="units">Eenheden</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">Streefdoel:</string>
     <string name="prefs_range_title">Bereik voor visualisatie</string>
@@ -377,17 +262,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Update Wear gegevens</string>
     <string name="open_settings_on_wear">Open instellingen op Wear</string>
-    <string name="pumperror">Pomp storing</string>
-    <string name="lowbattery">Batterij bijna leeg</string>
-    <string name="pumpshutdown">Pomp uitschakelen</string>
-    <string name="batterydischarged">Pomp Batterij Leeg</string>
-    <string name="danarkoreanpump">DanaR Koreaans</string>
     <string name="basal_rate">Basaal:</string>
-    <string name="profile_set_failed">Instellie van basaal profiel mislukt</string>
-    <string name="profile_set_ok">Basaal profiel in pomp bijgewerkt</string>
-    <string name="danar_disableeasymode">EasyUI modus in pomp deactiveren</string>
-    <string name="danar_enableextendedbolus">Activeer vertraagde bolussen op de pomp</string>
-    <string name="danar_switchtouhmode">Wijzig de modus E/dag naar E/uur op de pomp</string>
     <string name="basalvaluebelowminimum">Basaalwaarde onder minimum. Profiel niet ingesteld!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Laatste BG:</string>
@@ -395,7 +270,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Permanent bericht</string>
     <string name="old_data">Oude gegevens</string>
-    <string name="minago">%1$d min geleden</string>
     <string name="sms_minago">%1$dmin geleden</string>
     <string name="localprofile">Lokaal profiel</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -411,41 +285,22 @@
     <string name="hypo">Hypo</string>
     <string name="activity">Activiteit</string>
     <string name="removerecord">Verwijder record</string>
-    <string name="danar_stats">DanaR Statistiek</string>
-    <string name="danar_stats_cumulative_tdd">Cumulatieve TDD</string>
-    <string name="danar_stats_expweight">Exponentieel verhoogd TDD</string>
-    <string name="danar_stats_basalrate">Basaal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Datum</string>
-    <string name="danar_stats_ratio">Ratio</string>
-    <string name="danar_stats_amount_days"># Dagen</string>
-    <string name="danar_stats_weight">Gewicht</string>
-    <string name="danar_stats_warning_Message">Mogelijks inaccuraat bij gebruik van bolussen om infusieset te vullen!</string>
-    <string name="danar_stats_olddata_Message">Oude gegevens druk \"VERNIEUW\" a.u.b.</string>
-    <string name="danar_stats_tbb">Totaal basaal</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Initialiseren...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">EP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFIEL</string>
     <string name="treatments_shortname">BEHAND</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">DOEL</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Afgekorte tab titels</string>
     <string name="always_use_shortavg">Gebruik altijd korte gemiddeld verschil ipv gewone verschil</string>
     <string name="always_use_shortavg_summary">Nuttig wanneer gegevens van niet gedempte bronnen zoals Xdrip noisy zijn.</string>
-    <string name="advancedsettings_title">Geavanceerde instellingen</string>
-    <string name="danar_model">Model: %1$02X Protokoll: %2$02X Code: %3$02X</string>
     <string name="profile">Profiel</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Standaard waarde: 3.0 Dit is een belangrijke veiligheid parameter van OpenAPS. Dit limiteert je basaal met een max van 3 maal je hoogste basale dosis. Normaal hoef je deze niet te veranderen. Het is echter belangrijk dat je de ingebouwde limieten kent.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
@@ -464,18 +319,9 @@
     <string name="smscommunicator_calibrationsent">Kalibratie verzonden. Het ontvangen van kalibraties moet actief zijn in xDrip.</string>
     <string name="smscommunicator_calibrationfailed">XDrip ontvangt geen kalibraties</string>
     <string name="pumpsuspended">Pomp onderbreken</string>
-    <string name="gettingpumpstatus">Opvragen pomp status</string>
-    <string name="settingtempbasal">Instellingen tijdelijk basaal</string>
-    <string name="stoppingtempbasal">Stoppen van tijdelijk basaal</string>
-    <string name="settingextendedbolus">Instellingen vertraagde bolus</string>
-    <string name="stoppingextendedbolus">Stoppen van vertraagde bolus</string>
-    <string name="updatingbasalrates">Bijwerken basaal patroon</string>
-    <string name="disconnecting">Verbreken</string>
     <string name="executing">Uitvoeren</string>
     <string name="virtualpump_settings">Virtuele pomp instellingen</string>
     <string name="virtualpump_uploadstatus_title">Upload status naar NS</string>
-    <string name="wrongpassword">Verkeerd wachtwoord</string>
-    <string name="approachingdailylimit">Insuline daglimiet bereikt</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -499,7 +345,6 @@
     <string name="wear_detailedIOB_title">Toon gedetailleerde IOB</string>
     <string name="wear_detailedIOB_summary">Splits IOB in bolus en basaal op de watchface</string>
     <string name="nosuccess">Niet geslaagd - controleer de telefoon</string>
-    <string name="notavailable">Niet beschikbaar</string>
     <string name="patientage">Leeftijd Patient</string>
     <string name="child">Kind</string>
     <string name="teenage">Tiener</string>
@@ -532,8 +377,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Log app start naar NS</string>
     <string name="restartingapp">Sluiten van applicatie om instellingen bij te werken.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insuline</string>
     <string name="configbuilder_insulin_description">Welk soort insuline gebruik je?</string>
     <string name="fastactinginsulin">Snel werkende insuline</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -548,9 +391,6 @@
     <string name="statuslights_bat_critical">Drempel alarm batterij niveau [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Laatste verbinding</string>
-    <string name="danar_bluetooth_status">Bluetooh status</string>
     <string name="nav_about">Over</string>
     <string name="smscommunicator_missingsmspermission">Geen SMS bevoegdheid</string>
     <string name="smscommunicator_missingphonestatepermission">Machtiging ontbreekt voor telefoon gebruik</string>
@@ -561,17 +401,12 @@
     <string name="wear_showbgi_summary">Voeg BGI toe aan status lijn</string>
     <string name="ns_noupload">Geen upload naar NS</string>
     <string name="ns_noupload_summary">AAPS is verbonden met NS maar er worden geen wijzigingen uitgevoerd op NS</string>
-    <string name="basal_step">Basaal stap</string>
-    <string name="bolus_step">Bolus Stap</string>
     <string name="overview_extendedbolus_cancel_button">Annuleer vertraagde bolus</string>
     <string name="careportal_sensorage_label">Ouderdom sensor</string>
     <string name="careportal_canulaage_label">Ouderdom infusie set</string>
     <string name="careportal_insulinage_label">Ouderdom insuline</string>
-    <string name="hours">uren</string>
-    <string name="invalidprofile">Ongeldig profiel !!!</string>
     <string name="doprofileswitch">Profiel wissel uitvoeren</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
-    <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
     <string name="ns_alarmoptions">Alarm opties</string>
     <string name="nsalarm_urgenthigh">Zeer hoog</string>
     <string name="nsalarm_high">Hoog</string>
@@ -595,7 +430,6 @@
     <string name="absorptionsettings_title">Opname instellingen</string>
     <string name="absorption_maxtime_title">Max absorptietijd maaltijd [uur]</string>
     <string name="absorption_maxtime_summary">Verwachte tijd in uren totdat alle koolhydraten opgenomen zijn</string>
-    <string name="danar_visualizeextendedaspercentage_title">Geef vertraagde bolus weer in %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -620,7 +454,6 @@
     <string name="careportal_pump_label">POMP</string>
     <string name="careportal_newnstreatment_duration_min_label">Tijdsduur [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activeer UAM</string>
     <string name="enablesmb">Activeer SMB</string>
     <string name="enablesmb_summary">SMB in plaats van tijdelijke basalen voor snellere reactie</string>
@@ -632,23 +465,7 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">DIA van %1$f te kort - %2$f wordt inplaats gebruikt!</string>
     <string name="activate_profile">Activeer profiel</string>
-    <string name="date">Datum</string>
     <string name="invalid">Ongeldig</string>
-    <string name="waitingforpairing">Wachten op koppelen van de pomp</string>
-    <string name="pairingok">Koppeling geslaagd</string>
-    <string name="pairingtimedout">Koppeling verlopen</string>
-    <string name="pairing">Koppelen</string>
-    <string name="danars_nodeviceavailable">Geen toestel gevonden</string>
-    <string name="emptyreservoir">Ampul leeg</string>
-    <string name="bloodsugarmeasurementalert">Bloed glucose meetpunt alarm</string>
-    <string name="remaininsulinalert">Resterende insuline hoeveelheid</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Geselecteerde pomp</string>
-    <string name="pairpump">Koppel nieuwe pomp</string>
-    <string name="bolusspeed">Bolus snelheid</string>
-    <string name="danar_setbasalstep001">Zet de basale stapgrootte op 0,01 E/uur</string>
-    <string name="serialnumber">Serie nummer</string>
     <string name="careportal_newnstreatment_percentage_label">Percentage</string>
     <string name="careportal_newnstreatment_timeshift_label">Tijd verschuiving</string>
     <string name="default_temptargets">Standaard tijdelijk basaal</string>
@@ -658,32 +475,18 @@
     <string name="activity_target">Activiteits doel</string>
     <string name="hypo_duration">Hypo tijdsduur</string>
     <string name="hypo_target">Hypo streefwaarde</string>
-    <string name="danar_history_prime">Vullen</string>
-    <string name="gettingextendedbolusstatus">Vertraagde bolus status ophalen</string>
-    <string name="gettingbolusstatus">Bolus status ophalen</string>
-    <string name="gettingtempbasalstatus">Ophalen van tijdelijke basaal status</string>
-    <string name="gettingpumpsettings">Pomp instellingen ophalen</string>
-    <string name="gettingpumptime">Pomp tijd ophalen</string>
     <string name="reuse">Herbruik</string>
     <string name="wearcontrol_title">Bedieningen via horloge</string>
     <string name="wearcontrol_summary">Stel tijdelijke doelen en bolussen in vanop je horloge.</string>
-    <string name="connectiontimedout">Connectie verlopen</string>
     <string name="food">Voeding</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">u</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<geen>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Prot</string>
     <string name="shortfat">Vet</string>
     <string name="active"><![CDATA[<Huidig>]]></string>
-    <string name="waitingforestimatedbolusend">Wachten op complete bolus toediening. Resterend %1$d sec.</string>
-    <string name="processinghistory">Uitvoeren van gebeurtenis</string>
-    <string name="startingbolus">Bolus toediening gestart</string>
     <string name="executingrightnow">Opdracht is nu uitgevoerd</string>
-    <string name="pumpdrivercorrected">Pomp service gecorrigeerd</string>
     <string name="pump_unreachable">Pomp niet beschikbaar</string>
     <string name="missed_bg_readings">Geen BG metingen</string>
     <string name="raise_notifications_as_android_notifications">Gebruik systeem notificaties voor waarschuwingen en notificaties</string>
@@ -693,9 +496,6 @@
     <string name="pump_unreachable_threshold">Pomp niet beschikbaar sinds [min]</string>
     <string name="urgent_alarm">Dringend alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Deactiveert de bluetooth functie van de telefoon gedurende een ogenblik. Dit kan op sommige gsm\'s een vastgelopen bluetooth service verhelpen.</string>
     <string name="eversense">Eversense App (aangepast)</string>
     <string name="dexcomg5_nsupload_title">Upload BG gegevens naar NS</string>
     <string name="bgsource_upload">BG upload instellingen</string>
@@ -703,12 +503,9 @@
     <string name="wear_detailed_delta_summary">Toon delta met een extra decimaal punt</string>
     <string name="smbmaxminutes">SMB max minuten</string>
     <string name="smbmaxminutes_summary">Max minuten basaal om SMB tot te limiteren</string>
-    <string name="unsupportedfirmware">Niet ondersteunde pomp firmware</string>
     <string name="dexcomg5_xdripupload_title">Stuur BG data naar xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Basale waarde vervangen door minimaal ondersteunde waarde; %1$s</string>
-    <string name="maximumbasalvaluereplaced">Basale waarde vervangen door maximale ondersteunde waarde: %1$s</string>
     <string name="overview_editquickwizard_usebg">BG berekening</string>
     <string name="overview_editquickwizard_usebolusiob">Bolus IOB berekening</string>
     <string name="overview_editquickwizard_usebasaliob">Basaal IOB berekening</string>
@@ -726,8 +523,6 @@
     <string name="closedmodeenabled">Closed modus actief</string>
     <string name="maxiobset">Maximum IOB juist ingesteld</string>
     <string name="hasbgdata">BG beschikbaar op gekozen bron</string>
-    <string name="basalprofilenotaligned">Basaalstanden niet ingesteld in hele uren: %1$s</string>
-    <string name="zerovalueinprofile">Ongeldig profiel: %1$s</string>
     <string name="combo_programming_bolus">Bolus in pomp programmeren </string>
     <string name="combo_refresh">Vernieuw</string>
     <string name="combo_pump_state_label">Status</string>
@@ -748,7 +543,6 @@
     <string name="bolus_frequency_exceeded">Een bolus met dezelfde hoeveelheid was gevraagd binnen de afgelopen twee minuten. Om incidentele of door bugs veroorzaakte dubbele bolussen te voorkomen is deze bolus geannuleerd.</string>
     <string name="combo_pump_connected_now">Zojuist</string>
     <string name="combo_activity_reading_pump_history">Lezen van pomp historiek</string>
-    <string name="danar_history">Historiek</string>
     <string name="combo_activity_setting_basal_profile">Instellen van basaal profiel</string>
     <string name="combo_pump_cartridge_low_warrning">Insuline ampul is bijna leeg</string>
     <string name="combo_pump_battery_low_warrning">Batterij pomp is bijna leeg</string>
@@ -767,8 +561,6 @@
     <string name="extendedbolusdeliveryerror">Vertraagde bolus toedieningsfout</string>
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">voorbij</string>
-    <string name="format_hours">%1$.2f u</string>
-    <string name="format_mins">%1$d minuten</string>
     <string name="enablesmbalways">Activeer SMB altijd</string>
     <string name="enablesmbalways_summary">SMB altijd aan onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
     <string name="enablesmbaftercarbs">Activeer SMB na koolhydraten</string>
@@ -779,8 +571,6 @@
     <string name="enablesmbwithtemptarget_summary">Gebruik SMB bij een actief tijdelijk streefdoel (eet binnenkort, activiteit)</string>
     <string name="enablesmbwithhightemptarget">Gebruik SMB met een hoog tijdelijk streefdoel</string>
     <string name="enablesmbwithhightemptarget_summary">Gebruik SMB tijdens een verhoogd tijdelijk doel (Inspanningen)</string>
-    <string name="let_temp_basal_run">Laat tijdelijk basaal lopen</string>
-    <string name="mute">Geluid dempen</string>
     <string name="overview_insulin_label">Insuline</string>
     <string name="overview_carbs_label">Koolhydraten</string>
     <string name="overview_buttons_selection">Knoppen</string>
@@ -822,7 +612,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Dev versie actief. Closed loop gedeactiveerd</string>
     <string name="engineering_mode_enabled">Engineering modus is geactiveerd</string>
     <string name="not_eng_mode_or_release">Engineering modus is niet geactiveerd en dit is niet de release branche</string>
-    <string name="pump_basebasalrate">%1$.2f E/uur</string>
     <string name="combo_actvity_reading_basal_profile">Basaal profiel wordt gelezen</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">De pomp historiek is gewijzigd nadat de bolus berekend was. De bolus is Niet toegediend. Programmeer een nieuwe bolus indien nodig.</string>
     <string name="combo_error_updating_treatment_record">Bolus succesvol toegediend, maar toevoegen van de behandeling is gefaald. Dit kan voorvallen wanneer twee kleine bolussen van dezelfde grote gekozen waren gedurende de laatste 2 minuten. Controleer aub de pomphistoriek en de behandelingen, voeg de ontbrekende toe via het Careportal. Let op dat je geen 2 dezelfde hoeveelheden hebt op hetzelfde ogenblik.</string>
@@ -845,15 +634,10 @@
     <string name="smbdisabledinpreferences">SMB gedeactiveerd in de voorkeuren</string>
     <string name="uamdisabledinpreferences">UAM gedeactiveerd in configuratie</string>
     <string name="uamdisabledoref1notselected">UAM gedeactiveerd omdat het Oref1 gevoeligheid plugin nodig heeft</string>
-    <string name="limitingbasalratio">Beperken van basaal tot max %1$.2f E/uur wegens de %2$s</string>
-    <string name="pumplimit">Pomp limiet</string>
-    <string name="itmustbepositivevalue">dit moet een positieve waarde zijn</string>
     <string name="maxbasalmultiplier">Max basaal vermenigvuldiger</string>
     <string name="maxdailybasalmultiplier">Max dagelijks basaal vermenigvuldiger</string>
     <string name="smb_frequency_exceeded">Er is een bolus toegediend gedurende de afgelopen 3 minuten, SMB wordt overgeslagen</string>
     <string name="basal_set_correctly">Basaal correct ingesteld</string>
-    <string name="limitingpercentrate">Begrezen van max procentuele wijzigen tot %1$d%% want de %2$s</string>
-    <string name="limitingbolus">Bolus beperkt tot %1$.1f E doordat %2$s</string>
     <string name="limitingextendedbolus">Beperken van extended bolus op %1$.1f E vanwege %2$s</string>
     <string name="limitingmaxiob">Max IOB wordt beperkt tot %1$.1f E doordat %2$s</string>
     <string name="limitingcarbs">Koolhydraten worden beperkt tot %1$d gr doordat %2$s</string>
@@ -868,7 +652,6 @@
     <string name="smbnotallowedinopenloopmode">SMB niet toegestaan in Open Loop modus</string>
     <string name="food_short">Voeding</string>
     <string name="reset">Reset</string>
-    <string name="waitingfortimesynchronization">Wachten voor tijdsynchronisatie (%1$d sec)</string>
     <string name="loopdisconnectedfor">Verbinding verbroken (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Max totaal IOB dat OpenAPS niet kan overschrijden [E]</string>
     <string name="openapssmb_maxiob_summary">Deze waarde heet MAX IOB in OpenAPS context\nOpenAPS zal geen extra insuline toedienen als de actuele IOB onderstaande waarde overschreden heeft</string>
@@ -884,7 +667,6 @@
     <string name="nav_setupwizard">Setup Wizard</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Selecteer uw taal</string>
-    <string name="boluserrorcode">Gevraagd: %1$.2fU Toegediend: %2$.2fE Error code: %3$s</string>
     <string name="firstinsulinincrement">Eerste insuline increment</string>
     <string name="secondinsulinincrement">Tweede insuline increment</string>
     <string name="thirdinsulinincrement">Derde  insuline increment</string>
@@ -907,7 +689,6 @@
     <string name="virtualpump_type">Virtuele pomp Type</string>
     <string name="virtualpump_definition">Pomp definitie</string>
     <string name="virtualpump_pump_def">Bolus: Stap=%1$s\nExtended Bolus: [Stap=%2$s, Duur=%3$smin-%4$sh]\nBasaal: Stap=%5$s\nTBR: %6$s (by %7$s), Duur=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Alleen absolute waardes (geen van-tot bereik) worden ondersteund voor basaal / bolus in virtuele pomp.</string>
     <string name="ns_autobackfill_title">Automatische BG aanvullen</string>
     <string name="wear_wizard_settings">Wizard instellingen</string>
     <string name="wear_wizard_settings_summary">Berekeningen inclusief in het resultaat van de wizard</string>
@@ -938,22 +719,6 @@
     <string name="request">Verzoek</string>
     <string name="insulinsourcesetup">Gevoeligheid plugin configureren</string>
     <string name="exit">Afsluiten</string>
-    <string name="danar_useroptions">Gebruikersopties</string>
-    <string name="danar_timedisplay">Tijdnotatie</string>
-    <string name="danar_buttonscroll">Scroll-knop</string>
-    <string name="danar_beep">Geef een \'piep\' als op een knop gedrukt wordt</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Geluid</string>
-    <string name="danar_pumpalarm_vibrate">Trillen</string>
-    <string name="danar_pumpalarm_both">Beide</string>
-    <string name="danar_screentimeout">LCD-aan tijd [sec.]</string>
-    <string name="danar_backlight">Achtergrondverlichting-aan tijd [sec.]</string>
-    <string name="danar_glucoseunits">Glucose units</string>
-    <string name="danar_shutdown">Afsluiten [uren]</string>
-    <string name="danar_lowreservoir">Laag reservoir (eenheden)</string>
-    <string name="danar_saveuseroptions">Opslaan van de opties om de pomp</string>
-    <string name="option_on">Aan</string>
-    <string name="option_off">Uit</string>
     <string name="open_navigation">Open navigatie</string>
     <string name="close_navigation">Sluit navigatie</string>
     <string name="nav_plugin_preferences">Plugin voorkeuren</string>
@@ -969,8 +734,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lagere gevoeligheid voor temptargets < 100]]></string>
     <string name="combo_invalid_setup">Ongeldige pompinstellingen, controleer de documenten en controleer of het Quick Info-menu QUICK INFO wordt genoemd met behulp van de 360-configuratiesoftware.</string>
     <string name="custom">Aangepast</string>
-    <string name="largetimedifftitle">Groot tijdsverschil</string>
-    <string name="largetimediff">Groot tijdsverschil: \nDe tijd in de pomp wijkt meer dan 1,5 uur af. \nStel de tijd handmatig in op de pomp en zorg ervoor dat het uitlezen van de geschiedenis van de pomp geen onverwacht gedrag veroorzaakt. \nIndien mogelijk verwijder de geschiedenis uit de pomp pomp voor het wijzigen van de tijd of schakel de Closed Loop uit voor één DIA na de laatste verkeerde invoer van de geschiedenis, maar vanaf nu minstens één DIA.</string>
     <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
     <string name="storedsettingsfound">Opgeslagen instellingen gevonden</string>
     <string name="allow_hardware_pump_text">Let op: als u activeert en verbinding maakt met een hardwarepomp, kopieert AndroidAPS de basale instellingen van het profiel naar de pomp en overschrijft de bestaande basaal snelheid die op de pomp is opgeslagen. Zorg ervoor dat u de juiste basaal instelling hebt in AndroidAPS. Als u niet zeker weet of niet wilt dat de basaal instellingen op uw pomp worden overschreven, drukt u op Annuleren en herhaalt u het overschakelen naar de pomp op een later tijdstip.</string>
@@ -994,17 +757,10 @@
     <string name="setupwizard_preferred_aps_mode">Voorkeur APS-modus</string>
     <string name="treatments_wizard_total_label">Totaal</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Handshaking</string>
     <string name="sendlogfiles">Logboekbestanden van vandaag verzenden aan ontwikkelaars samen met de onverwachte situatie.</string>
-    <string name="maxbolusviolation">Max bolus overschreiding</string>
-    <string name="commanderror">Opdracht fout</string>
-    <string name="speederror">Snelheid fout</string>
-    <string name="insulinlimitviolation">Insuline limiet overschreiding</string>
     <string name="loop_openmode_min_change">Minimale verzoek voor aanpassing [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop zal alleen een wijzigingsverzoek tonen als de verandering groter is dan deze waarde in %. De standaard waarde is 20%</string>
-    <string name="pairfirst">Aub de pomp koppelen met je telefoon!</string>
     <string name="searching_for_devices">Bezig met zoeken naar apparaten…</string>
-    <string name="please_wait">Even geduld a.u.b.…</string>
     <string name="pairing_completed">Koppeling voltooid</string>
     <string name="code_compare">Worden dezelfde codes weergegeven op dit apparaat als op je pomp?</string>
     <string name="insight_pairing">Insight koppelen</string>
@@ -1093,7 +849,6 @@
     <string name="isequalorgreater">is gelijk aan of groter dan</string>
     <string name="isgreater">is groter dan</string>
     <string name="isnotavailable">is niet beschikbaar</string>
-    <string name="unknown">onbekend</string>
     <string name="glucoseisnotavailable">Glucose is niet beschikbaar</string>
     <string name="glucosecomparedmgdl">Glucose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glucose %1$s %2$.1f %3$s</string>
@@ -1110,23 +865,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisering</string>
     <string name="profile_total">== ∑  %1$s E</string>
-    <string name="profile_ins_units_per_hour">E/u</string>
-    <string name="profile_carbs_per_unit">g/E</string>
-    <string name="profile_per_unit">/E</string>
     <string name="dexcom_lognssensorchange_title">Noteer sensor wissel in NS</string>
     <string name="dexcom_lognssensorchange_summary">Noteer automatisch \"Sensor Wissel\" in NS bij starten van sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">seconde</string>
-    <string name="unit_minute">minuut</string>
-    <string name="unit_hour">uur</string>
-    <string name="unit_day">dag</string>
-    <string name="unit_week">week</string>
-    <string name="unit_seconds">seconden</string>
-    <string name="unit_minutes">minuten</string>
-    <string name="unit_hours">uren</string>
-    <string name="unit_days">dagen</string>
-    <string name="unit_weeks">weken</string>
     <string name="summary_tidepool_username">Uw Tidepool login gebruikersnaam, normaliter uw e-mailadres</string>
     <string name="title_tidepool_username">Inlog gebruikersnaam</string>
     <string name="summary_tidepool_password">Uw Tidepool login wachtwoord</string>
@@ -1168,7 +910,6 @@
     <string name="very_old_version">zeer oude versie</string>
     <string name="new_version_warning">Nieuwe versie al zeker %1$d dagen beschikbaar! Terugval LGS na %2$d dagen, loop zal worden uitgeschakeld na %3$d dagen</string>
     <string name="twohours">2u</string>
-    <string name="formatinsulinunits">%1$.2fE</string>
     <string name="dexcom_app_patched">Dexcom App (patched)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Ontvang BG waardes van de aangepaste Dexcom G app.</string>
@@ -1242,10 +983,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Geselecteerd</string>
     <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Lage Energie modus niet ondersteund.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth niet ingeschakeld.</string>
-    <string name="location_not_found_title">Locatie is niet ingeschakeld</string>
-    <string name="location_not_found_message">Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt.</string>
     <string name="location_yes">Inschakelen</string>
     <string name="location_no">Nee</string>
     <string name="rileylink_scanner_scanning">Scannen</string>
@@ -1286,7 +1023,6 @@
     <string name="rileylink_error_tuneup_failed">Verbinding maken mislukt</string>
     <string name="rileylink_error_pump_unreachable">Pomp niet bereikbaar</string>
     <string name="rileylink_error_pod_unreachable">Pod niet bereikbaar</string>
-    <string name="rileylink_error_address_not_set_short">Niet ingesteld</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1356,7 +1092,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolus limiet bereikt: %2$.2fU naar %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!! Trage koolhydraat absorptie gedetecteerd: %2$d%% van de tijd. Controleer je berekening nogmaals. COB kan zijn overschat waardoor er misschien meer insuline wordt afgegeven!!!</font> zijn]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d E</string>
     <string name="partialboluswizard">Voer dit deel van het bolus wizard resultaat uit [%]</string>
     <string name="deliverpartofboluswizard">Bolus wizard voert de berekening uit maar alleen dit deel van berekende insuline wordt geleverd. Handig in combinatie met het SMB algoritme.</string>
     <string name="loading">Bezig met laden...</string>
@@ -1364,7 +1099,6 @@
     <string name="time_range">Tijdsinterval</string>
     <string name="timerange_value">Tijd ligt tussen %1$s en %2$s</string>
     <string name="between">Tussen </string>
-    <string name="close">Sluiten</string>
     <string name="increasingmaxbasal">Verhogen van de maximale basaal waarde omdat de instelling lager is dan het maximum in het profiel</string>
     <string name="smscommunicator_messagebody">Ongeldige inhoud van het bericht</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1382,7 +1116,6 @@
     <string name="common_off">Uit</string>
     <string name="objectives_button_unfinish">Voltooiing wissen</string>
     <string name="objectives_button_unstart">Wissen gestart</string>
-    <string name="timedetection">Tijd detectie</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
     <string name="nopumpselected">Geen pomp geselecteerd</string>
     <string name="setupwizard_units_prompt">Selecteer eenheden waarin je waarden wilt weergeven</string>
@@ -1408,7 +1141,6 @@
     <string name="nav_survey">Enquête</string>
     <string name="invalidage">Ongeldige leeftijd invoer</string>
     <string name="invalidweight">Ongeldige gewicht invoer</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Laag: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Hoog: <b>%4$02d%%</b>]]></string>
     <string name="average">Gemiddelde</string>
     <string name="tdd">TDD</string>
@@ -1421,12 +1153,8 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Hulpmiddelen</string>
     <string name="show_calculation">Toon berekening</string>
-    <string name="error">Fout</string>
-    <string name="timeformat12h">12u</string>
-    <string name="timeformat24h">24u</string>
     <string name="automation_event">Automation gebeurtenis</string>
     <string name="alreadyset">Al ingesteld</string>
-    <string name="message">Bericht</string>
     <string name="clearqueueconfirm">Wachtrij leegmaken? Alle gegevens in de wachtrij zullen verloren gaan!</string>
     <string name="ebstopsloop">Gebruik van Vertraagde bolus functie zal de closed loop modus stoppen voor de duur van de vertraagde bolus. Wil je dit toch?</string>
     <string name="closed_loop_disabled_with_eb">Closed loop modus uitgeschakeld vanwege afgeven Vertraagde bolus</string>
@@ -1440,4 +1168,13 @@
     <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
     <string name="insight_alert_notification_channel">Insight pomp waarschuwingen</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 769d87d688..14f82463e8 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Zresetuj bazy danych</string>
     <string name="reset_db_confirm">Na pewno chcesz zresetować bazy danych?</string>
     <string name="nav_exit">Wyjście</string>
-    <string name="danar_useextended_title">Używaj przedłużonych bolusów dla &gt;200%%</string>
-    <string name="danar_bt_name_title">Urządzenie Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Zawsze używaj wartości bezwzględnych bazy</string>
     <string name="alert_dialog_storage_permission_text">Proszę uruchomić ponownie telefon lub zrestartować AndroidAPS w ustawieniach systemu telefonu \ninaczej AndroidAPS nie będzie otrzymywał logowań (ważne ze względu na śledzenie i sprawdzanie poprawności działania algorytmów)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">To urządzenie nie obsługuje białej listy optymalizacji baterii - mogą wystąpić problemy z wydajnością.</string>
     <string name="description_actions">Niektóre przyciski umożliwiające szybki dostęp do typowych funkcji</string>
-    <string name="description_careportal">Wprowadź zaawansowane wpisy w dzienniku.</string>
     <string name="description_config_builder">Konfiguracja aktywnych modułów systemu</string>
     <string name="description_objectives">Program do nauki</string>
     <string name="description_food">Wyświetla dane posiłków zdefiniowanych w Nightscout</string>
@@ -36,13 +33,10 @@
     <string name="description_profile_nightscout">Użycie profilu, który zdefiniowałeś w Nightscout</string>
     <string name="description_profile_simple">Zdefiniuj profil z tylko jednym blokiem czasowym.</string>
     <string name="description_pump_combo">Integracja z pompą Accu-Chek Combo, wymaga zainstalowania sterownika ruffy</string>
-    <string name="description_pump_dana_r">Integracja z pompą DANA R Diabecare</string>
-    <string name="description_pump_dana_r_korean">Integracja z pompą DANA R Diabetes, wersja koreańska</string>
-    <string name="description_pump_dana_r_v2">Integracja z pompą DANA R Diabecare z oprogramowaniem v2</string>
-    <string name="description_pump_dana_rs">Integracja z pompą DANA RS Diabecare</string>
     <string name="description_pump_mdi">Integracja pompy dla pacjentów podających insulinę w formie wielu zastrzyków dziennie</string>
     <string name="description_pump_virtual">Integracja z pompami, które nie posiadają jeszcze żadnego sterownika (Open Loop)</string>
     <string name="description_sensitivity_aaps">Wrażliwość jest obliczana w taki sam sposób, jak algorytm Oref0, ale możliwe jest podanie okresu z przeszłości. Minimalne wchłanianie węglowodanów jest obliczana na podstawie czasu wchłaniania max carb, określonego w ustawieniu.</string>
+    <string name="description_sensitivity_oref1">Wrażliwość oblicza się na podstawie danych z ostatnich 8 lub 24 godzin (przy użyciu danych o wyższej wrażliwości). Węglowodany (jeśli nie są wchłonięte) są skracane po upływie czasu określonego w ustawieniach. Wtyczka również oblicza UAM.</string>
     <string name="description_sensitivity_weighted_average">Wrażliwość jest obliczana jako średnia ważona z odchyleń. Nowsze wartości mają większą wagę. Minimalne wchłanianie węglowodanów jest obliczana na podstawie czasu wchłaniania max carb, określonego w ustawieniu. Algorytm ten najszybciej śledzi zmiany wrażliwości.</string>
     <string name="description_source_eversense">Pobieraj wartości BG ze spatchowanej aplikacji Eversense.</string>
     <string name="description_source_glimp">Pobieraj wartości BG z Glimp.</string>
@@ -53,13 +47,6 @@
     <string name="description_wear">Monitoruj i kontroluj AndroidAPS, korzystając z SmartWatch WearOS.</string>
     <string name="description_xdrip_status_line">Pokaż informacje o swojej pętli na watchface xDrip+.</string>
     <string name="description_sms_communicator">Zdalne sterowanie AndroidAPS za pomocą poleceń SMS.</string>
-    <string name="nsprofileview_units_label">Jednostki</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Baza</string>
-    <string name="nsprofileview_target_label">Cel</string>
-    <string name="noprofileset">NIE USTAWIONO PROFILU</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">Węglow.:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Węglow</string>
     <string name="treatments_wizard_correction_label">Korekta</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Uruchom teraz</string>
     <string name="vitualpump_label">POMPA WIRTUALNA</string>
-    <string name="pump_basebasalrate_label">Podstawowa dawka bazowa</string>
-    <string name="pump_tempbasal_label">Baza tymczasowa</string>
-    <string name="virtualpump_extendedbolus_label">Bolus Przedłużony</string>
-    <string name="pump_battery_label">Bateria</string>
-    <string name="pump_reservoir_label">Zbiornik</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Ostatnie działanie</string>
     <string name="openapsma_inputparameters_label">Parametry wejściowe</string>
@@ -95,16 +76,11 @@
     <string name="result">Rezultat</string>
     <string name="result_insulin_carbs">Wynik: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Brak danych o glukozie</string>
-    <string name="nochangerequested">Zmiana nie wymagana</string>
     <string name="openapsma_request_label">Żądanie</string>
-    <string name="rate">Wartość</string>
-    <string name="duration">Czas trwania</string>
-    <string name="reason">Powód</string>
     <string name="glucose">Glukoza</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Konfiguracja</string>
-    <string name="objectives">Zadania</string>
     <string name="overview">Przegląd</string>
     <string name="nsprofile">Profil Nightscout</string>
     <string name="simpleprofile">Prosty profil</string>
@@ -122,7 +98,6 @@
     <string name="configbuilder_general">Ogólne</string>
     <string name="configbuilder_general_description">To są główne wtyczki, które mogą okazać się użyteczne.</string>
     <string name="configbuilder_constraints_description">Które ograniczenia są zastosowane?</string>
-    <string name="days">dni</string>
     <string name="constraints">Ograniczenia</string>
     <string name="loop">Pętla</string>
     <string name="configbuilder_loop">Pętla</string>
@@ -138,7 +113,6 @@
     <string name="openapsma_disabled">Wtyczka jest wyłączona</string>
     <string name="constraints_violation">Naruszenie ograniczeń</string>
     <string name="treatmentdeliveryerror">Błąd podania bolusa</string>
-    <string name="tempbasaldeliveryerror">Błąd podania bazy tymczasowej</string>
     <string name="overview_newtempbasal_basalpercent">Wartość bazy [%]</string>
     <string name="setbasalquestion">Akceptuj nową bazę tymczasową:</string>
     <string name="overview_treatment_label">Leczenie</string>
@@ -149,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Baza</string>
     <string name="sms_basal">Baza:</string>
-    <string name="carbs">Węglow.</string>
     <string name="changeyourinput">Zmień wprowadzone dane!</string>
     <string name="configbuilder_bgsource">Źródło BG</string>
     <string name="configbuilder_bgsource_description">Skąd AndroidAPS powinien czerpać dane?</string>
@@ -166,25 +139,6 @@
     <string name="treatments_wizard_basaliob_label">Bazowa IOB</string>
     <string name="bolusconstraintapplied">Ograniczenia bolusa wprowadzone</string>
     <string name="carbsconstraintapplied">Ograniczenie stosowania węglowodanów</string>
-    <string name="careportal_bgcheck">Sprawdź BG</string>
-    <string name="careportal_announcement">Powiadomienie</string>
-    <string name="careportal_note">Notatka</string>
-    <string name="careportal_question">Pytanie</string>
-    <string name="careportal_exercise">Ćwiczenia</string>
-    <string name="careportal_pumpsitechange">Zmiana wkłucia</string>
-    <string name="careportal_cgmsensorinsert">Założenie sensora CGM</string>
-    <string name="careportal_cgmsensorstart">Uruchomienie sensora CGM</string>
-    <string name="careportal_insulincartridgechange">Zmiana zasobnika insuliny</string>
-    <string name="careportal_profileswitch">Zmiana profilu</string>
-    <string name="careportal_snackbolus">Bolus na przekąskę</string>
-    <string name="careportal_mealbolus">Bolus na posiłek</string>
-    <string name="careportal_correctionbolus">Bolus korekcyjny</string>
-    <string name="careportal_combobolus">Bolus złożony</string>
-    <string name="careportal_tempbasalstart">Dawka Tymczasowa Start</string>
-    <string name="careportal_tempbasalend">Dawka Tymczasowa Koniec</string>
-    <string name="careportal_carbscorrection">Węglow. korekcyjne</string>
-    <string name="careportal_openapsoffline">OpenAPS Rozłączony (Offline)</string>
-    <string name="careportal_newnstreatment_eventtype">Typ zdarzenia</string>
     <string name="careportal_newnstreatment_other">Inne</string>
     <string name="careportal_newnstreatment_meter">Miernik</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -205,7 +159,7 @@
     <string name="overview_extendedbolus_button">Bolus Przedłużony</string>
     <string name="configbuilder_nightscoutversion_label">Wersja Nightscout:</string>
     <string name="missing_carbs">Brakuje %1$dg</string>
-    <string name="exported">Właściwości wyeksportowane</string>
+    <string name="exported">Ustawienia wyeksportowane</string>
     <string name="export_to">Eksportuj ustawienia do</string>
     <string name="import_from">Importuj ustawienia z</string>
     <string name="setting_imported">Ustawienia zaimportowane</string>
@@ -216,35 +170,50 @@
     <string name="openapsma_maxbasal_summary">Wartość określona jako Maksymalna Baza (max basal) w OpenAPS</string>
     <string name="openapsma_maxiob_title">Maksymalna bazowa IOB, którą OpenAPS może dostarczyć [U]</string>
     <string name="openapsma_maxiob_summary">Ta wartość jest nazywana Max IOB w OpenAPS\nTo jest maksymalna wartość insuliny w [U], którą APS może dostarczyć w danej chwili.</string>
-    <string name="dismiss">ODRZUĆ</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Łączę</string>
-    <string name="connected">Połączono</string>
-    <string name="disconnected">Rozłączono</string>
-    <string name="danar_pump_settings">Ustawienia pompy Dana</string>
+    <string name="password_preferences_encrypt_prompt">Zostaniesz poproszony o hasło główne, które będzie użyte do szyfrowania wyeksportowanych preferencji.</string>
+    <string name="password_preferences_decrypt_prompt">Zostaniesz poproszony o hasło główne, które jest potrzebne do odszyfrowania zaimportowanych preferencji.</string>
+    <string name="preferences_export_canceled">Eksportowanie anulowane! Ustawienia NIE zostały wyeksportowane!</string>
+    <string name="preferences_import_canceled">Import anulowany! Ustawienia NIE zostały zaimportowane!</string>
+    <string name="check_preferences_before_import">Proszę sprawdzić ustawienia przed importem:</string>
+    <string name="check_preferences_cannot_import">Ustawienia nie mogą być zaimportowane!</string>
+    <string name="check_preferences_dangerous_import">Ustawienia nie powinny być importowane!</string>
+    <string name="check_preferences_details_btn">Wyjaśnij problemy z importem…</string>
+    <string name="check_preferences_details_title">Szczegóły problemów z importem</string>
+    <string name="check_preferences_import_btn">Importuj</string>
+    <string name="check_preferences_import_anyway_btn">Importuj mimo to (NIEBEZPIECZNE!)</string>
+    <string name="metadata_warning_different_flavour">Ustawienia zostały utworzone z innym wariantem AAPS (%1$s) gdy masz %2$s.\n\nNiektóre ustawienia mogą być brakujące lub nieprawidłowe - po zaimportowaniu proszę sprawdzić i zaktualizować swoje ustawienia.</string>
+    <string name="metadata_warning_different_device">Preferencje zostały utworzone na innym urządzeniu. Import ze starszego/innego telefonu jest OK, ale upewnij się, że importowane preferencje są poprawne!</string>
+    <string name="metadata_warning_outdated_format">Używasz przestarzałego formatu ze starych wersji AAPS, który nie jest bezpieczny! Używaj go tylko w ostateczności, jeśli nie masz eksportu w aktualnym formacie JSON.</string>
+    <string name="metadata_warning_old_export">Zaimportowane ustawienia mają już %1$s dni! Może masz bardziej aktualne ustawienia lub wybierzesz niewłaściwy plik? Pamiętaj o regularnym eksporcie ustawień!</string>
+    <string name="metadata_warning_date_format">Niepoprawny format daty i czasu!</string>
+    <string name="metadata_label_format">Format pliku</string>
+    <string name="metadata_label_created_at">Data utworzenia</string>
+    <string name="metadata_label_aaps_version">Wersja AAPS</string>
+    <string name="metadata_label_aaps_flavour">Wariant kompilacji</string>
+    <string name="metadata_label_device_name">Eksportowanie nazwy urządzenia pacjenta</string>
+    <string name="metadata_label_device_model">Eksportowanie modelu urządzenia</string>
+    <string name="metadata_label_encryption">Szyfrowanie pliku</string>
+    <string name="metadata_format_old">Stary format eksportu</string>
+    <string name="metadata_format_new">Nowy zaszyfrowany format</string>
+    <string name="metadata_format_debug">Nowy format testowy (niezaszyfrowany)</string>
+    <string name="metadata_format_other">Nieznany format eksportu</string>
+    <string name="prefdecrypt_settings_tampered">Plik ustawień został zmieniony</string>
+    <string name="prefdecrypt_settings_secure">Plik ustawień jest bezpieczny</string>
+    <string name="prefdecrypt_settings_unencrypted">Używanie niebezpieczne, niezaszyfrowany format ustawień</string>
+    <string name="prefdecrypt_wrong_json">Błąd w formacie JSON, brak wymaganego pola (format, zawartość, metadane lub zabezpieczenia)</string>
+    <string name="prefdecrypt_wrong_password">Błąd odszyfrowania, podane hasło nie może odszyfrować pliku</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Brak sumy kontrolnej pliku (hash), nie można zweryfikować autentyczności ustawień!</string>
+    <string name="prefdecrypt_issue_modified">Plik został zmodyfikowany po eksporcie!</string>
+    <string name="prefdecrypt_issue_parsing">Błąd odszyfrowania, nie udało się przetworzyć ustawień!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Błąd deszyfrowania, podane hasło jest niepoprawne lub plik ustawień został zmodyfikowany! Może się zdarzyć, że zaimportowany plik został wyeksportowany z innym hasłem głównym.</string>
+    <string name="prefdecrypt_issue_wrong_format">Brak konfiguracji szyfrowania, format ustawień jest nieprawidłowy!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Nieobsługiwany lub nieokreślony algorytm szyfrowania!</string>
     <string name="end_user_license_agreement">Umowa licencyjna użytkownika końcowego</string>
     <string name="end_user_license_agreement_text">NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM \"W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE\" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!!</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM I WYRAŻAM ZGODĘ</string>
     <string name="save">ZACHOWAJ</string>
-    <string name="nobtadapter">Nie odnaleziono urządzenia bluetooth</string>
-    <string name="devicenotfound">Nie odnaleziono wybranego urządzenia</string>
-    <string name="connectionerror">Błąd połączenia z pompą</string>
-    <string name="danar_iob_label">IOB w pompie</string>
-    <string name="danar_dailyunits">Jednostki dzienne</string>
-    <string name="pump_lastbolus_label">Ostatni bolus</string>
-    <string name="hoursago">%1$.1fh temu</string>
-    <string name="danar_invalidinput">Błędne dane wejściowe</string>
-    <string name="danar_valuenotsetproperly">Wartość ustawiona nieprawidłowo</string>
     <string name="reloadprofile">Załaduj profil ponownie</string>
-    <string name="danar_viewprofile">Zobacz profil</string>
-    <string name="enacted">Wykonane</string>
-    <string name="comment">Komentarz</string>
-    <string name="success">Sukces</string>
-    <string name="percent">Procent</string>
-    <string name="absolute">Całkowity</string>
-    <string name="canceltemp">Wyłącz bazę tymczasową</string>
     <string name="smscommunicator">Komunikator SMS</string>
-    <string name="waitingforpumpresult">Oczekiwanie na wynik</string>
     <string name="smscommunicator_allowednumbers">Dozwolone numery telefonów</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Aby dostarczyć bolus %1$.2fU wprowadź kod %2$s</string>
@@ -265,54 +234,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Cel %1$s na %2$d minut</string>
     <string name="smscommunicator_tt_set">Pomyślnie ustawiono cel %1$s na %2$d minuty</string>
     <string name="smscommunicator_tt_canceled">Pomyślnie anulowano cel tymczasowy</string>
-    <string name="bolusdelivering">Dostarczam %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Zezwalaj na komendy zdalne via SMS</string>
-    <string name="glucosetype_finger">Palec</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Ręczne</string>
-    <string name="careportal_temporarytarget">Cel tymczasowy (TT)</string>
-    <string name="careportal_temporarytargetcancel">Odrzuć Cel tymczasowy</string>
     <string name="danarprofile">Ustawienia profilu DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Czas aktywności insuliny</string>
-    <string name="failedupdatebasalprofile">Nieudane uaktualnienie profilu bazy</string>
-    <string name="danar_historyreload">Załaduj ponownie</string>
     <string name="uploading">Wgrywanie</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">Bolus DS</string>
-    <string name="danar_debolus">Bolus DE</string>
-    <string name="danar_error">błąd</string>
-    <string name="danar_refill">napełnij</string>
-    <string name="danar_basalhour">godzina bazy</string>
-    <string name="danar_glucose">glukoza</string>
-    <string name="danar_carbohydrate">węglowodany</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Wszystkie %1$d rekordy przesłane</string>
-    <string name="danar_sbolus">Bolus S</string>
-    <string name="danar_history_alarm">Alarmy</string>
-    <string name="danar_history_basalhours">Godziny Bazy</string>
-    <string name="danar_history_bolus">Bolusy</string>
-    <string name="danar_history_carbohydrates">Węglowodany</string>
-    <string name="danar_history_dailyinsulin">Insulina dzienna</string>
-    <string name="danar_history_errors">Błędy</string>
-    <string name="danar_history_glucose">Glukoza</string>
-    <string name="danar_history_refill">Napełnij</string>
-    <string name="danar_history_syspend">Wstrzymaj</string>
-    <string name="danar_history_connectingfor">Łączenie przez %1$d s</string>
-    <string name="danar_password_title">Hasło pompy</string>
-    <string name="wrongpumppassword">Błędne hasło pompy!</string>
-    <string name="pumpbusy">Pompa jest zajęta</string>
-    <string name="overview_bolusprogress_delivered">Dostarczone</string>
-    <string name="overview_bolusprogress_stoped">Zatrzymane</string>
     <string name="bolusstopped">Bolus zatrzymany</string>
     <string name="bolusstopping">Zatrzymuję bolus</string>
-    <string name="occlusion">Zatkanie</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">NACIŚNIĘTY STOP</string>
-    <string name="waitingforpump">Czekam na pompę</string>
-    <string name="overview_bolusprogress_goingtodeliver">Zamierzam dostarczyć %1$.2fU</string>
-    <string name="youareonallowedlimit">Osiągnąłeś dozwolony limit</string>
-    <string name="noprofileselected">Nie wybrano profilu</string>
     <string name="smscommunicator_loophasbeendisabled">Pętla (Loop) została wyłączona</string>
     <string name="smscommunicator_loophasbeenenabled">Pętla (Loop) została włączona</string>
     <string name="smscommunicator_loopisdisabled">Pętla (Loop) jest wyłączona</string>
@@ -352,11 +280,9 @@
     <string name="mealbolus">Posiłek</string>
     <string name="correctionbous">Korekta</string>
     <string name="actions">Akcje</string>
-    <string name="androidaps_start">AndroidAPS uruchomiony</string>
     <string name="ns_upload_only">NS tylko przesył. (wyłączona synch.)</string>
     <string name="ns_upload_only_summary">NS tylko przesył. Nie skuteczne na SGV o ile ni jest wykorzystywane lokalne źródło danych jak xDrip. Nie skuteczne na Profilach gdy profil z NS jest wykorzystywany.</string>
     <string name="pumpNotInitialized">Pompa nie zainicjowana!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pompa nie zainicjowana, profil nie ustawiony!</string>
     <string name="primefill">Rozpocznij/Wypełnij</string>
     <string name="fillwarning">Proszę upewnij się, że ilość wypełnienia odpowiada ilości właściwej dla twojego wkłucia!</string>
     <string name="othersettings_title">Inne</string>
@@ -366,8 +292,6 @@
     <string name="button3">Przycisk 3</string>
     <string name="units_colon">Jednostki:</string>
     <string name="units">Jednostki</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">DIA</string>
     <string name="target_range">Zakres docelowy:</string>
     <string name="prefs_range_title">Zakres do wizualizacji (na wykresie)</string>
@@ -377,17 +301,7 @@
     <string name="wear">Oprogramowanie Wear (Smartwatch)</string>
     <string name="resend_all_data">Prześlij ponownie wszystkie dane</string>
     <string name="open_settings_on_wear">Otwórz ustawienia dla Wear</string>
-    <string name="pumperror">Błąd pompy</string>
-    <string name="lowbattery">Niski stan baterii</string>
-    <string name="pumpshutdown">Wyłączenie pompy</string>
-    <string name="batterydischarged">Bateria pompy rozładowana</string>
-    <string name="danarkoreanpump">DanaR wersja Koreańska</string>
     <string name="basal_rate">Dawka bazowa:</string>
-    <string name="profile_set_failed">Ustawienie profilu bazy nie powiodło się</string>
-    <string name="profile_set_ok">Profil bazowy w pompie uaktualniony</string>
-    <string name="danar_disableeasymode">Wyłącz tryb EasyUI w pompie</string>
-    <string name="danar_enableextendedbolus">Uaktywnij bolusy przedłużone w pompie</string>
-    <string name="danar_switchtouhmode">Zmień tryb z U/d na U/h w pompie</string>
     <string name="basalvaluebelowminimum">Wartość bazy poniżej minimum. Nie ustawiono profilu!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Ostatnia BG:</string>
@@ -395,7 +309,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Nadchodzące powiadomienia</string>
     <string name="old_data">NIEAKTUALNE DANE</string>
-    <string name="minago">%1$d min temu</string>
     <string name="sms_minago">%1$dmin temu</string>
     <string name="localprofile">Lokalny Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -411,41 +324,22 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Ćwiczenia</string>
     <string name="removerecord">Usuń wpis</string>
-    <string name="danar_stats">DanaR Statystyki</string>
-    <string name="danar_stats_cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
-    <string name="danar_stats_expweight">Ważona wykładniczo TDD</string>
-    <string name="danar_stats_basalrate">Baza</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Stosunek</string>
-    <string name="danar_stats_amount_days"># Dni</string>
-    <string name="danar_stats_weight">Waga</string>
-    <string name="danar_stats_warning_Message">Możliwa niedokładność jeśli używasz bolusów do wypełnień!</string>
-    <string name="danar_stats_olddata_Message">Stare dane, naciśnij \"RELOAD\"</string>
-    <string name="danar_stats_tbb">Suma dzienna bazy (TBB)</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inicjuje ...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VPUMP</string>
     <string name="profileviewer_shortname">NSPROFIL</string>
     <string name="treatments_shortname">TREAT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Skrócone tytuły kart</string>
     <string name="always_use_shortavg">Zawsze używaj krótkiej średniej delty zamiast prostej delta</string>
     <string name="always_use_shortavg_summary">Użyteczne, jeżeli dane z niefiltrowanego źródła jak xDrip mają rozrzut.</string>
-    <string name="advancedsettings_title">Ustawienia zaawansowane</string>
-    <string name="danar_model">Model: %1$02X Protocol: %2$02X Code: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Wartość domyślna: 3 To jest kluczowy współczynnik bezpieczeństwa OpenAPS. Ogranicza dawki bazowe do 3x twojej największej dawki bazowej. Prawdopodobnie nie będziesz musiał tego zmieniać, ale powinieneś być świadomy tego, co się rozumie przez “3x max dzienna; 4x aktualna” dla współczynników bezpieczeństwa.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Wartość domyślna: 4 To jest drugi kluczowy współczynnik bezpieczeństwa OpenAPS, i druga wartość z “3x max dzienna; 4x aktualna”. To oznacza, że Twoja dawka bazowa niezależnie od maksymalnej bazy ustawionej na pompie nie może być większa niż ta ustawiona wartość razy twoja aktualna dawka bazowa. To ma na celu przestrzec ludzi przed ustawieniem zbyt wysokiej dawki maksymalnej przed zrozumieniem jak działa algorytm. Ponownie, wartość domyślna to 4x; większość ludzi nie będzie potrzebowała tego zmienić i raczej będą potrzebować dostosować inne ustawienia, jeśli czują, że zbliżają się do współczynnika bezpieczeństwa.</string>
@@ -464,18 +358,9 @@
     <string name="smscommunicator_calibrationsent">Kalibracja wysłana. Odbiór musi być dozwolony w xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip nie odbiera kalibracji</string>
     <string name="pumpsuspended">Pompa wstrzymana</string>
-    <string name="gettingpumpstatus">Uzyskiwanie statusu pompy</string>
-    <string name="settingtempbasal">Ustawianie bazy tymczasowej</string>
-    <string name="stoppingtempbasal">Zatrzymywanie bazy tymczasowej</string>
-    <string name="settingextendedbolus">Ustawianie bolusa przedłużonego</string>
-    <string name="stoppingextendedbolus">Zatrzymywanie bolusa przedłużonego</string>
-    <string name="updatingbasalrates">Uaktualnianie dawek bazowych</string>
-    <string name="disconnecting">Rozłączanie</string>
     <string name="executing">Wykonywanie</string>
     <string name="virtualpump_settings">Ustawienia pompy wirtualnej</string>
     <string name="virtualpump_uploadstatus_title">Przesyłaj status do NS</string>
-    <string name="wrongpassword">Złe hasło</string>
-    <string name="approachingdailylimit">Zbliżam się do dziennego limitu insuliny</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -499,13 +384,15 @@
     <string name="wear_detailedIOB_title">Pokaż szczegóły IOB</string>
     <string name="wear_detailedIOB_summary">Rozłóż IOB na bolus i IOB bazy na zegarku</string>
     <string name="nosuccess">nie udało się - proszę sprawdzić telefon</string>
-    <string name="notavailable">Niedostępne</string>
     <string name="patientage">Wiek pacjenta</string>
     <string name="child">Dziecko</string>
     <string name="teenage">Nastolatek</string>
     <string name="adult">Osoba dorosła</string>
     <string name="resistantadult">Osoba dorosła insulino odporna</string>
     <string name="patientage_summary">Proszę wybierz wiek pacjenta w celu ustawienia wartości limitów bezpieczeństwa</string>
+    <string name="patient_name">Nazwa pacjenta</string>
+    <string name="patient_name_summary">Proszę podać nazwę pacjenta lub pseudonim w celu rozróżnienia pomiędzy różnymi konfiguracjami</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Użytkownik</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s potrzebuję wyłączenia z optymalizacji baterii, w celu zapewnienia poprawnego działania</string>
     <string name="loopsuspended">Pętla wstrzymana</string>
@@ -532,8 +419,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Wyślij start app do NS</string>
     <string name="restartingapp">Zamykanie aplikacji w celu wprowadzenia ustawień.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">Jakiego typu insuliny używasz?</string>
     <string name="fastactinginsulin">Szybko działająca Insulina</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -556,9 +441,6 @@
     <string name="statuslights_bat_critical">Próg ostrzeżenia o krytycznym poziomie baterii [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Ostatnie połączenie</string>
-    <string name="danar_bluetooth_status">Status Bluetooth</string>
     <string name="nav_about">O programie</string>
     <string name="smscommunicator_missingsmspermission">Brak uprawnień SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Brak uprawnień do wykrywania stanu telefonu</string>
@@ -570,17 +452,12 @@
     <string name="ns_noupload">Brak przesyłania do NS</string>
     <string name="ns_noupload_summary">Wszystkie dane wysyłane do NS są odrzucane. AAPS jest podłączony do NS, ale nie dokonuje 
  żadnych zmian w NS</string>
-    <string name="basal_step">Krok bazy</string>
-    <string name="bolus_step">Krok bolusa</string>
     <string name="overview_extendedbolus_cancel_button">Anuluj bolus przedłużony </string>
     <string name="careportal_sensorage_label">Czas sensora</string>
     <string name="careportal_canulaage_label">Czas wkłucia</string>
     <string name="careportal_insulinage_label">Czas insuliny</string>
-    <string name="hours">godzin</string>
-    <string name="invalidprofile">Nieprawidłowy profil !!!</string>
     <string name="doprofileswitch">Zmień profil</string>
     <string name="careportal_pbage_label">Czas baterii pompy</string>
-    <string name="careportal_pumpbatterychange">Zmiana baterii pompy</string>
     <string name="ns_alarmoptions">Opcje alarmu</string>
     <string name="nsalarm_urgenthigh">Uwaga wysoki</string>
     <string name="nsalarm_high">Wysoki</string>
@@ -604,7 +481,6 @@
     <string name="absorptionsettings_title">Ustawienia wchłaniania</string>
     <string name="absorption_maxtime_title">Maks. czas wchłaniania posiłku [h]</string>
     <string name="absorption_maxtime_summary">Oczekiwany czas w godzinach, w którym wszystkie węglowodany zostają wchłonięte</string>
-    <string name="danar_visualizeextendedaspercentage_title">Wizualizacja bolusa przedłużonego jako %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -629,7 +505,6 @@
     <string name="careportal_pump_label">POMPA</string>
     <string name="careportal_newnstreatment_duration_min_label">Czas trwania [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Włącz UAM</string>
     <string name="enablesmb">Włącz SMB</string>
     <string name="enablesmb_summary">Używaj SMB (Super Mikro Bolusów) zamiast bazy tymczasowej dla szybszego działania </string>
@@ -641,23 +516,7 @@
     <string name="ultrarapid_oref">Ultra-Szybki Oref</string>
     <string name="dia_too_short">DIA %1$f zbyt krótki - przyjmuję %2$f w zamian!</string>
     <string name="activate_profile">Aktywuj profil</string>
-    <string name="date">Data</string>
     <string name="invalid">NIEPRAWIDŁOWY</string>
-    <string name="waitingforpairing">Oczekiwanie na pompe na sparowanie</string>
-    <string name="pairingok">Parowanie OK</string>
-    <string name="pairingtimedout">Przekroczono limit czasu parowania</string>
-    <string name="pairing">Parowanie</string>
-    <string name="danars_nodeviceavailable">Urządzenie nie zostało znalezione do tej pory</string>
-    <string name="emptyreservoir">Pusty zasobnik</string>
-    <string name="bloodsugarmeasurementalert">Alarm pomiaru poziomu cukru</string>
-    <string name="remaininsulinalert">Pozostała ilość insuliny</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Wybrana pompa</string>
-    <string name="pairpump">Sparuj nową pompę</string>
-    <string name="bolusspeed">Szybkość podawania bolusa</string>
-    <string name="danar_setbasalstep001">Ustaw krok bazy na 0.01 U/h</string>
-    <string name="serialnumber">Numer seryjny</string>
     <string name="careportal_newnstreatment_percentage_label">Procent</string>
     <string name="careportal_newnstreatment_timeshift_label">Zmiana czasu</string>
     <string name="default_temptargets">Domyślne tymczasowe wartości docelowe</string>
@@ -667,32 +526,18 @@
     <string name="activity_target">Ćwiczenia cel</string>
     <string name="hypo_duration">Hipo czas trwania</string>
     <string name="hypo_target">Hipo cel</string>
-    <string name="danar_history_prime">Wypełnianie</string>
-    <string name="gettingextendedbolusstatus">Status otrzymywania bolusa przedłużonego</string>
-    <string name="gettingbolusstatus">Status otrzymywania bolusa</string>
-    <string name="gettingtempbasalstatus">Status otrzymywania tymczasowej bazy</string>
-    <string name="gettingpumpsettings">Otrzymywanie ustawień pompy</string>
-    <string name="gettingpumptime">Otrzymywanie czasu pompy</string>
     <string name="reuse">użyj ponownie</string>
     <string name="wearcontrol_title">Sterowanie z zegarka</string>
     <string name="wearcontrol_summary">Ustawiaj wartości docelowe i wprowadzaj leczenie z zegarka.</string>
-    <string name="connectiontimedout">Przekroczono limit czasu połączenia</string>
     <string name="food">Posiłek</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<brak>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Bi</string>
     <string name="shortfat">Tł</string>
     <string name="active"><![CDATA[<Aktywny>]]></string>
-    <string name="waitingforestimatedbolusend">Oczekuję na zakończenie bolusa. Pozostało %1$d sec.</string>
-    <string name="processinghistory">Przetwarzanie zdarzenia</string>
-    <string name="startingbolus">Rozpoczynam podawanie bolusa</string>
     <string name="executingrightnow">Polecenie jest teraz wykonywane</string>
-    <string name="pumpdrivercorrected">Poprawiono sterownik pompy</string>
     <string name="pump_unreachable">Pompa nieosiągalna</string>
     <string name="missed_bg_readings">Pominięte odczyty BG</string>
     <string name="raise_notifications_as_android_notifications">Użyj powiadomień systemowych dla alertów i powiadomień</string>
@@ -702,22 +547,21 @@
     <string name="pump_unreachable_threshold">Pompa nieosiągalna próg [min]</string>
     <string name="urgent_alarm">Pilny alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Wyłącza bluetooth telefonu na jedną sekundę, jeśli nie jest możliwe połączenie z pompą. Może to pomóc w niektórych telefonach, w których blokuje się bluetooth.</string>
     <string name="eversense">Apka Eversense (spatchowana)</string>
     <string name="dexcomg5_nsupload_title">Przekaż dane BG do NS</string>
     <string name="bgsource_upload">Ustawienia wysyłania wartości BG (poziomów cukru)</string>
     <string name="wear_detailed_delta_title">Pokaż szczegółowe delta</string>
     <string name="wear_detailed_delta_summary">Pokaż deltę z jednym więcej miejscem dziesiętnym</string>
+    <string name="smbinterval_summary">Jak często SMB zostanie podane w min.</string>
     <string name="smbmaxminutes">SMB max. minut</string>
     <string name="smbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB</string>
-    <string name="unsupportedfirmware">Nieobsługiwane oprogramowanie pompy</string>
+    <string name="uamsmbmaxminutes">Maksymalna liczba minut UAM SMB</string>
+    <string name="uamsmbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB dla UAM</string>
+    <string name="carbsReqThreshold">Próg sugerowania węglowodanów</string>
+    <string name="carbsReqThreshold_summary">Kiedy sugeruje się węglowodany, ile węglowodanów spowoduje powiadomienie</string>
     <string name="dexcomg5_xdripupload_title">Prześlij dane BG do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Wartość bazy zastąpiona maksymalną obsługiwaną wartością: %1$s</string>
     <string name="overview_editquickwizard_usebg">Obliczenia BG</string>
     <string name="overview_editquickwizard_usebolusiob">Obliczenia Bolus IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Obliczenia IOB</string>
@@ -735,8 +579,6 @@
     <string name="closedmodeenabled">Tryb zamknięty włączony</string>
     <string name="maxiobset">Maks. IOB ustawione poprawnie</string>
     <string name="hasbgdata">BG dostępne z wybranego źródła</string>
-    <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
-    <string name="zerovalueinprofile">Nieprawidłowy profil: %1$s</string>
     <string name="combo_programming_bolus">Programowanie pompy do podawania bolusa</string>
     <string name="combo_refresh">Odśwież</string>
     <string name="combo_pump_state_label">Stan</string>
@@ -757,7 +599,6 @@
     <string name="bolus_frequency_exceeded">W ciągu ostatnich dwóch minut zażądano bolusa o tej samej wielkości. Z uwagi na zapobieganie przypadkowym podwójnym bolusom i ochronę przed błędami jest to zabronione.</string>
     <string name="combo_pump_connected_now">Teraz</string>
     <string name="combo_activity_reading_pump_history">Sczytuję historię pompy</string>
-    <string name="danar_history">Historia pompy</string>
     <string name="combo_activity_setting_basal_profile">Wczytuje profil bazowy</string>
     <string name="combo_pump_cartridge_low_warrning">Poziom zasobnika pompy jest niski</string>
     <string name="combo_pump_battery_low_warrning">Poziom baterii pompy jest niski</string>
@@ -776,8 +617,6 @@
     <string name="extendedbolusdeliveryerror">Błąd dostarczania bolusa przedłużonego</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">temu</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min.</string>
     <string name="enablesmbalways">Włącz SMB (Super Mikro Bolusy) zawsze</string>
     <string name="enablesmbalways_summary">Włącz SMB (Super Mikro Bolusy) zawsze, niezależnie od bolusów. Możliwe jedynie ze źródłem BG (poziomu cukru) z dobrym filtrowaniem, jak aplikacja G5</string>
     <string name="enablesmbaftercarbs">Włącz SMB po węglowodanach</string>
@@ -788,8 +627,6 @@
     <string name="enablesmbwithtemptarget_summary">Włącz SMB gdy tymczasowy poziom docelowy (TT) jest aktywny (TT WkrótcePosiłek, TT ćwiczenia)</string>
     <string name="enablesmbwithhightemptarget">Włącz SMB z wysokim tymczasowym poziomem docelowym</string>
     <string name="enablesmbwithhightemptarget_summary">Włącz SMB gdy wysoki tymczasowy poziom docelowy jest aktywny (TT ćwiczenia)</string>
-    <string name="let_temp_basal_run">Pozwól na działanie bazy tymczasowej</string>
-    <string name="mute">Wycisz</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Węglowod.</string>
     <string name="overview_buttons_selection">Przyciski</string>
@@ -831,7 +668,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Uruchomiona jest wersja dev. Zamknięta pętla jest wyłączona.</string>
     <string name="engineering_mode_enabled">Tryb Inżynierski włączony</string>
     <string name="not_eng_mode_or_release">Tryb inżynierski nie włączony i nie pracuje wersja \"kandydat do wydania\" (RC)</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Wczytuje profil bazowy</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Historia pompy zmieniła się po wykonaniu obliczenia bolusa. Bolus nie został dostarczony. Proszę, przelicz ponownie, jeśli wciąż potrzebujesz bolusa.</string>
     <string name="combo_error_updating_treatment_record">Bolus został pomyślnie dostarczony, ale dodanie wpisu leczenia nie powiodło się. Może się to zdarzyć, jeśli w ciągu ostatnich dwóch minut podano dwa małe bolusy o tej samej wielkości. Sprawdź historię pompy i leczenie i użyj PortaluOpieki, aby dodać brakujące wpisy. Make sure not to add any entries for the exact same minute and same amount.</string>
@@ -854,15 +690,10 @@
     <string name="smbdisabledinpreferences">SMB wyłączone w ustawieniach</string>
     <string name="uamdisabledinpreferences">UAM wyłączone w ustawieniach</string>
     <string name="uamdisabledoref1notselected">UAM jest wyłączone ponieważ zależy od wtyczki wrażliwości Oref1</string>
-    <string name="limitingbasalratio">Ograniczam maks. dawkę bazową do %1$.2f U/h z uwagi na %2$s</string>
-    <string name="pumplimit">ograniczenie pompy</string>
-    <string name="itmustbepositivevalue">wartość musi być dodatnia</string>
     <string name="maxbasalmultiplier">mnożnik maksymalnej dawki bazowej</string>
     <string name="maxdailybasalmultiplier">mnożnik maksymalnej dziennej dawki bazowej</string>
     <string name="smb_frequency_exceeded">Bolus został podany w ciągu ostatnich 3 minut, opuszczam SMB</string>
     <string name="basal_set_correctly">Baza ustawiona prawidłowo</string>
-    <string name="limitingpercentrate">Ograniczam maksymalną wartość w procentach do %1$d%% z uwagi na %2$s</string>
-    <string name="limitingbolus">Ograniczam bolus do %1$.1f U z uwagi na %2$s</string>
     <string name="limitingextendedbolus">Ograniczam bolus do %1$.1f U z uwagi na %2$s</string>
     <string name="limitingmaxiob">Ograniczam max IOB do %1$.1f U z uwagi na %2$s</string>
     <string name="limitingcarbs">Ograniczam węglow. do %1$d g z uwagi na %2$s</string>
@@ -877,7 +708,6 @@
     <string name="smbnotallowedinopenloopmode">SMB nie dozwolone w trybie otwartej pętli</string>
     <string name="food_short">Posiłek</string>
     <string name="reset">ponowne uruchomienie</string>
-    <string name="waitingfortimesynchronization">Oczekiwanie na synchronizację czasu (%1$d sec)</string>
     <string name="loopdisconnectedfor">Odłączony (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Maksymalna, całkowita IOB, której OpenAPS nie może przekroczyć [U]</string>
     <string name="openapssmb_maxiob_summary">Ta wartość jest nazywana Max IOB w OpenAPS\nOpenAPS nie poda więcej insuliny jeżeli obecna IOB jest większa niż ta wartość</string>
@@ -893,7 +723,6 @@
     <string name="nav_setupwizard">Kreator konfiguracji</string>
     <string name="setupwizard_finish">ZAKOŃCZ</string>
     <string name="setupwizard_language_prompt">Wybierz swój język</string>
-    <string name="boluserrorcode">Zadano: %1$.2fU Dostarczono: %2$.2fU Kod błędu: %3$s</string>
     <string name="firstinsulinincrement">Pierwszy stopień przyrostu insuliny</string>
     <string name="secondinsulinincrement">Drugi stopień przyrostu insuliny</string>
     <string name="thirdinsulinincrement">Trzeci stopień przyrostu insuliny</string>
@@ -916,7 +745,6 @@
     <string name="virtualpump_type">Pompa wirtualna</string>
     <string name="virtualpump_definition">Definicja Pompy</string>
     <string name="virtualpump_pump_def">Bolus: Krok =%1$s\nBolus Przedłużony: [krok =%2$s, czas trwania =%3$smin -%4$sh] \nBasal: krok =%5$s\nTBR: %6$s (przez %7$s), czas trwania =%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">*Tylko wartości dyskretne, nie zakresy są wspierane jako dawki bazowe/bolusy w pompie wirtualnej.</string>
     <string name="ns_autobackfill_title">Automatycznie uzupełnij BG</string>
     <string name="wear_wizard_settings">Ustawienia kreatora</string>
     <string name="wear_wizard_settings_summary">Obliczenia uwzględnione w wynikach kreatora:</string>
@@ -941,27 +769,12 @@
     <string name="startobjective">Rozpocznij swoje pierwsze Zadanie</string>
     <string name="permission">Uprawnienia</string>
     <string name="askforpermission">Zapytaj o uprawnienia</string>
+    <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
     <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji, aby przeprowadzić skan BT</string>
     <string name="needstoragepermission">Aplikacja wymaga dostępu do magazynu plików, aby móc przechować pliki logów</string>
     <string name="request">Żądanie</string>
     <string name="insulinsourcesetup">Skonfiguruj wtyczkę insuliny</string>
     <string name="exit">Wyjście</string>
-    <string name="danar_useroptions">Ustawienia użytkownika</string>
-    <string name="danar_timedisplay">Format wyświetlanego czasu</string>
-    <string name="danar_buttonscroll">Przycisk przewijania</string>
-    <string name="danar_beep">Dźwięk po przyciśnięciu przycisku</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Dźwięk</string>
-    <string name="danar_pumpalarm_vibrate">Wibracja</string>
-    <string name="danar_pumpalarm_both">Obie opcje</string>
-    <string name="danar_screentimeout">LCD na czas [sekund]</string>
-    <string name="danar_backlight">Podświetlenie na czas [sekund]</string>
-    <string name="danar_glucoseunits">Jednostki glukozy</string>
-    <string name="danar_shutdown">Wyłączenie [godzin]</string>
-    <string name="danar_lowreservoir">Niska zawartość zbiornika [Jednostki]</string>
-    <string name="danar_saveuseroptions">Zapisz ustawienia w pompie</string>
-    <string name="option_on">Włącz</string>
-    <string name="option_off">Wyłącz</string>
     <string name="open_navigation">Otwórz menu</string>
     <string name="close_navigation">Zamknij menu</string>
     <string name="nav_plugin_preferences">Konfiguracja wtyczki</string>
@@ -975,15 +788,19 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Zwiększona wrażliwość dla tymczasowego celu > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Niski tymczasowy cel zmniejszy wrażliwość</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Zmniejszona wrażliwość dla tymczasowego celu < 100]]></string>
+    <string name="resistance_lowers_target_title">Oporność na działanie insuliny obniża cel</string>
+    <string name="resistance_lowers_target_summary">Po wykryciu oporności obniża się docelowy poziom cukru</string>
+    <string name="sensitivity_raises_target_title">Wrażliwość podnosi docelowy poziom glukozy</string>
+    <string name="sensitivity_raises_target_summary">Po zwiększeniu wrażliwości zwiększ docelowy poziom glukozy</string>
     <string name="combo_invalid_setup">Nieprawidłowa konfiguracja pompy, sprawdź dokumentację i zweryfikuj, czy menu Quick Info nazwano QUICK INFO za pomocą oprogramowania konfiguracyjnego 360.</string>
     <string name="custom">Niestandardowe</string>
-    <string name="largetimedifftitle">Duża Różnica Czasu</string>
-    <string name="largetimediff">Duża różnica czasu:\nCzas w pompie jest wyłączony przez więcej niż 1,5 godziny.\n. Ustaw czas ręcznie na pompie i upewnij się, że odczyt historii pompy nie powoduje błędu.\nJeśli to możliwe, usuń historię z pompy przed zmianą czasu lub wyłącz pętlę zamkniętą do jednego DIA po ostatnim nieprawidłowym wpisie dziennika, ale co najmniej jeden DIA od teraz.</string>
     <string name="careportal_removestartedevents">Wyczyść zdarzenia \"Start AndroidAPS\"</string>
     <string name="storedsettingsfound">Znaleziono zapisane ustawienia</string>
     <string name="allow_hardware_pump_text">Uwaga: Jeśli aktywujesz połączenie z pompą inną niż wirtualna, AndroidAPS skopiuje ustawienia bazy do profilu pompy, zastępując istniejące ustawienia w niej zapisane. Upewnij się, że ustawienia bazy w AndroidAPS są poprawne. Jeśli nie jesteś pewien lub nie chcesz nadpisywać podstawowych ustawień pompy, naciśnij przycisk anuluj i połącz ponownie w innym czasie.</string>
     <string name="error_adding_treatment_title">Niekompletne dane leczenie</string>
     <string name="maintenance_settings">Ustawienia Konserwacji</string>
+    <string name="maintenance_email">Odbiorca E-maila</string>
+    <string name="maintenance_encrypt_exported_prefs">Zaszyfruj wyeksportowane ustawienia</string>
     <string name="maintenance_amount">Liczba logów do wysłania</string>
     <string name="maintenance">Konserwacja</string>
     <string name="maintenance_shortname">MAINT</string>
@@ -1002,17 +819,10 @@
     <string name="setupwizard_preferred_aps_mode">Preferowany tryb APS</string>
     <string name="treatments_wizard_total_label">Razem</string>
     <string name="calculation_short">Kalk</string>
-    <string name="handshaking">Uściskdłoni</string>
     <string name="sendlogfiles">Wyślij dzisiejsze pliki logów razem z datą i czasem do programistów. Nieoczekiwana sytuacja.</string>
-    <string name="maxbolusviolation">Przekroczenie ograniczenia maks. bolusa</string>
-    <string name="commanderror">Błąd polecenia</string>
-    <string name="speederror">Błąd prędkości</string>
-    <string name="insulinlimitviolation">Przekroczono limit insuliny</string>
     <string name="loop_openmode_min_change">Minimalna żądana zmiana [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otwarta pętla wprowadzi żądanie zmiany tylko w przypadku, gdy będzie ona większa niż ta wartość w %. Wartość domyślna to 20%</string>
-    <string name="pairfirst">Proszę sparować swoją pompę z telefonem!</string>
     <string name="searching_for_devices">Wyszukiwanie urządzeń…</string>
-    <string name="please_wait">Proszę czekać…</string>
     <string name="pairing_completed">Parowanie zakończone</string>
     <string name="code_compare">Czy kody wyświetlone na tym urządzeniu i na twojej pompie pasują?</string>
     <string name="insight_pairing">Parowanie Insight</string>
@@ -1101,7 +911,6 @@
     <string name="isequalorgreater">jest większe lub równe</string>
     <string name="isgreater">jest większe niż</string>
     <string name="isnotavailable">nie jest dostępne</string>
-    <string name="unknown">nieznany</string>
     <string name="glucoseisnotavailable">Poziom jest nieznany</string>
     <string name="glucosecomparedmgdl">Poziom %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Poziom %1$s %2$.1f %3$s</string>
@@ -1118,23 +927,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatyzacja</string>
     <string name="profile_total">== ∑ %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Prześlij zmianę sensora do NS</string>
     <string name="dexcom_lognssensorchange_summary">Podaj \"Zmiana Sensora\" do NS do NS automatycznie przy uruchomieniu sensora</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minuta</string>
-    <string name="unit_hour">godzina</string>
-    <string name="unit_day">dzień</string>
-    <string name="unit_week">tydzień</string>
-    <string name="unit_seconds">sekund</string>
-    <string name="unit_minutes">minut</string>
-    <string name="unit_hours">godzin</string>
-    <string name="unit_days">dni</string>
-    <string name="unit_weeks">tygodnie</string>
     <string name="summary_tidepool_username">Twoja nazwa użytkownika Tidepool, zwykle Twój adres e-mail</string>
     <string name="title_tidepool_username">Login nazwa użytkownika</string>
     <string name="summary_tidepool_password">Twoje hasło logowania do Tidepool</string>
@@ -1177,7 +973,6 @@
     <string name="very_old_version">bardzo stara wersja</string>
     <string name="new_version_warning">Nowa wersja dostępna co najmniej %1$d dni! Powrót do LGS (zawieszania podawania bazy przy niskim poziomie) po %2$d dniach, pętla zostanie wyłączona po %3$d dniach</string>
     <string name="twohours">2 h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Apka Dexcom (spatchowana)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Pobieraj wartości BG ze spatchowanej aplikacji Dexcom.</string>
@@ -1191,6 +986,8 @@
     <string name="exists">istnieje</string>
     <string name="notexists">nie istnieje</string>
     <string name="temptargetcompared">Cel tymczasowy %1$s</string>
+    <string name="btdevicecompared">Połączenie Bluetooth z urządzeniem %1$s %2$s</string>
+    <string name="btdevice">Połączenie z urządzeniem Bluetooth </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -1245,21 +1042,19 @@
     <string name="medtronic_pump_battery_alkaline">Alkaliczne (widok rozszerzony)</string>
     <string name="medtronic_pump_battery_lithium">Litowe (widok rozszerzony)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (widok rozszerzony)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (widok rozszerzony)</string>
     <string name="medtronic_bolus_debugging">Bolus/Leczenie - debugowanie</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SKANUJ</string>
     <string name="rileylink_scanner_scan_stop">ZATRZYMAJ</string>
     <string name="rileylink_scanner_selected_device">Wybrany</string>
     <string name="rileylink_scanner_title">Skan RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy nie obsługiwany.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth nie uruchomiony.</string>
-    <string name="location_not_found_title">Lokalizacja nie jest uruchomiona</string>
-    <string name="location_not_found_message">Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc można ją wyłączyć po udanym powiązaniu.</string>
     <string name="location_yes">Uruchom</string>
     <string name="location_no">Nie</string>
     <string name="rileylink_scanner_scanning">Skanowanie</string>
     <string name="rileylink_scanner_scanning_finished">Skanowanie zakończono</string>
     <string name="rileylink_scanner_scanning_error">Błąd skanowania: %1$d</string>
+    <string name="common_never">Nigdy</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Ustawienia</string>
     <string name="rileylink_settings_tab2">Historia</string>
@@ -1295,7 +1090,6 @@
     <string name="rileylink_error_tuneup_failed">Dostrojenie nie powiodło się</string>
     <string name="rileylink_error_pump_unreachable">Pompa nieosiągalna</string>
     <string name="rileylink_error_pod_unreachable">Pod nieosiągalny</string>
-    <string name="rileylink_error_address_not_set_short">Nie ustawiono</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1365,7 +1159,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Wprowadzono ograniczenie bolusa: %2$.2fU to %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Wykryto powolne wchłanianie węglowodanów: %2$d%% czasu. Sprawdź ponownie swoje obliczenia. COB mogły być przeszacowane przez co mogło być podane zbyt dużo insuliny !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Dostarcz tą część dawki insuliny z wyniku kalkulatora bolusa [%]</string>
     <string name="deliverpartofboluswizard">Kreator bolusa wykonuje obliczenia, ale tylko ta część obliczonej dawki insuliny jest dostarczana. Pomocne z algorytmem SMB.</string>
     <string name="loading">Wczytuję...</string>
@@ -1373,7 +1166,6 @@
     <string name="time_range">Zakres czasu</string>
     <string name="timerange_value">Czas mieści się w zakresie od %1$s do %2$s</string>
     <string name="between">Pomiędzy </string>
-    <string name="close">Zamknij</string>
     <string name="increasingmaxbasal">Zwiększanie maksymalnej wartości bazowej ponieważ ustawienia są poniżej maxymalnej wartości bazy w profilu</string>
     <string name="smscommunicator_messagebody">Błędny tekst wiadomości</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1391,8 +1183,8 @@
     <string name="common_off">Wyłącz</string>
     <string name="objectives_button_unfinish">Wyczyść skończone</string>
     <string name="objectives_button_unstart">Wyczyść rozpoczęte</string>
-    <string name="timedetection">Wykrywanie czasu</string>
     <string name="doyouwantresetstart">Czy chcesz zresetować czas rozpoczęcia zadania? Możesz utracić postępy.</string>
+    <string name="time_or_timezone_change">Zmiana czasu i/lub strefy czasowej w pompie</string>
     <string name="nopumpselected">Nie wybrano pompy</string>
     <string name="setupwizard_units_prompt">Wybierz jednostki, w których chcesz wyświetlać wartości</string>
     <string name="ns_ploadlocalprofile">Prześlij zmiany w profilu lokalnym do NS</string>
@@ -1417,7 +1209,6 @@
     <string name="nav_survey">Ankieta</string>
     <string name="invalidage">Nieprawidłowy wpis wieku</string>
     <string name="invalidweight">Nieprawidłowy wpis wagi</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Od: <b>%2$02d%%</b> Cel: <b>%3$02d%%</b> Do: <b>%4$02d%%</b>]]></string>
     <string name="average">Średnio</string>
     <string name="tdd">TDD</string>
@@ -1430,14 +1221,58 @@
     <string name="randombg_short">BG (poziom cukru)</string>
     <string name="tools">Narzędzia</string>
     <string name="show_calculation">Pokaż obliczenia</string>
-    <string name="error">Błąd</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Zdarzenie automatyzacji</string>
     <string name="alreadyset">Już ustawiono</string>
-    <string name="message">Wiadomość</string>
     <string name="clearqueueconfirm">Wyczyścić kolejkę? Wszystkie dane w kolejce zostaną utracone!</string>
+    <string name="ebstopsloop">Użycie funkcji Extended bolus spowoduje zatrzymanie trybu pętli zamkniętej na czas działania przedłużonego bolusa. Czy na pewno tego chcesz?</string>
+    <string name="closed_loop_disabled_with_eb">Zamknięta pętla wyłączona, ponieważ działa Extended Bolus (bolus przedłużony)</string>
+    <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"SprawdzanieTelefonu(em)\"</string>
+    <string name="chartmenu">Menu wykresu</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Żądany czas SMB</string>
+    <string name="loop_smbexecution_time_label">Czas wykonywania SMB</string>
+    <string name="loop_tbrrequest_time_label">Żądany czas bazy tymczasowej</string>
+    <string name="loop_tbrexecution_time_label">Czas wykonywania bazy tymczasowej</string>
+    <string name="insight_alert_notification_channel">Alarmy pompy Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">z aplikacji Uwierzytelniającej: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Włącz uwierzytelnianie</string>
+    <string name="smscommunicator_otp_enabled_summary">Uwierzytelnianie komend za pomocą haseł jednorazowych generowanych przez aplikację Google Authenticator lub podobnych aplikacji 2FA.</string>
+    <string name="smscommunicator_otp_pin">Dodatkowy PIN na końcu tokenu</string>
+    <string name="smscommunicator_otp_pin_summary">Dodatkowe cyfry, które powinny być zapamiętywane i przyklejone na końcu każdego wygenerowanego hasła jednorazowego</string>
+    <string name="smscomunicator_tab_otp_label">Ustawienia uwierzytelnienia</string>
+    <string name="smscommunicator_otp_verify_label">OTP do sprawdzenia:</string>
+    <string name="smscommunicator_otp_reset_btn">Resetuj uwierzytelnianie</string>
+    <string name="smscommunicator_otp_reset_title">Resetuj klucz uwierzytelniania</string>
+    <string name="smscommunicator_otp_reset_prompt">Czy na pewno zresetować klucz uwierzytelniający? Spowoduje to, że wszystkie aktualnie skonfigurowane uwierzytelniania będą niepoprawne i konieczne będzie ponowne ich skonfigurowanie.</string>
+    <string name="smscommunicator_otp_reset_successful">Nowy klucz uwierzytelniający został wygenerowany! Proszę użyć zaktualizowanego kodu QRCode do potwierdzenia uwierzytelniania.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Zainstaluj uwierzytelnianie</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Zeskanuj kod, aby skonfigurować kody OTP AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Sprawdź hasło jednorazowe</string>
+    <string name="smscommunicator_otp_reset_header">Resetuj uwierzytelnianie</string>
+    <string name="smscommunicator_otp_install_info">Na każdym telefonie śledzącym zainstalować aplikację uwierzytelniania obsługującą tokeny TOTP RFC 6238 Popularne darmowe aplikacje:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NIE UDOSTĘPNIAJ tego kodu online!\nUżyj go tylko do konfiguracji aplikacji uwierzytelniania na telefonach śledzących.</string>
+    <string name="smscommunicator_otp_reset_warning">Resetowanie uwierzytelniania powoduje, że wszystkie już ustawione uwierzytelnienia stają się niepoprawne (przestają działać). Trzeba będzie je jeszcze raz skonfigurować!</string>
+    <string name="onconnect">Przy połączeniu</string>
+    <string name="ondisconnect">Przy rozłączeniu</string>
+    <string name="overview_show_predictions">Prognozy poziomu</string>
+    <string name="overview_show_deviationslope">Krzywa odchylenie</string>
+    <string name="authorizationfailed">Autoryzacja nie powiodła się</string>
+    <string name="overview_show_absinsulin">Cała insulina</string>
+    <string name="master_password_summary">Hasło główne jest używane do szyfrowania kopii zapasowych i przełamania zabezpieczeń w aplikacji. Zapamiętaj je lub przechowuj w bezpiecznym miejscu.</string>
+    <string name="passwords_dont_match">Hasła się nie zgadzają!</string>
+    <string name="current_master_password">Aktualne hasło główne</string>
     <string name="statuslights">Wskaźniki stanu</string>
     <string name="statuslights_copy_ns">Kopiowanie ustawień z NS</string>
+    <string name="copyexistingvalues">Czy skopiować ustawienia NS (jeśli istnieją)?</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/validator.xml b/app/src/main/res/values-pl-rPL/validator.xml
index 3ea04e700d..bff65bf98c 100644
--- a/app/src/main/res/values-pl-rPL/validator.xml
+++ b/app/src/main/res/values-pl-rPL/validator.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="error_only_numeric_digits_allowed">Dozwolone są tylko cyfry.</string>
+    <string name="error_only_numeric_digits_range_allowed">Dozwolone są tylko cyfry w zakresie %1$s - %2$s.</string>
+    <string name="error_this_field_cannot_contain_special_character">To pole nie może zawierać znaków specjalnych</string>
+    <string name="error_only_standard_letters_are_allowed">Dozwolone są tylko standardowe litery</string>
+    <string name="error_field_must_not_be_empty">Pole nie może być puste</string>
+    <string name="error_email_address_not_valid">Nieprawidłowy adres e-mail</string>
+    <string name="error_creditcard_number_not_valid">Numer karty kredytowej nie jest prawidłowy</string>
+    <string name="error_phone_not_valid">Nieprawidłowy numer telefonu</string>
+    <string name="error_domain_not_valid">Nieprawidłowa nazwa domeny</string>
+    <string name="error_ip_not_valid">Nieprawidłowy adres IP</string>
+    <string name="error_url_not_valid">Adres Url sieci Web nie jest prawidłowy</string>
+    <string name="error_notvalid_personname">Nieprawidłowe imię lub nazwisko.</string>
+    <string name="error_notvalid_personfullname">Niepoprawne imię i nazwisko.</string>
+    <string name="error_date_not_valid">Nieprawidłowy format</string>
+    <string name="error_mustbe4digitnumber">Trzeba podać 4-cyfrowy numer</string>
+    <string name="error_mustbe6digitnumber">Trzeba podać 6-cyfrowy numer</string>
+    <string name="error_not_a_minimum_length">Nie wprowadzono minimalnej długości znaków</string>
+    <string name="error_pin_not_valid">Pin powinien być od 3 do 6 cyfr, nie takich samych ani kolejnych</string>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 76c269ca71..ab4fe5aebe 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -22,6 +22,7 @@
     <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A activar a automação</string>
     <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
+    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de acção deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é accionada no momento certo substitua a notificação por acção real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glic disponível no NS</string>
     <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
     <string name="objectives_manualenacts">Execução manual</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 93f7ede06e..59ef0d4a69 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Redefinir banco de dados</string>
     <string name="reset_db_confirm">Você realmente quer redefinir os bancos de dados?</string>
     <string name="nav_exit">Sair</string>
-    <string name="danar_useextended_title">Usar bólus prolongado de &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Sempre usar valores absolutos basais</string>
     <string name="alert_dialog_storage_permission_text">Por favor, reinicie seu telefone ou reinicie o AndroidAPS nas Configurações do Sistema \nCaso contrário o Android APS não terá registro (importante para rastrear e verificar que os algoritmos estão funcionando corretamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Este dispositivo não parece suportar a optimização de bateria na lista de permissões - pode ter problemas de desempenho.</string>
     <string name="description_actions">Alguns botões para acessar rapidamente a funções comuns</string>
-    <string name="description_careportal">Digite as entradas avançadas do livro de log.</string>
     <string name="description_config_builder">Usado para configurar os plugins ativos</string>
     <string name="description_objectives">Programa de aprendizagem</string>
     <string name="description_food">Exibe as predefinições de comida definidas no Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Fornece o perfil definido no Nightscout</string>
     <string name="description_profile_simple">Defina um perfil com apenas um bloco de cada vez.</string>
     <string name="description_pump_combo">Integração para bombas Accu-Chek Combo, requer ter o ruffy instalado</string>
-    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
-    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware atualizado</string>
-    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
     <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
     <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
     <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Monitore e controle AndroidAPS usando seu relógio WearOS.</string>
     <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
     <string name="description_sms_communicator">Controlar remotamente o AndroidAPS usando comandos SMS.</string>
-    <string name="nsprofileview_units_label">Unidades</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Meta</string>
-    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">Carboidratos:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbos</string>
     <string name="treatments_wizard_correction_label">Corr</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">IOB Bolus</string>
     <string name="openapsma_run">Executar agora</string>
     <string name="vitualpump_label">BOMBA VIRTUAL</string>
-    <string name="pump_basebasalrate_label">Taxa Basal de base</string>
-    <string name="pump_tempbasal_label">Basal temporaria</string>
-    <string name="virtualpump_extendedbolus_label">Bólus estendido</string>
-    <string name="pump_battery_label">Bateria</string>
-    <string name="pump_reservoir_label">Reservatório</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Última execução</string>
     <string name="openapsma_inputparameters_label">Parâmetros de entrada</string>
@@ -96,16 +76,11 @@
     <string name="result">Resultado</string>
     <string name="result_insulin_carbs">Resultado: %1$s %2$ss</string>
     <string name="openapsma_noglucosedata">Sem dados de glicose disponíveis</string>
-    <string name="nochangerequested">Nenhuma alteração solicitada</string>
     <string name="openapsma_request_label">Solicitar</string>
-    <string name="rate">Rácio</string>
-    <string name="duration">Duração</string>
-    <string name="reason">Motivo</string>
     <string name="glucose">Glicose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Configurador</string>
-    <string name="objectives">Objetivos</string>
     <string name="overview">Visão geral</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simples</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Geral</string>
     <string name="configbuilder_general_description">Estes são alguns plugins gerais que pode achar úteis.</string>
     <string name="configbuilder_constraints_description">Que restrições são aplicadas?</string>
-    <string name="days">dias</string>
     <string name="constraints">Restrições</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Plugin está desativado</string>
     <string name="constraints_violation">Violação das restrições</string>
     <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
-    <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
     <string name="overview_newtempbasal_basalpercent">Valor da Basal [%]</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Carboidratos</string>
     <string name="changeyourinput">Altere sua entrada!</string>
     <string name="configbuilder_bgsource">Fonte de BG</string>
     <string name="configbuilder_bgsource_description">De onde o AndroidAPS deve obter os dados?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">Modo APS</string>
     <string name="closedloop">Loop Fechado</string>
     <string name="openloop">Loop Aberto</string>
+    <string name="lowglucosesuspend">Suspensão de Glicémia Baixa</string>
     <string name="disabledloop">Loop Desativado</string>
     <string name="disableloop">Desativar loop</string>
     <string name="enableloop">Ativar loop</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">IOB Basal</string>
     <string name="bolusconstraintapplied">Restrição de bólus aplicada</string>
     <string name="carbsconstraintapplied">Restrições de carbs aplicada</string>
-    <string name="careportal_bgcheck">Verificação BG</string>
-    <string name="careportal_announcement">Anúncio</string>
-    <string name="careportal_note">Anotação</string>
-    <string name="careportal_question">Pergunta</string>
-    <string name="careportal_exercise">Exercício</string>
-    <string name="careportal_pumpsitechange">Alteração do local do cateter</string>
-    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
-    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
-    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
-    <string name="careportal_profileswitch">Troca de Perfil</string>
-    <string name="careportal_snackbolus">Bólus Lanche</string>
-    <string name="careportal_mealbolus">Bólus Refeição</string>
-    <string name="careportal_correctionbolus">Bólus Correcção</string>
-    <string name="careportal_combobolus">Bólus Combo</string>
-    <string name="careportal_tempbasalstart">Início Basal Temp</string>
-    <string name="careportal_tempbasalend">Fim de Basal Temp</string>
-    <string name="careportal_carbscorrection">Correção Carbos</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
     <string name="careportal_newnstreatment_other">Outro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
-    <string name="dismiss">Dispensar</string>
     <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
     <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
     <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
     <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
     <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Está a usar formato ultrapassado herdado a partir de versões antigas do AAPS, o que não é seguro! Use-o apenas como um último recurso, se não tiver uma exportação no actual no formato JSON.</string>
     <string name="metadata_warning_old_export">Preferências importadas já são %1$s dias antigas! Talvez tenha preferências mais actualizadas ou escolheu o ficheiro errado? Lembre-se de exportar preferências regularmente!</string>
     <string name="metadata_warning_date_format">Formato de data-hora inválido!</string>
+    <string name="metadata_warning_different_version">Preferências de uma versão menor diferente de aplicação. Está OK se você está importando após o upgrade, mas verifique após a importação se as preferências ainda estão corretas!</string>
+    <string name="metadata_urgent_different_version">Preferências de uma versão principal diferente de aplicação. As principais versões diferem significativamente e podem ter preferências incompatíveis! Certifique-se depois de importar que as preferências ainda estão corretas!</string>
     <string name="metadata_label_format">Formato do ficheiro</string>
     <string name="metadata_label_created_at">Criado em</string>
     <string name="metadata_label_aaps_version">Versão AAPS</string>
@@ -256,34 +212,17 @@
     <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Conectando</string>
-    <string name="connected">Conectado</string>
-    <string name="disconnected">Desconectado</string>
-    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="exported_today">exportado hoje</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado há %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportado às %1$s</string>
+    <string name="exported_less_than_hour_ago">exportado há menos de uma hora</string>
+    <string name="in_directory" comment="placeholder is for exported file path">no diretório: %1$s</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
     <string name="save">Salvar</string>
-    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
-    <string name="devicenotfound">Dispositivo selecionado não foi encontrado</string>
-    <string name="connectionerror">Erro de conexão com a bomba</string>
-    <string name="danar_iob_label">IOB Bomba</string>
-    <string name="danar_dailyunits">Unidades diárias</string>
-    <string name="pump_lastbolus_label">Último Bolus</string>
-    <string name="hoursago">%1$.1fh atrás</string>
-    <string name="danar_invalidinput">Dados de entrada inválidos</string>
-    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
     <string name="reloadprofile">Recarregar perfil</string>
-    <string name="danar_viewprofile">Ver perfil</string>
-    <string name="enacted">Executado</string>
-    <string name="comment">Commentário</string>
-    <string name="success">Sucesso</string>
-    <string name="percent">Percentagem</string>
-    <string name="absolute">Absoluto</string>
-    <string name="canceltemp">Cancelar basal temporária</string>
     <string name="smscommunicator">Comunicador SMS</string>
-    <string name="waitingforpumpresult">Aguardando resultados</string>
     <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
@@ -304,54 +243,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
     <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
-    <string name="bolusdelivering">Administrando %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos via SMS</string>
-    <string name="glucosetype_finger">Dedo</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Alvo Temporário</string>
-    <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duração da Insulina Ativa</string>
-    <string name="failedupdatebasalprofile">Falha ao atualizar o perfil basal</string>
-    <string name="danar_historyreload">Recarregar</string>
     <string name="uploading">Enviando</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS Bólus</string>
-    <string name="danar_debolus">DE Bólus</string>
-    <string name="danar_error">erro</string>
-    <string name="danar_refill">recarregar</string>
-    <string name="danar_basalhour">hora basal</string>
-    <string name="danar_glucose">glicose</string>
-    <string name="danar_carbohydrate">carboidrato</string>
-    <string name="danar_alarm">alarme</string>
-    <string name="danar_totaluploaded">Total de %1$d registros enviados</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarmes</string>
-    <string name="danar_history_basalhours">Horas de Basal</string>
-    <string name="danar_history_bolus">Bolus</string>
-    <string name="danar_history_carbohydrates">Carboidratos</string>
-    <string name="danar_history_dailyinsulin">Insulina diária</string>
-    <string name="danar_history_errors">Erros</string>
-    <string name="danar_history_glucose">Glicose</string>
-    <string name="danar_history_refill">Reabastecimento</string>
-    <string name="danar_history_syspend">Suspender</string>
-    <string name="danar_history_connectingfor">Conectando para %1$d</string>
-    <string name="danar_password_title">Senha da bomba</string>
-    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
-    <string name="pumpbusy">A bomba está ocupada</string>
-    <string name="overview_bolusprogress_delivered">Entregue</string>
-    <string name="overview_bolusprogress_stoped">Parado</string>
     <string name="bolusstopped">Bolus parado</string>
     <string name="bolusstopping">Parando o bolus</string>
-    <string name="occlusion">Oclusão</string>
-    <string name="overview_bolusprogress_stop">Parar</string>
-    <string name="overview_bolusprogress_stoppressed">STOP PRESSIONADO</string>
-    <string name="waitingforpump">Aguardando a bomba</string>
-    <string name="overview_bolusprogress_goingtodeliver">Vão ser administradas %1$.2fU</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
-    <string name="noprofileselected">Nenhum perfil selecionado</string>
     <string name="smscommunicator_loophasbeendisabled">Loop foi desativado</string>
     <string name="smscommunicator_loophasbeenenabled">Loop foi ativado</string>
     <string name="smscommunicator_loopisdisabled">Loop Desativado</string>
@@ -391,11 +289,9 @@
     <string name="mealbolus">Refeição</string>
     <string name="correctionbous">Correção</string>
     <string name="actions">Ações</string>
-    <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="ns_upload_only">Envio do NS apenas (sincronização desativada)</string>
     <string name="ns_upload_only_summary">Apenas upload para NS. Não é eficaz em SGV a menos que uma fonte local como xDrip esteja selecionada. Não é eficaz em perfis enquanto NS-Profiles é usado.</string>
     <string name="pumpNotInitialized">Bomba não inicializada!</string>
-    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
     <string name="othersettings_title">Outro</string>
@@ -405,8 +301,6 @@
     <string name="button3">Botão 3</string>
     <string name="units_colon">Unidades:</string>
     <string name="units">Unidades</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/L</string>
     <string name="dia">DIA</string>
     <string name="target_range">Intervalo Alvo:</string>
     <string name="prefs_range_title">Intervalo para visualização</string>
@@ -416,17 +310,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Reenviar Todos os Dados</string>
     <string name="open_settings_on_wear">Abrir Definições em Wear</string>
-    <string name="pumperror">Erro da Bomba</string>
-    <string name="lowbattery">Bateria fraca</string>
-    <string name="pumpshutdown">Bomba desligada</string>
-    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
-    <string name="danarkoreanpump">DanaR Coreana</string>
     <string name="basal_rate">Valor da Basal:</string>
-    <string name="profile_set_failed">Não foi possivel configurar o perfil de basal</string>
-    <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
-    <string name="danar_disableeasymode">Desactivar modo EasyUI na bomba</string>
-    <string name="danar_enableextendedbolus">Habilitar bolus estendido na bomba</string>
-    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
     <string name="basalvaluebelowminimum">Valor da basal abaixo do mínimo. Perfil não definido!</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Último BG:</string>
@@ -434,7 +318,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Notificação em curso</string>
     <string name="old_data">DADOS ANTIGOS</string>
-    <string name="minago">%1$d min atrás</string>
     <string name="sms_minago">%1$dmin atrás</string>
     <string name="localprofile">Perfil local</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +333,22 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Atividade</string>
     <string name="removerecord">Remover registo</string>
-    <string name="danar_stats">Estatísticas DanaR</string>
-    <string name="danar_stats_cumulative_tdd">Dose diária acumulativa</string>
-    <string name="danar_stats_expweight">Dose diária exponencialmente ponderada</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Média</string>
-    <string name="danar_stats_amount_days"># Dias</string>
-    <string name="danar_stats_weight">Peso</string>
-    <string name="danar_stats_warning_Message">Possivelmente impreciso se foram usados bolus para purgar/preencher!</string>
-    <string name="danar_stats_olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
-    <string name="danar_stats_tbb">Basal Diária Total</string>
-    <string name="danar_stats_tbb2">Basal diária * 2</string>
-    <string name="initializing">Inicializando...</string>
     <string name="actions_shortname">ACÇ</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">PS</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">PL</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">Início</string>
     <string name="virtualpump_shortname">BOMBAV</string>
     <string name="profileviewer_shortname">NSPerfil</string>
     <string name="treatments_shortname">TRATA</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Abreviar títulos dos separadores</string>
     <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
     <string name="always_use_shortavg_summary">Útil quando há ruído nos dados de fontes sem filtro como o xDrip.</string>
-    <string name="advancedsettings_title">Configurações Avançadas</string>
-    <string name="danar_model">Modelo: %1$02X Protocolo: %2$02X Código: %3$02X</string>
     <string name="profile">Perfil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor actual (qual seja menor) como valores máximos.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objectivo é evitar que sejam determinadas basais temporárias demasiado elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">Calibração enviada. Recepção têm de estar activada no xDrip.</string>
     <string name="smscommunicator_calibrationfailed">O xDrip não esta a receber as calibrações</string>
     <string name="pumpsuspended">Bomba suspensa</string>
-    <string name="gettingpumpstatus">A obter estado bomba</string>
-    <string name="settingtempbasal">Definindo basal temp</string>
-    <string name="stoppingtempbasal">A parar basal temp</string>
-    <string name="settingextendedbolus">Configurando bolus prolongado</string>
-    <string name="stoppingextendedbolus">Parando bolus prolongado</string>
-    <string name="updatingbasalrates">Atualizar valores das basais</string>
-    <string name="disconnecting">A desligar</string>
     <string name="executing">Executando</string>
     <string name="virtualpump_settings">Definições da bomba virtual</string>
     <string name="virtualpump_uploadstatus_title">Enviar estado para NS</string>
-    <string name="wrongpassword">Senha incorrecta</string>
-    <string name="approachingdailylimit">Aproximação do limite diario de insulina</string>
     <string name="nsclientinternal">NSCliente</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">Mostrar IOB detalhado</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
     <string name="nosuccess">não foi bem sucedido - por favor, verifique o telefone</string>
-    <string name="notavailable">Indisponível</string>
+    <string name="notavailable">n/d</string>
     <string name="patientage">Idade do Paciente</string>
     <string name="child">Criança</string>
     <string name="teenage">Adolescente</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">Superbólus</string>
     <string name="ns_logappstartedevent">Registar inicio da app no NS</string>
     <string name="restartingapp">A sair da aplicação para aplicar as configurações.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">Qual o tipo de insulina que está a utilizar?</string>
     <string name="fastactinginsulin">Insulina de ação rapida</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -584,15 +437,20 @@
     <string name="enablesuperbolus">Activar superbólus no assistente</string>
     <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
+    <string name="statuslights_cage_warning">Limite aviso idade canula [h]</string>
+    <string name="statuslights_cage_critical">Limite Crítico Idade Canula [h]</string>
+    <string name="statuslights_iage_warning">Limite aviso idade insulina [h]</string>
+    <string name="statuslights_iage_critical">Limite crítico idade insulina [h]</string>
+    <string name="statuslights_sage_warning">Limite aviso idade sensor [h]</string>
+    <string name="statuslights_sage_critical">Limite crítico idade sensor [h]</string>
+    <string name="statuslights_bage_warning">Limite de aviso de nível de bateria [h]</string>
+    <string name="statuslights_bage_critical">Limite crítico de nível de bateria [h]</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
     <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Última ligação</string>
-    <string name="danar_bluetooth_status">Estado Bluetooth</string>
     <string name="nav_about">Sobre</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -603,17 +461,12 @@
     <string name="wear_showbgi_summary">Adicionar BGI à linha de status</string>
     <string name="ns_noupload">Sem envio para NS</string>
     <string name="ns_noupload_summary">Todos os dados enviados para NS são descartados. AAPS está conectado ao NS, mas não é feita nenhuma alteração no NS</string>
-    <string name="basal_step">Valor da Basal</string>
-    <string name="bolus_step">Incremento de bolus</string>
     <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Estendido</string>
     <string name="careportal_sensorage_label">Idade do sensor</string>
     <string name="careportal_canulaage_label">Idade da Canula</string>
     <string name="careportal_insulinage_label">Idade de Insulina</string>
-    <string name="hours">horas</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
-    <string name="careportal_pumpbatterychange">Mudança de Bateria</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
     <string name="nsalarm_urgenthigh">Urgência hiperglicemia</string>
     <string name="nsalarm_high">Alta</string>
@@ -637,7 +490,6 @@
     <string name="absorptionsettings_title">Configurações de absorção</string>
     <string name="absorption_maxtime_title">Tempo máx. absorção refeição [h]</string>
     <string name="absorption_maxtime_summary">Tempo em horas, espectável para que todos os hidratos de carbono da refeição sejam absorvidos</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -662,7 +514,6 @@
     <string name="careportal_pump_label">BOMBA</string>
     <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
     <string name="openapssmb">SMB OpenAPS</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activar UAM</string>
     <string name="enablesmb">Activar SMB</string>
     <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma acção mais rápida</string>
@@ -674,23 +525,7 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
     <string name="activate_profile">Activar perfil</string>
-    <string name="date">Data</string>
     <string name="invalid">INVÁLIDO</string>
-    <string name="waitingforpairing">Aguardando emparelhamento na bomba</string>
-    <string name="pairingok">Emparelhamento OK</string>
-    <string name="pairingtimedout">Tempo emparelhamento excedido</string>
-    <string name="pairing">A emparelhar</string>
-    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
-    <string name="emptyreservoir">Reservatório vazio</string>
-    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
-    <string name="remaininsulinalert">Nível de insulina restante</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Bomba seleccionada</string>
-    <string name="pairpump">Emparelhar nova bomba</string>
-    <string name="bolusspeed">Velocidade Bólus</string>
-    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
-    <string name="serialnumber">Número de série</string>
     <string name="careportal_newnstreatment_percentage_label">Percentagem</string>
     <string name="careportal_newnstreatment_timeshift_label">Alteração Turno</string>
     <string name="default_temptargets">Alvo-Temp padrão</string>
@@ -700,32 +535,18 @@
     <string name="activity_target">alvo da atividade</string>
     <string name="hypo_duration">duração hipo</string>
     <string name="hypo_target">alvo hipo</string>
-    <string name="danar_history_prime">Purge/Encha</string>
-    <string name="gettingextendedbolusstatus">Procurando o status do bolus estendido</string>
-    <string name="gettingbolusstatus">A obter estado bólus</string>
-    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
-    <string name="gettingpumpsettings">A obter as definições da bomba</string>
-    <string name="gettingpumptime">A obter hora bomba</string>
     <string name="reuse">reutilizar</string>
     <string name="wearcontrol_title">Controles do Relógio</string>
     <string name="wearcontrol_summary">Definir Alvo-Temp and inserir Tratamentos do relógio.</string>
-    <string name="connectiontimedout">Ligação expirou</string>
     <string name="food">Alimentos</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<nenhum>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Gor</string>
     <string name="active"><![CDATA[<Activo>]]></string>
-    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d sec.</string>
-    <string name="processinghistory">A processar acção</string>
-    <string name="startingbolus">A iniciar administração de bolus</string>
     <string name="executingrightnow">Comando será executado agora</string>
-    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
     <string name="pump_unreachable">Bomba inacessível</string>
     <string name="missed_bg_readings">Leituras Glic. perdidas</string>
     <string name="raise_notifications_as_android_notifications">Usar as notificações do sistema para alertas e notificações</string>
@@ -735,9 +556,6 @@
     <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Watchdog BT</string>
-    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma conexão com bomba for possível. Este parâmetro pode ser util em alguns telefones, onde a pilha bluetooth congela.</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
     <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
     <string name="bgsource_upload">Configurações de upload de BG</string>
@@ -750,12 +568,9 @@
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
     <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
-    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="overview_editquickwizard_usebg">Cálculos Glic</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo de Bólus IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
@@ -773,8 +588,6 @@
     <string name="closedmodeenabled">Modo fechado ativado</string>
     <string name="maxiobset">IOB máxima definida correctamente</string>
     <string name="hasbgdata">Glicemia disponivel desde a fonte selecionada</string>
-    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <string name="combo_programming_bolus">A programar a bomba para injectar o bolus</string>
     <string name="combo_refresh">Atualizar</string>
     <string name="combo_pump_state_label">Estado</string>
@@ -795,7 +608,6 @@
     <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
     <string name="combo_pump_connected_now">Agora</string>
     <string name="combo_activity_reading_pump_history">Lendo histórico da bomba</string>
-    <string name="danar_history">Histórico da Bomba</string>
     <string name="combo_activity_setting_basal_profile">Configurando perfil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
     <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
@@ -814,9 +626,6 @@
     <string name="extendedbolusdeliveryerror">Erro na entrega Bólus Estendido</string>
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d mins</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
@@ -827,8 +636,6 @@
     <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
     <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
     <string name="enablesmbwithhightemptarget_summary">SMB activo com alvos temporários elevados em curso (exercicio)</string>
-    <string name="let_temp_basal_run">Permitir basal temp correr</string>
-    <string name="mute">Silêncio</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carbos</string>
     <string name="overview_buttons_selection">Botões</string>
@@ -870,7 +677,6 @@
     <string name="closed_loop_disabled_on_dev_branch">A correr a versão dev. O Loop fechado está desabilitado.</string>
     <string name="engineering_mode_enabled">Modo engenheiro activado</string>
     <string name="not_eng_mode_or_release">Modo de engenharia não habilitado e não no na versão mestra</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Lendo perfil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi injectado. Por favor, verifique se bolus ainda é necessário.</string>
     <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
@@ -893,15 +699,10 @@
     <string name="smbdisabledinpreferences">SMB desactivado nas configurações</string>
     <string name="uamdisabledinpreferences">UAM desactivado nas configurações</string>
     <string name="uamdisabledoref1notselected">UAM desactivado porque confia no plugin de sensibilidade Oref1</string>
-    <string name="limitingbasalratio">A basal max está limitada a %1$.2f U/h por %2$s</string>
-    <string name="pumplimit">limite bomba</string>
-    <string name="itmustbepositivevalue">deve ser valor positivo</string>
     <string name="maxbasalmultiplier">multiplicador de basal máx</string>
     <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
     <string name="smb_frequency_exceeded">Um bolus foi injectado nos últimos 3 minutos, saltando SMB</string>
     <string name="basal_set_correctly">Basal correctamente definida</string>
-    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
-    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
     <string name="limitingextendedbolus">A limitar bólus estendido para %1$.1f U porque %2$s</string>
     <string name="limitingmaxiob">A limitar IOB máx. para %1$.1f U porque %2$s</string>
     <string name="limitingcarbs">A limitar hidratos para %1$d g porque %2$s</string>
@@ -916,7 +717,6 @@
     <string name="smbnotallowedinopenloopmode">SMB não permitido no modo open loop</string>
     <string name="food_short">Alimentos</string>
     <string name="reset">repor</string>
-    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
     <string name="loopdisconnectedfor">Desligado (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Máximo total IOS OpenAPS não pode superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor é chamado de Max IOB em contexto de OpenAPS\nOpenAPS não adicionará mais insulina se o IOB atual for maior que este valor</string>
@@ -932,7 +732,6 @@
     <string name="nav_setupwizard">Assistente de Configuração</string>
     <string name="setupwizard_finish">TERMINAR</string>
     <string name="setupwizard_language_prompt">Selecione o seu Idioma</string>
-    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
     <string name="firstinsulinincrement">Primeiro incremento insulina</string>
     <string name="secondinsulinincrement">Segundo incremento insulina</string>
     <string name="thirdinsulinincrement">Terceiro incremento insulina</string>
@@ -955,7 +754,6 @@
     <string name="virtualpump_type">Tipo da Bomba Virtual</string>
     <string name="virtualpump_definition">Definição da Bomba</string>
     <string name="virtualpump_pump_def">Bólus: Passo=%1$s\nBólus Estendido: [Passo=%2$s, Duração=%3$smin -%4$sh] \nBasal: Passo=%5$s\ nTBR: %6$s (por %7$s), Duração=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
     <string name="ns_autobackfill_title">Preenchimentoauto Glicemia</string>
     <string name="wear_wizard_settings">Definições do Assistente Rápido</string>
     <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
@@ -986,22 +784,6 @@
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
     <string name="exit">Sair</string>
-    <string name="danar_useroptions">Opções do utilizador</string>
-    <string name="danar_timedisplay">Formato hora</string>
-    <string name="danar_buttonscroll">Botão rolamento</string>
-    <string name="danar_beep">Sinal ao pressionar botão</string>
-    <string name="danar_pumpalarm">Alarme</string>
-    <string name="danar_pumpalarm_sound">Som</string>
-    <string name="danar_pumpalarm_vibrate">Vibrar</string>
-    <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">LCD na hora [segundos]</string>
-    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
-    <string name="danar_glucoseunits">Unidades de Glucose</string>
-    <string name="danar_shutdown">Desligar [horas]</string>
-    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
-    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
-    <string name="option_on">Ligado</string>
-    <string name="option_off">Desligado</string>
     <string name="open_navigation">Abrir a navegação</string>
     <string name="close_navigation">Fechar a navegação</string>
     <string name="nav_plugin_preferences">Preferências plugin</string>
@@ -1021,8 +803,6 @@
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
     <string name="custom">Personalizado</string>
-    <string name="largetimedifftitle">Grande diferença Horária</string>
-    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Em caso contrario pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
@@ -1048,17 +828,10 @@
     <string name="setupwizard_preferred_aps_mode">Modo APS preferido</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Cumprimento</string>
     <string name="sendlogfiles">Enviar os ficheiros de registo do dia de hoje para os programadores. Situação inesperada.</string>
-    <string name="maxbolusviolation">Transgressão Bólus máx</string>
-    <string name="commanderror">Erro no comando</string>
-    <string name="speederror">Erro velocidade</string>
-    <string name="insulinlimitviolation">Transgressão limite insulina</string>
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">A app mostrará um pedido de alteração apenas se a mudança for superior a este valor em %. O valor padrão é 20%</string>
-    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="searching_for_devices">A pesquisar dispositivos…</string>
-    <string name="please_wait">Por favor aguarde…</string>
     <string name="pairing_completed">Emparelhamento concluído</string>
     <string name="code_compare">Os códigos exibidos neste dispositivo e na sua bomba correspondem?</string>
     <string name="insight_pairing">Emparelhamento Insight</string>
@@ -1147,7 +920,6 @@
     <string name="isequalorgreater">é igual ou maior que</string>
     <string name="isgreater">é maior que</string>
     <string name="isnotavailable">não está disponível</string>
-    <string name="unknown">desconhecido</string>
     <string name="glucoseisnotavailable">Glicose não está disponível</string>
     <string name="glucosecomparedmgdl">Glicose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicose %1$s %2$.1f %3$s</string>
@@ -1164,23 +936,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatização</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
     <string name="dexcom_lognssensorchange_summary">Criar evento \"Mudança de Sensor\" automaticamente no NS aquando do início do sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
     <string name="summary_tidepool_username">Nome de utilizador no Tidepool, normalmente seu endereço de e-mail</string>
     <string name="title_tidepool_username">Nome de Utilizador</string>
     <string name="summary_tidepool_password">Palavra-passe da conta Tidepool</string>
@@ -1221,9 +980,8 @@
     <string name="running_invalid_version">Detectamos que está  a correr uma versão inválida. Loop desactivado!</string>
     <string name="old_version">versão antiga</string>
     <string name="very_old_version">versão muito antiga</string>
-    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a LGS após %2$d dias, o loop será desactivado após %3$d dias</string>
+    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a SGB após %2$d dias, o loop será desactivado após %3$d dias</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">App Dexcom (com patch)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Receber valores da Glicemia da app Dexcom (com patch).</string>
@@ -1300,15 +1058,12 @@
     <string name="rileylink_scanner_scan_stop">PARAR</string>
     <string name="rileylink_scanner_selected_device">Seleccionado</string>
     <string name="rileylink_scanner_title">Procura RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth de energia baixa (LE) não suportado.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth não está activado.</string>
-    <string name="location_not_found_title">Localização Não Está Activada</string>
-    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
     <string name="location_yes">Activar</string>
     <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
     <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
     <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
+    <string name="common_never">Nunca</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Definições</string>
     <string name="rileylink_settings_tab2">Histórico</string>
@@ -1344,7 +1099,6 @@
     <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
     <string name="rileylink_error_pump_unreachable">Bomba inacessível</string>
     <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
-    <string name="rileylink_error_address_not_set_short">Não definido</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1414,7 +1168,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Entregue esta parte do resultado do assistente de bólus [%]</string>
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
@@ -1422,7 +1175,6 @@
     <string name="time_range">Intervalo de tempo</string>
     <string name="timerange_value">O tempo está entre %1$s e %2$s</string>
     <string name="between">Entre </string>
-    <string name="close">Fechar</string>
     <string name="increasingmaxbasal">Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil</string>
     <string name="smscommunicator_messagebody">Corpo da mensagem inválido</string>
     <string name="format_bg_isf">%1$s FSI: %2$.1f</string>
@@ -1440,8 +1192,8 @@
     <string name="common_off">Desligado</string>
     <string name="objectives_button_unfinish">Limpar terminado</string>
     <string name="objectives_button_unstart">Limpar iniciado</string>
-    <string name="timedetection">Detecção de tempo</string>
     <string name="doyouwantresetstart">Deseja reiniciar o objectivo? Pode perder seu progresso.</string>
+    <string name="time_or_timezone_change">Alterar Hora e/ou Fuso Horário na Bomba</string>
     <string name="nopumpselected">Nenhuma bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione as unidades em que deseja exibir os valores</string>
     <string name="ns_ploadlocalprofile">Carregar as alterações do perfil local para NS</string>
@@ -1466,7 +1218,6 @@
     <string name="nav_survey">Questionário</string>
     <string name="invalidage">Entrada de idade inválida</string>
     <string name="invalidweight">Entrada de peso inválida</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
     <string name="tdd">TDD</string>
@@ -1479,16 +1230,12 @@
     <string name="randombg_short">GLIC</string>
     <string name="tools">Ferramentas</string>
     <string name="show_calculation">Mostrar Localização</string>
-    <string name="error">Erro</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Evento de automação</string>
     <string name="alreadyset">Já definido</string>
-    <string name="message">Mensagem</string>
     <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
-    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
-    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
-    <string name="extended_bolus_short">BE</string>
+    <string name="ebstopsloop">O uso do Bólus Prolongado irá parar o modo Closed Loop no tempo do bólus prolongado. Quer realmente isso?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Prolongado</string>
+    <string name="extended_bolus_short">BP</string>
     <string name="phonechecker">\"VerificadorTelefone\"</string>
     <string name="chartmenu">Menu do Gráfico</string>
     <string name="sensitivity_short">AS</string>
@@ -1525,4 +1272,83 @@
     <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
     <string name="passwords_dont_match">As passwords não coincidem</string>
     <string name="current_master_password">Password Mestre actual</string>
+    <string name="statuslights">Luzes de Estado</string>
+    <string name="statuslights_copy_ns">Copiar definições do NS</string>
+    <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
+    <string name="classic_desrciption">Tema gráfico original</string>
+    <string name="buttonson_desrciption">Os botões são sempre exibidos na parte inferior do ecrã</string>
+    <string name="skin">Tema gráfico</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Beep Bólus Activado</string>
+    <string name="omnipod_config_beep_basal_enabled">Beep Basal Activado</string>
+    <string name="omnipod_config_beep_smb_enabled">Beep SMB Activado</string>
+    <string name="omnipod_config_beep_tbr_enabled">Beep DBT Activado</string>
+    <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Gestão Pod</string>
+    <string name="omnipod_pod_status">Estado do Pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U restante</string>
+    <string name="omnipod_reservoir_over50">Mais de 50 U</string>
+    <string name="omnipod_pod_address">Endereço do Pod</string>
+    <string name="omnipod_pod_expiry">Pod Expira</string>
+    <string name="omnipod_pod_name_no_info">Sem info</string>
+    <string name="omnipod_pod_no_pod_connected">Nenhum Pod ligado</string>
+    <string name="omnipod_pod_not_initalized">Não inicializado</string>
+    <string name="omnipod_pod_active_alerts">Alertas Pod Activos</string>
+    <string name="omnipod_ack_short">Reco Alertas</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
+    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_cmd_reset_pod">Repor Pod</string>
+    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
+    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
+    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporária (Forçado pelo controlador)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporária (Forçado pelo utilizador)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
+    <string name="omnipod_cmd_get_pod_status">Obter Status do Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Obter Pod Info</string>
+    <string name="omnipod_cmd_set_time">Definir Hora</string>
+    <string name="omnipod_cmd_configure_alerts">Configurar Alertas</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Reconhecer Alertas</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
+    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
+    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
+    <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
+    <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
+    <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desacitvar Pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
+    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
+    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
+    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
+    <string name="omnipod_rl_stats">Estatísticas RL</string>
+    <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index b28a79133e..537f13d41d 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -109,7 +109,7 @@
     <string name="wrongcarbs_addfakeinsulin">Como adicionar insulina falsa utilizando a função Recarregar</string>
     <string name="extendedcarbs_label">Tópico: Alimentos com Gordura e Proteína</string>
     <string name="extendedcarbs_handling">O que fazer se a comida contém uma grande quantidade de gordura e/ou proteínas?</string>
-    <string name="extendedcarbs_useextendedcarbs">Recalcular gordura e proteínas em hidratos e usar recurso de \"Hidratos Estendidos\".</string>
+    <string name="extendedcarbs_useextendedcarbs">Recalcular gordura e proteínas em hidratos e usar recurso de \"Hidratos Prolongados\".</string>
     <string name="extendedcarbs_add">Recalcular gordura e proteínas em hidratos e adicionar ao cálculo de bólus.</string>
     <string name="extendedcarbs_useextendedbolus">Use o bólus estendido para cobrir gordura e proteínas.</string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
diff --git a/app/src/main/res/values-pt-rPT/insight_alert_titles.xml b/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
index 1d3cc97b10..bd943c8c19 100644
--- a/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
+++ b/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
@@ -4,12 +4,12 @@
     <string name="alert_r2_title">Bolus não administrado</string>
     <string name="alert_r3_title">Alarme</string>
     <string name="alert_r4_title">Mudar o conjunto de infusão</string>
-    <string name="alert_r7_title">Basal temporária concluída</string>
+    <string name="alert_r7_title">DBT concluído</string>
     <string name="alert_w31_title">Reservatório quase vazio</string>
     <string name="alert_w32_title">Bateria fraca</string>
     <string name="alert_w33_title">Hora/Data inválida</string>
     <string name="alert_w34_title">Fora da Garantia</string>
-    <string name="alert_w36_title">Basal temporária cancelada</string>
+    <string name="alert_w36_title">DBT cancelado</string>
     <string name="alert_w38_title">Bolus cancelado</string>
     <string name="alert_w39_title">Aviso de periodo de empréstimo</string>
     <string name="alert_m20_title">Cartucho não inserido</string>
diff --git a/app/src/main/res/values-pt-rPT/insight_exceptions.xml b/app/src/main/res/values-pt-rPT/insight_exceptions.xml
index 78763caf20..34d6775898 100644
--- a/app/src/main/res/values-pt-rPT/insight_exceptions.xml
+++ b/app/src/main/res/values-pt-rPT/insight_exceptions.xml
@@ -6,8 +6,8 @@
     <string name="socket_creation_failed">Falha ao criar documento</string>
     <string name="timeout">Tempo expirou</string>
     <string name="maximum_number_of_bolus_type_already_running">Número máximo de bólus tipo já em execução</string>
-    <string name="no_active_tbr_to_cancel">Sem basal temporária para cancelar</string>
-    <string name="no_active_tbr_to_change">Sem basal temporária para alterar</string>
+    <string name="no_active_tbr_to_cancel">Sem DBT para cancelar</string>
+    <string name="no_active_tbr_to_change">Sem DBT para alterar</string>
     <string name="no_such_bolus_to_cancel">Sem bolus para cancelar</string>
     <string name="pump_already_in_that_state_exception">A bomba já está nesse estado</string>
     <string name="run_mode_not_allowed">Modo executar não autorizado</string>
diff --git a/app/src/main/res/values-pt-rPT/objectives.xml b/app/src/main/res/values-pt-rPT/objectives.xml
index 195da54c80..40678732c6 100644
--- a/app/src/main/res/values-pt-rPT/objectives.xml
+++ b/app/src/main/res/values-pt-rPT/objectives.xml
@@ -13,7 +13,7 @@
     <string name="objectives_maxbasal_objective">Compreender o seu open loop, incluindo as recomendações de basais temporárias</string>
     <string name="objectives_maxbasal_gate">Com base nessa experiência, decidir qual deve ser a basal máxima e configurá-la na bomba e nas preferências</string>
     <string name="objectives_maxiobzero_objective">Começar o close loop com Suspensão por Glicose Baixa</string>
-    <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
+    <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão Glicose Baixa</string>
     <string name="objectives_maxiob_objective">Ajustar o close loop, aumentar IOB máxima acima de 0 e reduzir gradualmente os alvos de Glic</string>
     <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de Glic baixa, antes de baixar Glic</string>
     <string name="objectives_autosens_objective">Ajuste as basais e os rácios, se necessário, e, em seguida, active o auto-sens</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b31fcdf7d7..3fd0429e7c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -8,17 +8,14 @@
     <string name="treatmentssafety_maxbolus_title">Max bolus permitido [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Max hidratos permitidos [g]</string>
     <string name="nav_preferences">Preferências</string>
-    <string name="nav_refreshtreatments">Atualizar tratamentos do NS</string>
+    <string name="nav_refreshtreatments">Actualizar tratamentos do NS</string>
     <string name="nav_resetdb">Reinicializar base de dados</string>
     <string name="reset_db_confirm">Quer realmente reiniciar a base de dados?</string>
     <string name="nav_exit">Sair</string>
-    <string name="danar_useextended_title">Usar bólus prolongado de &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Usar sempre valores absolutos de basal</string>
-    <string name="alert_dialog_storage_permission_text">Por favor, reinicie o seu telefone ou reinicie o AndroidAPS a partir das Configurações do Sistema \ncaso contrário, o AndroidAPS não terá registro (importante para controlar e verificar se os algoritmos estão a funcionar corretamente)!</string>
+    <string name="alert_dialog_storage_permission_text">Por favor, reinicie o telefone ou reinicie o AndroidAPS a partir das Configurações do Sistema \ncaso contrário, o AndroidAPS não terá registo (importante para controlar e verificar se os algoritmos estão a funcionar correctamente)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Este dispositivo não parece suportar a optimização de bateria na lista de permissões - pode ter problemas de desempenho.</string>
     <string name="description_actions">Alguns botões para aceder rapidamente a funções comuns</string>
-    <string name="description_careportal">Inserir as entradas avançadas do livro de registo.</string>
     <string name="description_config_builder">Usado para configurar os plugins ativos</string>
     <string name="description_objectives">Programa de aprendizagem</string>
     <string name="description_food">Exibe as predefinições de comida definidas no Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Fornece o perfil definido no Nightscout</string>
     <string name="description_profile_simple">Definir um perfil com apenas um bloco de tempo.</string>
     <string name="description_pump_combo">Integração para bombas Accu-Chek Combo, requer ter o ruffy instalado</string>
-    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
-    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware atualizado</string>
-    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
     <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
     <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
     <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
@@ -54,15 +47,8 @@
     <string name="description_wear">Monitorizar e controlar o AndroidAPS usando o seu relógio WearOS.</string>
     <string name="description_xdrip_status_line">Mostrar informações sobre o loop no watchface do xDrip+.</string>
     <string name="description_sms_communicator">Controlar remotamente o AndroidAPS usando comandos SMS.</string>
-    <string name="nsprofileview_units_label">Unidades</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">FSI</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Alvo</string>
-    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
-    <string name="treatments_carbs_label_string">Hidratos de Carbono:</string>
+    <string name="treatments_carbs_label_string">Hidratos:</string>
     <string name="treatments_iob_label_string">IOB:</string>
     <string name="sms_iob">IOB:</string>
     <string name="treatments_iobtotal_label_string">IOB Total:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Hidratos</string>
     <string name="treatments_wizard_correction_label">Corr</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bólus IOB</string>
     <string name="openapsma_run">Executar agora</string>
     <string name="vitualpump_label">BOMBA VIRTUAL</string>
-    <string name="pump_basebasalrate_label">Taxa Basal de base</string>
-    <string name="pump_tempbasal_label">Basal temp</string>
-    <string name="virtualpump_extendedbolus_label">Bólus estendido</string>
-    <string name="pump_battery_label">Bateria</string>
-    <string name="pump_reservoir_label">Reservatório</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Última execução</string>
     <string name="openapsma_inputparameters_label">Parâmetros de entrada</string>
@@ -96,16 +76,11 @@
     <string name="result">Resultado</string>
     <string name="result_insulin_carbs">Resultado: %1$s %2$ss</string>
     <string name="openapsma_noglucosedata">Sem dados de glucose disponíveis</string>
-    <string name="nochangerequested">Nenhuma alteração solicitada</string>
     <string name="openapsma_request_label">Pedido</string>
-    <string name="rate">Rácio</string>
-    <string name="duration">Duração</string>
-    <string name="reason">Motivo</string>
     <string name="glucose">Glucose</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Configurador</string>
-    <string name="objectives">Objetivos</string>
     <string name="overview">Visão geral</string>
     <string name="nsprofile">Perfil NS</string>
     <string name="simpleprofile">Perfil simples</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Geral</string>
     <string name="configbuilder_general_description">Estes são alguns plugins gerais que pode achar úteis.</string>
     <string name="configbuilder_constraints_description">Que restrições são aplicadas?</string>
-    <string name="days">dias</string>
     <string name="constraints">Restrições</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Plugin está desativado</string>
     <string name="constraints_violation">Violação das restrições</string>
     <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
-    <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
     <string name="overview_newtempbasal_basalpercent">Valor da Basal [%]</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">Hidratos de Carbono</string>
     <string name="changeyourinput">Altere o seu input!</string>
     <string name="configbuilder_bgsource">Origem dos valores de Glucose</string>
     <string name="configbuilder_bgsource_description">De onde deve o AndroidAPS obter os dados?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">Modo APS</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
+    <string name="lowglucosesuspend">Suspensão de Glicémia Baixa</string>
     <string name="disabledloop">Loop Desactivado</string>
     <string name="disableloop">Desactivar Loop</string>
     <string name="enableloop">Activar Loop</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
     <string name="bolusconstraintapplied">Restrição de bólus aplicada</string>
     <string name="carbsconstraintapplied">Restrição de hidratos de carbono aplicada</string>
-    <string name="careportal_bgcheck">Verificar Glic</string>
-    <string name="careportal_announcement">Anúncio</string>
-    <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Pergunta</string>
-    <string name="careportal_exercise">Exercício</string>
-    <string name="careportal_pumpsitechange">Alteração do local do cateter</string>
-    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
-    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
-    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
-    <string name="careportal_profileswitch">Troca de Perfil</string>
-    <string name="careportal_snackbolus">Bólus Lanche</string>
-    <string name="careportal_mealbolus">Bólus Refeição</string>
-    <string name="careportal_correctionbolus">Bólus Correcção</string>
-    <string name="careportal_combobolus">Bólus Combo</string>
-    <string name="careportal_tempbasalstart">Início Temp Basal</string>
-    <string name="careportal_tempbasalend">Fim Temp Basal</string>
-    <string name="careportal_carbscorrection">Correcção Hidratos</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Tipo de evento</string>
     <string name="careportal_newnstreatment_other">Outro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -203,7 +157,7 @@
     <string name="careportal_newnstreatment_glucosetype">Tipo de glicose</string>
     <string name="noprofile">Sem perfil carregado do NS</string>
     <string name="overview_tempbasal_button">BasalTemp</string>
-    <string name="overview_extendedbolus_button">Bólus estendido</string>
+    <string name="overview_extendedbolus_button">Bólus Prolongado</string>
     <string name="configbuilder_nightscoutversion_label">Versão Nightscout:</string>
     <string name="missing_carbs">Falta %1$dg</string>
     <string name="exported">Preferências exportadas</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
-    <string name="dismiss">Dispensar</string>
     <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
     <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
     <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
     <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
     <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Está a usar formato ultrapassado herdado a partir de versões antigas do AAPS, o que não é seguro! Use-o apenas como um último recurso, se não tiver uma exportação no actual no formato JSON.</string>
     <string name="metadata_warning_old_export">Preferências importadas já são %1$s dias antigas! Talvez tenha preferências mais actualizadas ou escolheu o ficheiro errado? Lembre-se de exportar preferências regularmente!</string>
     <string name="metadata_warning_date_format">Formato de data-hora inválido!</string>
+    <string name="metadata_warning_different_version">Preferências de uma versão menor diferente de aplicação. Está OK se você está importando após o upgrade, mas verifique após a importação se as preferências ainda estão corretas!</string>
+    <string name="metadata_urgent_different_version">Preferências de uma versão principal diferente de aplicação. As principais versões diferem significativamente e podem ter preferências incompatíveis! Certifique-se depois de importar que as preferências ainda estão corretas!</string>
     <string name="metadata_label_format">Formato do ficheiro</string>
     <string name="metadata_label_created_at">Criado em</string>
     <string name="metadata_label_aaps_version">Versão AAPS</string>
@@ -256,34 +212,17 @@
     <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">A ligar</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnected">Desligado</string>
-    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="exported_today">exportado hoje</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado há %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportado às %1$s</string>
+    <string name="exported_less_than_hour_ago">exportado há menos de uma hora</string>
+    <string name="in_directory" comment="placeholder is for exported file path">no diretório: %1$s</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
     <string name="save">Guardar</string>
-    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
-    <string name="devicenotfound">Dispositivo seleccionado não foi encontrado</string>
-    <string name="connectionerror">Erro de conexão da bomba</string>
-    <string name="danar_iob_label">IOB Bomba</string>
-    <string name="danar_dailyunits">Unidades diárias</string>
-    <string name="pump_lastbolus_label">Último bólus</string>
-    <string name="hoursago">%1$.1fh atrás</string>
-    <string name="danar_invalidinput">Entrada Inválida</string>
-    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
     <string name="reloadprofile">Recarregar perfil</string>
-    <string name="danar_viewprofile">Ver perfil</string>
-    <string name="enacted">Executado</string>
-    <string name="comment">Commentário</string>
-    <string name="success">Sucesso</string>
-    <string name="percent">Percentagem</string>
-    <string name="absolute">Absoluto</string>
-    <string name="canceltemp">Cancelar basal temp</string>
     <string name="smscommunicator">Comunicador SMS</string>
-    <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smscommunicator_allowednumbers">Número de telefones permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
@@ -304,54 +243,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
     <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
-    <string name="bolusdelivering">A enviar %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos via SMS</string>
-    <string name="glucosetype_finger">Dedo</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manual</string>
-    <string name="careportal_temporarytarget">Alvo Temporário</string>
-    <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Duração da Insulina Activa</string>
-    <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
-    <string name="danar_historyreload">Recarregar</string>
     <string name="uploading">A enviar</string>
-    <string name="danar_ebolus">E bólus</string>
-    <string name="danar_dsbolus">DS Bólus</string>
-    <string name="danar_debolus">DE Bólus</string>
-    <string name="danar_error">erro</string>
-    <string name="danar_refill">recarregar</string>
-    <string name="danar_basalhour">hora basal</string>
-    <string name="danar_glucose">glicose</string>
-    <string name="danar_carbohydrate">hidratos de carbono</string>
-    <string name="danar_alarm">alarme</string>
-    <string name="danar_totaluploaded">Total de %1$d registos carregados</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarmes</string>
-    <string name="danar_history_basalhours">Horas de Basal</string>
-    <string name="danar_history_bolus">Bolus</string>
-    <string name="danar_history_carbohydrates">Hidratos de Carbono</string>
-    <string name="danar_history_dailyinsulin">Insulina diária</string>
-    <string name="danar_history_errors">Erros</string>
-    <string name="danar_history_glucose">Glicose</string>
-    <string name="danar_history_refill">Recarregar</string>
-    <string name="danar_history_syspend">Suspender</string>
-    <string name="danar_history_connectingfor">A ligar durante %1$d s</string>
-    <string name="danar_password_title">Senha da bomba</string>
-    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
-    <string name="pumpbusy">A bomba está ocupada</string>
-    <string name="overview_bolusprogress_delivered">Entregue</string>
-    <string name="overview_bolusprogress_stoped">Parado</string>
     <string name="bolusstopped">O bolus parou</string>
     <string name="bolusstopping">A parar o bolus</string>
-    <string name="occlusion">Oclusão</string>
-    <string name="overview_bolusprogress_stop">Parar</string>
-    <string name="overview_bolusprogress_stoppressed">STOP PRESSIONADO</string>
-    <string name="waitingforpump">À espera da bomba</string>
-    <string name="overview_bolusprogress_goingtodeliver">Vai ser administrada %1$.2fU</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
-    <string name="noprofileselected">Nenhum perfil seleccionado</string>
     <string name="smscommunicator_loophasbeendisabled">Loop foi desactivado</string>
     <string name="smscommunicator_loophasbeenenabled">Loop foi activado</string>
     <string name="smscommunicator_loopisdisabled">Loop desactivado</string>
@@ -362,23 +260,23 @@
     <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
-    <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
+    <string name="smscommunicator_extendedreplywithcode">Para começar o bólus prolongado %1$.2fU/h para %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
-    <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
+    <string name="smscommunicator_extendedset">Bólus prolongado %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
     <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Início basal temp falhou </string>
-    <string name="smscommunicator_extendedfailed">Falha ao iniciar o bólus estendido</string>
+    <string name="smscommunicator_extendedfailed">Falha ao iniciar o bólus prolongado</string>
     <string name="smscommunicator_basalstopreplywithcode">Para parar a basal temporária responda com o código %1$s</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Para parar o bólus temporário responda com o código %1$s</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Para parar o bólus prolongado responda com o código %1$s</string>
     <string name="smscommunicator_tempbasalcanceled">Basal temp cancelada</string>
-    <string name="smscommunicator_extendedcanceled">Bólus estendido cancelado</string>
+    <string name="smscommunicator_extendedcanceled">Bólus prolongado cancelado</string>
     <string name="smscommunicator_tempbasalcancelfailed">Não foi possivel cancelar a basal temp</string>
-    <string name="smscommunicator_extendedcancelfailed">Falhou o cancelamento do bolus extendido</string>
+    <string name="smscommunicator_extendedcancelfailed">Falhou a cancelar bólus prolongado</string>
     <string name="smscommunicator_unknowncommand">Comando desconhecido ou resposta errada</string>
     <string name="quickwizard">Assistente Rápido</string>
     <string name="quickwizardsettings">Definições do Assistente Rápido</string>
@@ -391,22 +289,18 @@
     <string name="mealbolus">Refeição</string>
     <string name="correctionbous">Corr</string>
     <string name="actions">Acções</string>
-    <string name="androidaps_start">AndroidAPS iniciado</string>
     <string name="ns_upload_only">Envio NS apenas (sincronização desactivada)</string>
     <string name="ns_upload_only_summary">Apenas upload para NS. Não é eficaz em SGV a menos que uma fonte local como xDrip esteja selecionada. Não é eficaz em perfis enquanto NS-Profiles é usado.</string>
     <string name="pumpNotInitialized">Bomba não inicializada!</string>
-    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
     <string name="othersettings_title">Outro</string>
-    <string name="fillbolus_title">Purgar/Preencher os valores standard.</string>
+    <string name="fillbolus_title">Valor Padrão Insulina Purgar/Preencher.</string>
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
     <string name="units_colon">Unidades:</string>
     <string name="units">Unidades</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/L</string>
     <string name="dia">DIA</string>
     <string name="target_range">Intervalo Alvo:</string>
     <string name="prefs_range_title">Intervalo para visualização</string>
@@ -416,17 +310,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Reenviar Todos os Dados</string>
     <string name="open_settings_on_wear">Abrir Definições em Wear</string>
-    <string name="pumperror">Erro Bomba</string>
-    <string name="lowbattery">Bateria fraca</string>
-    <string name="pumpshutdown">Encerrar Bomba</string>
-    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
-    <string name="danarkoreanpump">DanaR Coreana</string>
     <string name="basal_rate">Valor da Basal:</string>
-    <string name="profile_set_failed">Não foi possivel configurar o perfil de basal</string>
-    <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
-    <string name="danar_disableeasymode">Desactivar modo EasyUI na bomba</string>
-    <string name="danar_enableextendedbolus">Habilitar bolus estendido na bomba</string>
-    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
     <string name="basalvaluebelowminimum">Valor da basal abaixo do mínimo. Perfil não definido!</string>
     <string name="sms_actualbg">GLIC:</string>
     <string name="sms_lastbg">Ultima Gli:</string>
@@ -434,7 +318,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Notificação em curso</string>
     <string name="old_data">DADOS ANTIGOS</string>
-    <string name="minago">%1$d min atrás</string>
     <string name="sms_minago">%1$dmin atrás</string>
     <string name="localprofile">Perfil local</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +333,22 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Actividade</string>
     <string name="removerecord">Remover registo</string>
-    <string name="danar_stats">Estatísticas DanaR</string>
-    <string name="danar_stats_cumulative_tdd">Dose diária acumulativa</string>
-    <string name="danar_stats_expweight">Dose diária exponencialmente ponderada</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bólus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Rácio</string>
-    <string name="danar_stats_amount_days"># Dias</string>
-    <string name="danar_stats_weight">Peso</string>
-    <string name="danar_stats_warning_Message">Possivelmente impreciso se foram usados bolus para purgar/preencher!</string>
-    <string name="danar_stats_olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
-    <string name="danar_stats_tbb">Basal Diária Total</string>
-    <string name="danar_stats_tbb2">Basal diária * 2</string>
-    <string name="initializing">A inicializar ...</string>
     <string name="actions_shortname">ACÇ</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">PS</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">PL</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">Início</string>
     <string name="virtualpump_shortname">BOMBAV</string>
     <string name="profileviewer_shortname">NSPerfil</string>
     <string name="treatments_shortname">TRATA</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Abreviar títulos dos separadores</string>
     <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
     <string name="always_use_shortavg_summary">Útil quando há ruído nos dados de fontes sem filtro como o xDrip.</string>
-    <string name="advancedsettings_title">Configurações Avançadas</string>
-    <string name="danar_model">Modelo: %1$02X Protocolo: %2$02X Código: %3$02X</string>
     <string name="profile">Perfil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor actual (qual seja menor) como valores máximos.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objectivo é evitar que sejam determinadas basais temporárias demasiado elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">Calibração enviada. Recepção têm de estar activada no xDrip.</string>
     <string name="smscommunicator_calibrationfailed">O xDrip não esta a receber as calibrações</string>
     <string name="pumpsuspended">Bomba suspensa</string>
-    <string name="gettingpumpstatus">A obter estado bomba</string>
-    <string name="settingtempbasal">Definindo basal temp</string>
-    <string name="stoppingtempbasal">A parar basal temp</string>
-    <string name="settingextendedbolus">Configurando bolus prolongado</string>
-    <string name="stoppingextendedbolus">Parando bolus prolongado</string>
-    <string name="updatingbasalrates">Atualizar valores das basais</string>
-    <string name="disconnecting">A desligar</string>
     <string name="executing">A Executar</string>
     <string name="virtualpump_settings">Definições da bomba virtual</string>
     <string name="virtualpump_uploadstatus_title">Enviar estado para NS</string>
-    <string name="wrongpassword">Senha incorrecta</string>
-    <string name="approachingdailylimit">Aproximação do limite diario de insulina</string>
     <string name="nsclientinternal">NSCliente</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">Mostrar IOB detalhada</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
     <string name="nosuccess">sem efeito - por favor verifique no telemóvel</string>
-    <string name="notavailable">Indisponível</string>
+    <string name="notavailable">n/d</string>
     <string name="patientage">Idade do Paciente</string>
     <string name="child">Criança</string>
     <string name="teenage">Adolescente</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">Superbólus</string>
     <string name="ns_logappstartedevent">Registar inicio da app no NS</string>
     <string name="restartingapp">A sair da aplicação para aplicar as configurações.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulina</string>
     <string name="configbuilder_insulin_description">Qual o tipo de insulina que está a utilizar?</string>
     <string name="fastactinginsulin">Insulina de ação rapida</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -598,9 +451,6 @@
     <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Última ligação</string>
-    <string name="danar_bluetooth_status">Estado Bluetooth</string>
     <string name="nav_about">Acerca</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -611,17 +461,12 @@
     <string name="wear_showbgi_summary">Adicionar BGI à linha de status</string>
     <string name="ns_noupload">Sem envio para NS</string>
     <string name="ns_noupload_summary">Todos os dados enviados para NS são descartados. AAPS está conectado ao NS, mas não é feita nenhuma alteração no NS</string>
-    <string name="basal_step">Valor da Basal</string>
-    <string name="bolus_step">Incremento de bolus</string>
-    <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Estendido</string>
+    <string name="overview_extendedbolus_cancel_button">Cancelar Bólus Prolongado</string>
     <string name="careportal_sensorage_label">Idade Sensor</string>
     <string name="careportal_canulaage_label">Idade Canula</string>
     <string name="careportal_insulinage_label">Idade Insulina</string>
-    <string name="hours">horas</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
-    <string name="careportal_pumpbatterychange">Troca bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
     <string name="nsalarm_urgenthigh">Urgência hiperglicemia</string>
     <string name="nsalarm_high">Alto</string>
@@ -645,7 +490,6 @@
     <string name="absorptionsettings_title">Configurações de absorção</string>
     <string name="absorption_maxtime_title">Tempo máx. absorção refeição [h]</string>
     <string name="absorption_maxtime_summary">Tempo em horas, espectável para que todos os hidratos de carbono da refeição sejam absorvidos</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -653,7 +497,7 @@
     <string name="openaps_short">OAPS</string>
     <string name="uploader_short">UPLD</string>
     <string name="basal_short">BAS</string>
-    <string name="virtualpump_extendedbolus_label_short">EST</string>
+    <string name="virtualpump_extendedbolus_label_short">PROL</string>
     <string name="keep_screen_on_title">Manter ecrã ligado</string>
     <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
     <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
@@ -670,7 +514,6 @@
     <string name="careportal_pump_label">BOMBA</string>
     <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activar UAM</string>
     <string name="enablesmb">Activar SMB</string>
     <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma acção mais rápida</string>
@@ -682,23 +525,7 @@
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
     <string name="activate_profile">Activar perfil</string>
-    <string name="date">Data</string>
     <string name="invalid">INVÁLIDO</string>
-    <string name="waitingforpairing">Aguardando emparelhamento na bomba</string>
-    <string name="pairingok">Emparelhamento OK</string>
-    <string name="pairingtimedout">Tempo emparelhamento excedido</string>
-    <string name="pairing">A emparelhar</string>
-    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
-    <string name="emptyreservoir">Reservatório vazio</string>
-    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
-    <string name="remaininsulinalert">Nível de insulina restante</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Bomba seleccionada</string>
-    <string name="pairpump">Emparelhar nova bomba</string>
-    <string name="bolusspeed">Velocidade Bólus</string>
-    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
-    <string name="serialnumber">Número de série</string>
     <string name="careportal_newnstreatment_percentage_label">Percentagem</string>
     <string name="careportal_newnstreatment_timeshift_label">Alteração Turno</string>
     <string name="default_temptargets">Alvo-Temp padrão</string>
@@ -708,32 +535,18 @@
     <string name="activity_target">alvo actividade</string>
     <string name="hypo_duration">duração hipo</string>
     <string name="hypo_target">alvo hipo</string>
-    <string name="danar_history_prime">Purge/Encha</string>
-    <string name="gettingextendedbolusstatus">Procurando o status do bolus estendido</string>
-    <string name="gettingbolusstatus">A obter estado bólus</string>
-    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
-    <string name="gettingpumpsettings">A obter as definições da bomba</string>
-    <string name="gettingpumptime">A obter hora bomba</string>
     <string name="reuse">reutilizar</string>
     <string name="wearcontrol_title">Controles do Relógio</string>
     <string name="wearcontrol_summary">Definir Alvo-Temp and inserir Tratamentos do relógio.</string>
-    <string name="connectiontimedout">Ligação expirou</string>
     <string name="food">Alimentos</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<nenhum>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Gor</string>
     <string name="active"><![CDATA[<Activo>]]></string>
-    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d sec.</string>
-    <string name="processinghistory">A processar acção</string>
-    <string name="startingbolus">A iniciar administração de bolus</string>
     <string name="executingrightnow">Comando será executado agora</string>
-    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
     <string name="pump_unreachable">Bomba inacessível</string>
     <string name="missed_bg_readings">Leituras Glic. perdidas</string>
     <string name="raise_notifications_as_android_notifications">Usar as notificações do sistema para alertas e notificações</string>
@@ -743,9 +556,6 @@
     <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Watchdog BT</string>
-    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma conexão com bomba for possível. Este parâmetro pode ser util em alguns telefones, onde a pilha bluetooth congela.</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
     <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
     <string name="bgsource_upload">Configurações de upload de BG</string>
@@ -758,12 +568,9 @@
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
     <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
-    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
     <string name="overview_editquickwizard_usebg">Cálculos Glic</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo de Bólus IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
@@ -781,9 +588,7 @@
     <string name="closedmodeenabled">Modo fechado ativado</string>
     <string name="maxiobset">IOB máxima definida correctamente</string>
     <string name="hasbgdata">Glicemia disponivel desde a fonte selecionada</string>
-    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
-    <string name="combo_programming_bolus">A programar a bomba para injectar o bolus</string>
+    <string name="combo_programming_bolus">A programar bomba para administrar bólus</string>
     <string name="combo_refresh">Actualizar</string>
     <string name="combo_pump_state_label">Estado</string>
     <string name="combo_pump_activity_label">Actividade</string>
@@ -793,17 +598,16 @@
     <string name="combo_pump_state_suspended_due_to_error">Suspenso devido ao erro</string>
     <string name="combo_pump_state_suspended_by_user">Suspenso pelo utilizador</string>
     <string name="combo_pump_state_running">A correr</string>
-    <string name="combo_pump_action_cancelling_tbr">Cancelar TBR</string>
-    <string name="combo_pump_action_setting_tbr">A definir TBR (%1$d%% / %2$d min)</string>
+    <string name="combo_pump_action_cancelling_tbr">A Cancelar DBT</string>
+    <string name="combo_pump_action_setting_tbr">A definir DBT (%1$d%% / %2$d min)</string>
     <string name="combo_pump_action_bolusing">Injectando (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">A actualizar</string>
     <string name="combo_pump_unsupported_operation">Operação solicitada não suportada pela bomba</string>
-    <string name="combo_low_suspend_forced_notification">Ultilização nao segura: bolus estendudos ou multionda estão activos. Modo do loop foi alterado para apenas suspender em limite inferior por 6h. Apenas são suportados bolus normais em modo loop</string>
+    <string name="combo_low_suspend_forced_notification">Utilização não segura: bólus prolongados ou multi-onda estão activos. Modo do loop foi alterado para apenas suspender em limite inferior por 6h. Apenas são suportados bólus normais em modo loop</string>
     <string name="combo_force_disabled_notification">Utilização insegura: A bomba utiliza uma perfil de basal diferente do primeiro. O loop foi desactivado. Seleccionar o primeiro perfil da bomba e reinicie.</string>
     <string name="bolus_frequency_exceeded">Um bolus com o mesmo valor foi introduzido nos 2 últimos minutos. Para evitar introduções acidentais e segurança contra bugs existentes o bolus foi cancelado.</string>
     <string name="combo_pump_connected_now">Agora</string>
     <string name="combo_activity_reading_pump_history">A ler histórico bomba</string>
-    <string name="danar_history">Histórico da Bomba</string>
     <string name="combo_activity_setting_basal_profile">A definir perfil basal</string>
     <string name="combo_pump_cartridge_low_warrning">Nível cartucho da bomba está baixo</string>
     <string name="combo_pump_battery_low_warrning">Bateria da bomba está fraca</string>
@@ -819,12 +623,9 @@
     <string name="combo_error_partial_bolus_delivered">Apenas %1$.2f U do bolus de %2$.2f U foi injectado de devido a um erro. Por favor verifique a bomba e tome as medidas necessárias.</string>
     <string name="combo_error_bolus_verification_failed">A injeção do bolus e a verificação do histórico da bomba falharam, por favor verifique a bomba. Se o bolus foi injetado será adicionado ao histórico de tratamentos durante a próxima conexão com a bomba.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Não há insulina suficiente no reservatório para bolus</string>
-    <string name="extendedbolusdeliveryerror">Erro na entrega Bólus Estendido</string>
+    <string name="extendedbolusdeliveryerror">Erro na administração Bólus Prolongado</string>
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d mins</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
@@ -835,8 +636,6 @@
     <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
     <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
     <string name="enablesmbwithhightemptarget_summary">SMB activo com alvos temporários elevados em curso (exercicio)</string>
-    <string name="let_temp_basal_run">Permitir basal temp correr</string>
-    <string name="mute">Silêncio</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Hidratos</string>
     <string name="overview_buttons_selection">Botões</string>
@@ -878,7 +677,6 @@
     <string name="closed_loop_disabled_on_dev_branch">A correr a versão dev. O Loop fechado está desabilitado.</string>
     <string name="engineering_mode_enabled">Modo engenheiro activado</string>
     <string name="not_eng_mode_or_release">Modo de engenharia não habilitado e não no na versão mestra</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">A ler perfil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi injectado. Por favor, verifique se bolus ainda é necessário.</string>
     <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
@@ -893,7 +691,7 @@
     <string name="combo_suspious_bolus_time">Hora/data da entrega do bólus na bomba parece errado, IOB aparentemente está incorrecto. Verifique hora/data na bomba.</string>
     <string name="profileswitch_ismissing">TrocaPerfil em falta. Por favor faça uma troca de perfil ou pressione \"Activar Perfil\" em PerfilLocal.</string>
     <string name="combo_bolus_count">Contagem Bólus</string>
-    <string name="combo_tbr_count">Contagem TBR</string>
+    <string name="combo_tbr_count">Contagem DBT</string>
     <string name="pumpisnottempbasalcapable">A bomba não é capaz de basais temporárias</string>
     <string name="novalidbasalrate">Nenhum valor de basal temporaria valido foi lido da bomba</string>
     <string name="closedmodedisabledinpreferences">Loop fecchado disabilitado nas preferências</string>
@@ -901,16 +699,11 @@
     <string name="smbdisabledinpreferences">SMB desactivado nas configurações</string>
     <string name="uamdisabledinpreferences">UAM desactivado nas configurações</string>
     <string name="uamdisabledoref1notselected">UAM desactivado porque confia no plugin de sensibilidade Oref1</string>
-    <string name="limitingbasalratio">A basal max está limitada a %1$.2f U/h por %2$s</string>
-    <string name="pumplimit">limite bomba</string>
-    <string name="itmustbepositivevalue">deve ser valor positivo</string>
     <string name="maxbasalmultiplier">multiplicador de basal máx</string>
     <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
     <string name="smb_frequency_exceeded">Um bolus foi injectado nos últimos 3 minutos, saltando SMB</string>
     <string name="basal_set_correctly">Basal correctamente definida</string>
-    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
-    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
-    <string name="limitingextendedbolus">A limitar bólus estendido para %1$.1f U porque %2$s</string>
+    <string name="limitingextendedbolus">A limitar bólus prolongado para %1$.1f U porque %2$s</string>
     <string name="limitingmaxiob">A limitar IOB máx. para %1$.1f U porque %2$s</string>
     <string name="limitingcarbs">A limitar hidratos para %1$d g porque %2$s</string>
     <string name="limitingiob">A limitar IOB para %1$.1f U porque %2$s</string>
@@ -924,7 +717,6 @@
     <string name="smbnotallowedinopenloopmode">SMB não permitido no modo open loop</string>
     <string name="food_short">Alimentos</string>
     <string name="reset">repor</string>
-    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
     <string name="loopdisconnectedfor">Desligado (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Máximo total IOB OpenAPS não pode superar [U]</string>
     <string name="openapssmb_maxiob_summary">Este valor é chamado de Max IOB em contexto de OpenAPS\nOpenAPS não adicionará mais insulina se o IOB atual for maior que este valor</string>
@@ -940,7 +732,6 @@
     <string name="nav_setupwizard">Assistente de Configuração</string>
     <string name="setupwizard_finish">TERMINAR</string>
     <string name="setupwizard_language_prompt">Selecione o seu Idioma</string>
-    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
     <string name="firstinsulinincrement">Primeiro incremento insulina</string>
     <string name="secondinsulinincrement">Segundo incremento insulina</string>
     <string name="thirdinsulinincrement">Terceiro incremento insulina</string>
@@ -962,8 +753,7 @@
     <string name="value_unavailable_short">n/a</string>
     <string name="virtualpump_type">Tipo da Bomba Virtual</string>
     <string name="virtualpump_definition">Definição da Bomba</string>
-    <string name="virtualpump_pump_def">Bólus: Passo=%1$s\nBólus Estendido: [Passo=%2$s, Duração=%3$smin -%4$sh] \nBasal: Passo=%5$s\ nTBR: %6$s (por %7$s), Duração=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
+    <string name="virtualpump_pump_def">Bólus: Passo=%1$s\nBólus Prolongado: [Passo=%2$s, Duração=%3$smin -%4$sh] \nBasal: Passo=%5$s\ nDBT: %6$s (por %7$s), Duração=%8$smin-%9$sh\n%10$s</string>
     <string name="ns_autobackfill_title">Preenchimentoauto Glicemia</string>
     <string name="wear_wizard_settings">Definições do Assistente Rápido</string>
     <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
@@ -994,22 +784,6 @@
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
     <string name="exit">Sair</string>
-    <string name="danar_useroptions">Opções do utilizador</string>
-    <string name="danar_timedisplay">Formato hora</string>
-    <string name="danar_buttonscroll">Botão rolamento</string>
-    <string name="danar_beep">Sinal ao pressionar botão</string>
-    <string name="danar_pumpalarm">Alarme</string>
-    <string name="danar_pumpalarm_sound">Som</string>
-    <string name="danar_pumpalarm_vibrate">Vibrar</string>
-    <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">LCD na hora [segundos]</string>
-    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
-    <string name="danar_glucoseunits">Unidades de Glucose</string>
-    <string name="danar_shutdown">Desligar [horas]</string>
-    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
-    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
-    <string name="option_on">Ligado</string>
-    <string name="option_off">Desligado</string>
     <string name="open_navigation">Abrir a navegação</string>
     <string name="close_navigation">Fechar a navegação</string>
     <string name="nav_plugin_preferences">Preferências plugin</string>
@@ -1029,8 +803,6 @@
     <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
     <string name="custom">Personalizado</string>
-    <string name="largetimedifftitle">Grande diferença Horária</string>
-    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
     <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Em caso contrario pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
@@ -1056,17 +828,10 @@
     <string name="setupwizard_preferred_aps_mode">Modo APS preferido</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Cumprimento</string>
     <string name="sendlogfiles">Enviar os ficheiros de registo do dia de hoje para os programadores. Situação inesperada.</string>
-    <string name="maxbolusviolation">Transgressão Bólus máx</string>
-    <string name="commanderror">Erro no comando</string>
-    <string name="speederror">Erro velocidade</string>
-    <string name="insulinlimitviolation">Transgressão limite insulina</string>
     <string name="loop_openmode_min_change">Pedido de mudança mínima [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">A app mostrará um pedido de alteração apenas se a mudança for superior a este valor em %. O valor padrão é 20%</string>
-    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="searching_for_devices">A pesquisar dispositivos…</string>
-    <string name="please_wait">Por favor aguarde…</string>
     <string name="pairing_completed">Emparelhamento concluído</string>
     <string name="code_compare">Os códigos exibidos neste dispositivo e na sua bomba correspondem?</string>
     <string name="insight_pairing">Emparelhamento Insight</string>
@@ -1084,7 +849,7 @@
     <string name="log_battery_changes">Registar mudanças de bateria</string>
     <string name="log_operating_mode_changes">Alterações do modo de funcionamento de registo</string>
     <string name="log_alerts">Alertas de registo</string>
-    <string name="enable_tbr_emulation">Ativar a emulação TBR</string>
+    <string name="enable_tbr_emulation">Activar a emulação DBT</string>
     <string name="enable_tbr_emulation_summary">Usar bólus prolongados em vez de basais temporárias para contornar o limite de 250%%</string>
     <string name="disconnect_delay">Atraso de desconexão [s]</string>
     <string name="serial_number">Número de série</string>
@@ -1112,17 +877,17 @@
     <string name="started">Iniciado</string>
     <string name="stopped">Parado</string>
     <string name="tbr_formatter">%1$d%% para %2$d / %3$d min</string>
-    <string name="extended_bolus">Bólus estendido</string>
+    <string name="extended_bolus">Bólus Prolongado</string>
     <string name="multiwave_bolus">Bólus Multi-Onda</string>
     <string name="eb_formatter">%1$.2f / %2$.2f U por %3$d min</string>
-    <string name="enable_tbr_over_notification">Desativar notificação do fim da basal temporária\n(configuração da bomba)</string>
-    <string name="disable_tbr_over_notification">Desativar notificação do fim da basal temporária\n(configuração da bomba)</string>
+    <string name="enable_tbr_over_notification">Activar notificação do fim da basal temporária\n(configuração da bomba)</string>
+    <string name="disable_tbr_over_notification">Desactivar notificação do fim da basal temporária\n(configuração da bomba)</string>
     <string name="refresh">Actualizar</string>
     <string name="description_pump_insight_local">Integração de bomba para bombas Accu-Chek Insight</string>
     <string name="not_inserted">Não inserido</string>
     <string name="short_status_last_connected">Última ligação:%1$d minutos atrás</string>
-    <string name="short_status_tbr">Basal temporária: %1$d%% para %2$d / %3$d minutos</string>
-    <string name="short_status_extended">Estendido: %1$.2f / %2$.2f U por %3$d min</string>
+    <string name="short_status_tbr">DBT: %1$d%% para %2$d / %3$d minutos</string>
+    <string name="short_status_extended">Prolongado: %1$.2f / %2$.2f U por %3$d min</string>
     <string name="short_status_multiwave">Multionda: %1$.2f / %2$.2f U por %3$d min</string>
     <string name="short_status_tdd">TDD: %1$.2f</string>
     <string name="short_status_reservoir">Reser:%1$.2fU</string>
@@ -1155,7 +920,6 @@
     <string name="isequalorgreater">é igual ou maior que</string>
     <string name="isgreater">é maior que</string>
     <string name="isnotavailable">não está disponível</string>
-    <string name="unknown">desconhecido</string>
     <string name="glucoseisnotavailable">Glicose não está disponível</string>
     <string name="glucosecomparedmgdl">Glicose %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicose %1$s %2$.1f %3$s</string>
@@ -1172,23 +936,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatização</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Registar mudança de sensor para NS</string>
     <string name="dexcom_lognssensorchange_summary">Criar evento \"Mudança de Sensor\" automaticamente no NS aquando do início do sensor</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
     <string name="summary_tidepool_username">Nome de utilizador no Tidepool, normalmente seu endereço de e-mail</string>
     <string name="title_tidepool_username">Nome de Utilizador</string>
     <string name="summary_tidepool_password">Palavra-passe da conta Tidepool</string>
@@ -1229,9 +980,8 @@
     <string name="running_invalid_version">Detectamos que está  a correr uma versão inválida. Loop desactivado!</string>
     <string name="old_version">versão antiga</string>
     <string name="very_old_version">versão muito antiga</string>
-    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a LGS após %2$d dias, o loop será desactivado após %3$d dias</string>
+    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a SGB após %2$d dias, o loop será desactivado após %3$d dias</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">App Dexcom (com patch)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Receber valores da Glicemia da app Dexcom (com patch).</string>
@@ -1299,7 +1049,7 @@
     <string name="medtronic_pump_battery_select">Tipo de Bateria (Visão Detalhada)</string>
     <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
     <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (Visão estendida)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
     <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
     <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
@@ -1308,15 +1058,12 @@
     <string name="rileylink_scanner_scan_stop">PARAR</string>
     <string name="rileylink_scanner_selected_device">Seleccionado</string>
     <string name="rileylink_scanner_title">Procura RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth de energia baixa (LE) não suportado.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth não está activado.</string>
-    <string name="location_not_found_title">Localização Não Está Activada</string>
-    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
     <string name="location_yes">Activar</string>
     <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
     <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
     <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
+    <string name="common_never">Nunca</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Definições</string>
     <string name="rileylink_settings_tab2">Histórico</string>
@@ -1352,7 +1099,6 @@
     <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
     <string name="rileylink_error_pump_unreachable">Bomba inacessível</string>
     <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
-    <string name="rileylink_error_address_not_set_short">Não definido</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1392,13 +1138,13 @@
     <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a TBR actual.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a TBR atual. A parar a operação.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar o DBT actual. A parar a operação.</string>
     <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi entregue, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR não pode ser definida.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a TBR atual.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definido.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar o DBT actual.</string>
     <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
     <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
     <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>
@@ -1422,7 +1168,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Entregue esta parte do resultado do assistente de bólus [%]</string>
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
@@ -1430,7 +1175,6 @@
     <string name="time_range">Intervalo de tempo</string>
     <string name="timerange_value">O tempo está entre %1$s e %2$s</string>
     <string name="between">Entre </string>
-    <string name="close">Fechar</string>
     <string name="increasingmaxbasal">Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil</string>
     <string name="smscommunicator_messagebody">Corpo da mensagem inválido</string>
     <string name="format_bg_isf">%1$s FSI: %2$.1f</string>
@@ -1448,8 +1192,8 @@
     <string name="common_off">Desligado</string>
     <string name="objectives_button_unfinish">Limpar terminado</string>
     <string name="objectives_button_unstart">Limpar iniciado</string>
-    <string name="timedetection">Detecção de tempo</string>
     <string name="doyouwantresetstart">Deseja reiniciar o objectivo? Pode perder seu progresso.</string>
+    <string name="time_or_timezone_change">Alterar Hora e/ou Fuso Horário na Bomba</string>
     <string name="nopumpselected">Nenhuma bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione as unidades em que deseja exibir os valores</string>
     <string name="ns_ploadlocalprofile">Carregar as alterações do perfil local para NS</string>
@@ -1474,7 +1218,6 @@
     <string name="nav_survey">Questionário</string>
     <string name="invalidage">Entrada de idade inválida</string>
     <string name="invalidweight">Entrada de peso inválida</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
     <string name="tdd">TDD</string>
@@ -1487,16 +1230,12 @@
     <string name="randombg_short">GLIC</string>
     <string name="tools">Ferramentas</string>
     <string name="show_calculation">Mostrar Localização</string>
-    <string name="error">Erro</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Evento de automação</string>
     <string name="alreadyset">Já definido</string>
-    <string name="message">Mensagem</string>
     <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
-    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
-    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
-    <string name="extended_bolus_short">BE</string>
+    <string name="ebstopsloop">O uso do Bólus Prolongado irá parar o modo Closed Loop no tempo do bólus prolongado. Quer realmente isso?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Prolongado</string>
+    <string name="extended_bolus_short">BP</string>
     <string name="phonechecker">\"VerificadorTelefone\"</string>
     <string name="chartmenu">Menu do Gráfico</string>
     <string name="sensitivity_short">AS</string>
@@ -1533,4 +1272,83 @@
     <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
     <string name="passwords_dont_match">As passwords não coincidem</string>
     <string name="current_master_password">Password Mestre actual</string>
+    <string name="statuslights">Luzes de Estado</string>
+    <string name="statuslights_copy_ns">Copiar definições do NS</string>
+    <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
+    <string name="classic_desrciption">Tema gráfico original</string>
+    <string name="buttonson_desrciption">Os botões são sempre exibidos na parte inferior do ecrã</string>
+    <string name="skin">Tema gráfico</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Beep Bólus Activado</string>
+    <string name="omnipod_config_beep_basal_enabled">Beep Basal Activado</string>
+    <string name="omnipod_config_beep_smb_enabled">Beep SMB Activado</string>
+    <string name="omnipod_config_beep_tbr_enabled">Beep DBT Activado</string>
+    <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Gestão Pod</string>
+    <string name="omnipod_pod_status">Estado do Pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U restante</string>
+    <string name="omnipod_reservoir_over50">Mais de 50 U</string>
+    <string name="omnipod_pod_address">Endereço do Pod</string>
+    <string name="omnipod_pod_expiry">Pod Expira</string>
+    <string name="omnipod_pod_name_no_info">Sem info</string>
+    <string name="omnipod_pod_no_pod_connected">Nenhum Pod ligado</string>
+    <string name="omnipod_pod_not_initalized">Não inicializado</string>
+    <string name="omnipod_pod_active_alerts">Alertas Pod Activos</string>
+    <string name="omnipod_ack_short">Reco Alertas</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
+    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_cmd_reset_pod">Repor Pod</string>
+    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
+    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
+    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporária (Forçado pelo controlador)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporária (Forçado pelo utilizador)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
+    <string name="omnipod_cmd_get_pod_status">Obter Status do Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Obter Pod Info</string>
+    <string name="omnipod_cmd_set_time">Definir Hora</string>
+    <string name="omnipod_cmd_configure_alerts">Configurar Alertas</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Reconhecer Alertas</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
+    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
+    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
+    <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
+    <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
+    <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desacitvar Pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
+    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
+    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
+    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
+    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
+    <string name="omnipod_rl_stats">Estatísticas RL</string>
+    <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index f4f0cf24c9..bd7dedb65d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Resetează bazele de date</string>
     <string name="reset_db_confirm">Sigur resetați bazele de date?</string>
     <string name="nav_exit">Ieșire</string>
-    <string name="danar_useextended_title">Folosiți bolusuri extinse pentru &gt;200%%</string>
-    <string name="danar_bt_name_title">Dispozitive bluetooth DanaR</string>
     <string name="ns_sync_use_absolute_title">Folosește întotdeauna valori absolute ale bazalei</string>
     <string name="alert_dialog_storage_permission_text">Restartați telefonul sau reporniți aplicația AndroidAPS din System Settings \naltfel AndroidAPS nu va putea face loguri (importante pentru verificarea corectitudinii funcționării algoritmilor)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Acest dispozitiv nu permite folosirea excluderii din lista de optimizare a bateriei - se poate să întâmpinați probleme de performanță.</string>
     <string name="description_actions">Butoane pentru accesarea celor mai comune facilităţi</string>
-    <string name="description_careportal">Accesaţi secţiunea de loguri avansate.</string>
     <string name="description_config_builder">Folosit pentru configurarea facilităţilor active</string>
     <string name="description_objectives">Program de învăţare</string>
     <string name="description_food">Afişează mâncărurile predefinite în Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Foloseşte profilul predefinit deja în Nightscout</string>
     <string name="description_profile_simple">Definește un profil cu un singur bloc de timp.</string>
     <string name="description_pump_combo">Integrare cu pompele Accu-Chek, necesită aplicația Ruffy</string>
-    <string name="description_pump_dana_r">Integrare cu pompele DANA Diabcare R</string>
-    <string name="description_pump_dana_r_korean">Integrare cu pompele DANA Diabcare R coreene</string>
-    <string name="description_pump_dana_r_v2">Integrare cu pompele DANA Diabcare R cu firmware upgradat</string>
-    <string name="description_pump_dana_rs">Integrare cu pompele DANA Diabcare RS</string>
     <string name="description_pump_mdi">Integrare cu pompă virtuală, pentru persoanele ce folosesc terapia cu pen</string>
     <string name="description_pump_virtual">Integrare cu pompele ce nu au încă un driver software disponibil (Buclă Deschisă)</string>
     <string name="description_sensitivity_aaps">Sensibilitatea este calculată la fel ca în algoritmul Oref0, dar se poate specifica un interval de timp în trecut. Absorbția minimă de carbohidrați este calculată din parametrul echivalent, stabilit în preferințe.</string>
@@ -53,13 +46,6 @@
     <string name="description_wear">Monitorizează și controlează aplicația AndroidAPS folosind smartwatchul WearOS.</string>
     <string name="description_xdrip_status_line">Afișează informații privind starea buclei pe watchface-ul xDrip+.</string>
     <string name="description_sms_communicator">Controlare de la distanță a AndroidAPS folosind comenzi date prin SMS.</string>
-    <string name="nsprofileview_units_label">Unități</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Bazală</string>
-    <string name="nsprofileview_target_label">Țintă</string>
-    <string name="noprofileset">NICIUN PROFIL SETAT</string>
     <string name="treatments_insulin_label_string">Insulină:</string>
     <string name="treatments_carbs_label_string">Carbohidrați:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -75,15 +61,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Carbohidrați</string>
     <string name="treatments_wizard_correction_label">Corecție</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">IOB bolus</string>
     <string name="openapsma_run">Execută</string>
     <string name="vitualpump_label">POMPĂ VIRTUALĂ</string>
-    <string name="pump_basebasalrate_label">Rată bazală normală</string>
-    <string name="pump_tempbasal_label">Bazală temporară</string>
-    <string name="virtualpump_extendedbolus_label">Bolus extins</string>
-    <string name="pump_battery_label">Baterie</string>
-    <string name="pump_reservoir_label">Rezervor</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Ultima execuție</string>
     <string name="openapsma_inputparameters_label">Parametri de intrare</string>
@@ -94,16 +74,11 @@
     <string name="openapsma_mealdata_label">Date despre masă</string>
     <string name="result">Rezultat</string>
     <string name="openapsma_noglucosedata">Nu există date despre glicemie</string>
-    <string name="nochangerequested">Nu este solicitată nicio schimbare</string>
     <string name="openapsma_request_label">Solicită</string>
-    <string name="rate">Rată</string>
-    <string name="duration">Durată</string>
-    <string name="reason">Motiv</string>
     <string name="glucose">Glicemie</string>
     <string name="delta">Diferență</string>
     <string name="sms_delta">Diferență:</string>
     <string name="configbuilder">Configurator</string>
-    <string name="objectives">Obiective</string>
     <string name="overview">Privire de ansamblu</string>
     <string name="nsprofile">Profil NS</string>
     <string name="simpleprofile">Profil simplu</string>
@@ -121,7 +96,6 @@
     <string name="configbuilder_general">General</string>
     <string name="configbuilder_general_description">Există pluginuri generale pe care le-ați putea găsi utile.</string>
     <string name="configbuilder_constraints_description">Ce constrângeri sunt aplicate?</string>
-    <string name="days">zile</string>
     <string name="constraints">Constrângeri</string>
     <string name="loop">Buclă</string>
     <string name="configbuilder_loop">Buclă</string>
@@ -137,7 +111,6 @@
     <string name="openapsma_disabled">Modul inactiv</string>
     <string name="constraints_violation">Încălcare a unei limite</string>
     <string name="treatmentdeliveryerror">Eroare la livrarea bolusului</string>
-    <string name="tempbasaldeliveryerror">Eroare la setare bazală temporară</string>
     <string name="setbasalquestion">Acceptă noua bazală temporară:</string>
     <string name="overview_treatment_label">Tratament</string>
     <string name="overview_calculator_label">Calculator</string>
@@ -147,7 +120,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazală</string>
     <string name="sms_basal">Bazală:</string>
-    <string name="carbs">Carbohidrați</string>
     <string name="changeyourinput">Schimbați ceea ce ați introdus!</string>
     <string name="configbuilder_bgsource">Sursă glicemie</string>
     <string name="configbuilder_bgsource_description">De unde trebuie să primească AndroidAPS datele?</string>
@@ -164,24 +136,6 @@
     <string name="treatments_wizard_basaliob_label">IOB bazală</string>
     <string name="bolusconstraintapplied">Constrângere de bolus aplicată</string>
     <string name="carbsconstraintapplied">Constrângere de carbohidrați aplicată</string>
-    <string name="careportal_bgcheck">Verificare glicemie</string>
-    <string name="careportal_announcement">Anunț</string>
-    <string name="careportal_note">Notă</string>
-    <string name="careportal_question">Întrebare</string>
-    <string name="careportal_exercise">Activitate fizică</string>
-    <string name="careportal_pumpsitechange">Schimbare loc pompă</string>
-    <string name="careportal_cgmsensorinsert">Inserare senzor</string>
-    <string name="careportal_cgmsensorstart">Start senzor</string>
-    <string name="careportal_insulincartridgechange">Schimbare cartuș insulină</string>
-    <string name="careportal_snackbolus">Gustare</string>
-    <string name="careportal_mealbolus">Masă</string>
-    <string name="careportal_correctionbolus">Bolus de corecție</string>
-    <string name="careportal_combobolus">Bolus combo</string>
-    <string name="careportal_tempbasalstart">Start bazală temporară</string>
-    <string name="careportal_tempbasalend">Sfârșit bazală temporară</string>
-    <string name="careportal_carbscorrection">Corecție de carbohidrați</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Tip eveniment</string>
     <string name="careportal_newnstreatment_other">Altul</string>
     <string name="careportal_newnstreatment_meter">Glucometru</string>
     <string name="careportal_newnstreatment_sensor">Senzor</string>
@@ -212,34 +166,12 @@
     <string name="openapsma_maxbasal_summary">Această valoare este denumită bazală maximă în contextul OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximul de bazală IOB pe care o poate livra OpenAPS[U]</string>
     <string name="openapsma_maxiob_summary">Această valoare este denumită Max IOB în contextul OpenAPS\nAceastă valoare este implicit nulă (0). După câteva zile sau săptămâni, în funcție de opțiunea dumneavoastră, puteți ajusta acest număr.</string>
-    <string name="dismiss">RENUNȚĂ</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Se conectează</string>
-    <string name="connected">Conectat</string>
-    <string name="disconnected">Deconectat</string>
     <string name="end_user_license_agreement">Licență utilizator final</string>
     <string name="end_user_license_agreement_text">NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
     <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
     <string name="save">Salvează</string>
-    <string name="nobtadapter">Nu s-a găsit niciun adaptor bluetooth</string>
-    <string name="devicenotfound">Dispozitivul selectat nu a fost găsit</string>
-    <string name="connectionerror">Eroare de conexiune cu pompa</string>
-    <string name="danar_iob_label">IOB din pompă</string>
-    <string name="danar_dailyunits">Unități zilnic</string>
-    <string name="pump_lastbolus_label">Ultimul bolus</string>
-    <string name="hoursago">%1$.1f o în urmă</string>
-    <string name="danar_invalidinput">Date de intrare incorecte</string>
-    <string name="danar_valuenotsetproperly">Valoare setată incorect</string>
     <string name="reloadprofile">Reîncarcă profilul</string>
-    <string name="danar_viewprofile">Afișează profilul</string>
-    <string name="enacted">Executat</string>
-    <string name="comment">Comentariu</string>
-    <string name="success">Succes</string>
-    <string name="percent">Procent</string>
-    <string name="absolute">Absolut</string>
-    <string name="canceltemp">Renunță la bazala temporară</string>
     <string name="smscommunicator">Comunicator SMS</string>
-    <string name="waitingforpumpresult">Se așteaptă rezultatul</string>
     <string name="smscommunicator_allowednumbers">Numere de telefon permise</string>
     <string name="smscommunicator_allowednumbers_summary">+ XXXXXXXXXX; + YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Pentru a livra un bolus de %1$.2fU răspundeți cu codul %2$s</string>
@@ -248,52 +180,13 @@
     <string name="bolusdelivered">Bolusul de %1$.2fU a fost livrat cu succes</string>
     <string name="bolusrequested">Se va livra un bolus de %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolusul de %1$.2fU a fost livrat cu succes</string>
-    <string name="bolusdelivering">Se livrează %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">Permite comenzi de la distanță, prin SMS</string>
-    <string name="glucosetype_finger">Deget</string>
-    <string name="glucosetype_sensor">Senzor</string>
-    <string name="manual">Manual</string>
     <string name="danarprofile">Setări de profil DanaR</string>
     <string name="danarprofile_dia">DIA [o]</string>
     <string name="danarprofile_dia_summary">Durata de Acțiune a Insulinei (DIA)</string>
-    <string name="failedupdatebasalprofile">Setarea profilului bazalei eșuată</string>
-    <string name="danar_historyreload">Reîncărcare</string>
     <string name="uploading">Se trimite</string>
-    <string name="danar_ebolus">Bolus E</string>
-    <string name="danar_dsbolus">Bolus DS</string>
-    <string name="danar_debolus">Bolus DE</string>
-    <string name="danar_error">eroare</string>
-    <string name="danar_refill">reumplere</string>
-    <string name="danar_basalhour">bazală pe oră</string>
-    <string name="danar_glucose">glicemie</string>
-    <string name="danar_carbohydrate">carbohidrat</string>
-    <string name="danar_alarm">alarmă</string>
-    <string name="danar_totaluploaded">Au fost încărcate %1$d înregistrări</string>
-    <string name="danar_sbolus">Bolus S</string>
-    <string name="danar_history_alarm">Alarme</string>
-    <string name="danar_history_basalhours">Ore bazale</string>
-    <string name="danar_history_bolus">Bolusuri</string>
-    <string name="danar_history_carbohydrates">Carbohidrați</string>
-    <string name="danar_history_dailyinsulin">Insulină zilnică</string>
-    <string name="danar_history_errors">Erori</string>
-    <string name="danar_history_glucose">Glicemie</string>
-    <string name="danar_history_refill">Reumplere</string>
-    <string name="danar_history_syspend">Suspendare</string>
-    <string name="danar_history_connectingfor">Conectat de %1$d s</string>
-    <string name="danar_password_title">Parola pompei</string>
-    <string name="wrongpumppassword">Parola pompei greșită!</string>
-    <string name="pumpbusy">Pompa face altă acțiune</string>
-    <string name="overview_bolusprogress_delivered">Livrat</string>
-    <string name="overview_bolusprogress_stoped">Oprit</string>
     <string name="bolusstopped">Bolus oprit</string>
     <string name="bolusstopping">Se oprește bolusul</string>
-    <string name="occlusion">Ocluzie</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STOP APĂSAT</string>
-    <string name="waitingforpump">Se așteaptă pompa</string>
-    <string name="overview_bolusprogress_goingtodeliver">Se va livra un bolus de %1$.2fU</string>
-    <string name="youareonallowedlimit">Ați atins limita permisă</string>
-    <string name="noprofileselected">Niciun profil selectat</string>
     <string name="smscommunicator_loophasbeendisabled">Bucla a fost dezactivată</string>
     <string name="smscommunicator_loophasbeenenabled">Bucla a fost activată</string>
     <string name="smscommunicator_loopisdisabled">Bucla este dezactivată</string>
@@ -330,11 +223,9 @@
     <string name="mealbolus">Masă</string>
     <string name="correctionbous">Corecție</string>
     <string name="actions">Acțiuni</string>
-    <string name="androidaps_start">AndroidAPS a pornit</string>
     <string name="ns_upload_only">Doar încărcare în NS (sincronizare dezactivată)</string>
     <string name="ns_upload_only_summary">Doar încărcare în NS. Nu are efect asupra SGV decât în cazul selectării unei surse locale, precum xDrip. Nu acționează asupra Profilurilor cât timp se folosesc profilurile din Nightscout.</string>
     <string name="pumpNotInitialized">Pompa nu este inițializată!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pompa nu este inițializată, profilul nu este setat!</string>
     <string name="primefill">Pregătire/umplere</string>
     <string name="fillwarning">Asigurați-vă că aveți cantitatea specificată de instrucțiunile setului de infuzie!</string>
     <string name="othersettings_title">Alte</string>
@@ -342,8 +233,6 @@
     <string name="button1">Buton 1</string>
     <string name="button2">Buton 2</string>
     <string name="button3">Buton 3</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="target_range">Intervalul țintă:</string>
     <string name="prefs_range_title">Intervalul pentru vizualizare</string>
     <string name="prefs_range_summary">Valoarea maximă și minimă pentru graficele din vizualizare și pentru smartwatch</string>
@@ -352,17 +241,7 @@
     <string name="wear">Ceas</string>
     <string name="resend_all_data">Retrimite toate datele</string>
     <string name="open_settings_on_wear">Deschide setările pe Wear</string>
-    <string name="pumperror">Eroare a pompei</string>
-    <string name="lowbattery">Baterie aproape descărcată</string>
-    <string name="pumpshutdown">Pompa oprită</string>
-    <string name="batterydischarged">Bateria pompei este descărcată</string>
-    <string name="danarkoreanpump">DanaR din Coreea</string>
     <string name="basal_rate">Rată bazală:</string>
-    <string name="profile_set_failed">Setarea profilului bazalei a eșuat</string>
-    <string name="profile_set_ok">Profilul bazalei a fost modificat în pompă</string>
-    <string name="danar_disableeasymode">Dezactivează modul EasyUI în pompă</string>
-    <string name="danar_enableextendedbolus">Activează bolusuri extinse în pompă</string>
-    <string name="danar_switchtouhmode">Schimbă din modul U/z în U/o în pompă</string>
     <string name="basalvaluebelowminimum">Valoarea bazalei este sub minimul permis. Profilul nu este setat!</string>
     <string name="sms_actualbg">Glicemie:</string>
     <string name="sms_lastbg">Ultima glicemie:</string>
@@ -370,7 +249,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Notificare activă</string>
     <string name="old_data">DATE VECHI</string>
-    <string name="minago">%1$d min în urmă</string>
     <string name="sms_minago">acum %1$dmin</string>
     <string name="localprofile">Profil local</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -385,41 +263,22 @@
     <string name="eatingsoon">Masă în curând</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Activitate</string>
-    <string name="danar_stats">Statistici DanaR</string>
-    <string name="danar_stats_cumulative_tdd">TDD cumulat</string>
-    <string name="danar_stats_expweight">TDD estimat exponențial</string>
-    <string name="danar_stats_basalrate">Bazală</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Data</string>
-    <string name="danar_stats_ratio">Rata</string>
-    <string name="danar_stats_amount_days"># Zile</string>
-    <string name="danar_stats_weight">Greutate</string>
-    <string name="danar_stats_warning_Message">Posibil fără acuratețe bună în cazul folosirii de bolusuri pentru pornire/umplere!</string>
-    <string name="danar_stats_olddata_Message">Date vechi, apăsați \"REÎNCĂRCARE\"</string>
-    <string name="danar_stats_tbb">Total bazală normală</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inițializare...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">BUCL</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">ACASĂ</string>
     <string name="virtualpump_shortname">POMPĂV</string>
     <string name="profileviewer_shortname">PROFILNS</string>
     <string name="treatments_shortname">TRAT</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBI</string>
     <string name="wear_shortname">CEAS</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Scurtează titlurile secțiunilor</string>
     <string name="always_use_shortavg">Folosește întotdeauna media scurtă a diferenței în locul diferenței simple</string>
     <string name="always_use_shortavg_summary">Folositor când datele vin de la surse nefiltrate, ca atunci când xDrip are măsurători zgomotoase.</string>
-    <string name="advancedsettings_title">Setări avansate</string>
-    <string name="danar_model">Model: %1$02X Protocol: %2$02X Cod: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Valoare implicită: 3\nAceasta este o setare de critică de securitate a OpenAPS. Asta înseamnă că se limitează bazala lade 3x valoarea maximă a bazalelor tale.Cel mai probabil nu veți schimba această valoare, dar trebuie să țineți cont de ce se discută despre “3x max zilnic; 4x curent” ca valori de siguranță.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Valoare implicită: 4\nAceasta este cealaltă jumătate a cheii de siguranță a OpenAPS și cealaltă jumătate a \"3x max zilnic; 4x curent\" al setărilor de siguranță.Aceasta înseamnă că bazala dumneavoastră, indiferent de bazala maximă configurată în pompă, nu poate fi mai mare de acest număr înmulțit cu nivelul curent al bazalei active. Această limitare este impusă pentru a evita posibilitatea de a intra pe un teritoriu periculos prin setarea unei bazale maxime excesiv de mari înainte de a înțelege funcționarea algoritmului. Din nou, valoarea implictă este 4x; majoritatea oamenilor nu vor trebui să ajusteze această valoare și vor modifica, mai degrabă, alte valori dacă vor simți că această valoare le stă în cale.</string>
@@ -438,18 +297,9 @@
     <string name="smscommunicator_calibrationsent">Calibrare trimisă. Recepționarea trebuie să fie activată și în xDrip.</string>
     <string name="smscommunicator_calibrationfailed">xDrip nu recepționează calibrări</string>
     <string name="pumpsuspended">Livrare de insulină suspendată</string>
-    <string name="gettingpumpstatus">Se primește starea pompei</string>
-    <string name="settingtempbasal">Se setează bazala temporară</string>
-    <string name="stoppingtempbasal">Se oprește bazala temporară</string>
-    <string name="settingextendedbolus">Se pornește bolusul extins</string>
-    <string name="stoppingextendedbolus">Se oprește bolusul extins</string>
-    <string name="updatingbasalrates">Se restabilesc ratele bazale</string>
-    <string name="disconnecting">Se deconectează</string>
     <string name="executing">Se execută</string>
     <string name="virtualpump_settings">Setări pompă virtuală</string>
     <string name="virtualpump_uploadstatus_title">Trimitere status către NS</string>
-    <string name="wrongpassword">Parolă greșită</string>
-    <string name="approachingdailylimit">Se apropie limita zilnică de insulină</string>
     <string name="nsclientinternal">Client NS</string>
     <string name="nsclientinternal_shortname">NSCI</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -473,7 +323,6 @@
     <string name="wear_detailedIOB_title">Arată IOB detaliat</string>
     <string name="wear_detailedIOB_summary">Separă IOB în bolus și IOB bazal pe ceas</string>
     <string name="nosuccess">fără succes - verificați telefonul</string>
-    <string name="notavailable">Nu este disponibil</string>
     <string name="patientage">Vârsta pacientului</string>
     <string name="child">Copil</string>
     <string name="teenage">Adolescent</string>
@@ -506,8 +355,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Înregistrează pornirea aplicației în NS</string>
     <string name="restartingapp">Se iese din aplicație în vederea aplicării setărilor.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Insulină</string>
     <string name="configbuilder_insulin_description">Ce tip de insulină folosiți?</string>
     <string name="fastactinginsulin">Insulină rapidă</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -520,9 +367,6 @@
     <string name="statuslights_res_critical">Pragul critic al nivelului insulinei în rezervor [U]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Ultima conexiune</string>
-    <string name="danar_bluetooth_status">Status bluetooth</string>
     <string name="nav_about">Despre</string>
     <string name="smscommunicator_missingsmspermission">Lipsesc permisiunile de SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Nu este acordată permisiunea de citire a stării telefonului</string>
@@ -533,16 +377,11 @@
     <string name="wear_showbgi_summary">Adaugă BGI în linia de status</string>
     <string name="ns_noupload">Fără trimitere către NS</string>
     <string name="ns_noupload_summary">Toate trimiterile de date către NS sunt oprite. AAPS este conectat la NS dar nu se fac schimbări în NS</string>
-    <string name="basal_step">Pas bazală</string>
-    <string name="bolus_step">Pas bolus</string>
     <string name="overview_extendedbolus_cancel_button">Renunță la bolusul extins</string>
     <string name="careportal_sensorage_label">Vechime senzor</string>
     <string name="careportal_canulaage_label">Vechime canulă</string>
     <string name="careportal_insulinage_label">Vechime insulină</string>
-    <string name="hours">ore</string>
-    <string name="invalidprofile">Profil invalid!!!</string>
     <string name="careportal_pbage_label">Vechime baterie pompă</string>
-    <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
     <string name="ns_alarmoptions">Opțiuni alarmare</string>
     <string name="nsalarm_urgenthigh">Hiper urgent</string>
     <string name="nsalarm_high">Hiper</string>
@@ -566,7 +405,6 @@
     <string name="absorptionsettings_title">Setări absorbție</string>
     <string name="absorption_maxtime_title">Timp maxim absorbție masă [o]</string>
     <string name="absorption_maxtime_summary">Timp în ore la care se presupune că toți carbohidrații sunt absorbiți</string>
-    <string name="danar_visualizeextendedaspercentage_title">Afișati bolusul extins ca %%</string>
     <string name="careportal_sensorage_label_short">VS</string>
     <string name="careportal_insulinage_label_short">VI</string>
     <string name="careportal_canulaage_label_short">VC</string>
@@ -591,7 +429,6 @@
     <string name="careportal_pump_label">POMPĂ</string>
     <string name="careportal_newnstreatment_duration_min_label">Durată [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Activează UAM</string>
     <string name="enablesmb">Activează SMB</string>
     <string name="enablesmb_summary">Folosește SMB în locul bazalei temporare pentru reacție mai rapidă</string>
@@ -603,22 +440,7 @@
     <string name="ultrarapid_oref">Oref Insulină-UltraRapidă</string>
     <string name="dia_too_short">DIA din %1$f prea scurtă - se folosește %2$f în schimb!</string>
     <string name="activate_profile">Activează profil</string>
-    <string name="date">Data</string>
     <string name="invalid">INVALID</string>
-    <string name="waitingforpairing">Se așteaptă conectarea la pompă</string>
-    <string name="pairingok">Conectare OK</string>
-    <string name="pairingtimedout">Conectare nereușită</string>
-    <string name="danars_nodeviceavailable">Niciun dispozitiv găsit până acum</string>
-    <string name="emptyreservoir">Rezervor gol</string>
-    <string name="bloodsugarmeasurementalert">Alertă măsurare glicemie</string>
-    <string name="remaininsulinalert">Nivel insulină rămas</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Pompa selectată</string>
-    <string name="pairpump">Conectare la pompă nouă</string>
-    <string name="bolusspeed">Viteză bolusare</string>
-    <string name="danar_setbasalstep001">Setare pas bazală la 0.01 U/o</string>
-    <string name="serialnumber">Număr serial</string>
     <string name="careportal_newnstreatment_percentage_label">Procentaj</string>
     <string name="careportal_newnstreatment_timeshift_label">Decalare</string>
     <string name="default_temptargets">Ținte-Temporare implicite</string>
@@ -628,31 +450,18 @@
     <string name="activity_target">țintă activitate</string>
     <string name="hypo_duration">durată țintă</string>
     <string name="hypo_target">țintă hipo</string>
-    <string name="danar_history_prime">Amorsare</string>
-    <string name="gettingextendedbolusstatus">Se citește starea bolusului extins</string>
-    <string name="gettingbolusstatus">Se citește starea bolusului</string>
-    <string name="gettingtempbasalstatus">Se citește starea bazalei temporare</string>
-    <string name="gettingpumpsettings">Se citesc setările pompei</string>
-    <string name="gettingpumptime">Se citește ora pompei</string>
     <string name="reuse">refolosire</string>
     <string name="wearcontrol_title">Controlare din ceas</string>
     <string name="wearcontrol_summary">Setare Ținte-Temporare și se introduc Tratamente din ceas.</string>
-    <string name="connectiontimedout">Conectare eșuată</string>
     <string name="food">Mâncare</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">min</string>
-    <string name="shorthour">o</string>
     <string name="none"><![CDATA[<nimic>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Grăsime</string>
     <string name="active"><![CDATA[<Activ>]]></string>
-    <string name="waitingforestimatedbolusend">Se așteaptă terminarea bolusării. Mai sunt %1$d secunde.</string>
-    <string name="processinghistory">Se procesează activitatea</string>
-    <string name="startingbolus">Pornire livrare bolus</string>
     <string name="executingrightnow">Se execută comanda chiar acum</string>
-    <string name="pumpdrivercorrected">S-a corectat driverul pompei</string>
     <string name="pump_unreachable">Pompă indisponibilă</string>
     <string name="missed_bg_readings">Lipsesc date glicemie</string>
     <string name="raise_notifications_as_android_notifications">Se folosesc notificările sistemului pentru alerte și notificări</string>
@@ -662,21 +471,15 @@
     <string name="pump_unreachable_threshold">Prag pompă indisponibilă [min]</string>
     <string name="urgent_alarm">Alarmă urgentă</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Oprește bluetooth-ul telefonului pentru o secundă dacă nu se poate conecta la pompă. Aceasta poate ajuta în cazul telefoanelor cu bluetooth incompatitibil.</string>
     <string name="eversense">Aplicația Eversense (modificată)</string>
     <string name="dexcomg5_nsupload_title">Încarcă date glicemie în NS</string>
     <string name="bgsource_upload">Setări înregistrare glicemie</string>
     <string name="wear_detailed_delta_title">Arată variație detaliată</string>
     <string name="wear_detailed_delta_summary">Arată variație cu încă o zecimală</string>
     <string name="smbmaxminutes_summary">Max minute de bazală la care să se limiteze SMB</string>
-    <string name="unsupportedfirmware">Soft pompă incompatibil</string>
     <string name="dexcomg5_xdripupload_title">Trimite date glicemie la xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Selectați 640g/Eversense ca sursă de date în xDrip+</string>
     <string name="nsclientbg">Glicemie NSClient</string>
-    <string name="minimalbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea minimă posibilă: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea maximă posibilă: %1$s</string>
     <string name="overview_editquickwizard_usebg">Calcul glicemie</string>
     <string name="overview_editquickwizard_usebolusiob">Calcul IOB bolus</string>
     <string name="overview_editquickwizard_usebasaliob">Calcul IOB bazală</string>
@@ -694,8 +497,6 @@
     <string name="closedmodeenabled">Mod buclă închisă activat</string>
     <string name="maxiobset">IOB maxim configurat corect</string>
     <string name="hasbgdata">Glicemie disponibilă din sursa selectată</string>
-    <string name="basalprofilenotaligned">Valori bazale nesincronizate cu ora: %1$s</string>
-    <string name="zerovalueinprofile">Profil invalid: %1$s</string>
     <string name="combo_programming_bolus">Se programează pompa pentru livrare bolus</string>
     <string name="combo_refresh">Reîncarcă</string>
     <string name="combo_pump_state_label">Stare</string>
@@ -734,7 +535,6 @@
     <string name="extendedbolusdeliveryerror">Eroare de livrare a bolusului extins</string>
     <string name="insightpump_shortname">Obiectiv</string>
     <string name="ago">în trecut</string>
-    <string name="format_hours">%1$.2f h</string>
     <string name="enablesmbalways">Activează SMB întotdeauna</string>
     <string name="enablesmbalways_summary">Activează SMB întotdeauna independent de bolusuri. Este posibil doar în cazul unei surse de glicemii filtrate, cum ar fi G5</string>
     <string name="enablesmbaftercarbs">Activează SMB după carbohidrați</string>
@@ -745,8 +545,6 @@
     <string name="enablesmbwithtemptarget_summary">Activează SMB chiar atunci când este o țintă temporară activă (mâncare in curând, exerciții fizice)</string>
     <string name="enablesmbwithhightemptarget">Activează SMB cu ținte temporare mari</string>
     <string name="enablesmbwithhightemptarget_summary">Activează SMB atunci când există o țintă temporară mare activă (exerciții fizice)</string>
-    <string name="let_temp_basal_run">Lasă să funcționeze bazala temporară</string>
-    <string name="mute">Liniște</string>
     <string name="overview_insulin_label">Insulină</string>
     <string name="overview_carbs_label">Carbohidrați</string>
     <string name="overview_buttons_selection">Butoane</string>
@@ -788,7 +586,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Se folosește versiunea dev. Bucla închisă este dezactivată.</string>
     <string name="engineering_mode_enabled">Mod inginer activat</string>
     <string name="not_eng_mode_or_release">Modul inginer nu este activat și nu este în versiunea lansată</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Se citește profilul bazal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Istoricul pompei s-a schimbat după calcularea bolusului. Bolusul nu a fost livrat. Recalculați dacă mai este necesar un bolus.</string>
     <string name="combo_error_updating_treatment_record">Bolus livrat, dar nu s-a reușit înregistrarea evenimentului. Aceasta se poate întâmpla când două bolusuri mici de aceeași valoare sunt livrate în mai puțin de două minute. Verificați istoricul pompei și înregistrările tratamentelor și folosiți Careportal pentru adăugarea intrărilor lipsă. Asigurați-vă că nu adăugați intrări duble.</string>
@@ -811,15 +608,10 @@
     <string name="smbdisabledinpreferences">SMB dezactivat în preferințe</string>
     <string name="uamdisabledinpreferences">UAM dezactivat din setări</string>
     <string name="uamdisabledoref1notselected">UAM dezactivat deoarece este bazat pe plugin-ul Oref1 pentru sensibilitate</string>
-    <string name="limitingbasalratio">Se limitează maximul ratei bazale la %1$.2f U/o datorită %2$s</string>
-    <string name="pumplimit">limită pompă</string>
-    <string name="itmustbepositivevalue">trebuie să fie o valoare pozitivă</string>
     <string name="maxbasalmultiplier">maximul multiplicatorului bazalei</string>
     <string name="maxdailybasalmultiplier">maximul zilnic al multiplicatorului bazalei</string>
     <string name="smb_frequency_exceeded">S-a livrat un bolus în ultimele 3 minute, nu se livrează SMB</string>
     <string name="basal_set_correctly">Bazala setată corect</string>
-    <string name="limitingpercentrate">Se limitează procentul ratei maxime la %1$d%% datorită %2$s</string>
-    <string name="limitingbolus">Se limitează bolusul la %1$.1f U datorită %2$s</string>
     <string name="limitingextendedbolus">Se limitează bolusul extins la %1$.1f U datorită %2$s</string>
     <string name="limitingmaxiob">Se limitează max IOB la %1$.1f U datorită %2$s</string>
     <string name="limitingcarbs">Se limitează carbohidrații %1$d g datorită %2$s</string>
@@ -834,7 +626,6 @@
     <string name="smbnotallowedinopenloopmode">SMB nu este permis în mod buclă deschisă</string>
     <string name="food_short">Mâncare</string>
     <string name="reset">resetare</string>
-    <string name="waitingfortimesynchronization">Se așteaptă o sincronizare a timpului (%1$d s)</string>
     <string name="loopdisconnectedfor">Deconectat (%1$d min)</string>
     <string name="openapssmb_maxiob_title">Maximul total IOB peste care OpenAPS nu poate trece [U]</string>
     <string name="openapssmb_maxiob_summary">Această valoare este denumită Max IOB în contextul OpenAPS,\nOpenAPS nu va adăuga mai multă insulină dacă IOB este mai mare ca această valoare</string>
@@ -850,7 +641,6 @@
     <string name="nav_setupwizard">Asistent de configurare</string>
     <string name="setupwizard_finish">TERMINARE</string>
     <string name="setupwizard_language_prompt">Alegeți limba</string>
-    <string name="boluserrorcode">Solicitat: %1$.2fU Livrat: %2$.2fU Cod eroare: %3$s</string>
     <string name="firstinsulinincrement">Primul increment de insulină</string>
     <string name="secondinsulinincrement">Al doilea increment de insulină</string>
     <string name="thirdinsulinincrement">Al treilea increment de insulină</string>
@@ -873,7 +663,6 @@
     <string name="virtualpump_type">Tipul pompei virtuale</string>
     <string name="virtualpump_definition">Definirea pompei</string>
     <string name="virtualpump_pump_def">Bolus: Pas=%1$s\nBolus Extins: [Pas=%2$s, Durată=%3$smin-%4$sh]\nBazală: Pas=%5$s\nRBT: %6$s (cu %7$s), Durată=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Doar valorile discrete, nu şi intervalele de valori sunt suportate ca şi incremente în pompa virtuală.</string>
     <string name="ns_autobackfill_title">Autocompletează glicemiile lipsă</string>
     <string name="wear_wizard_settings">Asistent setări</string>
     <string name="wear_wizard_settings_summary">Calcule incluse în rezultatul asistentului:</string>
@@ -903,18 +692,6 @@
     <string name="request">Cerință</string>
     <string name="insulinsourcesetup">Configurați plugin insulină</string>
     <string name="exit">Ieșire</string>
-    <string name="danar_useroptions">Opțiunile utilizatorului</string>
-    <string name="danar_timedisplay">Afișare a formatului timpului</string>
-    <string name="danar_buttonscroll">Buton derulare</string>
-    <string name="danar_beep">Sunet la apăsarea butonului</string>
-    <string name="danar_pumpalarm">Alarmă</string>
-    <string name="danar_pumpalarm_sound">Sunet</string>
-    <string name="danar_pumpalarm_vibrate">Vibrație</string>
-    <string name="danar_pumpalarm_both">Ambele</string>
-    <string name="danar_glucoseunits">Unități glicemie</string>
-    <string name="danar_saveuseroptions">Salvați opțiunile în pompă</string>
-    <string name="option_on">Pornit</string>
-    <string name="option_off">Oprit</string>
     <string name="open_navigation">Afișare navigație</string>
     <string name="close_navigation">Închidere navigație</string>
     <string name="nav_plugin_preferences">Preferințe plugin</string>
@@ -930,8 +707,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Sensibilitate scăzută pentru ținte temporare < 100]]></string>
     <string name="combo_invalid_setup">Setare pompă invalidă, verificați documentația și asigurați-vă că meniul Quick Info este denumit QUICK INFO, folosind aplicația 360 Configuration Software.</string>
     <string name="custom">Personalizat</string>
-    <string name="largetimedifftitle">Diferență majoră de timp</string>
-    <string name="largetimediff">Diferență majoră de timp:\nOra din pompă este diferită cu mai multe de 1.5 ore.\nPotriviți manual ora din pompă și asigurați-vă că sincronizarea cu datele istorice din pompă nu va produce un comportament neașteptat.\nDacă este posibil, ștergeți istoricul pompei înaintea modificării orei și inactivați bucla închisă pentru un interval DIA după ultima intrare istorică cu timp greșit, dar minim o DIA de acum încolo.</string>
     <string name="careportal_removestartedevents">AndroidAPS pornit curat</string>
     <string name="storedsettingsfound">Au fost găsite setări stocate</string>
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
@@ -955,17 +730,10 @@
     <string name="setupwizard_preferred_aps_mode">Modul APS preferat</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Calc</string>
-    <string name="handshaking">Împerechere</string>
     <string name="sendlogfiles">Trimite înregistrările zilei de astăzi către dezvoltatori, împreună cu timpul curent. Situație neașteptată.</string>
-    <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
-    <string name="commanderror">Eroare de comandă</string>
-    <string name="speederror">Eroare de viteză</string>
-    <string name="insulinlimitviolation">Încălcare a limitării cantităţii de insulină</string>
     <string name="loop_openmode_min_change">Cerere de schimbare minimală [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Bucla deschisă va afișa o nouă cerere de schimbare doar dacă nou valoare este mai mare cu %. Valoarea implicită este 20%</string>
-    <string name="pairfirst">Vă rog să conectați pompa cu telefonul!</string>
     <string name="searching_for_devices">Căutare dispozitive…</string>
-    <string name="please_wait">Așteptați…</string>
     <string name="pairing_completed">Asociere reușită</string>
     <string name="code_compare">Sunt identice codurile afișate aici și cele de pe pompă?</string>
     <string name="insight_pairing">Asociere Insight</string>
@@ -1054,7 +822,6 @@
     <string name="isequalorgreater">este mai mare sau egală cu</string>
     <string name="isgreater">este mai mare ca</string>
     <string name="isnotavailable">nu este disponibilă</string>
-    <string name="unknown">necunoscută</string>
     <string name="glucoseisnotavailable">Glicemia nu este disponibilă</string>
     <string name="glucosecomparedmgdl">Glicemie %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glicemie %1$s %2$.1f %3$s</string>
@@ -1071,23 +838,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatizare</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/o</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Înregistrează schimbarea senzorului în NS</string>
     <string name="dexcom_lognssensorchange_summary">Crează eveniment ”Schimbare Senzor” în NS la pornirea senzorului</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">secundă</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">oră</string>
-    <string name="unit_day">zi</string>
-    <string name="unit_week">săptămână</string>
-    <string name="unit_seconds">secunde</string>
-    <string name="unit_minutes">minute</string>
-    <string name="unit_hours">ore</string>
-    <string name="unit_days">zile</string>
-    <string name="unit_weeks">săptămâni</string>
     <string name="summary_tidepool_username">Utilizatorul Tidepool (de obicei adresa de email)</string>
     <string name="title_tidepool_username">Numele de utilizator</string>
     <string name="summary_tidepool_password">Parola Tidepool</string>
@@ -1127,7 +881,6 @@
     <string name="old_version">versiune veche</string>
     <string name="very_old_version">versiune foarte veche</string>
     <string name="twohours">2o</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">Aplicația Dexcom (modificată)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Primește valori glicemie de la aplicația Dexcom modificată.</string>
@@ -1191,10 +944,6 @@
     <string name="rileylink_scanner_scan_stop">STOP</string>
     <string name="rileylink_scanner_selected_device">Selectat</string>
     <string name="rileylink_scanner_title">Scanare RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">BLE nu este suportat.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth-ul este dezactivat.</string>
-    <string name="location_not_found_title">Localizarae este dezactivată</string>
-    <string name="location_not_found_message">Pentru a putea căuta dispozitive  Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa.</string>
     <string name="location_yes">Activează</string>
     <string name="location_no">Nu</string>
     <string name="rileylink_scanner_scanning">Scanează</string>
@@ -1235,7 +984,6 @@
     <string name="rileylink_error_tuneup_failed">Conectare eșuată</string>
     <string name="rileylink_error_pump_unreachable">Pompă indisponibilă</string>
     <string name="rileylink_error_pod_unreachable">Nu se poate comunica cu pod-ul</string>
-    <string name="rileylink_error_address_not_set_short">Nesetată</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompă Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1303,7 +1051,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricție de bolus aplicată: %2$.2fU la %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! A fost detectată o absorbție lentă a carbohidraților: %2$d%% din timp. Reverificați calculele. COB poate fi supraestimat, astfel că este posibilă administrarea de mai multă insulină !!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Livrați doar partea aceasta din rezultatul sugerat de wizard [%]</string>
     <string name="deliverpartofboluswizard">Wizard bolus face un calcul, dar numai o parte din insulina calculată este și livrată. Este mai eficient când se folosește cu algoritmul SMB.</string>
     <string name="loading">Se încarcă ...</string>
@@ -1311,7 +1058,6 @@
     <string name="time_range">Interval de timp</string>
     <string name="timerange_value">Timpul este între %1$s și %2$s</string>
     <string name="between">Între </string>
-    <string name="close">Închide</string>
     <string name="increasingmaxbasal">Se mărește valoarea bazalei maxime deoarece setarea este mai joasă decât bazala maximă din profil</string>
     <string name="smscommunicator_messagebody">Conținutul mesajului nu este valid</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1322,4 +1068,13 @@
     <string name="unit_minute_short">min</string>
     <string name="format_carbs">%1$dg</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index dc101ab364..85fd15c298 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">обнулить базы</string>
     <string name="reset_db_confirm">Вы действительно хотите обнулить базы данных?</string>
     <string name="nav_exit">Выход</string>
-    <string name="danar_useextended_title">Для величин &gt;200%% пользуйтесь пролонгированным болюсом</string>
-    <string name="danar_bt_name_title">устройство блутус danaR</string>
     <string name="ns_sync_use_absolute_title">Всегда пользуйтесь абсолютными величинами для базала</string>
     <string name="alert_dialog_storage_permission_text">Пожалуйста перезагрузите телефон или перезапустите AndroidAPS из системных настроек \иначе AndroidAPS не будет вести лог (важно для отслеживания и проверки алгоритмов)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Это устройство не поддерживает меню оптимизации батареи - могут быть проблемы с производительностью.</string>
     <string name="description_actions">Кнопки быстрого доступа к некоторым распространенным настройкам</string>
-    <string name="description_careportal">Введите дополнительные записи логов.</string>
     <string name="description_config_builder">Применяется для настройки активных плагинов</string>
     <string name="description_objectives">Обучающая программа</string>
     <string name="description_food">Показывает предварительные настройки приема пищи из Nightscout</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Содержит профиль, заданный в Nightscout</string>
     <string name="description_profile_simple">Определите профиль только в одном блоке времени.</string>
     <string name="description_pump_combo">Интеграция с помпой Accu-Chek Combo, требует наличия установленного алгоритма</string>
-    <string name="description_pump_dana_r">Интеграция с помпой DANA Diabetcare R</string>
-    <string name="description_pump_dana_r_korean">Интеграция с отечественной помпой DANA Diabetcare R</string>
-    <string name="description_pump_dana_r_v2">Интеграция с помпой Dana Diabetcare R с обновленной прошивкой</string>
-    <string name="description_pump_dana_rs">Интеграция с помпой DANA Diabetcare RS</string>
     <string name="description_pump_mdi">Интеграция с помпой для тех, кто делает многочисленные подколки для компенсации диабета</string>
     <string name="description_pump_virtual">Интеграция с помпами, еще не имеющими драйвера (незамкнутый цикл)</string>
     <string name="description_sensitivity_aaps">Чувствительность вычисляется аналогично алгоритму oref0, но можно включить период прошлого. Минимальное усвоение углеводов вычисляется на основе макс усвоения из настроек.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Мониторить и контролировать AndroidAPS при помощи часов WearOS.</string>
     <string name="description_xdrip_status_line">Показать информацию о работе алгоритма ИПЖ на экране смарт-часов xDrip+.</string>
     <string name="description_sms_communicator">Дистанционное управление AndroidAPS при помощи команд SMS.</string>
-    <string name="nsprofileview_units_label">единицы</string>
-    <string name="nsprofileview_dia_label">DIA (время действия инсулина)</string>
-    <string name="nsprofileview_ic_label">IC (инсулин/углеводы):</string>
-    <string name="nsprofileview_isf_label">ISF (чувствительность к инсулину)</string>
-    <string name="nsprofileview_basal_label">базал</string>
-    <string name="nsprofileview_target_label">Целевое значение СК:</string>
-    <string name="noprofileset">ПРОФИЛЬ НЕ ЗАДАН</string>
     <string name="treatments_insulin_label_string">инсулин:</string>
     <string name="treatments_carbs_label_string">углеводы:</string>
     <string name="treatments_iob_label_string">IOB:   активн инс</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">углеводы</string>
     <string name="treatments_wizard_correction_label">коррекция</string>
-    <string name="insulin_unit_shortname">ед</string>
     <string name="treatments_wizard_bolusiob_label">болюс IOB</string>
     <string name="openapsma_run">выполнить сейчас</string>
     <string name="vitualpump_label">ВИРТУАЛЬНАЯ ПОМПА</string>
-    <string name="pump_basebasalrate_label">базовая величина базала</string>
-    <string name="pump_tempbasal_label">врем базал</string>
-    <string name="virtualpump_extendedbolus_label">продленный болюс</string>
-    <string name="pump_battery_label">батарея</string>
-    <string name="pump_reservoir_label">резервуар</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">последнее выполненное</string>
     <string name="openapsma_inputparameters_label">параметры ввода</string>
@@ -96,16 +76,11 @@
     <string name="result">результат</string>
     <string name="result_insulin_carbs">Результат: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">данные гликемии недоступны</string>
-    <string name="nochangerequested">изменения не запрошены</string>
     <string name="openapsma_request_label">запрос</string>
-    <string name="rate">Базал</string>
-    <string name="duration">продолжительность</string>
-    <string name="reason">основание</string>
     <string name="glucose">гликемия</string>
     <string name="delta">изменение</string>
     <string name="sms_delta">дельта:</string>
     <string name="configbuilder">конфигуратор</string>
-    <string name="objectives">Цели</string>
     <string name="overview">начало</string>
     <string name="nsprofile">профиль NS</string>
     <string name="simpleprofile">простой профиль</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Общее</string>
     <string name="configbuilder_general_description">Это некоторые общепринятые плагины которые могут пригодиться.</string>
     <string name="configbuilder_constraints_description">Какие ограничения применяются?</string>
-    <string name="days">дней</string>
     <string name="constraints">ограничения</string>
     <string name="loop">замкнутый цикл</string>
     <string name="configbuilder_loop">замкнутый цикл</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">модуль не активен</string>
     <string name="constraints_violation">ограничение нарушено</string>
     <string name="treatmentdeliveryerror">Ошибка подачи болюса</string>
-    <string name="tempbasaldeliveryerror">Ошибка подачи врем базала</string>
     <string name="overview_newtempbasal_basalpercent">Величина базала [%]</string>
     <string name="setbasalquestion">принять новый врем базал:</string>
     <string name="overview_treatment_label">болюс</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">болюс:</string>
     <string name="basal">базал</string>
     <string name="sms_basal">базал: </string>
-    <string name="carbs">углеводы</string>
     <string name="changeyourinput">измените введенные данные</string>
     <string name="configbuilder_bgsource">источник СК</string>
     <string name="configbuilder_bgsource_description">Откуда должен получать данные AndroidAPS?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">режим APS</string>
     <string name="closedloop">замкнутый цикл</string>
     <string name="openloop">открытый цикл</string>
+    <string name="lowglucosesuspend">Приостановка помпы на низкой ГК</string>
     <string name="disabledloop">цикличность неактивирована</string>
     <string name="disableloop">Деактивировать цикличность</string>
     <string name="enableloop">Активировать цикличность</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">базал IOB</string>
     <string name="bolusconstraintapplied">применено ограничение болюса</string>
     <string name="carbsconstraintapplied">применено ограничение углеводов</string>
-    <string name="careportal_bgcheck">проверка СК</string>
-    <string name="careportal_announcement">оповещение</string>
-    <string name="careportal_note">заметка</string>
-    <string name="careportal_question">вопрос</string>
-    <string name="careportal_exercise">нагрузка</string>
-    <string name="careportal_pumpsitechange">смена места катетера помпы</string>
-    <string name="careportal_cgmsensorinsert">Установка сенсора мониторинга глюкозы</string>
-    <string name="careportal_cgmsensorstart">старт сенсора</string>
-    <string name="careportal_insulincartridgechange">замена картриджа инсулина</string>
-    <string name="careportal_profileswitch">Смена профиля</string>
-    <string name="careportal_snackbolus">болюс на перекус</string>
-    <string name="careportal_mealbolus">болюс на еду</string>
-    <string name="careportal_correctionbolus">болюс на коррекцию</string>
-    <string name="careportal_combobolus">комбинированный болюс</string>
-    <string name="careportal_tempbasalstart">начало действия врем базала</string>
-    <string name="careportal_tempbasalend">оконч действия врем базала</string>
-    <string name="careportal_carbscorrection">корректировка углеводов</string>
-    <string name="careportal_openapsoffline">OpenAPS офлайн</string>
-    <string name="careportal_newnstreatment_eventtype">тип события</string>
     <string name="careportal_newnstreatment_other">другое</string>
     <string name="careportal_newnstreatment_meter">глюкометр</string>
     <string name="careportal_newnstreatment_sensor">сенсор</string>
@@ -217,11 +171,11 @@
     <string name="openapsma_maxbasal_summary">в контексте OpenAPS называется макс базал</string>
     <string name="openapsma_maxiob_title">макс базал активн инс подаваемый с OpenAPS (ед)</string>
     <string name="openapsma_maxiob_summary">Эта величина называется Max IOB (макс активн инс) в OpenAPS\n. Это макс кол-во инсулина в ед. [U] которое APS может подать единовременно.</string>
-    <string name="dismiss">отклонить</string>
     <string name="password_preferences_encrypt_prompt">Будет предложено ввести главный пароль, который будет использоваться для шифрования экспортированных параметров.</string>
     <string name="password_preferences_decrypt_prompt">Вам будет предложено ввести главный пароль, необходимый для расшифровки импортированных настроек.</string>
     <string name="preferences_export_canceled">Экспорт отменен! Настройки НЕ экспортированы!</string>
     <string name="preferences_import_canceled">Импорт отменен! Настройки не импортированы!</string>
+    <string name="preferences_import_list_title">Выберите файл для импорта</string>
     <string name="check_preferences_before_import">Проверьте настройки перед импортом:</string>
     <string name="check_preferences_cannot_import">Не удается импортировать настройки!</string>
     <string name="check_preferences_dangerous_import">Не следует импортировать настройки!</string>
@@ -234,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Вы используете устаревший формат из старых версий AAPS, который не безопасен! Используйте его только в крайнем случае, если у вас нет экспорта в текущем формате JSON.</string>
     <string name="metadata_warning_old_export">Импортируемым параметрам уже %1$s дней! Может быть у вас есть более актуальные параметры или вы выбрали неправильный файл? Не забудьте регулярно экспортировать параметры!</string>
     <string name="metadata_warning_date_format">Недопустимый формат даты и времени!</string>
+    <string name="metadata_warning_different_version">Параметры из другой вспомогательной версии приложения. Если импортируете после обновления, это нормально но после импорта проверьте, все ли предпочтения по-прежнему верны!</string>
+    <string name="metadata_urgent_different_version">Параметры из другой основной версии приложения. Основные версии существенно различаются и могут иметь несовместимые настройки! После импорта убедитесь, что параметры все еще верны!</string>
     <string name="metadata_label_format">Формат файла</string>
     <string name="metadata_label_created_at">Дата создания</string>
     <string name="metadata_label_aaps_version">Версия AAPS</string>
@@ -256,34 +212,17 @@
     <string name="prefdecrypt_issue_wrong_pass">Ошибка расшифровки, указан недопустимый пароль или файл параметров изменен! Возможно, импортированный файл был экспортирован с использованием другого главного пароля.</string>
     <string name="prefdecrypt_issue_wrong_format">Отсутствует конфигурация шифрования, формат параметров недопустим!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Неподдерживаемый или не прописанный алгоритм шифрования!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">соединение устанавливается</string>
-    <string name="connected">соединение установлено</string>
-    <string name="disconnected">Разъединено</string>
-    <string name="danar_pump_settings">Настройки помпы DanaR</string>
+    <string name="exported_today">экспортировано сегодня</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">экспортировано %1$s назад</string>
+    <string name="exported_at" comment="at placeholder we add export date">экспортировано в %1$s</string>
+    <string name="exported_less_than_hour_ago">экспортировано менее часа назад</string>
+    <string name="in_directory" comment="placeholder is for exported file path">в каталоге: %1$s</string>
     <string name="end_user_license_agreement">лицензионное соглашение с пользователем</string>
     <string name="end_user_license_agreement_text">НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ.  </string>
     <string name="end_user_license_agreement_i_understand">я понимаю и принимаю</string>
     <string name="save">сохранить</string>
-    <string name="nobtadapter">адаптер блутус не найден</string>
-    <string name="devicenotfound">выбранное устройство не найдено</string>
-    <string name="connectionerror">ошибка соединения</string>
-    <string name="danar_iob_label">активный инсулин на помпе</string>
-    <string name="danar_dailyunits">суточные единицы</string>
-    <string name="pump_lastbolus_label">предыдущий болюс</string>
-    <string name="hoursago">%1$.1fч назад</string>
-    <string name="danar_invalidinput">введенные данные неверны</string>
-    <string name="danar_valuenotsetproperly">величина не задана должным образом</string>
     <string name="reloadprofile">обновить профиль</string>
-    <string name="danar_viewprofile">просмотр профиля</string>
-    <string name="enacted">выполнено</string>
-    <string name="comment">комментарий</string>
-    <string name="success">успех</string>
-    <string name="percent">процент</string>
-    <string name="absolute">абсолют</string>
-    <string name="canceltemp">отмена врем базала</string>
     <string name="smscommunicator">SMS коммуникатор</string>
-    <string name="waitingforpumpresult">ожидание результата от помпы</string>
     <string name="smscommunicator_allowednumbers">разрешенные телефонные номера</string>
     <string name="smscommunicator_allowednumbers_summary">+ XXXXXXXXXX; + YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Чтобы подать болюс %1$.2fU ответьте кодом %2$s</string>
@@ -304,54 +243,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Цель %1$s на %2$d минут</string>
     <string name="smscommunicator_tt_set">Цель %1$s на %2$d минут установлена успешно</string>
     <string name="smscommunicator_tt_canceled">Временная цель успешно отменена</string>
-    <string name="bolusdelivering">Подается болюс %1$.2fед.</string>
     <string name="smscommunicator_remotecommandsallowed">разрешить команды через смс</string>
-    <string name="glucosetype_finger">палец</string>
-    <string name="glucosetype_sensor">сенсор</string>
-    <string name="manual">вручную</string>
-    <string name="careportal_temporarytarget">Временные целевые значения</string>
-    <string name="careportal_temporarytargetcancel">Отмена времнной цели</string>
     <string name="danarprofile">настройки профиля DanaR</string>
     <string name="danarprofile_dia">время действия инсулина (ч.):</string>
     <string name="danarprofile_dia_summary">Продолжительность активности инсулина</string>
-    <string name="failedupdatebasalprofile">не удалось обновить базальный профиль</string>
-    <string name="danar_historyreload">Перезагрузка истории</string>
     <string name="uploading">передача данных</string>
-    <string name="danar_ebolus">Болюс E (удлиненный)</string>
-    <string name="danar_dsbolus">Болюс DS (комбинированный стандартный)</string>
-    <string name="danar_debolus">Болюс DE (комбинированный расширенный)</string>
-    <string name="danar_error">ошибка</string>
-    <string name="danar_refill">дозаправка</string>
-    <string name="danar_basalhour">почасовой базал</string>
-    <string name="danar_glucose">гликемия</string>
-    <string name="danar_carbohydrate">углеводы</string>
-    <string name="danar_alarm">внимание!</string>
-    <string name="danar_totaluploaded">Всего передано %1$d записей</string>
-    <string name="danar_sbolus">болюс S</string>
-    <string name="danar_history_alarm">оповещения об опасности</string>
-    <string name="danar_history_basalhours">почасовые базалы</string>
-    <string name="danar_history_bolus">болюсы</string>
-    <string name="danar_history_carbohydrates">углеводы</string>
-    <string name="danar_history_dailyinsulin">суточный инсулин</string>
-    <string name="danar_history_errors">ошибки</string>
-    <string name="danar_history_glucose">гликемия</string>
-    <string name="danar_history_refill">Перезаправка</string>
-    <string name="danar_history_syspend">Останов</string>
-    <string name="danar_history_connectingfor">Попытка установить связь: %1$d сек</string>
-    <string name="danar_password_title">пароль помпы</string>
-    <string name="wrongpumppassword">неверный пароль помпы</string>
-    <string name="pumpbusy">помпа занята</string>
-    <string name="overview_bolusprogress_delivered">Болюс подан</string>
-    <string name="overview_bolusprogress_stoped">остановлено</string>
     <string name="bolusstopped">Болюс остановлен</string>
     <string name="bolusstopping">Остановка болюса</string>
-    <string name="occlusion">закупорка</string>
-    <string name="overview_bolusprogress_stop">стоп</string>
-    <string name="overview_bolusprogress_stoppressed">нажат стоп</string>
-    <string name="waitingforpump">ожидание помпы</string>
-    <string name="overview_bolusprogress_goingtodeliver">Начинается подача болюса %1$.2fед.</string>
-    <string name="youareonallowedlimit">разрешенный предел достигнут</string>
-    <string name="noprofileselected">профиль не выбран</string>
     <string name="smscommunicator_loophasbeendisabled">зцикл был деактивирован</string>
     <string name="smscommunicator_loophasbeenenabled">зцикл был активирован</string>
     <string name="smscommunicator_loopisdisabled">зцикл не работает</string>
@@ -391,11 +289,9 @@
     <string name="mealbolus">болюс на еду</string>
     <string name="correctionbous">коррекция</string>
     <string name="actions">действия</string>
-    <string name="androidaps_start">AndroidAPS запущен</string>
     <string name="ns_upload_only">только передача в NS (синхронизация отсутствует)</string>
     <string name="ns_upload_only_summary">только передача в NS. работает в SGV только если выбран местный источник вроде xdrip. не работает в профилях при действующем профиле NS</string>
     <string name="pumpNotInitialized">помпа не инициализирована</string>
-    <string name="pumpNotInitializedProfileNotSet">помпа не инициализирована, профиль не установлен</string>
     <string name="primefill">прайм/заполнение</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
     <string name="othersettings_title">другое</string>
@@ -405,8 +301,6 @@
     <string name="button3">кнопка 3</string>
     <string name="units_colon">Единицы:</string>
     <string name="units">Единицы</string>
-    <string name="mgdl">мг/дл</string>
-    <string name="mmol">ммоль/л</string>
     <string name="dia">Время действия инсулина DIA</string>
     <string name="target_range">целевой диапазон</string>
     <string name="prefs_range_title">диапазон для визуализации</string>
@@ -416,17 +310,7 @@
     <string name="wear">Смарт-часы Wear</string>
     <string name="resend_all_data">повторить отправку всех данных</string>
     <string name="open_settings_on_wear">Открыть настройки на Wear</string>
-    <string name="pumperror">ошибка помпы</string>
-    <string name="lowbattery">низкий заряд батареи</string>
-    <string name="pumpshutdown">Выключение помпы</string>
-    <string name="batterydischarged">батарея помпы разряжена</string>
-    <string name="danarkoreanpump">DanaR Корея</string>
     <string name="basal_rate">Шаг базала:</string>
-    <string name="profile_set_failed">настройка базального профиля не состоялась</string>
-    <string name="profile_set_ok">базальный профиль помпы обновлен</string>
-    <string name="danar_disableeasymode">отключить режим EasyUI в помпе</string>
-    <string name="danar_enableextendedbolus">Активировать удлиненные болюсы на помпе</string>
-    <string name="danar_switchtouhmode">замена режима с U/d на U/h на помпе</string>
     <string name="basalvaluebelowminimum">значение базала ниже минимума. профиль не создан!</string>
     <string name="sms_actualbg">гликемия:</string>
     <string name="sms_lastbg">прошлый СК:</string>
@@ -434,7 +318,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">текущие уведомления</string>
     <string name="old_data">старые данные</string>
-    <string name="minago">%1$d мин. назад</string>
     <string name="sms_minago">%1$d мин. назад</string>
     <string name="localprofile">локальный профиль</string>
     <string name="openapsama">Помощник болюса OpenAPS AMA</string>
@@ -450,41 +333,22 @@
     <string name="hypo">Гипо</string>
     <string name="activity">Нагрузка</string>
     <string name="removerecord">Удалить запись</string>
-    <string name="danar_stats">статистика DanaR</string>
-    <string name="danar_stats_cumulative_tdd">накопительные TDD</string>
-    <string name="danar_stats_expweight">экспоненциально взвешенные TDD</string>
-    <string name="danar_stats_basalrate">базал</string>
-    <string name="danar_stats_bolus">болюс</string>
-    <string name="danar_stats_tdd">общая суточная доза</string>
-    <string name="danar_stats_date">дата</string>
-    <string name="danar_stats_ratio">коэффициент</string>
-    <string name="danar_stats_amount_days">количество дней</string>
-    <string name="danar_stats_weight">вес</string>
-    <string name="danar_stats_warning_Message">возможны неточности если болюсы использовались для заполнения</string>
-    <string name="danar_stats_olddata_Message">старые данные. нажмите \"перезагрузка\"</string>
-    <string name="danar_stats_tbb">общий базал</string>
-    <string name="danar_stats_tbb2">общий базал*2</string>
-    <string name="initializing">инициализация...</string>
     <string name="actions_shortname">ДЕЙСТВ</string>
     <string name="configbuilder_shortname">КОНФ</string>
     <string name="loop_shortname">ЗЦ</string>
     <string name="simpleprofile_shortname">ПП</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">ЛП</string>
-    <string name="danarpump_shortname">ДАНА</string>
     <string name="overview_shortname">НАЧАЛО</string>
     <string name="virtualpump_shortname">ВиртПомпа</string>
     <string name="profileviewer_shortname">профильNS</string>
     <string name="treatments_shortname">НАЗНАЧ</string>
-    <string name="careportal_shortname">ПОРТЛЕЧ</string>
     <string name="objectives_shortname">ЦЕЛИ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">сокращенные имена табул</string>
     <string name="always_use_shortavg">всегда используйте укороченное среднее приращение вместо простого</string>
     <string name="always_use_shortavg_summary">полезно когда данные из нефильтруемых источников вроде Xdrip зашумляются</string>
-    <string name="advancedsettings_title">расширенные настройки</string>
-    <string name="danar_model">модель: %1$02X протокол: %2$02X код: %3$02X</string>
     <string name="profile">профиль</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">значение по умолчанию:3 Это ключевой ограничитель безопасности OpenAPS. Он ограничивает величину вашего базала максимум до 3x максимума. Вам вероятно не понадобится менять эту величину но вам следует понимать, что она входит в формулу дуэта \"максимум 3x ежедневное; 4x текущее\"</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">значение по умолчанию: 4 . Это вторая половина обеспечения безопасности OpenAPS из дуэта \"максимум 3x ежедневное; 4x текущее\" Означает что ваша база независимо от установок помпы не может быть выше чем это число умноженное на текущее значение базала. Ограничение для того, чтобы предотвратить вторжение в опасную зону из-за высокого уровня установленных значений базы без понимания алгоритма работы приложения. Большинству людей никогда не потребуется изменять это значение, скорее всего нужно поменять другие настройки если вы чувствуете, что вам мешает это ограничение.</string>
@@ -503,18 +367,9 @@
     <string name="smscommunicator_calibrationsent">калибровка отправлена. в xdrip должен быть активирован прием</string>
     <string name="smscommunicator_calibrationfailed">xdrip не получает калибровок</string>
     <string name="pumpsuspended">Работа помпы остановлена</string>
-    <string name="gettingpumpstatus">получение статуса помпы</string>
-    <string name="settingtempbasal">установка врем базала</string>
-    <string name="stoppingtempbasal">остановка врем базала</string>
-    <string name="settingextendedbolus">Настройка удлиненного болюса</string>
-    <string name="stoppingextendedbolus">Остановка удлиненного болюса</string>
-    <string name="updatingbasalrates">обновление значений базала</string>
-    <string name="disconnecting">разъединение</string>
     <string name="executing">выполнение</string>
     <string name="virtualpump_settings">настройки вирт помпы</string>
     <string name="virtualpump_uploadstatus_title">статус передачи данных в NS</string>
-    <string name="wrongpassword">неверный пароль</string>
-    <string name="approachingdailylimit">приближается суточный лимит инсулина</string>
     <string name="nsclientinternal">клиент NS</string>
     <string name="nsclientinternal_shortname">КЛNS</string>
     <string name="nsclientinternal_url">Адрес URL:</string>
@@ -538,7 +393,7 @@
     <string name="wear_detailedIOB_title">показать IOB подробно</string>
     <string name="wear_detailedIOB_summary">разбивка IOB на болюсный и базальный IOB на циферблате смарт-часов</string>
     <string name="nosuccess">неудача - проверьте телефон</string>
-    <string name="notavailable">недоступно</string>
+    <string name="notavailable">н/д</string>
     <string name="patientage">Возраст пациента</string>
     <string name="child">ребенок</string>
     <string name="teenage">подросток</string>
@@ -574,8 +429,6 @@
     <string name="superbolus">суперболюс</string>
     <string name="ns_logappstartedevent">начать работу с NS</string>
     <string name="restartingapp">выход из приложения для применения настроек</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">инсулин</string>
     <string name="configbuilder_insulin_description">Какой тип инсулина вы используете?</string>
     <string name="fastactinginsulin">быстродействующий инсулин</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -598,9 +451,6 @@
     <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
     <string name="iob">IOB акт инс</string>
     <string name="cob">акт углев</string>
-    <string name="virtualpump_firmware_label">прошивка</string>
-    <string name="pump_lastconnection_label">прошлое соединение</string>
-    <string name="danar_bluetooth_status">статус блутус</string>
     <string name="nav_about">о приложении</string>
     <string name="smscommunicator_missingsmspermission">отсутствует смс подтверждение</string>
     <string name="smscommunicator_missingphonestatepermission">Отсутствует разрешение телефона</string>
@@ -611,17 +461,12 @@
     <string name="wear_showbgi_summary">добавить BGI в строку состояния</string>
     <string name="ns_noupload">данные не передаются в NS</string>
     <string name="ns_noupload_summary">данные передаваемые в NS не доходят. AAPS соединяется с NS но изменения туда не вносятся</string>
-    <string name="basal_step">шаг базала</string>
-    <string name="bolus_step">шаг болюса</string>
     <string name="overview_extendedbolus_cancel_button">Отмена удлиненного болюса</string>
     <string name="careportal_sensorage_label">сенсор пропаботал</string>
     <string name="careportal_canulaage_label">Катетер помпы проработал</string>
     <string name="careportal_insulinage_label">Инсулин проработал</string>
-    <string name="hours">час</string>
-    <string name="invalidprofile">Неверный профиль !!!</string>
     <string name="doprofileswitch">Переключить профиль</string>
     <string name="careportal_pbage_label">Батарея помпы работает</string>
-    <string name="careportal_pumpbatterychange">замена батареи помпы</string>
     <string name="ns_alarmoptions">опции оповещения</string>
     <string name="nsalarm_urgenthigh">Тревога выс</string>
     <string name="nsalarm_high">Высокий</string>
@@ -645,7 +490,6 @@
     <string name="absorptionsettings_title">Настройки усваиваемости</string>
     <string name="absorption_maxtime_title">Максимальное время усваимости пищи [h] (час)</string>
     <string name="absorption_maxtime_summary">Ожидаемое время усваивания всех углеводов пищи в часах</string>
-    <string name="danar_visualizeextendedaspercentage_title">Показать пролонгированный болюс в %%</string>
     <string name="careportal_sensorage_label_short">ВОЗРСенс</string>
     <string name="careportal_insulinage_label_short">ВозрИнс</string>
     <string name="careportal_canulaage_label_short">ВозрКан</string>
@@ -670,7 +514,6 @@
     <string name="careportal_pump_label">ПОМПА</string>
     <string name="careportal_newnstreatment_duration_min_label">Длительность (мин)</string>
     <string name="openapssmb">Супер микро болюс OpenAPS</string>
-    <string name="smb_shortname">Супер микро болюс SMB</string>
     <string name="enableuam">Включить непредвиденный прием пищи UAM</string>
     <string name="enablesmb">Включить супер микро болюс SMB</string>
     <string name="enablesmb_summary">Для ускорения действия используйте супер микро болюсы SMB вместо временного базала</string>
@@ -682,23 +525,7 @@
     <string name="ultrarapid_oref">Сверхбыстрый Oref</string>
     <string name="dia_too_short">Значение длительности работы инс %1$f слишком мало - применено %2$f!</string>
     <string name="activate_profile">АКТИВИРОВАТЬ ПРОФИЛЬ</string>
-    <string name="date">дата</string>
     <string name="invalid">НЕВЕРНО</string>
-    <string name="waitingforpairing">Ожидание соединения на помпе</string>
-    <string name="pairingok">Соединение OK</string>
-    <string name="pairingtimedout">Истекло время ожидания соединения</string>
-    <string name="pairing">Сопряжение</string>
-    <string name="danars_nodeviceavailable">Устройства пока не найдены</string>
-    <string name="emptyreservoir">Резервуар пуст</string>
-    <string name="bloodsugarmeasurementalert">Предупреждение при измерении уровня СК</string>
-    <string name="remaininsulinalert">Уровень оставшегося инсулина</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Выбранная помпа</string>
-    <string name="pairpump">Соединиться с другой помпой</string>
-    <string name="bolusspeed">Скорость подачи болюса</string>
-    <string name="danar_setbasalstep001">Установить шаг базала 0.01 ед/ч</string>
-    <string name="serialnumber">Серийный номер</string>
     <string name="careportal_newnstreatment_percentage_label">Процент</string>
     <string name="careportal_newnstreatment_timeshift_label">Сдвиг по времени</string>
     <string name="default_temptargets">Временные цели по умолчанию</string>
@@ -708,32 +535,18 @@
     <string name="activity_target">целевое значение СК при физической нагрузке</string>
     <string name="hypo_duration">длительность гипо</string>
     <string name="hypo_target">целевое значение СК при гипо</string>
-    <string name="danar_history_prime">Заполнить перед работой</string>
-    <string name="gettingextendedbolusstatus">Получение статуса удлиненного болюса</string>
-    <string name="gettingbolusstatus">Получение статуса болюса</string>
-    <string name="gettingtempbasalstatus">Получение статуса временного базала</string>
-    <string name="gettingpumpsettings">Получение настроек помпы</string>
-    <string name="gettingpumptime">Получение времени помпы</string>
     <string name="reuse">повторное использование</string>
     <string name="wearcontrol_title">Контроль с часов</string>
     <string name="wearcontrol_summary">Ставить временные цели и вводить назначения с часов.</string>
-    <string name="connectiontimedout">Истекло время ожидания соединения</string>
     <string name="food">Еда</string>
     <string name="shortgramm">грамм</string>
-    <string name="shortminute">минут</string>
-    <string name="shorthour">ч</string>
-    <string name="shortday">дн</string>
     <string name="none"><![CDATA[<отсутствует>]]></string>
     <string name="shortkilojoul">кДж</string>
     <string name="shortenergy">Энергия</string>
     <string name="shortprotein">Белки</string>
     <string name="shortfat">Жиры</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">Ожидание окончания болюса. Оставшиеся %1$d сек.</string>
-    <string name="processinghistory">Обработка события</string>
-    <string name="startingbolus">Начало подачи болюса</string>
     <string name="executingrightnow">Команда сейчас выполняется</string>
-    <string name="pumpdrivercorrected">Драйвер помпы откорректирован</string>
     <string name="pump_unreachable">Помпа недоступна</string>
     <string name="missed_bg_readings">Пропущенные данные СК</string>
     <string name="raise_notifications_as_android_notifications">Использовать системные уведомления для предупреждений и уведомлений</string>
@@ -743,9 +556,6 @@
     <string name="pump_unreachable_threshold">Порог недоступности помпы [min]</string>
     <string name="urgent_alarm">Сигнал тревоги</string>
     <string name="info">ИНФОРМАЦИЯ</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Дежурный режим Watchdog</string>
-    <string name="btwatchdog_summary">Выключает bluetooth телефона на одну секунду, если подключение к помпе невозможно. Это помогает на тех телефонах, где зависает модуль bluetooth.</string>
     <string name="eversense">Приложение Eversense (пропатченное)</string>
     <string name="dexcomg5_nsupload_title">Загрузить данные СК в Nightscout</string>
     <string name="bgsource_upload">Параметры загрузки СК</string>
@@ -758,12 +568,9 @@
     <string name="uamsmbmaxminutes_summary">Максимум минут базала ограничивающего микроболюсы SMB на непредвиденный прием пищи UAM</string>
     <string name="carbsReqThreshold">Порог предлагаемых углеводов</string>
     <string name="carbsReqThreshold_summary">Когда предлагаются углеводы, какое количество инициирует уведомление</string>
-    <string name="unsupportedfirmware">Неподдерживаемая версия прошивки помпы</string>
     <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
     <string name="nsclientbg">СК с клиента Nightscout</string>
-    <string name="minimalbasalvaluereplaced">Значение базала заменено минимальной поддерживаемой величиной: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Значение базала заменено максимальной поддерживаемой величиной: %1$s</string>
     <string name="overview_editquickwizard_usebg">Вычисление СК</string>
     <string name="overview_editquickwizard_usebolusiob">Расчет болюсного активного инсулина IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Расчет базального активного инсулина IOB</string>
@@ -781,8 +588,6 @@
     <string name="closedmodeenabled">Режим замкнутого цикла включен</string>
     <string name="maxiobset">Максимум активного инсулина IOB установлен правильно</string>
     <string name="hasbgdata">СК доступны из выбранного источника</string>
-    <string name="basalprofilenotaligned">Базальные значения не выровнены по часам: %1$s</string>
-    <string name="zerovalueinprofile">Недопустимый профиль: %1$s</string>
     <string name="combo_programming_bolus">Помпа программируется для болюса</string>
     <string name="combo_refresh">Обновить</string>
     <string name="combo_pump_state_label">Состояние</string>
@@ -803,7 +608,6 @@
     <string name="bolus_frequency_exceeded">Болюс с таким же количеством единиц был запрошен за последние две минуты. Для предотвращения случайных двойных болюсов и сбоев операция отменена.</string>
     <string name="combo_pump_connected_now">Сейчас</string>
     <string name="combo_activity_reading_pump_history">Чтение истории помпы</string>
-    <string name="danar_history">Журнал помпы</string>
     <string name="combo_activity_setting_basal_profile">Установка базального профиля</string>
     <string name="combo_pump_cartridge_low_warrning">Низкий уровень инсулина в картридже помпы</string>
     <string name="combo_pump_battery_low_warrning">Низкий заряд батареи помпы</string>
@@ -822,9 +626,6 @@
     <string name="extendedbolusdeliveryerror">Подача пролонгированного болюса не состоялась</string>
     <string name="insightpump_shortname">Поле обзора</string>
     <string name="ago">тому назад</string>
-    <string name="format_hours">%1$.2f ч</string>
-    <string name="format_mins">%1$d мин</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Всегда включать супер микро болюс SMB</string>
     <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
     <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
@@ -835,8 +636,6 @@
     <string name="enablesmbwithtemptarget_summary">Включить супер микро болюс SMB при активной временной цели (близкий прием пищи, нагрузка)</string>
     <string name="enablesmbwithhightemptarget">Включить супер микро болюс SMB с высокими значениями временных целей</string>
     <string name="enablesmbwithhightemptarget_summary">Включить супер микро болюс SMB при высоком значении действующей временной цели (нагрузка)</string>
-    <string name="let_temp_basal_run">Оставить временный базал работающим</string>
-    <string name="mute">Отключить звук</string>
     <string name="overview_insulin_label">Инсулин</string>
     <string name="overview_carbs_label">Кол-во углеводов</string>
     <string name="overview_buttons_selection">Кнопки</string>
@@ -878,7 +677,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Работает версия разработчика. Замкнутый цикл отключен.</string>
     <string name="engineering_mode_enabled">Режим отладки включен</string>
     <string name="not_eng_mode_or_release">Режим отладки не задействован и отсутствует на ветке релиза</string>
-    <string name="pump_basebasalrate">%1$.2f ед/час</string>
     <string name="combo_actvity_reading_basal_profile">Чтение базального профиля</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">История событий помпы изменилась с момента вычисления болюса. Болюс не подан. Пожалуйста пересчитайте потребность в болюсе.</string>
     <string name="combo_error_updating_treatment_record">Болюс подан успешно, но запись о назначении не сделана. Это может быть вызвано тем, что за последние две минуты назначено два болюса одного объема. Пожалуйста проверьте историю событий помпы и записи о назначениях и добавьте пропущенные записи из Портала назначений. Не добавляйте записи с одним и тем же временем и одинаковым объемом.</string>
@@ -901,15 +699,10 @@
     <string name="smbdisabledinpreferences">Супер микро болюс SMB отключен в настройках</string>
     <string name="uamdisabledinpreferences">Незапланированный прием пищи UAM отключен в настройках</string>
     <string name="uamdisabledoref1notselected">Незапланированный прием пищи UAM отключен, поскольку он основывается на плагине чувствительности из Oref1</string>
-    <string name="limitingbasalratio">Макс базальный уровень ограничен до %1$.2f ед/ч вследствие %2$s</string>
-    <string name="pumplimit">лимит помпы</string>
-    <string name="itmustbepositivevalue">величина должна быть положительной</string>
     <string name="maxbasalmultiplier">множитель макс базала</string>
     <string name="maxdailybasalmultiplier">множитель макс суточного базала</string>
     <string name="smb_frequency_exceeded">Болюс был подан в течение последних трех минут, минуя супер микро болюс SMB</string>
     <string name="basal_set_correctly">Базал задан корректно</string>
-    <string name="limitingpercentrate">Макс процент базала ограничен до %1$d%% ед/ч вследствие %2$s</string>
-    <string name="limitingbolus">Макс уровень болюса ограничен до %1$.1f ед вследствие %2$s</string>
     <string name="limitingextendedbolus">Ограничение расширенного болюса до %1$.1f U из-за %2$s</string>
     <string name="limitingmaxiob">Ограничение максимума активного инсулина IOB до %1$.1f U из-за %2$s</string>
     <string name="limitingcarbs">Ограничение максимума углеводов до %1$d грамм из-за %2$s</string>
@@ -924,7 +717,6 @@
     <string name="smbnotallowedinopenloopmode">В режиме незамкнутого цикла open loop супер микро болюс SMB не допускается</string>
     <string name="food_short">Еда</string>
     <string name="reset">сброс</string>
-    <string name="waitingfortimesynchronization">Ожидание синхронизации времени (%1$d сек)</string>
     <string name="loopdisconnectedfor">Разъединен (%1$d м)</string>
     <string name="openapssmb_maxiob_title">Предел суммарного активного инсулина IOB для OpenAPS [U]</string>
     <string name="openapssmb_maxiob_summary">Эта величина называется Max IOB в OpenAPS context\nOpenAPS не будет добавлять инсулин если текущий активный инсулин ее превысит</string>
@@ -940,7 +732,6 @@
     <string name="nav_setupwizard">Мастер настройки</string>
     <string name="setupwizard_finish">ГОТОВО</string>
     <string name="setupwizard_language_prompt">Выберите Ваш язык</string>
-    <string name="boluserrorcode">Запрошено: %1$.2f ед. Подано: %2$.2f ед. Код ошибки: %3$s</string>
     <string name="firstinsulinincrement">Первый шаг увеличения инсулина</string>
     <string name="secondinsulinincrement">Второй шаг увеличения инсулина</string>
     <string name="thirdinsulinincrement">Третий шаг увеличения инсулина</string>
@@ -963,7 +754,6 @@
     <string name="virtualpump_type">Тип виртуальной помпы</string>
     <string name="virtualpump_definition">Определение помпы</string>
     <string name="virtualpump_pump_def">Болюс: Шаг =%1$s\nПродленный Болюс: [Шаг =%2$s, Длительность =%3$sмин -%4$sh] \nБазал: Шаг =%5$s\ nTBR: %6$s (на %7$s), Длительность =%8$sмин -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* В виртуальной помпе поддерживаются только дискретные величины для обработки базала/болюса.</string>
     <string name="ns_autobackfill_title">Автозаполнение пропущенных данных СК</string>
     <string name="wear_wizard_settings">Параметры мастера настройки смарт-часов wear</string>
     <string name="wear_wizard_settings_summary">Расчеты, включены в результат мастера настройки смарт-часов wear:</string>
@@ -996,22 +786,6 @@ Context | Edit Context</string>
     <string name="request">Запрос</string>
     <string name="insulinsourcesetup">Настроить плагин инсулина</string>
     <string name="exit">Выход</string>
-    <string name="danar_useroptions">Параметры пользователя</string>
-    <string name="danar_timedisplay">Формат отображения времени</string>
-    <string name="danar_buttonscroll">Кнопка прокрутки</string>
-    <string name="danar_beep">Звуковой сигнал при нажатии кнопки</string>
-    <string name="danar_pumpalarm">Оповещение об опасности</string>
-    <string name="danar_pumpalarm_sound">Звуковой сигнал</string>
-    <string name="danar_pumpalarm_vibrate">Вибросигнал</string>
-    <string name="danar_pumpalarm_both">Оба</string>
-    <string name="danar_screentimeout">Время LCD экрана [seconds]</string>
-    <string name="danar_backlight">Время подсветки [seconds]</string>
-    <string name="danar_glucoseunits">Единиц глюкозы</string>
-    <string name="danar_shutdown">Выключение через [hours]</string>
-    <string name="danar_lowreservoir">В резервуаре мало инсулина [Units]</string>
-    <string name="danar_saveuseroptions">Сохранить параметры в помпе</string>
-    <string name="option_on">Вкл.</string>
-    <string name="option_off">Выкл.</string>
     <string name="open_navigation">Показать панель навигации</string>
     <string name="close_navigation">Cкрыть панель навигации</string>
     <string name="nav_plugin_preferences">Настройки расширений</string>
@@ -1031,8 +805,6 @@ Context | Edit Context</string>
     <string name="sensitivity_raises_target_summary">При обнаружении чувствительности целевой уровень глюкозы повышается</string>
     <string name="combo_invalid_setup">Недопустимые установки помпы, проверьте документацию и убедитесь, что меню Quick Info называется QUICK INFO, используя приложение 360 для конфигурации помпы.</string>
     <string name="custom">Пользовательские</string>
-    <string name="largetimedifftitle">Большая разница во времени</string>
-    <string name="largetimediff">Большая разница во времени: \n Время в помпе расходится более чем 1,5 ч. \n. Пожалуйста установите время на помпе вручную и убедитесь, что чтение истории помпы не вызывает неожиданное поведение.\n если возможно, удалите историю из помпы перед изменением времени или отключите замкнутый цикл на один DIA после последней неверной записи в журнале, как минимум на один DIA с настоящего момента.</string>
     <string name="careportal_removestartedevents">AndroidAPS перезапущен</string>
     <string name="storedsettingsfound">Найдены сохраненные параметры</string>
     <string name="allow_hardware_pump_text">Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время.</string>
@@ -1058,17 +830,10 @@ Context | Edit Context</string>
     <string name="setupwizard_preferred_aps_mode">Предпочитаемый режим APS</string>
     <string name="treatments_wizard_total_label">Итого</string>
     <string name="calculation_short">Кальк</string>
-    <string name="handshaking">Подтверждение связи</string>
     <string name="sendlogfiles">Отправьте файлы сегодняшнего лога разработчикам наряду с этим. Непредвиденная ситуация.</string>
-    <string name="maxbolusviolation">Макс нарушение болюса</string>
-    <string name="commanderror">Ошибка в команде</string>
-    <string name="speederror">Ошибка в скорости</string>
-    <string name="insulinlimitviolation">Нарушение ограничения инсулина</string>
     <string name="loop_openmode_min_change">Минимальный запрос на изменения [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Алгоритм ИПЖ выдаст всплывающее окно с запросом на новые изменения, только если изменение больше, чем это значение в %. Значение по умолчанию — 20%</string>
-    <string name="pairfirst">Выполните сопряжение помпы с телефоном!</string>
     <string name="searching_for_devices">Поиск устройств…</string>
-    <string name="please_wait">Подождите…</string>
     <string name="pairing_completed">Сопряжение выполнено</string>
     <string name="code_compare">Коды на этом устройстве и на вашей помпе совпадают?</string>
     <string name="insight_pairing">Сопряжение с Insight</string>
@@ -1157,7 +922,6 @@ Context | Edit Context</string>
     <string name="isequalorgreater">равно или больше чем</string>
     <string name="isgreater">больше чем</string>
     <string name="isnotavailable">недоступно</string>
-    <string name="unknown">неизвестно</string>
     <string name="glucoseisnotavailable">ГК недоступна</string>
     <string name="glucosecomparedmgdl">Гк %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Гк %1$s %2$.1f %3$s</string>
@@ -1174,23 +938,10 @@ Context | Edit Context</string>
     <string name="automation_short">Авто</string>
     <string name="automation">Автоматизация</string>
     <string name="profile_total">== ∑  %1$s ед</string>
-    <string name="profile_ins_units_per_hour">ед/ч</string>
-    <string name="profile_carbs_per_unit">г/ед</string>
-    <string name="profile_per_unit">/ед</string>
     <string name="dexcom_lognssensorchange_title">Внести замену сенсора в лог NS</string>
     <string name="dexcom_lognssensorchange_summary">Автоматически создать событие \"Замена сенсора\" в NS при запуске сенсора</string>
     <string name="tomato">Томато (MiaoMiao)</string>
     <string name="tomato_short">Томато</string>
-    <string name="unit_second">сек</string>
-    <string name="unit_minute">мин</string>
-    <string name="unit_hour">час</string>
-    <string name="unit_day">дн</string>
-    <string name="unit_week">нед</string>
-    <string name="unit_seconds">сек</string>
-    <string name="unit_minutes">мин</string>
-    <string name="unit_hours">час</string>
-    <string name="unit_days">дн</string>
-    <string name="unit_weeks">нед</string>
     <string name="summary_tidepool_username">Имя пользователя Tidepool, обычно ваш адрес электронной почты</string>
     <string name="title_tidepool_username">Имя пользователя</string>
     <string name="summary_tidepool_password">Ваш пароль для входа в Tidepool</string>
@@ -1233,7 +984,6 @@ Context | Edit Context</string>
     <string name="very_old_version">очень старая версия</string>
     <string name="new_version_warning">Новая версия доступна уже %1$d дней! По истечении %2$d дн алгоритм переходит в режим работы только с остановкой при низкой гликемии LGS, замкнутый цикл будет отключен через %3$d дн</string>
     <string name="twohours">2ч</string>
-    <string name="formatinsulinunits">%1$.2f ед</string>
     <string name="dexcom_app_patched">Приложение Dexcom (модифицированное)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Получать данные ГК от модифицированного приложения Dexcom.</string>
@@ -1310,10 +1060,6 @@ Context | Edit Context</string>
     <string name="rileylink_scanner_scan_stop">СТОП</string>
     <string name="rileylink_scanner_selected_device">Выбрано</string>
     <string name="rileylink_scanner_title">Сканирование RileyLink</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy не поддерживается.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth не включен.</string>
-    <string name="location_not_found_title">Геолокация не включена</string>
-    <string name="location_not_found_message">Для обнаружения Bluetooth на новых устройствах необходимо включить геолокацию. AAPS не отслеживает ваше местоположение и может быть отключен после успешного подключения.</string>
     <string name="location_yes">Включить</string>
     <string name="location_no">Нет</string>
     <string name="rileylink_scanner_scanning">Сканирование</string>
@@ -1355,7 +1101,6 @@ Context | Edit Context</string>
     <string name="rileylink_error_tuneup_failed">Ошибка TuneUp</string>
     <string name="rileylink_error_pump_unreachable">Помпа недоступна</string>
     <string name="rileylink_error_pod_unreachable">POD недоступен</string>
-    <string name="rileylink_error_address_not_set_short">Не выбрано</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Помпа Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1425,7 +1170,6 @@ Context | Edit Context</string>
     <string name="insulinFromCob"><![CDATA[Активные углеводы COB в сопоставлении с Активным инсулином IOB: <font color=\'%1$s\'>%2$+.2fед</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Применено ограничение на болюс: %2$.2fед до %3$.2fед</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Обнаружено медленное всасывание углеводов: %2$d%% времени. Еще раз проверьте свои расчеты. Возможно акт углеводы COB вне диапазона и может быть подано больше инсулина!!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f/%2$d ед</string>
     <string name="partialboluswizard">Подать эту часть рекомендации мастера болюса [%]</string>
     <string name="deliverpartofboluswizard">Мастер болюса выполняет расчет, но подана только эта часть рекомендуемого инсулина. Полезно с алгоритмом SMB.</string>
     <string name="loading">Загрузка...</string>
@@ -1433,7 +1177,6 @@ Context | Edit Context</string>
     <string name="time_range">Диапазон времени</string>
     <string name="timerange_value">Время между %1$s и %2$s</string>
     <string name="between">Между </string>
-    <string name="close">Закрыть</string>
     <string name="increasingmaxbasal">Повышаю максимальное значение базы т. к. оно меньше, чем максимальное значение в профиле</string>
     <string name="smscommunicator_messagebody">Недопустимое тело сообщения</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1451,7 +1194,6 @@ Context | Edit Context</string>
     <string name="common_off">Выкл.</string>
     <string name="objectives_button_unfinish">Очистить завершенные</string>
     <string name="objectives_button_unstart">Очистить начатые</string>
-    <string name="timedetection">Определение времени</string>
     <string name="doyouwantresetstart">Хотите сбросить начатую цель? Можете потерять уже достигнутое.</string>
     <string name="time_or_timezone_change">Изменение времени и/или часового пояса на помпе</string>
     <string name="nopumpselected">Помпа не выбрана</string>
@@ -1478,7 +1220,6 @@ Context | Edit Context</string>
     <string name="nav_survey">Опрос</string>
     <string name="invalidage">Некорректное значение возраст</string>
     <string name="invalidweight">Некорректное значение вес</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Низкий: <b>%2$02d%%</b> В целевом диапазоне: <b>%3$02d%%</b> Высокий: <b>%4$02d%%</b>]]></string>
     <string name="average">Средний</string>
     <string name="tdd">TDD/общая суточная доза</string>
@@ -1491,12 +1232,8 @@ Context | Edit Context</string>
     <string name="randombg_short">BG/ГК</string>
     <string name="tools">Инструментарий</string>
     <string name="show_calculation">Показать расчет</string>
-    <string name="error">Ошибка</string>
-    <string name="timeformat12h">12 ч</string>
-    <string name="timeformat24h">24 ч</string>
     <string name="automation_event">Автоматизированное событие</string>
     <string name="alreadyset">Уже установлено</string>
-    <string name="message">Сообщение</string>
     <string name="clearqueueconfirm">Очистить очередь? Все данные в очереди будут потеряны!</string>
     <string name="ebstopsloop">Функция Пролонгированный Болюс остановит режим замкнутого цикла на время действия пролонгированного болюса. Подтверждаете выбор?</string>
     <string name="closed_loop_disabled_with_eb">Замкнутый цикл отключен из-за работы Пролонгированного Болюса</string>
@@ -1540,4 +1277,115 @@ Context | Edit Context</string>
     <string name="statuslights">Индикаторы состояния</string>
     <string name="statuslights_copy_ns">Копировать параметры из NS</string>
     <string name="copyexistingvalues">Копировать настройки NS (если есть)?</string>
+    <string name="classic_desrciption">Исходная тема оформления</string>
+    <string name="buttonson_desrciption">Кнопки всегда отображаются в нижней части экрана</string>
+    <string name="skin">Тема оформления</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Для интеграции с помпой Omnipod требуется устройство RileyLink (с прошивкой 2.0 и выше).</string>
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Звуковой сигнал болюса включен</string>
+    <string name="omnipod_config_beep_basal_enabled">Звуковой сигнал базала включен</string>
+    <string name="omnipod_config_beep_smb_enabled">Звуковой сигнал микроболюса SMB включен</string>
+    <string name="omnipod_config_beep_tbr_enabled">Звуковой сигнал временного базала TBR включен</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Опции Отладки Пода Включены</string>
+    <string name="omnipod_config_timechange_enabled">Включено обнаружение часового пояса</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Управление помпой</string>
+    <string name="omnipod_pod_status">Статус помпы</string>
+    <string name="omnipod_reservoir_left">%1$.2f ед. осталось</string>
+    <string name="omnipod_reservoir_over50">Более 50 ед.</string>
+    <string name="omnipod_pod_address">Адрес Пода</string>
+    <string name="omnipod_pod_expiry">Срок действия Пода истекает</string>
+    <string name="omnipod_pod_name_no_info">Нет информации.</string>
+    <string name="omnipod_pod_no_pod_connected">Нет подключения к помпе</string>
+    <string name="omnipod_pod_not_initalized">Нет инициализации</string>
+    <string name="omnipod_pod_active_alerts">Активные оповещения помпы</string>
+    <string name="omnipod_ack_short">Оповещения помпы</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 МГц)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Операция невозможна.\n\n Сначала нужно настроить помпу Omnipod.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Операция невозможна.\n\n Подождите несколько минут, пока AAPS пытается задать профиль.</string>
+    <string name="omnipod_error_illegal_init_action_type">Недопустимый тип инициализации: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Активная помпа не выбрана.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Командная верификация не состоялась.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Произошла непредвиденная ошибка. Пожалуйста, сообщите об ошибке! (сообщить:: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Ошибка связи: недопустимые входные параметры.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Ошибка связи: время ожидания истекло.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ошибка связи: возникла непредвиденная ошибка. Пожалуйста, сообщите!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Ошибка связи: проверка целостности сообщения завершилась неудачно.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Ошибка связи: недопустимые входные параметры.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Ошибка связи: Pod находится в неверном состоянии.</string>
+    <string name="omnipod_driver_error_invalid_response">Ошибка связи: недопустимый ответ от помпы.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Ошибка связи: получено сообщение с недопустимым порядковым номером от Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Ошибка связи: получено сообщение с некорректным адресом от Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Ошибка связи: не удалось декодировать сообщение от Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Ошибка соединения: не удалось выполнить синхронизацию nonce resync.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Ошибка соединения: вне синхронизации.</string>
+    <string name="omnipod_driver_error_not_enough_data">Ошибка связи: недостаточно данных от Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Обнаружена ошибка Pod (%1$03d %2$s). Деактивируйте Pod и запустите новый.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Ошибка связи: Pod ответил ошибкой.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Управление помпой Omnipod </string>
+    <string name="omnipod_cmd_init_pod">Инициализировать Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Деактивировать Pod</string>
+    <string name="omnipod_cmd_reset_pod">Сброс помпы</string>
+    <string name="omnipod_cmd_pod_history">Журнал помпы</string>
+    <string name="omnipod_cmd_set_bolus">Настроить болюс</string>
+    <string name="omnipod_cmd_cancel_bolus">Отменить болюс</string>
+    <string name="omnipod_cmd_set_tbr">Установить временный базал</string>
+    <string name="omnipod_cmd_cancel_tbr">Отменить временный базал (внутренний драйвер)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Отменить временный базал (принудительно пользователем)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Задать расписание базала</string>
+    <string name="omnipod_cmd_get_pod_status">Получить состояние Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Получить информацию о Pod</string>
+    <string name="omnipod_cmd_set_time">Установить Время</string>
+    <string name="omnipod_cmd_configure_alerts">Сконфигурировать оповещения</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Подтвердить оповещения</string>
+    <string name="omnipod_cmd_suspend_delivery">Приостановить подачу</string>
+    <string name="omnipod_cmd_resume_delivery">Возобновить подачу</string>
+    <string name="omnipod_cmd_unknown_entry">Неизвестная запись</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f ед</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f ед, CH=%2$.1f г</string>
+    <string name="omnipod_cmd_tbr_value">Скорость: %1$.1f ед, Продолжительность: %2$d мин</string>
+    <string name="omnipod_cmd_reset_pod_desc">Если нажать <b>OK</b>, состояние Pod будет принудительно сброшено, и вы больше не сможете общаться с Pod. Сделайте это только в том случае, если вы не можете обмениваться с Pod. Если еще можно связаться с Pod, воспользуйтесь опцией <b>Деактивировать Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">В настоящее время история помпы недоступна.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Заполнить Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nЗаполните новый Pod запасом инсулина на 3 дня.\n\nПоступят два звуковых сигнала от помпы во время заправки. Это означает, что минимальное количество 85U заправлено. Не забудьте опустошить заправочный шприц даже после того, как услышите два звуковых сигнала.\n\nПосле заполнения Pod нажмите <b>Next</b>.\n\n<b>Примечание:</b> Пока не снимайте с помпы колпачок с иглой.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Первичное заполнение инфузионной секции пода</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Попытка сопряжения с новым Podом и первичного заполнения инфузионного отсека..\n\n После проверки всех пунктов можно нажать <b>Далее</b>.\n\n<b>Примечание:</b> В это время Под должен находиться рядом с RileyLink.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Подключить Под</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nПодготовьте место инфузии. Удалите колпачок с иглы и защиту липкого слоя, Установите Pod на тело.\n\nесли канюля выступает, нажмите <b>отменить</b> и утилизируйте Pod.\n\Нажмите <b>Далее</b> чтобы вставить канюлю и начать подачу базала.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Установка канюли (катетера) </string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Определение графика подачи базала и установка канюли. \n\n Когда проверены все шаги, нажмите <b>Далее</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Информация о Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nПомпа сейчас активна.\n\nБазальный график запрограммирован и катетер установлен.\n\nУбедитесь в том, что канюля установлена правильно и замените Pod, если такой уверенности нет.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Деактивировать Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nНажмите <b>Далее</b> для деактивации Пода\n\n<b>Примечание:</b> Это Приостановит всякую подачу инсулина и деактивирует помпу.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Деактивация помпы</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивация помпы.\n\n, Когда проверены все элементы, нажмите <b>Далее</b>.\n\n<b>Примечание:</b> Если деактивация постоянно завершается ошибкой, нажмите <b>Отменить</b> и примените <b>Сброс помпы</b> чтобы принудительно сбросить состояние Pod\'a.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod деактивирован.\n\nУдалите и утилизируйте Pod.</string>
+    <string name="omnipod_init_pod_pair_pod">Сопряжение Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Заполнение инфузионной секции Pod\'a</string>
+    <string name="omnipod_init_pod_fill_cannula">Заполнение катетера</string>
+    <string name="omnipod_init_pod_set_basal_profile">Задан профиль базала</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Отмена подачи инсулина</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивировать Pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Интеграция с помпой Omnompod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Напоминание о завершении сопряжения</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Напоминание о завершении настройки</string>
+    <string name="omnipod_alert_expiration">Срок Pod\'a истекает в ближайшее время</string>
+    <string name="omnipod_alert_expiration_advisory">Срок Pod\'a истекает в ближайшее время</string>
+    <string name="omnipod_alert_shutdown_imminent">Остановка неизбежна</string>
+    <string name="omnipod_alert_low_reservoir">В резервуаре мало инсулина</string>
+    <string name="omnipod_alert_unknown_alert">Неизвестное оповещение</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Возможно, не удалось задать базовый профиль. Подача инсулина может быть приостановлена! Обновите состояние Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Возможно, установка временного базала не удалась. Если временный базал уже работал, возможна его отмена! Обновите статус Pod\'a.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Возможно, не удалось задать время. Подача инсулина может быть приостановлена! Обновите состояние Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Не удалось проверить правильность подачи болюса. Убедитесь, что Pod подает болюс или отмените его.</string>
+    <string name="omnipod_rl_stats">Статистика RL</string>
+    <string name="omnipod_read_pulse_log_short">Журнал Pulse </string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 572d405cf4..dbb4f2dedb 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -12,13 +12,10 @@
     <string name="nav_resetdb">Vymaž databázu</string>
     <string name="reset_db_confirm">Naozaj chcete vymazať databázu?</string>
     <string name="nav_exit">Ukončiť</string>
-    <string name="danar_useextended_title">Použiť predĺžené bolusy pre &gt;200%%</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth zariadenie</string>
     <string name="ns_sync_use_absolute_title">Vždy používaj absolútne hodnoty bazálov</string>
     <string name="alert_dialog_storage_permission_text">Prosím reštartuj svoj telefón, alebo reštartuj AndroidAPS zo systémových nastavení, v opačnom prípade AndroidAPS nebude mocť zapisovať údaje (dôležité kvôli sledovaniu a overovaniu, že algoritmus pracuje správne)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Toto zariadenie zrejme neumožňuje vypnúť optimalizáciu batérie - môže dochádzať k problémom s výkonom.</string>
     <string name="description_actions">Niektoré tlačidlá na rýchly prístup do spoločných funkcií</string>
-    <string name="description_careportal">Zadávanie udalostí pre management diabetu.</string>
     <string name="description_config_builder">Používané na konfiguráciu aktívnych pluginov</string>
     <string name="description_objectives">Výukový program</string>
     <string name="description_food">Zobrazenie prednastavených jedál, definovaných v Nightscoute</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Použitie profilu, ktorý je definovaný v Nightscoute</string>
     <string name="description_profile_simple">Definuj profil s iba jedným časovým pásmom.</string>
     <string name="description_pump_combo">Ovládač pumpy pre Accu-Check Combo, vyžaduje nainštalovanú aplikáciu Ruffy</string>
-    <string name="description_pump_dana_r">Ovládač pumpy pre Dana Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Ovládač pumpy pre kórejskú verziu Dana Diabecare R</string>
-    <string name="description_pump_dana_r_v2">Ovládač pumpy pre Dana Diabecare R s aktualizovaným firmvérom</string>
-    <string name="description_pump_dana_rs">Ovládač pumpy pre Dana Diabecare RS</string>
     <string name="description_pump_mdi">Ovládač pumpy pre užívateľov používajúcich k liečbe diabetu inzulínové perá</string>
     <string name="description_pump_virtual">Ovládač pumpy pre užívateľov bez podporovanej pumpy (Otvorený okruh)</string>
     <string name="description_sensitivity_aaps">Citlivosť je počítaná tým istým spôsobom ako v Oref0, ale je možné špecifikovať časové okno do minulosti. Minimálne vstrebávanie sacharidov je počítané dynamicky z maximálnej doby vstrebávania, definovanej v nastaveniach.</string>
@@ -54,13 +47,6 @@
     <string name="description_wear">Zobrazovanie stavu a riadenie AndroidAPS z hodiniek s WearOS.</string>
     <string name="description_xdrip_status_line">Zobraz informácie o uzavretom okruhu na xDrip+ watchface.</string>
     <string name="description_sms_communicator">Ovládaj na diaľku AndroidAPS použitím SMS príkazov.</string>
-    <string name="nsprofileview_units_label">Jednotky</string>
-    <string name="nsprofileview_dia_label">Doba pôsobenia inzulínu</string>
-    <string name="nsprofileview_ic_label">Inzulínovo-sacharidový pomer</string>
-    <string name="nsprofileview_isf_label">Citlivosť</string>
-    <string name="nsprofileview_basal_label">Bazál</string>
-    <string name="nsprofileview_target_label">Cieľ</string>
-    <string name="noprofileset">Nenastavený žiadny profil</string>
     <string name="treatments_insulin_label_string">Inzulín:</string>
     <string name="treatments_carbs_label_string">Sacharidy:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -76,15 +62,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Sacharidy</string>
     <string name="treatments_wizard_correction_label">Korekcia</string>
-    <string name="insulin_unit_shortname">JI</string>
     <string name="treatments_wizard_bolusiob_label">Bolusový IOB</string>
     <string name="openapsma_run">Spustiť teraz</string>
     <string name="vitualpump_label">Virtuálna pumpa</string>
-    <string name="pump_basebasalrate_label">Základná hodnota bazálu</string>
-    <string name="pump_tempbasal_label">Dočasný bazál</string>
-    <string name="virtualpump_extendedbolus_label">Predĺžený bolus</string>
-    <string name="pump_battery_label">Batéria</string>
-    <string name="pump_reservoir_label">Zásobník</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Posledné spustenie</string>
     <string name="openapsma_inputparameters_label">Vstupné parametre</string>
@@ -96,16 +76,11 @@
     <string name="result">Výsledok</string>
     <string name="result_insulin_carbs">Výsledok: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Nedostupné dáta o glykémiách</string>
-    <string name="nochangerequested">Nepožadovaná žiadna zmena</string>
     <string name="openapsma_request_label">Požiadavka</string>
-    <string name="rate">Hodnota</string>
-    <string name="duration">Trvanie</string>
-    <string name="reason">Zdôvodnenie</string>
     <string name="glucose">Glykémia</string>
     <string name="delta">Rozdiel</string>
     <string name="sms_delta">Rozdiel:</string>
     <string name="configbuilder">Konfigurácia</string>
-    <string name="objectives">Ciele</string>
     <string name="overview">Prehľad</string>
     <string name="nsprofile">NS Profil</string>
     <string name="simpleprofile">Jednoduchý profil</string>
@@ -123,7 +98,6 @@
     <string name="configbuilder_general">Všeobecné</string>
     <string name="configbuilder_general_description">Toto sú všeobecné moduly, ktoré môžu byť užitočné.</string>
     <string name="configbuilder_constraints_description">Aké obmedzenia sú použité?</string>
-    <string name="days">dní</string>
     <string name="constraints">Obmedzenia</string>
     <string name="loop">Uzavretý okruh</string>
     <string name="configbuilder_loop">Uzavretý okruh</string>
@@ -139,7 +113,6 @@
     <string name="openapsma_disabled">Modul je deaktivovaný</string>
     <string name="constraints_violation">Mimo povolený rozsah</string>
     <string name="treatmentdeliveryerror">Chyba podania bolusu</string>
-    <string name="tempbasaldeliveryerror">Chyba podávania dočasného bazálu</string>
     <string name="overview_newtempbasal_basalpercent">Hodnota bazálu [%]</string>
     <string name="setbasalquestion">Povoliť nový dočasný bazál:</string>
     <string name="overview_treatment_label">Bolus</string>
@@ -150,7 +123,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
-    <string name="carbs">Sacharidy</string>
     <string name="changeyourinput">Zmeňte zadanie!</string>
     <string name="configbuilder_bgsource">Zdroj glykémie</string>
     <string name="configbuilder_bgsource_description">Odkiaľ má AndroidAPS získavať glykémie?</string>
@@ -158,6 +130,7 @@
     <string name="apsmode_title">APS mód</string>
     <string name="closedloop">Uzavretý okruh</string>
     <string name="openloop">Otvorený okruh</string>
+    <string name="lowglucosesuspend">Pozastavenie pri nízkej glykémii (LGS)</string>
     <string name="disabledloop">Uzavretý okruh deaktivovaný</string>
     <string name="disableloop">Deaktivovať uzavretý okruh</string>
     <string name="enableloop">Aktivovať uzavretý okruh</string>
@@ -167,25 +140,6 @@
     <string name="treatments_wizard_basaliob_label">Bazálny IOB</string>
     <string name="bolusconstraintapplied">Aplikované obmedzenie bolusu</string>
     <string name="carbsconstraintapplied">Aplikované obmedzenie sacharidov</string>
-    <string name="careportal_bgcheck">Kontrola glykémie</string>
-    <string name="careportal_announcement">Oznámenie</string>
-    <string name="careportal_note">Poznámka</string>
-    <string name="careportal_question">Otázka</string>
-    <string name="careportal_exercise">Pohyb</string>
-    <string name="careportal_pumpsitechange">Výmena setu</string>
-    <string name="careportal_cgmsensorinsert">Výmena senzora</string>
-    <string name="careportal_cgmsensorstart">Spustenie senzora</string>
-    <string name="careportal_insulincartridgechange">Výmena inzulínu</string>
-    <string name="careportal_profileswitch">Prepnutie profilu</string>
-    <string name="careportal_snackbolus">Bolus na desiatu/olovrant</string>
-    <string name="careportal_mealbolus">Bolus na jedlo</string>
-    <string name="careportal_correctionbolus">Korekčný bolus</string>
-    <string name="careportal_combobolus">Kombinovaný bolus</string>
-    <string name="careportal_tempbasalstart">Začiatok dočasného bazálu</string>
-    <string name="careportal_tempbasalend">Koniec dočasného bazálu</string>
-    <string name="careportal_carbscorrection">Prídavok sacharidov</string>
-    <string name="careportal_openapsoffline">OpenAPS vypnuté</string>
-    <string name="careportal_newnstreatment_eventtype">Typ udalosti</string>
     <string name="careportal_newnstreatment_other">Iné</string>
     <string name="careportal_newnstreatment_meter">Glukomer</string>
     <string name="careportal_newnstreatment_sensor">Senzor</string>
@@ -217,7 +171,6 @@
     <string name="openapsma_maxbasal_summary">Táto hodnota je nazývaná v OpenAPS ako \"max basal\"</string>
     <string name="openapsma_maxiob_title">Maximálny bazálny IOB, ktorý OpenAPS môže podať [JI]</string>
     <string name="openapsma_maxiob_summary">Táto hodnota je nazývaná v kontexte OpenAPS ako max IOB, je to maximálne množstvo inzulínu v [JI], ktoré APS môže naraz podať.</string>
-    <string name="dismiss">POTVRDIŤ</string>
     <string name="password_preferences_encrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie exportovaných nastavení.</string>
     <string name="password_preferences_decrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie importovaných nastavení.</string>
     <string name="preferences_export_canceled">Export zrušený! Nastavenia neboli exportované!</string>
@@ -256,34 +209,12 @@
     <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrovania, zadané heslo je neplatné, alebo bol súbor nastavení zmenený! Môže sa stať, že importovaný súbor bol exportovaný s iným hlavným heslom.</string>
     <string name="prefdecrypt_issue_wrong_format">Chýba konfigurácia šifrovania, formát nastavení je neplatný!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný alebo neurčený šifrovací algoritmus!</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Pripájanie</string>
-    <string name="connected">Pripojené</string>
-    <string name="disconnected">Odpojené</string>
-    <string name="danar_pump_settings">Nastavenie pumpy Dana</string>
     <string name="end_user_license_agreement">Licenčná zmluva s koncovým používateľom</string>
     <string name="end_user_license_agreement_text">Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM A POTVRDZUJEM</string>
     <string name="save">Uložiť</string>
-    <string name="nobtadapter">Bluetooth adaptér nenájdený</string>
-    <string name="devicenotfound">Vybrané zariadenie nenájdené</string>
-    <string name="connectionerror">Chyba pripájania pumpy</string>
-    <string name="danar_iob_label">IOB z pumpy</string>
-    <string name="danar_dailyunits">Jednotiek za deň</string>
-    <string name="pump_lastbolus_label">Posledný bolus</string>
-    <string name="hoursago">pred %1$.1fh</string>
-    <string name="danar_invalidinput">Chybné vstupné dáta</string>
-    <string name="danar_valuenotsetproperly">Hodnota nenastavená správne</string>
     <string name="reloadprofile">Obnoviť profil</string>
-    <string name="danar_viewprofile">Zobraziť profil</string>
-    <string name="enacted">Vykonané</string>
-    <string name="comment">Komentár</string>
-    <string name="success">Úspešne</string>
-    <string name="percent">Percent</string>
-    <string name="absolute">Absolútna</string>
-    <string name="canceltemp">Zrušiť dočasný bazál</string>
     <string name="smscommunicator">SMS komunikátor</string>
-    <string name="waitingforpumpresult">Čakanie na výsledok</string>
     <string name="smscommunicator_allowednumbers">Povolené telefónne čísla</string>
     <string name="smscommunicator_allowednumbers_summary">+421XXXXXXXXX;+421YYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Pre podanie bolusu %1$.2fJI odpovedz SMS kódom %2$s</string>
@@ -304,54 +235,13 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Cieľ %1$s na %2$d minút</string>
     <string name="smscommunicator_tt_set">Cieľ %1$s na %2$d minút bol úspešne nastavený</string>
     <string name="smscommunicator_tt_canceled">Dočasný cieľ úspešne zrušený</string>
-    <string name="bolusdelivering">Podávanie %1$.2fJI</string>
     <string name="smscommunicator_remotecommandsallowed">Povoliť príkazy na diaľku cez SMS</string>
-    <string name="glucosetype_finger">Prst</string>
-    <string name="glucosetype_sensor">Senzor</string>
-    <string name="manual">Iný</string>
-    <string name="careportal_temporarytarget">Dočasný cieľ</string>
-    <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
     <string name="danarprofile">DanaR nastavenie profilu</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Celková doba pôsobenia inzulínu</string>
-    <string name="failedupdatebasalprofile">Chyba pri aktualizovaní bazálneho profilu</string>
-    <string name="danar_historyreload">Načítať</string>
     <string name="uploading">Nahrávanie</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">chyba</string>
-    <string name="danar_refill">plnenie</string>
-    <string name="danar_basalhour">hodinový bazál</string>
-    <string name="danar_glucose">glykémia</string>
-    <string name="danar_carbohydrate">sacharidy</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Celkom nahraných %1$d záznamov</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarmy</string>
-    <string name="danar_history_basalhours">Hodinové bazály</string>
-    <string name="danar_history_bolus">Bolusy</string>
-    <string name="danar_history_carbohydrates">Sacharidy</string>
-    <string name="danar_history_dailyinsulin">Denný inzulín</string>
-    <string name="danar_history_errors">Chyby</string>
-    <string name="danar_history_glucose">Glykémia</string>
-    <string name="danar_history_refill">Plnenie</string>
-    <string name="danar_history_syspend">Pozastavenia</string>
-    <string name="danar_history_connectingfor">Pripájanie %1$d sek</string>
-    <string name="danar_password_title">Heslo do pumpy</string>
-    <string name="wrongpumppassword">Nesprávne heslo do pumpy!</string>
-    <string name="pumpbusy">Pumpa je zaneprázdnená</string>
-    <string name="overview_bolusprogress_delivered">Podané</string>
-    <string name="overview_bolusprogress_stoped">Zastavené</string>
     <string name="bolusstopped">Bolus zastavený</string>
     <string name="bolusstopping">Zastavenie bolusu</string>
-    <string name="occlusion">Oklúzia</string>
-    <string name="overview_bolusprogress_stop">Stop</string>
-    <string name="overview_bolusprogress_stoppressed">STLAČENÝ STOP</string>
-    <string name="waitingforpump">Čakám na pumpu</string>
-    <string name="overview_bolusprogress_goingtodeliver">Podávanie %1$.2fJ inzulínu</string>
-    <string name="youareonallowedlimit">Dosiahnutý limit</string>
-    <string name="noprofileselected">Nebol vybraný žiadny profil</string>
     <string name="smscommunicator_loophasbeendisabled">Uzavretý okruh bol deaktivovaný</string>
     <string name="smscommunicator_loophasbeenenabled">Uzavretý okruh bol aktivovaný</string>
     <string name="smscommunicator_loopisdisabled">Uzavretý okruh je deaktivovaný</string>
@@ -391,11 +281,9 @@
     <string name="mealbolus">Bolus</string>
     <string name="correctionbous">Korekcia</string>
     <string name="actions">Akcie</string>
-    <string name="androidaps_start">AndroidAPS spustený</string>
     <string name="ns_upload_only">Iba nahrávanie do NS (synchronizácia deaktivovaná)</string>
     <string name="ns_upload_only_summary">Iba nahrávanie dát do NS. Neúčinné pri hodnotách glykémie, pokiaľ nieje vybraný lokálny zdroj dát ako xDrip. Neúčinné pri profiloch, pokiaľ sa používajú NS profily.</string>
     <string name="pumpNotInitialized">Pumpa nie je inicializovaná!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pumpa nie je inicializovaná, profil nenastavený!</string>
     <string name="primefill">Plnenie/doplňovanie</string>
     <string name="fillwarning">Prosím uistite sa, že hodnota zodpovedá špecifikácií Vášho setu!</string>
     <string name="othersettings_title">Iné</string>
@@ -405,8 +293,6 @@
     <string name="button3">Tlačidlo 3</string>
     <string name="units_colon">Jednotky:</string>
     <string name="units">Jednotky</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/L</string>
     <string name="dia">DIA</string>
     <string name="target_range">Cieľový rozsah:</string>
     <string name="prefs_range_title">Rozsah pre zobrazenie</string>
@@ -416,17 +302,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Všetky dáta poslať znova</string>
     <string name="open_settings_on_wear">Otvoriť nastavenia na hodinkách</string>
-    <string name="pumperror">Chyba pumpy</string>
-    <string name="lowbattery">Nízky stav batérie</string>
-    <string name="pumpshutdown">Vypnutie pumpy</string>
-    <string name="batterydischarged">Batéria v pumpe vybitá</string>
-    <string name="danarkoreanpump">Kórejská DanaR</string>
     <string name="basal_rate">Bazál:</string>
-    <string name="profile_set_failed">Nastavenie bazálneho profilu zlyhalo</string>
-    <string name="profile_set_ok">Bazálny profil v pumpe aktualizovaný</string>
-    <string name="danar_disableeasymode">Deaktivovať v pumpe režim EasyUI</string>
-    <string name="danar_enableextendedbolus">Aktivovať v pumpe predĺžené bolusy</string>
-    <string name="danar_switchtouhmode">Zmeniť v pumpe režim z JI/d na JI/h</string>
     <string name="basalvaluebelowminimum">Hodnota bazálu pod povoleným minimom. Profil nenastavený!</string>
     <string name="sms_actualbg">Glykémia:</string>
     <string name="sms_lastbg">Posledná glykémia:</string>
@@ -434,7 +310,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Priebežné notifikácie</string>
     <string name="old_data">ZASTARALÉ DÁTA</string>
-    <string name="minago">pred %1$d min</string>
     <string name="sms_minago">pred %1$d min</string>
     <string name="localprofile">Lokálny profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -450,41 +325,22 @@
     <string name="hypo">Hypoglykémia</string>
     <string name="activity">Aktivita</string>
     <string name="removerecord">Odstrániť záznam</string>
-    <string name="danar_stats">DanaR štatistiky</string>
-    <string name="danar_stats_cumulative_tdd">Kumulatívny TDD</string>
-    <string name="danar_stats_expweight">Exponenciálne vážený TDD</string>
-    <string name="danar_stats_basalrate">Bazál</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Dátum</string>
-    <string name="danar_stats_ratio">Pomer</string>
-    <string name="danar_stats_amount_days">Dní</string>
-    <string name="danar_stats_weight">Váha</string>
-    <string name="danar_stats_warning_Message">Pravdepodobne nepresné, ak bol použitý bolus na plnenie!</string>
-    <string name="danar_stats_olddata_Message">Zastaralé dáta. Prosím načítajte ich znovu</string>
-    <string name="danar_stats_tbb">Celk. denný bazál</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Inicializácia ...</string>
     <string name="actions_shortname">AKCIA</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">OKRUH</string>
     <string name="simpleprofile_shortname">JPRO</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LPRF</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">PREH</string>
     <string name="virtualpump_shortname">VPUM</string>
     <string name="profileviewer_shortname">PROF</string>
     <string name="treatments_shortname">OŠET</string>
-    <string name="careportal_shortname">STAR</string>
     <string name="objectives_shortname">CIEĽ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Krátke názvy modulov</string>
     <string name="always_use_shortavg">Vždy používať krátkodobý priemerný rozdiel glykémií, namiesto rozdielu posledných dvoch hodnôt</string>
     <string name="always_use_shortavg_summary">Zmysluplné, pokiaľ dáta z xDripu obsahujú veľký šum.</string>
-    <string name="advancedsettings_title">Rozšírené nastavenia</string>
-    <string name="danar_model">Model: %1$02X Protokol: %2$02X Kód: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Štandardná hodnota: 3 Toto je kľúčová hodnota zabezpečenia. Hovorí, že maximálny nastaviteľný bazál je trojnásobkom maximálneho denného bazálu. Spravidla to zrejme nebudete musieť meniť, prípadne si prečítate o téme \"3x max denný; 4x aktuálny\".</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Štandardná hodnota: 4 Toto je druhá kľúčová hodnota. Hovorí, že maximálna hodnota dočasného bazálu nikdy nebude väčšia, ako štvornásobok aktuálneho bazálu. Je to preto, aby se ľudia nedostali do nebezpečných hodnôt skôr, ako pochopia ako OpenAPS pracuje. Znovu, štandardná hodnota je 4 a väčšina ľudí ju nikdy nebude musieť meniť. Pokiaľ nestačí, obvykle je problém niekde inde.</string>
@@ -503,18 +359,9 @@
     <string name="smscommunicator_calibrationsent">Kalibrácia odoslaná. Príjem kalibrácií musí byť v xDripe povolený.</string>
     <string name="smscommunicator_calibrationfailed">xDrip neprijíma kalibrácie</string>
     <string name="pumpsuspended">Pumpa pozastavená</string>
-    <string name="gettingpumpstatus">Načítavam stav pumpy</string>
-    <string name="settingtempbasal">Nastavujem dočasný bazál</string>
-    <string name="stoppingtempbasal">Zastavujem dočasný bazál</string>
-    <string name="settingextendedbolus">Nastavujem predĺžený bolus</string>
-    <string name="stoppingextendedbolus">Zastavujem predĺžený bolus</string>
-    <string name="updatingbasalrates">Aktualizujem bazály</string>
-    <string name="disconnecting">Odpájanie</string>
     <string name="executing">Vykonávam</string>
     <string name="virtualpump_settings">Nastavenie virtuálnej pumpy</string>
     <string name="virtualpump_uploadstatus_title">Nahrať stav do NS</string>
-    <string name="wrongpassword">Nesprávne heslo</string>
-    <string name="approachingdailylimit">Blíži sa denný limit inzulínu</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCl</string>
     <string name="nsclientinternal_url">Adresa URL:</string>
@@ -538,7 +385,6 @@
     <string name="wear_detailedIOB_title">Zobraziť detailný IOB</string>
     <string name="wear_detailedIOB_summary">Rozpísať IOB na hodinkách do bolusového a bazálneho</string>
     <string name="nosuccess">Neúspešné - skontrolujte telefón</string>
-    <string name="notavailable">Nedostupný</string>
     <string name="patientage">Vek pacienta</string>
     <string name="child">Dieťa</string>
     <string name="teenage">Dospievajúci</string>
@@ -574,8 +420,6 @@
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Zaznamenávať spustenie aplikácie do NS</string>
     <string name="restartingapp">Zatváram aplikáciu, aby sa aplikovali nové nastavenia.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">Inzulín</string>
     <string name="configbuilder_insulin_description">Aký druh inzulínu používate?</string>
     <string name="fastactinginsulin">Rýchlo pôsobiaci inzulín</string>
     <string name="fastactinginsulincomment">Novorapid, Humalog</string>
@@ -598,9 +442,6 @@
     <string name="statuslights_bat_critical">Prah kritickej úrovne batérie [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Posledné spojenie</string>
-    <string name="danar_bluetooth_status">Stav Bluetooth</string>
     <string name="nav_about">O aplikácii</string>
     <string name="smscommunicator_missingsmspermission">Chýbajúce povolenie SMS príkazov</string>
     <string name="smscommunicator_missingphonestatepermission">Chýba oprávnenia pre zisťovanie stavu telefónu</string>
@@ -611,17 +452,12 @@
     <string name="wear_showbgi_summary">Pridať BGI do stavového riadku</string>
     <string name="ns_noupload">Zakázať nahrávanie do NS</string>
     <string name="ns_noupload_summary">Všetky dáta odoslané do NS, budú zahodené. AAPS je pripojený k NS, ale nerobí v ňom žiadne zmeny</string>
-    <string name="basal_step">Krok bazálu</string>
-    <string name="bolus_step">Krok bolusu</string>
     <string name="overview_extendedbolus_cancel_button">Zrušiť predĺžený bolus</string>
     <string name="careportal_sensorage_label">Vek senzora</string>
     <string name="careportal_canulaage_label">Vek kanyly</string>
     <string name="careportal_insulinage_label">Vek inzulínu</string>
-    <string name="hours">hodín</string>
-    <string name="invalidprofile">Chybný profil !!!</string>
     <string name="doprofileswitch">Vykonajte zmenu profilu</string>
     <string name="careportal_pbage_label">Vek batérie v pumpe</string>
-    <string name="careportal_pumpbatterychange">Výmena batérie v pumpe</string>
     <string name="ns_alarmoptions">Nastavenie alarmov</string>
     <string name="nsalarm_urgenthigh">Veľmi vysoká</string>
     <string name="nsalarm_high">Vysoká</string>
@@ -645,7 +481,6 @@
     <string name="absorptionsettings_title">Nastavenie vstrebávania sacharidov</string>
     <string name="absorption_maxtime_title">Max. doba vstrebávania sacharidov [h]</string>
     <string name="absorption_maxtime_summary">Čas v hodinách, počas ktorého predpokladáme, že všetky sacharidy budú vstrebané</string>
-    <string name="danar_visualizeextendedaspercentage_title">Zobrazovať predĺžený bolus v %%</string>
     <string name="careportal_sensorage_label_short">SENZ</string>
     <string name="careportal_insulinage_label_short">INZ</string>
     <string name="careportal_canulaage_label_short">KAN</string>
@@ -670,7 +505,6 @@
     <string name="careportal_pump_label">PUMPA</string>
     <string name="careportal_newnstreatment_duration_min_label">Trvanie [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Povoliť UAM</string>
     <string name="enablesmb">Povoliť SMB</string>
     <string name="enablesmb_summary">Použiť Super Mikro Bolusy namiesto dočasných bazálov, pre zrýchleniu účinku</string>
@@ -682,23 +516,7 @@
     <string name="ultrarapid_oref">Ultra rýchly - Oref</string>
     <string name="dia_too_short">DIA %1$f je príliš krátke - AAPS namiesto toho použilo %2$f !</string>
     <string name="activate_profile">Aktivovať profil</string>
-    <string name="date">Dátum</string>
     <string name="invalid">NEPLATNÝ</string>
-    <string name="waitingforpairing">Čakanie na párovanie na pumpe</string>
-    <string name="pairingok">Spárované</string>
-    <string name="pairingtimedout">Vypršal časový limit pre párovanie</string>
-    <string name="pairing">Párovanie</string>
-    <string name="danars_nodeviceavailable">Zatiaľ nenájdené žiadne zariadenie</string>
-    <string name="emptyreservoir">Prázdny zásobník</string>
-    <string name="bloodsugarmeasurementalert">Výstraha merania glykémie</string>
-    <string name="remaininsulinalert">Zostávajúci inzulín</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Vybraná pumpa</string>
-    <string name="pairpump">Párovanie novej pumpy</string>
-    <string name="bolusspeed">Rýchlosť bolusu</string>
-    <string name="danar_setbasalstep001">Nastavte bazálny krok 0.01JI/h</string>
-    <string name="serialnumber">Sériové číslo</string>
     <string name="careportal_newnstreatment_percentage_label">% zmena</string>
     <string name="careportal_newnstreatment_timeshift_label">Posun času</string>
     <string name="default_temptargets">Predvolené nastavenie dočasných cieľov</string>
@@ -708,32 +526,18 @@
     <string name="activity_target">Cieľ pri aktivite</string>
     <string name="hypo_duration">Trvanie dočasného cieľa pri hypoglykémii</string>
     <string name="hypo_target">Cieľová hodnota pri hypoglykémii</string>
-    <string name="danar_history_prime">Plnenie</string>
-    <string name="gettingextendedbolusstatus">Získavam stav predĺžených bolusov</string>
-    <string name="gettingbolusstatus">Získavam stav bolusov</string>
-    <string name="gettingtempbasalstatus">Získavam stav dočasných bazálov</string>
-    <string name="gettingpumpsettings">Získavam nastavenia pumpy</string>
-    <string name="gettingpumptime">Získavam čas z pumpy</string>
     <string name="reuse">Znovu použiť</string>
     <string name="wearcontrol_title">Ovládanie z hodiniek</string>
     <string name="wearcontrol_summary">Nastavovanie dočasných cieľov a vkladanie ošetrení hodinkami.</string>
-    <string name="connectiontimedout">Vypršal čas na pripojenie</string>
     <string name="food">Jedlo</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">m</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<prázdne>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Tuk</string>
     <string name="active"><![CDATA[<Aktívny>]]></string>
-    <string name="waitingforestimatedbolusend">Čakanie na koniec bolusu. Zostáva %1$d sek.</string>
-    <string name="processinghistory">Spracúvam udalosť</string>
-    <string name="startingbolus">Spúšťam podávanie bolusu</string>
     <string name="executingrightnow">Príkaz sa práve vykonáva</string>
-    <string name="pumpdrivercorrected">Ovládač pumpy opravený</string>
     <string name="pump_unreachable">Pumpa nedostupná</string>
     <string name="missed_bg_readings">Chýbajúce hodnoty glykémie</string>
     <string name="raise_notifications_as_android_notifications">Používať systémové notifikácie pre výstrahy a oznámenia</string>
@@ -743,9 +547,6 @@
     <string name="pump_unreachable_threshold">Limit pre nedostupnosť pumpy [min]</string>
     <string name="urgent_alarm">Urgentný alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Strážny pes BT</string>
-    <string name="btwatchdog_summary">Vypne na 1 sekundu Bluetooth v telefóne, pokiaľ se nedarí pripojiť k pumpe. Môže to pomôcť pri telefónoch, ktoré majú problémy s BT.</string>
     <string name="eversense">Eversense aplikácia (upravená)</string>
     <string name="dexcomg5_nsupload_title">Nahrávať glykémie do NS</string>
     <string name="bgsource_upload">Nastavenie nahrávania glykémie</string>
@@ -758,12 +559,9 @@
     <string name="uamsmbmaxminutes_summary">Maximální počet minút bazálu, ku ktorým sa limituje SMB pre UAM</string>
     <string name="carbsReqThreshold">Prahová hodnota doporučenia sacharidov</string>
     <string name="carbsReqThreshold_summary">Po navrhnutí sacharidov, aké množstvo sacharidov vyvolá upozornenie</string>
-    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpe</string>
     <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
-    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahradená minimálnou možnou: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Hodnota bazálu nahradená maximálnou možnou: %1$s</string>
     <string name="overview_editquickwizard_usebg">Výpočet glykémie</string>
     <string name="overview_editquickwizard_usebolusiob">Výpočet bolusového IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Výpočet bazálneho IOB</string>
@@ -781,8 +579,6 @@
     <string name="closedmodeenabled">Uzavretý okruh povolený</string>
     <string name="maxiobset">Maximálne IOB nastavené správne</string>
     <string name="hasbgdata">Glykémie dostupné z vybraného zdroja</string>
-    <string name="basalprofilenotaligned">Bazálne hodnoty nie sú zarovnané na celé hodiny: %1$s</string>
-    <string name="zerovalueinprofile">Chybný profil: %1$s</string>
     <string name="combo_programming_bolus">Programovanie pumpy pre bolus</string>
     <string name="combo_refresh">Obnoviť</string>
     <string name="combo_pump_state_label">Stav</string>
@@ -803,7 +599,6 @@
     <string name="bolus_frequency_exceeded">Rovnako veľký bolus už bol v priebehu poslednej minúty požadovaný. Ako preventívna ochrana pred zdvojeným bolusom a ako ochrana pred chybami bola operácia zakázaná.</string>
     <string name="combo_pump_connected_now">Teraz</string>
     <string name="combo_activity_reading_pump_history">Načítavam históriu z pumpy</string>
-    <string name="danar_history">História pumpy</string>
     <string name="combo_activity_setting_basal_profile">Nastavenie bazálneho profilu</string>
     <string name="combo_pump_cartridge_low_warrning">Zásobník inzulínu v pumpe je takmer prázdny</string>
     <string name="combo_pump_battery_low_warrning">Batéria v pumpe je takmer vybitá</string>
@@ -822,9 +617,6 @@
     <string name="extendedbolusdeliveryerror">Chyba pri podávaní predĺženého bolusu</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">pred</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Vždy povoliť SMB</string>
     <string name="enablesmbalways_summary">Povoliť SMB nezávisle na bolusoch. Možno iba zo zdrojom glykémií s dobrým filtrovaním dát, ako napr. G5</string>
     <string name="enablesmbaftercarbs">Povoliť SMB po jedle</string>
@@ -835,8 +627,6 @@
     <string name="enablesmbwithtemptarget_summary">Povoliť SMB, pokiaľ je aktívny dočasný cieľ (aktivita, blížiace sa jedlo)</string>
     <string name="enablesmbwithhightemptarget">Povoliť SMB s vysokými dočasnými cieľmi</string>
     <string name="enablesmbwithhightemptarget_summary">Povoliť SMB, pokiaľ je aktívny vysoký dočasný cieľ (aktivita)</string>
-    <string name="let_temp_basal_run">Nechať bežať aktuálny dočasný bazál</string>
-    <string name="mute">Stíšiť</string>
     <string name="overview_insulin_label">Inzulín</string>
     <string name="overview_carbs_label">Sacharidy</string>
     <string name="overview_buttons_selection">Tlačidlá</string>
@@ -878,7 +668,6 @@
     <string name="closed_loop_disabled_on_dev_branch">Bežiaca vývojárska verzia. Uzavretý okruh je zakázaný.</string>
     <string name="engineering_mode_enabled">Vývojársky mód povolený</string>
     <string name="not_eng_mode_or_release">Vývojársky mód nie je povolený a nebeží vydaná verzia</string>
-    <string name="pump_basebasalrate">%1$.2f JI/h</string>
     <string name="combo_actvity_reading_basal_profile">Načítavam bazálny profil</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">História v pumpe sa zmenila po spočítaní bolusu. Bolus nebol podaný. Prosím spočítajte ho znovu, pokiaľ je stále potrebný.</string>
     <string name="combo_error_updating_treatment_record">Bolus úspešne podaný, ale zápis se nepodaril. To sa môže stať, pokiaľ sú podané bolusy rovnakej veľkosti v priebehu 2 minút. Skontrolujte históriu pumpy a zadajte chýbajúce položky do ošetrení. Uistite sa, že nezadávate rovnakú veľkosť v rámci 1 minúty.</string>
@@ -901,15 +690,10 @@
     <string name="smbdisabledinpreferences">SMB zakázané v nastaveniach</string>
     <string name="uamdisabledinpreferences">UAM zakázané v nastaveniach</string>
     <string name="uamdisabledoref1notselected">UAM zakázané, pretože nie je povolený plug-in Oref1</string>
-    <string name="limitingbasalratio">Max bazál obmedzený na %1$.2f JI/h: %2$s</string>
-    <string name="pumplimit">limit pumpy</string>
-    <string name="itmustbepositivevalue">požadovaná kladná hodnota</string>
     <string name="maxbasalmultiplier">maximálny násobok bazálu</string>
     <string name="maxdailybasalmultiplier">maximálny násobok najvyššieho bazálu</string>
     <string name="smb_frequency_exceeded">Podaný bolus v priebehu posledných 3 minút, SMB preskočené</string>
     <string name="basal_set_correctly">Bazál nastavený správne</string>
-    <string name="limitingpercentrate">Bazál obmedzený na %1$d%%: %2$s</string>
-    <string name="limitingbolus">Bolus obmedzený na %1$.1f JI: %2$s</string>
     <string name="limitingextendedbolus">Predĺžený bolus obmedzený na %1$.1f JI: %2$s</string>
     <string name="limitingmaxiob">Max IOB obmedzený na %1$.1f JI: %2$s</string>
     <string name="limitingcarbs">Sacharidy obmedzené na %1$d g: %2$s</string>
@@ -924,7 +708,6 @@
     <string name="smbnotallowedinopenloopmode">SBM nie sú povolené pri otvorenom okruhu</string>
     <string name="food_short">Jedlo</string>
     <string name="reset">Resetovať</string>
-    <string name="waitingfortimesynchronization">Čakanie na synchronizáciu času (%1$d s)</string>
     <string name="loopdisconnectedfor">Odpojené (%1$d m)</string>
     <string name="openapssmb_maxiob_title">Maximálne celkové IOB, ktoré OpenAPS nemôže prekročiť [JI]</string>
     <string name="openapssmb_maxiob_summary">Táto hodnota je v kontexte OpenAPS nazývaná Max IOB.\nOpenAPS nikdy nepridá inzulín, pokiaľ je súčasné IOB väčšie, ako táto hodnota</string>
@@ -940,7 +723,6 @@
     <string name="nav_setupwizard">Sprievodca nastavením</string>
     <string name="setupwizard_finish">Dokončiť</string>
     <string name="setupwizard_language_prompt">Vyberte jazyk</string>
-    <string name="boluserrorcode">Požadované: %1$.2fJI Podané: %2$.2fJI Chyba: %3$s</string>
     <string name="firstinsulinincrement">Prvý prídavok inzulínu</string>
     <string name="secondinsulinincrement">Druhý prídavok inzulínu</string>
     <string name="thirdinsulinincrement">Tretí prídavok inzulínu</string>
@@ -963,7 +745,6 @@
     <string name="virtualpump_type">Typ virtuálnej pumpy</string>
     <string name="virtualpump_definition">Definícia pumpy</string>
     <string name="virtualpump_pump_def">Bolus: Krok =%1$s\nPredl. bolus: [Krok=%2$s, Dĺžka=%3$smin-%4$sh]\nBazál: Krok=%5$s\nDoč. bazál: %6$s (%7$s), Dĺžka=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Iba diskrétne hodnoty a nie rozsahy sú podporované pre bazál/bolus vo virtuálnej pumpe.</string>
     <string name="ns_autobackfill_title">Automatické doplňovanie glykémií z NS</string>
     <string name="wear_wizard_settings">Nastavenie wizardu</string>
     <string name="wear_wizard_settings_summary">Kalkulácia použitá vo výsledku wizardu:</string>
@@ -994,22 +775,6 @@
     <string name="request">Požiadavka</string>
     <string name="insulinsourcesetup">Nastavenie inzulínového modulu</string>
     <string name="exit">Koniec</string>
-    <string name="danar_useroptions">Užívateľské nastavenia</string>
-    <string name="danar_timedisplay">Formát času</string>
-    <string name="danar_buttonscroll">Posun pri stlačení tlačidla</string>
-    <string name="danar_beep">Zvuk pri stlačení tlačidla</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Zvuk</string>
-    <string name="danar_pumpalarm_vibrate">Vibrácie</string>
-    <string name="danar_pumpalarm_both">Oboje</string>
-    <string name="danar_screentimeout">Čas pred vypnutím displeja [sekundy]</string>
-    <string name="danar_backlight">Podsvietenie [sekundy]</string>
-    <string name="danar_glucoseunits">Jednotky</string>
-    <string name="danar_shutdown">Vypnutie [hodiny]</string>
-    <string name="danar_lowreservoir">Nízky stav zásobníka [Jednotky]</string>
-    <string name="danar_saveuseroptions">Uložiť do pumpy</string>
-    <string name="option_on">ZAP</string>
-    <string name="option_off">VYP</string>
     <string name="open_navigation">Otvoriť Menu</string>
     <string name="close_navigation">Zavrieť Menu</string>
     <string name="nav_plugin_preferences">Nastavenie modulu</string>
@@ -1029,8 +794,6 @@
     <string name="sensitivity_raises_target_summary">Ak je zistená vyššia citlivosť, zvýši cieľovú hladinu glykémie</string>
     <string name="combo_invalid_setup">Chybné nastavenie pumpy. Prejdite si dokumentáciu a presvedčte sa, že menu Quick Info se nazýva QUICK INFO, s použitím 360° Configuration Software.</string>
     <string name="custom">Voliteľný</string>
-    <string name="largetimedifftitle">Veľký rozdiel v čase</string>
-    <string name="largetimediff">Veľký rozdiel v čase:\nČas v pumpe sa líši minimálne o 1,5 h.\nProsím upravte čas v pumpe manuálne a vymažte históriu pumpy.\nPokiaľ je to potrebné, prípadne pozastavte uzavretý okruh aspoň na \"DIA\" hodín.</string>
     <string name="careportal_removestartedevents">Vymazať udalosti \"AndroidAPS reštartovaný\"</string>
     <string name="storedsettingsfound">Nájdené uložené nastavenia</string>
     <string name="allow_hardware_pump_text">POZOR: Pokiaľ aktivujete a pripojíte skutočnú pumpu, AndroidAPS nakopíruje (a bude udržiavať) nastavenie bazálu z aktívneho profilu do pumpy. Nastavenie bazálu v pumpe bude prepísané. Pokiaľ si nieste istí, alebo nechcete prepísať bazály v pumpe, stlačte Zrušiť a opakujte prepnutie na inú pumpu neskôr.</string>
@@ -1056,17 +819,10 @@
     <string name="setupwizard_preferred_aps_mode">Preferovaný režim APS</string>
     <string name="treatments_wizard_total_label">Spolu</string>
     <string name="calculation_short">Kalk</string>
-    <string name="handshaking">Overovanie</string>
     <string name="sendlogfiles">Odošlite dnešné súbory protokolov vývojárom spolu s týmto časom. Neočakávaná situácia.</string>
-    <string name="maxbolusviolation">Prekročený maximálny bolus</string>
-    <string name="commanderror">Chyba príkazu</string>
-    <string name="speederror">Chyba rýchlosti</string>
-    <string name="insulinlimitviolation">Prekročený limit inzulínu</string>
     <string name="loop_openmode_min_change">Minimálna požiadavka na zmenu [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Otvorený okruh vytvorí novú žiadosť o zmenu iba v prípade, že zmena je väčšia ako táto hodnota v %. Štandardná hodnota je 20%</string>
-    <string name="pairfirst">Prosím spárujte pumpu s telefónom!</string>
     <string name="searching_for_devices">Vyhľadávam zariadenia...</string>
-    <string name="please_wait">Čakajte prosím...</string>
     <string name="pairing_completed">Párovanie dokončené</string>
     <string name="code_compare">Zhodujú sa kódy zobrazené na tomto zariadení a na pumpe?</string>
     <string name="insight_pairing">Párovanie Insight</string>
@@ -1155,7 +911,6 @@
     <string name="isequalorgreater">je rovnaká, alebo väčšia ako</string>
     <string name="isgreater">je väčšia ako</string>
     <string name="isnotavailable">nedostupný</string>
-    <string name="unknown">neznámy</string>
     <string name="glucoseisnotavailable">Glykémia nedostupná</string>
     <string name="glucosecomparedmgdl">Glykémia %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">Glykémia %1$s %2$.1f %3$s</string>
@@ -1172,23 +927,10 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatika</string>
     <string name="profile_total">== ∑  %1$s JI</string>
-    <string name="profile_ins_units_per_hour">JI/h</string>
-    <string name="profile_carbs_per_unit">g/JI</string>
-    <string name="profile_per_unit">/JI</string>
     <string name="dexcom_lognssensorchange_title">Ulož výmenu senzora do NS</string>
     <string name="dexcom_lognssensorchange_summary">Vytvoriť udalosť \"Výmena senzora\" v NS automaticky pri spustení senzora</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekunda</string>
-    <string name="unit_minute">minúta</string>
-    <string name="unit_hour">hodina</string>
-    <string name="unit_day">deň</string>
-    <string name="unit_week">týždeň</string>
-    <string name="unit_seconds">sekúnd</string>
-    <string name="unit_minutes">minút</string>
-    <string name="unit_hours">hodín</string>
-    <string name="unit_days">dní</string>
-    <string name="unit_weeks">týždňov</string>
     <string name="summary_tidepool_username">Vaše meno používateľa na Tidepoole, obvykle Vaša E-mailová adresa</string>
     <string name="title_tidepool_username">Meno používateľa</string>
     <string name="summary_tidepool_password">Heslo na Tidepool</string>
@@ -1231,7 +973,6 @@
     <string name="very_old_version">veľmi stará verzia</string>
     <string name="new_version_warning">Nová verzia je dostupná minimálne %1$d dní! Prepnutie na ochranu pred nízkou glykémiou po %2$d dňoch, vypnutie uzavretého okruhu po %3$d dňoch</string>
     <string name="twohours">2h</string>
-    <string name="formatinsulinunits">%1$.2fJI</string>
     <string name="dexcom_app_patched">Dexcom aplikácia (upravená)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Prijímaj hodnoty glykémie z upravenej Dexcom aplikácie.</string>
@@ -1308,10 +1049,6 @@
     <string name="rileylink_scanner_scan_stop">ZASTAVIŤ</string>
     <string name="rileylink_scanner_selected_device">Vybrané</string>
     <string name="rileylink_scanner_title">Vyhľadávanie RileyLinku</string>
-    <string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy nie je podporované.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth je aktivovaný.</string>
-    <string name="location_not_found_title">Poloha nie je aktivovaná</string>
-    <string name="location_not_found_message">Pre vyhľadávanie Bluetooth na novších zariadeniach je potrebné zapnúť polohu. AAPS nezaznamenáva vašu polohu a po úspešnom spárovaní sa môže poloha vypnúť.</string>
     <string name="location_yes">Aktivovať</string>
     <string name="location_no">Nie</string>
     <string name="rileylink_scanner_scanning">Vyhľadávanie</string>
@@ -1353,7 +1090,6 @@
     <string name="rileylink_error_tuneup_failed">Ladenie zlyhalo</string>
     <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
     <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
-    <string name="rileylink_error_address_not_set_short">Nenastavené</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1423,7 +1159,6 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Aplikované obmedzenie bolusu: %2$.2fJI na %3$.2fJI</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Detekovaná pomalá absorbcia sacharidov: %2$d%% času. Prekontrolujte kalkuláciu. COB môže byť úplne iné, môže byť podaného viac inzulínu!!!!!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d JI</string>
     <string name="partialboluswizard">Podaj túto časť z výsledku kalkulácie [%]</string>
     <string name="deliverpartofboluswizard">Bolusová kalkulačka urobí výpočet, ale iba táto časť vypočítaného inzulínu je podaná. Pomáha pri SMB algoritme.</string>
     <string name="loading">Načítavanie...</string>
@@ -1431,7 +1166,6 @@
     <string name="time_range">Časový rozsah</string>
     <string name="timerange_value">Čas je medzi %1$s a %2$s</string>
     <string name="between">Medzi</string>
-    <string name="close">Zavrieť</string>
     <string name="increasingmaxbasal">Zvýšenie maximálnej hodnoty bazálu, pretože nastavenie je nižšie, než je vaša maximálna hodnota bazálu v profile</string>
     <string name="smscommunicator_messagebody">Neplatný obsah správy</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1449,7 +1183,6 @@
     <string name="common_off">VYP</string>
     <string name="objectives_button_unfinish">Vymazanie dokončené</string>
     <string name="objectives_button_unstart">Vymazanie začaté</string>
-    <string name="timedetection">Detekcia času</string>
     <string name="doyouwantresetstart">Chcete resetovať začiatok cieľa? Môžete prísť o svoj pokrok.</string>
     <string name="time_or_timezone_change">Zmena času a/alebo časovej zóny na pumpe</string>
     <string name="nopumpselected">Nie je vybraná žiadna pumpa</string>
@@ -1476,7 +1209,6 @@
     <string name="nav_survey">Prieskum</string>
     <string name="invalidage">Neplatný záznam veku</string>
     <string name="invalidweight">Neplatný záznam váhy</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Priemer</string>
     <string name="tdd">CDD</string>
@@ -1489,12 +1221,8 @@
     <string name="randombg_short">Glykémia</string>
     <string name="tools">Nástroje</string>
     <string name="show_calculation">Zobraziť kalkuláciu</string>
-    <string name="error">Chyba</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
     <string name="automation_event">Udalosť automatiky</string>
     <string name="alreadyset">Už nastavené</string>
-    <string name="message">Správa</string>
     <string name="clearqueueconfirm">Vymazať frontu? Všetky dáta vo fronte budú stratené!</string>
     <string name="ebstopsloop">Použitie funkcie rozloženého bolusu zastaví uzavretý okruh na dobu trvania rozloženého bolusu. Naozaj to chcete?</string>
     <string name="closed_loop_disabled_with_eb">Uzavretý okruh je zastavený kvôli prebiehajúcemu rozloženému bolusu</string>
@@ -1538,4 +1266,13 @@
     <string name="statuslights">Indikátory stavu</string>
     <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
     <string name="copyexistingvalues">Skopírovať nastavenia NS (ak existujú)?</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index f2c7564cc4..70cc9c5d48 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -17,4 +17,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 7c4cc40f29..511f476671 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -12,20 +12,17 @@
     <string name="nav_resetdb">Återställ databaserna</string>
     <string name="reset_db_confirm">Vill du verkligen återställa databaserna?</string>
     <string name="nav_exit">Avsluta</string>
-    <string name="danar_useextended_title">Använd förlängd bolus för att ange &gt;200%% basal</string>
-    <string name="danar_bt_name_title">Dana R Bluetooth Pump</string>
     <string name="ns_sync_use_absolute_title">Använd alltid absoluta värden i basal</string>
     <string name="alert_dialog_storage_permission_text">Starta om telefonen eller AndroidAPS från systeminställningar,\nannars kommer AndroidAPS inte kunna logga fel (viktigt att kunna spåra och verifiera att algoritmerna fungerar korrekt)!</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Denna enhet verkar inte ha stöd för vitlistning från batterioptimering. Du eventuellt råka ut för problem pga detta.</string>
     <string name="description_actions">Knappar för att snabbt komma åt vanliga funktioner</string>
-    <string name="description_careportal">Mata in avancerade poster i loggboken</string>
     <string name="description_config_builder">Används för att konfigurera de aktiva insticksprogrammen</string>
     <string name="description_objectives">Inlärningsprogram</string>
     <string name="description_food">Visar förutbestämda inställningar för mat i Nightscout</string>
     <string name="description_insulin_rapid">Insulininställning för vanliga direktverkande insuliner som Humalog, Lispro, Apidra och Novorapid/Novolog</string>
     <string name="description_insulin_ultra_rapid">Insulininställning för ultrasnabba insuliner, t ex Fiasp</string>
     <string name="description_insulin_free_peak">Låter dig ställa in tidpunkten för toppen på insulinets aktivitet. Bör bara användas av avancerade användare</string>
-    <string name="description_loop">Aktivera eller avaktivera implementationen som kör loopen.</string>
+    <string name="description_loop">Aktivera eller inaktivera implementationen som kör loopen.</string>
     <string name="description_ns_client">Synkroniserar dina data med Nightscout</string>
     <string name="description_ma">Så som algoritmen var definierad år 2016</string>
     <string name="description_ama">Så som algoritmen var definierad år 2017</string>
@@ -36,10 +33,6 @@
     <string name="description_profile_nightscout">Använder profiler från Nightscout</string>
     <string name="description_profile_simple">Definiera en insulinprofil som bara har ett enda tidsblock.</string>
     <string name="description_pump_combo">Pumpintegration för Accu-Chek Combo. Kräver att Ruffy är installerat</string>
-    <string name="description_pump_dana_r">Pumpintegration för DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Pumpintegration för DANA Diabecare R, koreansk version</string>
-    <string name="description_pump_dana_r_v2">Pumpintegration för DANA Diabecare R med uppgraderad firmware</string>
-    <string name="description_pump_dana_rs">Pumpintegration för DANA Diabecare RS</string>
     <string name="description_pump_mdi">Integration för de som endast använder insulinpennor</string>
     <string name="description_pump_virtual">Integration för pumpar som ännu inte stöds av AndroidAPS (Open loop)</string>
     <string name="description_sensitivity_aaps">Känsligheten beräknas på samma sätt som i Oref0, men du kan specificera hur mycket av historiken som ska tas med i beräkningen. Minimalt upptag av kolhydrater beräknas utifrån maximal upptagstid för kolhydrater som angetts i Inställningar.</string>
@@ -55,13 +48,6 @@ Eversense-appen.</string>
     <string name="description_wear">Följ och kontrollera AndroidAPS med din Wear OS-klocka</string>
     <string name="description_xdrip_status_line">Visa AAPS-information på din xDrip-urtavla</string>
     <string name="description_sms_communicator">Fjärrstyr AndroidAPS med SMS-kommandon.</string>
-    <string name="nsprofileview_units_label">Enheter</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC</string>
-    <string name="nsprofileview_isf_label">ISF</string>
-    <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_target_label">Målvärde</string>
-    <string name="noprofileset">INGEN PROFIL VALD</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">KH:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -77,15 +63,9 @@ Eversense-appen.</string>
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">KH</string>
     <string name="treatments_wizard_correction_label">Korrektion</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Utför nu</string>
     <string name="vitualpump_label">Virtuell pump</string>
-    <string name="pump_basebasalrate_label">Profilens basaldos</string>
-    <string name="pump_tempbasal_label">Temp basal</string>
-    <string name="virtualpump_extendedbolus_label">Förlängd bolus</string>
-    <string name="pump_battery_label">Batterinivå</string>
-    <string name="pump_reservoir_label">Reservoar</string>
     <string name="virtualpump_resultok">OK</string>
     <string name="openapsma_lastrun_label">Senaste beräkning</string>
     <string name="openapsma_inputparameters_label">Ange värden</string>
@@ -97,16 +77,11 @@ Eversense-appen.</string>
     <string name="result">Resultat</string>
     <string name="result_insulin_carbs">Resultat: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Ingen BG-data tillänglig</string>
-    <string name="nochangerequested">Ingen ändring behövs</string>
     <string name="openapsma_request_label">Beräknat behov</string>
-    <string name="rate">Basaldos</string>
-    <string name="duration">Duration</string>
-    <string name="reason">Orsak</string>
     <string name="glucose">Glukos</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Konfigurationsverktyg</string>
-    <string name="objectives">Mål</string>
     <string name="overview">Översikt</string>
     <string name="nsprofile">NS-profil</string>
     <string name="simpleprofile">Enkel profil</string>
@@ -124,7 +99,6 @@ Eversense-appen.</string>
     <string name="configbuilder_general">Generella inställningar</string>
     <string name="configbuilder_general_description">Dessa är några allmänna insticksprogram som kan vara användbara.</string>
     <string name="configbuilder_constraints_description">Vilka begränsningar ska tillämpas?</string>
-    <string name="days">dagar</string>
     <string name="constraints">Begränsningar</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
@@ -137,10 +111,9 @@ Eversense-appen.</string>
     <string name="cancel">Avbryt</string>
     <string name="noapsselected">INGEN APS VALD</string>
     <string name="safety">Säkerhet</string>
-    <string name="openapsma_disabled">Insticksprogram avaktiverat</string>
+    <string name="openapsma_disabled">Insticksprogram inaktiverat</string>
     <string name="constraints_violation">Begränsning nådd</string>
     <string name="treatmentdeliveryerror">Fel vid bolusleverans</string>
-    <string name="tempbasaldeliveryerror">Fel vid justering av temp basal</string>
     <string name="overview_newtempbasal_basalpercent">Basaldos [%]</string>
     <string name="setbasalquestion">Acceptera ny temp basal:</string>
     <string name="overview_treatment_label">Behandling</string>
@@ -151,7 +124,6 @@ Eversense-appen.</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
-    <string name="carbs">KH</string>
     <string name="changeyourinput">Ändra inmatning</string>
     <string name="configbuilder_bgsource">BG-källa</string>
     <string name="configbuilder_bgsource_description">Var ska AndroidAPS få sitt data ifrån?</string>
@@ -159,6 +131,7 @@ Eversense-appen.</string>
     <string name="apsmode_title">APS-läge</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
+    <string name="lowglucosesuspend">Stopp innan lågt</string>
     <string name="disabledloop">Loop avstängd</string>
     <string name="disableloop">Inaktivera loop</string>
     <string name="enableloop">Aktivera loop</string>
@@ -168,25 +141,6 @@ Eversense-appen.</string>
     <string name="treatments_wizard_basaliob_label">IOB från basal</string>
     <string name="bolusconstraintapplied">Bolusspärr aktiverad</string>
     <string name="carbsconstraintapplied">Kolhydratsspärr aktiverad</string>
-    <string name="careportal_bgcheck">BG-kontroll</string>
-    <string name="careportal_announcement">Meddelande</string>
-    <string name="careportal_note">Anteckning</string>
-    <string name="careportal_question">Fråga</string>
-    <string name="careportal_exercise">Träning</string>
-    <string name="careportal_pumpsitechange">Byte pumpkanyl</string>
-    <string name="careportal_cgmsensorinsert">Byte CGM-sensor</string>
-    <string name="careportal_cgmsensorstart">Start CGM-sensor</string>
-    <string name="careportal_insulincartridgechange">Byte insulinreservoar</string>
-    <string name="careportal_profileswitch">Profilbyte</string>
-    <string name="careportal_snackbolus">Mellanmålsbolus</string>
-    <string name="careportal_mealbolus">Måltidsbolus</string>
-    <string name="careportal_correctionbolus">Korrektionsbolus</string>
-    <string name="careportal_combobolus">Kombi-bolus</string>
-    <string name="careportal_tempbasalstart">Temp basal start</string>
-    <string name="careportal_tempbasalend">Temp basal slut</string>
-    <string name="careportal_carbscorrection">KH-korrektion</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_newnstreatment_eventtype">Händelsetyp</string>
     <string name="careportal_newnstreatment_other">Annat</string>
     <string name="careportal_newnstreatment_meter">Mätare</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
@@ -218,11 +172,11 @@ Eversense-appen.</string>
     <string name="openapsma_maxbasal_summary">Detta värde kallas max basal inom OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximal basal IOB som OpenAPS kan ge [E]</string>
     <string name="openapsma_maxiob_summary">Detta värde kallas Max IOB i OpenAPS. Det är ställt till noll från start. Efter flera dagar till veckor, beroende på hur du känner, kan du välja att justera denna.</string>
-    <string name="dismiss">TA BORT</string>
     <string name="password_preferences_encrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att kryptera exporterade inställningar.</string>
     <string name="password_preferences_decrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att avkryptera importerade inställningar.</string>
     <string name="preferences_export_canceled">Exporten avbröts. Inställningarna har INTE exporterats!</string>
     <string name="preferences_import_canceled">Importen avbröts. Inställningarna har inte importerats!</string>
+    <string name="preferences_import_list_title">Välj fil att importera</string>
     <string name="check_preferences_before_import">Vänligen kontrollera inställningarna innan du importerar:</string>
     <string name="check_preferences_cannot_import">Inställningarna kan inte importeras!</string>
     <string name="check_preferences_dangerous_import">Inställningar bör inte importeras!</string>
@@ -235,6 +189,8 @@ Eversense-appen.</string>
     <string name="metadata_warning_outdated_format">Du använder det gamla formatet (från äldre versioner av AAPS) som inte är säkert. Använd det bara som en sista utväg om du inte har någon export i aktuellt format, JSON.</string>
     <string name="metadata_warning_old_export">Importerade inställningar är %1$s dagar gamla. Du kanske har mer aktuella inställningar eller väljer du fel fil? Kom ihåg att exportera dina inställningar regelbundet!</string>
     <string name="metadata_warning_date_format">Ogiltigt datumformat!</string>
+    <string name="metadata_warning_different_version">Inställningarna är sparade i en annan delversion av appen. Det är OK om du importerar efter uppgradering, men kontrollera att inställningarna fortfarande är korrekta efter import!</string>
+    <string name="metadata_urgent_different_version">Inställningarna är sparade i en annan huvudversion av appen. Olika huvudversioner kan ha helt olika struktur vilket kan göra dem inkompatibla. Kontrollera inställningarna noggrant efter import!</string>
     <string name="metadata_label_format">Filformat</string>
     <string name="metadata_label_created_at">Skapad</string>
     <string name="metadata_label_aaps_version">AAPS-version</string>
@@ -257,41 +213,24 @@ Eversense-appen.</string>
     <string name="prefdecrypt_issue_wrong_pass">Dekrypteringsfel. Det angivna lösenordet är ogiltigt eller så har inställningsfilen ändrats. Filen verkar ha exporterats med ett annat lösenord.</string>
     <string name="prefdecrypt_issue_wrong_format">Krypteringskonfigurationen saknas. Inställningsformatet är ogiltigt!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Ej stödd eller ej angiven krypteringsalgoritm!</string>
-    <string name="danarpump">Dana R</string>
-    <string name="connecting">Ansluter</string>
-    <string name="connected">Ansluten</string>
-    <string name="disconnected">Frånkopplad</string>
-    <string name="danar_pump_settings">Dana R pumpinställningar</string>
+    <string name="exported_today">exporterat idag</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exporterades för %1$s sedan</string>
+    <string name="exported_at" comment="at placeholder we add export date">exporterades %1$s</string>
+    <string name="exported_less_than_hour_ago">exporterades för mindre än timme sedan</string>
+    <string name="in_directory" comment="placeholder is for exported file path">i mappen: %1$s</string>
     <string name="end_user_license_agreement">Licensavtal för slutanvändare</string>
     <string name="end_user_license_agreement_text">FÅR INTE ANVÄNDAS FÖR ATT FATTA MEDICINSKA BESLUT. DET FINNS INGEN GARANTI FÖR PROGRAMMET I DEN UTSTRÄCKNING SOM TILLÅTS AV GÄLLANDE LAG. FÖRUTOM NÄR ANNAT ANGES SKRIFTLIGEN LEVERERAS APPLIKATIONEN SOM DEN ÄR HELT UTAN GARANTIER I NÅGON SOM HELST FORM, VARKEN UTTRYCKTA ELLER UNDERFÖRSTÅDDA, INKLUSIVE MEN INTE BEGRÄNSAT TILL SÄLJBARHET OCH LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. HELA RISKEN VAD GÄLLER KVALITET OCH PRESTANDA AV PROGRAMMET ÅLIGGER ANVÄNDAREN. OM PROGRAMMET VISAR SIG VARA DEFEKT ANTAR ANVÄNDAREN DEN FULLA FÖR KOSTNADEN FÖR ALL NÖDVÄNDIG SERVICE, REPARATION ELLER KORRIGERING.</string>
     <string name="end_user_license_agreement_i_understand">JAG FÖRSTÅR OCH GODKÄNNER</string>
     <string name="save">Spara</string>
-    <string name="nobtadapter">Ingen Bluetooth-adapter funnen</string>
-    <string name="devicenotfound">Vald enhet kan inte nås</string>
-    <string name="connectionerror">Anslutningsfel</string>
-    <string name="danar_iob_label">Pumpens IOB</string>
-    <string name="danar_dailyunits">Enheter per dag</string>
-    <string name="pump_lastbolus_label">Senaste bolus</string>
-    <string name="hoursago">%1$.1f tim sedan</string>
-    <string name="danar_invalidinput">Fel på inmatning</string>
-    <string name="danar_valuenotsetproperly">Misslyckades med inställning</string>
     <string name="reloadprofile">Ladda om profil</string>
-    <string name="danar_viewprofile">Visa profil</string>
-    <string name="enacted">Utförd</string>
-    <string name="comment">Kommentar</string>
-    <string name="success">Lyckad</string>
-    <string name="percent">Procent</string>
-    <string name="absolute">Absolut</string>
-    <string name="canceltemp">Avbryt temp basal</string>
     <string name="smscommunicator">SMS-tjänst</string>
-    <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smscommunicator_allowednumbers">Godkända telefonnummer</string>
     <string name="smscommunicator_allowednumbers_summary">+4670XXXXXXX; +4670YYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">För att ge bolus %1$.2f enheter, svara med kod %2$s</string>
     <string name="smscommunicator_mealbolusreplywithcode">För att ge bolus %1$.2f enheter, svara med kod: %2$s</string>
     <string name="smscommunicator_temptargetwithcode">För att sätta ett temporärt mål på %1$s, svara med kod: %2$s</string>
     <string name="smscommunicator_temptargetcancel">För att avbryta temporärt mål, svara med kod: %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">För att avaktivera fjärrkommandon via SMS, svara med kod: %1$s \n\nTänk på att måste ha tillgång till huvudtelefonen för att kunna återaktivera.</string>
+    <string name="smscommunicator_stopsmswithcode">För att inaktivera fjärrkommandon via SMS, svara med kod: %1$s \n\nTänk på att måste ha tillgång till huvudtelefonen för att kunna återaktivera.</string>
     <string name="smscommunicator_stoppedsms">Fjärrkommandon via SMS stoppas. För att återaktivera detta, använd Konfigurationsverktyget på huvudtelefonen.</string>
     <string name="smscommunicator_calibrationreplywithcode">För att skicka kalibrering %1$.2f, svara med kod %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus misslyckades</string>
@@ -305,54 +244,13 @@ Eversense-appen.</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Temporärt mål på %1$s är satt i %2$d minuter</string>
     <string name="smscommunicator_tt_set">Temporärt mål på %1$s är satt i %2$d minuter</string>
     <string name="smscommunicator_tt_canceled">Temporärt mål avbrutet</string>
-    <string name="bolusdelivering">Levererar %1$.2f enheter</string>
     <string name="smscommunicator_remotecommandsallowed">Tillåt fjärrstyrning via SMS</string>
-    <string name="glucosetype_finger">Finger</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manuell</string>
-    <string name="careportal_temporarytarget">Temp mål</string>
-    <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
     <string name="danarprofile">Dana R profilinställningar</string>
     <string name="danarprofile_dia">DIA [tim]</string>
     <string name="danarprofile_dia_summary">Insulinets verkningstid</string>
-    <string name="failedupdatebasalprofile">Lyckades inte uppdatera basalprofilen</string>
-    <string name="danar_historyreload">Hämta</string>
     <string name="uploading">Laddar upp</string>
-    <string name="danar_ebolus">Förlängd bolus</string>
-    <string name="danar_dsbolus">Standardbolus</string>
-    <string name="danar_debolus">Kombibolus</string>
-    <string name="danar_error">fel</string>
-    <string name="danar_refill">påfyllning</string>
-    <string name="danar_basalhour">basal tim</string>
-    <string name="danar_glucose">glukos</string>
-    <string name="danar_carbohydrate">kolhydrat</string>
-    <string name="danar_alarm">larm</string>
-    <string name="danar_totaluploaded">Laddade upp totalt %1$d värden</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Larm</string>
-    <string name="danar_history_basalhours">Basaltimmar</string>
-    <string name="danar_history_bolus">Bolusar</string>
-    <string name="danar_history_carbohydrates">Kolhydrater</string>
-    <string name="danar_history_dailyinsulin">Daglig insulinmängd</string>
-    <string name="danar_history_errors">Fel</string>
-    <string name="danar_history_glucose">Glukos</string>
-    <string name="danar_history_refill">Påfyllning</string>
-    <string name="danar_history_syspend">Stoppa</string>
-    <string name="danar_history_connectingfor">Ansluter (%1$d s)</string>
-    <string name="danar_password_title">Lösenord pump</string>
-    <string name="wrongpumppassword">Fel lösenord för pump</string>
-    <string name="pumpbusy">Pump upptagen</string>
-    <string name="overview_bolusprogress_delivered">Levererad</string>
-    <string name="overview_bolusprogress_stoped">Stoppad</string>
     <string name="bolusstopped">Bolus avbruten</string>
     <string name="bolusstopping">Avbryter bolus</string>
-    <string name="occlusion">Ocklusion</string>
-    <string name="overview_bolusprogress_stop">Stopp</string>
-    <string name="overview_bolusprogress_stoppressed">Stopp nedtryckt</string>
-    <string name="waitingforpump">Väntar på pump</string>
-    <string name="overview_bolusprogress_goingtodeliver">Kommer att leverera %1$.2f enheter</string>
-    <string name="youareonallowedlimit">Du har nått din tillåtna gräns</string>
-    <string name="noprofileselected">Ingen profil vald</string>
     <string name="smscommunicator_loophasbeendisabled">Loop stängdes av. </string>
     <string name="smscommunicator_loophasbeenenabled">Loop aktiverades</string>
     <string name="smscommunicator_loopisdisabled">Loop är avstängd</string>
@@ -392,11 +290,9 @@ Eversense-appen.</string>
     <string name="mealbolus">Måltid</string>
     <string name="correctionbous">Korrektion</string>
     <string name="actions">Åtgärder</string>
-    <string name="androidaps_start">AndroidAPS startad</string>
     <string name="ns_upload_only">Endast uppladdning till Nightscout</string>
     <string name="ns_upload_only_summary">Endast uppladdning till Nightscout. Kommer inte få BG-data om inte lokal källa som xDrip används. Kommer heller inte att kunna hämta basalprofiler från Nightscout.</string>
     <string name="pumpNotInitialized">Pump inte initierad</string>
-    <string name="pumpNotInitializedProfileNotSet">Pump inte initierad, ingen profil vald.</string>
     <string name="primefill">Förfyllning</string>
     <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
     <string name="othersettings_title">Övrigt</string>
@@ -406,8 +302,6 @@ Eversense-appen.</string>
     <string name="button3">Knapp 3</string>
     <string name="units_colon">Enheter:</string>
     <string name="units">Enheter</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="dia">Duration</string>
     <string name="target_range">Målområde:</string>
     <string name="prefs_range_title">Gränsvärden för visualisering</string>
@@ -417,17 +311,7 @@ Eversense-appen.</string>
     <string name="wear">Klocka (Wear)</string>
     <string name="resend_all_data">Uppdatera klockans data</string>
     <string name="open_settings_on_wear">Öppna inställningar på klockan</string>
-    <string name="pumperror">Pumpfel</string>
-    <string name="lowbattery">Svagt batteri</string>
-    <string name="pumpshutdown">Pump avstängd</string>
-    <string name="batterydischarged">Pumpbatteri urladdat</string>
-    <string name="danarkoreanpump">Dana R Korea</string>
     <string name="basal_rate">Basal:</string>
-    <string name="profile_set_failed">Lyckades inte sätta basalprofilen</string>
-    <string name="profile_set_ok">Basalprofilen uppdaterad i pumpen</string>
-    <string name="danar_disableeasymode">Avaktivera EasyUI-läget i pumpen</string>
-    <string name="danar_enableextendedbolus">Aktivera förlängd bolus i pumpen</string>
-    <string name="danar_switchtouhmode">Ändra inställningen från E/d till E/tim i pumpen</string>
     <string name="basalvaluebelowminimum">Basal understiger miniminivå. Profilen sattes inte.</string>
     <string name="sms_actualbg">BG:</string>
     <string name="sms_lastbg">Senaste BG:</string>
@@ -435,7 +319,6 @@ Eversense-appen.</string>
     <string name="MM640g">Minimed 640G</string>
     <string name="ongoingnotificaction">Konstant avisering i telefonen</string>
     <string name="old_data">Aktuellt BG saknas!</string>
-    <string name="minago">%1$d&#160;min sedan</string>
     <string name="sms_minago">%1$d min sedan</string>
     <string name="localprofile">Lokal profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -451,41 +334,22 @@ Eversense-appen.</string>
     <string name="hypo">Hypo</string>
     <string name="activity">Träning</string>
     <string name="removerecord">Ta bort post</string>
-    <string name="danar_stats">Dana R statistik</string>
-    <string name="danar_stats_cumulative_tdd">Kumulativ TDD</string>
-    <string name="danar_stats_expweight">Exponentiellt viktad TDD</string>
-    <string name="danar_stats_basalrate">Basal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Datum</string>
-    <string name="danar_stats_ratio">Kvot</string>
-    <string name="danar_stats_amount_days">Antal dagar</string>
-    <string name="danar_stats_weight">Vikt</string>
-    <string name="danar_stats_warning_Message">Kan visa fel om man använder bolus för priming/fyllning!</string>
-    <string name="danar_stats_olddata_Message">Gammal data. Tryck på Hämta.</string>
-    <string name="danar_stats_tbb">Total grundbasal</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Startar...</string>
     <string name="actions_shortname">Act</string>
     <string name="configbuilder_shortname">Konf</string>
     <string name="loop_shortname">Loop</string>
     <string name="simpleprofile_shortname">EP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">Dana</string>
     <string name="overview_shortname">Hem</string>
     <string name="virtualpump_shortname">vPump</string>
     <string name="profileviewer_shortname">Profil</string>
     <string name="treatments_shortname">Beh</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">Mål</string>
     <string name="wear_shortname">Wear</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Förkorta namnen på flikarna</string>
     <string name="always_use_shortavg">Använd alltid kort medeldelta istället för enkel delta</string>
     <string name="always_use_shortavg_summary">Användbart när ofiltrerade källor som xDrip ger brusvärden</string>
-    <string name="advancedsettings_title">Avancerade inställningar</string>
-    <string name="danar_model">Modell: %1$02X Protokoll: %2$02X Kod: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Standardvärde: 3 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina temp basaler till maximalt 3x din största basaldos. Du behöver oftast inte ändra detta värde. Läs på och förstå skillnaden mellan 3x nuvarande och 3x daglig max som säkerhetsinställningar.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardvärde: 4 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4 gånger din nuvarande basaldos, oberoende av din maximala basaldos. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning.</string>
@@ -504,18 +368,9 @@ Eversense-appen.</string>
     <string name="smscommunicator_calibrationsent">Kalibrering skickad. Observera att xDrip måste vara inställd att ta emot kalibreringar.</string>
     <string name="smscommunicator_calibrationfailed">xDrip tar inte emot kalibreringar</string>
     <string name="pumpsuspended">Pump pausad</string>
-    <string name="gettingpumpstatus">Hämtar pumpstatus</string>
-    <string name="settingtempbasal">Ställer in temp basal</string>
-    <string name="stoppingtempbasal">Avbryter temp basal</string>
-    <string name="settingextendedbolus">Ställer in förlängd bolus</string>
-    <string name="stoppingextendedbolus">Avbryter förlängd bolus</string>
-    <string name="updatingbasalrates">Uppdaterar basaldoser</string>
-    <string name="disconnecting">Kopplar från</string>
     <string name="executing">Utför</string>
     <string name="virtualpump_settings">Inställningar för Virtuell pump</string>
     <string name="virtualpump_uploadstatus_title">Ladda upp status till Nightscout</string>
-    <string name="wrongpassword">Fel lösenord</string>
-    <string name="approachingdailylimit">Maximal daglig dos snart nådd</string>
     <string name="nsclientinternal">NS Client</string>
     <string name="nsclientinternal_shortname">NSCl</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -539,7 +394,7 @@ Eversense-appen.</string>
     <string name="wear_detailedIOB_title">Visa detaljerad IOB</string>
     <string name="wear_detailedIOB_summary">Visa IOB med bolus och basal på klocka</string>
     <string name="nosuccess">misslyckat - kontrollera telefonen</string>
-    <string name="notavailable">Ej tillgängligt</string>
+    <string name="notavailable">-</string>
     <string name="patientage">Personens ålder</string>
     <string name="child">Barn</string>
     <string name="teenage">Tonåring</string>
@@ -575,8 +430,6 @@ Eversense-appen.</string>
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Rapportera appstart till Nightscout</string>
     <string name="restartingapp">Avslutar appen för att inställningarna ska läsas in.</string>
-    <string name="danarv2pump">Dana R v2</string>
-    <string name="configbuilder_insulin">Insulin</string>
     <string name="configbuilder_insulin_description">Vilken typ av insulin använder du?</string>
     <string name="fastactinginsulin">Snabbverkande Insulin</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog, Apidra</string>
@@ -585,15 +438,20 @@ Eversense-appen.</string>
     <string name="enablesuperbolus">Aktivera superbolus i kalkylatorn</string>
     <string name="enablesuperbolus_summary">Aktiverar superbolusfunktionen i kalkylatorn. Aktivera inte innan du förstått hur den fungerar. DEN KAN ORSAKA ÖVERDOSERING AV INSULIN OM INSIKT SAKNAS OM FUNKTIONEN!</string>
     <string name="show_statuslights">Visa \"statuslampor\" på hemskärmen</string>
+    <string name="statuslights_cage_warning">Kanylålder - varning: [h]</string>
+    <string name="statuslights_cage_critical">Kanylålder - akut varning: [h]</string>
+    <string name="statuslights_iage_warning">Insulinålder - varning: [h]</string>
+    <string name="statuslights_iage_critical">Insulinålder - akut varning: [h]</string>
+    <string name="statuslights_sage_warning">Sensorålder - varning: [h]</string>
+    <string name="statuslights_sage_critical">Sensorålder - akut varning: [h]</string>
+    <string name="statuslights_bage_warning">Batteriålder - varning: [h]</string>
+    <string name="statuslights_bage_critical">Batteriålder - akut varning: [h]</string>
     <string name="statuslights_res_warning">Varningsnivå för reservoar [U]</string>
     <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
     <string name="statuslights_bat_warning">Varningsnivå för batteri [%]</string>
     <string name="statuslights_bat_critical">Akut varningsnivå för batteri [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmwareversion</string>
-    <string name="pump_lastconnection_label">Senast ansluten</string>
-    <string name="danar_bluetooth_status">Bluetoothstatus</string>
     <string name="nav_about">Om</string>
     <string name="smscommunicator_missingsmspermission">Saknar behörighet att skicka SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Behörighet saknas</string>
@@ -604,17 +462,12 @@ Eversense-appen.</string>
     <string name="wear_showbgi_summary">Visa BGI i statusraden</string>
     <string name="ns_noupload">Ingen uppladdning till Nightscout</string>
     <string name="ns_noupload_summary">Ingen data sänds till Nightscout. AndroidAPS ansluter till Nightscout men inga ändringar görs i Nightscout</string>
-    <string name="basal_step">Basalsteg</string>
-    <string name="bolus_step">Bolussteg</string>
     <string name="overview_extendedbolus_cancel_button">Stoppa förlängd bolus</string>
     <string name="careportal_sensorage_label">Sensorålder</string>
     <string name="careportal_canulaage_label">Kanylålder</string>
     <string name="careportal_insulinage_label">Insulinålder</string>
-    <string name="hours">timmar</string>
-    <string name="invalidprofile">Ogiltig profil!</string>
     <string name="doprofileswitch">Genomför profilbyte</string>
     <string name="careportal_pbage_label">Pumpbatteri ålder</string>
-    <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
     <string name="ns_alarmoptions">Larminställningar</string>
     <string name="nsalarm_urgenthigh">Akut hög</string>
     <string name="nsalarm_high">Hög</string>
@@ -638,7 +491,6 @@ Eversense-appen.</string>
     <string name="absorptionsettings_title">Absorptionsinställningar</string>
     <string name="absorption_maxtime_title">Max absorptionstid för en måltid [tim]</string>
     <string name="absorption_maxtime_summary">Tid i timmar när alla kolhydrater förväntas vara absorberade</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visa förlängd bolus som %%</string>
     <string name="careportal_sensorage_label_short">SAGE</string>
     <string name="careportal_insulinage_label_short">IAGE</string>
     <string name="careportal_canulaage_label_short">CAGE</string>
@@ -663,7 +515,6 @@ Eversense-appen.</string>
     <string name="careportal_pump_label">PUMP</string>
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">Aktivera UAM</string>
     <string name="enablesmb">Aktivera SMB</string>
     <string name="enablesmb_summary">Använd Super Micro Bolusar istället för temp basal för snabbare resultat</string>
@@ -675,23 +526,7 @@ Eversense-appen.</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">%1$f tim DIA är för kort. Använder %2$f istället!</string>
     <string name="activate_profile">Aktivera profil</string>
-    <string name="date">Datum</string>
     <string name="invalid">OGILTIG</string>
-    <string name="waitingforpairing">Väntar på parkoppling med pump</string>
-    <string name="pairingok">Parkopplingen klar</string>
-    <string name="pairingtimedout">Parkopplingen tog för lång tid</string>
-    <string name="pairing">Parkoppling</string>
-    <string name="danars_nodeviceavailable">Ingen enhet funnen ännu</string>
-    <string name="emptyreservoir">Tom reservoar</string>
-    <string name="bloodsugarmeasurementalert">Varning om blodsockermätning</string>
-    <string name="remaininsulinalert">Återstående mängd insulin </string>
-    <string name="danarspump">Dana RS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Vald pump</string>
-    <string name="pairpump">Parkoppla ny pump</string>
-    <string name="bolusspeed">Bolushastighet</string>
-    <string name="danar_setbasalstep001">Sätt basalsteg till 0.01 enheter per timme</string>
-    <string name="serialnumber">Serienummer</string>
     <string name="careportal_newnstreatment_percentage_label">Procent</string>
     <string name="careportal_newnstreatment_timeshift_label">Tidsförskjutning</string>
     <string name="default_temptargets">Standardmålvärden</string>
@@ -701,32 +536,18 @@ Eversense-appen.</string>
     <string name="activity_target">Mål vid träning</string>
     <string name="hypo_duration">Hypo [min]</string>
     <string name="hypo_target">Mål vid Hypo</string>
-    <string name="danar_history_prime">Förfyll</string>
-    <string name="gettingextendedbolusstatus">Hämtar status för förlängd bolus</string>
-    <string name="gettingbolusstatus">Hämtar status för bolus</string>
-    <string name="gettingtempbasalstatus">Hämtar status för temp basal</string>
-    <string name="gettingpumpsettings">Hämtar pumpinställningar</string>
-    <string name="gettingpumptime">Hämtar tid och datum i pumpen</string>
     <string name="reuse">återanvänd</string>
     <string name="wearcontrol_title">Kontrollera från klockan</string>
     <string name="wearcontrol_summary">Sätt temp målvärde och ange behandlingar från klockan.</string>
-    <string name="connectiontimedout">Anslutningen tog för lång tid</string>
     <string name="food">Matdatabas</string>
     <string name="shortgramm">g</string>
-    <string name="shortminute">min</string>
-    <string name="shorthour">h</string>
-    <string name="shortday">d</string>
     <string name="none"><![CDATA[<ingen>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Fett</string>
     <string name="active"><![CDATA[<Aktiv>]]></string>
-    <string name="waitingforestimatedbolusend">Slutför bolus (%1$d sek)</string>
-    <string name="processinghistory">Behandlar</string>
-    <string name="startingbolus">Påbörjar bolus</string>
     <string name="executingrightnow">Kommando körs just nu</string>
-    <string name="pumpdrivercorrected">Pumpdrivrutin justerad</string>
     <string name="pump_unreachable">Pumpen kan inte nås</string>
     <string name="missed_bg_readings">BG-värden saknas</string>
     <string name="raise_notifications_as_android_notifications">Systemaviseringar för larm &amp; info</string>
@@ -736,9 +557,6 @@ Eversense-appen.</string>
     <string name="pump_unreachable_threshold">Pumpen ses som ej nåbar efter [min]</string>
     <string name="urgent_alarm">Akut larm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Bluetooth-övervakare</string>
-    <string name="btwatchdog_summary">Startar om bluetooth på telefonen om anslutning till pumpen misslyckas. Detta hjälper på en del telefoner där bluetooth ibland hänger sig.</string>
     <string name="eversense">Eversense App (modifierad)</string>
     <string name="dexcomg5_nsupload_title">Ladda upp BG-data till Nightscout</string>
     <string name="bgsource_upload">Uppladdningsinställningar för BG</string>
@@ -751,12 +569,9 @@ Eversense-appen.</string>
     <string name="uamsmbmaxminutes_summary">Max antal minuter basal som kan bli SMB vid UAM</string>
     <string name="carbsReqThreshold">Min föreslagen mängd kolhydrater</string>
     <string name="carbsReqThreshold_summary">När kolhydrater rekommenderas som korrektion, ange minsta mängd KH som ger notifiering</string>
-    <string name="unsupportedfirmware">Pumpens firmware stöds inte</string>
     <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
     <string name="nsclientbg">NSClient BG</string>
-    <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Basalvärdet ersatt med det maximala tillåtna: %1$s</string>
     <string name="overview_editquickwizard_usebg">Använd BG</string>
     <string name="overview_editquickwizard_usebolusiob">Använd bolus-IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Använd basal-IOB</string>
@@ -774,8 +589,6 @@ Eversense-appen.</string>
     <string name="closedmodeenabled">Closed loop aktiverad</string>
     <string name="maxiobset">Max IOB är korrekt angivet</string>
     <string name="hasbgdata">BG tillgängligt från vald källa</string>
-    <string name="basalprofilenotaligned">Profilens basaler är inte satta på hel timme: %1$s</string>
-    <string name="zerovalueinprofile">Ogiltig profil: %1$s</string>
     <string name="combo_programming_bolus">Programmerar bolus i pump</string>
     <string name="combo_refresh">Uppdatera</string>
     <string name="combo_pump_state_label">Läge</string>
@@ -796,7 +609,6 @@ Eversense-appen.</string>
     <string name="bolus_frequency_exceeded">En bolus med samma mängd efterfrågades inom den senaste minuten. För att förhindra att råka ge dubbla bolusar av misstag och ev programfel är detta inte tillåtet.</string>
     <string name="combo_pump_connected_now">Nu</string>
     <string name="combo_activity_reading_pump_history">Läser historik från pumpen</string>
-    <string name="danar_history">Pumphistorik</string>
     <string name="combo_activity_setting_basal_profile">Sätter basalprofil</string>
     <string name="combo_pump_cartridge_low_warrning">Låg nivå i insulinreservoaren</string>
     <string name="combo_pump_battery_low_warrning">Pumpbatteriet är svagt</string>
@@ -815,9 +627,6 @@ Eversense-appen.</string>
     <string name="extendedbolusdeliveryerror">Förlängd bolus misslyckad</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">sedan</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
     <string name="enablesmbalways">Använd alltid SMB</string>
     <string name="enablesmbalways_summary">Använd alltid SMB oberoende av bolus. Endast möjligt med en bra filtrerad BG-källa, t ex Dexcom G5.</string>
     <string name="enablesmbaftercarbs">Använd SMB efter kolhydrater</string>
@@ -828,8 +637,6 @@ Eversense-appen.</string>
     <string name="enablesmbwithtemptarget_summary">Använd SMB när temp mål är satt, t ex Äta snart eller Träning</string>
     <string name="enablesmbwithhightemptarget">Använd SMB vid högt målvärde</string>
     <string name="enablesmbwithhightemptarget_summary">Använd SMB även när ett högt temp målvärde är satt (över 5,5 mmol)</string>
-    <string name="let_temp_basal_run">Låt temp basalen gå</string>
-    <string name="mute">Tysta</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Kolhydrater</string>
     <string name="overview_buttons_selection">Knappar</string>
@@ -871,7 +678,6 @@ Eversense-appen.</string>
     <string name="closed_loop_disabled_on_dev_branch">Du kör nu dev-versionen. Closed Loop inte tillåtet.</string>
     <string name="engineering_mode_enabled">Engineering Mode aktiverat</string>
     <string name="not_eng_mode_or_release">Engineering Mode inte aktiverat och appen körs inte som release</string>
-    <string name="pump_basebasalrate">%1$.2f U/h</string>
     <string name="combo_actvity_reading_basal_profile">Läser basalprofil</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">Pumphistoriken ändrad efter att boluskalkylen gjordes. Bolusen har inte levererats. Vänligen gör en ny kalkyl vid behov.</string>
     <string name="combo_error_updating_treatment_record">Bolusen levererad, men det gick inte att lägga till den i loggen. Detta kan hända om två små bolusar ges inom två minuter. Vänligen kontrollera pumpens historik och Careportal och lägg till om det saknas. Se till att inte lägga till två bolusar med samma mängd och samma tid.</string>
@@ -894,15 +700,10 @@ Eversense-appen.</string>
     <string name="smbdisabledinpreferences">SMB inaktiverat i Inställningar</string>
     <string name="uamdisabledinpreferences">UAM är inaktiverat i inställningarna</string>
     <string name="uamdisabledoref1notselected">UAM är inaktiverat eftersom det kräver Oref1 känslighetsplugin</string>
-    <string name="limitingbasalratio">Begränsar max basal till %1$.2f E/h pga %2$s</string>
-    <string name="pumplimit">pumpbegränsning</string>
-    <string name="itmustbepositivevalue">det måste vara ett positivt värde</string>
     <string name="maxbasalmultiplier">multiplikator för max basal</string>
     <string name="maxdailybasalmultiplier">multiplikator för daglig max basal</string>
     <string name="smb_frequency_exceeded">En bolus gavs för mindre än 3 min sedan. Hoppar över SMB</string>
     <string name="basal_set_correctly">Basal justerad korrekt</string>
-    <string name="limitingpercentrate">Begränsar max procent hastighet till %1$d%% pga %2$s</string>
-    <string name="limitingbolus">Begränsar bolus till %1$.1f enheter pga %2$s</string>
     <string name="limitingextendedbolus">Begränsar bolus till %1$.1f enheter pga %2$s</string>
     <string name="limitingmaxiob">Begränsar max IOB till %1$.1f pga %2$s</string>
     <string name="limitingcarbs">Begränsar kolhydrater till %1$d g pga %2$s</string>
@@ -917,7 +718,6 @@ Eversense-appen.</string>
     <string name="smbnotallowedinopenloopmode">SMB inte tillåtet i Open Loop</string>
     <string name="food_short">Mat</string>
     <string name="reset">Återställ</string>
-    <string name="waitingfortimesynchronization">Väntar på tidssynkronisering (%1$d sek)</string>
     <string name="loopdisconnectedfor">Frånkopplad (%1$d min)</string>
     <string name="openapssmb_maxiob_title">Max IOB som OpenAPS inte kan överstiga [U]</string>
     <string name="openapssmb_maxiob_summary">Det här värdet kallas Max IOB av OpenAPS. Om denna mängd insulin on board (IOB) nås, kan inte OpenAPS lägga till mer.</string>
@@ -933,7 +733,6 @@ Eversense-appen.</string>
     <string name="nav_setupwizard">Installationsguide</string>
     <string name="setupwizard_finish">Avsluta</string>
     <string name="setupwizard_language_prompt">Välj språk</string>
-    <string name="boluserrorcode">Angivet: %1$.2f enheter. Levererat: %2$.2f enheter. Felkod: %3$s</string>
     <string name="firstinsulinincrement">Första snabbknabben för insulin</string>
     <string name="secondinsulinincrement">Andra snabbknabben för insulin</string>
     <string name="thirdinsulinincrement">Tredje snabbknabben för insulin</string>
@@ -956,7 +755,6 @@ Eversense-appen.</string>
     <string name="virtualpump_type">Typ av virtuell pump</string>
     <string name="virtualpump_definition">Pumpdefinition</string>
     <string name="virtualpump_pump_def">Bolus: Steg =%1$s\nFörlängd bolus: [Steg=%2$s, duration =%3$smin -%4$sh] \nBasal: Steg=%5$s\nTempbasal: %6$s (av %7$s), duration =%8$smin -%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Inga spann stöds som granularitet för basal/bolus i den virtuella pumpen. Endast enkla värden.</string>
     <string name="ns_autobackfill_title">Auto Backfill BG</string>
     <string name="wear_wizard_settings">Kalkylatorinställningar</string>
     <string name="wear_wizard_settings_summary">Kalkyler inkluderade i resultatet</string>
@@ -987,22 +785,6 @@ Eversense-appen.</string>
     <string name="request">Begäran</string>
     <string name="insulinsourcesetup">Konfigurera insticksprogram för insulin</string>
     <string name="exit">Avsluta</string>
-    <string name="danar_useroptions">Användaralternativ</string>
-    <string name="danar_timedisplay">Format för tidsvisning</string>
-    <string name="danar_buttonscroll">Scrollfunktion</string>
-    <string name="danar_beep">Pip vid knapptryckning</string>
-    <string name="danar_pumpalarm">Larm</string>
-    <string name="danar_pumpalarm_sound">Ljud</string>
-    <string name="danar_pumpalarm_vibrate">Vibrera</string>
-    <string name="danar_pumpalarm_both">Båda</string>
-    <string name="danar_screentimeout">LCD på, tid [sek]</string>
-    <string name="danar_backlight">Bakgrundsbelysning på, tid [sek]</string>
-    <string name="danar_glucoseunits">Glukosenheter</string>
-    <string name="danar_shutdown">Avstängning pump [tim]</string>
-    <string name="danar_lowreservoir">Låg reservoar [Enheter]</string>
-    <string name="danar_saveuseroptions">Spara till pump</string>
-    <string name="option_on">På</string>
-    <string name="option_off">Av</string>
     <string name="open_navigation">Öppna menyn</string>
     <string name="close_navigation">Stäng menyn</string>
     <string name="nav_plugin_preferences">Inställningar för insticksprogram</string>
@@ -1022,8 +804,6 @@ Eversense-appen.</string>
     <string name="sensitivity_raises_target_summary">Om systemet upptäcker tillfällig insulinkänslighet, höj mål-BG för att på så sätt minska insulindoseringen</string>
     <string name="combo_invalid_setup">Felaktig pumpinstallation. Kontrollera dokumentationen och verifiera att Snabbmenyn heter QUICK INFO med hjälp av 360-mjukvaran.</string>
     <string name="custom">Anpassad</string>
-    <string name="largetimedifftitle">Stor tidsskillnad</string>
-    <string name="largetimediff">Stor tidsskillnad:\nTiden i pumpen skiljer mer än 1,5 timme.\nVänligen justera tiden manuellt på pumpen och se till att det går att läsa historiken från pumpen utan oväntat beteende.\nOm möjligt, töm historiken i pumpen innan tidsomställning alternativt stäng av loopen i minst DIA timmar efter den senaste felaktiga historikloggen, men minst DIA timmar från nu.</string>
     <string name="careportal_removestartedevents">Rensa alla \"AndroidAPS startad\"</string>
     <string name="storedsettingsfound">Tidigare sparade inställningar hittade</string>
     <string name="allow_hardware_pump_text">Varning: Om du aktiverar och ansluter en pump, kommer AndroidAPS skriva över pumpens basalprofil med den aktiva profilen i AndroidAPS. Se till att ha rätt inställningar i appen innan du ansluter. Om du är osäker, tryck på Avbryt och anslut pumpen på nytt vid ett senare tillfälle.</string>
@@ -1049,17 +829,10 @@ Eversense-appen.</string>
     <string name="setupwizard_preferred_aps_mode">Föredraget APS-läge</string>
     <string name="treatments_wizard_total_label">Total</string>
     <string name="calculation_short">Kalkyl</string>
-    <string name="handshaking">Anslutningen verifieras</string>
     <string name="sendlogfiles">Skicka dagens loggfiler till utvecklarna tillsammans med denna datumstämpel. Oväntad situation.</string>
-    <string name="maxbolusviolation">Max bolus nådd</string>
-    <string name="commanderror">Kommandofel</string>
-    <string name="speederror">Felaktig hastighet</string>
-    <string name="insulinlimitviolation">Insulingräns nådd</string>
     <string name="loop_openmode_min_change">Minsta ändring som ger notifiering [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">I Open Loop-läge kommer AAPS bara att be om ändring ifall förändringen är större än detta värde. Standardvärdet är 20%</string>
-    <string name="pairfirst">Vänligen para ihop pumpen med telefonen.</string>
     <string name="searching_for_devices">Söker enheter…</string>
-    <string name="please_wait">Var god vänta…</string>
     <string name="pairing_completed">Parkoppling lyckades</string>
     <string name="code_compare">Stämmer koderna överens mellan denna enhet och din pump?</string>
     <string name="insight_pairing">Parkoppling av Insight</string>
@@ -1136,7 +909,7 @@ Eversense-appen.</string>
     <string name="automation_missing_trigger">Specificera åtminstone en utlösare.</string>
     <string name="automation_missing_action">Specificera åtminstone en åtgärd.</string>
     <string name="alreadyenabled">Redan aktiverad</string>
-    <string name="alreadydisabled">Redan avaktiverad</string>
+    <string name="alreadydisabled">Redan inaktiverad</string>
     <string name="alreadysuspended">Redan pausad</string>
     <string name="resumeloop">Återuppta loop</string>
     <string name="notsuspended">Inte pausad</string>
@@ -1144,11 +917,10 @@ Eversense-appen.</string>
     <string name="stoptemptarget">Avbryt temp mål</string>
     <string name="islesser">är mindre än</string>
     <string name="isequalorlesser">är samma eller mindre än</string>
-    <string name="isequal">är samma som</string>
+    <string name="isequal">är lika med</string>
     <string name="isequalorgreater">är samma eller större än</string>
     <string name="isgreater">är större än</string>
     <string name="isnotavailable">är inte tillgänglig</string>
-    <string name="unknown">okänd</string>
     <string name="glucoseisnotavailable">BG-data är inte tillgängligt</string>
     <string name="glucosecomparedmgdl">BG %1$s %2$.0f %3$s</string>
     <string name="glucosecomparedmmol">BG %1$s %2$.1f %3$s</string>
@@ -1165,23 +937,10 @@ Eversense-appen.</string>
     <string name="automation_short">Auto</string>
     <string name="automation">Automation</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">Logga sensorbyte till Nightscout</string>
     <string name="dexcom_lognssensorchange_summary">Loggar automatiskt ett sensorbyte i NS när en sensor startas</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <string name="unit_second">sekund</string>
-    <string name="unit_minute">minut</string>
-    <string name="unit_hour">timme</string>
-    <string name="unit_day">day</string>
-    <string name="unit_week">vecka</string>
-    <string name="unit_seconds">sekunder</string>
-    <string name="unit_minutes">minuter</string>
-    <string name="unit_hours">timmar</string>
-    <string name="unit_days">dagar</string>
-    <string name="unit_weeks">veckor</string>
     <string name="summary_tidepool_username">Ditt användarnamn på Tidepool. Normalt din e-postadress</string>
     <string name="title_tidepool_username">Användarnamn</string>
     <string name="summary_tidepool_password">Ditt Tidepool-lösenord</string>
@@ -1224,7 +983,6 @@ Eversense-appen.</string>
     <string name="very_old_version">väldigt gammal version</string>
     <string name="new_version_warning">Ny version tillgänglig för %1$d dagar sedan. Systemet kommer att byta läge till \"stopp innan lågt\" efter %2$d dagar och sluta loopa helt efter %3$d dagar</string>
     <string name="twohours">2 tim</string>
-    <string name="formatinsulinunits">%1$.2f U</string>
     <string name="dexcom_app_patched">Dexcoms app (modifierad)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Ta emot BG-data från den modifierade Dexcom-appen.</string>
@@ -1301,15 +1059,12 @@ Eversense-appen.</string>
     <string name="rileylink_scanner_scan_stop">AVBRYT</string>
     <string name="rileylink_scanner_selected_device">Vald</string>
     <string name="rileylink_scanner_title">Riley Link-sökning</string>
-    <string name="rileylink_scanner_ble_not_supported">Enheten stöder inte BLE.</string>
-    <string name="rileylink_scanner_ble_not_enabled">Bluetooth avstängt.</string>
-    <string name="location_not_found_title">Platsdata är inte aktiverat</string>
-    <string name="location_not_found_message">För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats.</string>
     <string name="location_yes">Aktivera</string>
     <string name="location_no">Nej</string>
     <string name="rileylink_scanner_scanning">Söker</string>
     <string name="rileylink_scanner_scanning_finished">Sökning avslutad</string>
     <string name="rileylink_scanner_scanning_error">Fel vid sökning: %1$d</string>
+    <string name="common_never">Aldrig</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Inställningar</string>
     <string name="rileylink_settings_tab2">Historik</string>
@@ -1345,7 +1100,6 @@ Eversense-appen.</string>
     <string name="rileylink_error_tuneup_failed">Frekvensjustering misslyckades</string>
     <string name="rileylink_error_pump_unreachable">Pumpen kan inte nås</string>
     <string name="rileylink_error_pod_unreachable">Podden kan inte nås</string>
-    <string name="rileylink_error_address_not_set_short">Ej vald</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronicpump</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
@@ -1415,7 +1169,6 @@ Eversense-appen.</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Bolusbegränsning: %2$.2fU till %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>Varning! Långsam KH-absorption upptäckt %2$d%% av tiden. Dubbelkolla din beräkning. COB kan vara väldigt missvisande och du riskerar få för mycket insulin!</font>]]></string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
     <string name="partialboluswizard">Direkt bolus [%]</string>
     <string name="deliverpartofboluswizard">Bolusguiden utför beräkningar, men endast denna del av beräknat insulin levereras. Användbar med SMB-algoritm.</string>
     <string name="loading">Laddar...</string>
@@ -1423,7 +1176,6 @@ Eversense-appen.</string>
     <string name="time_range">Tidsintervall</string>
     <string name="timerange_value">Klockan är mellan %1$s och %2$s</string>
     <string name="between">Mellan </string>
-    <string name="close">Stäng</string>
     <string name="increasingmaxbasal">Ökar maximalt basaldos eftersom inställningen är lägre än din maximala basal i profilen</string>
     <string name="smscommunicator_messagebody">Ogiltigt innehåll i meddelande</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
@@ -1441,8 +1193,8 @@ Eversense-appen.</string>
     <string name="common_off">Av</string>
     <string name="objectives_button_unfinish">Rensa avslutade</string>
     <string name="objectives_button_unstart">Rensa påbörjade</string>
-    <string name="timedetection">Tidsdetektering</string>
     <string name="doyouwantresetstart">Vill du starta om målet? Du kan förlora de steg du gjort hittills.</string>
+    <string name="time_or_timezone_change">Tid och/eller tidszonsändring på pump</string>
     <string name="nopumpselected">Ingen pump har valts</string>
     <string name="setupwizard_units_prompt">Välj enheter du vill visa värden i</string>
     <string name="ns_ploadlocalprofile">Överför lokala profiländringar till NS</string>
@@ -1467,7 +1219,6 @@ Eversense-appen.</string>
     <string name="nav_survey">Enkät</string>
     <string name="invalidage">Ogiltig inmatning (ålder)</string>
     <string name="invalidweight">Ogiltig inmatning (vikt)</string>
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Låg: <b>%2$02d%%</b> Mål: <b>%3$02d%%</b> Hög: <b>%4$02d%%</b>]]></string>
     <string name="average">Medel</string>
     <string name="tdd">TDD</string>
@@ -1480,12 +1231,8 @@ Eversense-appen.</string>
     <string name="randombg_short">BG</string>
     <string name="tools">Verktyg</string>
     <string name="show_calculation">Visa beräkning</string>
-    <string name="error">Fel</string>
-    <string name="timeformat12h">12 tim</string>
-    <string name="timeformat24h">24 tim</string>
     <string name="automation_event">Automationshändelse</string>
     <string name="alreadyset">Redan satt</string>
-    <string name="message">Meddelande</string>
     <string name="clearqueueconfirm">Allt data som inte synkats kommer att kastas bort. Är du säker på att du vill tömma kön?</string>
     <string name="ebstopsloop">OBS! Om du använder förlängd bolus, kommer du inte längre vara i Closed Loop under den tiden som den förlängda bolusen är igång. Vill du fortsätta?</string>
     <string name="closed_loop_disabled_with_eb">Closed Loop-läget inaktiverat pga att en förlängd bolus är aktiv</string>
@@ -1526,4 +1273,118 @@ Eversense-appen.</string>
     <string name="master_password_summary">Huvudlösenordet används för att kryptera backuper och för att åsidosätta vissa säkerhetsfunktioner i applikationen. Kom ihåg det eller förvara det på ett säkert ställe.</string>
     <string name="passwords_dont_match">Lösenorden stämmer inte överens</string>
     <string name="current_master_password">Nuvarande huvudlösenord</string>
+    <string name="statuslights">Statuslampor</string>
+    <string name="statuslights_copy_ns">Kopiera inställningar från NS</string>
+    <string name="copyexistingvalues">Kopiera NS-inställningar (om det finns)?</string>
+    <string name="classic_desrciption">Ursprungligt tema</string>
+    <string name="buttonson_desrciption">Knappar visas alltid längst ned på skärmen</string>
+    <string name="skin">Tema</string>
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Pumpintegrering för Omnipod. Kräver Riley Link med minst v2-firmware.</string>
+    <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Boluspip aktiverade</string>
+    <string name="omnipod_config_beep_basal_enabled">Basalpip aktiverade</string>
+    <string name="omnipod_config_beep_smb_enabled">SMB-pip aktiverade</string>
+    <string name="omnipod_config_beep_tbr_enabled">Tempbasal-pip aktiverade</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Debug-alternativ aktiverade för pod</string>
+    <string name="omnipod_config_timechange_enabled">Automatisk avkänning av tidszon aktiverad</string>
+    <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Omnipod</string>
+    <string name="omnipod_pod_status">Pod-status</string>
+    <string name="omnipod_reservoir_left">%1$.2f U återstår</string>
+    <string name="omnipod_reservoir_over50">Över 50 U</string>
+    <string name="omnipod_pod_address">Podadress</string>
+    <string name="omnipod_pod_expiry">Pod går ut</string>
+    <string name="omnipod_pod_name_no_info">Ingen info</string>
+    <string name="omnipod_pod_no_pod_connected">Ingen pod ansluten</string>
+    <string name="omnipod_pod_not_initalized">Inte initierad</string>
+    <string name="omnipod_pod_active_alerts">Aktiva pod-varningar</string>
+    <string name="omnipod_ack_short">Ack-varningar</string>
+    <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operationen inte möjlig.\n\n Du måste konfigurera Omnipod innan du kan använda denna funktion.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operationen är inte möjlig.\n\n Du måste vänta några minuter, tills AAPS försöker ställa in profilen för första gången.</string>
+    <string name="omnipod_error_illegal_init_action_type">Ogiltig PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Ingen aktiv pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Kommandoverifikation misslyckades.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Ett oväntat fel uppstod. Vänligen rapportera! (typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Kommunikationsfel: Emottog ogiltiga indataparametrar.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Kommunikationsfel: Timeout.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Kommunikationsfel: Ett oväntat fel inträffade. Rapportera!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Kommunikationsfel: Lyckades inte verifiera meddelandet.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Kommunikationsfel: Mottog ett ogiltigt datapaket från pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Kommunikationsfel: Pod är i fel tillstånd.</string>
+    <string name="omnipod_driver_error_invalid_response">Kommunikationsfel: Mottog ett felaktig svar från pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Kommunikationsfel: Tog emot ett meddelande med ett ogiltigt sekvensnummer från podden.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Kommunikationsfel: Tog emot ett meddelande med en ogiltig adress från podden.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Kommunikationsfel: Misslyckades avkoda meddelandet från pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Kommunikationsfel: \"nonce resync\" misslyckades.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Kommunikationsfel: \"nonce\" är inte i synk.</string>
+    <string name="omnipod_driver_error_not_enough_data">Kommunikationsfel: Mottog inte tillräckligt mycket data från pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Ett pod-fel (%1$03d %2$s) har upptäckts. Vänligen inaktivera din pod och starta en ny.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Kommunikationsfel: Pod returnerade ett fel.</string>
+    <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Podhantering</string>
+    <string name="omnipod_cmd_init_pod">Initiera pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Inaktivera pod</string>
+    <string name="omnipod_cmd_reset_pod">Återställ pod</string>
+    <string name="omnipod_cmd_pod_history">Pod-historik</string>
+    <string name="omnipod_cmd_set_bolus">Leverera bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Avbryt Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Sätt temp basal</string>
+    <string name="omnipod_cmd_cancel_tbr">Avbryt temp basal (internt av drivrutinen)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Avbryt temp basal (tvingat av användaren)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Ange basaldoser</string>
+    <string name="omnipod_cmd_get_pod_status">Uppdatera pod-status</string>
+    <string name="omnipod_cmd_get_pod_info">Hämta Pod-information</string>
+    <string name="omnipod_cmd_set_time">Ställ in tid</string>
+    <string name="omnipod_cmd_configure_alerts">Konfigurera varningar</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Bekräfta varningar</string>
+    <string name="omnipod_cmd_suspend_delivery">Pausa insulintillförsel</string>
+    <string name="omnipod_cmd_resume_delivery">Återuppta insulintillförsel</string>
+    <string name="omnipod_cmd_unknown_entry">Okänd post</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, KH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Dos: %1$.1f U, Duration: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Om du trycker på <b>OK</b>, kommer poddstatus att tvångsåterställas och du kommer inte att kunna kommunicera med podden längre. Gör det här bara om du inte kan kommunicera med podden. Om du fortfarande kan kommunicera med den, använd alternativet <b>Inaktivera pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Pod-historik är inte tillgänglig för tillfället.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Fyll pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nFyll den nya podden med tillräckligt med insulin för 3 dagar.\n\nLyssna efter två pip under påfyllningsprocessen. Dessa anger att minimimängden 85U har nåtts. Var noga med att helt tömma påfyllningssprutan, även efter att ha hört de två pipen.\n\nNär påfyllningen är klar, tryck <b>Nästa</b>.\n\n<b>Notera:</b> Ta inte bort nålskyddet ännu.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Förfyllning</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Försöker parkoppla den nya podden och förfylla den.\n\nNär alla steg är sluförda, kan du trycka på <b>Nästa</b>.\n\n<b>Notera:</b> Håll din riley link väldigt nära podden.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Fäst podden</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nFörbered infusionsplatsen. Ta bort poddens nålskydd och fäst podden på infusionsplatsen.\n\nOm kanylen sticker ut, tryck på <b>Avbryt</b> och kasta din pod.\n\nTryck <b>Nästa</b> för att skjuta in kanylen och påbörja basaldoseringen.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Skjuter in kanylen</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Försöker att ställa in basaldoser och skjuta in kanylen.\n\nNär alla steg är slutförda, kan du trycka på <b>Nästa</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod-info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPodden är nu aktiverad.\n\nDina basaldoser har programmerats och kanylen har skjutits in in.\n\nKontrollera att kanylen sitter på rätt sätt och byt pod om den inte gjort det.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Inaktivera pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nTryck på <b>Nästa</b> för att inaktivera podden.\n\n<b>OBS!</b> Det här stoppar all insulintillförsel och inaktiverar podden.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Inaktiverar pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Inaktivering av pod\n\nNär alla steg är slutförda, kan du trycka på <b>Nästa</b>.\n\n<b>Notera:</b> Om inaktivering misslyckas ofta, tryck på <b>Avbryt</b> och använd alternativet <b>Återställ pod</b> för att tvångsåterställa podden.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod inaktiverad.\n\nTa bort podden och kasta den.</string>
+    <string name="omnipod_init_pod_pair_pod">Parkoppla pod</string>
+    <string name="omnipod_init_pod_prime_pod">Förfyll pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Fyll kanyl</string>
+    <string name="omnipod_init_pod_set_basal_profile">Sätt basalprofil</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Avbryt leverans</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Inaktivera pod</string>
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Pumpintegration för Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Påminnelse att slutföra parkoppling</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
+    <string name="omnipod_alert_expiration">Pod kommer att gå ut inom kort</string>
+    <string name="omnipod_alert_expiration_advisory">Pod kommer att gå ut inom kort</string>
+    <string name="omnipod_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
+    <string name="omnipod_alert_low_reservoir">Låg reservoar</string>
+    <string name="omnipod_alert_unknown_alert">Okänd varning</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Inställning av basalprofil kan ha misslyckats. Leverans kan avbrytas! Vänligen uppdatera pod-status.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Inställning av temp basal kan ha misslyckats. Om det redan var en temp basal igång, kan den ha avbrutits! Vänligen uppdatera pod-status.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Tidsuppdateringen kan ha misslyckats. Leverans kan avbrytas! Vänligen uppdatera pod-status.</string>
+    <string name="omnipod_bolus_failed_uncertain">Det går inte att verifiera om bolusen är slutförd. Verifiera att din pod leverarar bolus eller avsluta bolus.</string>
+    <string name="omnipod_rl_stats">RL-statistik</string>
+    <string name="omnipod_read_pulse_log_short">Pulslogg</string>
 </resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 733b287549..3b916dda38 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -12,11 +12,9 @@
     <string name="nav_resetdb">Veritabanlarını sıfırla</string>
     <string name="reset_db_confirm">Veritabanlarını gerçekten sıfırlamak istiyor musunuz?</string>
     <string name="nav_exit">Çıkış</string>
-    <string name="danar_bt_name_title">DanaR Bluetooth aygıtı</string>
     <string name="ns_sync_use_absolute_title">Her zaman bazal mutlak değerleri kullan</string>
     <string name="alert_dialog_storage_permission_text">Lütfen telefonunu yeniden başlat, yada Android APS sistem ayarları üzerinden yeniden başlat.\nAksi taktirde Android APS hiç bir günlük tutmayacak (takip ve doğrulama, algoritmanın düzenli çalışmasi için önemli)!</string>
     <string name="description_actions">Ortak özelliklere hızlıca erişmek için bazı düğmeler</string>
-    <string name="description_careportal">Gelişmiş kayıt defteri girişleri.</string>
     <string name="description_config_builder">Aktif eklentileri yapılandırmak için kullanılan</string>
     <string name="description_objectives">Eğitim programı</string>
     <string name="description_food">Nightscout\'ta tanımlanan gıda ön ayarlarını gösterir</string>
@@ -33,10 +31,6 @@
     <string name="description_profile_nightscout">Nightscout\'ta tanımladığınız profili sağlar</string>
     <string name="description_profile_simple">Sadece bir zaman bloğuyla bir profil tanımlayın.</string>
     <string name="description_pump_combo">Accu-Chek Combo pompalar için pompa entegrasyonu, ruffy yüklü olması gerektirir</string>
-    <string name="description_pump_dana_r">DANA Diabecare R pompaları için pompa entegrasyonu</string>
-    <string name="description_pump_dana_r_korean">DANA Diabecare R yerli Kore pompaları için pompa entegrasyonu</string>
-    <string name="description_pump_dana_r_v2">Güncellenmiş ürün yazılımlı DANA Diabecare R pompaları için pompa entegrasyonu</string>
-    <string name="description_pump_dana_rs">DANA Diabecare RS pompaları için pompa entegrasyonu</string>
     <string name="description_pump_mdi">Diyabet tedavisi için günde birden fazla enjeksiyon yapan kişiler için pompa entegrasyonu</string>
     <string name="description_pump_virtual">Henüz herhangi bir sürücüye sahip olmayan pompalar için pompa entegrasyonu (Açık Döngü)</string>
     <string name="description_sensitivity_aaps">Duyarlılık, Oref0 gibi aynı şekilde hesaplanır ancak geçmiş zaman çerçevesi belirtebilirsiniz. Minimal karbonhidrat emilimi, tercihlerden maksimum karbonhidrat emilim süresinden hesaplanır.</string>
@@ -49,13 +43,6 @@
     <string name="description_wear">WearOS saatinizi kullanarak AndroidAPS\'yi izleyin ve kontrol edin.</string>
     <string name="description_xdrip_status_line">Döngü\'yle ilgili bilgileri xDrip+ watchface\'inizde gösterin.</string>
     <string name="description_sms_communicator">SMS komutlarını kullanarak uzaktan AndroidAPS kontrolü.</string>
-    <string name="nsprofileview_units_label">Ünite</string>
-    <string name="nsprofileview_dia_label">DIA</string>
-    <string name="nsprofileview_ic_label">IC Karbonhidrat İnsülin Oranı</string>
-    <string name="nsprofileview_isf_label">ISF İnsülin Duyarlılık Faktörü</string>
-    <string name="nsprofileview_basal_label">Bazal</string>
-    <string name="nsprofileview_target_label">Hedef</string>
-    <string name="noprofileset">PROFİLİ AYARLANMADI</string>
     <string name="treatments_insulin_label_string">İnsülin:</string>
     <string name="treatments_carbs_label_string">Karbonhidrat:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -71,15 +58,9 @@
     <string name="treatments_wizard_tt_label">TT</string>
     <string name="treatments_wizard_carbs_label">Karbonhidrat</string>
     <string name="treatments_wizard_correction_label">Düzeltme</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">Bolus IOB</string>
     <string name="openapsma_run">Şimdi Çalıştır</string>
     <string name="vitualpump_label">SANAL POMPA</string>
-    <string name="pump_basebasalrate_label">Temel bazal oranı</string>
-    <string name="pump_tempbasal_label">Geçici Bazal</string>
-    <string name="virtualpump_extendedbolus_label">Yayım Bolus</string>
-    <string name="pump_battery_label">Pil</string>
-    <string name="pump_reservoir_label">Rezervuar</string>
     <string name="virtualpump_resultok">Tamam</string>
     <string name="openapsma_lastrun_label">Son Çalıştırma</string>
     <string name="openapsma_inputparameters_label">Girdi Parametreleri</string>
@@ -90,16 +71,11 @@
     <string name="openapsma_mealdata_label">Yemek Verisi</string>
     <string name="result">Sonuç</string>
     <string name="openapsma_noglucosedata">Glikoz verisi yok</string>
-    <string name="nochangerequested">Değişiklik yapılmadı</string>
     <string name="openapsma_request_label">İstek</string>
-    <string name="rate">Oranı</string>
-    <string name="duration">Süre</string>
-    <string name="reason">Nedeni</string>
     <string name="glucose">Glikoz</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
     <string name="configbuilder">Konfigurasyon oluştur</string>
-    <string name="objectives">Hedefler</string>
     <string name="overview">Genel Bakış</string>
     <string name="nsprofile">Nightscout Profil</string>
     <string name="simpleprofile">Basit Profil</string>
@@ -117,7 +93,6 @@
     <string name="configbuilder_general">Genel</string>
     <string name="configbuilder_general_description">Kullanışlı bulabileceğiniz bazı genel eklentiler.</string>
     <string name="configbuilder_constraints_description">Hangi kısıtlamaları uygula?</string>
-    <string name="days">günler</string>
     <string name="constraints">Kısıtlamalar</string>
     <string name="loop">Döngü</string>
     <string name="configbuilder_loop">Döngü</string>
@@ -133,7 +108,6 @@
     <string name="openapsma_disabled">Eklenti devre dışı</string>
     <string name="constraints_violation">Kısıtlamalar ihlali</string>
     <string name="treatmentdeliveryerror">Bolus teslimat hatası</string>
-    <string name="tempbasaldeliveryerror">Geçici Bazal teslimat hatası</string>
     <string name="setbasalquestion">Yeni geçici bazal oranını kabul et:</string>
     <string name="overview_treatment_label">Tedavi</string>
     <string name="overview_calculator_label">Hesap makinesi</string>
@@ -143,7 +117,6 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazal</string>
     <string name="sms_basal">Bazal:</string>
-    <string name="carbs">Karbonhidrat</string>
     <string name="changeyourinput">Girişinizi değiştirin!</string>
     <string name="configbuilder_bgsource">KŞ kaynağı</string>
     <string name="configbuilder_bgsource_description">AndroidAPS verilerini nereden alsın?</string>
@@ -160,24 +133,6 @@
     <string name="treatments_wizard_basaliob_label">Bazal IOB</string>
     <string name="bolusconstraintapplied">Bolus kısıtlaması uygulandı</string>
     <string name="carbsconstraintapplied">Karbonhidrat kısıtlaması uygulandı</string>
-    <string name="careportal_bgcheck">KŞ Kontrol</string>
-    <string name="careportal_announcement">Duyuru</string>
-    <string name="careportal_note">Not</string>
-    <string name="careportal_question">Soru</string>
-    <string name="careportal_exercise">Egzersiz</string>
-    <string name="careportal_pumpsitechange">Pompa Kanül Değişimi</string>
-    <string name="careportal_cgmsensorinsert">CGM Sensör Yerleştir</string>
-    <string name="careportal_cgmsensorstart">CGM sensörü Başlat</string>
-    <string name="careportal_insulincartridgechange">İnsülin Kartuş Değişimi</string>
-    <string name="careportal_snackbolus">Aperatif Bolusu</string>
-    <string name="careportal_mealbolus">Öğün Bolus</string>
-    <string name="careportal_correctionbolus">Düzeltme Bolus</string>
-    <string name="careportal_combobolus">Kombo Bolus</string>
-    <string name="careportal_tempbasalstart">Geçici Basal başlat</string>
-    <string name="careportal_tempbasalend">Geçici Bazal Bitimi</string>
-    <string name="careportal_carbscorrection">Karbonhidrat düzeltme</string>
-    <string name="careportal_openapsoffline">OpenAPS etkisiz</string>
-    <string name="careportal_newnstreatment_eventtype">Etkinlik Türü</string>
     <string name="careportal_newnstreatment_other">Diğer</string>
     <string name="careportal_newnstreatment_meter">Metre</string>
     <string name="careportal_newnstreatment_sensor">Sensör</string>
@@ -207,82 +162,24 @@
     <string name="openapsma_maxbasal_summary">Bu değer OpenAPS\'te \"max bazal\" olarak adlandırılır</string>
     <string name="openapsma_maxiob_title">OpenAPS\'nin vermesine izin verilen maksimum bazal IOB (Aktif insülin) [U]</string>
     <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Max IOB denir.\nAPS\'de [U] bir kerede verilen maksimum insülin.</string>
-    <string name="dismiss">İptal et</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">Bağlanıyor</string>
-    <string name="connected">Bağlanıldı</string>
-    <string name="disconnected">Bağlantı kesildi</string>
     <string name="end_user_license_agreement">Son Kullanıcı Lisans Sözleşmesi</string>
     <string name="end_user_license_agreement_text">TIBBİ KARAR VERMEK İÇİN KULLANILMAMALIDIR. UYGULANABİLİR YASANIN İZİN VERDİĞİ ÖLÇÜDE, PROGRAM İÇİN GARANTİ YOKTUR. TELİF HAKKI SAHİPLERİNİN VE / VEYA DİĞER TARAFLARIN YAZILI OLMASINA YÖNELİK BAŞKA HİÇBİR ŞEKİLDE BELİRTİLEN VEYA BELİRLİ BİR AMACA UYGUNLUK İLE İLGİLİ ZIMNİ GARANTİLER DE DAHİL OLMAK ÜZERE ANCAK BUNLARLA SINIRLI OLMAMAK ÜZERE AÇIK VEYA ZIMNİ HİÇBİR GARANTİ OLMAKSIZIN “OLDUĞU GİBİ” SAĞLAMAKTADIR. PROGRAMIN KALİTESİ VE PERFORMANSI İLE İLGİLİ TÜM RİSK SİZE AİTTİR. PROGRAMIN HASARLI OLMASI DURUMUNDA, TÜM GEREKLİ SERVİS, ONARIM VEYA DÜZELTME MALİYETİNİ KABUL ETMİŞ OLURSUNUZ.</string>
     <string name="end_user_license_agreement_i_understand">BEN ANLADIM VE KABUL EDİYORUM</string>
     <string name="save">Kaydet</string>
-    <string name="nobtadapter">Bluetooth bağdaştırıcısı bulunamadı</string>
-    <string name="devicenotfound">Seçili aygıt bulunamadı</string>
-    <string name="connectionerror">Pompa bağlantı hatası</string>
-    <string name="danar_iob_label">IOB(Aktif insülin) pompa</string>
-    <string name="danar_dailyunits">Günlük birimleri</string>
-    <string name="pump_lastbolus_label">Son bolus</string>
-    <string name="danar_invalidinput">Geçersiz bilgi girişi</string>
-    <string name="danar_valuenotsetproperly">Değer düzgün ayarlanmamış</string>
     <string name="reloadprofile">Dosyayı yeniden yükle</string>
-    <string name="danar_viewprofile">Profili görüntüle</string>
-    <string name="enacted">Yürütüldü</string>
-    <string name="comment">Yorum</string>
-    <string name="success">Başarılı</string>
-    <string name="percent">Yüzde</string>
-    <string name="absolute">Mutlak</string>
-    <string name="canceltemp">Temp bazal iptal</string>
     <string name="smscommunicator">SMS Kommunikator</string>
-    <string name="waitingforpumpresult">Sonuç bekleniyor...</string>
     <string name="smscommunicator_allowednumbers">İzinli telefon numaraları</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Bolus %1$.2fU gönderilecek, kod ile cevap ver %2$s</string>
     <string name="smscommunicator_calibrationreplywithcode">Kalibrasyon %1$.2f gönderilecek, kod ile cevap ver %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus başarısız oldu</string>
     <string name="smscommunicator_remotecommandsallowed">SMS ile uzaktan komutlara izin ver</string>
-    <string name="glucosetype_finger">Parmak</string>
-    <string name="glucosetype_sensor">Sensör</string>
-    <string name="manual">Manuel</string>
     <string name="danarprofile">DanaR profil ayarları</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">İnsülin aktivitesinin süresi</string>
-    <string name="failedupdatebasalprofile">Bazal profiliniz güncellenemedi</string>
-    <string name="danar_historyreload">Yeniden yükle</string>
     <string name="uploading">Yüklüyor</string>
-    <string name="danar_ebolus">E bolus</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">hata</string>
-    <string name="danar_refill">doldur</string>
-    <string name="danar_basalhour">bazal saati</string>
-    <string name="danar_glucose">glikoz</string>
-    <string name="danar_carbohydrate">karbonhidrat</string>
-    <string name="danar_alarm">alarm</string>
-    <string name="danar_totaluploaded">Toplam %1$d kayıt yüklenildi</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">Alarmlar</string>
-    <string name="danar_history_basalhours">Basal Saatleri</string>
-    <string name="danar_history_bolus">Boluses</string>
-    <string name="danar_history_carbohydrates">Karbonhidratlar</string>
-    <string name="danar_history_dailyinsulin">Günlük insülin miktarı</string>
-    <string name="danar_history_errors">Hatalar</string>
-    <string name="danar_history_glucose">Glikoz</string>
-    <string name="danar_history_refill">Doldur</string>
-    <string name="danar_history_syspend">Askıya alınan</string>
-    <string name="danar_history_connectingfor">%1$d bağlanıyor</string>
-    <string name="danar_password_title">Pompa parolası</string>
-    <string name="wrongpumppassword">Hatalı parola!</string>
-    <string name="pumpbusy">Pompa meşgul</string>
-    <string name="overview_bolusprogress_delivered">Gönderildi</string>
-    <string name="overview_bolusprogress_stoped">Durdu</string>
     <string name="bolusstopped">Bolus durdu</string>
     <string name="bolusstopping">Bolus durdurma</string>
-    <string name="occlusion">Tıkanıklık</string>
-    <string name="overview_bolusprogress_stop">Dur</string>
-    <string name="overview_bolusprogress_stoppressed">DURDUR\'A BASTIĞINIZ</string>
-    <string name="waitingforpump">Pompa bekleniyor</string>
-    <string name="youareonallowedlimit">İzin verilen sınıra ulaştınız</string>
-    <string name="noprofileselected">Profil seçilmedi</string>
     <string name="smscommunicator_loophasbeendisabled">Döngü devre dışı bırakıldı</string>
     <string name="smscommunicator_loophasbeenenabled">Döngü etkinleştirildi</string>
     <string name="smscommunicator_loopisdisabled">Döngü devre dışı</string>
@@ -305,11 +202,9 @@
     <string name="mealbolus">Ögün</string>
     <string name="correctionbous">Düzeltme</string>
     <string name="actions">Eylemler</string>
-    <string name="androidaps_start">AndroidAPS başladı</string>
     <string name="ns_upload_only">Sadece Nightscout\'a yükle (devre dışı senkronizasyon)</string>
     <string name="ns_upload_only_summary">Sadece NS yükle. Etkili değil SGV üzerinde xDrip gibi bir yerel kaynağı seçili olmadıkça. NS-profilleri kullanılır iken profilleri üzerinde etkili değil.</string>
     <string name="pumpNotInitialized">Pompa başlatılmamış!</string>
-    <string name="pumpNotInitializedProfileNotSet">Pompa, başlatılmamış profili oluşturulmamış!</string>
     <string name="primefill">Hazırla/doldur</string>
     <string name="fillwarning">Lütfen miktarın infüzyon setinizin özelliklerine uygun olduğundan emin olun!</string>
     <string name="othersettings_title">Diğer</string>
@@ -317,8 +212,6 @@
     <string name="button1">Düğme 1</string>
     <string name="button2">Düğme 2</string>
     <string name="button3">Düğme 3</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="target_range">Hedef aralığı:</string>
     <string name="prefs_range_title">Görselleştirme Aralığı</string>
     <string name="prefs_range_summary">Genel bakış ve akıllı saat göstergesi için yüksek ve düşük değerler</string>
@@ -327,17 +220,7 @@
     <string name="wear">Wear</string>
     <string name="resend_all_data">Tüm verileri yeniden gönderin</string>
     <string name="open_settings_on_wear">Ayarları Wear\'da açın</string>
-    <string name="pumperror">Pompa hatası</string>
-    <string name="lowbattery">Düşük Pil</string>
-    <string name="pumpshutdown">Pompayı durdur</string>
-    <string name="batterydischarged">Pompa pili bitmiş</string>
-    <string name="danarkoreanpump">DanaR Kore</string>
     <string name="basal_rate">Bazal oranı:</string>
-    <string name="profile_set_failed">Bazal profil ayarı başarısız oldu</string>
-    <string name="profile_set_ok">Pompadaki Bazal profil güncellendi</string>
-    <string name="danar_disableeasymode">Pompada EasyUI modunu devre dışı bırak</string>
-    <string name="danar_enableextendedbolus">Pompada yayma bolusları etkinleştir</string>
-    <string name="danar_switchtouhmode">Pompayı Ü/d\'den Ü/s\'te değiştirin</string>
     <string name="basalvaluebelowminimum">Minimum değerin altında bazal değeri. Profil ayarlanmadı!</string>
     <string name="sms_actualbg">KŞ:</string>
     <string name="sms_lastbg">Son KŞ:</string>
@@ -345,7 +228,6 @@
     <string name="MM640g">MM640g</string>
     <string name="ongoingnotificaction">Sürekli Bildirim</string>
     <string name="old_data">ESKİ VERİ</string>
-    <string name="minago">%1$d dakika önce</string>
     <string name="sms_minago">%1$ddak önce</string>
     <string name="localprofile">Yerel profil</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -359,41 +241,22 @@
     <string name="eatingsoon">Yakında Öğün</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Eğzersiz</string>
-    <string name="danar_stats">DanaR istatistikleri</string>
-    <string name="danar_stats_cumulative_tdd">Toplamsal GTD (Günlük Toplam Doz)</string>
-    <string name="danar_stats_expweight">Katlanarak artan ağırlıklı GTD (Günlük Toplam Doz)</string>
-    <string name="danar_stats_basalrate">Bazal</string>
-    <string name="danar_stats_bolus">Bolus</string>
-    <string name="danar_stats_tdd">TDD</string>
-    <string name="danar_stats_date">Tarih</string>
-    <string name="danar_stats_ratio">Oran</string>
-    <string name="danar_stats_amount_days"># Gün</string>
-    <string name="danar_stats_weight">Kilo</string>
-    <string name="danar_stats_warning_Message">Hazırlama / doldurma için boluslar kullanılıyorsa muhtemelen yanlış!</string>
-    <string name="danar_stats_olddata_Message">Eski Veri Lütfen \"Yeniden Yükle\"ye Basın</string>
-    <string name="danar_stats_tbb">Günlük bazal miktarı</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">Başlatılıyor ...</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">DÖNGÜ</string>
     <string name="simpleprofile_shortname">SP</string>
     <string name="oaps_shortname">OAPS</string>
     <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">DANA</string>
     <string name="overview_shortname">HOME</string>
     <string name="virtualpump_shortname">VPOMP</string>
     <string name="profileviewer_shortname">NSPROFIL</string>
     <string name="treatments_shortname">TEDAVİ</string>
-    <string name="careportal_shortname">CP</string>
     <string name="objectives_shortname">OBJ</string>
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Kısa tab başlıkları</string>
     <string name="always_use_shortavg">Her zaman basit delta yerine kısa ortalama delta kullan</string>
     <string name="always_use_shortavg_summary">xDrip gibi filtre uygulanmamış kaynaklardan gelen veriler gürültülü olduğunda kullanışlıdır.</string>
-    <string name="advancedsettings_title">Gelişmiş Ayarlar</string>
-    <string name="danar_model">Model: %1$02X Protokol: %2$02X Kod: %3$02X</string>
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Varsayılan değer: 3 Bu OpenAPS için önemli bir güvenlik ayarıdır. Maksimum bazal Iob\'u, en büyük bazal oranınızın üç katı (varsayılan olarak) ile sınırlar. Genel olarak, bu değeri değiştirmemelisiniz. Ama \"3x max günlük, 4x şuan\" ın bir güvenlik ayarı olarak ne anlama geldiğini bilmelisiniz.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Varsayılan ayar: 4 Bu, OpenAPS güvenlik ayarlarının diğer yarısı ve \"3x max günlük, 4x akım\" güvenlik korumasının diğer yarısıdır. Bu, başlangıç değerinizin, pompada ayarlanan taban maksimum değerinizden bağımsız olarak, mevcut bazal seviyenin bu sayısından daha yüksek olamayacağı anlamına gelir. Bu, insanların, algoritmanın nasıl çalıştığını anlamadan temel çizgiyi büyük ölçüde artırarak kendilerini tehlikeli durumlarda bulmalarını engellemektir. Varsayılan ayar 4x\'dir; Çoğu insan bu ayarları asla değiştirmek zorunda kalmayacak, ancak bu güvenlik sınırına yakınsa diğer terapi ayarlarını ayarlamalıdırlar.</string>
@@ -411,18 +274,9 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smscommunicator_calibrationsent">Kalibrasyon gönderildi. Alma xDrip+\'ta etkinleştirilmelidir.</string>
     <string name="smscommunicator_calibrationfailed">xDrip+ kalibrasyonları almıyor</string>
     <string name="pumpsuspended">Pompa durduldu</string>
-    <string name="gettingpumpstatus">Pompa durumu alınıyor</string>
-    <string name="settingtempbasal">Geçici bazal ayarlanıyor</string>
-    <string name="stoppingtempbasal">Geçici bazal durduruluyor</string>
-    <string name="settingextendedbolus">Yayma bolus ayarlanıyor</string>
-    <string name="stoppingextendedbolus">Yayma bolus durduruluyor</string>
-    <string name="updatingbasalrates">Geçici bazal oranları güncelleniyor</string>
-    <string name="disconnecting">Bağlantı kesiliyor</string>
     <string name="executing">Yürütülüyor</string>
     <string name="virtualpump_settings">Sanal pompa ayarları</string>
     <string name="virtualpump_uploadstatus_title">Nightscout\'a durum aktar</string>
-    <string name="wrongpassword">Hatalı parola</string>
-    <string name="approachingdailylimit">Günlük İnsülin limitine yaklaşıldı</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCl</string>
     <string name="nsclientinternal_url">URL:</string>
@@ -446,7 +300,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="wear_detailedIOB_title">Ayrıntılı IOB göster</string>
     <string name="wear_detailedIOB_summary">Watchface üzerinde IOB\'yi bolus ve bazal IOB\'ye ayırın</string>
     <string name="nosuccess">başarısız - lütfen telefonu kontrol edin</string>
-    <string name="notavailable">Mevcut değil</string>
     <string name="patientage">Hasta yaşı</string>
     <string name="child">Çocuk</string>
     <string name="teenage">Ergen</string>
@@ -477,8 +330,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="superbolus">Superbolus</string>
     <string name="ns_logappstartedevent">Log uygulaması NightScout\'a başlar</string>
     <string name="restartingapp">Ayarları uygulamak için uygulamadan çıkılıyor.</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">İnsülin</string>
     <string name="configbuilder_insulin_description">Hangi tür insülin kullanıyorsunuz?</string>
     <string name="fastactinginsulin">Hızlı etkili İnsülin</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
@@ -488,9 +339,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="enablesuperbolus_summary">Kurulum sihirbazında superbolus işlevselliğini etkinleştirin. Gerçekten ne yaptığınızı öğrenene kadar etkinleştirmeyin. BİLİNÇSİZ KULLANILDIĞINDA AŞIRI DOS İNSÜLIN VERİLEBİLİR!</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="pump_lastconnection_label">Son bağlantı</string>
-    <string name="danar_bluetooth_status">Bluetooth durumu</string>
     <string name="nav_about">Hakkında</string>
     <string name="smscommunicator_missingsmspermission">SMS izni eksik</string>
     <string name="smscommunicator_missingphonestatepermission">Kayıp telefon durum yetkilendirmesi</string>
@@ -501,16 +349,11 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="wear_showbgi_summary">BGI\'yı durum satırına ekle</string>
     <string name="ns_noupload">NightScout\'a yükleme yok</string>
     <string name="ns_noupload_summary">NS\'ye gönderilen tüm veriler düştü. AAPS NS\'ye bağlandı, ancak NS\'de hiçbir değişiklik yapılmadı</string>
-    <string name="basal_step">Bazal adım</string>
-    <string name="bolus_step">Bolus adım</string>
     <string name="overview_extendedbolus_cancel_button">Yayma Bolusu iptal et</string>
     <string name="careportal_sensorage_label">Sensör yaşı</string>
     <string name="careportal_canulaage_label">Kanül yaşı</string>
     <string name="careportal_insulinage_label">İnsülin yaşı</string>
-    <string name="hours">saatler</string>
-    <string name="invalidprofile">Geçersiz profil!!!</string>
     <string name="careportal_pbage_label">Pompa pil yaşı</string>
-    <string name="careportal_pumpbatterychange">Pompa Akü Değişimi</string>
     <string name="ns_alarmoptions">Alarm türleri</string>
     <string name="nsalarm_urgenthigh">Aşırı yüksek</string>
     <string name="nsalarm_high">Yüksek</string>
@@ -557,7 +400,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="careportal_pump_label">PUMP</string>
     <string name="careportal_newnstreatment_duration_min_label">Süre [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">UAM etkinleştir</string>
     <string name="enablesmb">SMB (Super Micro Bolus) etkinleştir</string>
     <string name="enablesmb_summary">Daha hızlı bir etki için temp bazal yerine Super Micro Bolus kullanın</string>
@@ -569,22 +411,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="ultrarapid_oref">Hızlı Oref</string>
     <string name="dia_too_short">DIA %1$f çok kısa - bunun yerine %2$f kullanıyor!</string>
     <string name="activate_profile">Profili etkinleştir</string>
-    <string name="date">Tarih</string>
     <string name="invalid">GEÇERSİZ</string>
-    <string name="waitingforpairing">Pompada eşleştirme bekleniyor</string>
-    <string name="pairingok">Eşleştirme tamam</string>
-    <string name="pairingtimedout">Eşleştirme zaman aşımı</string>
-    <string name="danars_nodeviceavailable">Şu ana kadar hiçbir cihaz bulunamadı</string>
-    <string name="emptyreservoir">Rezervuar boş</string>
-    <string name="bloodsugarmeasurementalert">Kan şekeri ölçüm uyarısı</string>
-    <string name="remaininsulinalert">Kalan insülin düzeyi</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="selectedpump">Seçilen Pompa</string>
-    <string name="pairpump">Yeni Pompa eşleştir</string>
-    <string name="bolusspeed">Bolus hızı</string>
-    <string name="danar_setbasalstep001">Bazal adımı ayarla 0,01 Ü/s</string>
-    <string name="serialnumber">Seri numara</string>
     <string name="careportal_newnstreatment_percentage_label">Yüzdesi</string>
     <string name="careportal_newnstreatment_timeshift_label">Zaman kaydır</string>
     <string name="default_temptargets">Varsayılan Geçici hedefler</string>
@@ -594,31 +421,18 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="activity_target">eğzersiz hedefi</string>
     <string name="hypo_duration">hipo süresi</string>
     <string name="hypo_target">hipo hedefi</string>
-    <string name="danar_history_prime">Doldur</string>
-    <string name="gettingextendedbolusstatus">Yayma bolus durumu alınıyor</string>
-    <string name="gettingbolusstatus">Bolus durumu alınıyor</string>
-    <string name="gettingtempbasalstatus">Geçici bazal durumu alınıyor</string>
-    <string name="gettingpumpsettings">Pompa ayarları alınıyor</string>
-    <string name="gettingpumptime">Pompa durumu alınıyor</string>
     <string name="reuse">yeniden kullanım</string>
     <string name="wearcontrol_title">Saat tarafından kontrol</string>
     <string name="wearcontrol_summary">Tedavileri ve Geçici hedefleri saat tarafından girin.</string>
-    <string name="connectiontimedout">Bağlantı zaman aşımına uğradı</string>
     <string name="food">Yiyecek</string>
     <string name="shortgramm">gr</string>
-    <string name="shortminute">dk</string>
-    <string name="shorthour">sa</string>
     <string name="none"><![CDATA[<yok>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">Prot</string>
     <string name="shortfat">Yağ</string>
     <string name="active"><![CDATA[<Aktif>]]></string>
-    <string name="waitingforestimatedbolusend">Bolus bitimi için bekleniyor. Kalan %1$d san.</string>
-    <string name="processinghistory">Etkinlik işleniyor</string>
-    <string name="startingbolus">Bolus teslimatı başlatılıyor</string>
     <string name="executingrightnow">Komut şu anda çalıştırıldı</string>
-    <string name="pumpdrivercorrected">Pompa sürücüsü düzeltildi</string>
     <string name="pump_unreachable">Pompa ulaşılamıyor</string>
     <string name="missed_bg_readings">Kaçırılan KŞ Okumaları</string>
     <string name="raise_notifications_as_android_notifications">Uyarılar ve bildirimler için sistem bildirimlerini kullan</string>
@@ -628,14 +442,10 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="pump_unreachable_threshold">Kritik eşik pompaya erişilemiyor [min]</string>
     <string name="urgent_alarm">Acil önemli Alarm</string>
     <string name="info">INFO</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">BT Watchdog</string>
-    <string name="btwatchdog_summary">Pompa ile herhangi bir bağlantı sorunu yaşanıyorsa, Akıllı telefonunuzda Bluetooth bağlantısını kapatıp açın. Bu bluetooth bağlantı sorununu giderecektir.</string>
     <string name="dexcomg5_nsupload_title">KŞ verilerini NighScout\'a yükle</string>
     <string name="wear_detailed_delta_title">Ayrıntılı delta göster</string>
     <string name="wear_detailed_delta_summary">Bir ondalık basamakla deltayı göster</string>
     <string name="smbmaxminutes_summary">SMB\'yi sınırlamak için maksimum bazal dakika</string>
-    <string name="unsupportedfirmware">Desteklenmeyen pompa yazılımı</string>
     <string name="dexcomg5_xdripupload_title">XDrip+\'a KŞ verilerini gönder</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ içerisinde 640g/Eversense veri kaynağı seç</string>
     <string name="nsclientbg">Nightscout Client KŞ</string>
@@ -702,8 +512,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="enablesmbwithtemptarget_summary">Geçici hedef aktif olduğunda SMB\'yi etkinleştir (yakında yeme, egzersiz)</string>
     <string name="enablesmbwithhightemptarget">Yüksek geçici bazal oran hedefleriyle SMB\'yi etkinleştir</string>
     <string name="enablesmbwithhightemptarget_summary">Yüksek geçici bazal oran hedef etkin olduğunda SMB\'yi etkinleştirin (egzersiz)</string>
-    <string name="let_temp_basal_run">Geçici bazal oranını etkin burakın</string>
-    <string name="mute">Sesi kapat</string>
     <string name="overview_insulin_label">İnsülin</string>
     <string name="overview_carbs_label">Karbonhidrat</string>
     <string name="overview_buttons_selection">Tuşlar</string>
@@ -764,15 +572,10 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smbdisabledinpreferences">SMB tercihleri devre dışı</string>
     <string name="uamdisabledinpreferences">UAM (UnAnnounced Meals) tercihlerde devre dışı bırakıldı</string>
     <string name="uamdisabledoref1notselected">UAM (UnAnnounced Meals), Oref1 duyarlılık eklentisine bağlı olduğu için devre dışı bırakıldı</string>
-    <string name="limitingbasalratio">%2$s nedeniyle max bazal oranını %1$.2f Ü/s ile sınırlı</string>
-    <string name="pumplimit">pompa sınırı</string>
-    <string name="itmustbepositivevalue">pozitif bir değer olmalıdır</string>
     <string name="maxbasalmultiplier">max bazal çarpanı</string>
     <string name="maxdailybasalmultiplier">max günlük bazal çarpan</string>
     <string name="smb_frequency_exceeded">Son 3 dakika içerisinde bir bolus gönderildi, SMB (Super Micro Bolus) atlandı</string>
     <string name="basal_set_correctly">Bazal oranı doğru ayarlanmış</string>
-    <string name="limitingpercentrate">%2$s\'den dolayı max yüzde oranı %1$d%% ile sınırlandırılıyor</string>
-    <string name="limitingbolus">%2$s\'den dolayı bolus %1$.1f U ile sınırlandırılıyor</string>
     <string name="limitingextendedbolus">%2$s\'den dolayı yayım bolus %1$.1f U ile sınırlandırılıyor</string>
     <string name="limitingmaxiob">%2$s\'den dolayı max IOB\'yi (Aktif İnsülin) %1$.1f U ile sınırlandırılıyor</string>
     <string name="limitingcarbs">%2$s\'den dolayı karbonhidratlar %1$d g ile sınırlandırılıyor</string>
@@ -787,7 +590,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smbnotallowedinopenloopmode">Açık Döngü modunda Super Micro Bolus\'a izin verilmiyor</string>
     <string name="food_short">Yiyecek</string>
     <string name="reset">sıfırla</string>
-    <string name="waitingfortimesynchronization">Zaman senkronizasyonu bekleniyor (%1$d sn)</string>
     <string name="loopdisconnectedfor">Bağlantısı kesildi (%1$d m)</string>
     <string name="openapssmb_maxiob_title">OpenAPS tarafından aşılmayacak, maksimum toplam IOB(Aktif İnsülin)[U]</string>
     <string name="openapssmb_maxiob_summary">Bu değer OpenAPS bağlamında Max IOB (Aktif İnsülin) olarak adlandırılır\nOpenAPS, mevcut IOB bu değerden daha büyükse daha fazla insülin eklemez</string>
@@ -803,7 +605,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="nav_setupwizard">Kurulum Sihirbazı</string>
     <string name="setupwizard_finish">BİTTİ</string>
     <string name="setupwizard_language_prompt">Dilinizi seçin</string>
-    <string name="boluserrorcode">Soruldu: %1$.2fU Teslim edildi: %2$.2fU Hata kodu: %3$s</string>
     <string name="firstinsulinincrement">Birinci insülin artışı</string>
     <string name="secondinsulinincrement">İkinci insülin artışı</string>
     <string name="thirdinsulinincrement">Üçüncü insülin artışı</string>
@@ -826,7 +627,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="virtualpump_type">Sanal pompa tipi</string>
     <string name="virtualpump_definition">Pompa tanımı</string>
     <string name="virtualpump_pump_def">Bolus: Adım=%1$s\nYayım Bolus: [Step=%2$s, Süre=%3$smin-%4$sh]\nBasal: Adım=%5$s\nTBR: %6$s (ile %7$s), Süre=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">* Sanal pompada yalnızca belirli değerler, aralıklar değil ayrıntı olarak bazal/bolus desteklenmez.</string>
     <string name="ns_autobackfill_title">KŞ Otomatik doldur</string>
     <string name="wear_wizard_settings">Kurulum Sihirbazı Ayarları</string>
     <string name="wear_wizard_settings_summary">Sihirbaz sonucuna dahil edilen hesaplamalar:</string>
@@ -855,18 +655,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="request">İstek</string>
     <string name="insulinsourcesetup">İnsülin eklentisini yapılandır</string>
     <string name="exit">Çıkış</string>
-    <string name="danar_useroptions">Kullanıcı seçenekleri</string>
-    <string name="danar_timedisplay">Görüntü saat biçimi</string>
-    <string name="danar_buttonscroll">Düğme kaydırma</string>
-    <string name="danar_beep">Tuşa basıldığında bip sesi çıkar</string>
-    <string name="danar_pumpalarm">Alarm</string>
-    <string name="danar_pumpalarm_sound">Ses</string>
-    <string name="danar_pumpalarm_vibrate">Titreşim</string>
-    <string name="danar_pumpalarm_both">İkisi de</string>
-    <string name="danar_glucoseunits">Glikoz birimleri</string>
-    <string name="danar_saveuseroptions">Seçenekleri pompaya kaydet</string>
-    <string name="option_on">Aç</string>
-    <string name="option_off">Kapa</string>
     <string name="open_navigation">Navigasyonu aç</string>
     <string name="close_navigation">Navigasyonu kapat</string>
     <string name="nav_plugin_preferences">Eklenti tercihleri</string>
@@ -882,8 +670,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Geçici Hedefi < 100 duyarlılığı düşürün]]></string>
     <string name="combo_invalid_setup">Geçersiz pompa kurulumu, dokümanları kontrol edin ve Hızlı Bilgi menüsünün 360 konfigürasyon yazılımını kullanarak QUICK INFO olarak adlandırıldığını doğrulayın.</string>
     <string name="custom">Özel</string>
-    <string name="largetimedifftitle">Büyük zaman farkı</string>
-    <string name="largetimediff">Büyük zaman farkı:\n1,5 saatten fazla olduğunda pompada zaman kapalıdır.\nLütfen pompanın üzerindeki zamanı manuel olarak ayarlayın ve geçmişin pompadan okunmasından dolayı beklenmedik davranışlara neden olmadığından emin olun.\nMümkünse, zamanı değiştirmeden önce geçmişini pompadan çıkarın veya son yanlış geçmiş girişinden sonra bir DIA için Kapalı Döngü\'yü iptal edin, ancak o andan itibaren en az bir DIA\'yı devre dışı bırakın.</string>
     <string name="careportal_removestartedevents">Temiz AndroidAPS başladı</string>
     <string name="storedsettingsfound">Saklanan ayarlar bulundu</string>
     <string name="allow_hardware_pump_text">Dikkat: Eğer bir donanım pompasını etkinleştirir ve bağlarsanız, AndroidAPS, bazal ayarları profilden pompaya aktaracaktır ve pompada kayıtlı mevcut bazal oranlarının üzerine yazacaktır. AndroidAPS\'de doğru ayarların olduğundan emin olun. Emin değilseniz veya pompanızdaki bazal ayarların üzerine yazmak istemiyorsanız, iptal tuşuna basın ve daha sonra tekrar deneyin.</string>
@@ -907,17 +693,9 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="setupwizard_preferred_aps_mode">Tercih edilen APS modu</string>
     <string name="treatments_wizard_total_label">Toplam</string>
     <string name="calculation_short">Hesap</string>
-    <string name="handshaking">Handshaking</string>
     <string name="sendlogfiles">Bu günün log dosyalarını bu zamana göre geliştiricilere gönder. Beklenmedik bir durum.</string>
-    <string name="maxbolusviolation">Max bolus ihlali</string>
-    <string name="commanderror">Komut hatası</string>
-    <string name="speederror">Hız hatası</string>
-    <string name="insulinlimitviolation">İnsülin sınırı ihlali</string>
     <string name="loop_openmode_min_change">Minimum istek değişikliği [%]</string>
-    <string name="pairfirst">Lütfen pompanızı telefonunuzla bağlayın!</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_carbs_per_unit">g/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
     <!-- Pump Abstract -->
@@ -933,4 +711,13 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0ae0966cf2..b642819c55 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -12,12 +12,9 @@
     <string name="nav_resetdb">重置数据库</string>
     <string name="reset_db_confirm">你真的想重置数据库吗?</string>
     <string name="nav_exit">退出</string>
-    <string name="danar_useextended_title">使用&gt;200%%的扩展大剂量（extended boluses）</string>
-    <string name="danar_bt_name_title">DanaR 蓝牙设备</string>
     <string name="ns_sync_use_absolute_title">总是使用基础率的绝对值</string>
     <string name="alert_dialog_storage_permission_text">请重启你的手机或者从系统设置里重启AndroidAPS软件 \n 否则 Android APS将不会记录日志 (这对于跟踪和检查算法是否正确很重要)!</string>
     <string name="description_actions">一些快速访问常用功能的按钮</string>
-    <string name="description_careportal">输入高级日志条目</string>
     <string name="description_config_builder">用于配置活动插件</string>
     <string name="description_objectives">学习计划</string>
     <string name="description_food">显示 Nightscout 中定义的食物预设</string>
@@ -34,10 +31,6 @@
     <string name="description_profile_nightscout">提供您在 Nightscout 中已经定义的配置文件</string>
     <string name="description_profile_simple">仅使用一个时间段定义配置文件。</string>
     <string name="description_pump_combo">与Accu-Check Combo 胰岛素泵集成，需要安装ruffy软件</string>
-    <string name="description_pump_dana_r">与丹纳R泵集成</string>
-    <string name="description_pump_dana_r_korean">与韩版丹纳R泵集成</string>
-    <string name="description_pump_dana_r_v2">与 DanaRv2 泵集成</string>
-    <string name="description_pump_dana_rs">与丹纳RS泵集成</string>
     <string name="description_pump_mdi">与用于糖尿病治疗的多次每日注射的泵集成</string>
     <string name="description_pump_virtual">与我们还没有其驱动的泵集成（开环）</string>
     <string name="description_sensitivity_aaps">灵敏度的计算方式与 Oref0 相同, 但可以指定过去的时间范围。碳水化合物吸收最小值是根据参数选项里的碳水化合物吸收时间最大值计算得来的</string>
@@ -51,13 +44,6 @@
     <string name="description_wear">使用您的 WearOS 手表监视和控制 AndroidAPS。</string>
     <string name="description_xdrip_status_line">在 xDrip + 表盘上显示有关闭环的信息。</string>
     <string name="description_sms_communicator">远程控制 AndroidAPS 使用 SMS 短信命令。</string>
-    <string name="nsprofileview_units_label">单位</string>
-    <string name="nsprofileview_dia_label">DIA胰岛素作用持续时间</string>
-    <string name="nsprofileview_ic_label">IC碳水系数</string>
-    <string name="nsprofileview_isf_label">ISF胰岛素敏感系数</string>
-    <string name="nsprofileview_basal_label">基础率</string>
-    <string name="nsprofileview_target_label">血糖控制目标值</string>
-    <string name="noprofileset">没有设置配置文件</string>
     <string name="treatments_insulin_label_string">胰岛素:</string>
     <string name="treatments_carbs_label_string">碳水化合物:</string>
     <string name="treatments_iob_label_string">IOB活性胰岛素:</string>
@@ -73,15 +59,9 @@
     <string name="treatments_wizard_tt_label">临时目标</string>
     <string name="treatments_wizard_carbs_label">碳水化合物</string>
     <string name="treatments_wizard_correction_label">矫正值</string>
-    <string name="insulin_unit_shortname">U</string>
     <string name="treatments_wizard_bolusiob_label">大剂量活性胰岛素IOB</string>
     <string name="openapsma_run">现在运行</string>
     <string name="vitualpump_label">虚拟泵</string>
-    <string name="pump_basebasalrate_label">基础率</string>
-    <string name="pump_tempbasal_label">临时基础率</string>
-    <string name="virtualpump_extendedbolus_label">扩展大剂量(方波)</string>
-    <string name="pump_battery_label">电池</string>
-    <string name="pump_reservoir_label">储药器</string>
     <string name="virtualpump_resultok">确定</string>
     <string name="openapsma_lastrun_label">上一次运行</string>
     <string name="openapsma_inputparameters_label">输入参数</string>
@@ -92,16 +72,11 @@
     <string name="openapsma_mealdata_label">膳食数据</string>
     <string name="result">结果</string>
     <string name="openapsma_noglucosedata">没有可用的血糖数据</string>
-    <string name="nochangerequested">不需要改变</string>
     <string name="openapsma_request_label">请求</string>
-    <string name="rate">比率</string>
-    <string name="duration">持续时间</string>
-    <string name="reason">原因</string>
     <string name="glucose">血糖</string>
     <string name="delta">增量</string>
     <string name="sms_delta">增量:</string>
     <string name="configbuilder">配置生成器</string>
-    <string name="objectives">目标</string>
     <string name="overview">首页概览</string>
     <string name="nsprofile">NS 配置文件</string>
     <string name="simpleprofile">简单配置文件</string>
@@ -119,7 +94,6 @@
     <string name="configbuilder_general">一般</string>
     <string name="configbuilder_general_description">这些是一些一般的插件, 你可能会觉得有用。</string>
     <string name="configbuilder_constraints_description">应用了哪些约束条件？</string>
-    <string name="days">天</string>
     <string name="constraints">约束条件</string>
     <string name="loop">闭环</string>
     <string name="configbuilder_loop">闭环</string>
@@ -135,7 +109,6 @@
     <string name="openapsma_disabled">插件已禁用</string>
     <string name="constraints_violation">违反约束条件</string>
     <string name="treatmentdeliveryerror">大剂量输注错误</string>
-    <string name="tempbasaldeliveryerror">临时基础输注错误</string>
     <string name="setbasalquestion">接受新的临时基础率</string>
     <string name="overview_treatment_label">治疗</string>
     <string name="overview_calculator_label">计算器</string>
@@ -145,7 +118,6 @@
     <string name="sms_bolus">大剂量:</string>
     <string name="basal">基础率</string>
     <string name="sms_basal">基础率:</string>
-    <string name="carbs">碳水化合物</string>
     <string name="changeyourinput">更改您的输入!</string>
     <string name="configbuilder_bgsource">血糖来源</string>
     <string name="configbuilder_bgsource_description">AndroidAPS 从何处获取数据？</string>
@@ -162,24 +134,6 @@
     <string name="treatments_wizard_basaliob_label">基础 IOB</string>
     <string name="bolusconstraintapplied">大剂量约束条件应用了</string>
     <string name="carbsconstraintapplied">碳水化合物约束条件应用了</string>
-    <string name="careportal_bgcheck">指血检查</string>
-    <string name="careportal_announcement">通告</string>
-    <string name="careportal_note">备注</string>
-    <string name="careportal_question">问题</string>
-    <string name="careportal_exercise">运动</string>
-    <string name="careportal_pumpsitechange">泵更换管路</string>
-    <string name="careportal_cgmsensorinsert">CGM 传感器插入</string>
-    <string name="careportal_cgmsensorstart">CGM 传感器启动</string>
-    <string name="careportal_insulincartridgechange">更换储药器</string>
-    <string name="careportal_snackbolus">零食大剂量</string>
-    <string name="careportal_mealbolus">餐时大剂量</string>
-    <string name="careportal_correctionbolus">矫正大剂量</string>
-    <string name="careportal_combobolus">Combo组合大剂量</string>
-    <string name="careportal_tempbasalstart">临时基础率开始</string>
-    <string name="careportal_tempbasalend">临时基础率结束</string>
-    <string name="careportal_carbscorrection">碳水化合物校正</string>
-    <string name="careportal_openapsoffline">OpenAPS 离线</string>
-    <string name="careportal_newnstreatment_eventtype">事件类型</string>
     <string name="careportal_newnstreatment_other">其他</string>
     <string name="careportal_newnstreatment_meter">血糖仪</string>
     <string name="careportal_newnstreatment_sensor">传感器</string>
@@ -209,34 +163,12 @@
     <string name="openapsma_maxbasal_summary">这个值在 OpenAPS被称为最大基础率</string>
     <string name="openapsma_maxiob_title">OpenAPS通过基础率可以输注的IOB活性胰岛素的最大值[U]</string>
     <string name="openapsma_maxiob_summary">这个值在OpenAPS中被成为最大IOB\n这是APS单次可以输注的胰岛素的最大值[U]</string>
-    <string name="dismiss">忽略</string>
-    <string name="danarpump">DanaR</string>
-    <string name="connecting">正在连接</string>
-    <string name="connected">已连接</string>
-    <string name="disconnected">已断开连接</string>
     <string name="end_user_license_agreement">最终用户许可协议</string>
     <string name="end_user_license_agreement_text">不得用于制定医疗决定。在适用法律允许的范围内，对该程序不作任何保证。除非另有书面授权的版权所有者和/或其他方均按原样提供程序，不附带明示或暗示的任何形式的担保，包括但不限于对适销性和适用于特定用途的默示担保。对您的程序的质量和性能的完整风险。如果程序存在缺陷，您应承担所有必要维修，修理或更正的代价.</string>
     <string name="end_user_license_agreement_i_understand">我理解并同意</string>
     <string name="save">保存</string>
-    <string name="nobtadapter">未找到蓝牙适配器</string>
-    <string name="devicenotfound">找不到所选设备</string>
-    <string name="connectionerror">泵连接错误</string>
-    <string name="danar_iob_label">泵 IOB</string>
-    <string name="danar_dailyunits">每日单位数</string>
-    <string name="pump_lastbolus_label">上次大剂量</string>
-    <string name="hoursago">%1$.1f小时前</string>
-    <string name="danar_invalidinput">无效的输入数据</string>
-    <string name="danar_valuenotsetproperly">数值设定的不正确</string>
     <string name="reloadprofile">重新加载配置文件</string>
-    <string name="danar_viewprofile">查看配置文件</string>
-    <string name="enacted">制定</string>
-    <string name="comment">评论</string>
-    <string name="success">成功</string>
-    <string name="percent">百分比</string>
-    <string name="absolute">绝对值</string>
-    <string name="canceltemp">取消临时基础率</string>
     <string name="smscommunicator">SMS短信通讯器</string>
-    <string name="waitingforpumpresult">正在等待结果</string>
     <string name="smscommunicator_allowednumbers">允许的手机号码</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s</string>
@@ -245,52 +177,13 @@
     <string name="bolusdelivered">已经成功输注大剂量%1$.2fU</string>
     <string name="bolusrequested">将要输注 %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">已经成功输注大剂量%1$.2fU</string>
-    <string name="bolusdelivering">正在输注 %1$.2fU</string>
     <string name="smscommunicator_remotecommandsallowed">通过SMS短信允许远程命令</string>
-    <string name="glucosetype_finger">手指</string>
-    <string name="glucosetype_sensor">传感器</string>
-    <string name="manual">手动</string>
     <string name="danarprofile">DanaR 配置文件设置</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">胰岛素活性持续时间</string>
-    <string name="failedupdatebasalprofile">更新基础率配置文件失败</string>
-    <string name="danar_historyreload">重新加载</string>
     <string name="uploading">正在上传···</string>
-    <string name="danar_ebolus">扩展大剂量</string>
-    <string name="danar_dsbolus">DS bolus</string>
-    <string name="danar_debolus">DE bolus</string>
-    <string name="danar_error">错误</string>
-    <string name="danar_refill">充盈</string>
-    <string name="danar_basalhour">基础率 小时</string>
-    <string name="danar_glucose">血糖</string>
-    <string name="danar_carbohydrate">碳水化合物</string>
-    <string name="danar_alarm">报警</string>
-    <string name="danar_totaluploaded">总计上传了%1$d个记录</string>
-    <string name="danar_sbolus">S bolus</string>
-    <string name="danar_history_alarm">报警</string>
-    <string name="danar_history_basalhours">基础率 小时</string>
-    <string name="danar_history_bolus">大剂量</string>
-    <string name="danar_history_carbohydrates">碳水化合物</string>
-    <string name="danar_history_dailyinsulin">每日胰岛素用量</string>
-    <string name="danar_history_errors">错误</string>
-    <string name="danar_history_glucose">血糖</string>
-    <string name="danar_history_refill">充盈</string>
-    <string name="danar_history_syspend">暂停</string>
-    <string name="danar_history_connectingfor">正在连接 %1$d s</string>
-    <string name="danar_password_title">泵密码</string>
-    <string name="wrongpumppassword">错误的泵密码</string>
-    <string name="pumpbusy">胰岛素泵忙碌中</string>
-    <string name="overview_bolusprogress_delivered">已输注</string>
-    <string name="overview_bolusprogress_stoped">已停止</string>
     <string name="bolusstopped">大剂量停止了</string>
     <string name="bolusstopping">正在停止大剂量</string>
-    <string name="occlusion">堵管</string>
-    <string name="overview_bolusprogress_stop">停止</string>
-    <string name="overview_bolusprogress_stoppressed">停止键按下了</string>
-    <string name="waitingforpump">正在等待泵</string>
-    <string name="overview_bolusprogress_goingtodeliver">将要输注 %1$.2fU</string>
-    <string name="youareonallowedlimit">你达到了允许的极限</string>
-    <string name="noprofileselected">没有选定配置文件</string>
     <string name="smscommunicator_loophasbeendisabled">闭环已经被禁用</string>
     <string name="smscommunicator_loophasbeenenabled">闭环已经被启用</string>
     <string name="smscommunicator_loopisdisabled">闭环被禁用</string>
@@ -327,11 +220,9 @@
     <string name="mealbolus">饮食</string>
     <string name="correctionbous">矫正</string>
     <string name="actions">手动操作</string>
-    <string name="androidaps_start">AndroidAPS 启动了</string>
     <string name="ns_upload_only">只上传到NS服务器 (禁用同步)</string>
     <string name="ns_upload_only_summary">只上传给NS服务器，对SGV没有影响除非选择了本地血糖来源，例如 xDrip. 对配置文件没有影响当选择NS-配置文件时.</string>
     <string name="pumpNotInitialized">泵未初始化!</string>
-    <string name="pumpNotInitializedProfileNotSet">泵未初始化, 配置文件未设置!</string>
     <string name="primefill">充盈</string>
     <string name="fillwarning">请确保数量和输液器里的药量匹配</string>
     <string name="othersettings_title">其他</string>
@@ -339,8 +230,6 @@
     <string name="button1">按钮1</string>
     <string name="button2">按钮2</string>
     <string name="button3">按钮3</string>
-    <string name="mgdl">mg/dl</string>
-    <string name="mmol">mmol/l</string>
     <string name="target_range">目标范围:</string>
     <string name="prefs_range_title">可视化范围</string>
     <string name="prefs_range_summary">在智能手表上的图表上的高值和低值标记</string>
@@ -349,17 +238,7 @@
     <string name="wear">手表</string>
     <string name="resend_all_data">重新发送所有数据</string>
     <string name="open_settings_on_wear">在手表上打开设置</string>
-    <string name="pumperror">泵错误</string>
-    <string name="lowbattery">电池电量低</string>
-    <string name="pumpshutdown">泵关机</string>
-    <string name="batterydischarged">泵电池被拆卸了</string>
-    <string name="danarkoreanpump">DanaR 韩版</string>
     <string name="basal_rate">基础率比值：</string>
-    <string name="profile_set_failed">设定基础率配置文件失败</string>
-    <string name="profile_set_ok">泵基础率配置文件更新了</string>
-    <string name="danar_disableeasymode">禁用泵中的 EasyUI 模式</string>
-    <string name="danar_enableextendedbolus">在泵上启用扩展大剂量</string>
-    <string name="danar_switchtouhmode">在泵上更改模式，从U/d 改为 U/h</string>
     <string name="basalvaluebelowminimum">基础率值低于泵支持的最小值。配置文件没有设定</string>
     <string name="sms_actualbg">血糖:</string>
     <string name="sms_lastbg">上次血糖：</string>
@@ -367,7 +246,6 @@
     <string name="MM640g">美敦力640g</string>
     <string name="ongoingnotificaction">持续的的通知</string>
     <string name="old_data">旧数据</string>
-    <string name="minago">%1$d 分钟前</string>
     <string name="sms_minago">%1$d分钟前</string>
     <string name="localprofile">本地配置文件</string>
     <string name="openapsama">OpenAPS AMA</string>
@@ -382,41 +260,22 @@
     <string name="eatingsoon">很快吃饭</string>
     <string name="hypo">低</string>
     <string name="activity">活动</string>
-    <string name="danar_stats">DanaR 统计</string>
-    <string name="danar_stats_cumulative_tdd">累积的每日胰岛素输注的总量</string>
-    <string name="danar_stats_expweight">日输注总量指数加权</string>
-    <string name="danar_stats_basalrate">基础率</string>
-    <string name="danar_stats_bolus">大剂量</string>
-    <string name="danar_stats_tdd">日胰岛素总量</string>
-    <string name="danar_stats_date">日期</string>
-    <string name="danar_stats_ratio">比值</string>
-    <string name="danar_stats_amount_days"># 天</string>
-    <string name="danar_stats_weight">权重</string>
-    <string name="danar_stats_warning_Message">如果使用大剂量来充盈排气的话，活性胰岛素的量显示的可能不准确</string>
-    <string name="danar_stats_olddata_Message">旧数据请按 \"重新加载\"</string>
-    <string name="danar_stats_tbb">基础率总量</string>
-    <string name="danar_stats_tbb2">TBB * 2</string>
-    <string name="initializing">正在初始化</string>
     <string name="actions_shortname">操作</string>
     <string name="configbuilder_shortname">配置</string>
     <string name="loop_shortname">闭环</string>
     <string name="simpleprofile_shortname">本地</string>
     <string name="oaps_shortname">OpenAPS</string>
     <string name="localprofile_shortname">本地配置文件</string>
-    <string name="danarpump_shortname">丹纳泵</string>
     <string name="overview_shortname">主页</string>
     <string name="virtualpump_shortname">虚拟泵</string>
     <string name="profileviewer_shortname">NS配置文件</string>
     <string name="treatments_shortname">治疗</string>
-    <string name="careportal_shortname">记录</string>
     <string name="objectives_shortname">目标</string>
     <string name="wear_shortname">手表</string>
     <string name="smscommunicator_shortname">手机SMS</string>
     <string name="short_tabtitles">标题名称缩写</string>
     <string name="always_use_shortavg">总是使用短时间的平均增量代替简单增量</string>
     <string name="always_use_shortavg_summary">当数据来自没有过滤的源头时，例如 xDrip 偶尔出现噪音数据.</string>
-    <string name="advancedsettings_title">高级设置</string>
-    <string name="danar_model">型号: %1$02X 协议: %2$02X 代码: %3$02X</string>
     <string name="profile">配置文件</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">默认值: 3 这是一个关键的 OpenAPS 安全阀值。这是限制你的闭环可以最大扩张3倍的日最大基础率。你可能不需要改变这个值 但你应该这个值的含义。日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置,</string>
@@ -435,18 +294,9 @@
     <string name="smscommunicator_calibrationsent">校准值发送了，必须在xDrip开启允许通过其他app使用它的校准功能</string>
     <string name="smscommunicator_calibrationfailed">xDrip 没有收到校准</string>
     <string name="pumpsuspended">泵暂停了</string>
-    <string name="gettingpumpstatus">正在获取泵的状态</string>
-    <string name="settingtempbasal">正在设定临时基础率</string>
-    <string name="stoppingtempbasal">正在停止临时基础率</string>
-    <string name="settingextendedbolus">正在设定扩展大剂量</string>
-    <string name="stoppingextendedbolus">正在停止扩展大剂量</string>
-    <string name="updatingbasalrates">正在更新基础率</string>
-    <string name="disconnecting">正在断开连接</string>
     <string name="executing">正在执行</string>
     <string name="virtualpump_settings">虚拟泵设置</string>
     <string name="virtualpump_uploadstatus_title">将状态上传到 NS</string>
-    <string name="wrongpassword">密码错误</string>
-    <string name="approachingdailylimit">接近每日胰岛素的极限值</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCIient</string>
     <string name="nsclientinternal_url">URL网址：</string>
@@ -470,7 +320,6 @@
     <string name="wear_detailedIOB_title">显示详细 IOB</string>
     <string name="wear_detailedIOB_summary">在手表的表盘上分别显示大剂量IOB和基础IOB</string>
     <string name="nosuccess">未成功-请检查手机</string>
-    <string name="notavailable">不可用</string>
     <string name="patientage">病人年龄</string>
     <string name="child">儿童</string>
     <string name="teenage">青少年</string>
@@ -501,8 +350,6 @@
     <string name="superbolus">超级大剂量Superbolus</string>
     <string name="ns_logappstartedevent">记录app启动事件到NS服务器</string>
     <string name="restartingapp">正在退出应用程序以应用设置。</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="configbuilder_insulin">胰岛素</string>
     <string name="configbuilder_insulin_description">你使用哪种类型的胰岛素？</string>
     <string name="fastactinginsulin">速效胰岛素</string>
     <string name="fastactinginsulincomment">诺和锐, 门冬, 优泌乐</string>
@@ -515,9 +362,6 @@
     <string name="statuslights_res_critical">储药器药量低于阈值[U] 严重警告</string>
     <string name="iob">IOB活性胰岛素</string>
     <string name="cob">COB活性碳水</string>
-    <string name="virtualpump_firmware_label">固件</string>
-    <string name="pump_lastconnection_label">上次连接</string>
-    <string name="danar_bluetooth_status">蓝牙状态</string>
     <string name="nav_about">关于</string>
     <string name="smscommunicator_missingsmspermission">缺少 SMS 短信权限</string>
     <string name="smscommunicator_missingphonestatepermission">缺少手机状态权限</string>
@@ -528,16 +372,11 @@
     <string name="wear_showbgi_summary">添加血糖线到状态线</string>
     <string name="ns_noupload">没有上传到NS服务器</string>
     <string name="ns_noupload_summary">所有发送到 NS 的数据都将被丢弃。AAPS 已连接到 NS, 但 NS中没有进行任何更改</string>
-    <string name="basal_step">基础率步值</string>
-    <string name="bolus_step">大剂量步值</string>
     <string name="overview_extendedbolus_cancel_button">取消扩展大剂量</string>
     <string name="careportal_sensorage_label">传感器使用时间</string>
     <string name="careportal_canulaage_label">管路使用时间</string>
     <string name="careportal_insulinage_label">胰岛素使用时间</string>
-    <string name="hours">小时</string>
-    <string name="invalidprofile">无效的配置文件!!!</string>
     <string name="careportal_pbage_label">泵电池使用时间</string>
-    <string name="careportal_pumpbatterychange">更换泵电池</string>
     <string name="ns_alarmoptions">报警选项</string>
     <string name="nsalarm_urgenthigh">紧急高</string>
     <string name="nsalarm_high">高</string>
@@ -561,7 +400,6 @@
     <string name="absorptionsettings_title">食物吸收设置</string>
     <string name="absorption_maxtime_title">膳食最大吸收时间 [h]</string>
     <string name="absorption_maxtime_summary">预计膳食中所有的碳水化合物被吸收的时间，以小时为单位</string>
-    <string name="danar_visualizeextendedaspercentage_title">用百分比的形式显示扩展 %%</string>
     <string name="careportal_sensorage_label_short">探头AGE</string>
     <string name="careportal_insulinage_label_short">胰岛素AGE</string>
     <string name="careportal_canulaage_label_short">管路AGE</string>
@@ -585,7 +423,6 @@
     <string name="careportal_pump_label">泵</string>
     <string name="careportal_newnstreatment_duration_min_label">持续时间 [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
-    <string name="smb_shortname">SMB</string>
     <string name="enableuam">启用 UAM</string>
     <string name="enablesmb">启用微型大剂量</string>
     <string name="enablesmb_summary">使用微型大剂量代替使用临时基础率，更快的干预</string>
@@ -597,22 +434,7 @@
     <string name="ultrarapid_oref">超速效 Oref</string>
     <string name="dia_too_short">DIA of %1$f 太短了，请使用 %2$f 代替</string>
     <string name="activate_profile">激活配置文件</string>
-    <string name="date">日期</string>
     <string name="invalid">无效</string>
-    <string name="waitingforpairing">等待泵配对</string>
-    <string name="pairingok">配对成功</string>
-    <string name="pairingtimedout">配对超时</string>
-    <string name="danars_nodeviceavailable">迄今未找到任何设备</string>
-    <string name="emptyreservoir">储药器空了</string>
-    <string name="bloodsugarmeasurementalert">血糖测量警报</string>
-    <string name="remaininsulinalert">剩余胰岛素数量</string>
-    <string name="danarspump">丹纳RS</string>
-    <string name="danarspump_shortname">丹纳泵</string>
-    <string name="selectedpump">已选择的泵</string>
-    <string name="pairpump">配对新的泵</string>
-    <string name="bolusspeed">大剂量输注速度</string>
-    <string name="danar_setbasalstep001">将基础率步值设定为 0.01 U/小时</string>
-    <string name="serialnumber">序列号</string>
     <string name="careportal_newnstreatment_percentage_label">百分比</string>
     <string name="careportal_newnstreatment_timeshift_label">时间偏移</string>
     <string name="default_temptargets">默认的临时目标</string>
@@ -622,31 +444,18 @@
     <string name="activity_target">运动临时目标</string>
     <string name="hypo_duration">持续时间短</string>
     <string name="hypo_target">低目标</string>
-    <string name="danar_history_prime">充盈</string>
-    <string name="gettingextendedbolusstatus">正在获取扩展大剂量状态</string>
-    <string name="gettingbolusstatus">正在获取大剂量状态</string>
-    <string name="gettingtempbasalstatus">正在获取临时基础率状态</string>
-    <string name="gettingpumpsettings">正在获取泵设置</string>
-    <string name="gettingpumptime">正在获取泵时间</string>
     <string name="reuse">重复用</string>
     <string name="wearcontrol_title">从手表上控制</string>
     <string name="wearcontrol_summary">设置临时目标并从手表中进行治疗操作。</string>
-    <string name="connectiontimedout">连接超时</string>
     <string name="food">食物</string>
     <string name="shortgramm">克</string>
-    <string name="shortminute">分</string>
-    <string name="shorthour">小时</string>
     <string name="none"><![CDATA[<none>]]></string>
     <string name="shortkilojoul">kJ</string>
     <string name="shortenergy">En</string>
     <string name="shortprotein">蛋白质</string>
     <string name="shortfat">脂肪</string>
     <string name="active"><![CDATA[<Active>]]></string>
-    <string name="waitingforestimatedbolusend">正在等待大剂量输注结束。剩余时间 %1$d 秒。</string>
-    <string name="processinghistory">正在处理事件</string>
-    <string name="startingbolus">开始大剂量输注</string>
     <string name="executingrightnow">现在命令被执行了</string>
-    <string name="pumpdrivercorrected">泵驱动程序已更正</string>
     <string name="pump_unreachable">泵无法连接</string>
     <string name="missed_bg_readings">血糖读数丢失</string>
     <string name="raise_notifications_as_android_notifications">对警报和通知使用系统通知音</string>
@@ -656,21 +465,15 @@
     <string name="pump_unreachable_threshold">泵无法连接的时间阈值[min]</string>
     <string name="urgent_alarm">紧急报警</string>
     <string name="info">信息</string>
-    <string name="bluetooth">蓝牙</string>
-    <string name="btwatchdog_title">蓝牙看门狗</string>
-    <string name="btwatchdog_summary">如果没有连接到泵，关闭手机的蓝牙一秒钟再自动打开。这在一些蓝牙堆栈僵死的手机上是有帮助的,</string>
     <string name="eversense">Everyang App (补丁)</string>
     <string name="dexcomg5_nsupload_title">将 数据血糖数据上传到 NS服务器</string>
     <string name="bgsource_upload">血糖上传设置</string>
     <string name="wear_detailed_delta_title">显示详细的增量</string>
     <string name="wear_detailed_delta_summary">增量再多显示一个小数位</string>
     <string name="smbmaxminutes_summary">基础率的最大分钟数限制SMB微型大剂量到</string>
-    <string name="unsupportedfirmware">不支持的泵固件</string>
     <string name="dexcomg5_xdripupload_title">将血糖数据发送到 xDrip +</string>
     <string name="dexcomg5_xdripupload_summary">在 xDrip + 选择640ｇ/Eversense 数据源</string>
     <string name="nsclientbg">NSClient 血糖</string>
-    <string name="minimalbasalvaluereplaced">基础率值被泵支持的最小值: %1$s 替换了</string>
-    <string name="maximumbasalvaluereplaced">基础率值被泵支持的最大值:%1$s 替换了</string>
     <string name="overview_editquickwizard_usebg">血糖计算</string>
     <string name="overview_editquickwizard_usebolusiob">大剂量IOB (活性胰岛素) 计算</string>
     <string name="overview_editquickwizard_usebasaliob">基础率IOB (活性胰岛素) 计算</string>
@@ -688,8 +491,6 @@
     <string name="closedmodeenabled">闭环模式启用了</string>
     <string name="maxiobset">合理地设置最大 IOB</string>
     <string name="hasbgdata">所选的血糖值来源的血糖是可用的</string>
-    <string name="basalprofilenotaligned">基础率值与小时不一致:%1$s</string>
-    <string name="zerovalueinprofile">无效的配置文件：%1$s</string>
     <string name="combo_programming_bolus">正在调用泵上的大剂量输注程序</string>
     <string name="combo_refresh">刷新</string>
     <string name="combo_pump_state_label">状态</string>
@@ -738,8 +539,6 @@
     <string name="enablesmbwithtemptarget_summary">当临时目标处于活动状态时启用 SMB (很快吃饭, 运动)</string>
     <string name="enablesmbwithhightemptarget">启用具有高临时目标的 SMB</string>
     <string name="enablesmbwithhightemptarget_summary">当临时目标处于活动状态（锻炼）时启用SMB</string>
-    <string name="let_temp_basal_run">让临时基础率运行</string>
-    <string name="mute">静音</string>
     <string name="overview_insulin_label">胰岛素</string>
     <string name="overview_carbs_label">碳水</string>
     <string name="overview_buttons_selection">按钮</string>
@@ -803,15 +602,10 @@
     <string name="smbdisabledinpreferences">SMB微型大剂量在参数选项里被禁用了</string>
     <string name="uamdisabledinpreferences">UAM 在参数选项中被禁用了</string>
     <string name="uamdisabledoref1notselected">UAM被禁用, 因为它依赖于 Oref1 敏感都插件</string>
-    <string name="limitingbasalratio">最大基础率被限定为 %1$.2f U/h 由于 %2$s</string>
-    <string name="pumplimit">泵限制</string>
-    <string name="itmustbepositivevalue">它必须是正数</string>
     <string name="maxbasalmultiplier">最大基础率倍数</string>
     <string name="maxdailybasalmultiplier">最大日基础率倍数</string>
     <string name="smb_frequency_exceeded">在最近3分钟内输注了大剂量，正在忽略SMB微型大剂量</string>
     <string name="basal_set_correctly">正确地设置基础率</string>
-    <string name="limitingpercentrate">由于 %2$s, 将最大百分比限制为 %1$d%%</string>
-    <string name="limitingbolus">由于 %2$s, 将大剂量限制为 %1$.1f U</string>
     <string name="limitingextendedbolus">由于 %2$s, 将扩展大剂量限制为 %1$.1f U</string>
     <string name="limitingmaxiob">由于 %2$s, 将最大 IOB(活性胰岛素) 限制为 %1$.1f U</string>
     <string name="limitingcarbs">由于 %2$s, 将碳水化合物限制为 %1$d 克</string>
@@ -826,7 +620,6 @@
     <string name="smbnotallowedinopenloopmode">在开环模式下不允许使用SMB－微型大剂量</string>
     <string name="food_short">食物</string>
     <string name="reset">重置</string>
-    <string name="waitingfortimesynchronization">正在等待时间同步 (%1$d 秒)</string>
     <string name="loopdisconnectedfor">已断开连接 (%1$d 分)</string>
     <string name="openapssmb_maxiob_title">OpenAPS的IOB活性胰岛素总数的最大值不能超过[U]</string>
     <string name="openapssmb_maxiob_summary">该值在OpenAPS中称为最大 IOB\n如果当前IOB大于此值，则OpenAPS不会输注更多胰岛素</string>
@@ -842,7 +635,6 @@
     <string name="nav_setupwizard">设置向导</string>
     <string name="setupwizard_finish">完成</string>
     <string name="setupwizard_language_prompt">选择你的语言</string>
-    <string name="boluserrorcode">已请求: %1$.2fU 已输注: %2$.2fU 错误代码: %3$s</string>
     <string name="firstinsulinincrement">第一胰岛素增量</string>
     <string name="secondinsulinincrement">第二胰岛素增量</string>
     <string name="thirdinsulinincrement">第三胰岛素增量</string>
@@ -865,7 +657,6 @@
     <string name="virtualpump_type">虚拟泵类型</string>
     <string name="virtualpump_definition">泵定义</string>
     <string name="virtualpump_pump_def">大剂量: Step=%1$s\n扩展大剂量: [Step=%2$s, 持续时间=%3$smin-%4$sh]\n基础率: Step=%5$s\nTBR临时基础率: %6$s (by %7$s), 持续时间=%8$smin-%9$sh\n%10$s</string>
-    <string name="virtualpump_pump_def_extended_note">仅支持离散值，不支持范围值</string>
     <string name="ns_autobackfill_title">Autobackfill 血糖</string>
     <string name="wear_wizard_settings">向导设置</string>
     <string name="wear_wizard_settings_summary">包含在向导中的计算结果：</string>
@@ -894,18 +685,6 @@
     <string name="request">请求</string>
     <string name="insulinsourcesetup">配置胰岛素插件</string>
     <string name="exit">退出</string>
-    <string name="danar_useroptions">用户选项</string>
-    <string name="danar_timedisplay">时间显示的格式</string>
-    <string name="danar_buttonscroll">按钮滚动</string>
-    <string name="danar_beep">按下按钮时发出提示音</string>
-    <string name="danar_pumpalarm">报警</string>
-    <string name="danar_pumpalarm_sound">声音</string>
-    <string name="danar_pumpalarm_vibrate">振动</string>
-    <string name="danar_pumpalarm_both">两者都</string>
-    <string name="danar_glucoseunits">血糖单位</string>
-    <string name="danar_saveuseroptions">保存选项到泵上</string>
-    <string name="option_on">开启</string>
-    <string name="option_off">关闭</string>
     <string name="open_navigation">打开导航栏</string>
     <string name="close_navigation">关闭导航栏</string>
     <string name="nav_plugin_preferences">插件选项</string>
@@ -921,8 +700,6 @@
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[当临时目标 ＜= 100 mg/dl (5.5 mmol/l) 时降低灵敏度]]></string>
     <string name="combo_invalid_setup">泵设置的无效，检查文档并核实这个Quick Info 菜单被命名为 QUICK INFO，使用360 configuration 这个软件　</string>
     <string name="custom">自定义</string>
-    <string name="largetimedifftitle">手机和泵的时间相差很大</string>
-    <string name="largetimediff">手机和泵的时间相差很大\n泵上的时间已经偏离１. ５小时\n请在泵上手动调整时间，并且确定可以顺利读取泵历史，没有出现意外的行为。\n如果可能的话，在更改泵时间之前从泵上删除历史。或者禁用闭环至少一个DIA的时间，也就是胰岛素作用时间。</string>
     <string name="careportal_removestartedevents">Clean AndroidAPS 启动了</string>
     <string name="storedsettingsfound">发现曾经保存过的设置</string>
     <string name="allow_hardware_pump_text">注意：如果你激活并且连接到了一个硬件泵，AndroidAPS将会从配置文件复制基础率到泵上。覆盖泵上已有的基础率。请确定你已经在AndroidAPS上设置了正确的基础率。如果你不确定或者不想覆盖泵上的基础率设置，按取消键，以后再切换激活配置文件。</string>
@@ -946,16 +723,9 @@
     <string name="setupwizard_preferred_aps_mode">首选的APS模式</string>
     <string name="treatments_wizard_total_label">总计</string>
     <string name="calculation_short">计算</string>
-    <string name="handshaking">握手</string>
     <string name="sendlogfiles">发送包括当前时间的今日的日志文件给开发者。描述一下意外情况</string>
-    <string name="maxbolusviolation">超出最大大剂量的限制</string>
-    <string name="commanderror">命令错误</string>
-    <string name="speederror">速度错误</string>
-    <string name="insulinlimitviolation">违反胰岛素限制</string>
     <string name="loop_openmode_min_change">最小请求更改[%]</string>
-    <string name="pairfirst">请将您的泵与您的手机配对!</string>
     <string name="searching_for_devices">正在搜索设备…</string>
-    <string name="please_wait">请稍等...</string>
     <string name="pairing_completed">配对已完成</string>
     <string name="code_compare">此设备和您的泵上显示的代码是否匹配？</string>
     <string name="insight_pairing">Insight 正在配对</string>
@@ -1021,22 +791,10 @@
     <string name="recovery_duration">恢复持续时间</string>
     <string name="timeout_during_handshake">握手时超时-重启蓝牙</string>
     <string name="profile_total">== ∑  %1$s U</string>
-    <string name="profile_carbs_per_unit">克/U</string>
-    <string name="profile_per_unit">/U</string>
     <string name="dexcom_lognssensorchange_title">记录传感器更换至NS服务器</string>
     <string name="dexcom_lognssensorchange_summary">在传感器启动时在 NS服务器 自动创建事件 \"传感器更改\"</string>
     <string name="tomato">番茄（喵喵）</string>
     <string name="tomato_short">番茄</string>
-    <string name="unit_second">秒</string>
-    <string name="unit_minute">分钟</string>
-    <string name="unit_hour">小时</string>
-    <string name="unit_day">天</string>
-    <string name="unit_week">周</string>
-    <string name="unit_seconds">秒</string>
-    <string name="unit_minutes">分钟</string>
-    <string name="unit_hours">小时</string>
-    <string name="unit_days">天</string>
-    <string name="unit_weeks">周</string>
     <string name="summary_tidepool_username">你的Tidepool登录用户名，通常是你的邮件地址</string>
     <string name="title_tidepool_username">登录用户名</string>
     <string name="summary_tidepool_password">登录密码</string>
@@ -1062,7 +820,6 @@
     <string name="old_version">旧版本</string>
     <string name="very_old_version">非常旧版本</string>
     <string name="twohours">2小时</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
     <string name="dexcom_app_patched">德康app（补丁版）</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">从补丁版的德康APP收到血糖值</string>
@@ -1079,4 +836,13 @@
     <!-- MDT Pump Status -->
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
 </resources>
diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..24af7efece
--- /dev/null
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pairing">Párování</string>
+    <!--    General-->
+    <string name="error">Chyba</string>
+    <string name="not_set_short">Nenastaveno</string>
+    <string name="failedupdatebasalprofile">Chyba při nastavení bazálního pprofilu</string>
+    <string name="profile_set_ok">Bazální profil aktualizován</string>
+    <string name="invalidinput">Chybná vstupní data</string>
+    <string name="tempbasaldeliveryerror">Chyba nastavování dočasného bazálu</string>
+    <string name="goingtodeliver">Podávání %1$.2fU inzulínu</string>
+    <string name="waitingforpump">Čekání na pumpu</string>
+    <string name="connectingfor">Připojování %1$d sec</string>
+    <string name="bolusdelivering">Aplikováno %1$.2fU</string>
+    <string name="handshaking">Navazování spojení</string>
+    <string name="connecting">Připojuji</string>
+    <string name="connected">Připojeno</string>
+    <string name="disconnected">Odpojeno</string>
+    <string name="disconnecting">Odpojuji</string>
+    <string name="androidaps_start">AndroidAPS restartován</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pumpa je zaneprázdněna</string>
+    <string name="connectionerror">Chyba připojování pumpy</string>
+    <string name="youareonallowedlimit">Dosaženo limitu</string>
+    <string name="objectives">Cíle</string>
+    <string name="close">Zavřít</string>
+    <string name="please_wait">Počkejte prosím…</string>
+    <string name="mute">Ztlumit</string>
+    <string name="reload">Znovu načíst</string>
+    <string name="stoppressed">STISKNUTO STOP</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">Sacharidy</string>
+    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
+    <string name="date">Datum</string>
+    <string name="units_label">Jednotky</string>
+    <string name="dia_label">Doba působnosti inzulínu</string>
+    <string name="ic_label">Inzulínosacharidový poměr</string>
+    <string name="isf_label">Citlivost</string>
+    <string name="basal_label">Bazál</string>
+    <string name="target_label">Cíl</string>
+    <string name="initializing">Inicializuji ...</string>
+    <string name="serialnumber">Sériové číslo</string>
+    <string name="battery_label">Baterie</string>
+    <string name="lastconnection_label">Poslední spojení</string>
+    <string name="lastbolus_label">Poslední bolus</string>
+    <string name="dailyunits">Jednotek za den</string>
+    <string name="basebasalrate_label">Základní hodnota bazálu</string>
+    <string name="tempbasal_label">Dočasný bazál</string>
+    <string name="virtualpump_extendedbolus_label">Prodloužený bolus</string>
+    <string name="reservoir_label">Zásobník</string>
+    <string name="pumphistory">Historie pumpy</string>
+    <string name="viewprofile">Zobrazit profil</string>
+    <string name="eventtype">Typ události</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/L</string>
+    <string name="advancedsettings_title">Rozšířené nastavení</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Hlídač BT</string>
+    <string name="btwatchdog_summary">Vypne na 1 sek bluetooth v telefonu, pokud se nedaří připojit k pumpě. Může to pomoci u telefonů, které mají problémy s BT</string>
+    <!--    Constraints-->
+    <string name="limitingbasalratio">Max bazál omezen na %1$.2f U/h: %2$s</string>
+    <string name="pumplimit">limit pumpy</string>
+    <string name="limitingpercentrate">Bazál omezen na %1$d%%: %2$s</string>
+    <string name="itmustbepositivevalue">požadována kladná hodnota</string>
+    <string name="limitingbolus">Bolus omezen na %1$.1f U: %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pumpa není inicializována, profil nenastaven!</string>
+    <!--    Dialogs-->
+    <string name="confirmation">Potvrzení</string>
+    <string name="message">Zpráva</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Zrušit</string>
+    <string name="dismiss">POTVRDIT</string>
+    <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy nepodporováno.</string>
+    <string name="ble_not_enabled">Bluetooth není povoleno.</string>
+    <string name="location_not_found_title">Zjišťování polohy není povoleno</string>
+    <string name="location_not_found_message">Pro vyhledání Bluetooth zařízení na novějších telefonech musí být povoleno zjišťování polohy. AAPS vás nesleduje a po provedení párování můžete tuto volbu opět zakázat.</string>
+    <!--    DateUtil-->
+    <string name="minago">před %1$dm</string>
+    <string name="hoursago">před %1$.1fh</string>
+    <string name="shorthour">h</string>
+    <string name="days">dnů</string>
+    <string name="hours">hodin</string>
+    <string name="unit_second">sekunda</string>
+    <string name="unit_minute">minuta</string>
+    <string name="unit_hour">hodina</string>
+    <string name="unit_day">den</string>
+    <string name="unit_week">týden</string>
+    <string name="unit_seconds">sekund</string>
+    <string name="unit_minutes">minut</string>
+    <string name="unit_hours">hodin</string>
+    <string name="unit_days">dní</string>
+    <string name="unit_weeks">týdnů</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Hodnoty bazálů nejsou zarovnané na celé hodiny: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahrazena minimální možnou: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Hodnota bazálu nahrazena maximální možnou: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Není vybrán žádný profil</string>
+    <!--    PumpType-->
+    <string name="def_extended_note">* Pouze diskrétní hodnoty a ne rozsahy jsou podporovány pro bazál/bolus ve virtuální pumpě.</string>
+    <!--    APSResult-->
+    <string name="canceltemp">Zrušit dočasný bazál</string>
+    <string name="let_temp_basal_run">Nechat běžet aktuální dočasný bazál</string>
+    <string name="rate">Hodnota</string>
+    <string name="duration">Trvání</string>
+    <string name="reason">Zdůvodnění</string>
+    <string name="nochangerequested">Změna nepožadována</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Chybný profil: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$d minut</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">Kontrola glykémie</string>
+    <string name="careportal_announcement">Oznámení</string>
+    <string name="careportal_note">Poznámka</string>
+    <string name="careportal_question">Otázka</string>
+    <string name="careportal_exercise">Cvičení</string>
+    <string name="careportal_pumpsitechange">Výměna setu</string>
+    <string name="careportal_cgmsensorinsert">Výměna senzoru</string>
+    <string name="careportal_cgmsensorstart">Znovu spuštění senzoru</string>
+    <string name="careportal_insulincartridgechange">Výměna inzulínu</string>
+    <string name="careportal_profileswitch">Přepnutí profilu</string>
+    <string name="careportal_snackbolus">Bolus na svačinu</string>
+    <string name="careportal_mealbolus">Bolus na jídlo</string>
+    <string name="careportal_correctionbolus">Korekční bolus</string>
+    <string name="careportal_combobolus">Kombinovaný bolus</string>
+    <string name="careportal_tempbasalstart">Dočasný bazál začátek</string>
+    <string name="careportal_tempbasalend">Dočasný bazál konec</string>
+    <string name="careportal_carbscorrection">Přídavek sacharidů</string>
+    <string name="careportal_openapsoffline">OpenAPS vypnuto</string>
+    <string name="careportal_pumpbatterychange">Výměna baterie pumpy</string>
+    <string name="careportal_temporarytarget">Dočasný cíl</string>
+    <string name="careportal_temporarytargetcancel">Dočasný cíl konec</string>
+    <string name="glucosetype_finger">Glukoměr</string>
+    <string name="glucosetype_sensor">Senzor</string>
+    <string name="manual">Ručně</string>
+    <string name="unknown">neznámý</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Vypršel čas připojování</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Provedeno</string>
+    <string name="comment">Komentář</string>
+    <string name="success">Úspěch</string>
+    <string name="percent">Procenta</string>
+    <string name="absolute">Absolutní</string>
+    <string name="configbuilder_insulin">Inzulín</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Čekání na výsledek</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <string name="stats">Statistiky</string>
+    <string name="cumulative_tdd">Kumulativní CDD</string>
+    <string name="expweight">Exponenciálně vážená CDD</string>
+    <string name="basalrate">Bazál</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">CDD</string>
+    <string name="ratio">Koef</string>
+    <string name="amount_days">Dní</string>
+    <string name="weight">Váha</string>
+    <string name="warning_Message">Pravděpodobně nepřesné při používání bolusů k doplňování</string>
+    <string name="olddata_Message">Zastaralá data. Prosím načtěte je znovu</string>
+    <string name="tbb">Celk. denní bazál</string>
+    <string name="tbb2">CZB * 2</string>
+    <!--    Ntp-->
+    <string name="timedetection">Detekce času</string>
+</resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..bd93e81191
--- /dev/null
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <string name="confirmation">Bestätigung</string>
+    <string name="message">Nachricht</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="dismiss">VERWERFEN</string>
+    <!--    BlePreCheck-->
+    <string name="location_not_found_title">Standortdienst ist nicht aktiviert</string>
+    <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>
+    <!--    DateUtil-->
+    <string name="minago">vor %1$d Min.</string>
+    <string name="hoursago">vor %1$.1f Stunde</string>
+    <string name="shorthour">Std</string>
+    <string name="days">Tage</string>
+    <string name="hours">Stunden</string>
+    <string name="unit_second">Sekunde</string>
+    <string name="unit_minute">Minute</string>
+    <string name="unit_hour">Stunde</string>
+    <string name="unit_day">Tag</string>
+    <string name="unit_week">Woche</string>
+    <string name="unit_seconds">Sekunden</string>
+    <string name="unit_minutes">Minuten</string>
+    <string name="unit_hours">Stunden</string>
+    <string name="unit_days">Tage</string>
+    <string name="unit_weeks">Wochen</string>
+    <string name="shortminute">min</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Basalraten beginnen nicht zur vollen Stunde: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basal-Wert wurde durch den kleinst möglichen Wert ersetzt: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Basal-Wert wurde durch größt möglichen Wert ersetzt: %1$s</string>
+    <string name="profile_per_unit">/IE</string>
+    <string name="profile_ins_units_per_hour">IE/h</string>
+    <string name="profile_carbs_per_unit">g/IE</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Kein Profil ausgewählt</string>
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <string name="canceltemp">TBR abbrechen</string>
+    <string name="let_temp_basal_run">Temporäre Basalrate aktiv lassen</string>
+    <string name="rate">Rate</string>
+    <string name="duration">Dauer</string>
+    <string name="reason">Begründung</string>
+    <string name="nochangerequested">Keine Anpassung benötigt</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Ungültiges Profil: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$d Min.</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">BZ Test</string>
+    <string name="careportal_announcement">Ankündigung</string>
+    <string name="careportal_note">Notiz</string>
+    <string name="careportal_question">Frage</string>
+    <string name="careportal_exercise">Bewegung</string>
+    <string name="careportal_pumpsitechange">Pumpenkatheter Wechsel</string>
+    <string name="careportal_cgmsensorinsert">CGM-Sensor gesetzt</string>
+    <string name="careportal_cgmsensorstart">CGM-Sensor Start</string>
+    <string name="careportal_insulincartridgechange">Insulinreservoir Wechsel</string>
+    <string name="careportal_profileswitch">Profilwechsel</string>
+    <string name="careportal_snackbolus">Snack Bolus</string>
+    <string name="careportal_mealbolus">Mahlzeiten Bolus</string>
+    <string name="careportal_correctionbolus">Korrektur Bolus</string>
+    <string name="careportal_combobolus">Combo Bolus</string>
+    <string name="careportal_tempbasalstart">TBR Start</string>
+    <string name="careportal_tempbasalend">TBR Ende</string>
+    <string name="careportal_carbscorrection">Kohlenhydrat Korrektur</string>
+    <string name="careportal_openapsoffline">OpenAPS offline</string>
+    <string name="careportal_pumpbatterychange">Pumpenbatterie Wechsel</string>
+    <string name="careportal_temporarytarget">Temporäres Ziel</string>
+    <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
+    <string name="glucosetype_finger">Finger</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manuell</string>
+    <string name="unknown">unbekannt</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Zeitüberschreitung bei Verbindung</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Ausgeführt</string>
+    <string name="comment">Kommentar</string>
+    <string name="success">Erfolgreich</string>
+    <string name="percent">Prozent</string>
+    <string name="absolute">Absolut</string>
+    <string name="configbuilder_insulin">Insulin</string>
+    <string name="insulin_unit_shortname">IE</string>
+    <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-el-rGR/strings.xml b/core/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-fi-rFI/strings.xml b/core/src/main/res/values-fi-rFI/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-fi-rFI/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..be1596e82b
--- /dev/null
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <string name="confirmation">Conferma</string>
+    <string name="message">Messaggio</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Annulla</string>
+    <string name="dismiss">RIMUOVI</string>
+    <!--    BlePreCheck-->
+    <string name="location_not_found_title">La localizzazione non è abilitata</string>
+    <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
+    <!--    DateUtil-->
+    <string name="minago">%1$dm fa</string>
+    <string name="hoursago">%1$.1fh fa</string>
+    <string name="shorthour">h</string>
+    <string name="days">giorni</string>
+    <string name="hours">ore</string>
+    <string name="unit_second">secondo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">ora</string>
+    <string name="unit_day">giorno</string>
+    <string name="unit_week">settimana</string>
+    <string name="unit_seconds">secondi</string>
+    <string name="unit_minutes">minuti</string>
+    <string name="unit_hours">ore</string>
+    <string name="unit_days">giorni</string>
+    <string name="unit_weeks">settimane</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Valori basali non allineati alle ore: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valore basale sostituito dal minimo valore supportato: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valore basale sostituito dal massimo valore supportato: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Nessun profilo selezionato</string>
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <string name="canceltemp">Cancella basale temporanea</string>
+    <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
+    <string name="rate">Tasso</string>
+    <string name="duration">Durata</string>
+    <string name="reason">Motivo</string>
+    <string name="nochangerequested">Nessun cambiamento richiesto</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Profilo non valido: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">Controllo BG</string>
+    <string name="careportal_announcement">Avviso</string>
+    <string name="careportal_note">Nota</string>
+    <string name="careportal_question">Domanda</string>
+    <string name="careportal_exercise">Esercizio fisico</string>
+    <string name="careportal_pumpsitechange">Cambio posizione cannula</string>
+    <string name="careportal_cgmsensorinsert">Inserimento sensore</string>
+    <string name="careportal_cgmsensorstart">Avvio sensore</string>
+    <string name="careportal_insulincartridgechange">Cambio cartuccia insulina</string>
+    <string name="careportal_profileswitch">Cambio profilo</string>
+    <string name="careportal_snackbolus">Bolo spuntino</string>
+    <string name="careportal_mealbolus">Bolo pasto</string>
+    <string name="careportal_correctionbolus">Bolo di correzione</string>
+    <string name="careportal_combobolus">Bolo combo</string>
+    <string name="careportal_tempbasalstart">Avvio basale temporanea</string>
+    <string name="careportal_tempbasalend">Fine basale temporanea</string>
+    <string name="careportal_carbscorrection">Correzione con CHO</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Cambio batteria micro</string>
+    <string name="careportal_temporarytarget">Target temporaneo</string>
+    <string name="careportal_temporarytargetcancel">Cancellazione temp-target</string>
+    <string name="glucosetype_finger">Dito</string>
+    <string name="glucosetype_sensor">Sensore</string>
+    <string name="manual">Manuale</string>
+    <string name="unknown">sconosciuto</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Time out connessione</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Attivato</string>
+    <string name="comment">Commento</string>
+    <string name="success">OK</string>
+    <string name="percent">Percento</string>
+    <string name="absolute">Assoluto</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">In attesa del risultato</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-ja-rJP/strings.xml b/core/src/main/res/values-ja-rJP/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-ja-rJP/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..17473920e9
--- /dev/null
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pairing">A Emparelhar</string>
+    <!--    General-->
+    <string name="error">Erro</string>
+    <string name="not_set_short">Não definido</string>
+    <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
+    <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
+    <string name="invalidinput">Entrada Inválida</string>
+    <string name="tempbasaldeliveryerror">Erro na entrega da Basal Temp</string>
+    <string name="goingtodeliver">A ser administrada %1$.2fU</string>
+    <string name="waitingforpump">À espera da bomba</string>
+    <string name="connectingfor">A ligar durante %1$d s</string>
+    <string name="bolusdelivering">A enviar %1$.2fU</string>
+    <string name="handshaking">Cumprimento</string>
+    <string name="connecting">A ligar</string>
+    <string name="connected">Ligado</string>
+    <string name="disconnected">Desligado</string>
+    <string name="disconnecting">A desligar</string>
+    <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">A bomba está ocupada</string>
+    <string name="connectionerror">Erro de ligação da bomba</string>
+    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
+    <string name="objectives">Objectivos</string>
+    <string name="close">Fechar</string>
+    <string name="please_wait">Por favor aguarde…</string>
+    <string name="mute">Silêncio</string>
+    <string name="reload">Recarregar</string>
+    <string name="stoppressed">PARAR PRESSIONADO</string>
+    <string name="stop">Parar</string>
+    <string name="carbs">Hidratos</string>
+    <string name="invalidprofile">Perfil inválido !!!</string>
+    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
+    <string name="date">Data</string>
+    <string name="units_label">Unidades</string>
+    <string name="dia_label">DIA</string>
+    <string name="isf_label">FSI</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Alvo</string>
+    <string name="initializing">A inicializar ...</string>
+    <string name="serialnumber">Número de série</string>
+    <string name="battery_label">Bateria</string>
+    <string name="lastconnection_label">Última ligação</string>
+    <string name="virtualpump_extendedbolus_label">Bólus Prolongado</string>
+    <string name="eventtype">Tipo de evento</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/L</string>
+    <string name="advancedsettings_title">Configurações Avançadas</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Watchdog BT</string>
+    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma ligação com bomba for possível. Este parâmetro pode ser útil em alguns telefones, onde o bluetooth congela.</string>
+    <!--    Constraints-->
+    <string name="limitingbasalratio">A basal máx está limitada a %1$.2f U/h por %2$s</string>
+    <string name="pumplimit">limite bomba</string>
+    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
+    <string name="itmustbepositivevalue">deve ser valor positivo</string>
+    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
+    <!--    Dialogs-->
+    <string name="confirmation">Confirmação</string>
+    <string name="message">Mensagem</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancelar</string>
+    <string name="dismiss">DISPENSAR</string>
+    <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy não suportado.</string>
+    <string name="ble_not_enabled">Bluetooth não está activado.</string>
+    <string name="location_not_found_title">Localização Não Está Activa</string>
+    <string name="location_not_found_message">Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido.</string>
+    <!--    DateUtil-->
+    <string name="minago">%1$dm atrás</string>
+    <string name="hoursago">%1$.1fh atrás</string>
+    <string name="shorthour">h</string>
+    <string name="days">dias</string>
+    <string name="hours">horas</string>
+    <string name="unit_second">segundo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">hora</string>
+    <string name="unit_day">dia</string>
+    <string name="unit_week">semana</string>
+    <string name="unit_seconds">segundos</string>
+    <string name="unit_minutes">minutos</string>
+    <string name="unit_hours">horas</string>
+    <string name="unit_days">dias</string>
+    <string name="unit_weeks">semanas</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Nenhum perfil seleccionado</string>
+    <!--    PumpType-->
+    <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
+    <!--    APSResult-->
+    <string name="canceltemp">Cancelar Basal Temp</string>
+    <string name="let_temp_basal_run">Permitir Basal Temp Correr</string>
+    <string name="rate">Rácio</string>
+    <string name="duration">Duração</string>
+    <string name="reason">Motivo</string>
+    <string name="nochangerequested">Nenhuma alteração solicitada</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">Verificar Glic</string>
+    <string name="careportal_announcement">Anúncio</string>
+    <string name="careportal_note">Nota</string>
+    <string name="careportal_question">Pergunta</string>
+    <string name="careportal_exercise">Exercício</string>
+    <string name="careportal_pumpsitechange">Mudança de Cateter</string>
+    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
+    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
+    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
+    <string name="careportal_profileswitch">Troca de Perfil</string>
+    <string name="careportal_snackbolus">Bólus Lanche</string>
+    <string name="careportal_mealbolus">Bólus Refeição</string>
+    <string name="careportal_correctionbolus">Bólus Correcção</string>
+    <string name="careportal_combobolus">Bólus Combo</string>
+    <string name="careportal_tempbasalstart">Início Basal Temp</string>
+    <string name="careportal_tempbasalend">Fim Basal Temp</string>
+    <string name="careportal_carbscorrection">Correcção Hidratos</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Troca Bateria Bomba</string>
+    <string name="careportal_temporarytarget">Alvo Temporário</string>
+    <string name="careportal_temporarytargetcancel">Cancelar Alvo Temporário</string>
+    <string name="glucosetype_finger">Dedo</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manual</string>
+    <string name="unknown">desconhecido</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Ligação expirou</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Realizado</string>
+    <string name="comment">Comentário</string>
+    <string name="success">Sucesso</string>
+    <string name="percent">Percentagem</string>
+    <string name="absolute">Absoluto</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">À espera de resultado</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <string name="stats">Estatísticas</string>
+    <string name="cumulative_tdd">Dose diária acumulativa</string>
+    <string name="expweight">Dose diária exponencialmente ponderada</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bólus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Rácio</string>
+    <string name="amount_days"># Dias</string>
+    <string name="weight">Peso</string>
+    <string name="warning_Message">Possivelmente impreciso se foram usados bólus para purgar/preencher!</string>
+    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
+    <string name="tbb">Basal Diária Total</string>
+    <string name="tbb2">Basal diária * 2</string>
+    <!--    Ntp-->
+    <string name="timedetection">Detecção de tempo</string>
+</resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..17473920e9
--- /dev/null
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pairing">A Emparelhar</string>
+    <!--    General-->
+    <string name="error">Erro</string>
+    <string name="not_set_short">Não definido</string>
+    <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
+    <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
+    <string name="invalidinput">Entrada Inválida</string>
+    <string name="tempbasaldeliveryerror">Erro na entrega da Basal Temp</string>
+    <string name="goingtodeliver">A ser administrada %1$.2fU</string>
+    <string name="waitingforpump">À espera da bomba</string>
+    <string name="connectingfor">A ligar durante %1$d s</string>
+    <string name="bolusdelivering">A enviar %1$.2fU</string>
+    <string name="handshaking">Cumprimento</string>
+    <string name="connecting">A ligar</string>
+    <string name="connected">Ligado</string>
+    <string name="disconnected">Desligado</string>
+    <string name="disconnecting">A desligar</string>
+    <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d mins</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">A bomba está ocupada</string>
+    <string name="connectionerror">Erro de ligação da bomba</string>
+    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
+    <string name="objectives">Objectivos</string>
+    <string name="close">Fechar</string>
+    <string name="please_wait">Por favor aguarde…</string>
+    <string name="mute">Silêncio</string>
+    <string name="reload">Recarregar</string>
+    <string name="stoppressed">PARAR PRESSIONADO</string>
+    <string name="stop">Parar</string>
+    <string name="carbs">Hidratos</string>
+    <string name="invalidprofile">Perfil inválido !!!</string>
+    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
+    <string name="date">Data</string>
+    <string name="units_label">Unidades</string>
+    <string name="dia_label">DIA</string>
+    <string name="isf_label">FSI</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Alvo</string>
+    <string name="initializing">A inicializar ...</string>
+    <string name="serialnumber">Número de série</string>
+    <string name="battery_label">Bateria</string>
+    <string name="lastconnection_label">Última ligação</string>
+    <string name="virtualpump_extendedbolus_label">Bólus Prolongado</string>
+    <string name="eventtype">Tipo de evento</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/L</string>
+    <string name="advancedsettings_title">Configurações Avançadas</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Watchdog BT</string>
+    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma ligação com bomba for possível. Este parâmetro pode ser útil em alguns telefones, onde o bluetooth congela.</string>
+    <!--    Constraints-->
+    <string name="limitingbasalratio">A basal máx está limitada a %1$.2f U/h por %2$s</string>
+    <string name="pumplimit">limite bomba</string>
+    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
+    <string name="itmustbepositivevalue">deve ser valor positivo</string>
+    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
+    <!--    Dialogs-->
+    <string name="confirmation">Confirmação</string>
+    <string name="message">Mensagem</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancelar</string>
+    <string name="dismiss">DISPENSAR</string>
+    <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy não suportado.</string>
+    <string name="ble_not_enabled">Bluetooth não está activado.</string>
+    <string name="location_not_found_title">Localização Não Está Activa</string>
+    <string name="location_not_found_message">Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido.</string>
+    <!--    DateUtil-->
+    <string name="minago">%1$dm atrás</string>
+    <string name="hoursago">%1$.1fh atrás</string>
+    <string name="shorthour">h</string>
+    <string name="days">dias</string>
+    <string name="hours">horas</string>
+    <string name="unit_second">segundo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">hora</string>
+    <string name="unit_day">dia</string>
+    <string name="unit_week">semana</string>
+    <string name="unit_seconds">segundos</string>
+    <string name="unit_minutes">minutos</string>
+    <string name="unit_hours">horas</string>
+    <string name="unit_days">dias</string>
+    <string name="unit_weeks">semanas</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Nenhum perfil seleccionado</string>
+    <!--    PumpType-->
+    <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
+    <!--    APSResult-->
+    <string name="canceltemp">Cancelar Basal Temp</string>
+    <string name="let_temp_basal_run">Permitir Basal Temp Correr</string>
+    <string name="rate">Rácio</string>
+    <string name="duration">Duração</string>
+    <string name="reason">Motivo</string>
+    <string name="nochangerequested">Nenhuma alteração solicitada</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">Verificar Glic</string>
+    <string name="careportal_announcement">Anúncio</string>
+    <string name="careportal_note">Nota</string>
+    <string name="careportal_question">Pergunta</string>
+    <string name="careportal_exercise">Exercício</string>
+    <string name="careportal_pumpsitechange">Mudança de Cateter</string>
+    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
+    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
+    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
+    <string name="careportal_profileswitch">Troca de Perfil</string>
+    <string name="careportal_snackbolus">Bólus Lanche</string>
+    <string name="careportal_mealbolus">Bólus Refeição</string>
+    <string name="careportal_correctionbolus">Bólus Correcção</string>
+    <string name="careportal_combobolus">Bólus Combo</string>
+    <string name="careportal_tempbasalstart">Início Basal Temp</string>
+    <string name="careportal_tempbasalend">Fim Basal Temp</string>
+    <string name="careportal_carbscorrection">Correcção Hidratos</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Troca Bateria Bomba</string>
+    <string name="careportal_temporarytarget">Alvo Temporário</string>
+    <string name="careportal_temporarytargetcancel">Cancelar Alvo Temporário</string>
+    <string name="glucosetype_finger">Dedo</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manual</string>
+    <string name="unknown">desconhecido</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Ligação expirou</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Realizado</string>
+    <string name="comment">Comentário</string>
+    <string name="success">Sucesso</string>
+    <string name="percent">Percentagem</string>
+    <string name="absolute">Absoluto</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">À espera de resultado</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <string name="stats">Estatísticas</string>
+    <string name="cumulative_tdd">Dose diária acumulativa</string>
+    <string name="expweight">Dose diária exponencialmente ponderada</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bólus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Rácio</string>
+    <string name="amount_days"># Dias</string>
+    <string name="weight">Peso</string>
+    <string name="warning_Message">Possivelmente impreciso se foram usados bólus para purgar/preencher!</string>
+    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
+    <string name="tbb">Basal Diária Total</string>
+    <string name="tbb2">Basal diária * 2</string>
+    <!--    Ntp-->
+    <string name="timedetection">Detecção de tempo</string>
+</resources>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..467eb5eb59
--- /dev/null
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pairing">Сопряжение</string>
+    <!--    General-->
+    <string name="error">Ошибка</string>
+    <string name="not_set_short">Не выбрано</string>
+    <string name="failedupdatebasalprofile">не удалось обновить базальный профиль</string>
+    <string name="profile_set_ok">базальный профиль помпы обновлен</string>
+    <string name="invalidinput">введенные данные неверны</string>
+    <string name="tempbasaldeliveryerror">Ошибка подачи врем базала</string>
+    <string name="goingtodeliver">Начинается подача болюса %1$.2fед.</string>
+    <string name="waitingforpump">ожидание помпы</string>
+    <string name="connectingfor">Связь установлена за %1$d сек</string>
+    <string name="bolusdelivering">Подается болюс %1$.2fед.</string>
+    <string name="handshaking">Подтверждение связи</string>
+    <string name="connecting">соединение устанавливается</string>
+    <string name="connected">соединение установлено</string>
+    <string name="disconnected">Разъединено</string>
+    <string name="disconnecting">разъединение</string>
+    <string name="androidaps_start">AndroidAPS запущен</string>
+    <string name="formatinsulinunits">%1$.2f ед</string>
+    <string name="reservoirvalue">%1$.0f/%2$d ед</string>
+    <string name="pump_basebasalrate">%1$.2f ед/час</string>
+    <string name="format_hours">%1$.2f ч</string>
+    <string name="format_mins">%1$d мин</string>
+    <string name="format_mins_short">%1$dм</string>
+    <string name="pumpbusy">помпа занята</string>
+    <string name="connectionerror">ошибка соединения</string>
+    <string name="youareonallowedlimit">разрешенный предел достигнут</string>
+    <string name="objectives">Цели</string>
+    <string name="close">Закрыть</string>
+    <string name="please_wait">Подождите…</string>
+    <string name="mute">Отключить звук</string>
+    <string name="reload">Перезагрузка истории</string>
+    <string name="stoppressed">нажат стоп</string>
+    <string name="stop">стоп</string>
+    <string name="carbs">Углеводы</string>
+    <string name="invalidprofile">Неверный профиль !!!</string>
+    <string name="noprofileset">ПРОФИЛЬ НЕ ЗАДАН</string>
+    <string name="date">дата</string>
+    <string name="units_label">единицы</string>
+    <string name="dia_label">DIA (время действия инсулина)</string>
+    <string name="ic_label">IC (инсулин/углеводы):</string>
+    <string name="isf_label">ISF (чувствительность к инсулину)</string>
+    <string name="basal_label">базал</string>
+    <string name="target_label">Целевое значение СК:</string>
+    <string name="initializing">инициализация...</string>
+    <string name="serialnumber">Серийный номер</string>
+    <string name="battery_label">батарея</string>
+    <string name="lastconnection_label">прошлое соединение</string>
+    <string name="lastbolus_label">предыдущий болюс</string>
+    <string name="dailyunits">суточные единицы</string>
+    <string name="basebasalrate_label">базовая величина базала</string>
+    <string name="tempbasal_label">врем базал</string>
+    <string name="virtualpump_extendedbolus_label">Пролонгированный болюс</string>
+    <string name="reservoir_label">Резервуар</string>
+    <string name="pumphistory">Журнал помпы</string>
+    <string name="viewprofile">просмотр профиля</string>
+    <string name="eventtype">тип события</string>
+    <string name="mgdl">мг/дл</string>
+    <string name="mmol">ммоль/л</string>
+    <string name="advancedsettings_title">расширенные настройки</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Дежурный режим Watchdog</string>
+    <string name="btwatchdog_summary">Выключает bluetooth телефона на одну секунду, если подключение к помпе невозможно. Это помогает на тех телефонах, где зависает модуль bluetooth.</string>
+    <!--    Constraints-->
+    <string name="limitingbasalratio">Макс базальный уровень ограничен до %1$.2f ед/ч вследствие %2$s</string>
+    <string name="pumplimit">лимит помпы</string>
+    <string name="limitingpercentrate">Макс процент базала ограничен до %1$d%% ед/ч вследствие %2$s</string>
+    <string name="itmustbepositivevalue">величина должна быть положительной</string>
+    <string name="limitingbolus">Макс уровень болюса ограничен до %1$.1f ед вследствие %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">помпа не инициализирована, профиль не установлен</string>
+    <!--    Dialogs-->
+    <string name="confirmation">Подтверждение</string>
+    <string name="message">Сообщение</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Отменить</string>
+    <string name="dismiss">ОТКЛОНИТЬ</string>
+    <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth с низким энергопотреблением не поддерживается.</string>
+    <string name="ble_not_enabled">Bluetooth не включен.</string>
+    <string name="location_not_found_title">Геолокация не включена</string>
+    <string name="location_not_found_message">Для обнаружения Bluetooth на новых устройствах необходимо включить геолокацию. AAPS не отслеживает ваше местоположение и может быть отключен после успешного сопряжения.</string>
+    <!--    DateUtil-->
+    <string name="minago">%1$d мин. назад</string>
+    <string name="hoursago">%1$.1fч. назад</string>
+    <string name="shorthour">ч</string>
+    <string name="days">дн</string>
+    <string name="hours">час</string>
+    <string name="unit_second">сек</string>
+    <string name="unit_minute">мин</string>
+    <string name="unit_hour">час</string>
+    <string name="unit_day">дн</string>
+    <string name="unit_week">нед</string>
+    <string name="unit_seconds">сек</string>
+    <string name="unit_minutes">мин</string>
+    <string name="unit_hours">час</string>
+    <string name="unit_days">дн</string>
+    <string name="unit_weeks">нед</string>
+    <string name="shortminute">мин</string>
+    <string name="shortday">дн</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Базальные значения не выровнены по часам: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Значение базала заменено минимальной поддерживаемой величиной: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Значение базала заменено максимальной поддерживаемой величиной: %1$s</string>
+    <string name="profile_per_unit">/ед</string>
+    <string name="profile_ins_units_per_hour">ед/ч</string>
+    <string name="profile_carbs_per_unit">г/ед</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">профиль не выбран</string>
+    <!--    PumpType-->
+    <string name="def_extended_note">* В виртуальной помпе поддерживаются только дискретные величины для обработки базала/болюса.</string>
+    <!--    APSResult-->
+    <string name="canceltemp">отмена врем базала</string>
+    <string name="let_temp_basal_run">Оставить временный базал работающим</string>
+    <string name="rate">Скорость</string>
+    <string name="duration">Продолжительность</string>
+    <string name="reason">Основание</string>
+    <string name="nochangerequested">Именения не запрошены</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Недопустимый профиль: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$d мин</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2f</b>Бол:<b>%3$.2f</b>Баз:<b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">Проверка ГК</string>
+    <string name="careportal_announcement">Оовещение</string>
+    <string name="careportal_note">Примечание</string>
+    <string name="careportal_question">Вопрос</string>
+    <string name="careportal_exercise">Нгрузка</string>
+    <string name="careportal_pumpsitechange">Сена места катетера помпы</string>
+    <string name="careportal_cgmsensorinsert">Установка сенсора мониторинга глюкозы</string>
+    <string name="careportal_cgmsensorstart">Сарт сенсора</string>
+    <string name="careportal_insulincartridgechange">Замена картриджа инсулина</string>
+    <string name="careportal_profileswitch">Смена профиля</string>
+    <string name="careportal_snackbolus">Болюс на перекус</string>
+    <string name="careportal_mealbolus">Болюс на еду</string>
+    <string name="careportal_correctionbolus">Болюс на коррекцию</string>
+    <string name="careportal_combobolus">Комбинированный болюс</string>
+    <string name="careportal_tempbasalstart">Начало действия врем базала</string>
+    <string name="careportal_tempbasalend">Оконч действия врем базала</string>
+    <string name="careportal_carbscorrection">Коррекция углеводов</string>
+    <string name="careportal_openapsoffline">OpenAPS в автономном режиме</string>
+    <string name="careportal_pumpbatterychange">Замена батареи помпы</string>
+    <string name="careportal_temporarytarget">Временная цель</string>
+    <string name="careportal_temporarytargetcancel">Отмена временной цели</string>
+    <string name="glucosetype_finger">Палец</string>
+    <string name="glucosetype_sensor">Сенсор</string>
+    <string name="manual">Вручную</string>
+    <string name="unknown">неизвестно</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Истекло время ожидания соединения</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Выполнено</string>
+    <string name="comment">Комментарий</string>
+    <string name="success">Успешно</string>
+    <string name="percent">Процент</string>
+    <string name="absolute">Абсолютный</string>
+    <string name="configbuilder_insulin">Инсулин</string>
+    <string name="insulin_unit_shortname">Ед</string>
+    <string name="waitingforpumpresult">Ожидание результата</string>
+    <string name="smb_shortname">Супер микро болюс SMB</string>
+    <!--    TDDStatsActivity-->
+    <string name="stats">Статистика</string>
+    <string name="cumulative_tdd">накопительные TDD</string>
+    <string name="expweight">экспоненциально взвешенные TDD</string>
+    <string name="basalrate">базал</string>
+    <string name="bolus">Болюс</string>
+    <string name="tdd">TDD/общая суточная доза</string>
+    <string name="ratio">коэффициент</string>
+    <string name="amount_days">количество дней</string>
+    <string name="weight">вес</string>
+    <string name="warning_Message">возможны неточности если болюсы использовались для заполнения</string>
+    <string name="olddata_Message">старые данные. нажмите \"перезагрузка\"</string>
+    <string name="tbb">общий базал</string>
+    <string name="tbb2">общий базал*2</string>
+    <!--    Ntp-->
+    <string name="timedetection">Определение времени</string>
+</resources>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-sl-rSI/strings.xml b/core/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..ee98f23a74
--- /dev/null
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <string name="confirmation">Bekräftelse</string>
+    <string name="message">Meddelande</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Avbryt</string>
+    <string name="dismiss">TA BORT</string>
+    <!--    BlePreCheck-->
+    <string name="location_not_found_title">Platsdata är inte aktiverat</string>
+    <string name="location_not_found_message">För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats.</string>
+    <!--    DateUtil-->
+    <string name="minago">%1$dm sedan</string>
+    <string name="hoursago">%1$.1f tim sedan</string>
+    <string name="shorthour">h</string>
+    <string name="days">dagar</string>
+    <string name="hours">timmar</string>
+    <string name="unit_second">sekund</string>
+    <string name="unit_minute">minut</string>
+    <string name="unit_hour">timme</string>
+    <string name="unit_day">dag</string>
+    <string name="unit_week">vecka</string>
+    <string name="unit_seconds">sekunder</string>
+    <string name="unit_minutes">minuter</string>
+    <string name="unit_hours">timmar</string>
+    <string name="unit_days">dagar</string>
+    <string name="unit_weeks">veckor</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
+    <!--    Profile-->
+    <string name="basalprofilenotaligned">Profilens basaler är inte satta på hel timme: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basalvärdet ersatt med det lägsta tillåtna: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Basalvärdet ersatt med det högsta tillåtna: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
+    <!--    ProfileFunction-->
+    <string name="noprofileselected">Ingen profil vald</string>
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <string name="canceltemp">Avbryt temp basal</string>
+    <string name="let_temp_basal_run">Låt temp basalen gå</string>
+    <string name="rate">Basaldos</string>
+    <string name="duration">Duration</string>
+    <string name="reason">Orsak</string>
+    <string name="nochangerequested">Ingen ändring behövs</string>
+    <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Ogiltig profil: %1$s</string>
+    <!--    Temptarget-->
+    <string name="mins">%1$d min</string>
+    <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <!--    Translator-->
+    <string name="careportal_bgcheck">BG-kontroll</string>
+    <string name="careportal_announcement">Meddelande</string>
+    <string name="careportal_note">Anteckning</string>
+    <string name="careportal_question">Fråga</string>
+    <string name="careportal_exercise">Träning</string>
+    <string name="careportal_pumpsitechange">Byte pumpkanyl</string>
+    <string name="careportal_cgmsensorinsert">Byte CGM-sensor</string>
+    <string name="careportal_cgmsensorstart">Start CGM-sensor</string>
+    <string name="careportal_insulincartridgechange">Byte insulinreservoar</string>
+    <string name="careportal_profileswitch">Profilbyte</string>
+    <string name="careportal_snackbolus">Mellanmålsbolus</string>
+    <string name="careportal_mealbolus">Måltidsbolus</string>
+    <string name="careportal_correctionbolus">Korrektionsbolus</string>
+    <string name="careportal_combobolus">Kombi-bolus</string>
+    <string name="careportal_tempbasalstart">Temp basal start</string>
+    <string name="careportal_tempbasalend">Temp basal slut</string>
+    <string name="careportal_carbscorrection">KH-korrektion</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Byte pumpbatteri</string>
+    <string name="careportal_temporarytarget">Temp mål</string>
+    <string name="careportal_temporarytargetcancel">Avbryt temp mål</string>
+    <string name="glucosetype_finger">Finger</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manuell</string>
+    <string name="unknown">okänd</string>
+    <!--    Command-->
+    <string name="connectiontimedout">Anslutningen tog för lång tid</string>
+    <!--    PumpEnactResult-->
+    <string name="enacted">Utförd</string>
+    <string name="comment">Kommentar</string>
+    <string name="success">Lyckad</string>
+    <string name="percent">Procent</string>
+    <string name="absolute">Absolut</string>
+    <string name="configbuilder_insulin">Insulin</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Väntar på resultat</string>
+    <string name="smb_shortname">SMB</string>
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/dana/src/main/res/values-af-rZA/strings.xml b/dana/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/dana/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-cs-rCZ/strings.xml b/dana/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..54cb889cc2
--- /dev/null
+++ b/dana/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="danars_pairing">Párování</string>
+    <string name="danars_nodeviceavailable">Prozatím žádné zařízení nenalezeno</string>
+    <string name="danars_pairingok">Spárováno</string>
+    <string name="danars_pairingtimedout">Vypršel časový limit pro párování</string>
+    <string name="danars_waitingforpairing">Čekání na spárování na pumpě</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Ovladač pumpy pro DanaRS</string>
+    <string name="maxbolusviolation">Překročen maximální bolus</string>
+    <string name="commanderror">Chyba příkazu</string>
+    <string name="speederror">Chyba rychlosti</string>
+    <string name="insulinlimitviolation">Překročen limit inzulínu</string>
+    <string name="boluserrorcode">Požadováno: %1$.2fU Doručeno: %2$.2fU Chyba: %3$s</string>
+    <string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string>
+    <string name="danar_setbasalstep001">Nastavte bazální krok 0.01U/h</string>
+    <string name="resetpairing">Reset párování?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtokol: %3$02X\nKód: %4$02X</string>
+    <string name="processinghistory">Zpracovávám</string>
+    <string name="danar_enableextendedbolus">Povolit kombinované bolusy v pumpě</string>
+    <string name="overview_bolusprogress_delivered">Podáno</string>
+    <string name="overview_bolusprogress_stoped">Zastaveno</string>
+    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpě</string>
+    <string name="pumperror">Chyba pumpy</string>
+    <string name="lowbattery">Nízký stav baterie</string>
+    <string name="basalcompare">Dodávám méně než přednastavený bazál</string>
+    <string name="pumpshutdown">Pumpa vypnuta</string>
+    <string name="batterydischarged">Baterie v pumpě vybitá</string>
+    <string name="occlusion">Okluze</string>
+    <string name="emptyreservoir">Prázdný zásobník</string>
+    <string name="bloodsugarmeasurementalert">Výstraha měření glykémie</string>
+    <string name="remaininsulinalert">Zbývající inzulín</string>
+    <string name="missedbolus">Chybějící bolus</string>
+    <string name="invalidpairing">Neplatné informace o párování. Požadavek na nové párování</string>
+    <string name="gettingpumpstatus">Nahrávám stav pumpy</string>
+    <string name="gettingextendedbolusstatus">Nahrávám prodloužené bolusy</string>
+    <string name="gettingbolusstatus">Nahrávám bolusy</string>
+    <string name="gettingtempbasalstatus">Nahrávám dočasné bazály</string>
+    <string name="gettingpumpsettings">Nahrávám nastavení pumpy</string>
+    <string name="gettingpumptime">Nahrávám čas v pumpě</string>
+    <string name="largetimedifftitle">Velký rozdíl v času</string>
+    <string name="largetimediff">Velký rozdíl v času:\nČas v pumpě se liší minimálně o 1,5 h.\nProsím upravte čas v pumpě ručně a vymažte historii pumpy.\nPokud je to třeba, pozastavte smyčku alespoň na \"DIA\" hodin.</string>
+    <string name="pairfirst">Spárujte pumpu s telefonem!</string>
+    <string name="approachingdailylimit">Blíží se denní limit inzulínu</string>
+    <string name="startingbolus">Spouštím bolus</string>
+    <string name="waitingforestimatedbolusend">Čekání na konec bolusu. Zbývá %1$d sek.</string>
+    <string name="stoppingtempbasal">Zastavuji dočasný bazál</string>
+    <string name="settingextendedbolus">Nastavuji prodloužený bolus</string>
+    <string name="stoppingextendedbolus">Zastavuji prodloužený bolus</string>
+    <string name="updatingbasalrates">Aktualizuji bazály</string>
+    <string name="settingtempbasal">Nastavuji dočasný bazál</string>
+    <string name="waitingfortimesynchronization">Čekání na synchronizaci času (%1$d s)</string>
+    <string name="wrongpassword">Chybné heslo</string>
+    <string name="wrongpumppassword">Špatné heslo k pumpě!</string>
+    <string name="danar_history_alarm">Alarmy</string>
+    <string name="danar_history_basalhours">Hodinové bazály</string>
+    <string name="danar_history_bolus">Bolusy</string>
+    <string name="danar_history_carbohydrates">Sacharidy</string>
+    <string name="danar_history_dailyinsulin">Denní inzulín</string>
+    <string name="danar_history_errors">Chyby</string>
+    <string name="danar_history_glucose">Glykémie</string>
+    <string name="danar_history_refill">Plnění</string>
+    <string name="danar_history_syspend">Vypnutí</string>
+    <string name="danar_history_prime">Doplňování</string>
+    <string name="danar_useroptions">Uživatelská nastavení</string>
+    <string name="danar_timedisplay">Formát času</string>
+    <string name="danar_buttonscroll">Posun při stisknutí tlačítka</string>
+    <string name="danar_beep">Zvuk při stisknutí tlačítka</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Zvuk</string>
+    <string name="danar_pumpalarm_vibrate">Vibrace</string>
+    <string name="danar_pumpalarm_both">Oboje</string>
+    <string name="danar_screentimeout">Čas před vypnutím displeje [sekundy]</string>
+    <string name="danar_backlight">Podsvícení [sekundy]</string>
+    <string name="danar_glucoseunits">Jednotky</string>
+    <string name="danar_shutdown">Vypnutí [hodiny]</string>
+    <string name="danar_lowreservoir">Nízký stav zásobníku [Jednotky]</string>
+    <string name="danar_saveuseroptions">Uložit do pumpy</string>
+    <string name="description_pump_dana_r">Ovladač pumpy pro DanaR</string>
+    <string name="description_pump_dana_r_korean">Ovladač pumpy pro korejskou verzi DanaR</string>
+    <string name="description_pump_dana_r_v2">Ovladač pumpy pro DanaR s upgradovaným firmwarem</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nenalezen Bluetooth adaptér</string>
+    <string name="devicenotfound">Vybrané zařízení nenalezeno</string>
+    <string name="danar_switchtouhmode">Změnit režim z U/d na U/h v pumpě</string>
+    <string name="danarkoreanpump">Korejská DanaR</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Ovladač pumpy opraven</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Zakázat EasyUI režim v pumpě</string>
+    <string name="profile_set_failed">Nastavení bazálního profilu selhalo</string>
+    <string name="danar_bluetooth_status">Stav Bluetooth</string>
+    <string name="danar_iob_label">IOB z pumpy</string>
+    <string name="basal_step">Krok bazálu</string>
+    <string name="bolus_step">Krok bolusu</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Nastavení pumpy Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">ZAP</string>
+    <string name="option_off">VYP</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth zařízení</string>
+    <string name="danars_password_title">Heslo pumpy (pouze v1)</string>
+    <string name="danar_password_title">Heslo k pumpě</string>
+    <string name="danar_useextended_title">Použít prodloužené bolusy pro &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %%</string>
+    <string name="bolusspeed">Rychlost bolusu</string>
+    <string name="selectedpump">Vybraná pumpa</string>
+    <string name="rs_loginsulinchange_title">Zaznamenat výměnu zásobníku</string>
+    <string name="rs_loginsulinchange_summary">Přidat událost \"Výměna inzulínu\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="rs_logcanulachange_title">Zaznamenat změnu kanyly</string>
+    <string name="rs_logcanulachange_summary">Přidat událost \"Výměna setu\" do portálu pěče, pokud je zjištěna v historii</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Stiskněte OK na pumpě\na zadejte 2 zobrazená čísla\nUdržujte display na pumpě zapnutý stisknutím tlačítka minus dokud nedokončíte zadání kódu.</string>
+    <string name="num1pin">1: (12 číslic)</string>
+    <string name="num2pin">2: (8 číslic)</string>
+</resources>
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-el-rGR/strings.xml b/dana/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-es-rES/strings.xml b/dana/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-fi-rFI/strings.xml b/dana/src/main/res/values-fi-rFI/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-fi-rFI/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-ga-rIE/strings.xml b/dana/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-hr-rHR/strings.xml b/dana/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/dana/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-iw-rIL/strings.xml b/dana/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-ja-rJP/strings.xml b/dana/src/main/res/values-ja-rJP/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-ja-rJP/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-ko-rKR/strings.xml b/dana/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-lt-rLT/strings.xml b/dana/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-pl-rPL/strings.xml b/dana/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..445b5cfe64
--- /dev/null
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="danars_pairing">A Emparelhar</string>
+    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
+    <string name="danars_pairingok">Emparelhamento OK</string>
+    <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
+    <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Transgressão Bólus máx</string>
+    <string name="commanderror">Erro no comando</string>
+    <string name="speederror">Erro velocidade</string>
+    <string name="insulinlimitviolation">Transgressão limite insulina</string>
+    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
+    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
+    <string name="processinghistory">A processar acção</string>
+    <string name="danar_enableextendedbolus">Habilitar bólus prolongado na bomba</string>
+    <string name="overview_bolusprogress_delivered">Administrado</string>
+    <string name="overview_bolusprogress_stoped">Parado</string>
+    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
+    <string name="pumperror">Erro Bomba</string>
+    <string name="lowbattery">Bateria fraca</string>
+    <string name="pumpshutdown">Encerrar Bomba</string>
+    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
+    <string name="occlusion">Oclusão</string>
+    <string name="emptyreservoir">Reservatório vazio</string>
+    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
+    <string name="remaininsulinalert">Nível de insulina restante</string>
+    <string name="missedbolus">Bólus não administrado</string>
+    <string name="gettingpumpstatus">A obter estado bomba</string>
+    <string name="gettingextendedbolusstatus">A procurar o estado do bólus prolongado</string>
+    <string name="gettingbolusstatus">A obter estado bólus</string>
+    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
+    <string name="gettingpumpsettings">A obter as definições da bomba</string>
+    <string name="gettingpumptime">A obter hora bomba</string>
+    <string name="largetimedifftitle">Grande diferença Horária</string>
+    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
+    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
+    <string name="approachingdailylimit">Aproximação do limite diário de insulina</string>
+    <string name="startingbolus">A iniciar administração de bolus</string>
+    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d seg.</string>
+    <string name="stoppingtempbasal">A parar basal temp</string>
+    <string name="settingextendedbolus">A configurar bólus prolongado</string>
+    <string name="stoppingextendedbolus">A parar bólus prolongado</string>
+    <string name="updatingbasalrates">A actualizar taxas das basais</string>
+    <string name="settingtempbasal">Definindo basal temp</string>
+    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
+    <string name="wrongpassword">Senha incorrecta</string>
+    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Horas de Basal</string>
+    <string name="danar_history_bolus">Bólus</string>
+    <string name="danar_history_carbohydrates">Hidratos de Carbono</string>
+    <string name="danar_history_dailyinsulin">Insulina diária</string>
+    <string name="danar_history_errors">Erros</string>
+    <string name="danar_history_glucose">Glicose</string>
+    <string name="danar_history_refill">Encher</string>
+    <string name="danar_history_syspend">Suspender</string>
+    <string name="danar_history_prime">Purgar</string>
+    <string name="danar_useroptions">Opções do utilizador</string>
+    <string name="danar_timedisplay">Formato hora</string>
+    <string name="danar_useextended_title">Usar bólus prolongado por &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
+</resources>
diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/dana/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..445b5cfe64
--- /dev/null
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="danars_pairing">A Emparelhar</string>
+    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
+    <string name="danars_pairingok">Emparelhamento OK</string>
+    <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
+    <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Transgressão Bólus máx</string>
+    <string name="commanderror">Erro no comando</string>
+    <string name="speederror">Erro velocidade</string>
+    <string name="insulinlimitviolation">Transgressão limite insulina</string>
+    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
+    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
+    <string name="processinghistory">A processar acção</string>
+    <string name="danar_enableextendedbolus">Habilitar bólus prolongado na bomba</string>
+    <string name="overview_bolusprogress_delivered">Administrado</string>
+    <string name="overview_bolusprogress_stoped">Parado</string>
+    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
+    <string name="pumperror">Erro Bomba</string>
+    <string name="lowbattery">Bateria fraca</string>
+    <string name="pumpshutdown">Encerrar Bomba</string>
+    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
+    <string name="occlusion">Oclusão</string>
+    <string name="emptyreservoir">Reservatório vazio</string>
+    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
+    <string name="remaininsulinalert">Nível de insulina restante</string>
+    <string name="missedbolus">Bólus não administrado</string>
+    <string name="gettingpumpstatus">A obter estado bomba</string>
+    <string name="gettingextendedbolusstatus">A procurar o estado do bólus prolongado</string>
+    <string name="gettingbolusstatus">A obter estado bólus</string>
+    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
+    <string name="gettingpumpsettings">A obter as definições da bomba</string>
+    <string name="gettingpumptime">A obter hora bomba</string>
+    <string name="largetimedifftitle">Grande diferença Horária</string>
+    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
+    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
+    <string name="approachingdailylimit">Aproximação do limite diário de insulina</string>
+    <string name="startingbolus">A iniciar administração de bolus</string>
+    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d seg.</string>
+    <string name="stoppingtempbasal">A parar basal temp</string>
+    <string name="settingextendedbolus">A configurar bólus prolongado</string>
+    <string name="stoppingextendedbolus">A parar bólus prolongado</string>
+    <string name="updatingbasalrates">A actualizar taxas das basais</string>
+    <string name="settingtempbasal">Definindo basal temp</string>
+    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
+    <string name="wrongpassword">Senha incorrecta</string>
+    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Horas de Basal</string>
+    <string name="danar_history_bolus">Bólus</string>
+    <string name="danar_history_carbohydrates">Hidratos de Carbono</string>
+    <string name="danar_history_dailyinsulin">Insulina diária</string>
+    <string name="danar_history_errors">Erros</string>
+    <string name="danar_history_glucose">Glicose</string>
+    <string name="danar_history_refill">Encher</string>
+    <string name="danar_history_syspend">Suspender</string>
+    <string name="danar_history_prime">Purgar</string>
+    <string name="danar_useroptions">Opções do utilizador</string>
+    <string name="danar_timedisplay">Formato hora</string>
+    <string name="danar_useextended_title">Usar bólus prolongado por &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
+</resources>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-ru-rRU/strings.xml b/dana/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..964feb4428
--- /dev/null
+++ b/dana/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="danars_pairing">Сопряжение</string>
+    <string name="danars_nodeviceavailable">Устройства пока не найдены</string>
+    <string name="danars_pairingok">Соединение OK</string>
+    <string name="danars_pairingtimedout">Истекло время ожидания соединения</string>
+    <string name="danars_waitingforpairing">Ожидание соединения на помпе</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Интеграция с помпой DANA Diabetcare RS</string>
+    <string name="maxbolusviolation">Нарушение макс болюса</string>
+    <string name="commanderror">Ошибка в команде</string>
+    <string name="speederror">Ошибка в скорости</string>
+    <string name="insulinlimitviolation">Нарушение лимита инсулина</string>
+    <string name="boluserrorcode">Запрошено: %1$.2f ед. Подано: %2$.2f ед. Код ошибки: %3$s</string>
+    <string name="danar_valuenotsetproperly">величина не задана должным образом</string>
+    <string name="danar_setbasalstep001">Установить шаг базала 0.01 ед/ч</string>
+    <string name="resetpairing">Сбросить информацию о сопряжении?</string>
+    <string name="dana_model">%1$s\nМодель: %2$02X\nПротокол: %3$02X\nКод: %4$02X</string>
+    <string name="processinghistory">Обработка события</string>
+    <string name="danar_enableextendedbolus">Активировать пролонгированные болюсы на помпе</string>
+    <string name="overview_bolusprogress_delivered">Болюс подан</string>
+    <string name="overview_bolusprogress_stoped">остановлено</string>
+    <string name="unsupportedfirmware">Неподдерживаемая версия прошивки помпы</string>
+    <string name="pumperror">ошибка помпы</string>
+    <string name="lowbattery">низкий заряд батареи</string>
+    <string name="basalcompare">Подается меньше предварительно установленной базальной скорости</string>
+    <string name="pumpshutdown">Выключение помпы</string>
+    <string name="batterydischarged">батарея помпы разряжена</string>
+    <string name="occlusion">закупорка</string>
+    <string name="emptyreservoir">Резервуар пуст</string>
+    <string name="bloodsugarmeasurementalert">Предупреждение при измерении уровня СК</string>
+    <string name="remaininsulinalert">Уровень оставшегося инсулина</string>
+    <string name="missedbolus">Недоставленный болюс</string>
+    <string name="invalidpairing">Неверная информация о соединении. Запрос нового сопряжения</string>
+    <string name="gettingpumpstatus">получение статуса помпы</string>
+    <string name="gettingextendedbolusstatus">Получение статуса пролонгированного болюса</string>
+    <string name="gettingbolusstatus">Получение статуса болюса</string>
+    <string name="gettingtempbasalstatus">Получение статуса временного базала</string>
+    <string name="gettingpumpsettings">Получение настроек помпы</string>
+    <string name="gettingpumptime">Получение времени помпы</string>
+    <string name="largetimedifftitle">Большая разница во времени</string>
+    <string name="largetimediff">Большая разница во времени: \n Время в помпе расходится более чем 1,5 ч. \n. Пожалуйста установите время на помпе вручную и убедитесь, что чтение истории помпы не вызывает неожиданное поведение.\n если возможно, удалите историю из помпы перед изменением времени или отключите замкнутый цикл на один DIA после последней неверной записи в журнале, как минимум на один DIA с настоящего момента.</string>
+    <string name="pairfirst">Выполните сопряжение помпы с телефоном!</string>
+    <string name="approachingdailylimit">приближается суточный лимит инсулина</string>
+    <string name="startingbolus">Начало подачи болюса</string>
+    <string name="waitingforestimatedbolusend">Ожидание окончания болюса. Оставшиеся %1$d сек.</string>
+    <string name="stoppingtempbasal">остановка врем базала</string>
+    <string name="settingextendedbolus">Настройка пролонгированного болюса</string>
+    <string name="stoppingextendedbolus">Остановка пролонгированного болюса</string>
+    <string name="updatingbasalrates">обновление значений базала</string>
+    <string name="settingtempbasal">установка врем базала</string>
+    <string name="waitingfortimesynchronization">Ожидание синхронизации времени (%1$d сек)</string>
+    <string name="wrongpassword">неверный пароль</string>
+    <string name="wrongpumppassword">неверный пароль помпы</string>
+    <string name="danar_history_alarm">оповещения об опасности</string>
+    <string name="danar_history_basalhours">почасовые базалы</string>
+    <string name="danar_history_bolus">болюсы</string>
+    <string name="danar_history_carbohydrates">углеводы</string>
+    <string name="danar_history_dailyinsulin">суточный инсулин</string>
+    <string name="danar_history_errors">ошибки</string>
+    <string name="danar_history_glucose">гликемия</string>
+    <string name="danar_history_refill">Перезаправка</string>
+    <string name="danar_history_syspend">Останов</string>
+    <string name="danar_history_prime">Заполнить перед работой</string>
+    <string name="danar_useroptions">Параметры пользователя</string>
+    <string name="danar_timedisplay">Формат отображения времени</string>
+    <string name="danar_buttonscroll">Кнопка прокрутки</string>
+    <string name="danar_beep">Звуковой сигнал при нажатии кнопки</string>
+    <string name="danar_pumpalarm">Оповещение об опасности</string>
+    <string name="danar_pumpalarm_sound">Звуковой сигнал</string>
+    <string name="danar_pumpalarm_vibrate">Вибросигнал</string>
+    <string name="danar_pumpalarm_both">Оба</string>
+    <string name="danar_screentimeout">Время LCD экрана [seconds]</string>
+    <string name="danar_backlight">Время подсветки [seconds]</string>
+    <string name="danar_glucoseunits">Единиц глюкозы</string>
+    <string name="danar_shutdown">Выключение через [hours]</string>
+    <string name="danar_lowreservoir">В резервуаре мало инсулина [Units]</string>
+    <string name="danar_saveuseroptions">Сохранить параметры в помпе</string>
+    <string name="description_pump_dana_r">Интеграция с помпой DANA Diabetcare R</string>
+    <string name="description_pump_dana_r_korean">Интеграция с отечественной помпой DANA Diabetcare R</string>
+    <string name="description_pump_dana_r_v2">Интеграция с помпой Dana Diabetcare R с обновленной прошивкой</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">адаптер блутус не найден</string>
+    <string name="devicenotfound">выбранное устройство не найдено</string>
+    <string name="danar_switchtouhmode">замена режима с ед/дн на ед/ч на помпе</string>
+    <string name="danarkoreanpump">DanaR Корея</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Драйвер помпы откорректирован</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">отключить режим упрощенного интерфейса EasyUI в помпе</string>
+    <string name="profile_set_failed">настройка базального профиля не состоялась</string>
+    <string name="danar_bluetooth_status">статус блутус</string>
+    <string name="danar_iob_label">активный инсулин на помпе</string>
+    <string name="basal_step">шаг базала</string>
+    <string name="bolus_step">шаг болюса</string>
+    <string name="virtualpump_firmware_label">прошивка</string>
+    <string name="danar_pump_settings">Настройки помпы Dana</string>
+    <string name="timeformat12h">12 ч</string>
+    <string name="timeformat24h">24 ч</string>
+    <string name="option_on">Вкл.</string>
+    <string name="option_off">Выкл.</string>
+    <string name="danar_bt_name_title">устройство блутус danaR</string>
+    <string name="danars_password_title">Пароль для помпы (только v1)</string>
+    <string name="danar_password_title">пароль помпы</string>
+    <string name="danar_useextended_title">Для величин &gt;200%% пользуйтесь пролонгированным болюсом</string>
+    <string name="danar_visualizeextendedaspercentage_title">Показать пролонгированный болюс в %%</string>
+    <string name="bolusspeed">Скорость подачи болюса</string>
+    <string name="selectedpump">Выбранная помпа</string>
+    <string name="rs_loginsulinchange_title">Отслеживать замену резервуара</string>
+    <string name="rs_loginsulinchange_summary">Добавить событие \"Замена инсулина\" в портал терапииl при обнаружении в хронологии</string>
+    <string name="rs_logcanulachange_title">Отслеживать замену катетера помпы в журнале</string>
+    <string name="rs_logcanulachange_summary">Добавить событие \"Замена инсулина\" в портал терапииl при обнаружении в хронологии</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Нажмите OK на помпе\nи введите 2 отображаемых номера\nДержите экран помпы включенным нажимая кнопку минус, пока не закончите ввод кода.</string>
+    <string name="num1pin">1: (12 цифр)</string>
+    <string name="num2pin">2: (8 цифр)</string>
+</resources>
diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/dana/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-sl-rSI/strings.xml b/dana/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/dana/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-tr-rTR/strings.xml b/dana/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-zh-rCN/strings.xml b/dana/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml
index 3ea04e700d..3a8303f063 100644
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@@ -1,2 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(голям)</string>
+    <string name="label_xdrip_big_chart">AAPS(Графика)</string>
+    <string name="label_xdrip_no_chart">AAPS(без рафика)</string>
+    <string name="label_xdrip_circle">AAPS(Кръгъл)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Самолет)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
+    <string name="label_warning_sync">Няма данни!</string>
+    <string name="label_warning_old">Стари данни!</string>
+    <string name="label_warning_since">От %1$s</string>
+    <string name="label_warning_sync_aaps">Свържи с AAPS!</string>
+    <string name="msg_warning_sync">Няма данни от %1$s! Проверете дали AAPS на телефона изпраща данни до часовника</string>
+    <string name="msg_warning_old">Данните са %1$s стари! Проверете сензора, xDrip+, HС, AAPS конфигурацията и други!</string>
+    <string name="pref_on">Вкл</string>
+    <string name="pref_off">Изкл</string>
+    <string name="pref_vibrate_on_bolus">Вибрация при болус</string>
+    <string name="pref_units_for_actions">Единици за Действие</string>
+    <string name="pref_show_date">Покажи дата</string>
+    <string name="pref_show_iob">Покажи инсулин</string>
+    <string name="pref_show_cob">Покажи въгл</string>
+    <string name="pref_show_delta">Покажи Делта</string>
+    <string name="pref_show_avgdelta">Покажи средна делта</string>
+    <string name="pref_show_phone_battery">Батерия на телефон</string>
+    <string name="pref_show_rig_battery">Батерия на устройство</string>
+    <string name="pref_show_basal_rate">Покажи базал</string>
+</resources>
diff --git a/wear/src/main/res/values-it-rIT/strings.xml b/wear/src/main/res/values-it-rIT/strings.xml
index 0f7282e210..e843401e23 100644
--- a/wear/src/main/res/values-it-rIT/strings.xml
+++ b/wear/src/main/res/values-it-rIT/strings.xml
@@ -19,14 +19,14 @@
     <string name="pref_on">On</string>
     <string name="pref_off">Off</string>
     <string name="pref_vibrate_on_bolus">Vibra durante bolo</string>
-    <string name="pref_units_for_actions">Unità per Azioni</string>
+    <string name="pref_units_for_actions">Unità per azioni</string>
     <string name="pref_show_date">Mostra data</string>
     <string name="pref_show_iob">Mostra IOB</string>
     <string name="pref_show_cob">Mostra COB</string>
     <string name="pref_show_delta">Mostra delta</string>
     <string name="pref_show_avgdelta">Mostra AvgDelta</string>
     <string name="pref_show_phone_battery">Mostra batteria telefono</string>
-    <string name="pref_show_rig_battery">Mostra Batteria Rig</string>
+    <string name="pref_show_rig_battery">Mostra batteria rig</string>
     <string name="pref_show_basal_rate">Mostra velocità basale</string>
     <string name="pref_show_loop_status">Mostra stato loop</string>
     <string name="pref_show_bg">Mostra BG</string>
@@ -52,8 +52,8 @@
     <string name="pref_high">Alto</string>
     <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Numeri grandi</string>
-    <string name="pref_ring_history">Storico Ring</string>
-    <string name="pref_light_ring_history">Storico Light Ring</string>
+    <string name="pref_ring_history">Ring History</string>
+    <string name="pref_light_ring_history">Light Ring History</string>
     <string name="pref_animations">Animazioni</string>
     <string name="pref_wizard_in_menu">Wizard in Menu</string>
     <string name="pref_prime_in_menu">Carica in Menu</string>
diff --git a/wear/src/main/res/values-pl-rPL/strings.xml b/wear/src/main/res/values-pl-rPL/strings.xml
index 805bd3677f..27cdfebbe2 100644
--- a/wear/src/main/res/values-pl-rPL/strings.xml
+++ b/wear/src/main/res/values-pl-rPL/strings.xml
@@ -50,6 +50,7 @@
     <string name="pref_low">Niska</string>
     <string name="pref_medium">Średnia</string>
     <string name="pref_high">Wysoka</string>
+    <string name="pref_auto">Auto</string>
     <string name="pref_big_numbers">Duże Cyfry</string>
     <string name="pref_ring_history">Historia glikemi</string>
     <string name="pref_light_ring_history">Dyskretniejsza historia</string>

From 1d1d57a45838f6f972b0fee3eb261e3d8e1c8459 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 00:04:09 +0200
Subject: [PATCH 079/400] fix SPBackupAgent

---
 .../info/nightscout/androidaps/utils/SPBackupAgent.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
index b3348ddc73..098b90c5d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/SPBackupAgent.java
@@ -5,13 +5,11 @@ import android.app.backup.SharedPreferencesBackupHelper;
 
 public class SPBackupAgent extends BackupAgentHelper {
 
-    // API 24
-    final String PREFS = getApplicationContext().getPackageName() + "_preferences";
-
-    final String PREFS_BACKUP_KEY = "SP";
-
     @Override
     public void onCreate() {
+        // API 24
+        final String PREFS = getApplicationContext().getPackageName() + "_preferences";
+        final String PREFS_BACKUP_KEY = "SP";
         SharedPreferencesBackupHelper helper =
                 new SharedPreferencesBackupHelper(this, PREFS);
         addHelper(PREFS_BACKUP_KEY, helper);

From e1df6c8145df7b010f636edf9e09e724a9c6c74f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 00:23:39 +0200
Subject: [PATCH 080/400] minSdkVersion 24

---
 app/build.gradle    | 2 +-
 core/build.gradle   | 2 +-
 dana/build.gradle   | 2 +-
 danar/build.gradle  | 2 +-
 danars/build.gradle | 2 +-
 wear/build.gradle   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 16b564b67c..ddd3aae0cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -124,7 +124,7 @@ android {
     ndkVersion "21.1.6352462"
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
diff --git a/core/build.gradle b/core/build.gradle
index b3045c0f35..b05a44d655 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
diff --git a/dana/build.gradle b/dana/build.gradle
index 1b83d2b2a2..4450b57df6 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
diff --git a/danar/build.gradle b/danar/build.gradle
index dc0b51d60e..83399cc43a 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
diff --git a/danars/build.gradle b/danars/build.gradle
index f3831ea0cb..80a5623e04 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
diff --git a/wear/build.gradle b/wear/build.gradle
index ffe7617086..fbfeeccfbc 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -46,7 +46,7 @@ android {
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion 28
         versionCode 1
         versionName "1.0.2"

From 66c567f0e70f1db601867d155f8984793c6670c5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 12:33:23 +0200
Subject: [PATCH 081/400] lint & deprecation

---
 .../info/nightscout/androidaps/MainApp.java   |  1 +
 .../pump/medtronic/data/dto/BasalProfile.java |  4 ---
 .../medtronic/data/dto/TempBasalPair.java     |  3 +--
 .../sensitivity/SensitivityOref1Plugin.java   | 26 ++++++++-----------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index a00c681e81..126ba47d22 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -113,6 +113,7 @@ public class MainApp extends DaggerApplication {
                 .build();
     }
 
+    @SuppressWarnings("deprecation")
     private void registerLocalBroadcastReceiver() {
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intents.ACTION_NEW_TREATMENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
index 61b235f1d2..f5ff77cf72 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
@@ -363,10 +363,6 @@ public class BasalProfile {
     }
 
 
-    private boolean isLogEnabled() {
-        return L.isEnabled(LTag.PUMPCOMM);
-    }
-
     public boolean verify(PumpType pumpType) {
 
         try {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
index caac54e122..bf3e771b1e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
@@ -42,8 +42,7 @@ public class TempBasalPair extends info.nightscout.androidaps.plugins.pump.commo
     public TempBasalPair(AAPSLogger aapsLogger, byte[] response) {
         super();
 
-        if (L.isEnabled(LTag.PUMPCOMM))
-            aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
 
         isPercent = response[0] == 1;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index 5740c7a5d1..fec1b6d960 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -2,6 +2,8 @@ package info.nightscout.androidaps.plugins.sensitivity;
 
 import androidx.collection.LongSparseArray;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -61,7 +63,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         this.dateUtil = dateUtil;
     }
 
-    @Override
+    @NotNull @Override
     public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
         // todo this method is called from the IobCobCalculatorPlugin, which leads to a circular
         // dependency, this should be avoided
@@ -92,7 +94,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         //[0] = 8 hour
         //[1] = 24 hour
         //Deviationshour has DeviationsArray
-        List<ArrayList> deviationsHour = Arrays.asList(new ArrayList(), new ArrayList());
+        List<ArrayList<Double>> deviationsHour = Arrays.asList(new ArrayList<>(), new ArrayList<>());
         List<String> pastSensitivityArray = Arrays.asList("", "");
         List<String> sensResultArray = Arrays.asList("", "");
         List<Double> ratioArray = Arrays.asList(0d, 0d);
@@ -118,7 +120,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             //hoursegment = 0 = 8 hour
             //hoursegment = 1 = 24 hour
             while (hoursegment < deviationsHour.size()) {
-                ArrayList deviationsArray = deviationsHour.get(hoursegment);
+                ArrayList<Double> deviationsArray = deviationsHour.get(hoursegment);
                 String pastSensitivity = pastSensitivityArray.get(hoursegment);
 
                 // reset deviations after site change
@@ -144,8 +146,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
                         deviationsArray.add(deviation);
 
 
-                for (int i = 0; i < autosensData.extraDeviation.size(); i++)
-                    deviationsArray.add(autosensData.extraDeviation.get(i));
+                deviationsArray.addAll(autosensData.extraDeviation);
 
                 if (deviationsArray.size() > deviationCategory.get(hoursegment)) {
                     deviationsArray.remove(0);
@@ -170,13 +171,12 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         // this dampens any large sensitivity changes detected based on too little data, without ignoring them completely
 
         for (int i = 0; i < deviationsHour.size(); i++) {
-            ArrayList deviations = deviationsHour.get(i);
+            ArrayList<Double> deviations = deviationsHour.get(i);
             getAapsLogger().debug(LTag.AUTOSENS, "Using most recent " + deviations.size() + " deviations");
             if (deviations.size() < deviationCategory.get(i)) {
                 int pad = (int) Math.round((1 - (double) deviations.size() / deviationCategory.get(i)) * 18);
                 getAapsLogger().debug(LTag.AUTOSENS, "Adding " + pad + " more zero deviations");
                 for (int d = 0; d < pad; d++) {
-                    ;
                     deviations.add(0d);
                 }
             }
@@ -190,11 +190,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             ArrayList deviationsArray = deviationsHour.get(hourused);
             String pastSensitivity = pastSensitivityArray.get(hourused);
             String sensResult = "(8 hours) ";
-            String senstime = sensResult;
-            if (hourused == 1) {
-                senstime = "(24 hours) ";
-                sensResult = senstime;
-            }
+            if (hourused == 1) sensResult = "(24 hours) ";
             String ratioLimit = "";
 
             Double[] deviations = new Double[deviationsArray.size()];
@@ -212,10 +208,10 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             double basalOff = 0;
 
             if (pSensitive < 0) { // sensitive
-                basalOff = pSensitive * (60 / 5) / Profile.toMgdl(sens, profile.getUnits());
+                basalOff = pSensitive * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
                 sensResult += "Excess insulin sensitivity detected";
             } else if (pResistant > 0) { // resistant
-                basalOff = pResistant * (60 / 5) / Profile.toMgdl(sens, profile.getUnits());
+                basalOff = pResistant * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
                 sensResult += "Excess insulin resistance detected";
             } else {
                 sensResult += "Sensitivity normal";
@@ -239,7 +235,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
         if (ratioArray.get(0) < ratioArray.get(1)) {
             key = 0;
         }
-        String message = hoursDetection.get(key) + " of sensitivity used";
+        //String message = hoursDetection.get(key) + " of sensitivity used";
         AutosensResult output = fillResult(ratioArray.get(key), current.cob, pastSensitivityArray.get(key), ratioLimitArray.get(key),
                 sensResultArray.get(key) + comparison, deviationsHour.get(key).size());
 

From 9c472e4e0536c5c385e471f3c43338961a281a41 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 12:58:59 +0200
Subject: [PATCH 082/400] simplify RL code

---
 .../RileyLinkCommunicationManager.java         | 18 +++++++++---------
 .../comm/MedtronicCommunicationManager.java    | 10 +++++-----
 .../comm/OmnipodCommunicationManager.java      | 11 ++++-------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index d352250071..12a0f0f4d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -59,23 +59,23 @@ public abstract class RileyLinkCommunicationManager {
 
 
     // All pump communications go through this function.
-    protected <E extends RLMessage> E sendAndListen(RLMessage msg, int timeout_ms, Class<E> clazz)
+    protected RLMessage sendAndListen(RLMessage msg, int timeout_ms)
             throws RileyLinkCommunicationException {
-        return sendAndListen(msg, timeout_ms, null, clazz);
+        return sendAndListen(msg, timeout_ms, null);
     }
 
-    private <E extends RLMessage> E sendAndListen(RLMessage msg, int timeout_ms, Integer extendPreamble_ms, Class<E> clazz)
+    private RLMessage sendAndListen(RLMessage msg, int timeout_ms, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
-        return sendAndListen(msg, timeout_ms, 0, extendPreamble_ms, clazz);
+        return sendAndListen(msg, timeout_ms, 0, extendPreamble_ms);
     }
 
     // For backward compatibility
-    private <E extends RLMessage> E sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, Integer extendPreamble_ms, Class<E> clazz)
+    private RLMessage sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
-        return sendAndListen(msg, timeout_ms, repeatCount, 0, extendPreamble_ms, clazz);
+        return sendAndListen(msg, timeout_ms, repeatCount, 0, extendPreamble_ms);
     }
 
-    protected <E extends RLMessage> E sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, int retryCount, Integer extendPreamble_ms, Class<E> clazz)
+    protected RLMessage sendAndListen(RLMessage msg, int timeout_ms, int repeatCount, int retryCount, Integer extendPreamble_ms)
             throws RileyLinkCommunicationException {
 
         // internal flag
@@ -88,7 +88,7 @@ public abstract class RileyLinkCommunicationManager {
                 (byte) 0, (byte) repeatCount, (byte) 0, (byte) 0, timeout_ms, (byte) retryCount, extendPreamble_ms);
 
         RadioResponse radioResponse = rfSpyResponse.getRadioResponse(injector);
-        E response = createResponseMessage(radioResponse.getPayload(), clazz);
+        RLMessage response = createResponseMessage(radioResponse.getPayload());
 
         if (response.isValid()) {
             // Mark this as the last time we heard from the pump.
@@ -124,7 +124,7 @@ public abstract class RileyLinkCommunicationManager {
     }
 
 
-    public abstract <E extends RLMessage> E createResponseMessage(byte[] payload, Class<E> clazz);
+    public abstract RLMessage createResponseMessage(byte[] payload);
 
 
     public abstract void setPumpDeviceState(PumpDeviceState pumpDeviceState);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index 086dc92cd7..83ed08ddd0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -87,9 +87,9 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
     }
 
     @Override
-    public <E extends RLMessage> E createResponseMessage(byte[] payload, Class<E> clazz) {
+    public RLMessage createResponseMessage(byte[] payload) {
         PumpMessage pumpMessage = new PumpMessage(aapsLogger, payload);
-        return (E) pumpMessage;
+        return pumpMessage;
     }
 
     @Override
@@ -170,7 +170,7 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
                 if (radioResponse.isValid()) {
 
-                    PumpMessage pumpResponse = createResponseMessage(radioResponse.getPayload(), PumpMessage.class);
+                    PumpMessage pumpResponse = (PumpMessage) createResponseMessage(radioResponse.getPayload());
 
                     if (!pumpResponse.isValid()) {
                         aapsLogger.warn(LTag.PUMPCOMM, "Response is invalid ! [interrupted={}, timeout={}]", rfSpyResponse.wasInterrupted(),
@@ -551,8 +551,8 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
 
     // All pump communications go through this function.
-    private PumpMessage sendAndListen(RLMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
-        return sendAndListen(msg, timeout_ms, PumpMessage.class);
+    protected PumpMessage sendAndListen(RLMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
+        return sendAndListen(msg, timeout_ms);
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
index e77befd258..89b6a43559 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
@@ -16,11 +16,8 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLink
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.OmnipodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
@@ -94,8 +91,8 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
     }
 
     @Override
-    public <E extends RLMessage> E createResponseMessage(byte[] payload, Class<E> clazz) {
-        return (E) new OmnipodPacket(payload);
+    public RLMessage createResponseMessage(byte[] payload) {
+        return new OmnipodPacket(payload);
     }
 
     @Override
@@ -301,7 +298,7 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
         OmnipodPacket ack = createAckPacket(podState, packetAddress, messageAddress);
         boolean quiet = false;
         while (!quiet) try {
-            sendAndListen(ack, 300, 1, 0, 40, OmnipodPacket.class);
+            sendAndListen(ack, 300, 1, 0, 40);
         } catch (RileyLinkCommunicationException ex) {
             if (RileyLinkBLEError.Timeout.equals(ex.getErrorCode())) {
                 quiet = true;
@@ -333,7 +330,7 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
         while (System.currentTimeMillis() < timeoutTime) {
             OmnipodPacket response = null;
             try {
-                response = sendAndListen(packet, responseTimeoutMilliseconds, repeatCount, 9, preambleExtensionMilliseconds, OmnipodPacket.class);
+                response = (OmnipodPacket) sendAndListen(packet, responseTimeoutMilliseconds, repeatCount, 9, preambleExtensionMilliseconds);
             } catch (RileyLinkCommunicationException | OmnipodException ex) {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in exchangePackets: " + ex.getClass().getSimpleName() + ": " + ex.getMessage());
                 continue;

From b7ef1910030059102f68d79442585a0fd8fe5b20 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 13:34:32 +0200
Subject: [PATCH 083/400] lint & deprecation

---
 .../general/nsclient/NSClientPlugin.java      | 23 ++++---
 .../general/nsclient/acks/NSAddAck.java       | 29 +++++----
 .../general/nsclient/acks/NSUpdateAck.java    | 12 ++--
 .../general/nsclient/data/NSDeviceStatus.java | 19 +++---
 .../nsclient/services/NSClientService.java    | 61 ++++++++-----------
 .../activities/TDDStatsActivity.java          |  2 +-
 .../nightscout/androidaps/data/IobTotal.java  | 10 +--
 .../androidaps/data/ProfileIntervals.java     |  1 -
 .../androidaps/interfaces/Constraint.java     | 16 ++---
 .../plugins/aps/loop/APSResult.java           |  8 +--
 .../nightscout/androidaps/utils/HtmlHelper.kt |  0
 11 files changed, 85 insertions(+), 96 deletions(-)
 rename {app => core}/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt (100%)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
index 9443e23e39..1764142432 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
@@ -7,7 +7,6 @@ import android.content.ServiceConnection;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
-import android.text.Html;
 import android.text.Spanned;
 
 import androidx.preference.PreferenceFragmentCompat;
@@ -42,6 +41,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientS
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
 import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.HtmlHelper;
 import info.nightscout.androidaps.utils.ToastUtils;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -56,13 +56,14 @@ public class NSClientPlugin extends PluginBase {
     private final RxBusWrapper rxBus;
     private final ResourceHelper resourceHelper;
     private final Context context;
+    private final FabricPrivacy fabricPrivacy;
     private final SP sp;
     private final Config config;
 
     public Handler handler;
 
     private final List<EventNSClientNewLog> listLog = new ArrayList<>();
-    Spanned textLog = Html.fromHtml("");
+    Spanned textLog = HtmlHelper.INSTANCE.fromHtml("");
 
     public boolean paused;
     boolean autoscroll;
@@ -80,6 +81,7 @@ public class NSClientPlugin extends PluginBase {
             RxBusWrapper rxBus,
             ResourceHelper resourceHelper,
             Context context,
+            FabricPrivacy fabricPrivacy,
             SP sp,
             NsClientReceiverDelegate nsClientReceiverDelegate,
             Config config
@@ -98,6 +100,7 @@ public class NSClientPlugin extends PluginBase {
         this.rxBus = rxBus;
         this.resourceHelper = resourceHelper;
         this.context = context;
+        this.fabricPrivacy = fabricPrivacy;
         this.sp = sp;
         this.nsClientReceiverDelegate = nsClientReceiverDelegate;
         this.config = config;
@@ -134,17 +137,17 @@ public class NSClientPlugin extends PluginBase {
                 .subscribe(event -> {
                     status = event.getStatus(resourceHelper);
                     rxBus.send(new EventNSClientUpdateGUI());
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventNetworkChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
@@ -153,7 +156,7 @@ public class NSClientPlugin extends PluginBase {
                     if (nsClientService != null) {
                         context.unbindService(mConnection);
                     }
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventNSClientNewLog.class)
@@ -161,17 +164,17 @@ public class NSClientPlugin extends PluginBase {
                 .subscribe(event -> {
                     addToLog(event);
                     aapsLogger.debug(LTag.NSCLIENT, event.getAction() + " " + event.getLogText());
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventChargingState.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> nsClientReceiverDelegate.onStatusEvent(event), fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventNSClientResend.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> resend(event.getReason()), exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(event -> resend(event.getReason()), fabricPrivacy::logException)
         );
     }
 
@@ -236,7 +239,7 @@ public class NSClientPlugin extends PluginBase {
                     newTextLog.append(log.toPreparedHtml());
                 }
             }
-            textLog = Html.fromHtml(newTextLog.toString());
+            textLog = HtmlHelper.INSTANCE.fromHtml(newTextLog.toString());
         } catch (OutOfMemoryError e) {
             ToastUtils.showToastInUiThread(context, rxBus, "Out of memory!\nStop using this phone !!!", R.raw.error);
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
index 8541253f81..dbd9151938 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAddAck.java
@@ -2,13 +2,11 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import io.socket.client.Ack;
 
@@ -16,16 +14,23 @@ import io.socket.client.Ack;
  * Created by mike on 29.12.2015.
  */
 public class NSAddAck extends Event implements Ack {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
+    private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+
     public String _id = null;
     public String nsClientID = null;
     public JSONObject json = null;
 
+    public NSAddAck(AAPSLogger aapsLogger, RxBusWrapper rxBus) {
+        this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
+    }
+
     public void call(Object... args) {
         // Regular response
         try {
             JSONArray responsearray = (JSONArray) (args[0]);
-            JSONObject response = null;
+            JSONObject response;
             if (responsearray.length() > 0) {
                 response = responsearray.getJSONObject(0);
                 _id = response.getString("_id");
@@ -34,10 +39,10 @@ public class NSAddAck extends Event implements Ack {
                     nsClientID = response.getString("NSCLIENT_ID");
                 }
             }
-            RxBus.Companion.getINSTANCE().send(this);
+            rxBus.send(this);
             return;
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         // Check for not authorized
         try {
@@ -45,15 +50,13 @@ public class NSAddAck extends Event implements Ack {
             if (response.has("result")) {
                 _id = null;
                 if (response.getString("result").contains("Not")) {
-                    RxBus.Companion.getINSTANCE().send(new EventNSClientRestart());
+                    rxBus.send(new EventNSClientRestart());
                     return;
                 }
-                if (L.isEnabled(LTag.NSCLIENT))
-                    log.debug("DBACCESS " + response.getString("result"));
+                aapsLogger.debug(LTag.NSCLIENT, "DBACCESS " + response.getString("result"));
             }
-            return;
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
index bc79bd2739..3b500c3ec8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
@@ -2,11 +2,10 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import info.nightscout.androidaps.events.Event;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBus;
 import io.socket.client.Ack;
 
@@ -14,7 +13,7 @@ import io.socket.client.Ack;
  * Created by mike on 21.02.2016.
  */
 public class NSUpdateAck extends Event implements Ack {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
+    private final AAPSLogger aapsLogger;
     public boolean result = false;
     public String _id;
     public String action;
@@ -27,17 +26,18 @@ public class NSUpdateAck extends Event implements Ack {
                     result = true;
                 else if (response.getString("result").equals("Missing _id")) {
                     result = true;
-                    log.debug("Internal error: Missing _id returned on dbUpdate ack");
+                    aapsLogger.debug(LTag.NSCLIENT, "Internal error: Missing _id returned on dbUpdate ack");
                 }
                 RxBus.Companion.getINSTANCE().send(this);
             } catch (JSONException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception", e);
             }
     }
 
-    public NSUpdateAck(String action, String _id) {
+    public NSUpdateAck(String action, String _id, AAPSLogger aapsLogger) {
         super();
         this.action = action;
         this._id = _id;
+        this.aapsLogger = aapsLogger;
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
index 8e5da2448d..7195435515 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
@@ -20,6 +20,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.HtmlHelper;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -158,7 +159,7 @@ public class NSDeviceStatus {
     public Spanned getExtendedPumpStatus() {
         if (deviceStatusPumpData != null && deviceStatusPumpData.extended != null)
             return deviceStatusPumpData.extended;
-        return Html.fromHtml("");
+        return HtmlHelper.INSTANCE.fromHtml("");
     }
 
     public Spanned getPumpStatus() {
@@ -170,7 +171,7 @@ public class NSDeviceStatus {
         string.append(": </span>");
 
         if (deviceStatusPumpData == null)
-            return Html.fromHtml("");
+            return HtmlHelper.INSTANCE.fromHtml("");
 
         // test warning level
         int level = Levels.INFO;
@@ -225,7 +226,7 @@ public class NSDeviceStatus {
 
         string.append("</span>"); // color
 
-        return Html.fromHtml(string.toString());
+        return HtmlHelper.INSTANCE.fromHtml(string.toString());
     }
 
     static class DeviceStatusPumpData {
@@ -273,7 +274,7 @@ public class NSDeviceStatus {
                     String value = extendedJson.getString(key);
                     exteneded.append("<b>").append(key).append(":</b> ").append(value).append("<br>");
                 }
-                deviceStatusPumpData.extended = Html.fromHtml(exteneded.toString());
+                deviceStatusPumpData.extended = HtmlHelper.INSTANCE.fromHtml(exteneded.toString());
             }
         } catch (Exception e) {
             aapsLogger.error("Unhandled exception", e);
@@ -345,7 +346,7 @@ public class NSDeviceStatus {
         }
         string.append("</span>"); // color
 
-        return Html.fromHtml(string.toString());
+        return HtmlHelper.INSTANCE.fromHtml(string.toString());
     }
 
     public static long getOpenApsTimestamp() {
@@ -365,11 +366,11 @@ public class NSDeviceStatus {
                 string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockEnacted)).append("</b> ").append(deviceStatusOpenAPSData.enacted.getString("reason")).append("<br>");
             if (deviceStatusOpenAPSData.suggested != null)
                 string.append("<b>").append(DateUtil.minAgo(resourceHelper, deviceStatusOpenAPSData.clockSuggested)).append("</b> ").append(deviceStatusOpenAPSData.suggested.getString("reason")).append("<br>");
-            return Html.fromHtml(string.toString());
+            return HtmlHelper.INSTANCE.fromHtml(string.toString());
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
         }
-        return Html.fromHtml("");
+        return HtmlHelper.INSTANCE.fromHtml("");
     }
 
     // ********* Uploader data ***********
@@ -441,7 +442,7 @@ public class NSDeviceStatus {
 
         string.append(minBattery);
         string.append("%");
-        return Html.fromHtml(string.toString());
+        return HtmlHelper.INSTANCE.fromHtml(string.toString());
     }
 
     public Spanned getExtendedUploaderStatus() {
@@ -455,7 +456,7 @@ public class NSDeviceStatus {
             string.append("<b>").append(device).append(":</b> ").append(uploader.battery).append("%<br>");
         }
 
-        return Html.fromHtml(string.toString());
+        return HtmlHelper.INSTANCE.fromHtml(string.toString());
     }
 
     public static APSResult getAPSResult(HasAndroidInjector injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index 195bb577cf..e2835b163f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -19,7 +19,6 @@ import com.j256.ormlite.dao.CloseableIterator;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import java.net.URISyntaxException;
 import java.sql.SQLException;
@@ -41,9 +40,7 @@ import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.ProfileStore;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.NSClientPlugin;
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue;
@@ -87,13 +84,13 @@ public class NSClientService extends DaggerService {
     @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject SP sp;
+    @Inject FabricPrivacy fabricPrivacy;
     @Inject NSClientPlugin nsClientPlugin;
     @Inject BuildHelper buildHelper;
     @Inject Config config;
     @Inject DateUtil dateUtil;
     @Inject UploadQueue uploadQueue;
 
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
     private CompositeDisposable disposable = new CompositeDisposable();
 
     static public PowerManager.WakeLock mWakeLock;
@@ -157,7 +154,7 @@ public class NSClientService extends DaggerService {
                         destroy();
                         initialize();
                     }
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventPreferenceChange.class)
@@ -171,17 +168,16 @@ public class NSClientService extends DaggerService {
                         destroy();
                         initialize();
                     }
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventAppExit.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
-                    if (L.isEnabled(LTag.NSCLIENT))
-                        log.debug("EventAppExit received");
+                    aapsLogger.debug(LTag.NSCLIENT, "EventAppExit received");
                     destroy();
                     stopSelf();
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(EventNSClientRestart.class)
@@ -189,22 +185,22 @@ public class NSClientService extends DaggerService {
                 .subscribe(event -> {
                     latestDateInReceivedData = 0;
                     restart();
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(NSAuthAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(this::processAuthAck, exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(this::processAuthAck, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(NSUpdateAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(this::processUpdateAck, exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(this::processUpdateAck, fabricPrivacy::logException)
         );
         disposable.add(rxBus
                 .toObservable(NSAddAck.class)
                 .observeOn(Schedulers.io())
-                .subscribe(this::processAddAck, exception -> FabricPrivacy.getInstance().logException(exception))
+                .subscribe(this::processAddAck, fabricPrivacy::logException)
         );
     }
 
@@ -274,6 +270,7 @@ public class NSClientService extends DaggerService {
         return START_STICKY;
     }
 
+    @SuppressWarnings("deprecation")
     public void initialize() {
         dataCounter = 0;
 
@@ -366,8 +363,7 @@ public class NSClientService extends DaggerService {
     private Emitter.Listener onDisconnect = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            if (L.isEnabled(LTag.NSCLIENT))
-                log.debug("disconnect reason: {}", args);
+            aapsLogger.debug(LTag.NSCLIENT, "disconnect reason: {}", args);
             rxBus.send(new EventNSClientNewLog("NSCLIENT", "disconnect event"));
         }
     };
@@ -401,7 +397,7 @@ public class NSClientService extends DaggerService {
             authMessage.put("from", latestDateInReceivedData); // send data newer than
             authMessage.put("secret", nsAPIhashCode);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             return;
         }
         rxBus.send(new EventNSClientNewLog("AUTH", "requesting auth"));
@@ -455,8 +451,7 @@ public class NSClientService extends DaggerService {
                 data = (JSONObject) args[0];
                 handleAnnouncement(data);
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
-                return;
+                aapsLogger.error("Unhandled exception", e);
             }
         }
     };
@@ -482,8 +477,7 @@ public class NSClientService extends DaggerService {
                 data = (JSONObject) args[0];
                 handleAlarm(data);
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
-                return;
+                aapsLogger.error("Unhandled exception", e);
             }
         }
     };
@@ -494,7 +488,7 @@ public class NSClientService extends DaggerService {
             data = (JSONObject) args[0];
             handleUrgentAlarm(data);
         } catch (Exception e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     };
 
@@ -517,8 +511,7 @@ public class NSClientService extends DaggerService {
                 rxBus.send(new EventDismissNotification(Notification.NSURGENTALARM));
                 aapsLogger.debug(LTag.NSCLIENT, data.toString());
             } catch (Exception e) {
-                log.error("Unhandled exception", e);
-                return;
+                aapsLogger.error("Unhandled exception", e);
             }
         }
     };
@@ -723,7 +716,7 @@ public class NSClientService extends DaggerService {
                         }
                         rxBus.send(new EventNSClientNewLog("LAST", dateUtil.dateAndTimeString(latestDateInReceivedData)));
                     } catch (JSONException e) {
-                        log.error("Unhandled exception", e);
+                        aapsLogger.error("Unhandled exception", e);
                     }
                     //rxBus.send(new EventNSClientNewLog("NSCLIENT", "onDataUpdate end");
                 } finally {
@@ -743,7 +736,7 @@ public class NSClientService extends DaggerService {
             mSocket.emit("dbUpdate", message, ack);
             rxBus.send(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -757,7 +750,7 @@ public class NSClientService extends DaggerService {
             mSocket.emit("dbUpdateUnset", message, ack);
             rxBus.send(new EventNSClientNewLog("DBUPDATEUNSET " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -770,7 +763,7 @@ public class NSClientService extends DaggerService {
             mSocket.emit("dbRemove", message, ack);
             rxBus.send(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -783,7 +776,7 @@ public class NSClientService extends DaggerService {
             mSocket.emit("dbAdd", message, ack);
             rxBus.send(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -818,16 +811,16 @@ public class NSClientService extends DaggerService {
                     while (iterator.hasNext() && maxcount > 0) {
                         DbRequest dbr = iterator.next();
                         if (dbr.action.equals("dbAdd")) {
-                            NSAddAck addAck = new NSAddAck();
+                            NSAddAck addAck = new NSAddAck(aapsLogger, rxBus);
                             dbAdd(dbr, addAck);
                         } else if (dbr.action.equals("dbRemove")) {
-                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id);
+                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
                             dbRemove(dbr, removeAck);
                         } else if (dbr.action.equals("dbUpdate")) {
-                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id);
+                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
                             dbUpdate(dbr, updateAck);
                         } else if (dbr.action.equals("dbUpdateUnset")) {
-                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id);
+                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
                             dbUpdateUnset(dbr, updateUnsetAck);
                         }
                         maxcount--;
@@ -836,7 +829,7 @@ public class NSClientService extends DaggerService {
                     iterator.close();
                 }
             } catch (SQLException e) {
-                log.error("Unhandled exception", e);
+                aapsLogger.error("Unhandled exception", e);
             }
 
             rxBus.send(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
@@ -1038,7 +1031,7 @@ public class NSClientService extends DaggerService {
                 ret.add(newarr);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             ret = new ArrayList<>();
             ret.add(array);
         }
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
index 5208898ddc..905655587f 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.java
@@ -296,7 +296,7 @@ public class TDDStatsActivity extends NoSplashAppCompatActivity {
         historyList = historyList.subList(0, Math.min(10, historyList.size()));
 
         //fill single gaps
-        dummies = new LinkedList();
+        dummies = new LinkedList<>();
         DateFormat df = new SimpleDateFormat("dd.MM.", Locale.getDefault());
         for (int i = 0; i < historyList.size() - 1; i++) {
             TDD elem1 = historyList.get(i);
diff --git a/core/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/core/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index 7538cfa9ad..adefc76767 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -2,19 +2,15 @@ package info.nightscout.androidaps.data;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Date;
 
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
 import info.nightscout.androidaps.plugins.general.overview.graphExtensions.PointsWithLabelGraphSeries;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.Round;
 
 public class IobTotal implements DataPointWithLabelInterface {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(IobTotal.class);
 
     public double iob;
     public double activity;
@@ -108,8 +104,7 @@ public class IobTotal implements DataPointWithLabelInterface {
             json.put("basaliob", basaliob);
             json.put("activity", activity);
             json.put("time", DateUtil.toISOString(new Date()));
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+        } catch (JSONException ignored) {
         }
         return json;
     }
@@ -139,8 +134,7 @@ public class IobTotal implements DataPointWithLabelInterface {
                 JSONObject iwzt = iobWithZeroTemp.determineBasalJson();
                 json.put("iobWithZeroTemp", iwzt);
             }
-        } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+        } catch (JSONException ignored) {
         }
         return json;
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
index c93c549afc..ac3db85d2a 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
@@ -20,7 +20,6 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 // When no interval match the lastest record without duration is used
 
 public class ProfileIntervals<T extends Interval> {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(ProfileIntervals.class);
 
     private LongSparseArray<T> rawData; // oldest at index 0
 
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
index 4ce36b6abc..461b89beaf 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Constraint.java
@@ -10,7 +10,7 @@ import info.nightscout.androidaps.logging.LTag;
  * Created by mike on 19.03.2018.
  */
 
-public class Constraint<T extends Comparable> {
+public class Constraint<T extends Comparable<T>> {
     private T value;
     private T originalValue;
 
@@ -85,14 +85,12 @@ public class Constraint<T extends Comparable> {
         return from.getClass().getSimpleName().replace("Plugin", "");
     }
 
-    public Constraint addReason(String reason, Object from) {
+    public void addReason(String reason, Object from) {
         reasons.add(translateFrom(from) + ": " + reason);
-        return this;
     }
 
-    public Constraint addMostLimingReason(String reason, Object from) {
+    private void addMostLimingReason(String reason, Object from) {
         mostLimiting.add(translateFrom(from) + ": " + reason);
-        return this;
     }
 
     public String getReasons(AAPSLogger aapsLogger) {
@@ -102,7 +100,7 @@ public class Constraint<T extends Comparable> {
             if (count++ != 0) sb.append("\n");
             sb.append(r);
         }
-        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
         return sb.toString();
     }
 
@@ -117,7 +115,7 @@ public class Constraint<T extends Comparable> {
             if (count++ != 0) sb.append("\n");
             sb.append(r);
         }
-        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting origial value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
+        aapsLogger.debug(LTag.CONSTRAINTS, "Limiting original value: " + originalValue + " to " + value + ". Reason: " + sb.toString());
         return sb.toString();
     }
 
@@ -126,8 +124,6 @@ public class Constraint<T extends Comparable> {
     }
 
     public void copyReasons(Constraint<?> another) {
-        for (String s : another.getReasonList()) {
-            reasons.add(s);
-        }
+        reasons.addAll(another.getReasonList());
     }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index edec4da528..84ab8e5661 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.aps.loop;
 
-import android.text.Html;
 import android.text.Spanned;
 
 import org.json.JSONArray;
@@ -20,14 +19,15 @@ import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.Constraint;
+import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
-import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.utils.DecimalFormatter;
+import info.nightscout.androidaps.utils.HtmlHelper;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -153,9 +153,9 @@ public class APSResult {
 
             // reason
             ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
-            return Html.fromHtml(ret);
+            return HtmlHelper.INSTANCE.fromHtml(ret);
         } else
-            return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
+            return HtmlHelper.INSTANCE.fromHtml(resourceHelper.gs(R.string.nochangerequested));
     }
 
     public APSResult newAndClone(HasAndroidInjector injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
rename to core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt

From 7060c51681c1dfcdf21d4ddb47561dd53e3d75b5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 14:33:47 +0200
Subject: [PATCH 084/400] lint & deprecation

---
 .../androidaps/db/DatabaseHelper.java         | 337 ++++++++----------
 .../androidaps/db/DatabaseHelperProvider.java |   4 +
 .../dependencyInjection/DataClassesModule.kt  |  10 +-
 .../plugins/general/food/FoodPlugin.kt        |   2 +-
 .../plugins/general/food/FoodService.java     |  65 ++--
 .../general/nsclient/NSClientFragment.java    |   3 +-
 .../general/nsclient/acks/NSAuthAck.java      |  17 +-
 .../general/nsclient/acks/NSUpdateAck.java    |   9 +-
 .../nsclient/services/NSClientService.java    |   8 +-
 .../ResetRileyLinkConfigurationTask.java      |   7 +-
 .../pump/insight/InsightAlertService.java     |   4 +-
 .../activities/InsightAlertActivity.java      |   3 +-
 .../plugins/pump/virtual/VirtualPumpPlugin.kt |  11 -
 .../plugins/treatments/TreatmentService.java  |   6 +-
 .../utils/NumberPickerVertical.java           |   2 -
 .../androidaps/data/ProfileIntervals.java     |   8 +-
 .../nightscout/androidaps/db/DbRequest.java   |   4 -
 .../nightscout/androidaps/db/TempTarget.java  |   5 -
 .../interfaces/DatabaseHelperInterface.kt     |   7 +-
 .../plugins/aps/loop/DeviceStatus.java        |   9 +-
 .../androidaps/plugins/bus/RxBus.kt           |  28 --
 .../androidaps/plugins/bus/RxBusWrapper.kt    |  10 +-
 .../plugins/general/nsclient/NSUpload.java    |   2 +-
 23 files changed, 244 insertions(+), 317 deletions(-)
 delete mode 100644 core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 212a26dfd8..50a7d3ed47 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -17,7 +17,6 @@ import com.j256.ormlite.table.TableUtils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -29,6 +28,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.dana.comm.RecordTypes;
@@ -47,10 +48,9 @@ import info.nightscout.androidaps.events.EventTempTargetChange;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.ProfileInterface;
 import info.nightscout.androidaps.interfaces.ProfileStore;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
@@ -71,7 +71,9 @@ import info.nightscout.androidaps.utils.T;
  * direct calls to the corresponding methods (eg. resetDatabases) should be done by a central service.
  */
 public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject VirtualPumpPlugin virtualPumpPlugin;
 
     public static final String DATABASE_NAME = "AndroidAPSDb";
     public static final String DATABASE_BGREADINGS = "BgReadings";
@@ -114,6 +116,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public DatabaseHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        StaticInjector.Companion.getInstance().androidInjector().inject(this);
         onCreate(getWritableDatabase(), getConnectionSource());
         //onUpgrade(getWritableDatabase(), getConnectionSource(), 1,1);
     }
@@ -121,8 +124,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     @Override
     public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) {
         try {
-            if (L.isEnabled(LTag.DATABASE))
-                log.info("onCreate");
+            aapsLogger.info(LTag.DATABASE, "onCreate");
             TableUtils.createTableIfNotExists(connectionSource, TempTarget.class);
             TableUtils.createTableIfNotExists(connectionSource, BgReading.class);
             TableUtils.createTableIfNotExists(connectionSource, DanaRHistoryRecord.class);
@@ -141,7 +143,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             database.execSQL("INSERT INTO sqlite_sequence (name, seq) SELECT \"" + DATABASE_INSIGHT_PUMP_IDS + "\", " + System.currentTimeMillis() + " " +
                     "WHERE NOT EXISTS (SELECT 1 FROM sqlite_sequence WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\")");
         } catch (SQLException e) {
-            log.error("Can't create database", e);
+            aapsLogger.error("Can't create database", e);
             throw new RuntimeException(e);
         }
     }
@@ -153,7 +155,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             this.newVersion = newVersion;
 
             if (oldVersion < 7) {
-                log.info(DatabaseHelper.class.getName(), "onUpgrade");
+                aapsLogger.info(LTag.DATABASE, "onUpgrade");
                 TableUtils.dropTable(connectionSource, TempTarget.class, true);
                 TableUtils.dropTable(connectionSource, BgReading.class, true);
                 TableUtils.dropTable(connectionSource, DanaRHistoryRecord.class, true);
@@ -176,15 +178,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 database.execSQL("UPDATE sqlite_sequence SET seq = " + System.currentTimeMillis() + " WHERE name = \"" + DATABASE_INSIGHT_PUMP_IDS + "\"");
             }
         } catch (SQLException e) {
-            log.error("Can't drop databases", e);
+            aapsLogger.error("Can't drop databases", e);
             throw new RuntimeException(e);
         }
     }
 
     @Override
     public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        log.info("Do nothing for downgrading...");
-        log.debug("oldVersion: {}, newVersion: {}", oldVersion, newVersion);
+        aapsLogger.info(LTag.DATABASE, "Do nothing for downgrading...");
+        aapsLogger.info(LTag.DATABASE, "oldVersion: {}, newVersion: {}", oldVersion, newVersion);
     }
 
     public int getOldVersion() {
@@ -225,9 +227,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, PodHistory.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
+        virtualPumpPlugin.setFakingStatus(true);
         scheduleBgChange(null); // trigger refresh
         scheduleTemporaryBasalChange();
         scheduleExtendedBolusChange();
@@ -238,7 +240,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 new java.util.TimerTask() {
                     @Override
                     public void run() {
-                        RxBus.Companion.getINSTANCE().send(new EventRefreshOverview("resetDatabases", false));
+                        rxBus.send(new EventRefreshOverview("resetDatabases", false));
                     }
                 },
                 3000
@@ -250,7 +252,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, TempTarget.class, true);
             TableUtils.createTableIfNotExists(connectionSource, TempTarget.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleTemporaryTargetChange();
     }
@@ -261,9 +263,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, TemporaryBasal.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
-        VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(false);
+        virtualPumpPlugin.setFakingStatus(false);
         scheduleTemporaryBasalChange();
     }
 
@@ -273,7 +275,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, ExtendedBolus.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleExtendedBolusChange();
     }
@@ -283,7 +285,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, CareportalEvent.class, true);
             TableUtils.createTableIfNotExists(connectionSource, CareportalEvent.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -293,7 +295,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, ProfileSwitch.class, true);
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleProfileSwitchChange();
     }
@@ -303,7 +305,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.dropTable(connectionSource, TDD.class, true);
             TableUtils.createTableIfNotExists(connectionSource, TDD.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -361,11 +363,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return getDao(PodHistory.class);
     }
 
-    public static long roundDateToSec(long date) {
+    public long roundDateToSec(long date) {
         long rounded = date - date % 1000;
         if (rounded != date)
-            if (L.isEnabled(LTag.DATABASE))
-                log.debug("Rounding " + date + " to " + rounded);
+            aapsLogger.debug(LTag.DATABASE, "Rounding " + date + " to " + rounded);
         return rounded;
     }
     // -------------------  BgReading handling -----------------------
@@ -376,23 +377,20 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             BgReading old = getDaoBgReadings().queryForId(bgReading.date);
             if (old == null) {
                 getDaoBgReadings().create(bgReading);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("BG: New record from: " + from + " " + bgReading.toString());
+                aapsLogger.debug(LTag.DATABASE, "BG: New record from: " + from + " " + bgReading.toString());
                 scheduleBgChange(bgReading);
                 return true;
             }
             if (!old.isEqual(bgReading)) {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("BG: Similiar found: " + old.toString());
+                aapsLogger.debug(LTag.DATABASE, "BG: Similiar found: " + old.toString());
                 old.copyFrom(bgReading);
                 getDaoBgReadings().update(old);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("BG: Updating record from: " + from + " New data: " + old.toString());
+                aapsLogger.debug(LTag.DATABASE, "BG: Updating record from: " + from + " New data: " + old.toString());
                 scheduleBgChange(bgReading);
                 return false;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return false;
     }
@@ -402,16 +400,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoBgReadings().update(bgReading);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    private static void scheduleBgChange(@Nullable final BgReading bgReading) {
+    private void scheduleBgChange(@Nullable final BgReading bgReading) {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing EventNewBg");
-                RxBus.Companion.getINSTANCE().send(new EventNewBG(bgReading));
+                aapsLogger.debug(LTag.DATABASE, "Firing EventNewBg");
+                rxBus.send(new EventNewBG(bgReading));
                 scheduledBgPost = null;
             }
         }
@@ -437,7 +434,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             bgReadings = daoBgreadings.query(preparedQuery);
             return bgReadings;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -454,7 +451,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             bgReadings = daoBgreadings.query(preparedQuery);
             return bgReadings;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -471,7 +468,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             bgReadings = daoBgreadings.query(preparedQuery);
             return bgReadings;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<BgReading>();
     }
@@ -482,7 +479,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             Dao<TDD, String> dao = getDaoTDD();
             dao.createOrUpdate(tdd);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -495,7 +492,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             PreparedQuery<TDD> preparedQuery = queryBuilder.prepare();
             tddList = getDaoTDD().query(preparedQuery);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             tddList = new ArrayList<>();
         }
         return tddList;
@@ -514,7 +511,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             PreparedQuery<TDD> preparedQuery = queryBuilder.prepare();
             tddList = getDaoTDD().query(preparedQuery);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             tddList = new ArrayList<>();
         }
         return tddList;
@@ -530,7 +527,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().delete(dbr);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -539,7 +536,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().deleteById(nsClientId);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return 0;
     }
@@ -556,7 +553,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 delete(r);
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -564,7 +561,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             TableUtils.clearTable(connectionSource, DbRequest.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -572,7 +569,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoDbRequest().closeableIterator();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             return null;
         }
     }
@@ -603,7 +600,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempTargets = daoTempTargets.query(preparedQuery);
             return tempTargets;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<TempTarget>();
     }
@@ -620,7 +617,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempTargets = daoTempTargets.query(preparedQuery);
             return tempTargets;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<TempTarget>();
     }
@@ -637,8 +634,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         getDaoTempTargets().delete(old); // need to delete/create because date may change too
                         old.copyFrom(tempTarget);
                         getDaoTempTargets().create(old);
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("TEMPTARGET: Updating record by date from: " + Source.getString(tempTarget.source) + " " + old.toString());
+                        aapsLogger.debug(LTag.DATABASE, "TEMPTARGET: Updating record by date from: " + Source.getString(tempTarget.source) + " " + old.toString());
                         scheduleTemporaryTargetChange();
                         return true;
                     }
@@ -657,28 +653,25 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             getDaoTempTargets().delete(old); // need to delete/create because date may change too
                             old.copyFrom(tempTarget);
                             getDaoTempTargets().create(old);
-                            if (L.isEnabled(LTag.DATABASE))
-                                log.debug("TEMPTARGET: Updating record by _id from: " + Source.getString(tempTarget.source) + " " + old.toString());
+                            aapsLogger.debug(LTag.DATABASE, "TEMPTARGET: Updating record by _id from: " + Source.getString(tempTarget.source) + " " + old.toString());
                             scheduleTemporaryTargetChange();
                             return true;
                         }
                     }
                 }
                 getDaoTempTargets().create(tempTarget);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
+                aapsLogger.debug(LTag.DATABASE, "TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
                 scheduleTemporaryTargetChange();
                 return true;
             }
             if (tempTarget.source == Source.USER) {
                 getDaoTempTargets().create(tempTarget);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
+                aapsLogger.debug(LTag.DATABASE, "TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
                 scheduleTemporaryTargetChange();
                 return true;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return false;
     }
@@ -688,16 +681,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTempTargets().delete(tempTarget);
             scheduleTemporaryTargetChange();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    private static void scheduleTemporaryTargetChange() {
+    private void scheduleTemporaryTargetChange() {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing EventTempTargetChange");
-                RxBus.Companion.getINSTANCE().send(new EventTempTargetChange());
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTempTargetChange");
+                rxBus.send(new EventTempTargetChange());
                 scheduledTemTargetPost = null;
             }
         }
@@ -739,14 +731,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     .source(Source.NIGHTSCOUT);
             createOrUpdate(tempTarget);
         } catch (JSONException e) {
-            log.error("Unhandled exception: " + trJson.toString(), e);
+            aapsLogger.error("Unhandled exception: " + trJson.toString(), e);
         }
     }
 
     public void deleteTempTargetById(String _id) {
         TempTarget stored = findTempTargetById(_id);
         if (stored != null) {
-            log.debug("TEMPTARGET: Removing TempTarget record from database: " + stored.toString());
+            aapsLogger.debug(LTag.DATABASE, "TEMPTARGET: Removing TempTarget record from database: " + stored.toString());
             delete(stored);
             scheduleTemporaryTargetChange();
         }
@@ -766,7 +758,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -783,7 +775,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             }
 
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -798,7 +790,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             PreparedQuery<DanaRHistoryRecord> preparedQuery = queryBuilder.prepare();
             historyList = getDaoDanaRHistory().query(preparedQuery);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
             historyList = new ArrayList<>();
         }
         return historyList;
@@ -821,8 +813,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 List<TemporaryBasal> trList = getDaoTemporaryBasal().query(preparedQuery);
                 if (trList.size() > 0) {
                     // do nothing, pump history record cannot be changed
-                    if (L.isEnabled(LTag.DATABASE))
-                        log.debug("TEMPBASAL: Already exists from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
+                    aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: Already exists from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
                     return false;
                 }
 
@@ -839,8 +830,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     old.copyFromPump(tempBasal);
                     old.source = Source.PUMP;
 
-                    if (L.isEnabled(LTag.DATABASE))
-                        log.debug("TEMPBASAL: Updated record with Pump Data : " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
+                    aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: Updated record with Pump Data : " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
 
                     getDaoTemporaryBasal().update(old);
 
@@ -851,8 +841,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 }
 
                 getDaoTemporaryBasal().create(tempBasal);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
+                aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
                 updateEarliestDataChange(tempBasal.date);
                 scheduleTemporaryBasalChange();
                 return true;
@@ -869,8 +858,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         getDaoTemporaryBasal().delete(old); // need to delete/create because date may change too
                         old.copyFrom(tempBasal);
                         getDaoTemporaryBasal().create(old);
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("TEMPBASAL: Updating record by date from: " + Source.getString(tempBasal.source) + " " + old.toString());
+                        aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: Updating record by date from: " + Source.getString(tempBasal.source) + " " + old.toString());
                         updateEarliestDataChange(oldDate);
                         updateEarliestDataChange(old.date);
                         scheduleTemporaryBasalChange();
@@ -892,8 +880,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             getDaoTemporaryBasal().delete(old); // need to delete/create because date may change too
                             old.copyFrom(tempBasal);
                             getDaoTemporaryBasal().create(old);
-                            if (L.isEnabled(LTag.DATABASE))
-                                log.debug("TEMPBASAL: Updating record by _id from: " + Source.getString(tempBasal.source) + " " + old.toString());
+                            aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: Updating record by _id from: " + Source.getString(tempBasal.source) + " " + old.toString());
                             updateEarliestDataChange(oldDate);
                             updateEarliestDataChange(old.date);
                             scheduleTemporaryBasalChange();
@@ -902,22 +889,20 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     }
                 }
                 getDaoTemporaryBasal().create(tempBasal);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
+                aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
                 updateEarliestDataChange(tempBasal.date);
                 scheduleTemporaryBasalChange();
                 return true;
             }
             if (tempBasal.source == Source.USER) {
                 getDaoTemporaryBasal().create(tempBasal);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
+                aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
                 updateEarliestDataChange(tempBasal.date);
                 scheduleTemporaryBasalChange();
                 return true;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return false;
     }
@@ -927,7 +912,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoTemporaryBasal().delete(tempBasal);
             updateEarliestDataChange(tempBasal.date);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleTemporaryBasalChange();
     }
@@ -943,7 +928,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempbasals = getDaoTemporaryBasal().query(preparedQuery);
             return tempbasals;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<TemporaryBasal>();
     }
@@ -959,20 +944,19 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             tempbasals = getDaoTemporaryBasal().query(preparedQuery);
             return tempbasals;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<TemporaryBasal>();
     }
 
-    private static void scheduleTemporaryBasalChange() {
+    private void scheduleTemporaryBasalChange() {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing EventTempBasalChange");
-                RxBus.Companion.getINSTANCE().send(new EventReloadTempBasalData());
-                RxBus.Companion.getINSTANCE().send(new EventTempBasalChange());
+                aapsLogger.debug(LTag.DATABASE, "Firing EventTempBasalChange");
+                rxBus.send(new EventReloadTempBasalData());
+                rxBus.send(new EventTempBasalChange());
                 if (earliestDataChange != null)
-                    RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(earliestDataChange));
+                    rxBus.send(new EventNewHistoryData(earliestDataChange));
                 earliestDataChange = null;
                 scheduledTemBasalsPost = null;
             }
@@ -1014,8 +998,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         .insulin(trJson.getDouble("originalExtendedAmount"))
                         ._id(trJson.getString("_id"));
                 // if faking found in NS, adapt AAPS to use it too
-                if (!VirtualPumpPlugin.Companion.getPlugin().getFakingStatus()) {
-                    VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
+                if (!virtualPumpPlugin.getFakingStatus()) {
+                    virtualPumpPlugin.setFakingStatus(true);
                     updateEarliestDataChange(0);
                     scheduleTemporaryBasalChange();
                 }
@@ -1029,8 +1013,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 extendedBolus.insulin = 0;
                 extendedBolus._id = trJson.getString("_id");
                 // if faking found in NS, adapt AAPS to use it too
-                if (!VirtualPumpPlugin.Companion.getPlugin().getFakingStatus()) {
-                    VirtualPumpPlugin.Companion.getPlugin().setFakingStatus(true);
+                if (!virtualPumpPlugin.getFakingStatus()) {
+                    virtualPumpPlugin.setFakingStatus(true);
                     updateEarliestDataChange(0);
                     scheduleTemporaryBasalChange();
                 }
@@ -1055,15 +1039,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 createOrUpdate(tempBasal);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception: " + trJson.toString(), e);
+            aapsLogger.error("Unhandled exception: " + trJson.toString(), e);
         }
     }
 
     public void deleteTempBasalById(String _id) {
         TemporaryBasal stored = findTempBasalById(_id);
         if (stored != null) {
-            if (L.isEnabled(LTag.DATABASE))
-                log.debug("TEMPBASAL: Removing TempBasal record from database: " + stored.toString());
+            aapsLogger.debug(LTag.DATABASE, "TEMPBASAL: Removing TempBasal record from database: " + stored.toString());
             delete(stored);
             updateEarliestDataChange(stored.date);
             scheduleTemporaryBasalChange();
@@ -1085,7 +1068,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return list.get(0);
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1107,7 +1090,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
 
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1117,8 +1100,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public boolean createOrUpdate(ExtendedBolus extendedBolus) {
         try {
-            if (L.isEnabled(LTag.DATABASE))
-                log.debug("EXTENDEDBOLUS: createOrUpdate: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
+            aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: createOrUpdate: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
 
             ExtendedBolus old;
             extendedBolus.date = roundDateToSec(extendedBolus.date);
@@ -1137,13 +1119,12 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     PreparedQuery<ExtendedBolus> preparedQuery = queryBuilder.prepare();
                     List<ExtendedBolus> trList = getDaoExtendedBolus().query(preparedQuery);
                     if (trList.size() > 1) {
-                        log.error("EXTENDEDBOLUS: Multiple records found for pumpId: " + extendedBolus.pumpId);
+                        aapsLogger.error("EXTENDEDBOLUS: Multiple records found for pumpId: " + extendedBolus.pumpId);
                         return false;
                     }
                     getDaoExtendedBolus().createOrUpdate(extendedBolus);
                 }
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
+                aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
                 updateEarliestDataChange(extendedBolus.date);
                 scheduleExtendedBolusChange();
                 return true;
@@ -1156,8 +1137,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         getDaoExtendedBolus().delete(old); // need to delete/create because date may change too
                         old.copyFrom(extendedBolus);
                         getDaoExtendedBolus().create(old);
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("EXTENDEDBOLUS: Updating record by date from: " + Source.getString(extendedBolus.source) + " " + old.log());
+                        aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: Updating record by date from: " + Source.getString(extendedBolus.source) + " " + old.log());
                         updateEarliestDataChange(oldDate);
                         updateEarliestDataChange(old.date);
                         scheduleExtendedBolusChange();
@@ -1179,8 +1159,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             getDaoExtendedBolus().delete(old); // need to delete/create because date may change too
                             old.copyFrom(extendedBolus);
                             getDaoExtendedBolus().create(old);
-                            if (L.isEnabled(LTag.DATABASE))
-                                log.debug("EXTENDEDBOLUS: Updating record by _id from: " + Source.getString(extendedBolus.source) + " " + old.log());
+                            aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: Updating record by _id from: " + Source.getString(extendedBolus.source) + " " + old.log());
                             updateEarliestDataChange(oldDate);
                             updateEarliestDataChange(old.date);
                             scheduleExtendedBolusChange();
@@ -1189,22 +1168,20 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     }
                 }
                 getDaoExtendedBolus().create(extendedBolus);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
+                aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
                 updateEarliestDataChange(extendedBolus.date);
                 scheduleExtendedBolusChange();
                 return true;
             }
             if (extendedBolus.source == Source.USER) {
                 getDaoExtendedBolus().create(extendedBolus);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
+                aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
                 updateEarliestDataChange(extendedBolus.date);
                 scheduleExtendedBolusChange();
                 return true;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return false;
     }
@@ -1215,7 +1192,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     .where().eq("pumpId", pumpId)
                     .queryForFirst();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1225,7 +1202,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoExtendedBolus().delete(extendedBolus);
             updateEarliestDataChange(extendedBolus.date);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleExtendedBolusChange();
     }
@@ -1241,7 +1218,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             extendedBoluses = getDaoExtendedBolus().query(preparedQuery);
             return extendedBoluses;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<ExtendedBolus>();
     }
@@ -1257,7 +1234,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             extendedBoluses = getDaoExtendedBolus().query(preparedQuery);
             return extendedBoluses;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<ExtendedBolus>();
     }
@@ -1265,8 +1242,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public void deleteExtendedBolusById(String _id) {
         ExtendedBolus stored = findExtendedBolusById(_id);
         if (stored != null) {
-            if (L.isEnabled(LTag.DATABASE))
-                log.debug("EXTENDEDBOLUS: Removing ExtendedBolus record from database: " + stored.toString());
+            aapsLogger.debug(LTag.DATABASE, "EXTENDEDBOLUS: Removing ExtendedBolus record from database: " + stored.toString());
             delete(stored);
             updateEarliestDataChange(stored.date);
             scheduleExtendedBolusChange();
@@ -1288,7 +1264,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1316,14 +1292,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             createOrUpdate(extendedBolus);
     }
 
-    private static void scheduleExtendedBolusChange() {
+    private void scheduleExtendedBolusChange() {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing EventExtendedBolusChange");
-                RxBus.Companion.getINSTANCE().send(new EventReloadTreatmentData(new EventExtendedBolusChange()));
+                aapsLogger.debug(LTag.DATABASE, "Firing EventExtendedBolusChange");
+                rxBus.send(new EventReloadTreatmentData(new EventExtendedBolusChange()));
                 if (earliestDataChange != null)
-                    RxBus.Companion.getINSTANCE().send(new EventNewHistoryData(earliestDataChange));
+                    rxBus.send(new EventNewHistoryData(earliestDataChange));
                 earliestDataChange = null;
                 scheduledExtendedBolusPost = null;
             }
@@ -1346,7 +1321,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoCareportalEvents().createOrUpdate(careportalEvent);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -1355,7 +1330,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoCareportalEvents().delete(careportalEvent);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleCareportalEventChange();
     }
@@ -1364,7 +1339,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoCareportalEvents().queryForId(timestamp);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1385,7 +1360,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             else
                 return null;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1402,7 +1377,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1419,7 +1394,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1448,7 +1423,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1465,7 +1440,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvents = preprocessOpenAPSOfflineEvents(careportalEvents);
             return careportalEvents;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1481,15 +1456,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
             if (list.size() == 1) {
                 CareportalEvent record = list.get(0);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Removing CareportalEvent record from database: " + record.toString());
+                aapsLogger.debug(LTag.DATABASE, "Removing CareportalEvent record from database: " + record.toString());
                 delete(record);
             } else {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("CareportalEvent not found database: " + _id);
+                aapsLogger.debug(LTag.DATABASE, "CareportalEvent not found database: " + _id);
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1505,15 +1478,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             if (list.size() == 0) {
                 careportalEvent = new CareportalEvent(StaticInjector.Companion.getInstance());
                 careportalEvent.source = Source.NIGHTSCOUT;
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Adding CareportalEvent record to database: " + trJson.toString());
+                aapsLogger.debug(LTag.DATABASE, "Adding CareportalEvent record to database: " + trJson.toString());
                 // Record does not exists. add
             } else if (list.size() == 1) {
                 careportalEvent = list.get(0);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Updating CareportalEvent record in database: " + trJson.toString());
+                aapsLogger.debug(LTag.DATABASE, "Updating CareportalEvent record in database: " + trJson.toString());
             } else {
-                log.error("Something went wrong");
+                aapsLogger.error("Something went wrong");
                 return;
             }
             careportalEvent.date = trJson.getLong("mills");
@@ -1522,16 +1493,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             careportalEvent._id = trJson.getString("_id");
             createOrUpdate(careportalEvent);
         } catch (SQLException | JSONException e) {
-            log.error("Unhandled exception: " + trJson.toString(), e);
+            aapsLogger.error("Unhandled exception: " + trJson.toString(), e);
         }
     }
 
-    private static void scheduleCareportalEventChange() {
+    private void scheduleCareportalEventChange() {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing scheduleCareportalEventChange");
-                RxBus.Companion.getINSTANCE().send(new EventCareportalEventChange());
+                aapsLogger.debug(LTag.DATABASE, "Firing scheduleCareportalEventChange");
+                rxBus.send(new EventCareportalEventChange());
                 scheduledCareportalEventPost = null;
             }
         }
@@ -1566,7 +1536,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             }
             return profileSwitches;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1588,7 +1558,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             else
                 return null;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1606,7 +1576,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             profileSwitches = daoProfileSwitch.query(preparedQuery);
             return profileSwitches;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1624,7 +1594,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             profileSwitches = daoProfileSwitch.query(preparedQuery);
             return profileSwitches;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
@@ -1642,8 +1612,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         profileSwitch.profileName = old.profileName; // preserver profileName to prevent multiple CPP extension
                         getDaoProfileSwitch().delete(old); // need to delete/create because date may change too
                         getDaoProfileSwitch().create(profileSwitch);
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("PROFILESWITCH: Updating record by date from: " + Source.getString(profileSwitch.source) + " " + old.toString());
+                        aapsLogger.debug(LTag.DATABASE, "PROFILESWITCH: Updating record by date from: " + Source.getString(profileSwitch.source) + " " + old.toString());
                         scheduleProfileSwitchChange();
                         return true;
                     }
@@ -1662,8 +1631,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             getDaoProfileSwitch().delete(old); // need to delete/create because date may change too
                             old.copyFrom(profileSwitch);
                             getDaoProfileSwitch().create(old);
-                            if (L.isEnabled(LTag.DATABASE))
-                                log.debug("PROFILESWITCH: Updating record by _id from: " + Source.getString(profileSwitch.source) + " " + old.toString());
+                            aapsLogger.debug(LTag.DATABASE, "PROFILESWITCH: Updating record by _id from: " + Source.getString(profileSwitch.source) + " " + old.toString());
                             scheduleProfileSwitchChange();
                             return true;
                         }
@@ -1672,20 +1640,18 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 // look for already added percentage from NS
                 profileSwitch.profileName = PercentageSplitter.pureName(profileSwitch.profileName);
                 getDaoProfileSwitch().create(profileSwitch);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
+                aapsLogger.debug(LTag.DATABASE, "PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
                 scheduleProfileSwitchChange();
                 return true;
             }
             if (profileSwitch.source == Source.USER) {
                 getDaoProfileSwitch().create(profileSwitch);
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
+                aapsLogger.debug(LTag.DATABASE, "PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
                 scheduleProfileSwitchChange();
                 return true;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return false;
     }
@@ -1695,17 +1661,16 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             getDaoProfileSwitch().delete(profileSwitch);
             scheduleProfileSwitchChange();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
-    private static void scheduleProfileSwitchChange() {
+    private void scheduleProfileSwitchChange() {
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATABASE))
-                    log.debug("Firing EventProfileNeedsUpdate");
-                RxBus.Companion.getINSTANCE().send(new EventReloadProfileSwitchData());
-                RxBus.Companion.getINSTANCE().send(new EventProfileNeedsUpdate());
+                aapsLogger.debug(LTag.DATABASE, "Firing EventProfileNeedsUpdate");
+                rxBus.send(new EventReloadProfileSwitchData());
+                rxBus.send(new EventProfileNeedsUpdate());
                 scheduledProfileSwitchEventPost = null;
             }
         }
@@ -1754,18 +1719,15 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     Profile profile = store.getSpecificProfile(profileSwitch.profileName);
                     if (profile != null) {
                         profileSwitch.profileJson = profile.getData().toString();
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("Profile switch prefilled with JSON from local store");
+                        aapsLogger.debug(LTag.DATABASE, "Profile switch prefilled with JSON from local store");
                         // Update data in NS
                         nsUpload.updateProfileSwitch(profileSwitch);
                     } else {
-                        if (L.isEnabled(LTag.DATABASE))
-                            log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
+                        aapsLogger.debug(LTag.DATABASE, "JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
                         return;
                     }
                 } else {
-                    if (L.isEnabled(LTag.DATABASE))
-                        log.debug("Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
+                    aapsLogger.debug(LTag.DATABASE, "Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
                     return;
                 }
             }
@@ -1773,15 +1735,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 profileSwitch.profilePlugin = trJson.getString("profilePlugin");
             createOrUpdate(profileSwitch);
         } catch (JSONException e) {
-            log.error("Unhandled exception: " + trJson.toString(), e);
+            aapsLogger.error("Unhandled exception: " + trJson.toString(), e);
         }
     }
 
     public void deleteProfileSwitchById(String _id) {
         ProfileSwitch stored = findProfileSwitchById(_id);
         if (stored != null) {
-            if (L.isEnabled(LTag.DATABASE))
-                log.debug("PROFILESWITCH: Removing ProfileSwitch record from database: " + stored.toString());
+            aapsLogger.debug(LTag.DATABASE, "PROFILESWITCH: Removing ProfileSwitch record from database: " + stored.toString());
             delete(stored);
             scheduleTemporaryTargetChange();
         }
@@ -1801,7 +1762,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 return null;
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1812,7 +1773,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoInsightHistoryOffset().createOrUpdate(offset);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1820,7 +1781,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             return getDaoInsightHistoryOffset().queryForId(pumpSerial);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1829,7 +1790,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoInsightBolusID().createOrUpdate(bolusID);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1841,7 +1802,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     .and().between("timestamp", timestamp - 259200000, timestamp + 259200000)
                     .queryForFirst();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1850,7 +1811,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoInsightPumpID().createOrUpdate(pumpID);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1863,7 +1824,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                     .and().lt("timestamp", before)
                     .queryForFirst();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
@@ -1876,7 +1837,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         try {
             getDaoPodHistory().createOrUpdate(podHistory);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -1894,7 +1855,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             podHistories = daoPodHistory.query(preparedQuery);
             return podHistories;
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return new ArrayList<>();
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
index 60c7578b74..d174f170f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -65,4 +65,8 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
     @NotNull @Override public CloseableIterator<DbRequest> getDbRequestInterator() {
         return MainApp.getDbHelper().getDbRequestInterator();
     }
+
+    @Override public long roundDateToSec(long date) {
+        return MainApp.getDbHelper().roundDateToSec(date);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
index 2441f34314..c63e70ace8 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/DataClassesModule.kt
@@ -3,14 +3,10 @@ package info.nightscout.androidaps.dependencyInjection
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.*
 import info.nightscout.androidaps.interfaces.ProfileStore
-import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.ExtendedBolus
-import info.nightscout.androidaps.db.ProfileSwitch
-import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.db.Treatment
+import info.nightscout.androidaps.plugins.general.food.FoodService
 import info.nightscout.androidaps.plugins.treatments.TreatmentService
 import info.nightscout.androidaps.utils.wizard.BolusWizard
 import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
@@ -21,7 +17,9 @@ abstract class DataClassesModule {
 
     @ContributesAndroidInjector abstract fun glucoseStatusInjector(): GlucoseStatus
 
+    @ContributesAndroidInjector abstract fun DatabaseHelperInjector(): DatabaseHelper
     @ContributesAndroidInjector abstract fun treatmentServiceInjector(): TreatmentService
+    @ContributesAndroidInjector abstract fun foodServiceInjector(): FoodService
 
     @ContributesAndroidInjector abstract fun bolusWizardInjector(): BolusWizard
     @ContributesAndroidInjector abstract fun quickWizardEntryInjector(): QuickWizardEntry
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
index 9c41df2666..3482a9b11a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodPlugin.kt
@@ -28,6 +28,6 @@ class FoodPlugin @Inject constructor(
 
     override fun onStart() {
         super.onStart()
-        service = FoodService()
+        service = FoodService(injector)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
index 405fc22b50..8b69403960 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodService.java
@@ -15,7 +15,6 @@ import com.j256.ormlite.table.TableUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -25,15 +24,17 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.db.ICallback;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
 import info.nightscout.androidaps.events.EventNsFood;
-import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -43,16 +44,20 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
-    private Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATAFOOD);
+    @Inject AAPSLogger aapsLogger;
+    @Inject RxBusWrapper rxBus;
+    @Inject FabricPrivacy fabricPrivacy;
+
     private CompositeDisposable disposable = new CompositeDisposable();
 
     private static final ScheduledExecutorService foodEventWorker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledFoodEventPost = null;
 
-    public FoodService() {
+    public FoodService(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
         onCreate();
         dbInitialize();
-        disposable.add(RxBus.Companion.getINSTANCE()
+        disposable.add(rxBus
                 .toObservable(EventNsFood.class)
                 .observeOn(Schedulers.io())
                 .subscribe(event -> {
@@ -62,7 +67,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
                         this.createFoodFromJsonIfNotExists(array);
                     else
                         this.deleteNS(array);
-                }, exception -> FabricPrivacy.getInstance().logException(exception))
+                }, fabricPrivacy::logException)
         );
     }
 
@@ -88,7 +93,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
         try {
             return DaoManager.createDao(this.getConnectionSource(), Food.class);
         } catch (SQLException e) {
-            log.error("Cannot create Dao for Food.class");
+            aapsLogger.error("Cannot create Dao for Food.class");
         }
 
         return null;
@@ -98,18 +103,16 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
     public void onCreate() {
         super.onCreate();
         try {
-            if (L.isEnabled(LTag.DATAFOOD))
-                log.info("onCreate");
+            aapsLogger.info(LTag.DATAFOOD, "onCreate");
             TableUtils.createTableIfNotExists(this.getConnectionSource(), Food.class);
         } catch (SQLException e) {
-            log.error("Can't create database", e);
+            aapsLogger.error("Can't create database", e);
             throw new RuntimeException(e);
         }
     }
 
     public void onUpgrade(ConnectionSource connectionSource, int oldVersion, int newVersion) {
-        if (L.isEnabled(LTag.DATAFOOD))
-            log.info("onUpgrade");
+        aapsLogger.info(LTag.DATAFOOD, "onUpgrade");
 //            this.resetFood();
     }
 
@@ -122,7 +125,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
             TableUtils.dropTable(this.getConnectionSource(), Food.class, true);
             TableUtils.createTableIfNotExists(this.getConnectionSource(), Food.class);
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         scheduleFoodChange();
     }
@@ -147,9 +150,8 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
 
         class PostRunnable implements Runnable {
             public void run() {
-                if (L.isEnabled(LTag.DATAFOOD))
-                    log.debug("Firing EventFoodChange");
-                RxBus.Companion.getINSTANCE().send(event);
+                aapsLogger.debug(LTag.DATAFOOD, "Firing EventFoodChange");
+                rxBus.send(event);
                 callback.setPost(null);
             }
         }
@@ -183,7 +185,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
         try {
             return this.getDao().queryForAll();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
 
         return new ArrayList<>();
@@ -208,7 +210,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
             Food food = Food.createFromJson(json);
             this.createFoodFromJsonIfNotExists(food);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -220,7 +222,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
                 this.createFoodFromJsonIfNotExists(food);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -233,7 +235,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
             String _id = json.getString("_id");
             this.deleteByNSId(_id);
         } catch (JSONException | SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -244,7 +246,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
                 this.deleteNS(json);
             }
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -258,8 +260,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
     public void deleteByNSId(String _id) throws SQLException {
         Food stored = this.findByNSId(_id);
         if (stored != null) {
-            if (L.isEnabled(LTag.DATAFOOD))
-                log.debug("Removing Food record from database: " + stored.toString());
+            aapsLogger.debug(LTag.DATAFOOD, "Removing Food record from database: " + stored.toString());
             this.delete(stored);
         }
     }
@@ -276,7 +277,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
             this.getDao().delete(food);
             this.scheduleFoodChange();
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
     }
 
@@ -312,10 +313,9 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
     public void createOrUpdate(Food food) {
         try {
             this.getDao().createOrUpdate(food);
-            if (L.isEnabled(LTag.DATAFOOD))
-                log.debug("Created or Updated: " + food.toString());
+            aapsLogger.debug(LTag.DATAFOOD, "Created or Updated: " + food.toString());
         } catch (SQLException e) {
-            log.error("Unable to createOrUpdate Food", e);
+            aapsLogger.error("Unable to createOrUpdate Food", e);
         }
         this.scheduleFoodChange();
     }
@@ -323,10 +323,9 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
     public void create(Food food) {
         try {
             this.getDao().create(food);
-            if (L.isEnabled(LTag.DATAFOOD))
-                log.debug("New record: " + food.toString());
+            aapsLogger.debug(LTag.DATAFOOD, "New record: " + food.toString());
         } catch (SQLException e) {
-            log.error("Unable to create Food", e);
+            aapsLogger.error("Unable to create Food", e);
         }
         this.scheduleFoodChange();
     }
@@ -346,7 +345,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
                 return list.get(0);
             }
         } catch (SQLException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
index 27310dad90..4ba13a8fb5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientN
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientUpdateGUI;
 import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.HtmlHelper;
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -155,7 +156,7 @@ public class NSClientFragment extends DaggerFragment implements View.OnClickList
             logScrollview.fullScroll(ScrollView.FOCUS_DOWN);
         }
         urlTextView.setText(nsClientPlugin.url());
-        Spanned queuetext = Html.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + uploadQueue.size() + "</b>");
+        Spanned queuetext = HtmlHelper.INSTANCE.fromHtml(resourceHelper.gs(R.string.queue) + " <b>" + uploadQueue.size() + "</b>");
         queueTextView.setText(queuetext);
         statusTextView.setText(nsClientPlugin.status);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
index dd6267308a..ea47305be4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSAuthAck.java
@@ -3,19 +3,26 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks;
 import org.json.JSONObject;
 
 import info.nightscout.androidaps.events.Event;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import io.socket.client.Ack;
 
-public class NSAuthAck extends Event implements Ack{
+public class NSAuthAck extends Event implements Ack {
+
+    private final RxBusWrapper rxBus;
+
     public boolean read = false;
     public boolean write = false;
     public boolean write_treatment = false;
 
-    public void call(Object...args) {
-        JSONObject response = (JSONObject)args[0];
+    public NSAuthAck(RxBusWrapper rxBus) {
+        this.rxBus = rxBus;
+    }
+
+    public void call(Object... args) {
+        JSONObject response = (JSONObject) args[0];
         read = response.optBoolean("read");
         write = response.optBoolean("write");
         write_treatment = response.optBoolean("write_treatment");
-        RxBus.Companion.getINSTANCE().send(this);
+        rxBus.send(this);
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
index 3b500c3ec8..95a00279cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/acks/NSUpdateAck.java
@@ -6,7 +6,7 @@ import org.json.JSONObject;
 import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBus;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import io.socket.client.Ack;
 
 /**
@@ -14,6 +14,8 @@ import io.socket.client.Ack;
  */
 public class NSUpdateAck extends Event implements Ack {
     private final AAPSLogger aapsLogger;
+    private final RxBusWrapper rxBus;
+
     public boolean result = false;
     public String _id;
     public String action;
@@ -28,16 +30,17 @@ public class NSUpdateAck extends Event implements Ack {
                     result = true;
                     aapsLogger.debug(LTag.NSCLIENT, "Internal error: Missing _id returned on dbUpdate ack");
                 }
-                RxBus.Companion.getINSTANCE().send(this);
+                rxBus.send(this);
             } catch (JSONException e) {
                 aapsLogger.error("Unhandled exception", e);
             }
     }
 
-    public NSUpdateAck(String action, String _id, AAPSLogger aapsLogger) {
+    public NSUpdateAck(String action, String _id, AAPSLogger aapsLogger, RxBusWrapper rxBus) {
         super();
         this.action = action;
         this._id = _id;
         this.aapsLogger = aapsLogger;
+        this.rxBus = rxBus;
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index e2835b163f..cc5057f7eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -329,7 +329,7 @@ public class NSClientService extends DaggerService {
             String socketId = mSocket != null ? mSocket.id() : "NULL";
             rxBus.send(new EventNSClientNewLog("NSCLIENT", "connect #" + connectCounter + " event. ID: " + socketId));
             if (mSocket != null)
-                sendAuthMessage(new NSAuthAck());
+                sendAuthMessage(new NSAuthAck(rxBus));
             watchdog();
         }
     };
@@ -814,13 +814,13 @@ public class NSClientService extends DaggerService {
                             NSAddAck addAck = new NSAddAck(aapsLogger, rxBus);
                             dbAdd(dbr, addAck);
                         } else if (dbr.action.equals("dbRemove")) {
-                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
+                            NSUpdateAck removeAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
                             dbRemove(dbr, removeAck);
                         } else if (dbr.action.equals("dbUpdate")) {
-                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
+                            NSUpdateAck updateAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
                             dbUpdate(dbr, updateAck);
                         } else if (dbr.action.equals("dbUpdateUnset")) {
-                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger);
+                            NSUpdateAck updateUnsetAck = new NSUpdateAck(dbr.action, dbr._id, aapsLogger, rxBus);
                             dbUpdateUnset(dbr, updateUnsetAck);
                         }
                         maxcount--;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
index 370015ab95..bc9a4a3aa0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
@@ -4,15 +4,10 @@ import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.plugins.bus.RxBus;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceTransport;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState;
-import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
 
 /**
  * Created by geoff on 7/16/16.
@@ -34,7 +29,7 @@ public class ResetRileyLinkConfigurationTask extends PumpTask {
 
     @Override
     public void run() {
-        RileyLinkPumpDevice pumpAbstract = (RileyLinkPumpDevice)activePlugin.getActivePump();
+        RileyLinkPumpDevice pumpAbstract = (RileyLinkPumpDevice) activePlugin.getActivePump();
 
         rxBus.send(new EventRefreshButtonState(false));
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
index 0812bb7614..50722c627c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java
@@ -8,7 +8,6 @@ import android.content.ServiceConnection;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Vibrator;
-import android.text.Html;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
@@ -34,6 +33,7 @@ import info.nightscout.androidaps.plugins.pump.insight.exceptions.InsightExcepti
 import info.nightscout.androidaps.plugins.pump.insight.exceptions.app_layer_errors.AppLayerErrorException;
 import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils;
 import info.nightscout.androidaps.plugins.pump.insight.utils.ExceptionTranslator;
+import info.nightscout.androidaps.utils.HtmlHelper;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class InsightAlertService extends DaggerService implements InsightConnectionService.StateCallback {
@@ -299,7 +299,7 @@ public class InsightAlertService extends DaggerService implements InsightConnect
         notificationBuilder.setContentTitle(alertUtils.getAlertCode(alert.getAlertType()) + " – " + alertUtils.getAlertTitle(alert.getAlertType()));
         String description = alertUtils.getAlertDescription(alert);
         if (description != null)
-            notificationBuilder.setContentText(Html.fromHtml(description).toString());
+            notificationBuilder.setContentText(HtmlHelper.INSTANCE.fromHtml(description).toString());
 
         Intent fullScreenIntent = new Intent(this, InsightAlertActivity.class);
         PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(this, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
index 65034d321a..c5121184ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/activities/InsightAlertActivity.java
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.Alert;
 import info.nightscout.androidaps.plugins.pump.insight.descriptors.AlertStatus;
 import info.nightscout.androidaps.plugins.pump.insight.utils.AlertUtils;
+import info.nightscout.androidaps.utils.HtmlHelper;
 
 public class InsightAlertActivity extends DaggerAppCompatActivity {
 
@@ -91,7 +92,7 @@ public class InsightAlertActivity extends DaggerAppCompatActivity {
         if (description == null) this.errorDescription.setVisibility(View.GONE);
         else {
             this.errorDescription.setVisibility(View.VISIBLE);
-            this.errorDescription.setText(Html.fromHtml(description));
+            this.errorDescription.setText(HtmlHelper.INSTANCE.fromHtml(description));
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
index c91f916d11..2ef49e95b5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt
@@ -66,16 +66,6 @@ class VirtualPumpPlugin @Inject constructor(
 ), PumpInterface {
 
 
-    companion object {
-        private lateinit var virtualPumpPlugin: VirtualPumpPlugin
-
-        @Deprecated("Use dagger to get an instance")
-        fun getPlugin(): VirtualPumpPlugin {
-            checkNotNull(virtualPumpPlugin) { "Accessing VirtualPumpPlugin before first instantiation" }
-            return virtualPumpPlugin
-        }
-    }
-
     private val disposable = CompositeDisposable()
     var batteryPercent = 50
     var reservoirInUnits = 50
@@ -86,7 +76,6 @@ class VirtualPumpPlugin @Inject constructor(
     private val pumpDescription = PumpDescription()
 
     init {
-        virtualPumpPlugin = this
         pumpDescription.isBolusCapable = true
         pumpDescription.bolusStep = 0.1
         pumpDescription.isExtendedBolusCapable = true
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index dd1e84c960..60bd9b9b8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -38,6 +38,7 @@ import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.events.EventNsTreatment;
 import info.nightscout.androidaps.events.EventReloadTreatmentData;
 import info.nightscout.androidaps.events.EventTreatmentChange;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
@@ -60,6 +61,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
     @Inject FabricPrivacy fabricPrivacy;
     @Inject RxBusWrapper rxBus;
     @Inject MedtronicPumpPlugin medtronicPumpPlugin;
+    @Inject DatabaseHelperInterface databaseHelper;
 
     private CompositeDisposable disposable = new CompositeDisposable();
 
@@ -289,7 +291,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         }
         try {
             Treatment old;
-            treatment.date = DatabaseHelper.roundDateToSec(treatment.date);
+            treatment.date = databaseHelper.roundDateToSec(treatment.date);
 
             if (treatment.source == Source.PUMP) {
                 // check for changed from pump change in NS
@@ -412,7 +414,7 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
             aapsLogger.debug(LTag.DATATREATMENTS, "DoubleBolusDebug: createOrUpdateMedtronic:: originalTreatment={}, fromNightScout={}", treatment, fromNightScout);
 
         try {
-            treatment.date = DatabaseHelper.roundDateToSec(treatment.date);
+            treatment.date = databaseHelper.roundDateToSec(treatment.date);
 
             Treatment existingTreatment = getRecord(treatment.pumpId, treatment.date);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
index cae1a3cde3..f09f562d25 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
@@ -30,8 +30,6 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
  * Created by mike on 28.06.2016.
  */
 public class NumberPickerVertical extends NumberPicker {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(NumberPickerVertical.class);
-
     public NumberPickerVertical(Context context) {
         super(context);
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
index ac3db85d2a..6e68c3996a 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/ProfileIntervals.java
@@ -3,14 +3,10 @@ package info.nightscout.androidaps.data;
 import androidx.annotation.Nullable;
 import androidx.collection.LongSparseArray;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
 /**
  * Created by mike on 09.05.2017.
@@ -23,11 +19,11 @@ public class ProfileIntervals<T extends Interval> {
 
     private LongSparseArray<T> rawData; // oldest at index 0
 
-    public ProfileIntervals () {
+    public ProfileIntervals() {
         rawData = new LongSparseArray<>();
     }
 
-    public ProfileIntervals (ProfileIntervals<T> other) {
+    public ProfileIntervals(ProfileIntervals<T> other) {
         rawData = other.rawData.clone();
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java b/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
index e280c5efbb..12bcc740c3 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/DbRequest.java
@@ -5,10 +5,7 @@ import com.j256.ormlite.table.DatabaseTable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
 
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.DateUtil;
 
 /**
@@ -18,7 +15,6 @@ import info.nightscout.androidaps.utils.DateUtil;
  */
 @DatabaseTable(tableName = "DBRequests")
 public class DbRequest {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
 
     @DatabaseField(id = true)
     public String nsClientID = null;
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
index 92668d255a..65b9075ac4 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TempTarget.java
@@ -3,23 +3,18 @@ package info.nightscout.androidaps.db;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
-import org.slf4j.Logger;
-
 import java.util.Objects;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.interfaces.Interval;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 @DatabaseTable(tableName = "TempTargets")
 public class TempTarget implements Interval {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
 
     @DatabaseField(id = true)
     public long date;
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index e24d0fc678..fbaab3d3db 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -15,9 +15,10 @@ interface DatabaseHelperInterface {
     fun create(record: DbRequest)
     fun getDanaRHistoryRecordsByType(type: Byte): List<DanaRHistoryRecord>
     fun getTDDs(): List<TDD>
-    fun size(table: String) : Long
+    fun size(table: String): Long
     fun deleteAllDbRequests()
-    fun deleteDbRequest(id: String) : Int
+    fun deleteDbRequest(id: String): Int
     fun deleteDbRequestbyMongoId(action: String, _id: String)
-    fun getDbRequestInterator() : CloseableIterator<DbRequest>
+    fun getDbRequestInterator(): CloseableIterator<DbRequest>
+    fun roundDateToSec(date: Long): Long
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
index c8e49d013a..e517ef1681 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/DeviceStatus.java
@@ -4,6 +4,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 
@@ -365,7 +366,7 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 */
 
 public class DeviceStatus {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
+    private final AAPSLogger aapsLogger;
 
     public String device = null;
     public JSONObject pump = null;
@@ -375,6 +376,10 @@ public class DeviceStatus {
     public int uploaderBattery = 0;
     public String created_at = null;
 
+    public DeviceStatus(AAPSLogger aapsLogger) {
+        this.aapsLogger = aapsLogger;
+    }
+
     public JSONObject mongoRecord() {
         JSONObject record = new JSONObject();
 
@@ -389,7 +394,7 @@ public class DeviceStatus {
             if (uploaderBattery != 0) record.put("uploaderBattery", uploaderBattery);
             if (created_at != null) record.put("created_at", created_at);
         } catch (JSONException e) {
-            log.error("Unhandled exception", e);
+            aapsLogger.error("Unhandled exception", e);
         }
         return record;
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
deleted file mode 100644
index 0b2960c7d9..0000000000
--- a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package info.nightscout.androidaps.plugins.bus
-
-import info.nightscout.androidaps.events.Event
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.PublishSubject
-
-class RxBus {
-
-    companion object {
-        @JvmStatic
-        @Deprecated("Get via Dagger. Will be removed once fully transitioned to Dagger")
-        var INSTANCE: RxBus = RxBus()//TODO: remove as soon as Dagger is fully set up
-    }
-
-    private val publisher = PublishSubject.create<Event>()
-
-    fun send(event: Event) {
-        publisher.onNext(event)
-    }
-
-    // Listen should return an Observable and not the publisher
-    // Using ofType we filter only events that match that class type
-    fun <T> toObservable(eventType: Class<T>): Observable<T> =
-            publisher
-                    .subscribeOn(Schedulers.io())
-                    .ofType(eventType)
-}
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
index 66e5324113..cb1bc903fa 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBusWrapper.kt
@@ -2,20 +2,24 @@ package info.nightscout.androidaps.plugins.bus
 
 import info.nightscout.androidaps.events.Event
 import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.PublishSubject
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 open class RxBusWrapper @Inject constructor() {
 
-    private val bus: RxBus = RxBus.INSTANCE
+    private val publisher = PublishSubject.create<Event>()
 
     fun send(event: Event) {
-        bus.send(event)
+        publisher.onNext(event)
     }
 
     // Listen should return an Observable and not the publisher
     // Using ofType we filter only events that match that class type
     fun <T> toObservable(eventType: Class<T>): Observable<T> =
-        bus.toObservable(eventType)
+        publisher
+            .subscribeOn(Schedulers.io())
+            .ofType(eventType)
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index d5b03fd747..f6cd44a84b 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -199,7 +199,7 @@ public class NSUpload {
             return;
         }
 
-        DeviceStatus deviceStatus = new DeviceStatus();
+        DeviceStatus deviceStatus = new DeviceStatus(aapsLogger);
         try {
             LoopInterface.LastRun lastRun = loopPlugin.getLastRun();
             if (lastRun != null && lastRun.getLastAPSRun() > System.currentTimeMillis() - 300 * 1000L) {

From 666ce54b1fb1c6dfb9eaf9519222d34067e84f9b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 15:07:50 +0200
Subject: [PATCH 085/400] lint & deprecation

---
 .../plugins/pump/omnipod/OmnipodPumpPlugin.java      | 12 ------------
 .../omnipod/defs/OmnipodPumpPluginInterface.java     |  1 +
 .../pump/omnipod_dash/OmnipodDashPumpPlugin.java     |  9 ---------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 8d5c7b8b41..76d39f7318 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -90,8 +90,6 @@ import io.reactivex.schedulers.Schedulers;
 public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPumpPluginInterface, RileyLinkPumpDevice {
 
     // TODO Dagger (maybe done)
-    private static OmnipodPumpPlugin plugin = null;
-    private RileyLinkServiceData rileyLinkServiceData;
     private ServiceTaskExecutor serviceTaskExecutor;
     private RileyLinkOmnipodService rileyLinkOmnipodService;
     private OmnipodUtil omnipodUtil;
@@ -150,11 +148,9 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
                 PumpType.Insulet_Omnipod,
                 injector, resourceHelper, aapsLogger, commandQueue, rxBus, activePlugin, sp, context, fabricPrivacy, dateUtil
         );
-        this.rileyLinkServiceData = rileyLinkServiceData;
         this.serviceTaskExecutor = serviceTaskExecutor;
 
         displayConnectionMessages = false;
-        OmnipodPumpPlugin.plugin = this;
         this.omnipodUtil = omnipodUtil;
         this.omnipodPumpStatus = omnipodPumpStatus;
 
@@ -249,14 +245,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
     }
 
-    @Deprecated
-    public static OmnipodPumpPlugin getPlugin() {
-        if (plugin == null)
-            throw new IllegalStateException("Plugin not injected jet");
-        return plugin;
-    }
-
-
     @Override
     protected void onStart() {
         super.onStart();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
index f2066ebb2b..0026d41f97 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodPumpPluginInterface.java
@@ -10,6 +10,7 @@ public interface OmnipodPumpPluginInterface extends PumpInterface {
 
     void setDriverState(OmnipodDriverState state);
 
+    @Deprecated
     RxBusWrapper getRxBus();
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java
index d4f8e8dc85..29e21e41ab 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java
@@ -50,7 +50,6 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP
     // TODO Dagger
     //private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
 
-    protected static OmnipodDashPumpPlugin plugin = null;
     //private RileyLinkOmnipodService omnipodService;
     //private OmnipodPumpStatus pumpStatusLocal = null;
 
@@ -136,14 +135,6 @@ public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodP
 //        };
     }
 
-    @Deprecated
-    public static OmnipodDashPumpPlugin getPlugin() {
-        if (plugin == null)
-            throw new IllegalStateException("Plugin not injected jet");
-        return plugin;
-    }
-
-
     private String getLogPrefix() {
         return "OmnipodPlugin::";
     }

From 879882f3e886ff54c3b8f29d6553709b80e17803 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 16:36:43 +0200
Subject: [PATCH 086/400] typo

---
 .../di/{DaanRSServicesModule.kt => DanaRSServicesModule.kt}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename danars/src/main/java/info/nightscout/androidaps/danars/di/{DaanRSServicesModule.kt => DanaRSServicesModule.kt} (100%)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt
similarity index 100%
rename from danars/src/main/java/info/nightscout/androidaps/danars/di/DaanRSServicesModule.kt
rename to danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSServicesModule.kt

From 903555ed9f70a4d9c41771200f17b36edddc878c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 12 May 2020 23:33:42 +0200
Subject: [PATCH 087/400] Dana msg refactor

---
 .../dependencyInjection/AppComponent.kt       |   4 +-
 .../DanaRS_Packet_APS_History_EventsTest.kt   |   3 -
 ...anaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt |   3 +-
 ...et_General_Get_Shipping_InformationTest.kt |   2 -
 .../plugins/pump/danaR/comm/DanaRTestBase.kt  |  44 +++++-
 .../pump/danaR/comm/MessageHashTableRTest.kt  |  22 +--
 .../pump/danaR/comm/MsgBolusProgressTest.kt   |   7 +-
 .../pump/danaR/comm/MsgBolusStartTest.kt      |   5 +-
 .../danaR/comm/MsgBolusStartWithSpeedTest.kt  |   5 +-
 .../pump/danaR/comm/MsgBolusStopTest.kt       |   8 +-
 .../pump/danaR/comm/MsgCheckValueTest.kt      |  11 +-
 .../plugins/pump/danaR/comm/MsgErrorTest.kt   |   9 +-
 .../pump/danaR/comm/MsgHistoryAlarmTest.kt    |   5 +-
 .../pump/danaR/comm/MsgHistoryAllDoneTest.kt  |   2 +-
 .../pump/danaR/comm/MsgHistoryAllTest.kt      |   8 +-
 .../danaR/comm/MsgHistoryBasalHourTest.kt     |   3 +-
 .../pump/danaR/comm/MsgHistoryBolusTest.kt    |   3 +-
 .../pump/danaR/comm/MsgHistoryCarboTest.kt    |   3 +-
 .../danaR/comm/MsgHistoryDailyInsulinTest.kt  |   3 +-
 .../pump/danaR/comm/MsgHistoryDoneTest.kt     |   2 +-
 .../pump/danaR/comm/MsgHistoryErrorTest.kt    |   3 +-
 .../pump/danaR/comm/MsgHistoryGlucoseTest.kt  |   3 +-
 .../pump/danaR/comm/MsgHistoryNewDoneTest.kt  |   2 +-
 .../pump/danaR/comm/MsgHistoryNewTest.kt      |   3 +-
 .../pump/danaR/comm/MsgHistoryRefillTest.kt   |   3 +-
 .../pump/danaR/comm/MsgHistorySuspendTest.kt  |   3 +-
 .../danaR/comm/MsgInitConnStatusBasicTest.kt  |   2 +-
 .../danaR/comm/MsgInitConnStatusBolusTest.kt  |   7 +-
 .../danaR/comm/MsgInitConnStatusOptionTest.kt |  11 +-
 .../danaR/comm/MsgInitConnStatusTimeTest.kt   |  19 +--
 .../pump/danaR/comm/MsgPCCommStartTest.kt     |   2 +-
 .../pump/danaR/comm/MsgPCCommStopTest.kt      |   2 +-
 .../comm/MsgSetActivateBasalProfileTest.kt    |   2 +-
 .../pump/danaR/comm/MsgSetBasalProfileTest.kt |   7 +-
 .../pump/danaR/comm/MsgSetCarbsEntryTest.kt   |   2 +-
 .../comm/MsgSetExtendedBolusStartTest.kt      |   5 +-
 .../danaR/comm/MsgSetExtendedBolusStopTest.kt |   2 +-
 .../comm/MsgSetSingleBasalProfileTest.kt      |   7 +-
 .../danaR/comm/MsgSetTempBasalStartTest.kt    |   2 +-
 .../plugins/pump/danaR/comm/MsgSetTimeTest.kt |   3 +-
 .../pump/danaR/comm/MsgSetUserOptionsTest.kt  |   2 +-
 .../danaR/comm/MsgSettingActiveProfileTest.kt |   5 +-
 .../comm/MsgSettingBasalProfileAllTest.kt     |   2 +-
 .../pump/danaR/comm/MsgSettingBasalTest.kt    |  11 +-
 .../pump/danaR/comm/MsgSettingGlucoseTest.kt  |   2 +-
 .../danaR/comm/MsgSettingMaxValuesTest.kt     |   5 +-
 .../pump/danaR/comm/MsgSettingMealTest.kt     |  16 +-
 .../comm/MsgSettingProfileRatiosAllTest.kt    |   8 +-
 .../danaR/comm/MsgSettingProfileRatiosTest.kt |   8 +-
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |  18 +--
 .../danaR/comm/MsgSettingShippingInfoTest.kt  |   5 +-
 .../danaR/comm/MsgSettingUserOptionsTest.kt   |   2 +-
 .../pump/danaR/comm/MsgStatusBasicTest.kt     |   5 +-
 .../danaR/comm/MsgStatusBolusExtendedTest.kt  |  10 +-
 .../pump/danaR/comm/MsgStatusProfileTest.kt   |   8 +-
 .../pump/danaR/comm/MsgStatusTempBasalTest.kt |  10 +-
 .../plugins/pump/danaR/comm/MsgStatusTest.kt  |   5 +-
 .../comm/MessageHashTableRKoreanTest.kt       |  24 +--
 .../danaRv2/comm/MessageHashTable_rv2Test.kt  |  32 +---
 .../pump/danaRv2/comm/MsgCheckValue_v2Test.kt |  23 +--
 .../danaRv2/comm/MsgHistoryEvents_v2Test.kt   |  15 +-
 .../comm/MsgSetAPSTempBasalStart_v2Test.kt    |  45 +++---
 .../danaRv2/comm/MsgSetHistoryEntry_v2Test.kt |   3 +-
 .../pump/danaRv2/comm/MsgStatusAPS_v2Test.kt  |   6 +-
 .../comm/MsgStatusBolusExtended_v2Test.kt     |   6 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2Test.kt |   3 +-
 .../androidaps/core/ExampleUnitTest.kt        |  18 ---
 .../comm/MessageHashTableRKorean.kt           | 104 +++++--------
 .../danaRKorean/comm/MsgCheckValue_k.kt       |  11 +-
 .../comm/MsgInitConnStatusBasic_k.kt          |  12 +-
 .../comm/MsgInitConnStatusBolus_k.kt          |  14 +-
 .../comm/MsgInitConnStatusTime_k.kt           |  24 +--
 .../comm/MsgSettingBasalProfileAll_k.kt       |   8 +-
 .../danaRKorean/comm/MsgSettingBasal_k.kt     |  10 +-
 .../danaRKorean/comm/MsgStatusBasic_k.kt      |   8 +-
 .../danaRKorean/comm/MsgStatus_k.kt           |   8 +-
 .../services/DanaRKoreanExecutionService.java |  63 ++++----
 .../danaRv2/comm/MessageHashTableRv2.kt       | 144 +++++++-----------
 .../danaRv2/comm/MsgCheckValue_v2.kt          |  27 +---
 .../danaRv2/comm/MsgHistoryEvents_v2.kt       |  17 +--
 .../comm/MsgSetAPSTempBasalStart_v2.kt        |   8 +-
 .../danaRv2/comm/MsgSetHistoryEntry_v2.kt     |   8 +-
 .../danaRv2/comm/MsgStatusAPS_v2.kt           |  10 +-
 .../danaRv2/comm/MsgStatusBolusExtended_v2.kt |  10 +-
 .../danaRv2/comm/MsgStatusTempBasal_v2.kt     |  12 +-
 .../services/DanaRv2ExecutionService.java     |  91 ++++++-----
 .../androidaps/danar/comm/MessageBase.java    | 119 +++++++++------
 .../danar/comm/MessageHashTableR.kt           | 132 +++++++---------
 .../androidaps/danar/comm/MsgBolusProgress.kt |  12 +-
 .../androidaps/danar/comm/MsgBolusStart.kt    |  10 +-
 .../danar/comm/MsgBolusStartWithSpeed.kt      |  10 +-
 .../androidaps/danar/comm/MsgBolusStop.kt     |  12 +-
 .../androidaps/danar/comm/MsgCheckValue.kt    |  11 +-
 .../androidaps/danar/comm/MsgError.kt         |  14 +-
 .../androidaps/danar/comm/MsgHistoryAlarm.kt  |  12 +-
 .../androidaps/danar/comm/MsgHistoryAll.kt    |  12 +-
 .../danar/comm/MsgHistoryAllDone.kt           |   8 +-
 .../danar/comm/MsgHistoryBasalHour.kt         |  12 +-
 .../androidaps/danar/comm/MsgHistoryBolus.kt  |  12 +-
 .../androidaps/danar/comm/MsgHistoryCarbo.kt  |  12 +-
 .../danar/comm/MsgHistoryDailyInsulin.kt      |  12 +-
 .../androidaps/danar/comm/MsgHistoryDone.kt   |   8 +-
 .../androidaps/danar/comm/MsgHistoryError.kt  |  12 +-
 .../danar/comm/MsgHistoryGlucose.kt           |  12 +-
 .../androidaps/danar/comm/MsgHistoryNew.kt    |  12 +-
 .../danar/comm/MsgHistoryNewDone.kt           |   8 +-
 .../androidaps/danar/comm/MsgHistoryRefill.kt |  12 +-
 .../danar/comm/MsgHistorySuspend.kt           |  12 +-
 .../danar/comm/MsgInitConnStatusBasic.kt      |   8 +-
 .../danar/comm/MsgInitConnStatusBolus.kt      |  12 +-
 .../danar/comm/MsgInitConnStatusOption.kt     |  14 +-
 .../danar/comm/MsgInitConnStatusTime.kt       |  24 +--
 .../androidaps/danar/comm/MsgPCCommStart.kt   |   6 +-
 .../androidaps/danar/comm/MsgPCCommStop.kt    |   6 +-
 .../danar/comm/MsgSetActivateBasalProfile.kt  |   6 +-
 .../danar/comm/MsgSetBasalProfile.kt          |  10 +-
 .../androidaps/danar/comm/MsgSetCarbsEntry.kt |   6 +-
 .../danar/comm/MsgSetExtendedBolusStart.kt    |   8 +-
 .../danar/comm/MsgSetExtendedBolusStop.kt     |   6 +-
 .../danar/comm/MsgSetSingleBasalProfile.kt    |  10 +-
 .../danar/comm/MsgSetTempBasalStart.kt        |   6 +-
 .../danar/comm/MsgSetTempBasalStop.kt         |   6 +-
 .../androidaps/danar/comm/MsgSetTime.kt       |  13 +-
 .../danar/comm/MsgSetUserOptions.kt           |   8 +-
 .../danar/comm/MsgSettingActiveProfile.kt     |   8 +-
 .../androidaps/danar/comm/MsgSettingBasal.kt  |  12 +-
 .../danar/comm/MsgSettingBasalProfileAll.kt   |   8 +-
 .../danar/comm/MsgSettingGlucose.kt           |  11 +-
 .../danar/comm/MsgSettingMaxValues.kt         |   8 +-
 .../androidaps/danar/comm/MsgSettingMeal.kt   |  14 +-
 .../danar/comm/MsgSettingProfileRatios.kt     |  13 +-
 .../danar/comm/MsgSettingProfileRatiosAll.kt  |  13 +-
 .../danar/comm/MsgSettingPumpTime.kt          |   7 +-
 .../danar/comm/MsgSettingShippingInfo.kt      |   8 +-
 .../danar/comm/MsgSettingUserOptions.kt       |   8 +-
 .../androidaps/danar/comm/MsgStatus.kt        |   9 +-
 .../androidaps/danar/comm/MsgStatusBasic.kt   |   8 +-
 .../danar/comm/MsgStatusBolusExtended.kt      |  12 +-
 .../androidaps/danar/comm/MsgStatusProfile.kt |  13 +-
 .../danar/comm/MsgStatusTempBasal.kt          |  10 +-
 .../androidaps/danar/di/DanaRCommModule.kt    |  83 ++++++++++
 .../androidaps/danar/di/DanaRModule.kt        |   9 ++
 .../AbstractDanaRExecutionService.java        |  24 +--
 .../danar/services/DanaRExecutionService.java |  72 ++++-----
 .../androidaps/danars/comm/DanaRS_Packet.java |  25 +--
 .../comm/DanaRS_Packet_APS_History_Events.kt  |  30 ++--
 .../DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt   |   4 +-
 ...acket_Bolus_Get_Calculation_Information.kt |   4 +-
 .../DanaRS_Packet_Option_Get_User_Option.kt   |   2 +-
 149 files changed, 879 insertions(+), 1289 deletions(-)
 delete mode 100644 core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt
 create mode 100644 danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
 create mode 100644 danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index 24dadb14d1..544580925a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -7,7 +7,7 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.di.CoreModule
 import info.nightscout.androidaps.dana.di.DanaModule
-import info.nightscout.androidaps.danar.di.DanaRServicesModule
+import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
 import javax.inject.Singleton
 
@@ -35,7 +35,7 @@ import javax.inject.Singleton
         UIModule::class,
         CoreModule::class,
         DanaModule::class,
-        DanaRServicesModule::class,
+        DanaRModule::class,
         DanaRSModule::class
     ]
 )
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 4716a22dca..fe42eb0305 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -60,9 +60,6 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
         Assert.assertEquals(expectedValues[4], returnedValues[4])
         // second
         Assert.assertEquals(expectedValues[5], returnedValues[5])
-        // test message decoding
-        testPacket.handleMessage(createArray(50, 0.toByte()))
-        Assert.assertEquals(false, testPacket.failed)
         Assert.assertEquals("APS_HISTORY_EVENTS", testPacket.friendlyName)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
index 5b86df3888..04afc60cf6 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -26,7 +27,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // are pump units MG/DL ???
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL, danaPump.units)
+        Assert.assertEquals(DanaPump.UNITS_MGDL, danaPump.units)
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(34, 3.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index 1b8ff9c3bc..21716b37c8 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -31,8 +31,6 @@ class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
         packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
-        packet.handleMessage(createArray(18, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 44da056f3c..602274a128 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -3,18 +3,26 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.TreatmentsInterface
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
 
+@PrepareForTest(DetailedBolusInfoStorage::class, ConstraintChecker::class)
 open class DanaRTestBase : TestBase() {
 
     @Mock lateinit var sp: SP
@@ -23,6 +31,15 @@ open class DanaRTestBase : TestBase() {
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var databaseHelper: DatabaseHelperInterface
     @Mock lateinit var treatmentsInterface: TreatmentsInterface
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var configBuilder: ConfigBuilderInterface
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var nsUpload: NSUpload
 
     @Before
     fun prepareMock() {
@@ -31,6 +48,23 @@ open class DanaRTestBase : TestBase() {
 
     val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is MessageBase) {
+                it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+                it.danaPump = danaPump
+                it.danaRPlugin = danaRPlugin
+                it.danaRKoreanPlugin = danaRKoreanPlugin
+                it.danaRv2Plugin = danaRv2Plugin
+                it.rxBus = RxBusWrapper()
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePluginProvider
+                it.configBuilder = configBuilder
+                it.detailedBolusInfoStorage = detailedBolusInfoStorage
+                it.constraintChecker = constraintChecker
+                it.nsUpload = nsUpload
+                it.databaseHelper = databaseHelper
+                it.commandQueue = commandQueue
+            }
             if (it is TemporaryBasal) {
                 it.aapsLogger = aapsLogger
                 it.activePlugin = activePluginProvider
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index 9aa7f2dad3..a80a581bec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -1,22 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageHashTableR
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -25,21 +16,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
 class MessageHashTableRTest : DanaRTestBase() {
 
-    @Mock lateinit var rxBus: RxBusWrapper
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Mock lateinit var nsUpload: NSUpload
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, databaseHelper, dateUtil)
+        val messageHashTable = MessageHashTableR(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index a6b6f246d9..1eec5b7473 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -5,27 +5,22 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danar.comm.MsgBolusProgress
 import info.nightscout.androidaps.db.Treatment
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgBolusProgressTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    val rxBus = RxBusWrapper()
 
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
         danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
         danaPump.bolusAmountToBeDelivered = 3.0
-        val packet = MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump)
+        val packet = MsgBolusProgress(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
index e5693f33a2..da5a814bad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStart(aapsLogger, constraintChecker, danaPump, 1.0)
+        val packet = MsgBolusStart(injector, 1.0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index bd4f6ca35c..6c89a58db0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartWithSpeedTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0)
+        val packet = MsgBolusStartWithSpeed(injector, 0.0, 0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 45281f2797..d1b353c259 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -4,26 +4,20 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danar.comm.MsgBolusStop
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.db.Treatment
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgBolusStopTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
         `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
         danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
-        val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump)
+        val packet = MsgBolusStop(injector)
 
         // test message decoding
         packet.handleMessage(ByteArray(100))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index 3faa03b87e..be0165938f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -1,25 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgCheckValue
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgCheckValueTest : DanaRTestBase() {
 
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-
     @Test fun runTest() {
-        val packet = MsgCheckValue(aapsLogger, danaPump, danaRPlugin)
+        val packet = MsgCheckValue(injector)
 
         // test message decoding
         val array = ByteArray(100)
-        putByteToArray(array, 0, info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL.toByte())
+        putByteToArray(array, 0, DanaPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
+        Assert.assertEquals(DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index 4ccc113fa4..a67bad6612 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgError
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,13 +13,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(NSUpload::class)
 class MsgErrorTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var nsUpload: NSUpload
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
         PowerMockito.mockStatic(NSUpload::class.java)
-        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload)
+        val packet = MsgError(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
index ffea0e4dbe..1f3154a95f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryAlarm
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -9,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner
 @RunWith(PowerMockRunner::class)
 class MsgHistoryAlarmTest : DanaRTestBase() {
 
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
-        val packet = MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper)
+        val packet = MsgHistoryAlarm(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
index e9cb529359..0e45e40cc6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryAllDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryAllDone(aapsLogger, danaPump)
+        val packet = MsgHistoryAllDone(injector)
 
         // test message decoding
         packet.handleMessage(ByteArray(0))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
index 7384ce84d7..cd95f1a530 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.danar.comm.MsgHistoryAll
 import info.nightscout.androidaps.db.DatabaseHelper
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -13,16 +12,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(MainApp::class)
 class MsgHistoryAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        PowerMockito.mockStatic(MainApp::class.java)
-        `when`(MainApp.getDbHelper()).thenReturn(PowerMockito.mock(DatabaseHelper::class.java))
-        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryAll(injector)
 
         // test message decoding
-        val array = ByteArray(100)
+        val array = createArray(100, 2)
 
         putByteToArray(array, 0, 1)
         packet.handleMessage(array)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
index 79ec7d8fdc..05022714fd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBasalHour
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBasalHourTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryBasalHour(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
index 9852196047..cbeabe16d1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBolus
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryBolus(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
index e455a469ba..1433cb0470 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryCarbo
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryCarboTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryCarbo(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
index 0d00fab90a..eae5d34e86 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryDailyInsulin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDailyInsulinTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryDailyInsulin(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
index 50fa9b5b1d..86706531cf 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDone(aapsLogger, danaPump)
+        val packet = MsgHistoryDone(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
index f13bcadec9..f2618a2bb7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryError
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryError(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryError(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
index bc3ab42785..3ec8c737dc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryGlucose
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryGlucose(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
index 3f350d3cb2..0bfceb6477 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNewDone(aapsLogger, danaPump)
+        val packet = MsgHistoryNewDone(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
index daf56f0b10..229a21dde6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryNew
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryNew(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
index fc6a9d3fbd..ccbb985ede 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryRefill
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryRefillTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryRefill(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
index dcc199df53..a45322f5b9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistorySuspend
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistorySuspendTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistorySuspend(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
index 070205489a..dac1589cac 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgInitConnStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBasic(aapsLogger, danaPump)
+        val packet = MsgInitConnStatusBasic(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
index 8a4b42d3c9..96c3ead153 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBolus
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgInitConnStatusBolusTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaPump)
+        val packet = MsgInitConnStatusBolus(injector)
 
         // test message decoding
         var array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
index fc236fa9a7..f86c346ba2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -1,14 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusOption
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
@@ -18,12 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(VirtualPumpPlugin::class)
 class MsgInitConnStatusOptionTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        `when`(activePlugin.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
-        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, activePlugin)
+        `when`(activePluginProvider.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
+        val packet = MsgInitConnStatusOption(injector)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index 813c8fa940..be2a069952 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -1,31 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusTime
-import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class, info.nightscout.androidaps.danar.DanaRPlugin::class, ConfigBuilderPlugin::class)
+@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, ConfigBuilderPlugin::class, CommandQueueProvider::class)
 class MsgInitConnStatusTimeTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-
     @Test fun runTest() {
-        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil)
+        val packet = MsgInitConnStatusTime(injector)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
index 235d5e6757..426086e1b7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgPCCommStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgPCCommStart(aapsLogger)
+        val packet = MsgPCCommStart(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
index 10452ad547..75b60f6686 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgPCCommStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgPCCommStop(aapsLogger)
+        val packet = MsgPCCommStop(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
index 24be4bf480..bafa3b3376 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetActivateBasalProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetActivateBasalProfile(aapsLogger, 1.toByte())
+        val packet = MsgSetActivateBasalProfile(injector, 1.toByte())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
index a74a940e0f..56c2c51d0e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgSetBasalProfileTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgSetBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper, 1.toByte(), Array(24) { 1.0 })
+        val packet = MsgSetBasalProfile(injector, 1.toByte(), Array(24) { 1.0 })
 
         // test message decoding
         packet.handleMessage(createArray(34, 2.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
index 9bedcdf29c..9a0ba905ee 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetCarbsEntryTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), 10)
+        val packet = MsgSetCarbsEntry(injector, System.currentTimeMillis(), 10)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index ad28decac2..967fed825b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgSetExtendedBolusStartTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val packet = MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 2.0, 2.toByte())
+        val packet = MsgSetExtendedBolusStart(injector, 2.0, 2.toByte())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
index a870698fdf..dfac8cbfd3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetExtendedBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetExtendedBolusStop(aapsLogger)
+        val packet = MsgSetExtendedBolusStop(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
index f2b1de97da..79e43acd7e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetSingleBasalProfile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgSetSingleBasalProfileTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgSetSingleBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper,  createArray(24, 2.0))
+        val packet = MsgSetSingleBasalProfile(injector, createArray(24, 2.0))
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
index f67d0f2aad..715a491779 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetTempBasalStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetTempBasalStart(aapsLogger, 250, 1)
+        val packet = MsgSetTempBasalStart(injector, 250, 1)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
index db01c3c138..44a1c64ddb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -5,13 +5,12 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
 
 @RunWith(PowerMockRunner::class)
 class MsgSetTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetTime(aapsLogger, dateUtil, Date(System.currentTimeMillis()))
+        val packet = MsgSetTime(injector, System.currentTimeMillis())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
index 69f814faf7..14c70f4a04 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetUserOptions(aapsLogger, danaPump)
+        val packet = MsgSetUserOptions(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
index 56f7e96971..532d6e0c7b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingActiveProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingActiveProfile(aapsLogger, danaPump)
+        val packet = MsgSettingActiveProfile(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaPump.activeProfile)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaPump.activeProfile)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
index eddf05406e..cf172d5f50 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingBasalProfileAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingBasalProfileAll(aapsLogger, danaPump)
+        val packet = MsgSettingBasalProfileAll(injector)
 
         // test message decoding
         packet.handleMessage(createArray(400, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
index dadb640d2d..7d281f6b50 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingBasal
+import info.nightscout.androidaps.interfaces.PumpDescription
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,15 +13,13 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class)
 class MsgSettingBasalTest : DanaRTestBase() {
 
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-
     @Test fun runTest() {
         `when`(danaRPlugin.getPumpDescription()).thenReturn(PumpDescription())
-        val packet = MsgSettingBasal(aapsLogger, danaPump, danaRPlugin)
+        val packet = MsgSettingBasal(injector)
 
         // test message decoding
         packet.handleMessage(createArray(100, 1.toByte()))
-        val expected = MessageBase.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
+        val expected = packet.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
         Assert.assertEquals(expected.toDouble() / 100.0, danaPump.pumpProfiles!![danaPump.activeProfile][1], 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
index c69532df2d..5a779d70b6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingGlucose(aapsLogger, danaPump)
+        val packet = MsgSettingGlucose(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
index 3d0ab552c0..95152aed97 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingMaxValuesTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingMaxValues(aapsLogger, danaPump)
+        val packet = MsgSettingMaxValues(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaPump.maxBolus, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaPump.maxBolus, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
index 9e3387d2ed..1c7126485b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -1,31 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MsgSettingMeal
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class, info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class)
+@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
 class MsgSettingMealTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-
     @Test fun runTest() {
-        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRKoreanPlugin)
+        val packet = MsgSettingMeal(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaPump.bolusStep, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaPump.bolusStep, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index dd574c4200..d04e4dcfcb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll
 import org.junit.Assert
 import org.junit.Test
@@ -11,11 +11,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatiosAll(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.morningCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.morningCIR)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index 8e56b1defb..2cc012862c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatios(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatios(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 81f6f33b35..f99a68d472 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime
 import org.junit.Assert
 import org.junit.Test
@@ -12,17 +12,17 @@ import java.util.*
 class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingPumpTime(aapsLogger, danaPump, dateUtil)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingPumpTime(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         val bytes = createArray(34, 7.toByte())
         val time = Date(
-            100 + MessageBase.intFromBuff(bytes, 5, 1),
-            MessageBase.intFromBuff(bytes, 4, 1) - 1,
-            MessageBase.intFromBuff(bytes, 3, 1),
-            MessageBase.intFromBuff(bytes, 2, 1),
-            MessageBase.intFromBuff(bytes, 1, 1),
-            MessageBase.intFromBuff(bytes, 0, 1)
+            100 + packet.intFromBuff(bytes, 5, 1),
+            packet.intFromBuff(bytes, 4, 1) - 1,
+            packet.intFromBuff(bytes, 3, 1),
+            packet.intFromBuff(bytes, 2, 1),
+            packet.intFromBuff(bytes, 1, 1),
+            packet.intFromBuff(bytes, 0, 1)
         ).time
         packet.handleMessage(bytes)
         Assert.assertEquals(time, danaPump.pumpTime)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index 200f6801c5..f75ed71ba7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo
 import org.junit.Assert
@@ -11,8 +12,8 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingShippingInfoTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingShippingInfo(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingShippingInfo(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaPump.serialNumber)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index 6b77343b60..c9c300081d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingUserOptions(aapsLogger, danaPump)
+        val packet = MsgSettingUserOptions(injector)
         danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(48, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
index e140a22205..910e84830f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgStatusBasic
 import org.junit.Assert
 import org.junit.Test
@@ -11,9 +10,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusBasic(aapsLogger, danaPump)
+        val packet = MsgStatusBasic(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index 4bda015615..4621f34029 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -1,25 +1,19 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgStatusBolusExtendedTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-
     @Test
     fun runTest() {
-        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil)
+        `when`(activePluginProvider.activeTreatments).thenReturn(treatmentsInterface)
+        val packet = MsgStatusBolusExtended(injector)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index df34e11c0f..3872536d6e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgStatusProfile
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusProfile(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgStatusProfile(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
index e08bbeab66..8827e59bcb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,12 +13,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConfigBuilderPlugin::class)
 class MsgStatusTempBasalTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-
     @Test fun runTest() {
-        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector)
+        `when`(activePluginProvider.activeTreatments).thenReturn(treatmentsInterface)
+        val packet = MsgStatusTempBasal(injector)
         // test message decoding
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
index 9f86f604b3..ad8ef6a2d1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgStatus
 import org.junit.Assert
 import org.junit.Test
@@ -11,9 +10,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatus(aapsLogger, danaPump)
+        val packet = MsgStatus(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 3703dc4c3d..1632760ba7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -1,42 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
-import info.nightscout.androidaps.danars.comm.DanaRSTestBase
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
-class MessageHashTableRKoreanTest : DanaRSTestBase() {
+class MessageHashTableRKoreanTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var nsUpload: NSUpload
-    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, databaseHelper, injector)
+        val messageHashTable = MessageHashTableRKorean(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index 096e20e2bc..f531aa25ad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -1,28 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import android.content.Context
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2
 import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -31,29 +19,15 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
 class MessageHashTable_rv2Test : DanaRTestBase() {
 
-    @Mock lateinit var context: Context
-    @Mock lateinit var rxBus: RxBusWrapper
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Mock lateinit var nsUpload: NSUpload
-
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, nsUpload, injector, DateUtil(context, resourceHelper), databaseHelper)
-        val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaPump)
+        val messageHashTableRv2 = MessageHashTableRv2(injector)
+        val forTesting: MessageBase = MsgStatusAPS_v2(injector)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
         // try putting another command
-        val testMessage = MessageBase()
+        val testMessage = MessageBase(injector)
         testMessage.SetCommand(0xE005)
         messageHashTableRv2.put(testMessage)
         Assert.assertEquals(0xE005, messageHashTableRv2.findMessage(0xE005).command.toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index 3d1af1fa52..f8aeb37b1d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -1,18 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2
-import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
@@ -20,19 +17,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, DanaRv2Plugin::class, ConfigBuilderPlugin::class)
 class MsgCheckValue_v2Test : DanaRTestBase() {
 
-    val rxBus = RxBusWrapper()
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-
     @Test
     fun runTest() {
-        val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
+        val packet = MsgCheckValue_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
+        Assert.assertEquals(DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
index a7e4082c11..1adaee10a3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import android.content.Context
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
@@ -19,16 +13,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DetailedBolusInfoStorage::class)
 class MsgHistoryEvents_v2Test : DanaRTestBase() {
 
-    @Mock lateinit var context: Context
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-
     @Test @Throws(Exception::class) fun runTest() {
-        val packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), activePluginProvider, injector, DateUtil(context, resourceHelper), 0)
+        val packet = MsgHistoryEvents_v2(injector, 0)
 
         // test message decoding
-        val array = ByteArray(100)
+        val array = createArray(100, 2)
 
         putByteToArray(array, 0, 0xFF.toByte())
         packet.handleMessage(array)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
index 0a275c8418..228a953b5c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase.intFromBuff
 import info.nightscout.androidaps.danars.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -14,33 +13,33 @@ class MsgSetAPSTempBasalStart_v2Test : DanaRTestBase() {
     @Test fun runTest() {
 
         // test low hard limit
-        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
-        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, -1, true, false)
+        Assert.assertEquals(0, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
-        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 550, true, false)
+        Assert.assertEquals(500, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test setting 15 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
-        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 50, true, false)
+        Assert.assertEquals(50, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test setting 30 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
-        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 50, false, true)
+        Assert.assertEquals(50, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // over 200% set always 15 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
-        Assert.assertEquals(250, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 250, false, true)
+        Assert.assertEquals(250, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test low hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
-        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, -1, false, true)
+        Assert.assertEquals(0, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
-        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 550, false, true)
+        Assert.assertEquals(500, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
 
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
index 0510313426..8d21eab349 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -10,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetHistoryEntry_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
+        val packet = MsgSetHistoryEntry_v2(injector, 1, System.currentTimeMillis(), 1, 0)
         // test message decoding
         // != 1 fails
         packet.handleMessage(createArray(34, 2.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
index 9f3685644c..9f92821b35 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,11 +12,11 @@ class MsgStatusAPS_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2(aapsLogger, danaPump)
+        val packet = MsgStatusAPS_v2(injector)
         // test iob
         //TODO Find a way to mock treatments plugin
         val testArray = createArray(34, 7.toByte())
-        val iob = MessageBase.intFromBuff(testArray, 0, 2) / 100.0
+        val iob = packet.intFromBuff(testArray, 0, 2) / 100.0
         packet.handleMessage(testArray)
         Assert.assertEquals(iob, danaPump.iob, 0.0)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
index ba93f8e707..33f96373eb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,9 +12,9 @@ class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2(aapsLogger, danaPump)
+        val packet = MsgStatusBolusExtended_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaPump.extendedBolusAmount, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaPump.extendedBolusAmount, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
index 7843fbb85c..b1b6da6960 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -10,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTempBasal_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil)
+        val packet = MsgStatusTempBasal_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
         Assert.assertEquals(true, danaPump.isTempBasalInProgress)
diff --git a/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt b/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt
deleted file mode 100644
index 35bc1a6629..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package info.nightscout.androidaps.core
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
index c5f46ff919..eced4a9afa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -1,82 +1,56 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableRKorean @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    dateUtil: DateUtil,
-    nsUpload: NSUpload,
-    databaseHelper: DatabaseHelperInterface,
-    injector: HasAndroidInjector
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic_k(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus_k(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll_k(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic_k(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus_k(injector))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime_k(injector))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus_k(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic_k(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgSettingBasal_k(injector))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(injector))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll_k(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_k(injector))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
     }
 
     override fun put(message: MessageBase) {
@@ -84,6 +58,6 @@ class MessageHashTableRKorean @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 2161598069..362240338c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -1,17 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgCheckValue_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xF0F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index 4a578f2cb7..07999f5267 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -1,22 +1,16 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBasic_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0303)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index 7a3e75114c..290121b7ac 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -1,24 +1,16 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0302)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index f990fe8346..c884364b03 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -1,33 +1,17 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusTime_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0301)
@@ -46,7 +30,7 @@ class MsgInitConnStatusTime_k(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingKoreanDanaDriver")
+            configBuilder.storeSettings("ChangingKoreanDanaDriver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 4a2e6bb063..3b286a3de1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
@@ -15,9 +14,8 @@ import java.util.*
  * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
  */
 class MsgSettingBasalProfileAll_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3206)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
index 150099293d..4e3bfb11ec 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSettingBasal_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3202)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
index 2ac86a5085..559dde782d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusBasic_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
index b0f7004955..0f0815bd93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatus_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 2bacae53cb..e9963d8ba3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -4,7 +4,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -12,6 +11,10 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean;
+import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgSettingBasal_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.danar.DanaRPlugin;
 import info.nightscout.androidaps.danar.R;
 import info.nightscout.androidaps.danar.SerialIOThread;
@@ -50,10 +53,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean;
-import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k;
-import info.nightscout.androidaps.danaRKorean.comm.MsgSettingBasal_k;
-import info.nightscout.androidaps.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.T;
@@ -128,10 +127,10 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
-            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
-            MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin);
+            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(injector);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector);
+            MsgCheckValue_k checkValue = new MsgCheckValue_k(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -154,7 +153,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRKoreanPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
@@ -162,15 +161,15 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal_k(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -184,8 +183,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -213,12 +212,12 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -226,8 +225,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -235,8 +234,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -244,8 +243,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -261,12 +260,12 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
         danaPump.setBolusingTreatment(t);
         danaPump.setBolusDone(false);
-        MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+        MsgBolusStart start = new MsgBolusStart(injector, amount);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(injector, carbtime, carbs));
         }
 
         if (amount > 0) {
@@ -298,7 +297,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
@@ -317,7 +316,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, basal);
+        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(injector, basal);
         mSerialIOThread.sendMessage(msgSet);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
index f0e3f4570f..89764534d6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
@@ -1,104 +1,74 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableRv2 @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    danaRv2Plugin: DanaRv2Plugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    nsUpload: NSUpload,
-    injector: HasAndroidInjector,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil))        // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended_v2(aapsLogger, danaPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
-        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgStatusAPS_v2(aapsLogger, danaPump))              // 0xE001 CMD_PUMPSTATUS_APS
-        put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
-        put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(injector, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal_v2(injector))        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended_v2(injector))    // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(injector))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime(injector))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(injector))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(injector))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(injector))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(injector))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(injector))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(injector))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal(injector))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(injector))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(injector))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(injector))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(injector))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(injector, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(injector))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(injector, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(injector))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_v2(injector))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgStatusAPS_v2(injector))              // 0xE001 CMD_PUMPSTATUS_APS
+        put(MsgSetAPSTempBasalStart_v2(injector, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
+        put(MsgHistoryEvents_v2(injector))          // 0xE003 CMD_GET_HISTORY
+        put(MsgSetHistoryEntry_v2(injector, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
     override fun put(message: MessageBase) {
@@ -106,6 +76,6 @@ class MessageHashTableRv2 @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 64d15af883..184acdec55 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -1,33 +1,18 @@
 package info.nightscout.androidaps.danaRv2.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgCheckValue_v2(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val danaRv2Plugin: DanaRv2Plugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
 
     init {
@@ -41,7 +26,7 @@ class MsgCheckValue_v2(
         danaPump.hwModel = intFromBuff(bytes, 0, 1)
         danaPump.protocol = intFromBuff(bytes, 1, 1)
         danaPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaPump.hwModel != info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL) {
+        if (danaPump.hwModel != DanaPump.EXPORT_MODEL) {
             danaPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
@@ -53,7 +38,7 @@ class MsgCheckValue_v2(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            configBuilder.storeSettings("ChangingDanaRv2Driver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
@@ -69,7 +54,7 @@ class MsgCheckValue_v2(
             danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
             danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            configBuilder.storeSettings("ChangingDanaRv2Driver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
index 13e5ed1e51..ae2c29e8be 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -9,26 +8,14 @@ import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
 class MsgHistoryEvents_v2 constructor(
-    val aapsLogger: AAPSLogger,
-    val resourceHelper: ResourceHelper,
-    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    val danaRv2Plugin: DanaRv2Plugin,
-    val rxBus: RxBusWrapper,
-    val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector,
-    private val dateUtil: DateUtil,
     var from: Long = 0
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE003)
@@ -175,7 +162,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            else                                                        -> {
+            else                                                       -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 8e09ee1273..cd1d36e29c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -1,16 +1,16 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 
 @Suppress("UNUSED_PARAMETER")
 class MsgSetAPSTempBasalStart_v2(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var percent: Int,
     fifteenMinutes: Boolean,
     thirtyMinutes: Boolean
-) : MessageBase() {
+) : MessageBase(injector) {
 
     val PARAM30MIN = 160
     val PARAM15MIN = 150
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
index 7a73fc4c00..c19a3912a7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSetHistoryEntry_v2(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     type: Int, time: Long, param1: Int, param2: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE004)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
index d09355299e..383d190a48 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusAPS_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE001)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
index 425c5c0469..f0afbabcb2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
index cdd72aae2a..53f2c81e1d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.logging.LTag
 import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index 87d689530f..41267b5854 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -6,7 +6,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -157,11 +156,11 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
-            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil);
-            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaPump);
-            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
+            MsgStatus statusMsg = new MsgStatus(injector);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
+            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(injector);
+            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(injector);
+            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -184,14 +183,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             PumpInterface pump = activePlugin.getActivePump();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+            mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
             if (danaPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
@@ -221,8 +220,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 } else {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -231,17 +230,17 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             long now = System.currentTimeMillis();
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(injector));
                 danaPump.setLastSettingsRead(now);
             }
 
@@ -268,12 +267,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -283,12 +282,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -303,12 +302,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -317,8 +316,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -327,8 +326,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -337,8 +336,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -354,16 +353,16 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+            start = new MsgBolusStart(injector, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+            start = new MsgBolusStartWithSpeed(injector, amount, preferencesSpeed);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, carbtime, carbs);
+            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, carbtime, carbs);
             mSerialIOThread.sendMessage(msg);
-            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, carbtime, carbs, 0);
+            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
@@ -420,7 +419,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             public void run() {
                 // load last bolus status
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-                mSerialIOThread.sendMessage(new MsgStatus(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgStatus(injector));
                 bolusingEvent.setPercent(100);
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
@@ -430,9 +429,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount, long time) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, time, amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, time, amount);
         mSerialIOThread.sendMessage(msg);
-        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, time, amount, 0);
+        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
         lastHistoryFetched = Math.min(lastHistoryFetched, time - T.mins(1).msecs());
         return true;
@@ -449,7 +448,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil, lastHistoryFetched);
+        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(injector, lastHistoryFetched);
         aapsLogger.debug(LTag.PUMP, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
@@ -469,9 +468,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(injector, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
@@ -483,7 +482,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
index fc9e9ab6ec..9f918a416c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
@@ -3,19 +3,33 @@ package info.nightscout.androidaps.danar.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.joda.time.DateTime;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 
-import info.nightscout.androidaps.logging.L;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.dana.DanaPump;
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.danar.DanaRPlugin;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.utils.CRC;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /*
  *  00  01   02  03   04   05  06
@@ -24,22 +38,39 @@ import info.nightscout.androidaps.utils.CRC;
  */
 
 public class MessageBase {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.PUMPCOMM);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public DateUtil dateUtil;
+    @Inject public DanaPump danaPump;
+    @Inject public DanaRPlugin danaRPlugin;
+    @Inject public DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject public DanaRv2Plugin danaRv2Plugin;
+    @Inject public RxBusWrapper rxBus;
+    @Inject public ResourceHelper resourceHelper;
+    @Inject public ActivePluginProvider activePlugin;
+    @Inject public ConfigBuilderInterface configBuilder;
+    @Inject public CommandQueueProvider commandQueue;
+    @Inject public DetailedBolusInfoStorage detailedBolusInfoStorage;
+    @Inject public ConstraintChecker constraintChecker;
+    @Inject public NSUpload nsUpload;
+    @Inject public DatabaseHelperInterface databaseHelper;
+    HasAndroidInjector injector;
+
     public byte[] buffer = new byte[512];
     private int position = 6;
 
     public boolean received = false;
     public boolean failed = false;
 
+    public MessageBase(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+        this. injector = injector;
+    }
+
     public void SetCommand(int cmd) {
         this.buffer[4] = (byte) (cmd >> 8 & 0xFF);
         this.buffer[5] = (byte) (cmd & 0xFF);
     }
 
-    public void resetBuffer() {
-        position = 6;
-    }
-
     public void AddParamByte(byte data) {
         this.buffer[this.position++] = data;
     }
@@ -66,13 +97,15 @@ public class MessageBase {
         AddParamByte((byte) (date.get(Calendar.SECOND)));
     }
 
-    public void AddParamDateTime(Date date) {
-        AddParamByte((byte) (date.getSeconds()));
-        AddParamByte((byte) (date.getMinutes()));
-        AddParamByte((byte) (date.getHours()));
-        AddParamByte((byte) (date.getDate()));
-        AddParamByte((byte) (date.getMonth() + 1));
-        AddParamByte((byte) (date.getYear() - 100));
+    public void AddParamDateTimeReversed(long timestamp) {
+        GregorianCalendar date = new GregorianCalendar();
+        date.setTimeInMillis(timestamp);
+        AddParamByte((byte) (date.get(Calendar.SECOND)));
+        AddParamByte((byte) (date.get(Calendar.MINUTE)));
+        AddParamByte((byte) (date.get(Calendar.HOUR_OF_DAY)));
+        AddParamByte((byte) (date.get(Calendar.DAY_OF_MONTH)));
+        AddParamByte((byte) (date.get(Calendar.MONTH) + 1));
+        AddParamByte((byte) (date.get(Calendar.YEAR) - 1900 - 100));
     }
 
     public byte[] getRawMessageBytes() {
@@ -97,13 +130,11 @@ public class MessageBase {
     }
 
     public void handleMessage(byte[] bytes) {
-        if (L.isEnabled(LTag.PUMPCOMM)) {
-            if (bytes.length > 6) {
-                int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
-                log.debug("UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
-            } else {
-                log.debug("MISFORMATTED MSG: " + toHexString(bytes));
-            }
+        if (bytes.length > 6) {
+            int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
+            aapsLogger.debug(LTag.PUMPCOMM, "UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "MISFORMATTED MSG: " + toHexString(bytes));
         }
     }
 
@@ -115,11 +146,11 @@ public class MessageBase {
         return command;
     }
 
-    public static int byteFromRawBuff(byte[] buff, int offset) {
+    public int byteFromRawBuff(byte[] buff, int offset) {
         return buff[offset] & 0xFF;
     }
 
-    public static int intFromBuff(byte[] buff, int offset, int length) {
+    public int intFromBuff(byte[] buff, int offset, int length) {
         offset += 6;
         switch (length) {
             case 1:
@@ -134,37 +165,39 @@ public class MessageBase {
         return 0;
     }
 
-    public static long dateTimeFromBuff(byte[] buff, int offset) {
+    public long dateTimeFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         0
-                ).getTime();
+                ).getMillis();
     }
 
-    public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
+    public synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         intFromBuff(buff, offset + 5, 1)
-                ).getTime();
+                ).getMillis();
     }
 
-    public static long dateFromBuff(byte[] buff, int offset) {
+    public long dateFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
-                        intFromBuff(buff, offset + 2, 1)
-                ).getTime();
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
+                        intFromBuff(buff, offset + 2, 1),
+                        0,
+                        0
+                ).getMillis();
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
@@ -184,7 +217,7 @@ public class MessageBase {
     }
 
     public static String toHexString(byte[] buff) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         int count = 0;
         for (byte element : buff) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
index 9ecf8c8d12..4e36973f26 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
@@ -1,99 +1,73 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableR @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    nsUpload: NSUpload,
-    injector: HasAndroidInjector,
-    databaseHelper: DatabaseHelperInterface,
-    dateUtil: DateUtil
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(injector, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(injector))                    // 0x020B CMD_PUMP_STATUS
         // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgInitConnStatusTime(injector))
+        put(MsgInitConnStatusBolus(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(injector))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(injector))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(injector))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(injector))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(injector))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(injector))               // 0x31F1 CMD_HISTORY_DONT_USED
         // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))
+        put(MsgSettingBasal(injector))
         // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgSettingMeal(injector))
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(injector))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(injector))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(injector))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(injector, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(injector))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(injector, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(injector))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
         // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgCheckValue(aapsLogger, danaPump, danaRPlugin))
+        put(MsgCheckValue(injector))
     }
 
     override fun put(message: MessageBase) {
@@ -101,6 +75,6 @@ class MessageHashTableR @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index ecc27bed6a..2cceeb10f1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -1,20 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
 class MsgBolusProgress(
-    private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
-    private val rxBus: RxBusWrapper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0202)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index 4ea0916bec..66ba788656 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStart(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
-    private val danaPump: DanaPump,
+    injector: HasAndroidInjector,
     private var amount: Double
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0102)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index a683851ae3..845d6407d9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -1,18 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStartWithSpeed(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
-    private val danaPump: DanaPump,
+    injector: HasAndroidInjector,
     private var amount: Double,
     speed: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0104)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index 8d9ae93671..a531d1cc03 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -1,19 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgBolusStop(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0101)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
index afc59a642c..d6c9ef2255 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
@@ -1,15 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.logging.LTag
 
 class MsgCheckValue(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xF0F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index 2f451ee8ac..4791424d8e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -1,21 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgError(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val nsUpload: NSUpload
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0601)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
index 81750a9eac..c531f30ad4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryAlarm(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3105)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
index 5c437ddc77..f7573d14c2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
@@ -1,19 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 open class MsgHistoryAll(
-    val aapsLogger: AAPSLogger,
-    val rxBus: RxBusWrapper,
-    private val dateUtil: DateUtil,
-    private val databaseHelper: DatabaseHelperInterface
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x41F2)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
index c439f5af77..431a301a7a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryAllDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x41F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
index 14b7c009c6..a90847871e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBasalHour(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x310A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
index 94ee55b969..b7f2cd011a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBolus(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3101)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
index 9f55b2c5e2..2aa76526d7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryCarbo(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3107)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
index 173eaa29ea..df0e3135d6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryDailyInsulin(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3102)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
index 2279fd40d9..a528a630c4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x31F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
index e8ee5fd720..55ddadb91a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryError(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3106)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
index 325154157d..15f40773fa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryGlucose(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3104)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
index 1ba71e3138..21e9d23672 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryNew(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x42F2)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
index ce9cd5ed89..77f627d8ff 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryNewDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x42F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
index 66494adfbb..1b4b38d67b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryRefill(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3108)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
index a37fad26f9..a0b6bbb9a3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistorySuspend(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3109)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
index 0ec5675d8d..c0b3864df1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgInitConnStatusBasic(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0303)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index b53541a077..f866533d08 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -1,21 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0302)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index e44fda8252..3fa4ef120c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -1,23 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusOption(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0304)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index b03946d4ba..090d4ee443 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -1,32 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusTime(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0301)
@@ -45,7 +29,7 @@ class MsgInitConnStatusTime(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaDriver")
+            configBuilder.storeSettings("ChangingDanaDriver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             failed = false
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
index 3765d47905..3bb8aca2df 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgPCCommStart constructor(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3001)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
index c2c2ee78d8..e71226a556 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgPCCommStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3002)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
index ba60178a34..da1f3fc439 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetActivateBasalProfile(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     index: Byte
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
index f49a34b394..b72acacffe 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
@@ -1,20 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSetBasalProfile(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    injector: HasAndroidInjector,
     index: Byte,
     values: Array<Double>
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
index 611da11862..bf5010d5e6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSetCarbsEntry(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     val time: Long,
     val amount: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0402)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index cb13f2c2e1..e4af85ecf0 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -1,17 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 
 class MsgSetExtendedBolusStart(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
+    injector: HasAndroidInjector,
     private var amount: Double,
     private var halfhours: Byte
 
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0407)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
index b655ba6361..422fef6875 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetExtendedBolusStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0406)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
index c194eebe0e..fe183a648e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
@@ -1,19 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSetSingleBasalProfile(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    injector: HasAndroidInjector,
     values: Array<Double>
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
index e9f9a201c2..85a515d78b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetTempBasalStart(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var percent: Int,
     private var durationInHours: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0401)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
index 97551b446c..8fa27bec42 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetTempBasalStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0403)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
index aa526f19ad..e9a61dcb9f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
@@ -1,19 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.utils.DateUtil
-import java.util.*
 
 class MsgSetTime(
-    private val aapsLogger: AAPSLogger,
-    private val dateUtil: DateUtil,
-    time: Date
-) : MessageBase() {
+    injector: HasAndroidInjector,
+    time: Long
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x330a)
-        AddParamDateTime(time)
+        AddParamDateTimeReversed(time)
         aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + dateUtil.dateAndTimeString(time))
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index ab69e4017c..68d6ef73d9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSetUserOptions(
-    private val aapsLogger: AAPSLogger,
-    danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x330B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
index dbc313ad4e..09ae3d740e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingActiveProfile(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320C)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
index ed377cb020..dd62d52352 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
@@ -1,16 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danar.DanaRPlugin
 import java.util.*
 
 class MsgSettingBasal(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3202)
@@ -18,7 +14,7 @@ class MsgSettingBasal(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         for (index in 0..23) {
             var basal = intFromBuff(bytes, 2 * index, 2)
             if (basal < danaRPlugin.pumpDescription.basalMinimumRate) basal = 0
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
index b16cdff6b4..44314f131a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 /**
@@ -14,9 +13,8 @@ import java.util.*
  * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
  */
 class MsgSettingBasalProfileAll(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     override fun handleMessage(bytes: ByteArray) {
         danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
index f5516d564c..dd101f3240 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
@@ -1,16 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 /**
  * Created by mike on 05.07.2016.
  */
 class MsgSettingGlucose(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3209)
@@ -20,7 +19,7 @@ class MsgSettingGlucose(
     override fun handleMessage(bytes: ByteArray) {
         danaPump.units = intFromBuff(bytes, 0, 1)
         danaPump.easyBasalMode = intFromBuff(bytes, 1, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaPump.easyBasalMode)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
index acf3578439..aa5dba7afb 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingMaxValues(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 48ee127a37..2b235de981 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -1,24 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSettingMeal(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3203)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
index 861660cd6d..47d37d746a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgSettingProfileRatios(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3204)
@@ -15,7 +14,7 @@ class MsgSettingProfileRatios(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -28,7 +27,7 @@ class MsgSettingProfileRatios(
             danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
             danaPump.currentAIDR = intFromBuff(bytes, 8, 1)
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
index ba199acfa6..5ae004ceac 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgSettingProfileRatiosAll(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320D)
@@ -15,7 +14,7 @@ class MsgSettingProfileRatiosAll(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.morningCIR = intFromBuff(bytes, 0, 2)
             danaPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.afternoonCIR = intFromBuff(bytes, 4, 2)
@@ -34,7 +33,7 @@ class MsgSettingProfileRatiosAll(
             danaPump.nightCIR = intFromBuff(bytes, 12, 2)
             danaPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 88ecc856e4..5fffb9cf71 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaPump
@@ -8,10 +9,8 @@ import org.joda.time.DateTime
 import java.util.*
 
 class MsgSettingPumpTime(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
index a0540c4524..20515fd4e8 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingShippingInfo(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index d687513c94..9f3350a579 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 class MsgSettingUserOptions(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
 
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
index 2160ba8616..92100e07b1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
@@ -1,14 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatus(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
index 087eedeb77..b3e8f25b84 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatusBasic(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index b6e707b96c..2daf290d93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -3,20 +3,12 @@ package info.nightscout.androidaps.danar.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended(
-    private val injector: HasAndroidInjector,
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
index 263cdf8b9b..ec84c0184a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusProfile(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0204)
@@ -15,7 +14,7 @@ class MsgStatusProfile(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -26,7 +25,7 @@ class MsgStatusProfile(
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
             danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
index d8791c83ab..c354da3bb0 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
@@ -3,18 +3,12 @@ package info.nightscout.androidaps.danar.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import kotlin.math.ceil
 
 class MsgStatusTempBasal(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider,
-    private val injector: HasAndroidInjector
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
new file mode 100644
index 0000000000..f9c9b58f8d
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.danar.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.danaRKorean.comm.*
+import info.nightscout.androidaps.danaRv2.comm.*
+import info.nightscout.androidaps.danar.comm.*
+
+@Module
+@Suppress("unused")
+abstract class DanaRCommModule {
+
+    @ContributesAndroidInjector abstract fun contributesMessageBase(): MessageBase
+    @ContributesAndroidInjector abstract fun contributesMsgSetTime(): MsgSetTime
+    @ContributesAndroidInjector abstract fun contributesMsgBolusProgress(): MsgBolusProgress
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStart(): MsgBolusStart
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStartWithSpeed(): MsgBolusStartWithSpeed
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStop(): MsgBolusStop
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue(): MsgCheckValue
+    @ContributesAndroidInjector abstract fun contributesMsgError(): MsgError
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAll(): MsgHistoryAll
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAllDone(): MsgHistoryAllDone
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryDone(): MsgHistoryDone
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryNewDone(): MsgHistoryNewDone
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBasic(): MsgInitConnStatusBasic
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBolus(): MsgInitConnStatusBolus
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusOption(): MsgInitConnStatusOption
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusTime(): MsgInitConnStatusTime
+    @ContributesAndroidInjector abstract fun contributesMsgPCCommStart(): MsgPCCommStart
+    @ContributesAndroidInjector abstract fun contributesMsgPCCommStop(): MsgPCCommStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetActivateBasalProfile(): MsgSetActivateBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetBasalProfile(): MsgSetBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetCarbsEntry(): MsgSetCarbsEntry
+    @ContributesAndroidInjector abstract fun contributesMsgSetExtendedBolusStart(): MsgSetExtendedBolusStart
+    @ContributesAndroidInjector abstract fun contributesMsgSetExtendedBolusStop(): MsgSetExtendedBolusStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetSingleBasalProfile(): MsgSetSingleBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetTempBasalStart(): MsgSetTempBasalStart
+    @ContributesAndroidInjector abstract fun contributesMsgSetTempBasalStop(): MsgSetTempBasalStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetUserOptions(): MsgSetUserOptions
+    @ContributesAndroidInjector abstract fun contributesMsgSettingActiveProfile(): MsgSettingActiveProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasal(): MsgSettingBasal
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasalProfileAll(): MsgSettingBasalProfileAll
+    @ContributesAndroidInjector abstract fun contributesMsgSettingGlucose(): MsgSettingGlucose
+    @ContributesAndroidInjector abstract fun contributesMsgSettingMaxValues(): MsgSettingMaxValues
+    @ContributesAndroidInjector abstract fun contributesMsgSettingMeal(): MsgSettingMeal
+    @ContributesAndroidInjector abstract fun contributesMsgSettingProfileRatios(): MsgSettingProfileRatios
+    @ContributesAndroidInjector abstract fun contributesMsgSettingProfileRatiosAll(): MsgSettingProfileRatiosAll
+    @ContributesAndroidInjector abstract fun contributesMsgSettingPumpTime(): MsgSettingPumpTime
+    @ContributesAndroidInjector abstract fun contributesMsgSettingShippingInfo(): MsgSettingShippingInfo
+    @ContributesAndroidInjector abstract fun contributesMsgSettingUserOptions(): MsgSettingUserOptions
+    @ContributesAndroidInjector abstract fun contributesMsgStatus(): MsgStatus
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBasic(): MsgStatusBasic
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBolusExtended(): MsgStatusBolusExtended
+    @ContributesAndroidInjector abstract fun contributesMsgStatusProfile(): MsgStatusProfile
+    @ContributesAndroidInjector abstract fun contributesMsgStatusTempBasal(): MsgStatusTempBasal
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryBolus(): MsgHistoryBolus
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryDailyInsulin(): MsgHistoryDailyInsulin
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryGlucose(): MsgHistoryGlucose
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAlarm(): MsgHistoryAlarm
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryError(): MsgHistoryError
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryCarbo(): MsgHistoryCarbo
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryRefill(): MsgHistoryRefill
+    @ContributesAndroidInjector abstract fun contributesMsgHistorySuspend(): MsgHistorySuspend
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryBasalHour(): MsgHistoryBasalHour
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryNew(): MsgHistoryNew
+
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue_v2(): MsgCheckValue_v2
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryEvents_v2(): MsgHistoryEvents_v2
+    @ContributesAndroidInjector abstract fun contributesMsgSetAPSTempBasalStart_v2(): MsgSetAPSTempBasalStart_v2
+    @ContributesAndroidInjector abstract fun contributesMsgSetHistoryEntry_v2(): MsgSetHistoryEntry_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusAPS_v2(): MsgStatusAPS_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBolusExtended_v2(): MsgStatusBolusExtended_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusTempBasal_v2(): MsgStatusTempBasal_v2
+
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue_k(): MsgCheckValue_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBasic_k(): MsgInitConnStatusBasic_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBolus_k(): MsgInitConnStatusBolus_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusTime_k(): MsgInitConnStatusTime_k
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasalProfileAll_k(): MsgSettingBasalProfileAll_k
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasal_k(): MsgSettingBasal_k
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBasic_k(): MsgStatusBasic_k
+    @ContributesAndroidInjector abstract fun contributesMsgStatus_k(): MsgStatus_k
+}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt
new file mode 100644
index 0000000000..021d3573d7
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.danar.di
+
+import dagger.Module
+
+@Module(includes = [
+    DanaRCommModule::class,
+    DanaRServicesModule::class
+])
+open class DanaRModule
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 44f2950eb6..2fc6d2500f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -211,7 +211,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
 
     public void bolusStop() {
         aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (danaPump.getBolusingTreatment() == null ? "" : danaPump.getBolusingTreatment().insulin));
-        MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump);
+        MsgBolusStop stop = new MsgBolusStop(injector);
         danaPump.setBolusStopForced(true);
         if (isConnected()) {
             mSerialIOThread.sendMessage(stop);
@@ -230,42 +230,42 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
         MessageBase msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryAlarm(injector);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryBasalHour(injector);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryBolus(injector);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryCarbo(injector);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryDailyInsulin(injector);
                 break;
             case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryError(injector);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryGlucose(injector);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryRefill(injector);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistorySuspend(injector);
                 break;
         }
         danaPump.setHistoryDoneReceived(false);
-        mSerialIOThread.sendMessage(new MsgPCCommStart(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgPCCommStart(injector));
         SystemClock.sleep(400);
         mSerialIOThread.sendMessage(msg);
         while (!danaPump.getHistoryDoneReceived() && mRfcommSocket.isConnected()) {
             SystemClock.sleep(100);
         }
         SystemClock.sleep(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgPCCommStop(injector));
         result.success = true;
         result.comment = "OK";
         return result;
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index fa95da936c..5d78247577 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -4,7 +4,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -64,6 +63,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -136,11 +136,11 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
-            MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaPump, danaRPlugin);
+            MsgStatus statusMsg = new MsgStatus(injector);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector);
+            MsgCheckValue checkValue = new MsgCheckValue(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -163,7 +163,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
@@ -171,19 +171,19 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(injector));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(injector));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -195,8 +195,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 long timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                 aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date()));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -224,12 +224,12 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -237,8 +237,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -246,8 +246,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -255,8 +255,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -275,14 +275,14 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+            start = new MsgBolusStart(injector, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+            start = new MsgBolusStartWithSpeed(injector, amount, preferencesSpeed);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(injector, carbtime, carbs));
         }
 
         if (amount > 0) {
@@ -368,7 +368,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
@@ -387,9 +387,9 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(injector, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
@@ -401,7 +401,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
index 619700d90b..eacdfc1ffa 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
@@ -3,8 +3,9 @@ package info.nightscout.androidaps.danars.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
+import org.joda.time.DateTime;
+
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -117,14 +118,14 @@ public class DanaRS_Packet {
 
     public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         intFromBuff(buff, offset + 5, 1)
-                ).getTime();
+                ).getMillis();
     }
 
     protected static int intFromBuff(byte[] b, int srcStart, int srcLength) {
@@ -159,11 +160,13 @@ public class DanaRS_Packet {
 
     public long dateFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + byteArrayToInt(getBytes(buff, offset, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 1, 1)) - 1,
-                        byteArrayToInt(getBytes(buff, offset + 2, 1))
-                ).getTime();
+                new DateTime(
+                        2000 + byteArrayToInt(getBytes(buff, offset, 1)),
+                        byteArrayToInt(getBytes(buff, offset + 1, 1)),
+                        byteArrayToInt(getBytes(buff, offset + 2, 1)),
+                        0,
+                        0
+                ).getMillis();
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
@@ -180,7 +183,7 @@ public class DanaRS_Packet {
         if (buff == null)
             return "";
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         int count = 0;
         for (byte element : buff) {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index eb3f5529aa..d2e8bbc3dd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -85,7 +85,7 @@ open class DanaRS_Packet_APS_History_Events(
         val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
+            DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -93,13 +93,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
+            DanaPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
+            DanaPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -107,13 +107,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
+            DanaPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
+            DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -125,7 +125,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
+            DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -137,7 +137,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
+            DanaPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -145,42 +145,42 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
+            DanaPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
+            DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
+            DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
+            DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
+            DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
+            DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.CARBS             -> {
+            DanaPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
@@ -191,7 +191,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIMECANNULA      -> {
+            DanaPump.PRIMECANNULA      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index 327c4c99be..d476115d63 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -48,7 +48,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         val cf02: Double
         val cf04: Double
         val cf06: Double
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             dataIndex += dataSize
             dataSize = 2
             danaPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
@@ -95,7 +95,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         }
         if (danaPump.units < 0 || danaPump.units > 1) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Language: $language")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index a1fddcbea9..fff895b239 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -42,14 +42,14 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         dataIndex += dataSize
         dataSize = 1
         danaPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MMOL) {
+        if (danaPump.units == DanaPump.UNITS_MMOL) {
             danaPump.currentCF = danaPump.currentCF / 100.0
             danaPump.currentTarget = danaPump.currentTarget / 100.0
             currentBG = currentBG / 100.0
         }
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current BG: $currentBG")
         aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbohydrate")
         aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaPump.currentTarget)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
index 65ca61945e..c9fe481da8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -74,7 +74,7 @@ class DanaRS_Packet_Option_Get_User_Option(
         aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaPump.lcdOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaPump.backlightOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaPump.selectedLanguage)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaPump.shutdownHour)
         aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaPump.lowReservoirRate)
         aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaPump.refillAmount)

From c03a89db16988384c60b9e316d0d5610f8387480 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 13 May 2020 00:11:48 +0200
Subject: [PATCH 088/400] HistoryBrowser fix

---
 .../historyBrowser/IobCobStaticCalculatorPlugin.kt           | 4 +++-
 .../plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java | 4 ++--
 .../plugins/iob/iobCobCalculator/IobCobOref1Thread.java      | 5 +++--
 .../plugins/iob/iobCobCalculator/IobCobThread.java           | 5 +++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
index 4a81820fd7..03214175d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
@@ -2,9 +2,9 @@ package info.nightscout.androidaps.historyBrowser
 
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -15,7 +15,9 @@ import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
 class IobCobStaticCalculatorPlugin @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index c38c286122..01e8aa2ce2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -814,9 +814,9 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + dateUtil.dateAndTimeString(end));
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
             if (sensitivityOref1Plugin.isEnabled())
-                thread = new IobCobOref1Thread(injector, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+                thread = new IobCobOref1Thread(injector, this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             else
-                thread = new IobCobThread(injector, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+                thread = new IobCobThread(injector, this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             thread.start();
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index 457b16716a..ef891ff62c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -62,7 +62,6 @@ public class IobCobOref1Thread extends Thread {
     @Inject ProfileFunction profileFunction;
     @Inject Context context;
     @Inject ActivePluginProvider activePluginProvider;
-    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
     @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
     @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
     @Inject BuildHelper buildHelper;
@@ -71,6 +70,7 @@ public class IobCobOref1Thread extends Thread {
     @Inject DateUtil dateUtil;
 
     private final HasAndroidInjector injector;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin; // cannot be injected : HistoryBrowser uses different instance
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -78,10 +78,11 @@ public class IobCobOref1Thread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    IobCobOref1Thread(HasAndroidInjector injector, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    IobCobOref1Thread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
         injector.androidInjector().inject(this);
         this.injector = injector;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
 
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index 84a02005e1..d5af67e3b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -59,7 +59,6 @@ public class IobCobThread extends Thread {
     @Inject ProfileFunction profileFunction;
     @Inject Context context;
     @Inject ActivePluginProvider activePluginProvider;
-    @Inject IobCobCalculatorPlugin iobCobCalculatorPlugin;
     @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
     @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
     @Inject BuildHelper buildHelper;
@@ -68,6 +67,7 @@ public class IobCobThread extends Thread {
     @Inject DateUtil dateUtil;
 
     private final HasAndroidInjector injector;
+    private final IobCobCalculatorPlugin iobCobCalculatorPlugin; // cannot be injected : HistoryBrowser uses different instance
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -75,10 +75,11 @@ public class IobCobThread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    @Inject IobCobThread(HasAndroidInjector injector, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    @Inject IobCobThread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
         injector.androidInjector().inject(this);
         this.injector = injector;
+        this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
 
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;

From 15df6f33498182a3a5bbb4f5a9a97143fa1c4763 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Wed, 13 May 2020 10:14:02 +1200
Subject: [PATCH 089/400] merge n fix

---
 .../plugins/aps/loop/LoopPlugin.java          |   8 +++----
 .../general/overview/OverviewFragment.kt      |  20 ++++++++++--------
 app/src/main/jniLibs/README.md                |   1 +
 .../jniLibs/arm64-v8a/libBleCommandUtil.so    | Bin 0 -> 14000 bytes
 .../jniLibs/armeabi-v7a/libBleCommandUtil.so  | Bin 0 -> 13728 bytes
 .../main/jniLibs/armeabi/libBleCommandUtil.so | Bin 0 -> 13724 bytes
 .../main/jniLibs/mips/libBleCommandUtil.so    | Bin 0 -> 71484 bytes
 .../main/jniLibs/mips64/libBleCommandUtil.so  | Bin 0 -> 14808 bytes
 app/src/main/jniLibs/x86/libBleCommandUtil.so | Bin 0 -> 13668 bytes
 .../main/jniLibs/x86_64/libBleCommandUtil.so  | Bin 0 -> 14272 bytes
 app/src/main/res/values/strings.xml           |   1 +
 11 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/jniLibs/README.md
 create mode 100644 app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/armeabi/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/mips/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/mips64/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/x86/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/x86_64/libBleCommandUtil.so

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 1912d26b7a..44418a4106 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -446,26 +446,26 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                             rxBus.send(new EventNewNotification(carbreqlocal));
                         }
                         if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
-                            NSUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
+                            nsUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
                         }
                         if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)){
                             Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction5m.putExtra("ignoreDuration", 5);
                             PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore5m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore5m,"Ignore 5m"), pendingIntent5m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore5m,"Ignore 5m"), pendingIntent5m);
 
                             Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction15m.putExtra("ignoreDuration", 15);
                             PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context, 1, intentAction15m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore15m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore15m,"Ignore 15m"), pendingIntent15m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, resourceHelper.gs(R.string.ignore15m,"Ignore 15m"), pendingIntent15m);
 
                             Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction30m.putExtra("ignoreDuration", 30);
                             PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_UPDATE_CURRENT);
                             NotificationCompat.Action actionIgnore30m = new
-                                    NotificationCompat.Action(R.drawable.ic_notif_aaps, sp.getString(R.string.ignore30m,"Ignore 30m"), pendingIntent30m);
+                                    NotificationCompat.Action(R.drawable.ic_notif_aaps,  resourceHelper.gs(R.string.ignore30m,"Ignore 30m"), pendingIntent30m);
 
                             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
                             builder.setSmallIcon(R.drawable.notif_icon)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index a2fe9ce136..910e30c1a9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -748,15 +748,17 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
 
         val lastRun = loopPlugin.lastRun
-        if (config.APS && lastRun?.constraintsProcessed != null && lastRun?.constraintsProcessed.carbsReq > 0) {
-            overview_cob?.text = cobText + " *" + lastRun?.constraintsProcessed.carbsReq + " "+R.string.required+"*"
-            if (!carbAnimation.isRunning)
-                carbAnimation.start()
-        } else {
-            overview_cob?.text = cobText
-            if (carbAnimation.isRunning)
-                carbAnimation.stop()
-            carbAnimation.selectDrawable(0);
+        if (config.APS && lastRun?.constraintsProcessed != null) {
+            if (lastRun.constraintsProcessed!!.carbsReq > 0) {
+                overview_cob?.text = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
+                if (!carbAnimation.isRunning)
+                    carbAnimation.start()
+            } else {
+                overview_cob?.text = cobText
+                if (carbAnimation.isRunning)
+                    carbAnimation.stop()
+                carbAnimation.selectDrawable(0);
+            }
         }
 
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
diff --git a/app/src/main/jniLibs/README.md b/app/src/main/jniLibs/README.md
new file mode 100644
index 0000000000..7041df4e10
--- /dev/null
+++ b/app/src/main/jniLibs/README.md
@@ -0,0 +1 @@
+# danars-support-lib
\ No newline at end of file
diff --git a/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so b/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..69e283b5feb97bb8a055667ad99ef5a9da19f549
GIT binary patch
literal 14000
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

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..0c717bc3e836ca2b3bc7a546fa4d7779e1f52334
GIT binary patch
literal 13728
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
a1zkzJ0ZhE85RTh`+WnyWD^+48PWL~3K&c}D

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/armeabi/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..a51a8c7d9a16654b7d0e34c9d6e15b1a866b74f9
GIT binary patch
literal 13724
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
b9efny>4#*|LpbdNqECYFchpEdX}<pgP_0qI

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/mips/libBleCommandUtil.so b/app/src/main/jniLibs/mips/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..fcff5eb6b250d8a7f2ad4de289cc827108591260
GIT binary patch
literal 71484
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

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/mips64/libBleCommandUtil.so b/app/src/main/jniLibs/mips64/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..a8a292ea13037eccfe791f25e6526e8947b64a24
GIT binary patch
literal 14808
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
Vi@KXCds`=a1^r1Ij<dz|{{^|Ld3yi=

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86/libBleCommandUtil.so b/app/src/main/jniLibs/x86/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..638a9def954cf6ee4f3347adb3ffac94c61f6984
GIT binary patch
literal 13668
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

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86_64/libBleCommandUtil.so b/app/src/main/jniLibs/x86_64/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..94873d3732404ea850d7758d70e77e81b415dcc4
GIT binary patch
literal 14272
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
Pob#VbL?SQx73lv3RqkM5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11d278a3e0..a44b94e0f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -789,6 +789,7 @@
     <string name="ns_create_announcements_from_carbs_req_title">Create announcements from carbs required alerts</string>
     <string name="ns_create_announcements_from_errors_summary">Create Nightscout announcement for error dialogs and local alerts (also viewable in Careportal under Treatments)</string>
     <string name="ns_create_announcements_from_carbs_req_summary">Create Nightscout announcements for carbs required alerts</string>
+    <string name="key_ns_create_announcements_from_carbs_req" translatable="false">ns_create_announcements_from_carbs_req</string>
     <string name="eversense_shortname" translatable="false">EVR</string>
     <string name="wear_predictions_summary">Show the predictions on the watchface.</string>
     <string name="wear_predictions_title">Predictions</string>

From b49d9d13af75d08ca5fba84ef0a643d0af530d1b Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Wed, 13 May 2020 10:36:16 +1200
Subject: [PATCH 090/400] revert counter logic

---
 app/src/main/assets/OpenAPSSMB/determine-basal.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index 18181d25de..00a9c1d0a2 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -897,8 +897,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     // if not in LGS mode, cancel temps before the top of the hour to reduce beeping/vibration
     // console.error(profile.skip_neutral_temps, rT.deliverAt.getMinutes());
-    //patch determine basal so skip_neutral_temps works as expected
-    if ( !profile.skip_neutral_temps && rT.deliverAt.getMinutes() >= 55 ) {
+    if ( profile.skip_neutral_temps && rT.deliverAt.getMinutes() >= 55 ) {
         rT.reason += "; Canceling temp at " + rT.deliverAt.getMinutes() + "m past the hour. ";
         return tempBasalFunctions.setTempBasal(0, 0, profile, rT, currenttemp);
     }

From bcfd5e014998e07c905acc169c703c9fe29d594e Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Wed, 13 May 2020 11:36:32 +1200
Subject: [PATCH 091/400] revert counter logic

---
 .../plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 1032f81287..fa92994920 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -266,7 +266,7 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);
         mProfile.put("maxCOB", SMBDefaults.maxCOB);
-        mProfile.put("skip_neutral_temps", !pump.setNeutralTempAtFullHour());
+        mProfile.put("skip_neutral_temps", pump.setNeutralTempAtFullHour());
         // min_5m_carbimpact is not used within SMB determinebasal
         //if (mealData.usedMinCarbsImpact > 0) {
         //    mProfile.put("min_5m_carbimpact", mealData.usedMinCarbsImpact);

From 5a75c59965c5862573e4076aa003c978abd50fc9 Mon Sep 17 00:00:00 2001
From: Mackwe <marcus.lindfors@home.se>
Date: Wed, 13 May 2020 20:11:50 +0200
Subject: [PATCH 092/400] Tiny basals fix for Dana pumps

---
 .../androidaps/danaRKorean/DanaRKoreanPlugin.java      |  6 ++++--
 .../nightscout/androidaps/danaRv2/DanaRv2Plugin.java   |  6 ++++--
 .../info/nightscout/androidaps/danar/DanaRPlugin.java  |  6 ++++--
 .../info/nightscout/androidaps/danars/DanaRSPlugin.kt  | 10 ++++++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
index 1b77688dff..acb5bf5783 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.java
@@ -203,8 +203,8 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
         absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
-        final boolean doLowTemp = absoluteRate < getBaseBasalRate();
+        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
+        final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
         final boolean doHighTemp = absoluteRate > getBaseBasalRate() && !useExtendedBoluses;
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
@@ -234,6 +234,8 @@ public class DanaRKoreanPlugin extends AbstractDanaRPlugin {
 
         if (doLowTemp || doHighTemp) {
             Integer percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
+            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 mins. So if it's less than .10u/h, set a zero temp.
+            if (absoluteRate < 0.10d) percentRate = 0;
             if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
             else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
             if (percentRate > getPumpDescription().maxTempPercent) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index 20fb735d93..3dc9473a18 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -230,8 +230,8 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
         absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
-        final boolean doLowTemp = absoluteRate < getBaseBasalRate();
+        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
+        final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
         final boolean doHighTemp = absoluteRate > getBaseBasalRate();
 
         if (doTempOff) {
@@ -251,6 +251,8 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
 
         if (doLowTemp || doHighTemp) {
             Integer percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
+            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 mins. So if it's less than .10u/h, set a zero temp.
+            if (absoluteRate < 0.10d) percentRate = 0;
             if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
             else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
             if (percentRate > 500) // Special high temp 500/15min
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index ff467c3924..8c9c449b17 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -201,8 +201,8 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
         absoluteRate = constraintChecker.applyBasalConstraints(new Constraint<>(absoluteRate), profile).value();
 
-        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d;
-        final boolean doLowTemp = absoluteRate < getBaseBasalRate();
+        final boolean doTempOff = getBaseBasalRate() - absoluteRate == 0d && absoluteRate >= 0.10d;
+        final boolean doLowTemp = absoluteRate < getBaseBasalRate() || absoluteRate < 0.10d;
         final boolean doHighTemp = absoluteRate > getBaseBasalRate() && !useExtendedBoluses;
         final boolean doExtendedTemp = absoluteRate > getBaseBasalRate() && useExtendedBoluses;
 
@@ -232,6 +232,8 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
 
         if (doLowTemp || doHighTemp) {
             Integer percentRate = Double.valueOf(absoluteRate / getBaseBasalRate() * 100).intValue();
+            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 mins. So if it's less than .10u/h, set a zero temp.
+            if (absoluteRate < 0.10d) percentRate = 0;
             if (percentRate < 100) percentRate = Round.ceilTo((double) percentRate, 10d).intValue();
             else percentRate = Round.floorTo((double) percentRate, 10d).intValue();
             if (percentRate > getPumpDescription().maxTempPercent) {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 37aa73b877..01ef2637c3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -8,8 +8,8 @@ import android.os.IBinder
 import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPumpInterface
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.dana.DanaPumpInterface
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -358,7 +358,13 @@ class DanaRSPlugin @Inject constructor(
             return result
         }
         if (doLowTemp || doHighTemp) {
-            var percentRate = java.lang.Double.valueOf(absoluteAfterConstrain / baseBasalRate * 100).toInt()
+            var percentRate = 0
+            // Any basal less than 0.10u/h will be dumped once per hour, not every 4 mins. So if it's less than .10u/h, set a zero temp.
+            if (absoluteAfterConstrain >= 0.10) {
+                percentRate = java.lang.Double.valueOf(absoluteAfterConstrain / baseBasalRate * 100).toInt()
+            } else {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Requested basal < 0.10u/h. Setting 0u/h (doLowTemp || doHighTemp)")
+            }
             percentRate = if (percentRate < 100) Round.ceilTo(percentRate.toDouble(), 10.0).toInt() else Round.floorTo(percentRate.toDouble(), 10.0).toInt()
             if (percentRate > 500) // Special high temp 500/15min
                 percentRate = 500

From bc217438e9cdad561c180258c5c9007cadf39af1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 13 May 2020 21:16:29 +0200
Subject: [PATCH 093/400] fix message call MDT

---
 .../pump/medtronic/comm/MedtronicCommunicationManager.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index 83ed08ddd0..a8405ea00d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -552,7 +552,7 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
     // All pump communications go through this function.
     protected PumpMessage sendAndListen(RLMessage msg, int timeout_ms) throws RileyLinkCommunicationException {
-        return sendAndListen(msg, timeout_ms);
+        return (PumpMessage) super.sendAndListen(msg, timeout_ms);
     }
 
 

From a241a23c99883826316ff66fb403fffb4533bfe7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 13 May 2020 23:28:07 +0200
Subject: [PATCH 094/400] fix pref parsing

---
 .../androidaps/activities/MyPreferenceFragment.kt         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 0af1782c90..1d8740f631 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -238,11 +238,9 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             resourceHelper.gs(R.string.key_high_mark),
             resourceHelper.gs(R.string.key_low_mark)
         )
-        if (listOf(*unitDependent).contains(pref.key)) {
-            val editTextPref = pref as EditTextPreference
-            val converted = Profile.toCurrentUnitsString(profileFunction, SafeParse.stringToDouble(editTextPref.text))
-            editTextPref.summary = converted
-            editTextPref.text = converted
+        if (unitDependent.toList().contains(pref.key) && pref is EditTextPreference) {
+            val converted = Profile.toCurrentUnits(profileFunction, SafeParse.stringToDouble(pref.text))
+            pref.summary = converted.toString()
         }
     }
 

From ebc7a973d6037adb7878e720ca19b6f880e9e6e4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 14 May 2020 10:10:34 +0200
Subject: [PATCH 095/400] New Crowdin translations (#2639)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese)

* New translations protection.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations protection.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)
---
 app/src/main/res/values-bg-rBG/strings.xml    |   7 +
 app/src/main/res/values-fr-rFR/strings.xml    | 115 ++++++++++++-
 app/src/main/res/values-pt-rPT/exam.xml       |  18 +-
 .../values-pt-rPT/insight_alert_titles.xml    |   2 +-
 app/src/main/res/values-pt-rPT/protection.xml |  22 +--
 app/src/main/res/values-pt-rPT/strings.xml    | 131 ++++++++------
 app/src/main/res/values-sk-rSK/strings.xml    | 111 ++++++++++++
 core/src/main/res/values-de-rDE/strings.xml   |  85 ++++++++++
 core/src/main/res/values-fr-rFR/strings.xml   | 160 ++++++++++++++++++
 core/src/main/res/values-it-rIT/strings.xml   |  85 ++++++++++
 core/src/main/res/values-pt-rPT/strings.xml   |  16 +-
 core/src/main/res/values-sk-rSK/strings.xml   | 160 ++++++++++++++++++
 core/src/main/res/values-sv-rSE/strings.xml   |  85 ++++++++++
 dana/src/main/res/values-de-rDE/strings.xml   | 119 ++++++++++++-
 dana/src/main/res/values-fr-rFR/strings.xml   | 119 ++++++++++++-
 dana/src/main/res/values-it-rIT/strings.xml   | 119 ++++++++++++-
 dana/src/main/res/values-pt-rPT/strings.xml   |  57 ++++++-
 dana/src/main/res/values-sk-rSK/strings.xml   | 119 ++++++++++++-
 dana/src/main/res/values-sv-rSE/strings.xml   | 120 ++++++++++++-
 19 files changed, 1568 insertions(+), 82 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 5da523fc0d..80bafc0b29 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -346,6 +346,7 @@
     <string name="wear_detailedIOB_title">Покажи подробен IOB</string>
     <string name="wear_detailedIOB_summary">Раздели IOB от болус и от базал на часовника</string>
     <string name="nosuccess">неуспешно - моля проверете телефона</string>
+    <string name="notavailable">---</string>
     <string name="patientage">Възраст на потребителя</string>
     <string name="child">Дете</string>
     <string name="teenage">Тийнейджър</string>
@@ -991,6 +992,7 @@
     <string name="rileylink_scanner_scanning">Сканиране</string>
     <string name="rileylink_scanner_scanning_finished">Завършено сканиране</string>
     <string name="rileylink_scanner_scanning_error">Грешка при сканиране: %1$d</string>
+    <string name="common_never">Никога</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Настройки</string>
     <string name="rileylink_settings_tab2">История</string>
@@ -1170,6 +1172,7 @@
     <string name="loop_tbrrequest_time_label">Диапазон между временни базали</string>
     <string name="loop_tbrexecution_time_label">Продължителност на временни базали</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="overview_show_predictions">Прогнозни КЗ</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
@@ -1177,6 +1180,10 @@
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_cmd_set_bolus">Стартирай болус</string>
+    <string name="omnipod_cmd_set_tbr">Приложи временен базал</string>
+    <string name="omnipod_init_pod_set_basal_profile">Приложи базалният профил</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="omnipod_alert_low_reservoir">Минимален инсулин в резервоара</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index df9a0e04fa..f9e0d10cc5 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -167,14 +167,15 @@
     <string name="filenotfound">Fichier introuvable</string>
     <string name="nav_export">Exporter les paramètres</string>
     <string name="nav_import">Importer les paramètres</string>
-    <string name="openapsma_maxbasal_title">Max. U/hr pour le débit temp Basal</string>
+    <string name="openapsma_maxbasal_title">Max U/h pour le débit de Basal Temp</string>
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
-    <string name="openapsma_maxiob_title">IA basale max que OpenAPS pourra délivrer [U]</string>
+    <string name="openapsma_maxiob_title">IA Basal max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
     <string name="password_preferences_encrypt_prompt">Le mot de passe principal vous sera demandé pour crypter les préférences exportées.</string>
     <string name="password_preferences_decrypt_prompt">Le mot de passe principal vous sera demandé pour décrypter les préférences exportées.</string>
     <string name="preferences_export_canceled">Export annulé ! Les préférences n\'ont PAS été exportées !</string>
     <string name="preferences_import_canceled">Import annulé ! Les préférences n\'ont PAS été importées !</string>
+    <string name="preferences_import_list_title">Sélectionner le fichier à importer</string>
     <string name="check_preferences_before_import">Vérifiez les préférences avant d\'importer :</string>
     <string name="check_preferences_cannot_import">Les préférences ne peuvent pas être importées !</string>
     <string name="check_preferences_dangerous_import">Les préférences ne doivent pas être importées !</string>
@@ -187,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Vous utilisez le format obsolète des anciennes versions d\'APPS qui n\'est pas sécurisé ! Utilisez-le uniquement en dernier recours, si vous n\'avez pas d\'export au format JSON actuel.</string>
     <string name="metadata_warning_old_export">Les préférences importées ont déjà %1$s jours ! Vous avez peut-être des préférences plus récentes ou vous avez sélectionné un mauvais fichier ? N\'oubliez pas d\'exporter vos préférences régulièrement !</string>
     <string name="metadata_warning_date_format">Format de date invalide !</string>
+    <string name="metadata_warning_different_version">Préférences d\'une autre version mineure différente de l\'application. C\'est OK si vous importez après la mise à jour, mais vérifiez après l\'importation si les préférences sont toujours correctes !</string>
+    <string name="metadata_urgent_different_version">Préférences d\'une autre version majeure différente de l\'application. Les versions majeures diffèrent significativement et peuvent avoir des préférences incompatibles ! Vérifiez bien après l\'import que les préférences sont toujours correctes !</string>
     <string name="metadata_label_format">Format de fichier</string>
     <string name="metadata_label_created_at">Créé le</string>
     <string name="metadata_label_aaps_version">Version d\'AAPS</string>
@@ -209,6 +212,11 @@
     <string name="prefdecrypt_issue_wrong_pass">Erreur de décryptage, le mot de passe fourni est invalide ou le fichier de paramètres à été modifié ! Cela peut arriver si le fichier a été exporté avec un mot de passe principal différent.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuration du cryptage manquant, format des paramètres invalide !</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algorithme de cryptage non pris en charge ou non spécifié !</string>
+    <string name="exported_today">exporté aujourd\'hui</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exporté il y a %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exporté à %1$s</string>
+    <string name="exported_less_than_hour_ago">exporté il y a moins d\'une heure</string>
+    <string name="in_directory" comment="placeholder is for exported file path">dans le dossier : %1$s</string>
     <string name="end_user_license_agreement">Contrat de Licence pour Utilisateur Final</string>
     <string name="end_user_license_agreement_text">NE DOIT PAS ÊTRE UTILISÉ POUR PRENDRE DES DÉCISIONS MÉDICALES. IL N\'Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LA LIMITE PERMISE PAR LA LOI APPLICABLE. SAUF S\'IL EST INDIQUÉ LE CONTRAIRE PAR ÉCRIT. LES TITULAIRES DU DROIT D\'AUTEUR ET / OU D\'AUTRES PARTIES FOURNISSENT LE PROGRAMME «EN L\'ÉTAT» SANS GARANTIE D\'AUCUNE SORTE, EXPLICITE OU IMPLICITE, Y COMPRIS MAIS NON SEULEMENT AUX GARANTIES IMPLICITES DE QUALITÉ MARCHANDE ET D\'ADÉQUATION À UN USAGE PARTICULIER
 L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME SONT DE VOTRE RESPONSABILITÉ. SI LE PROGRAMME EST DÉFECTUEUX, VOUS ASSUMEZ LE COÛT DE TOUS LES SERVICES, RÉPARATIONS OU CORRECTIONS NÉCESSAIRES.</string>
@@ -386,6 +394,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear_detailedIOB_title">Afficher l\'IA détaillée</string>
     <string name="wear_detailedIOB_summary">Sur la montre, décomposer l’IA en IA bolus et IA basal</string>
     <string name="nosuccess">Sans succès - vérifiez votre téléphone</string>
+    <string name="notavailable">s/o</string>
     <string name="patientage">Age du patient</string>
     <string name="child"> Enfant</string>
     <string name="teenage">Adolescent</string>
@@ -1267,13 +1276,115 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights">Voyants d\'état</string>
     <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
     <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
+    <string name="classic_desrciption">Thème d\'origine</string>
+    <string name="buttonson_desrciption">Les boutons sont toujours affichés en bas de l\'écran</string>
+    <string name="skin">Thème</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">L\'intégration de la pompe Omnipod nécessite un boitier RileyLink (avec au minimum un firmware 2.0).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Bip Bolus Activé</string>
+    <string name="omnipod_config_beep_basal_enabled">Bip Basal Activé</string>
+    <string name="omnipod_config_beep_smb_enabled">Bip SMB activé</string>
+    <string name="omnipod_config_beep_tbr_enabled">Bip DBT Activé</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Options de débogage Pod activées</string>
+    <string name="omnipod_config_timechange_enabled">Changement de Zone/Heure Activé</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod</string>
+    <string name="omnipod_pod_status">État du Pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
+    <string name="omnipod_reservoir_over50">Plus de 50 U</string>
+    <string name="omnipod_pod_address">Adresse du Pod</string>
+    <string name="omnipod_pod_expiry">Pod Expiré</string>
+    <string name="omnipod_pod_name_no_info">Pas d\'infos</string>
+    <string name="omnipod_pod_no_pod_connected">Pas de Pod Connecté</string>
+    <string name="omnipod_pod_not_initalized">Non initialisé</string>
+    <string name="omnipod_pod_active_alerts">Activer Alertes Pod</string>
+    <string name="omnipod_ack_short">Valid Alert</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operation impossible.\n\nVous devez d\'abord configurer l\'Omnipod pour pouvoir faire cette operation.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operation impossible.\n\nVous devez attendre quelques minutes, jusqu\'à ce que AAPS tente de définir le profil pour la première fois.</string>
+    <string name="omnipod_error_illegal_init_action_type">type d\'action d\'init Pod non autorisée : %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Pas de Pod Actif.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Échec de vérification de la commande.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Erreur inconnue. Veuillez signaler ! (type : %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Échec de communication : paramètres d\'entrées reçus invalides.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Échec de communication : délai expiré.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Échec de communication : Erreur inconnue. Veuillez signaler !</string>
+    <string name="omnipod_driver_error_crc_mismatch">Échec de communication : vérification de l\'intégrité du message échouée.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Échec de communication : paquet reçu du Pod invalide.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Échec de communication : état du Pod incorrect.</string>
+    <string name="omnipod_driver_error_invalid_response">Échec de communication : réponse invalide reçue du Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Échec de communication : message reçu du Pod avec un numéro de séquence invalide.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Échec de communication : message reçu du Pod avec une adresse invalide.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Échec de communication : échec du décodage du message reçu du Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Échec de communication : resynchro nonce échouée.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Échec de communication : nonce non synchro.</string>
+    <string name="omnipod_driver_error_not_enough_data">Échec de communication : pas assez de données reçues du Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Un défaut du Pod a été détecté (%1$03d %2$s). Veuillez désactiver votre Pod et en démarrer un nouveau.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Échec de communication : le Pod a renvoyé un message d\'erreur.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestion Pod</string>
+    <string name="omnipod_cmd_init_pod">Init Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Désactiver Pod</string>
+    <string name="omnipod_cmd_reset_pod">Réinit. Pod</string>
+    <string name="omnipod_cmd_pod_history">Historique Pod</string>
+    <string name="omnipod_cmd_set_bolus">Définir Bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Annuler Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Définir le Basal Temporaire</string>
+    <string name="omnipod_cmd_cancel_tbr">Basal Temp Annulée (en interne par le pilote)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Basal Temp Annulée (par l\'utilisateur)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Définir le schéma de basal</string>
+    <string name="omnipod_cmd_get_pod_status">État du Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Infos du Pod</string>
+    <string name="omnipod_cmd_set_time">Régler L\'heure</string>
+    <string name="omnipod_cmd_configure_alerts">Configurer les alertes</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Valider les Alertes</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspendre l\'injection</string>
+    <string name="omnipod_cmd_resume_delivery">Pousuivre l\'injection</string>
+    <string name="omnipod_cmd_unknown_entry">Entrée inconnue</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, Gluc=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Débit : %1$.1f U, Durée : %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Si vous appuyez sur <b>OK</b>, le Pod sera réinitialisé et vous ne pourrez plus communiquer avec lui. Ne le faite que si vous ne pouvez plus communiquer avec le Pod. Si vous pouvez toujours communiquer avec lui, veuillez utiliser l\'option <b>Désactiver Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Historique Pod non disponible pour le moment.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Remplir le Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nRemplir le nouveau Pod avec suffisamment d\'insuline pendant 3 jours.\n\nÉcoutez les deux bips du Pod pendant le processus de remplissage. Ils indiquent que la quantité minimale de 85U a été ajouté. Assurez-vous de vider complètement la seringue de remplissage, même après avoir entendu les deux bips.\n\nAprès avoir rempli le Pod, veuillez appuyer sur <b>Suivant</b>.\n\n<b>Remarque :</b> Ne retirez pas la protection de l\'aiguille du Pod pour le moment.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Amorçage</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Tentative d\'appairage et d\'amorçage du nouveau Pod.\n\nQuand tous les items sont cochées, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Veuillez maintenir le Pod tout près du RileyLink en ce moment.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Collez le Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPréparez le site d\'injection. Enlevez la protection de l\'aiguille et le support adhésif et collez le Pod sur le site d\'injection.\n\nSi la canule se colle, appuyez sur <b>Annuler</b> et jetez votre Pod.\n\nAppuyez sur <b>Suivant</b> pour insérer la canule et démarrer l\'injection de la basal.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Insertion canule</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Tentative de définir le schéma de basal et d\'insertion de la canule.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Infos Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nLe Pod est maintenant actif.\n\nVos débits de basal ont été programmés et la canule a été insérée.\n\nVeuillez verifier que la canule a été insérée correctement et remplacez votre Pod si vous pensez que ce n\'est pas le cas.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Désactiver Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nAppuyez sur <b>Suivant</b> pour désactiver le Pod.\n\n<b>Remarque :</b> Cela suspendra l\'injection de l\'insuline et désactivera le Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Désactivation du Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Désactivation du Pod.\n\nQuand tous les items sont cochés, appuyez sur <b>Suivant</b>.\n\n<b>Remarque :</b> Si la désactivation échoue en permanence, appuyez sur <b>Annuler</b> et utilisez l\'option <b>Réinit. Pod</b> pour réinitialiser l\'état du Pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod désactivé.\n\nVeuillez enlever le Pod de votre corps et le jeter.</string>
+    <string name="omnipod_init_pod_pair_pod">Appairer le Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Amorcer le Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Remplir tubulure</string>
+    <string name="omnipod_init_pod_set_basal_profile">Définir profil de basal</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Annuler l\'injection</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Désactiver Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Intégration de la pompe Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
+    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
+    <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
+    <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
+    <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
+    <string name="omnipod_alert_unknown_alert">Alerte inconnue</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Le paramétrage du profil basal a peut-être échoué. L\'injection pourrait être suspendue ! Veuillez actualiser l\'état du pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Le réglage de la basal temp a peut-être échoué. S\'il y avait déjà un DBT en cours, cela a peut-être été annulé ! Veuillez actualiser le statut du pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Le paramétrage de l\'heure a peut-être échoué. L\'injection pourrait être suspendue ! Veuillez actualiser l\'état du pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Vérifiez que votre Pod délivre le bolus ou annulez le bolus.</string>
+    <string name="omnipod_rl_stats">État RL</string>
+    <string name="omnipod_read_pulse_log_short">Enreg. Pulse</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index 537f13d41d..cf9f53bcf4 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -18,7 +18,7 @@
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Tópico: Desligar a Bomba</string>
     <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
-    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser entregue.</string>
+    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser administrada.</string>
     <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
     <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
@@ -51,8 +51,8 @@
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">Tópico: Loop Desactivado/Suspenso</string>
     <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
-    <string name="suspendloop_yes">Sim, a insulina basal continua a ser entregue.</string>
-    <string name="suspendloop_no">Não, a entrega da insulina está parada.</string>
+    <string name="suspendloop_yes">Sim, a insulina basal continua a ser administrada.</string>
+    <string name="suspendloop_no">Não, administração da insulina está parada.</string>
     <string name="basaltest_label">Topic: Testar Basal, FSI e IC</string>
     <string name="basaltest_when">Quando devo validar valores das basais, FSI e de IC?</string>
     <string name="basaltest_beforeloop">Antes de começar com o looping.</string>
@@ -115,7 +115,7 @@
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Tópico: Monitorização Remota</string>
     <string name="nsclient_howcanyou">Como pode monitorizar AAPS do seu filho remotamente?</string>
-    <string name="nsclient_nightscout">Usando um site Nightscout.</string>
+    <string name="nsclient_nightscout">A usar um site Nightscout.</string>
     <string name="nsclient_dexcomfollow">App Dex om Follow se estiver a usar a app original Dexcom (Glic apenas).</string>
     <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se estiver a usar a app xDrip.</string>
     <string name="nsclient_xdripfollower">xDrip a correr no modo seguidor.</string>
@@ -123,16 +123,16 @@
     <string name="nsclient_spikeiphone">App Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_label">Tópico: Factor de Sensibilidade de Insulina</string>
-    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma entrega de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma entrega de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina entregue quando a AAPS corrige Glic alta.</string>
+    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
+    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
+    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
     <string name="isf_preferences">É necessário inserir FSI nas Preferências.</string>
     <string name="isf_profile">A alteração do valor do FSI no seu perfil é suficiente para aplicar a mudança.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
     <string name="ic_label">Tópico: Rácio IC</string>
-    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina entregue para uma dada quantidade de hidratos.</string>
-    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina entregue para uma dada quantidade de hidratos.</string>
+    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
+    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
     <string name="ic_different">IC será diferente se contar a unidade de pão como 10g ou 12g.</string>
     <string name="ic_meaning">O significado do IC é: Quantas unidades de pão são cobertas por 1U de insulina.</string>
diff --git a/app/src/main/res/values-pt-rPT/insight_alert_titles.xml b/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
index bd943c8c19..1ac44dae19 100644
--- a/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
+++ b/app/src/main/res/values-pt-rPT/insight_alert_titles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="alert_r1_title">Administrar bolus</string>
+    <string name="alert_r1_title">Administrar Bólus</string>
     <string name="alert_r2_title">Bolus não administrado</string>
     <string name="alert_r3_title">Alarme</string>
     <string name="alert_r4_title">Mudar o conjunto de infusão</string>
diff --git a/app/src/main/res/values-pt-rPT/protection.xml b/app/src/main/res/values-pt-rPT/protection.xml
index 67ae6b40c1..1d65b8cf53 100644
--- a/app/src/main/res/values-pt-rPT/protection.xml
+++ b/app/src/main/res/values-pt-rPT/protection.xml
@@ -5,19 +5,19 @@
     <string name="settings_protection">Definições Protecção</string>
     <string name="application_protection">Protecção Aplicação</string>
     <string name="bolus_protection">Protecção Bólus</string>
-    <string name="master_password">Password Mestre</string>
-    <string name="settings_password">Definições Password</string>
-    <string name="application_password">Password Aplicação</string>
-    <string name="bolus_password">Password Bólus</string>
+    <string name="master_password">Senha Mestre</string>
+    <string name="settings_password">Senha Definições</string>
+    <string name="application_password">Senha Aplicação</string>
+    <string name="bolus_password">Senha Bólus</string>
     <string name="unlock_settings">Definições Desbloqueio</string>
     <string name="biometric">Biométrico</string>
-    <string name="custom_password">Password Personalizada</string>
+    <string name="custom_password">Senha Personalizada</string>
     <string name="noprotection">Sem Protecção</string>
     <string name="protection">Protecção</string>
-    <string name="master_password_missing">A Password Mestre não está definida!\n\nPor favor, configure Password Mestre em Preferências (%1$s &#8594; %2$s)</string>
-    <string name="password_set">Password foi definida!</string>
-    <string name="password_not_set">Password não foi definida</string>
-    <string name="password_not_changed">Password não foi alterada</string>
-    <string name="password_cleared">Password apagada!</string>
-    <string name="password_hint">Insira a password aqui</string>
+    <string name="master_password_missing">A Senha Mestre não está definida!\n\nPor favor, configure Senha Mestre em Preferências (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Senha foi definida!</string>
+    <string name="password_not_set">Senha não foi definida</string>
+    <string name="password_not_changed">Senha não foi alterada</string>
+    <string name="password_cleared">Senha limpa!</string>
+    <string name="password_hint">Insira aqui a senha</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3fd0429e7c..1b8cc9057a 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -101,7 +101,7 @@
     <string name="constraints">Restrições</string>
     <string name="loop">Loop</string>
     <string name="configbuilder_loop">Loop</string>
-    <string name="configbuilder_loop_description">Utilize isto para ativar a integração loop do AndroidAPS.</string>
+    <string name="configbuilder_loop_description">Utilize isto para activar a integração loop do AndroidAPS.</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Depois das restrições processadas</string>
     <string name="loop_tbrsetbypump_label">Basal temporária definida pela bomba</string>
@@ -112,7 +112,7 @@
     <string name="safety">Segurança</string>
     <string name="openapsma_disabled">Plugin está desativado</string>
     <string name="constraints_violation">Violação das restrições</string>
-    <string name="treatmentdeliveryerror">Erro na entrega do bolus</string>
+    <string name="treatmentdeliveryerror">Erro na administração do bólus</string>
     <string name="overview_newtempbasal_basalpercent">Valor da Basal [%]</string>
     <string name="setbasalquestion">Aceitar nova basal temporária:</string>
     <string name="overview_treatment_label">Tratamento</string>
@@ -169,10 +169,10 @@
     <string name="nav_import">Importar configurações</string>
     <string name="openapsma_maxbasal_title">Max U/hr em que uma Temp Basal pode ser definida</string>
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
-    <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
-    <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
-    <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
-    <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
+    <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode administrar [U]</string>
+    <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode administrar de uma vez.</string>
+    <string name="password_preferences_encrypt_prompt">Será perguntado pela senha mestre, que será usada para encriptar preferências exportadas.</string>
+    <string name="password_preferences_decrypt_prompt">Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
     <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
@@ -205,11 +205,11 @@
     <string name="prefdecrypt_settings_secure">Ficheiro de configurações é seguro</string>
     <string name="prefdecrypt_settings_unencrypted">A usar um formato de configurações não seguro e não encriptado</string>
     <string name="prefdecrypt_wrong_json">Erro de formato JSON, campo necessário ausente (formato, conteúdo, metadados ou segurança)</string>
-    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a password inserida não pode desencriptar o ficheiro</string>
+    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a senha inserida não pode desencriptar o ficheiro</string>
     <string name="prefdecrypt_issue_missing_file_hash">Ficheiro de verificação (hash) em falta, não é possível verificar a autenticidade de configurações!</string>
     <string name="prefdecrypt_issue_modified">Ficheiro foi modificado após exportação!</string>
     <string name="prefdecrypt_issue_parsing">Erro Desencriptação, a análise de preferências falhou!</string>
-    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre diferente.</string>
+    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Senha Mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
     <string name="exported_today">exportado hoje</string>
@@ -225,8 +225,8 @@
     <string name="smscommunicator">Comunicador SMS</string>
     <string name="smscommunicator_allowednumbers">Número de telefones permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
-    <string name="smscommunicator_mealbolusreplywithcode">Para dar bólus %1$.2fU responder com código %2$s</string>
+    <string name="smscommunicator_bolusreplywithcode">Para administrar bólus %1$.2fU responder com código %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Para administrar bólus %1$.2fU responder com código %2$s</string>
     <string name="smscommunicator_temptargetwithcode">Para definir o Alvo Tempo %1$s responda com o código %2$s</string>
     <string name="smscommunicator_temptargetcancel">Para cancelar Alvo Temp responda com o código %1$s</string>
     <string name="smscommunicator_stopsmswithcode">Para desactivar o Serviço Remoto SMS de responda com o código %1$s.\n\nTenha em mente que será capaz de o reactivar directamente apenas a partir do telemóvel mestre do AAPS.</string>
@@ -236,10 +236,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
     <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
-    <string name="bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="bolusrequested">Vai ser enviado %1$.2fU</string>
-    <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU entregue com sucesso</string>
+    <string name="bolusdelivered">Bólus %1$.2fU administrado com êxito</string>
+    <string name="bolusrequested">A ser administrado %1$.2fU</string>
+    <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU administrado com êxito</string>
+    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU administrado com sucesso</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
     <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
@@ -381,14 +381,14 @@
     <string name="nsclientinternal_secret_title">NS API secret</string>
     <string name="nsclientinternal_secret_dialogtitle">NS API secret</string>
     <string name="nsclientinternal_secret_dialogmessage">Insira NS API secret (min 12 caract.)</string>
-    <string name="deliver_now">Entregar agora</string>
+    <string name="deliver_now">Administrar agora</string>
     <string name="clear_queue">Limpar fila de espera</string>
     <string name="show_queue">Mostrar file de espera</string>
     <string name="queue">Fila de espera:</string>
     <string name="status">Estado:</string>
     <string name="paused">Em pausa</string>
     <string name="clearlog">Limpar Registo</string>
-    <string name="nowritepermission">Cliente NS sem permissões para alterar dados. Tem a senha API correta?</string>
+    <string name="nowritepermission">NSCliente sem permissões para alterar dados. Tem a senha API correta?</string>
     <string name="wear_settings">Definições Wear</string>
     <string name="wear_detailedIOB_title">Mostrar IOB detalhada</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
@@ -500,7 +500,7 @@
     <string name="virtualpump_extendedbolus_label_short">PROL</string>
     <string name="keep_screen_on_title">Manter ecrã ligado</string>
     <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
-    <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
+    <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de hidratos serão erroneamente identificados como uma variação da sensibilidade !!</string>
     <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Cancelar</string>
@@ -558,7 +558,7 @@
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
     <string name="dexcomg5_nsupload_title">Enviar dados Glic. para NS</string>
-    <string name="bgsource_upload">Configurações de upload de BG</string>
+    <string name="bgsource_upload">Configurações de upload de Glic</string>
     <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
     <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
@@ -618,10 +618,10 @@
     <string name="combo_notification_check_time_date">Necesário actualizar relógio da bomba</string>
     <string name="combo_warning">Aviso</string>
     <string name="combo_pump_tbr_cancelled_warrning">Basal Temporária CANCELADA. O aviso foi confirmado</string>
-    <string name="combo_error_no_connection_no_bolus_delivered">Não foi possivel establecer comunicação com a bomba. Nenhum bolus foi administrado.</string>
-    <string name="combo_error_no_bolus_delivered">Administração de bolus falhou. Nenhum bolus parece ter sido administrado. Para confirmar, por favor verifique a bomba de forma a evitar uma dupla administração de bolus e programe novamente o bolus. De forma a evitar qualquer problema, os bolus não são reprogramados de forma automatica.</string>
-    <string name="combo_error_partial_bolus_delivered">Apenas %1$.2f U do bolus de %2$.2f U foi injectado de devido a um erro. Por favor verifique a bomba e tome as medidas necessárias.</string>
-    <string name="combo_error_bolus_verification_failed">A injeção do bolus e a verificação do histórico da bomba falharam, por favor verifique a bomba. Se o bolus foi injetado será adicionado ao histórico de tratamentos durante a próxima conexão com a bomba.</string>
+    <string name="combo_error_no_connection_no_bolus_delivered">Não foi possível estabelecer comunicação com a bomba. Nenhum bólus foi administrado</string>
+    <string name="combo_error_no_bolus_delivered">Administração de bólus falhou. Nenhum bólus parece ter sido administrado. Para confirmar, por favor verifique a bomba de forma a evitar uma dupla administração de bólus e programe novamente o bólus. De forma a evitar qualquer problema, os bólus não são reprogramados de forma automática.</string>
+    <string name="combo_error_partial_bolus_delivered">Apenas %1$.2f U do bólus de %2$.2f U foi administrado devido a um erro. Por favor verifique a bomba e tome as medidas necessárias.</string>
+    <string name="combo_error_bolus_verification_failed">A administrar o bólus e a verificação do histórico da bomba falharam, por favor verifique a bomba. Se o bólus foi administrado será adicionado ao histórico de tratamentos durante a próxima ligação com a bomba.</string>
     <string name="combo_reservoir_level_insufficient_for_bolus">Não há insulina suficiente no reservatório para bolus</string>
     <string name="extendedbolusdeliveryerror">Erro na administração Bólus Prolongado</string>
     <string name="insightpump_shortname">Visão</string>
@@ -678,8 +678,8 @@
     <string name="engineering_mode_enabled">Modo engenheiro activado</string>
     <string name="not_eng_mode_or_release">Modo de engenharia não habilitado e não no na versão mestra</string>
     <string name="combo_actvity_reading_basal_profile">A ler perfil basal</string>
-    <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi injectado. Por favor, verifique se bolus ainda é necessário.</string>
-    <string name="combo_error_updating_treatment_record">O bolus foi injectado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
+    <string name="combo_bolus_rejected_due_to_pump_history_change">O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bólus não foi administrado. Por favor, verifique se bólus ainda é necessário.</string>
+    <string name="combo_error_updating_treatment_record">O bólus foi administrado, mas não foi possível adicionar ao histórico. Isto é possível se dois bólus do mesmo valor baixo foram administrados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">A rejeitar a temporal alta uma vez que o cálculo não considerou as mudanças do histórico da bomba</string>
     <string name="combo_activity_checking_pump_state">A actualizar estado bomba</string>
     <string name="combo_warning_pump_basal_rate_changed">O rácio da basal foi alterado na bomba e vai ser actualizado em breve</string>
@@ -688,7 +688,7 @@
     <string name="combo_error_multiple_boluses_with_identical_timestamp">Bólus múltiplos, com a mesma quantidade e no mesmo minuto acabaram de ser importados. Apenas um registo pôde ser adicionado aos tratamentos. Por favor confirma na bomba e adicione o registo de bólus manualmente, utilizando o separador do Careportal. Tenha em atenção que deve criar um bólus com um tempo em que nã oexistem outros registos de bólus.</string>
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">O último bólus tem mais de 24 horas ou está no futuro. Por favor verifique se a data está definida correctamente na bomba.</string>
-    <string name="combo_suspious_bolus_time">Hora/data da entrega do bólus na bomba parece errado, IOB aparentemente está incorrecto. Verifique hora/data na bomba.</string>
+    <string name="combo_suspious_bolus_time">Hora/data da administração do bólus na bomba parece errado, IOB aparentemente está incorrecto. Verifique hora/data na bomba.</string>
     <string name="profileswitch_ismissing">TrocaPerfil em falta. Por favor faça uma troca de perfil ou pressione \"Activar Perfil\" em PerfilLocal.</string>
     <string name="combo_bolus_count">Contagem Bólus</string>
     <string name="combo_tbr_count">Contagem DBT</string>
@@ -701,7 +701,7 @@
     <string name="uamdisabledoref1notselected">UAM desactivado porque confia no plugin de sensibilidade Oref1</string>
     <string name="maxbasalmultiplier">multiplicador de basal máx</string>
     <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
-    <string name="smb_frequency_exceeded">Um bolus foi injectado nos últimos 3 minutos, saltando SMB</string>
+    <string name="smb_frequency_exceeded">Um bólus foi administrado nos últimos 3 minutos, a ignorar SMB</string>
     <string name="basal_set_correctly">Basal correctamente definida</string>
     <string name="limitingextendedbolus">A limitar bólus prolongado para %1$.1f U porque %2$s</string>
     <string name="limitingmaxiob">A limitar IOB máx. para %1$.1f U porque %2$s</string>
@@ -711,7 +711,7 @@
     <string name="hardlimit">limite rígido</string>
     <string name="unsafeusage">uso não seguro</string>
     <string name="readstatusfailed">Erro na leitura de estado</string>
-    <string name="record_pump_site_change">Registar mudança de sítio</string>
+    <string name="record_pump_site_change">Registar mudança local bomba</string>
     <string name="record_insulin_cartridge_change">Registar mudança cartucho</string>
     <string name="smbalwaysdisabled">SMB sempre e depois dos hidratos desactivado por fonte da Glicemia activa não suportar filtro avançado</string>
     <string name="smbnotallowedinopenloopmode">SMB não permitido no modo open loop</string>
@@ -757,8 +757,8 @@
     <string name="ns_autobackfill_title">Preenchimentoauto Glicemia</string>
     <string name="wear_wizard_settings">Definições do Assistente Rápido</string>
     <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
-    <string name="wear_display_settings">Mostrar Configurações</string>
-    <string name="wear_general_settings">Configurações gerais</string>
+    <string name="wear_display_settings">Configurações Ecrã</string>
+    <string name="wear_general_settings">Configurações Gerais</string>
     <string name="enable_nsclient">Activar NSCliente</string>
     <string name="welcometosetupwizard">Bem-vindo ao assistente de configuração. Vai guiá-lo(a) através do processo de instalação\n</string>
     <string name="pumpsetup">Configurações da bomba</string>
@@ -836,14 +836,14 @@
     <string name="code_compare">Os códigos exibidos neste dispositivo e na sua bomba correspondem?</string>
     <string name="insight_pairing">Emparelhamento Insight</string>
     <string name="insight_local">Accu-Chek Insight</string>
-    <string name="insight_delivered">%1$.2fU / %2$.2fU entregue</string>
+    <string name="insight_delivered">%1$.2fU / %2$.2fU administado</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
     <string name="tube_changed">Tubo mudado</string>
     <string name="pump_time_updated">Hora da bomba actualizada</string>
     <string name="confirm">Confirmar</string>
     <string name="mute_alert">Silêncio</string>
     <string name="pump_alert">Alerta da Bomba</string>
-    <string name="log_site_changes">Registar alterações de local</string>
+    <string name="log_site_changes">Registar mudanças de local</string>
     <string name="log_reservoir_changes">Número de unidades do reservatório alteradas</string>
     <string name="log_tube_changes">Registar alterações de tubo</string>
     <string name="log_battery_changes">Registar mudanças de bateria</string>
@@ -942,8 +942,8 @@
     <string name="tomato_short">Tomato</string>
     <string name="summary_tidepool_username">Nome de utilizador no Tidepool, normalmente seu endereço de e-mail</string>
     <string name="title_tidepool_username">Nome de Utilizador</string>
-    <string name="summary_tidepool_password">Palavra-passe da conta Tidepool</string>
-    <string name="title_tidepool_password">Palavra-passe</string>
+    <string name="summary_tidepool_password">Senha da conta Tidepool</string>
+    <string name="title_tidepool_password">Senha Login</string>
     <string name="title_tidepool_test_login">Teste de Conta Tidepool</string>
     <string name="summary_tidepool_dev_servers">Se activado, envio será para https://int-app.tidepool.org em vez do habitual https://app.tidepool.org/</string>
     <string name="title_tidepool_dev_servers">Usar servidores de integração (teste)</string>
@@ -1141,8 +1141,8 @@
     <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
     <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar o DBT actual. A parar a operação.</string>
     <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi entregue, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser administrado.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi administado, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
     <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definido.</string>
     <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar o DBT actual.</string>
     <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
@@ -1168,8 +1168,8 @@
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restrição de Bolus aplicada: %2$.2fU para %3$.2fU</font>]]></string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!</font>]]></string>
-    <string name="partialboluswizard">Entregue esta parte do resultado do assistente de bólus [%]</string>
-    <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
+    <string name="partialboluswizard">Administrar esta parte do resultado do assistente de bólus [%]</string>
+    <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é administada. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
     <string name="time_range">Intervalo de tempo</string>
@@ -1247,9 +1247,9 @@
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">a partir da app Autenticador para: %1$s</string>
     <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
-    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Password-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
     <string name="smscommunicator_otp_pin">PIN adicional no token final</string>
-    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Password-Única que seja gerada</string>
+    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
     <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
     <string name="smscommunicator_otp_verify_label">OTP para verificar:</string>
     <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
@@ -1258,7 +1258,7 @@
     <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode actualizado para os autenticadores.</string>
     <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
-    <string name="smscommunicator_otp_step3_test_header">3. Teste Uma-Password-Única</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testar Uma-Senha-Única</string>
     <string name="smscommunicator_otp_reset_header">Repor Autenticadores</string>
     <string name="smscommunicator_otp_install_info">Instalar uma app Autenticador que suporte Tokens RFC 6238 TOTP em cada telefone seguidor. Populares aplicativos gratuitos são:\n • Authy\n • o Google Authenticator\n • LastPass Autenticador\n • FreeOTP Autenticador</string>
     <string name="smscommunicator_otp_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</string>
@@ -1269,9 +1269,9 @@
     <string name="overview_show_deviationslope">Desvio de inclinação</string>
     <string name="authorizationfailed">Falha na autorização</string>
     <string name="overview_show_absinsulin">Insulina absoluta</string>
-    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
-    <string name="passwords_dont_match">As passwords não coincidem</string>
-    <string name="current_master_password">Password Mestre actual</string>
+    <string name="master_password_summary">Senha Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
+    <string name="passwords_dont_match">As senhas não coincidem</string>
+    <string name="current_master_password">Senha Mestre actual</string>
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
@@ -1280,11 +1280,13 @@
     <string name="skin">Tema gráfico</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
     <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Beep Bólus Activado</string>
-    <string name="omnipod_config_beep_basal_enabled">Beep Basal Activado</string>
-    <string name="omnipod_config_beep_smb_enabled">Beep SMB Activado</string>
-    <string name="omnipod_config_beep_tbr_enabled">Beep DBT Activado</string>
+    <string name="omnipod_config_beep_bolus_enabled">Sinal Bólus Activado</string>
+    <string name="omnipod_config_beep_basal_enabled">Sinal Basal Activado</string>
+    <string name="omnipod_config_beep_smb_enabled">Sinal SMB Activado</string>
+    <string name="omnipod_config_beep_tbr_enabled">Sinal DBT Activado</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Opções de Depuração do Pod habilitadas</string>
     <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
     <!-- Omnipod - Fragment -->
     <string name="omnipod_pod_mgmt">Gestão Pod</string>
@@ -1301,8 +1303,27 @@
     <!-- Omnipod - Dialogs -->
     <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">A operação não é possível.\n\n Precisa de esperar alguns minutos, até que AAPS tente definir o perfil para a primeira vez.</string>
+    <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
     <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
     <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Falha na comunicação: tempo limite.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Falha na comunicação: ocorreu um erro inesperado. Por favor, reporte!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado.</string>
+    <string name="omnipod_driver_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização.</string>
+    <string name="omnipod_driver_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro.</string>
     <!-- Omnipod - Pod Mgmt -->
     <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
     <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
@@ -1326,19 +1347,29 @@
     <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
     <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
     <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Se pressionar <b>OK</b>, o estado do Pod vai ser forçado a redefinir e você não será capaz de comunicar mais com o Pod. Faça isso somente se você não pode comunicar mais com o Pod. Se ainda pode comunicar com o Pod, por favor, use o <b>Desactivar Pod</b> opção.</string>
+    <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
     <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nPreencher o novo Pod com insulina suficiente para 3 dias.\n\nOuvir dois sinais sonoros a partir do Pod durante o processo de enchimento. Isso indica que a quantidade mínima de 85U foi inserida. Certifique-se de esvaziar completamente a seringa, mesmo depois de ouvir dois sinais sonoros.\n\nDepois de preencher o Pod, por favor, pressione <b>Próximo</b>.\n\n<b>Nota:</b> não remova a tampa da agulha do Pod neste momento.</string>
     <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">A tentar emparelhar com o novo Pod e purgá-lo.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> por favor, mantenha o Pod muito perto do RileyLink neste momento.</string>
     <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare o local de infusão. Remova a tampa da agulha do Pod e o adesivo e fixe o Pod no local de infusão.\n\nSe a canula sair, por favor, pressione <b>Cancelar</b> e descarte o seu Pod.\n\nPressione <b>Próximo</b> para inserir a canula e começar a administração da basal.</string>
     <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">A tentar definir um plano da basal inicial e inserir canula.\n\nQuando todos os itens estiverem verificados, pode pressionar <b>Próximo</b>.</string>
     <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nO Pod está agora activo.\n\nO seu plano de basal foi programado e a canula foi inserida.\n\nPor favor, verifique se a canula foi inserida correctamente e substitua o seu Pod se você se sente que não.</string>
     <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nPressione <b>Próximo</b> para desactivar o Pod.\n\n<b>Nota:</b> Isto irá suspender toda a administração de insulina e desactivar o Pod.</string>
     <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">A desactivar o Pod.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> Se desactivar falhar continuamente, por favor, pressione <b>Cancelar</b> e use o <b>Repor Pod</b> opção para forçar a repor o estado do Pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
     <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
     <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
     <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
     <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
     <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desacitvar Pod</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
@@ -1349,6 +1380,10 @@
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
     <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Pode ter falhado ao definir perfil da basal. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Pode ter falhado ao definir basal temporária. Se houve uma basal temporária já em execução, pode ter sido cancelada! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Pode ter falhado ao definir a hora. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
     <string name="omnipod_rl_stats">Estatísticas RL</string>
     <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index dbb4f2dedb..4102738d1d 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -175,6 +175,7 @@
     <string name="password_preferences_decrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie importovaných nastavení.</string>
     <string name="preferences_export_canceled">Export zrušený! Nastavenia neboli exportované!</string>
     <string name="preferences_import_canceled">Import zrušený! Nastavenia neboli importované!</string>
+    <string name="preferences_import_list_title">Vyberte súbor, ktorý chcete importovať</string>
     <string name="check_preferences_before_import">Prosím skontrolujte nastavenia predtým, ako importujete:</string>
     <string name="check_preferences_cannot_import">Nastavenia nemôžu byť importované!</string>
     <string name="check_preferences_dangerous_import">Nastavenia by nemali byť importované!</string>
@@ -187,6 +188,8 @@
     <string name="metadata_warning_outdated_format">Používate zastaralý formát zo staršej verzie AAPS, čo nie je bezpečné! Používajte len ako poslednú možnosť, ak nemáte export v aktuálnom, JSON formáte.</string>
     <string name="metadata_warning_old_export">Importované nastavenia sú už %1$s dní staré! Možno máte viacero novších nastavení, alebo ste zvolili nesprávny súbor? Nezabúdajte pravidelne exportovať nastavenia!</string>
     <string name="metadata_warning_date_format">Nesprávny formát dátumu a času!</string>
+    <string name="metadata_warning_different_version">Nastavenie z odlišnej, nižšej verzie aplikácie. Je to v poriadku, pokiaľ importujete po aktualizácii, po importe však skontrolujte, či sú nastavenia stále správne!</string>
+    <string name="metadata_urgent_different_version">Nastavenia z odlišnej hlavnej verzie aplikácie. Hlavná verzia sa výrazne líši a nemusia mať kompatibilné nastavenia. Po importe skontrolujte, či sú nastavenia stále správne!</string>
     <string name="metadata_label_format">Formát súboru</string>
     <string name="metadata_label_created_at">Vytvorené</string>
     <string name="metadata_label_aaps_version">Verzia AAPS</string>
@@ -209,6 +212,11 @@
     <string name="prefdecrypt_issue_wrong_pass">Chyba dešifrovania, zadané heslo je neplatné, alebo bol súbor nastavení zmenený! Môže sa stať, že importovaný súbor bol exportovaný s iným hlavným heslom.</string>
     <string name="prefdecrypt_issue_wrong_format">Chýba konfigurácia šifrovania, formát nastavení je neplatný!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepodporovaný alebo neurčený šifrovací algoritmus!</string>
+    <string name="exported_today">exportované dnes</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportované pred %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportované v %1$s</string>
+    <string name="exported_less_than_hour_ago">exportované pred menej ako hodinou</string>
+    <string name="in_directory" comment="placeholder is for exported file path">v adresári: %1$s</string>
     <string name="end_user_license_agreement">Licenčná zmluva s koncovým používateľom</string>
     <string name="end_user_license_agreement_text">Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie.</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM A POTVRDZUJEM</string>
@@ -385,6 +393,7 @@
     <string name="wear_detailedIOB_title">Zobraziť detailný IOB</string>
     <string name="wear_detailedIOB_summary">Rozpísať IOB na hodinkách do bolusového a bazálneho</string>
     <string name="nosuccess">Neúspešné - skontrolujte telefón</string>
+    <string name="notavailable">nie je k dispozícii</string>
     <string name="patientage">Vek pacienta</string>
     <string name="child">Dieťa</string>
     <string name="teenage">Dospievajúci</string>
@@ -1266,13 +1275,115 @@
     <string name="statuslights">Indikátory stavu</string>
     <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
     <string name="copyexistingvalues">Skopírovať nastavenia NS (ak existujú)?</string>
+    <string name="classic_desrciption">Pôvodný vzhľad</string>
+    <string name="buttonson_desrciption">Tlačidlá sú vždy zobrazené v spodnej časti obrazovky</string>
+    <string name="skin">Vzhľad</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integrácia pumpy pre Omnipod, vyžaduje zariadenie RileyLink (s firmwarom aspoň 2.0).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Pípnutie pri boluse povolené</string>
+    <string name="omnipod_config_beep_basal_enabled">Pípnutie pri bazále povolené</string>
+    <string name="omnipod_config_beep_smb_enabled">Pípnutie pri SMB povolené</string>
+    <string name="omnipod_config_beep_tbr_enabled">Pípnutie pri TBR povolené</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Možnosti ladenia Podu povolené</string>
+    <string name="omnipod_config_timechange_enabled">Letný čas / Detekcia časového pásma povolená</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Správa Podu</string>
+    <string name="omnipod_pod_status">Stav Podu</string>
+    <string name="omnipod_reservoir_left">Zostáva %1$.2f JI</string>
+    <string name="omnipod_reservoir_over50">Viac ako 50 JI</string>
+    <string name="omnipod_pod_address">Adresa Podu</string>
+    <string name="omnipod_pod_expiry">Expirácia Podu</string>
+    <string name="omnipod_pod_name_no_info">Žiadne info</string>
+    <string name="omnipod_pod_no_pod_connected">Žiadny Pod nie je pripojený</string>
+    <string name="omnipod_pod_not_initalized">Nie je inicializovaný</string>
+    <string name="omnipod_pod_active_alerts">Výstrahy aktívneho Podu</string>
+    <string name="omnipod_ack_short">Potvrdiť výstrahu</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operácia nie je možná.\n\nNajskôr je nutné nakonfigurovať Omnipod, kým bude možné túto funkciu použiť.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operácia nie je možná.\n\n Je potrebné niekoľko minút počkať, pokiaľ sa AAPS nepokúsi prvý krát nastaviť profil.</string>
+    <string name="omnipod_error_illegal_init_action_type">Neplatný atribút PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Žiadny aktívny Pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Overenie príkazu zlyhalo.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Došlo k neočakávanej chybe. Nahláste ju! (typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Komunikácia zlyhala: boli prijaté neplatné vstupné parametre.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Komunikácia zlyhala: časový limit vypršal.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikácia zlyhala: vyskytla sa neočakávaná chyba. Prosím, nahláste to!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Komunikácia zlyhala: overenie integrity správy zlyhalo.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Komunikácia zlyhala: boli prijaté neplatné pakety z Podu.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Komunikácia zlyhala: Pod je v chybnom stave.</string>
+    <string name="omnipod_driver_error_invalid_response">Komunikácia zlyhala: bola prijatá neplatná odozva z Podu.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikácia zlyhala: bola prijatá správa s neplatným poradovým číslom z Podu.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Komunikácia zlyhala: bola prijatá správa s neplatnou adresou z Podu.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Komunikácia zlyhala: nepodarilo se dekódovať správu z Podu.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Komunikácia zlyhala: opakovaná synchronizácia Nonce hodnoty zlyhala.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikácia zlyhala: hodnota Nonce nebola synchronizovaná.</string>
+    <string name="omnipod_driver_error_not_enough_data">Komunikácia zlyhala: nedostatok dát prijatých z Podu.</string>
+    <string name="omnipod_driver_error_pod_fault">Bola zistená chyba Podu (%1$03d %2$s). Deaktivujte Pod a spustite nový.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Komunikácia zlyhala: Pod vrátil chybovú odozvu.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Správa Podu</string>
+    <string name="omnipod_cmd_init_pod">Inicializovať Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Deaktivovať Pod</string>
+    <string name="omnipod_cmd_reset_pod">Resetovať Pod</string>
+    <string name="omnipod_cmd_pod_history">História Podu</string>
+    <string name="omnipod_cmd_set_bolus">Nastaviť bolus</string>
+    <string name="omnipod_cmd_cancel_bolus">Zrušiť bolus</string>
+    <string name="omnipod_cmd_set_tbr">Nastaviť dočasný bazál</string>
+    <string name="omnipod_cmd_cancel_tbr">Zrušiť dočasný bazál (interne ovládačom)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Zrušiť dočasný bazál (nútene užívateľom)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Nastaviť plán bazálu</string>
+    <string name="omnipod_cmd_get_pod_status">Zistiť stav Podu</string>
+    <string name="omnipod_cmd_get_pod_info">Zistiť informácie o Pode</string>
+    <string name="omnipod_cmd_set_time">Nastaviť čas</string>
+    <string name="omnipod_cmd_configure_alerts">Nastaviť výstrahy</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Potvrdiť výstrahy</string>
+    <string name="omnipod_cmd_suspend_delivery">Pozastaviť dodávanie inzulínu</string>
+    <string name="omnipod_cmd_resume_delivery">Pokračovať v dodávaní inzulínu</string>
+    <string name="omnipod_cmd_unknown_entry">Neznáma položka</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f JI</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f JI, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Rýchlosť: %1$.1f JI, Doba trvania: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Keď stlačíš <b>OK</b>, bude pripojenie na Pod nútene prerušené a nebudete sa môcť k nemu už viac pripojiť. Urob tak iba vtedy, ak AAPS nemôže viac komunikovať s Podom. Ak stále môžete komunikovať s Podom, prosím použite možnosť <b>Deaktivovať Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">História Podu momentálne nie je dostupná.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte Pod dostatočným množstvom inzulínu na 3 dni.\n\nPočúvaj aj dve pípnutia počas plnenia. Tieto poukazujú na to, že Pod bol naplnený minimálnym množstvom 85 JI. Úplne vyprázdni striekačku, aj keď si počul dve pípnutia.\n\nKlikni &lt;bĎalej&lt;/b&gt; po tom, čo si naplnil Pod.\n\n&lt;b&gt;Poznámka:&lt;/b&gt; Neodstraňuj ešte ochranu ihly na Pode.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Plnenie</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Pokús sa spárovať s novým Podom a naplň ho.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> prosím držte teraz Pod veľmi blízko RileyLinku.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Pripevni Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPripravte infúzny set. Odstráňte krytku ihly na Pode a ochranu samolepky a pripojte Pod k infúznemu setu. \n\nAk sa kanyla odlepí, prosím stlačte <b>Zrušiť</b> a zahoďte Váš Pod.\n\nStlačte <b>Ďalšia</b> na zavedenie kanyly a začiatok podávania bazálu.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Zavedenie kanyly</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Pokúšam sa nastaviť počiatočnú bazálnu dávku a zaviesť kanylu.\n\nAk sú všetky položky označené, môžete stlačiť <b>Ďalší</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Informácie o Pode</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je teraz aktívny.\n\nVaša bazálna dávka je nastavená a kanyla bola zavedená.\n\nProsím skontrolujte, či bola kanyla zavedená správne a ak máte pocit, že nie, tak vymeňte Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovať Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nStlačte <b>Ďalej</b> pre deaktiváciu Podu.\n\n<b>Poznámka:</b> Toto preruší celkovo podávanie inzulínu a deaktivuje Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivácia Podu</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktivujem Pod.\n\nKeď sú všetky položky zaškrtnuté, môžete stlačiť <b>Ďalej</b>.\n\n<b>Poznámka:</b> Ak deaktivácia neustále zlyháva, stlačte prosím <b>Zrušiť</b> a použite možnosť <b>Resetovať Pod</b>, na nútené obnovenie stavu Podu.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivovaný.\n\nProsím odstráňte Pod z Vášho tela a zlikvidujte ho.</string>
+    <string name="omnipod_init_pod_pair_pod">Spárujte Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Naplňte Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Naplňte kanylu</string>
+    <string name="omnipod_init_pod_set_basal_profile">Nastavte bazálny profil</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Zrušte podávanie</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivujte Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integrácia pumpy pre Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
+    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
+    <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
+    <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
+    <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
+    <string name="omnipod_alert_unknown_alert">Neznáma výstraha</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Nastavenie bazálu mohlo zlyhať. Podávanie môže byť pozastavené! Prosím, obnovte stav Podu.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Nastavenie dočasného bazálu mohlo zlyhať. Ak už bol spustený dočasný bazál, mohol byť zrušený! Prosím, obnovte stav Podu.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Nastavenie času mohlo zlyhať. Podávanie môže byť pozastavené! Prosím, obnovte stav Podu.</string>
+    <string name="omnipod_bolus_failed_uncertain">Nie je možné overiť, či bolo podávanie bolusu úspešné. Prosím overte, že váš Pod podáva bolus, alebo zrušte bolus.</string>
+    <string name="omnipod_rl_stats">Štatistiky RL</string>
+    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
 </resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index bd93e81191..dd1063e8c7 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -1,7 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Koppeln</string>
     <!--    General-->
+    <string name="error">Fehler</string>
+    <string name="not_set_short">Nicht angegeben</string>
+    <string name="failedupdatebasalprofile">Fehler beim Aktualisieren des Basalprofils</string>
+    <string name="profile_set_ok">Basal-Profil in der Pumpe aktualisiert</string>
+    <string name="invalidinput">Ungültige Eingabedaten</string>
+    <string name="tempbasaldeliveryerror">TBR Abgabe-Fehler</string>
+    <string name="goingtodeliver">Werde %1$.2fIE abgeben</string>
+    <string name="waitingforpump">Warte auf Pumpe</string>
+    <string name="connectingfor">Verbindungsaufbau seit %1$d s</string>
+    <string name="bolusdelivering">Gebe %1$.2fIE ab</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connecting">Verbinden</string>
+    <string name="connected">Verbunden</string>
+    <string name="disconnected">Getrennt</string>
+    <string name="disconnecting">Verbindung wird getrennt</string>
+    <string name="androidaps_start">AndroidAPS gestartet</string>
+    <string name="formatinsulinunits">%1$.2f IE</string>
+    <string name="reservoirvalue">%1$.0f / %2$d IE</string>
+    <string name="pump_basebasalrate">%1$.2f IE/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min.</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pumpe ist beschäftigt</string>
+    <string name="connectionerror">Pumpen-Verbindungsfehler</string>
+    <string name="youareonallowedlimit">Limit erreicht</string>
+    <string name="objectives">Objectives (Ziele)</string>
+    <string name="close">Schließen</string>
+    <string name="please_wait">Bitte warten…</string>
+    <string name="mute">Alarm stoppen</string>
+    <string name="reload">Neu laden</string>
+    <string name="stoppressed">STOPP GEDRÜCKT</string>
+    <string name="stop">Stopp</string>
+    <string name="carbs">Kohlenhydrate</string>
+    <string name="invalidprofile">Ungültiges oder defektes Profil!</string>
+    <string name="noprofileset">KEIN PROFIL GESETZT</string>
+    <string name="date">Datum</string>
+    <string name="units_label">Einheiten</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Ziel</string>
+    <string name="initializing">Initialisierung...</string>
+    <string name="serialnumber">Seriennummer</string>
+    <string name="battery_label">Batterie</string>
+    <string name="lastconnection_label">Letzte Verbindung</string>
+    <string name="lastbolus_label">Letzter Bolus</string>
+    <string name="dailyunits">Tägliche Einheiten</string>
+    <string name="basebasalrate_label">Basis-Basalrate</string>
+    <string name="tempbasal_label">TBR</string>
+    <string name="virtualpump_extendedbolus_label">Verzögerter Bolus</string>
+    <string name="reservoir_label">Reservoir</string>
+    <string name="pumphistory">Pumpen-Historie</string>
+    <string name="viewprofile">Profil anzeigen</string>
+    <string name="eventtype">Ereignistyp</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Erweiterte Einstellungen</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Deaktiviert Bluetooth kurzzeitig, falls keine Verbindung zur Pumpe besteht. Dies kann für Smartphones mit Verbindungsproblemen nützlich sein.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Begrenzung der max. Basalrate auf %1$.2f IE/h wegen %2$s</string>
+    <string name="pumplimit">Limit der Pumpe</string>
+    <string name="limitingpercentrate">Begrenzung des max. Prozentsatzes auf %1$d%% wegen %2$s</string>
+    <string name="itmustbepositivevalue">Es muss ein positiver Wert sein.</string>
+    <string name="limitingbolus">Begrenze Bolusmenge auf %1$.1f IE wegen %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pumpe nicht initialisiert, Profil nicht gesetzt!</string>
     <!--    Dialogs-->
     <string name="confirmation">Bestätigung</string>
     <string name="message">Nachricht</string>
@@ -9,6 +77,8 @@
     <string name="cancel">Abbrechen</string>
     <string name="dismiss">VERWERFEN</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth-Low-Energy nicht unterstützt.</string>
+    <string name="ble_not_enabled">Bluetooth nicht aktiviert.</string>
     <string name="location_not_found_title">Standortdienst ist nicht aktiviert</string>
     <string name="location_not_found_message">Auf neueren Geräten muss für die Bluetooth-Erkennung der Standortdienst aktiviert sein. AAPS speichert keine Standortdaten und der Dienst kann nach erfolgreichem Pairing wieder deaktiviert werden.</string>
     <!--    DateUtil-->
@@ -39,6 +109,7 @@
     <!--    ProfileFunction-->
     <string name="noprofileselected">Kein Profil ausgewählt</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Bei der virtuellen Pumpe können nur einzelne Werte und keine Bereiche zur Festlegung der Basal/Bolus-Granularität gewählt werden.</string>
     <!--    APSResult-->
     <string name="canceltemp">TBR abbrechen</string>
     <string name="let_temp_basal_run">Temporäre Basalrate aktiv lassen</string>
@@ -91,5 +162,19 @@
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistik</string>
+    <string name="cumulative_tdd">Kumulative TDD</string>
+    <string name="expweight">Exponentiell gewichtete TDD</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Verhältnis</string>
+    <string name="amount_days"># Tage</string>
+    <string name="weight">Gewichtung</string>
+    <string name="warning_Message">Möglicherweise ungenau, wenn zum Befüllen ein Bolus verwendet wurde!</string>
+    <string name="olddata_Message">Veraltete Daten, bitte klicke auf \"NEU LADEN\"</string>
+    <string name="tbb">Tägl. Basalmenge</string>
+    <string name="tbb2">Tägl. Basalmenge * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Zeiterkennung</string>
 </resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 4c45586f82..85f5ce3e2f 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -1,20 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Appairage</string>
     <!--    General-->
+    <string name="error">Erreur</string>
+    <string name="not_set_short">Non configuré</string>
+    <string name="failedupdatebasalprofile">La mise à jour du profil basal a échouée</string>
+    <string name="profile_set_ok">Profil Basal mise à jour dans la pompe</string>
+    <string name="invalidinput">Données saisies invalides</string>
+    <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
+    <string name="goingtodeliver">%1$.2fU vont être injectées</string>
+    <string name="waitingforpump">Attente connection pompe</string>
+    <string name="connectingfor">Connexion à %1$s en cours</string>
+    <string name="bolusdelivering">Injection en cours %1$.2fU</string>
+    <string name="handshaking">Connexion</string>
+    <string name="connecting">Connection en cours</string>
+    <string name="connected">Connectée</string>
+    <string name="disconnected">Déconnectée</string>
+    <string name="disconnecting">Déconnexion en cours</string>
+    <string name="androidaps_start">AndroidAPS est lancé</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pompe occupée</string>
+    <string name="connectionerror">Erreur connection pompe</string>
+    <string name="youareonallowedlimit">Vous avez atteint la limite maximale</string>
+    <string name="objectives">Objectifs</string>
+    <string name="close">Fermer</string>
+    <string name="please_wait">Merci de patienter...</string>
+    <string name="mute">Muet</string>
+    <string name="reload">Actualiser</string>
+    <string name="stoppressed">ARRÊT APPUYÉ</string>
+    <string name="stop">Arrêt</string>
+    <string name="carbs">Glucides</string>
+    <string name="invalidprofile">Profil incorrect !!!</string>
+    <string name="noprofileset">PAS DE PROFIL DÉFINI</string>
+    <string name="date"> Date</string>
+    <string name="units_label">Unités</string>
+    <string name="dia_label">DAI</string>
+    <string name="ic_label">G/I</string>
+    <string name="isf_label">SI</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Cible</string>
+    <string name="initializing">En cours d\'initialisation...</string>
+    <string name="serialnumber">Numéro de série</string>
+    <string name="battery_label">Niveau batterie</string>
+    <string name="lastconnection_label">Dernière connexion</string>
+    <string name="lastbolus_label">Dernier bolus</string>
+    <string name="dailyunits">Unités quotidiennes</string>
+    <string name="basebasalrate_label">Débit de Basal</string>
+    <string name="tempbasal_label">Basal temporaire</string>
+    <string name="virtualpump_extendedbolus_label">Bolus étendu</string>
+    <string name="reservoir_label">Réservoir</string>
+    <string name="pumphistory">Historique pompe</string>
+    <string name="viewprofile">Consulter le profil</string>
+    <string name="eventtype">Type d\'évènement</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Paramètres Avancés</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Coupe le Bluetooth du téléphone une seconde si la connexion pompe n’est pas possible. Cela peut aider pour les téléphones dont la connexion Bluetooth se bloque.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Limiter le débit de basal max à %1$.2f U/h à cause de %2$s</string>
+    <string name="pumplimit">Limite de la pompe</string>
+    <string name="limitingpercentrate">Limiter le pourcentage max à %1$d%% à cause de %2$s</string>
+    <string name="itmustbepositivevalue">la valeur doit être positive</string>
+    <string name="limitingbolus">Limiter le Bolus à %1$.1f U à cause de %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompe non initialisée, profil non défini !</string>
     <!--    Dialogs-->
+    <string name="confirmation">Confirmation</string>
+    <string name="message">Message</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Annuler</string>
+    <string name="dismiss">REJETER</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy non pris en charge.</string>
+    <string name="ble_not_enabled">Bluetooth désactivé.</string>
+    <string name="location_not_found_title">Localisation désactivée</string>
+    <string name="location_not_found_message">La localisation doit être activée sur les nouveaux appareils pour que la recherche Bluetooth fonctionne. AAPS n\'enregistre pas votre localisation et la localisation peut être désactivée après l\'appairage.</string>
     <!--    DateUtil-->
+    <string name="minago">il y a %1$dm</string>
+    <string name="hoursago">il y a %1$.1fh</string>
+    <string name="shorthour">h</string>
+    <string name="days">jours</string>
+    <string name="hours">heures</string>
+    <string name="unit_second">seconde</string>
+    <string name="unit_minute">minute</string>
+    <string name="unit_hour">heure</string>
+    <string name="unit_day">jour</string>
+    <string name="unit_week">semaine</string>
+    <string name="unit_seconds">secondes</string>
+    <string name="unit_minutes">minutes</string>
+    <string name="unit_hours">heures</string>
+    <string name="unit_days">jours</string>
+    <string name="unit_weeks">semaines</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">j</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Valeurs des débits de basal non alignées sur des heures: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valeur de basal remplacée par la valeur minimale autorisée : %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valeur de basal remplacée par la valeur maximale autorisée : %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Aucun profil séléctionné</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Uniquement les valeurs unitaires sont acceptées. Les plages pour les basal/bolus ne sont pas supportées par les pompes virtuelles.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Annuler Basal Temp</string>
+    <string name="let_temp_basal_run">Laisser démarrer le Basal Temp</string>
+    <string name="rate">Débit</string>
+    <string name="duration">Durée</string>
+    <string name="reason">Raison</string>
+    <string name="nochangerequested">Pas de changement demandé</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Profil incorrect : %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Contrôle Glycémie</string>
+    <string name="careportal_announcement">Notification</string>
+    <string name="careportal_note">Remarque</string>
+    <string name="careportal_question">Question</string>
+    <string name="careportal_exercise">Activité Physique</string>
+    <string name="careportal_pumpsitechange">Changement Zone D\'insertion</string>
+    <string name="careportal_cgmsensorinsert">Insertion Capteur MGC</string>
+    <string name="careportal_cgmsensorstart">Démarrage Capteur MGC</string>
+    <string name="careportal_insulincartridgechange">Changement du Réservoir</string>
+    <string name="careportal_profileswitch">Changement de profil</string>
+    <string name="careportal_snackbolus">Bolus Goûter</string>
+    <string name="careportal_mealbolus">Bolus Repas</string>
+    <string name="careportal_correctionbolus">Bolus de correction</string>
+    <string name="careportal_combobolus">Bolus Combiné</string>
+    <string name="careportal_tempbasalstart">Début Basal Temp</string>
+    <string name="careportal_tempbasalend">Fin Basal Temp</string>
+    <string name="careportal_carbscorrection">Ressucrage</string>
+    <string name="careportal_openapsoffline">OpenAPS hors ligne</string>
+    <string name="careportal_pumpbatterychange">Changement Pile Pompe</string>
+    <string name="careportal_temporarytarget">Cible temp.</string>
+    <string name="careportal_temporarytargetcancel">Annuler Cible Temporaire</string>
+    <string name="glucosetype_finger">Doigt</string>
+    <string name="glucosetype_sensor">Capteur</string>
+    <string name="manual">Manuel</string>
+    <string name="unknown">inconnu</string>
     <!--    Command-->
+    <string name="connectiontimedout">Connexion expirée</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Activé</string>
+    <string name="comment">Commentaire</string>
+    <string name="success">Succès</string>
+    <string name="percent">Pourcentage</string>
+    <string name="absolute">Absolu</string>
+    <string name="configbuilder_insulin">Insuline</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Attente de résultat</string>
+    <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Stats</string>
+    <string name="cumulative_tdd">DTI cumulé</string>
+    <string name="expweight">DTI avec Pondération Exponentielle</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">DTI</string>
+    <string name="ratio">Ratio</string>
+    <string name="amount_days">Nb Jours</string>
+    <string name="weight">Pondération</string>
+    <string name="warning_Message">Peut être inexact si des bolus sont utilisés pour l’amorçage et le remplissage !</string>
+    <string name="olddata_Message">Données anciennes, appuyez sur \"Actualiser\"</string>
+    <string name="tbb">Basal Totale (TBB)</string>
+    <string name="tbb2">DTB*2</string>
     <!--    Ntp-->
+    <string name="timedetection">Détection de temps</string>
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index be1596e82b..39663746a4 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -1,7 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Associazione</string>
     <!--    General-->
+    <string name="error">Errore</string>
+    <string name="not_set_short">Non impostato</string>
+    <string name="failedupdatebasalprofile">Impossibile aggiornare il profilo basale</string>
+    <string name="profile_set_ok">Profilo basale aggiornato nel micro</string>
+    <string name="invalidinput">Dati di input non validi</string>
+    <string name="tempbasaldeliveryerror">Errore erogazione basale temporanea</string>
+    <string name="goingtodeliver">Sto per erogare %1$.2fU</string>
+    <string name="waitingforpump">In attesa del micro</string>
+    <string name="connectingfor">In connessione per %1$d s</string>
+    <string name="bolusdelivering">Erogazione di %1$.2fU</string>
+    <string name="handshaking">Connessione</string>
+    <string name="connecting">Connessione</string>
+    <string name="connected">Connesso</string>
+    <string name="disconnected">Disconnesso</string>
+    <string name="disconnecting">Disconnessione</string>
+    <string name="androidaps_start">AndroidAPS avviato</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Il micro è occupato</string>
+    <string name="connectionerror">Errore connessione micro</string>
+    <string name="youareonallowedlimit">Hai raggiunto il limite consentito</string>
+    <string name="objectives">Obiettivi</string>
+    <string name="close">Chiudi</string>
+    <string name="please_wait">Attendi…</string>
+    <string name="mute">Muto</string>
+    <string name="reload">Ricarica</string>
+    <string name="stoppressed">STOP PREMUTO</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">CHO</string>
+    <string name="invalidprofile">Profilo non valido !!!</string>
+    <string name="noprofileset">NESSUN PROFILO IMPOSTATO</string>
+    <string name="date">Data</string>
+    <string name="units_label">Unità</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basale</string>
+    <string name="target_label">Target</string>
+    <string name="initializing">Inizializzazione...</string>
+    <string name="serialnumber">Numero seriale</string>
+    <string name="battery_label">Batteria</string>
+    <string name="lastconnection_label">Ultima connessione</string>
+    <string name="lastbolus_label">Ultimo bolo</string>
+    <string name="dailyunits">Unità giornaliere</string>
+    <string name="basebasalrate_label">Velocità basale originale</string>
+    <string name="tempbasal_label">Basale temporanea</string>
+    <string name="virtualpump_extendedbolus_label">Bolo Esteso</string>
+    <string name="reservoir_label">Serbatoio</string>
+    <string name="pumphistory">Storico micro</string>
+    <string name="viewprofile">Visualizza profilo</string>
+    <string name="eventtype">Tipo evento</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Impostazioni avanzate</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Spegne il bluetooth del telefono per qualche secondo se non è possibile alcuna connessione al micro. Questo può essere utile su alcuni telefoni.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
+    <string name="pumplimit">limite micro</string>
+    <string name="limitingpercentrate">Limitazione max tasso percentuale a %1$d%% a causa di: %2$s</string>
+    <string name="itmustbepositivevalue">deve essere un valore positivo</string>
+    <string name="limitingbolus">Limitazione bolo a %1$.1f U a causa di: %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Micro non inizializzato, profilo non impostato!</string>
     <!--    Dialogs-->
     <string name="confirmation">Conferma</string>
     <string name="message">Messaggio</string>
@@ -9,6 +77,8 @@
     <string name="cancel">Annulla</string>
     <string name="dismiss">RIMUOVI</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy non supportato.</string>
+    <string name="ble_not_enabled">Bluetooth non abilitato.</string>
     <string name="location_not_found_title">La localizzazione non è abilitata</string>
     <string name="location_not_found_message">Affinché la ricerca bluetooth funzioni sui dispositivi più recenti, la localizzazione deve essere abilitata, ma può essere disabilitata dopo l\'associazione. AAPS non tiene traccia della tua posizione.</string>
     <!--    DateUtil-->
@@ -39,6 +109,7 @@
     <!--    ProfileFunction-->
     <string name="noprofileselected">Nessun profilo selezionato</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Sono supportati solo valori discreti, non intervalli di valori, come incrementi per basale/bolo nel micro virtuale.</string>
     <!--    APSResult-->
     <string name="canceltemp">Cancella basale temporanea</string>
     <string name="let_temp_basal_run">Lascia eseguire la basale temporanea</string>
@@ -91,5 +162,19 @@
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistiche</string>
+    <string name="cumulative_tdd">TDD cumulativo</string>
+    <string name="expweight">TDD esponenzialmente ponderato</string>
+    <string name="basalrate">Basale</string>
+    <string name="bolus">Bolo</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Rapporto</string>
+    <string name="amount_days"># Giorni</string>
+    <string name="weight">Peso</string>
+    <string name="warning_Message">Probabilmente inaccurato se per il caricamento/riempimento si usano i boli al posto dell\'apposita funzione!</string>
+    <string name="olddata_Message">Dati vecchi, premi \"RICARICA\"</string>
+    <string name="tbb">Basale originale totale</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Rilevamento tempo</string>
 </resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 17473920e9..eae9d66156 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -7,11 +7,11 @@
     <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
     <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
     <string name="invalidinput">Entrada Inválida</string>
-    <string name="tempbasaldeliveryerror">Erro na entrega da Basal Temp</string>
+    <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
     <string name="goingtodeliver">A ser administrada %1$.2fU</string>
     <string name="waitingforpump">À espera da bomba</string>
     <string name="connectingfor">A ligar durante %1$d s</string>
-    <string name="bolusdelivering">A enviar %1$.2fU</string>
+    <string name="bolusdelivering">A administrar %1$.2fU</string>
     <string name="handshaking">Cumprimento</string>
     <string name="connecting">A ligar</string>
     <string name="connected">Ligado</string>
@@ -40,6 +40,7 @@
     <string name="date">Data</string>
     <string name="units_label">Unidades</string>
     <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
     <string name="isf_label">FSI</string>
     <string name="basal_label">Basal</string>
     <string name="target_label">Alvo</string>
@@ -47,7 +48,14 @@
     <string name="serialnumber">Número de série</string>
     <string name="battery_label">Bateria</string>
     <string name="lastconnection_label">Última ligação</string>
+    <string name="lastbolus_label">Último bólus</string>
+    <string name="dailyunits">Unidades diárias</string>
+    <string name="basebasalrate_label">Taxa Basal de base</string>
+    <string name="tempbasal_label">Basal temp</string>
     <string name="virtualpump_extendedbolus_label">Bólus Prolongado</string>
+    <string name="reservoir_label">Reservatório</string>
+    <string name="pumphistory">Histórico da Bomba</string>
+    <string name="viewprofile">Ver perfil</string>
     <string name="eventtype">Tipo de evento</string>
     <string name="mgdl">mg/dL</string>
     <string name="mmol">mmol/L</string>
@@ -119,9 +127,9 @@
     <string name="careportal_bgcheck">Verificar Glic</string>
     <string name="careportal_announcement">Anúncio</string>
     <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Pergunta</string>
+    <string name="careportal_question">Questão</string>
     <string name="careportal_exercise">Exercício</string>
-    <string name="careportal_pumpsitechange">Mudança de Cateter</string>
+    <string name="careportal_pumpsitechange">Mudança Local Bomba</string>
     <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
     <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
     <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 4c45586f82..2dd270300c 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -1,20 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Párovanie</string>
     <!--    General-->
+    <string name="error">Chyba</string>
+    <string name="not_set_short">Nenastavené</string>
+    <string name="failedupdatebasalprofile">Chyba pri aktualizovaní bazálneho profilu</string>
+    <string name="profile_set_ok">Bazálny profil v pumpe aktualizovaný</string>
+    <string name="invalidinput">Chybné vstupné dáta</string>
+    <string name="tempbasaldeliveryerror">Chyba podávania dočasného bazálu</string>
+    <string name="goingtodeliver">Podávanie %1$.2fJ inzulínu</string>
+    <string name="waitingforpump">Čakám na pumpu</string>
+    <string name="connectingfor">Pripájanie %1$d sek</string>
+    <string name="bolusdelivering">Podávanie %1$.2fJI</string>
+    <string name="handshaking">Overovanie</string>
+    <string name="connecting">Pripájanie</string>
+    <string name="connected">Pripojené</string>
+    <string name="disconnected">Odpojené</string>
+    <string name="disconnecting">Odpájanie</string>
+    <string name="androidaps_start">AndroidAPS spustený</string>
+    <string name="formatinsulinunits">%1$.2fJI</string>
+    <string name="reservoirvalue">%1$.0f / %2$d JI</string>
+    <string name="pump_basebasalrate">%1$.2fJI/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pumpa je zaneprázdnená</string>
+    <string name="connectionerror">Chyba pripájania pumpy</string>
+    <string name="youareonallowedlimit">Dosiahnutý limit</string>
+    <string name="objectives">Ciele</string>
+    <string name="close">Zavrieť</string>
+    <string name="please_wait">Čakajte prosím...</string>
+    <string name="mute">Stíšiť</string>
+    <string name="reload">Načítať</string>
+    <string name="stoppressed">STLAČENÝ STOP</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">Sacharidy</string>
+    <string name="invalidprofile">Chybný profil !!!</string>
+    <string name="noprofileset">Nenastavený žiadny profil</string>
+    <string name="date">Dátum</string>
+    <string name="units_label">Jednotky</string>
+    <string name="dia_label">Doba pôsobenia inzulínu</string>
+    <string name="ic_label">Inzulínovo-sacharidový pomer</string>
+    <string name="isf_label">Citlivosť</string>
+    <string name="basal_label">Bazál</string>
+    <string name="target_label">Cieľ</string>
+    <string name="initializing">Inicializácia ...</string>
+    <string name="serialnumber">Sériové číslo</string>
+    <string name="battery_label">Batéria</string>
+    <string name="lastconnection_label">Posledné spojenie</string>
+    <string name="lastbolus_label">Posledný bolus</string>
+    <string name="dailyunits">Jednotiek za deň</string>
+    <string name="basebasalrate_label">Základná hodnota bazálu</string>
+    <string name="tempbasal_label">Dočasný bazál</string>
+    <string name="virtualpump_extendedbolus_label">Rozložený bolus</string>
+    <string name="reservoir_label">Zásobník</string>
+    <string name="pumphistory">História pumpy</string>
+    <string name="viewprofile">Zobraziť profil</string>
+    <string name="eventtype">Typ udalosti</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/L</string>
+    <string name="advancedsettings_title">Rozšírené nastavenia</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Strážny pes BT</string>
+    <string name="btwatchdog_summary">Vypne na 1 sekundu Bluetooth v telefóne, pokiaľ se nedarí pripojiť k pumpe. Môže to pomôcť pri telefónoch, ktoré majú problémy s BT.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Max bazál obmedzený na %1$.2f JI/h: %2$s</string>
+    <string name="pumplimit">limit pumpy</string>
+    <string name="limitingpercentrate">Bazál obmedzený na %1$d%%: %2$s</string>
+    <string name="itmustbepositivevalue">požadovaná kladná hodnota</string>
+    <string name="limitingbolus">Bolus obmedzený na %1$.1f JI: %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pumpa nie je inicializovaná, profil nenastavený!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Potvrdenie</string>
+    <string name="message">Správa</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Zrušiť</string>
+    <string name="dismiss">ODMIETNUŤ</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy nie je podporované.</string>
+    <string name="ble_not_enabled">Bluetooth nie je aktivovaný.</string>
+    <string name="location_not_found_title">Poloha nie je aktivovaná</string>
+    <string name="location_not_found_message">Pre vyhľadanie Bluetooth zariadení na novších telefónoch musí byť povolené zisťovanie polohy. AAPS vás nesleduje a po úspešnom spárovaní môžete túto voľbu opäť zakázať.</string>
     <!--    DateUtil-->
+    <string name="minago">pred %1$d min</string>
+    <string name="hoursago">pred %1$.1fh</string>
+    <string name="shorthour">h</string>
+    <string name="days">dní</string>
+    <string name="hours">hodín</string>
+    <string name="unit_second">sekunda</string>
+    <string name="unit_minute">minúta</string>
+    <string name="unit_hour">hodina</string>
+    <string name="unit_day">deň</string>
+    <string name="unit_week">týždeň</string>
+    <string name="unit_seconds">sekúnd</string>
+    <string name="unit_minutes">minút</string>
+    <string name="unit_hours">hodín</string>
+    <string name="unit_days">dní</string>
+    <string name="unit_weeks">týždňov</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Bazálne hodnoty nie sú zarovnané na celé hodiny: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Hodnota bazálu nahradená minimálnou možnou: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Hodnota bazálu nahradená maximálnou možnou: %1$s</string>
+    <string name="profile_per_unit">/JI</string>
+    <string name="profile_ins_units_per_hour">JI/h</string>
+    <string name="profile_carbs_per_unit">g/JI</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Nebol vybraný žiadny profil</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Iba diskrétne hodnoty a nie rozsahy sú podporované pre bazál/bolus vo virtuálnej pumpe.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Zrušiť dočasný bazál</string>
+    <string name="let_temp_basal_run">Nechať bežať aktuálny dočasný bazál</string>
+    <string name="rate">Hodnota</string>
+    <string name="duration">Trvanie</string>
+    <string name="reason">Zdôvodnenie</string>
+    <string name="nochangerequested">Nepožadovaná žiadna zmena</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Chybný profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Kontrola glykémie</string>
+    <string name="careportal_announcement">Oznámenie</string>
+    <string name="careportal_note">Poznámka</string>
+    <string name="careportal_question">Otázka</string>
+    <string name="careportal_exercise">Pohyb</string>
+    <string name="careportal_pumpsitechange">Výmena setu</string>
+    <string name="careportal_cgmsensorinsert">Výmena senzora</string>
+    <string name="careportal_cgmsensorstart">Spustenie senzora</string>
+    <string name="careportal_insulincartridgechange">Výmena inzulínu</string>
+    <string name="careportal_profileswitch">Prepnutie profilu</string>
+    <string name="careportal_snackbolus">Bolus na desiatu/olovrant</string>
+    <string name="careportal_mealbolus">Bolus na jedlo</string>
+    <string name="careportal_correctionbolus">Korekčný bolus</string>
+    <string name="careportal_combobolus">Kombinovaný bolus</string>
+    <string name="careportal_tempbasalstart">Začiatok dočasného bazálu</string>
+    <string name="careportal_tempbasalend">Koniec dočasného bazálu</string>
+    <string name="careportal_carbscorrection">Prídavok sacharidov</string>
+    <string name="careportal_openapsoffline">OpenAPS vypnuté</string>
+    <string name="careportal_pumpbatterychange">Výmena batérie v pumpe</string>
+    <string name="careportal_temporarytarget">Dočasný cieľ</string>
+    <string name="careportal_temporarytargetcancel">Zrušiť dočasný cieľ</string>
+    <string name="glucosetype_finger">Prst</string>
+    <string name="glucosetype_sensor">Senzor</string>
+    <string name="manual">Iný</string>
+    <string name="unknown">neznámy</string>
     <!--    Command-->
+    <string name="connectiontimedout">Vypršal čas na pripojenie</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Vykonané</string>
+    <string name="comment">Komentár</string>
+    <string name="success">Úspešne</string>
+    <string name="percent">Percent</string>
+    <string name="absolute">Absolútna</string>
+    <string name="configbuilder_insulin">Inzulín</string>
+    <string name="insulin_unit_shortname">JI</string>
+    <string name="waitingforpumpresult">Čakanie na výsledok</string>
+    <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Štatistiky</string>
+    <string name="cumulative_tdd">Kumulatívny TDD</string>
+    <string name="expweight">Exponenciálne vážený TDD</string>
+    <string name="basalrate">Bazál</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">CDD</string>
+    <string name="ratio">Pomer</string>
+    <string name="amount_days">Dní</string>
+    <string name="weight">Váha</string>
+    <string name="warning_Message">Pravdepodobne nepresné, ak bol použitý bolus na plnenie!</string>
+    <string name="olddata_Message">Zastaralé dáta. Prosím načítajte ich znovu</string>
+    <string name="tbb">Celk. denný bazál</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Detekcia času</string>
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index ee98f23a74..d44a3b7bc8 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -1,7 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Parkoppling</string>
     <!--    General-->
+    <string name="error">Fel</string>
+    <string name="not_set_short">Ej vald</string>
+    <string name="failedupdatebasalprofile">Lyckades inte uppdatera basalprofilen</string>
+    <string name="profile_set_ok">Basalprofilen uppdaterad i pumpen</string>
+    <string name="invalidinput">Fel på inmatning</string>
+    <string name="tempbasaldeliveryerror">Fel vid justering av temp basal</string>
+    <string name="goingtodeliver">Kommer att leverera %1$.2f enheter</string>
+    <string name="waitingforpump">Väntar på pump</string>
+    <string name="connectingfor">Ansluter (%1$d s)</string>
+    <string name="bolusdelivering">Levererar %1$.2f enheter</string>
+    <string name="handshaking">Anslutningen verifieras</string>
+    <string name="connecting">Ansluter</string>
+    <string name="connected">Ansluten</string>
+    <string name="disconnected">Frånkopplad</string>
+    <string name="disconnecting">Kopplar från</string>
+    <string name="androidaps_start">AndroidAPS startad</string>
+    <string name="formatinsulinunits">%1$.2f U</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pump upptagen</string>
+    <string name="connectionerror">Anslutningsfel</string>
+    <string name="youareonallowedlimit">Du har nått din tillåtna gräns</string>
+    <string name="objectives">Mål</string>
+    <string name="close">Stäng</string>
+    <string name="please_wait">Var god vänta…</string>
+    <string name="mute">Tysta</string>
+    <string name="reload">Hämta</string>
+    <string name="stoppressed">Stopp nedtryckt</string>
+    <string name="stop">Stopp</string>
+    <string name="carbs">Kolhydrater</string>
+    <string name="invalidprofile">Ogiltig profil!</string>
+    <string name="noprofileset">INGEN PROFIL VALD</string>
+    <string name="date">Datum</string>
+    <string name="units_label">Enheter</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">CR</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Målvärde</string>
+    <string name="initializing">Startar...</string>
+    <string name="serialnumber">Serienummer</string>
+    <string name="battery_label">Batterinivå</string>
+    <string name="lastconnection_label">Senast ansluten</string>
+    <string name="lastbolus_label">Senaste bolus</string>
+    <string name="dailyunits">Enheter per dag</string>
+    <string name="basebasalrate_label">Profilens basaldos</string>
+    <string name="tempbasal_label">Temp basal</string>
+    <string name="virtualpump_extendedbolus_label">Förlängd bolus</string>
+    <string name="reservoir_label">Reservoar</string>
+    <string name="pumphistory">Pumphistorik</string>
+    <string name="viewprofile">Visa profil</string>
+    <string name="eventtype">Händelsetyp</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Avancerade inställningar</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Bluetooth-övervakare</string>
+    <string name="btwatchdog_summary">Startar om bluetooth på telefonen om anslutning till pumpen misslyckas. Detta hjälper på en del telefoner där bluetooth ibland hänger sig.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Max basal: %1$.2f E/h pga %2$s</string>
+    <string name="pumplimit">pumpbegränsning</string>
+    <string name="limitingpercentrate">Begränsar max procent hastighet till %1$d%% pga %2$s</string>
+    <string name="itmustbepositivevalue">det måste vara ett positivt värde</string>
+    <string name="limitingbolus">Max bolus: %1$.1f U pga %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pump inte initierad, ingen profil vald.</string>
     <!--    Dialogs-->
     <string name="confirmation">Bekräftelse</string>
     <string name="message">Meddelande</string>
@@ -9,6 +77,8 @@
     <string name="cancel">Avbryt</string>
     <string name="dismiss">TA BORT</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Enheten stöder inte BLE.</string>
+    <string name="ble_not_enabled">Bluetooth är avstängt.</string>
     <string name="location_not_found_title">Platsdata är inte aktiverat</string>
     <string name="location_not_found_message">För att Bluetooth ska fungera med nyare enheter, måste platsdata vara aktiverat. AAPS sparar inte din plats och det kan stängas av efter att enheten har parkopplats.</string>
     <!--    DateUtil-->
@@ -39,6 +109,7 @@
     <!--    ProfileFunction-->
     <string name="noprofileselected">Ingen profil vald</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Inga spann stöds som granularitet för basal/bolus i den virtuella pumpen. Endast enkla värden.</string>
     <!--    APSResult-->
     <string name="canceltemp">Avbryt temp basal</string>
     <string name="let_temp_basal_run">Låt temp basalen gå</string>
@@ -91,5 +162,19 @@
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistik</string>
+    <string name="cumulative_tdd">Kumulativ TDD</string>
+    <string name="expweight">Exponentiellt viktad TDD</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Kvot</string>
+    <string name="amount_days">Antal dagar</string>
+    <string name="weight">Vikt</string>
+    <string name="warning_Message">Kan visa fel om man använder bolus för förfyllning!</string>
+    <string name="olddata_Message">Gammalt data. Tryck på Hämta</string>
+    <string name="tbb">Total grundbasal</string>
+    <string name="tbb2">TDB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Tidsdetektering</string>
 </resources>
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
index 3ea04e700d..4d7efc4638 100644
--- a/dana/src/main/res/values-de-rDE/strings.xml
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -1,2 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Koppeln</string>
+    <string name="danars_nodeviceavailable">Pumpe noch nicht gefunden</string>
+    <string name="danars_pairingok">Pairing OK</string>
+    <string name="danars_pairingtimedout">Zeitüberschreitung beim Pairing</string>
+    <string name="danars_waitingforpairing">Auf Verbindung warten</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pumpen-Integration für Dana Diabecare RS Pumpen</string>
+    <string name="maxbolusviolation">Max. Bolus überschritten</string>
+    <string name="commanderror">Fehler bei Befehl</string>
+    <string name="speederror">Geschwindigkeits-Fehler</string>
+    <string name="insulinlimitviolation">Insulin-Beschränkung verletzt</string>
+    <string name="boluserrorcode">Angefragt: %1$.2f IE. Abgegeben: %2$.2f IE. Fehlercode: %3$s</string>
+    <string name="danar_valuenotsetproperly">Wert nicht korrekt gesetzt</string>
+    <string name="danar_setbasalstep001">Setze Basalschritt auf 0.01 IE/h</string>
+    <string name="resetpairing">Pairing zurücksetzen?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtokoll: %3$02X\nCode: %4$02X</string>
+    <string name="processinghistory">Ereignis wird verarbeitet</string>
+    <string name="danar_enableextendedbolus">Aktiviere verzögerten Bolus in der Pumpe.</string>
+    <string name="overview_bolusprogress_delivered">Abgegeben</string>
+    <string name="overview_bolusprogress_stoped">Gestoppt</string>
+    <string name="unsupportedfirmware">Nicht unterstützte Pumpen-Firmware</string>
+    <string name="pumperror">Pumpenfehler</string>
+    <string name="lowbattery">Niedriger Batteriestand</string>
+    <string name="basalcompare">Weniger als voreingestellte Basalrate abgeben</string>
+    <string name="pumpshutdown">Pumpe stoppen</string>
+    <string name="batterydischarged">Pumpenbatterie entladen</string>
+    <string name="occlusion">Verstopfung</string>
+    <string name="emptyreservoir">Reservoir leer</string>
+    <string name="bloodsugarmeasurementalert">Alarm BZ-Messung</string>
+    <string name="remaininsulinalert">Restinsulin</string>
+    <string name="missedbolus">Versäumter Bolus</string>
+    <string name="invalidpairing">Ungültige Pairing-Info. Paire neu.</string>
+    <string name="gettingpumpstatus">Pumpenstatus wird geladen</string>
+    <string name="gettingextendedbolusstatus">Status des verzögerten Bolus wird ermittelt</string>
+    <string name="gettingbolusstatus">Status des Bolus wird ermittelt</string>
+    <string name="gettingtempbasalstatus">Status der TBR wird ermittelt</string>
+    <string name="gettingpumpsettings">Pumpen-Einstellungen werden ermittelt</string>
+    <string name="gettingpumptime">Zeiteinstellung der Pumpe wird ermittelt</string>
+    <string name="largetimedifftitle">Große Zeitdifferenz</string>
+    <string name="largetimediff">Großer Zeitunterschied:\nDie Zeit in der Pumpe weicht um mindestens 1,5 Stunden ab.\nPasse die Zeit auf der Pumpe manuell an und lösche zuvor - falls möglich - die Pumpenhistorie.\nAlternativ kannst Du den Loop für die Stunden der Insulinwirkzeit (DIA) deaktivieren.</string>
+    <string name="pairfirst">Bitte kopple deine Pumpe mit deinem Telefon!</string>
+    <string name="approachingdailylimit">Tagesinsulin-Limit wird bald erreicht</string>
+    <string name="startingbolus">Bolus-Abgabe gestartet</string>
+    <string name="waitingforestimatedbolusend">Warte auf Ende der Bolus-Abgabe. %1$d sec verbleiben.</string>
+    <string name="stoppingtempbasal">TBR wird abgebrochen</string>
+    <string name="settingextendedbolus">Verzögerter Bolus wird gesetzt</string>
+    <string name="stoppingextendedbolus">Verzögerter Bolus wird abgebrochen</string>
+    <string name="updatingbasalrates">Basal-Profil wird aktualisiert</string>
+    <string name="settingtempbasal">TBR wird gesetzt</string>
+    <string name="waitingfortimesynchronization">Warte auf Zeitsynchronisierung (%1$d Sek.)</string>
+    <string name="wrongpassword">Falsches Passwort</string>
+    <string name="wrongpumppassword">Falsches Pumpen-Passwort!</string>
+    <string name="danar_history_alarm">Alarme</string>
+    <string name="danar_history_basalhours">Basal-Stunden</string>
+    <string name="danar_history_bolus">Boli</string>
+    <string name="danar_history_carbohydrates">Kohlenhydrate</string>
+    <string name="danar_history_dailyinsulin">Insulin-Tagesmengen</string>
+    <string name="danar_history_errors">Fehler</string>
+    <string name="danar_history_glucose">Glukose</string>
+    <string name="danar_history_refill">Füllmenge</string>
+    <string name="danar_history_syspend">Unterbrechungen</string>
+    <string name="danar_history_prime">Füllen</string>
+    <string name="danar_useroptions">Benutzerdefinierte Einstellungen</string>
+    <string name="danar_timedisplay">Zeitformat</string>
+    <string name="danar_buttonscroll">Scrollfunktion</string>
+    <string name="danar_beep">Piepen (Tastentöne)</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Töne</string>
+    <string name="danar_pumpalarm_vibrate">Vibration</string>
+    <string name="danar_pumpalarm_both">Beides</string>
+    <string name="danar_screentimeout">LCD-Einschaltdauer [Sek.]</string>
+    <string name="danar_backlight">Einschaltdauer Hintergrundbeleuchtung [Sek.]</string>
+    <string name="danar_glucoseunits">BZ-Einheit</string>
+    <string name="danar_shutdown">Abschalten (Std.)</string>
+    <string name="danar_lowreservoir">Reservoir fast leer (IE)</string>
+    <string name="danar_saveuseroptions">In Pumpe speichern</string>
+    <string name="description_pump_dana_r">Pumpen-Integration für DANA Diabecare R Pumpen</string>
+    <string name="description_pump_dana_r_korean">Pumpen-Integration für koreanische DANA Diabecare R Pumpen</string>
+    <string name="description_pump_dana_r_v2">Pumpen-Integration für DANA Diabecare R Pumpen mit aktualisierter Firmware</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Kein Bluetooth-Adapter gefunden</string>
+    <string name="devicenotfound">Ausgewähltes Gerät nicht gefunden</string>
+    <string name="danar_switchtouhmode">Wechsel den Modus von IE/d zu IE/h in der Pumpe</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pumpen-Treiber korrigiert</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">EasyUI-Modus in der Pumpe deaktivieren</string>
+    <string name="profile_set_failed">Setzen des Basal-Profils fehlgeschlagen</string>
+    <string name="danar_bluetooth_status">Bluetooth-Status</string>
+    <string name="danar_iob_label">Pumpen-IOB</string>
+    <string name="basal_step">Basal-Schritt</string>
+    <string name="bolus_step">Bolus-Schritt</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Dana Pumpen-Einstellungen</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Ein</string>
+    <string name="option_off">Aus</string>
+    <string name="danar_bt_name_title">DanaR Blueetooth--Gerät</string>
+    <string name="danars_password_title">Pumpen-Passwort (nur v1)</string>
+    <string name="danar_password_title">Pumpen-Passwort</string>
+    <string name="danar_useextended_title">Benutze verzögerten Bolus für hohe TBR &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Zeige verzögerten Bolus als %% an.</string>
+    <string name="bolusspeed">Bolus-Geschwindigkeit</string>
+    <string name="selectedpump">Ausgewählte Pumpe</string>
+    <string name="rs_loginsulinchange_title">Reservoirwechsel aufzeichnen</string>
+    <string name="rs_loginsulinchange_summary">Reservoirwechsel im Careportal hinzufügen, falls dies in der Historie gefunden wird.</string>
+    <string name="rs_logcanulachange_title">Kanülenwechsel dokumentieren</string>
+    <string name="rs_logcanulachange_summary">Kanülenwechsel im Careportal hinzufügen, falls dies in der Historie gefunden wird.</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Drücke OK auf der Pumpe\nund gib die beiden angezeigten Ziffernfolgen ein.\nHalte das Pumpendisplay aktiv indem Du den Minus-Button gedrückt hälst, bis Du den Code eingegeben hast.</string>
+    <string name="num1pin">1: (12 Zeichen)</string>
+    <string name="num2pin">2: (8 Zeichen)</string>
+</resources>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 3ea04e700d..7da5f10834 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -1,2 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Appairage</string>
+    <string name="danars_nodeviceavailable">Aucun appareil trouvé pour l\'instant</string>
+    <string name="danars_pairingok">Appairage OK</string>
+    <string name="danars_pairingtimedout">Délai d\'appairage expiré</string>
+    <string name="danars_waitingforpairing">Attente appairage pompe</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Intégration des pompes Diabecare DANA RS</string>
+    <string name="maxbolusviolation">Violation bolus Max</string>
+    <string name="commanderror">Erreur de commande</string>
+    <string name="speederror">Erreur de vitesse</string>
+    <string name="insulinlimitviolation">Violation limite d\'insuline</string>
+    <string name="boluserrorcode">Demandé : %1$.2fU Injecté : %2$.2fU code d’erreur : %3$s</string>
+    <string name="danar_valuenotsetproperly">Valeur incorrecte définie</string>
+    <string name="danar_setbasalstep001">Régler incrément basal à 0,01 U/h</string>
+    <string name="resetpairing">Réinitialiser l\'appairage ?</string>
+    <string name="dana_model">%1$s\nModèle : %2$02X\nProtocole : %3$02X\nCode : %4$02X</string>
+    <string name="processinghistory">Traitement d\'événement</string>
+    <string name="danar_enableextendedbolus">Activer les bolus étendus dans la pompe</string>
+    <string name="overview_bolusprogress_delivered">Injecté</string>
+    <string name="overview_bolusprogress_stoped">Arrêté</string>
+    <string name="unsupportedfirmware">Firmware pompe incompatible </string>
+    <string name="pumperror">Erreur Pompe</string>
+    <string name="lowbattery">Piles Faibles</string>
+    <string name="basalcompare">Injection inférieure au débit de basal</string>
+    <string name="pumpshutdown">Arrêt de la Pompe</string>
+    <string name="batterydischarged">Batterie Pompe Déchargée</string>
+    <string name="occlusion">Occlusion</string>
+    <string name="emptyreservoir">Réservoir vide</string>
+    <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
+    <string name="remaininsulinalert">Niveau d\'insuline restant</string>
+    <string name="missedbolus">Bolus manqués</string>
+    <string name="invalidpairing">Appairage invalide. Demande de nouvel appairage</string>
+    <string name="gettingpumpstatus">Obtenir l\'état de pompe</string>
+    <string name="gettingextendedbolusstatus">Obtenir l\'état du bolus étendu</string>
+    <string name="gettingbolusstatus">Obtenir l\'état du bolus</string>
+    <string name="gettingtempbasalstatus">Obtenir l\'état du basal temporaire</string>
+    <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
+    <string name="gettingpumptime">Obtenir l\'heure de la pompe</string>
+    <string name="largetimedifftitle">Différence horaire importante</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
+    <string name="pairfirst">Veuillez appairer votre pompe avec votre téléphone !</string>
+    <string name="approachingdailylimit">Limite quotidienne d\'insuline proche</string>
+    <string name="startingbolus">Injection du bolus démarrée</string>
+    <string name="waitingforestimatedbolusend">Bolus en cours. %1$d sec. restantes.</string>
+    <string name="stoppingtempbasal">Arrêter basal temp</string>
+    <string name="settingextendedbolus">Définir bolus étendu</string>
+    <string name="stoppingextendedbolus">Arrêter bolus étendu</string>
+    <string name="updatingbasalrates">Mise à jour des débits basal</string>
+    <string name="settingtempbasal">Définir basal temp</string>
+    <string name="waitingfortimesynchronization">Attente de synchronisation de l\'heure (%1$d sec)</string>
+    <string name="wrongpassword">Mot de passe incorrect</string>
+    <string name="wrongpumppassword">Mot de passe pompe incorrect !</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Heures Basal</string>
+    <string name="danar_history_bolus">Bolus</string>
+    <string name="danar_history_carbohydrates">Glucides</string>
+    <string name="danar_history_dailyinsulin">Insuline quotidienne</string>
+    <string name="danar_history_errors">Erreurs</string>
+    <string name="danar_history_glucose">Glycémie</string>
+    <string name="danar_history_refill">Remplir</string>
+    <string name="danar_history_syspend">Arrêter</string>
+    <string name="danar_history_prime">Amorcer</string>
+    <string name="danar_useroptions">Options utilisateur</string>
+    <string name="danar_timedisplay">Format d\'affichage de l\'heure</string>
+    <string name="danar_buttonscroll">Bouton défiler</string>
+    <string name="danar_beep">Bip sur appui bouton</string>
+    <string name="danar_pumpalarm">Alarme</string>
+    <string name="danar_pumpalarm_sound">Son</string>
+    <string name="danar_pumpalarm_vibrate">Vibration</string>
+    <string name="danar_pumpalarm_both">Les deux</string>
+    <string name="danar_screentimeout">Durée affichage LCD [secondes]</string>
+    <string name="danar_backlight">Rétro-éclairage [secondes]</string>
+    <string name="danar_glucoseunits">Unités glycémie</string>
+    <string name="danar_shutdown">Éteindre [heures]</string>
+    <string name="danar_lowreservoir">Réservoir faible [Unités]</string>
+    <string name="danar_saveuseroptions">Enregistrer les options sur la pompe</string>
+    <string name="description_pump_dana_r">Intégration des pompes Diabecare DANA R</string>
+    <string name="description_pump_dana_r_korean">Intégration des pompes coréennes Diabecare DANA RS</string>
+    <string name="description_pump_dana_r_v2">Intégration des pompes DANA Diabecare R avec firmware mis à jour</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Adaptateur bluetooth introuvable</string>
+    <string name="devicenotfound">Appareil sélectionné introuvable</string>
+    <string name="danar_switchtouhmode">Changer le mode de U/j vers U/h sur la pompe</string>
+    <string name="danarkoreanpump">DanaR Coréenne</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pilote pompe corrigé</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Désactiver le mode FacileUI (EasyUI) de la pompe</string>
+    <string name="profile_set_failed">Echec Paramétrage Profil Basal</string>
+    <string name="danar_bluetooth_status">État Bluetooth</string>
+    <string name="danar_iob_label">IA pompe</string>
+    <string name="basal_step">Incrément Basal</string>
+    <string name="bolus_step">Incrément Bolus</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Paramètres pompe Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Activé</string>
+    <string name="option_off">Désactivé</string>
+    <string name="danar_bt_name_title">Dispositif Bluetooth DanaR</string>
+    <string name="danars_password_title">Mot de passe pompe (v1 uniquement)</string>
+    <string name="danar_password_title">Mot de passe pompe</string>
+    <string name="danar_useextended_title">Utiliser les bolus étendus pour &gt; 200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Afficher le bolus étendu en %%</string>
+    <string name="bolusspeed">Vitesse bolus</string>
+    <string name="selectedpump">Pompe sélectionnée</string>
+    <string name="rs_loginsulinchange_title">Enreg. changement de réservoir</string>
+    <string name="rs_loginsulinchange_summary">Ajouter un évènement \"Changement d\'Insuline\" dans careportal si détecté dans l\'historique</string>
+    <string name="rs_logcanulachange_title">Enreg. changement de site</string>
+    <string name="rs_logcanulachange_summary">Ajouter l\'évènement \"Changement de Site\" dans careportal si détecté dans l\'historique</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Appuyez sur OK sur la pompe\net entrez les 2 numéros affichés\nConserver l\'affichage ACTIF sur la pompe en appuyant sur le bouton &lt;b&gt;moins&lt;b&gt; jusqu\'à ce que le code soit entré.</string>
+    <string name="num1pin">1: (12 chiffres)</string>
+    <string name="num2pin">2: (8 chiffres)</string>
+</resources>
diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/dana/src/main/res/values-it-rIT/strings.xml
index 3ea04e700d..3ffadabd3b 100644
--- a/dana/src/main/res/values-it-rIT/strings.xml
+++ b/dana/src/main/res/values-it-rIT/strings.xml
@@ -1,2 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Associazione</string>
+    <string name="danars_nodeviceavailable">Nessun dispositivo trovato finora</string>
+    <string name="danars_pairingok">Associazione OK</string>
+    <string name="danars_pairingtimedout">Time out associazione</string>
+    <string name="danars_waitingforpairing">In attesa di associare il micro</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integrazione del microinfusore DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Violazione bolo massimo</string>
+    <string name="commanderror">Errore comando</string>
+    <string name="speederror">Errore velocità</string>
+    <string name="insulinlimitviolation">Violazione limite insulina</string>
+    <string name="boluserrorcode">Chiesto: %1$.2fU Erogato: %2$.2fU Codice errore: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valore non impostato correttamente</string>
+    <string name="danar_setbasalstep001">Imposta incremento basale a 0.01 U/h</string>
+    <string name="resetpairing">Resettare le informazioni di associazione?</string>
+    <string name="dana_model">%1$s\nModello: %2$02X\nProtocollo: %3$02X\nCodice: %4$02X</string>
+    <string name="processinghistory">Elaborazione</string>
+    <string name="danar_enableextendedbolus">Abilita bolo esteso sul micro</string>
+    <string name="overview_bolusprogress_delivered">Erogato</string>
+    <string name="overview_bolusprogress_stoped">Stoppato</string>
+    <string name="unsupportedfirmware">Firmware del micro non supportato</string>
+    <string name="pumperror">Errore micro</string>
+    <string name="lowbattery">Livello batteria basso</string>
+    <string name="basalcompare">Erogazione di una velocità basale inferiore rispetto alla preimpostata</string>
+    <string name="pumpshutdown">Arresto micro</string>
+    <string name="batterydischarged">Batteria del micro scarica</string>
+    <string name="occlusion">Occlusione</string>
+    <string name="emptyreservoir">Serbatoio vuoto</string>
+    <string name="bloodsugarmeasurementalert">Avviso misurazione glicemia</string>
+    <string name="remaininsulinalert">Livello insulina rimanente</string>
+    <string name="missedbolus">Bolo perso</string>
+    <string name="invalidpairing">Informazioni associazione non valide. Richiesta nuova associazione</string>
+    <string name="gettingpumpstatus">Ricezione stato micro</string>
+    <string name="gettingextendedbolusstatus">Ricezione stato bolo esteso</string>
+    <string name="gettingbolusstatus">Ricezione stato bolo</string>
+    <string name="gettingtempbasalstatus">Ricezione stato basale temporanea</string>
+    <string name="gettingpumpsettings">Ricezione impostazioni micro</string>
+    <string name="gettingpumptime">Ricezione ora micro</string>
+    <string name="largetimedifftitle">Grande differenza oraria</string>
+    <string name="largetimediff">Grande differenza oraria:\nL\'ora nel micro differisce per più di 1h e 30m. \nRegola l\'ora manualmente e assicurati che la lettura dello storico dal micro non causi comportamenti imprevisti.\nSe possibile, cancella lo storico del micro prima di cambiare l\'ora oppure disabilita il loop chiuso per un tempo corrispondente al tuo valore DIA.</string>
+    <string name="pairfirst">Associa il micro con il tuo telefono!</string>
+    <string name="approachingdailylimit">Si avvicina il limite giornaliero di insulina</string>
+    <string name="startingbolus">Avvio erogazione bolo</string>
+    <string name="waitingforestimatedbolusend">Attesa per la fine del bolo. Rimangono %1$d sec.</string>
+    <string name="stoppingtempbasal">Stop basale temporanea</string>
+    <string name="settingextendedbolus">Impostazione bolo esteso</string>
+    <string name="stoppingextendedbolus">Stop bolo esteso</string>
+    <string name="updatingbasalrates">Aggiornamento velocità basali</string>
+    <string name="settingtempbasal">Impostazione basale temporanea</string>
+    <string name="waitingfortimesynchronization">In attesa della sincronizzazione dell\'ora (%1$d sec)</string>
+    <string name="wrongpassword">Password errata</string>
+    <string name="wrongpumppassword">Password micro errata!</string>
+    <string name="danar_history_alarm">Allarmi</string>
+    <string name="danar_history_basalhours">Ore basali</string>
+    <string name="danar_history_bolus">Boli</string>
+    <string name="danar_history_carbohydrates">Carboidrati</string>
+    <string name="danar_history_dailyinsulin">Insulina giornaliera</string>
+    <string name="danar_history_errors">Errori</string>
+    <string name="danar_history_glucose">Glicemia</string>
+    <string name="danar_history_refill">Riempimento</string>
+    <string name="danar_history_syspend">Sospensione</string>
+    <string name="danar_history_prime">Caricamento</string>
+    <string name="danar_useroptions">Opzioni utente</string>
+    <string name="danar_timedisplay">Formato dell\'ora</string>
+    <string name="danar_buttonscroll">Scorrimento (tasto)</string>
+    <string name="danar_beep">Suono alla pressione del tasto</string>
+    <string name="danar_pumpalarm">Allarme</string>
+    <string name="danar_pumpalarm_sound">Suono</string>
+    <string name="danar_pumpalarm_vibrate">Vibrazione</string>
+    <string name="danar_pumpalarm_both">Entrambi</string>
+    <string name="danar_screentimeout">LCD attivo [seconds]</string>
+    <string name="danar_backlight">Retroilluminazione attiva [seconds]</string>
+    <string name="danar_glucoseunits">Unità glicemia</string>
+    <string name="danar_shutdown">Arresto [hours]</string>
+    <string name="danar_lowreservoir">Livello serbatoio basso [Units]</string>
+    <string name="danar_saveuseroptions">Salva opzioni nel micro</string>
+    <string name="description_pump_dana_r">Integrazione del microinfusore DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Integrazione del microinfusore DANA Diabecare R Korean</string>
+    <string name="description_pump_dana_r_v2">Integrazione del microinfusore DANA Diabecare R con firmware aggiornato</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nessun adattatore bluetooth trovato</string>
+    <string name="devicenotfound">Dispositivo selezionato non trovato</string>
+    <string name="danar_switchtouhmode">Cambia modalità da U/d a U/h sul micro</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Driver del micro corretto</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Disabilita modalità EasyUI nel micro</string>
+    <string name="profile_set_failed">Impostazione profilo basale fallita</string>
+    <string name="danar_bluetooth_status">Stato bluetooth</string>
+    <string name="danar_iob_label">IOB micro</string>
+    <string name="basal_step">Incremento basale</string>
+    <string name="bolus_step">Incremento bolo</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Impostazioni micro Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">On</string>
+    <string name="option_off">Off</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danars_password_title">Password micro (solo v1)</string>
+    <string name="danar_password_title">Password micro</string>
+    <string name="danar_useextended_title">Usa boli estesi per &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizza bolo esteso come %%</string>
+    <string name="bolusspeed">Velocità bolo</string>
+    <string name="selectedpump">Micro selezionato</string>
+    <string name="rs_loginsulinchange_title">Registra cambio serbatorio</string>
+    <string name="rs_loginsulinchange_summary">Aggiungi evento \"cambio insulina\" al portale quando rilevato nello storico</string>
+    <string name="rs_logcanulachange_title">Registra cambio cannula</string>
+    <string name="rs_logcanulachange_summary">Aggiungi evento \"cambio posizione\" al portale quando rilevato nello storico</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Premi OK sul micro\ne inserisci i 2 numeri visualizzati\nMantieni acceso il display del micro premendo il tasto col simbolo del meno sino a che non hai finito di inserire il codice.</string>
+    <string name="num1pin">1: (12 cifre)</string>
+    <string name="num2pin">2: (8 cifre)</string>
+</resources>
diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/dana/src/main/res/values-pt-rPT/strings.xml
index 445b5cfe64..d641178465 100644
--- a/dana/src/main/res/values-pt-rPT/strings.xml
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@@ -12,9 +12,11 @@
     <string name="commanderror">Erro no comando</string>
     <string name="speederror">Erro velocidade</string>
     <string name="insulinlimitviolation">Transgressão limite insulina</string>
-    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
+    <string name="boluserrorcode">Pedido: %1$.2fU Administrado: %2$.2fU Código Erro: %3$s</string>
     <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
     <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
+    <string name="resetpairing">Repor as informações de emparelhamento?</string>
+    <string name="dana_model">%1$s\nModelo: %2$02X\nProtocolo: %3$02X\nCódigo: %4$02X</string>
     <string name="processinghistory">A processar acção</string>
     <string name="danar_enableextendedbolus">Habilitar bólus prolongado na bomba</string>
     <string name="overview_bolusprogress_delivered">Administrado</string>
@@ -22,6 +24,7 @@
     <string name="unsupportedfirmware">Firmware bomba não suportado</string>
     <string name="pumperror">Erro Bomba</string>
     <string name="lowbattery">Bateria fraca</string>
+    <string name="basalcompare">A administrar menos que a taxa de base predefinida</string>
     <string name="pumpshutdown">Encerrar Bomba</string>
     <string name="batterydischarged">Bateria da Bomba Descarregada</string>
     <string name="occlusion">Oclusão</string>
@@ -29,6 +32,7 @@
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
     <string name="remaininsulinalert">Nível de insulina restante</string>
     <string name="missedbolus">Bólus não administrado</string>
+    <string name="invalidpairing">Informações de emparelhamento inválidas. A solicitar novo emparelhamento</string>
     <string name="gettingpumpstatus">A obter estado bomba</string>
     <string name="gettingextendedbolusstatus">A procurar o estado do bólus prolongado</string>
     <string name="gettingbolusstatus">A obter estado bólus</string>
@@ -39,7 +43,7 @@
     <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
     <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="approachingdailylimit">Aproximação do limite diário de insulina</string>
-    <string name="startingbolus">A iniciar administração de bolus</string>
+    <string name="startingbolus">A iniciar administração de bólus</string>
     <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d seg.</string>
     <string name="stoppingtempbasal">A parar basal temp</string>
     <string name="settingextendedbolus">A configurar bólus prolongado</string>
@@ -61,6 +65,55 @@
     <string name="danar_history_prime">Purgar</string>
     <string name="danar_useroptions">Opções do utilizador</string>
     <string name="danar_timedisplay">Formato hora</string>
+    <string name="danar_buttonscroll">Botão rolamento</string>
+    <string name="danar_beep">Sinal ao pressionar botão</string>
+    <string name="danar_pumpalarm">Alarme</string>
+    <string name="danar_pumpalarm_sound">Som</string>
+    <string name="danar_pumpalarm_vibrate">Vibrar</string>
+    <string name="danar_pumpalarm_both">Ambos</string>
+    <string name="danar_screentimeout">LCD na hora [segundos]</string>
+    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
+    <string name="danar_glucoseunits">Unidades de Glicose</string>
+    <string name="danar_shutdown">Desligar [horas]</string>
+    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
+    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
+    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
+    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware actualizado</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
+    <string name="devicenotfound">Dispositivo seleccionado não foi encontrado</string>
+    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
+    <string name="danarkoreanpump">DanaR Coreana</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Desactivar modo EasyUI na bomba</string>
+    <string name="profile_set_failed">Não foi possível configurar o perfil de basal</string>
+    <string name="danar_bluetooth_status">Estado Bluetooth</string>
+    <string name="danar_iob_label">IOB Bomba</string>
+    <string name="basal_step">Incremento Basal</string>
+    <string name="bolus_step">Incremento Bólus</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Ligado</string>
+    <string name="option_off">Desligado</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danars_password_title">Senha da bomba (apenas v1)</string>
+    <string name="danar_password_title">Senha da bomba</string>
     <string name="danar_useextended_title">Usar bólus prolongado por &gt;200%%</string>
     <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
+    <string name="bolusspeed">Velocidade Bólus</string>
+    <string name="selectedpump">Bomba seleccionada</string>
+    <string name="rs_loginsulinchange_title">Registar mudança de reservatório</string>
+    <string name="rs_loginsulinchange_summary">Adicionar evento \"Mudança de Insulina\" ao careportal quando detectado no histórico</string>
+    <string name="rs_logcanulachange_title">Registar mudança de canula</string>
+    <string name="rs_logcanulachange_summary">Adicionar evento \"Mudança Local Bomba\" ao careportal, quando detectado no histórico</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Pressione OK na bomba\ne digite os 2 números mostrados\nManter o visor da bomba ligado, pressionando o botão menos até que você termine a digitação do código.</string>
+    <string name="num1pin">1: (12 dígitos)</string>
+    <string name="num2pin">2: (8 dígitos)</string>
 </resources>
diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/dana/src/main/res/values-sk-rSK/strings.xml
index 3ea04e700d..c7cd8251bb 100644
--- a/dana/src/main/res/values-sk-rSK/strings.xml
+++ b/dana/src/main/res/values-sk-rSK/strings.xml
@@ -1,2 +1,119 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Párovanie</string>
+    <string name="danars_nodeviceavailable">Zatiaľ nenájdené žiadne zariadenie</string>
+    <string name="danars_pairingok">Spárované</string>
+    <string name="danars_pairingtimedout">Vypršal časový limit pre párovanie</string>
+    <string name="danars_waitingforpairing">Čakanie na párovanie na pumpe</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Ovládač pumpy pre Dana Diabecare RS</string>
+    <string name="maxbolusviolation">Prekročený maximálny bolus</string>
+    <string name="commanderror">Chyba príkazu</string>
+    <string name="speederror">Chyba rýchlosti</string>
+    <string name="insulinlimitviolation">Prekročený limit inzulínu</string>
+    <string name="boluserrorcode">Požadované: %1$.2fJI Podané: %2$.2fJI Chyba: %3$s</string>
+    <string name="danar_valuenotsetproperly">Hodnota nenastavená správne</string>
+    <string name="danar_setbasalstep001">Nastavte bazálny krok 0.01JI/h</string>
+    <string name="resetpairing">Reset informácií o párovaní?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtokol: %3$02X\nKód: %4$02X</string>
+    <string name="processinghistory">Spracúvam udalosť</string>
+    <string name="danar_enableextendedbolus">Aktivovať v pumpe predĺžené bolusy</string>
+    <string name="overview_bolusprogress_delivered">Podané</string>
+    <string name="overview_bolusprogress_stoped">Zastavené</string>
+    <string name="unsupportedfirmware">Nepodporovaný firmware v pumpe</string>
+    <string name="pumperror">Chyba pumpy</string>
+    <string name="lowbattery">Nízky stav batérie</string>
+    <string name="basalcompare">Dodávám menej, ako je prednastavený bazál</string>
+    <string name="pumpshutdown">Vypnutie pumpy</string>
+    <string name="batterydischarged">Batéria v pumpe vybitá</string>
+    <string name="occlusion">Oklúzia</string>
+    <string name="emptyreservoir">Prázdny zásobník</string>
+    <string name="bloodsugarmeasurementalert">Výstraha merania glykémie</string>
+    <string name="remaininsulinalert">Zostávajúci inzulín</string>
+    <string name="missedbolus">Chýbajúci bolus</string>
+    <string name="invalidpairing">Neplatné informácie o párovaní. Požiadavka na nové párovanie</string>
+    <string name="gettingpumpstatus">Načítavam stav pumpy</string>
+    <string name="gettingextendedbolusstatus">Získavam stav predĺžených bolusov</string>
+    <string name="gettingbolusstatus">Získavam stav bolusov</string>
+    <string name="gettingtempbasalstatus">Získavam stav dočasných bazálov</string>
+    <string name="gettingpumpsettings">Získavam nastavenia pumpy</string>
+    <string name="gettingpumptime">Získavam čas z pumpy</string>
+    <string name="largetimedifftitle">Veľký rozdiel v čase</string>
+    <string name="largetimediff">Veľký rozdiel v čase:\nČas v pumpe sa líši minimálne o 1,5 h.\nProsím upravte čas v pumpe manuálne a vymažte históriu pumpy.\nPokiaľ je to potrebné, prípadne pozastavte uzavretý okruh aspoň na \"DIA\" hodín.</string>
+    <string name="pairfirst">Prosím spárujte pumpu s telefónom!</string>
+    <string name="approachingdailylimit">Blíži sa denný limit inzulínu</string>
+    <string name="startingbolus">Spúšťam podávanie bolusu</string>
+    <string name="waitingforestimatedbolusend">Čakanie na koniec bolusu. Zostáva %1$d sek.</string>
+    <string name="stoppingtempbasal">Zastavujem dočasný bazál</string>
+    <string name="settingextendedbolus">Nastavujem predĺžený bolus</string>
+    <string name="stoppingextendedbolus">Zastavujem predĺžený bolus</string>
+    <string name="updatingbasalrates">Aktualizujem bazály</string>
+    <string name="settingtempbasal">Nastavujem dočasný bazál</string>
+    <string name="waitingfortimesynchronization">Čakanie na synchronizáciu času (%1$d s)</string>
+    <string name="wrongpassword">Nesprávne heslo</string>
+    <string name="wrongpumppassword">Nesprávne heslo do pumpy!</string>
+    <string name="danar_history_alarm">Alarmy</string>
+    <string name="danar_history_basalhours">Hodinové bazály</string>
+    <string name="danar_history_bolus">Bolusy</string>
+    <string name="danar_history_carbohydrates">Sacharidy</string>
+    <string name="danar_history_dailyinsulin">Denný inzulín</string>
+    <string name="danar_history_errors">Chyby</string>
+    <string name="danar_history_glucose">Glykémia</string>
+    <string name="danar_history_refill">Plnenie</string>
+    <string name="danar_history_syspend">Pozastavenia</string>
+    <string name="danar_history_prime">Plnenie</string>
+    <string name="danar_useroptions">Užívateľské nastavenia</string>
+    <string name="danar_timedisplay">Formát času</string>
+    <string name="danar_buttonscroll">Posun pri stlačení tlačidla</string>
+    <string name="danar_beep">Zvuk pri stlačení tlačidla</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Zvuk</string>
+    <string name="danar_pumpalarm_vibrate">Vibrácie</string>
+    <string name="danar_pumpalarm_both">Oboje</string>
+    <string name="danar_screentimeout">Čas pred vypnutím displeja [sekundy]</string>
+    <string name="danar_backlight">Podsvietenie [sekundy]</string>
+    <string name="danar_glucoseunits">Jednotky</string>
+    <string name="danar_shutdown">Vypnutie [hodiny]</string>
+    <string name="danar_lowreservoir">Nízky stav zásobníka [Jednotky]</string>
+    <string name="danar_saveuseroptions">Uložiť do pumpy</string>
+    <string name="description_pump_dana_r">Ovládač pumpy pre Dana Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Ovládač pumpy pre kórejskú verziu Dana Diabecare R</string>
+    <string name="description_pump_dana_r_v2">Ovládač pumpy pre Dana Diabecare R s aktualizovaným firmvérom</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Bluetooth adaptér nenájdený</string>
+    <string name="devicenotfound">Vybrané zariadenie nenájdené</string>
+    <string name="danar_switchtouhmode">Zmeniť v pumpe režim z JI/d na JI/h</string>
+    <string name="danarkoreanpump">Kórejská DanaR</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Ovládač pumpy opravený</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Deaktivovať v pumpe režim EasyUI</string>
+    <string name="profile_set_failed">Nastavenie bazálneho profilu zlyhalo</string>
+    <string name="danar_bluetooth_status">Stav Bluetooth</string>
+    <string name="danar_iob_label">IOB z pumpy</string>
+    <string name="basal_step">Krok bazálu</string>
+    <string name="bolus_step">Krok bolusu</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Nastavenie pumpy Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">ZAP</string>
+    <string name="option_off">VYP</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth zariadenie</string>
+    <string name="danars_password_title">Heslo pumpy (iba v1)</string>
+    <string name="danar_password_title">Heslo do pumpy</string>
+    <string name="danar_useextended_title">Použiť predĺžené bolusy pre &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Zobrazovať predĺžený bolus v %%</string>
+    <string name="bolusspeed">Rýchlosť bolusu</string>
+    <string name="selectedpump">Vybraná pumpa</string>
+    <string name="rs_loginsulinchange_title">Zaznamenať výmenu zásobníka</string>
+    <string name="rs_loginsulinchange_summary">Pridať udalosť \"Výmena inzulínu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="rs_logcanulachange_title">Zaznamenať výmenu kanyly</string>
+    <string name="rs_logcanulachange_summary">Pridať udalosť \"Výmena setu\" do portálu starostlivosti, pokiaľ je zistená v histórii</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Stlačte OK na pumpe\na zadajte 2 zobrazené čísla\nUdržujte display na pumpe zapnutý stlačením tlačítka mínus, kým nedokončíte zadanie kódu.</string>
+    <string name="num1pin">1: (12 číslic)</string>
+    <string name="num2pin">2: (8 číslic)</string>
+</resources>
diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/dana/src/main/res/values-sv-rSE/strings.xml
index 3ea04e700d..0edf825c1d 100644
--- a/dana/src/main/res/values-sv-rSE/strings.xml
+++ b/dana/src/main/res/values-sv-rSE/strings.xml
@@ -1,2 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Parkoppling</string>
+    <string name="danars_nodeviceavailable">Ingen enhet funnen ännu</string>
+    <string name="danars_pairingok">Parkopplingen klar</string>
+    <string name="danars_pairingtimedout">Parkopplingen tog för lång tid</string>
+    <string name="danars_waitingforpairing">Väntar på parkoppling med pump</string>
+    <string name="danarspump">Dana RS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pumpintegration för DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Max bolus nådd</string>
+    <string name="commanderror">Kommandofel</string>
+    <string name="speederror">Felaktig hastighet</string>
+    <string name="insulinlimitviolation">Insulingräns nådd</string>
+    <string name="boluserrorcode">Angivet: %1$.2f enheter. Levererat: %2$.2f enheter. Felkod: %3$s</string>
+    <string name="danar_valuenotsetproperly">Misslyckades med inställning</string>
+    <string name="danar_setbasalstep001">Sätt basalsteg till 0.01 enheter per timme</string>
+    <string name="resetpairing">Återställ parkopplingen?</string>
+    <string name="dana_model">%1$s\nModell: %2$02X\nProtokoll: %3$02X\nKod: %4$02X</string>
+    <string name="processinghistory">Behandlar</string>
+    <string name="danar_enableextendedbolus">Aktivera förlängd bolus i pumpen</string>
+    <string name="overview_bolusprogress_delivered">Levererad</string>
+    <string name="overview_bolusprogress_stoped">Stoppad</string>
+    <string name="unsupportedfirmware">Pumpens firmware stöds inte</string>
+    <string name="pumperror">Pumpfel</string>
+    <string name="lowbattery">Låg batterinivå</string>
+    <string name="basalcompare">Levererar mindre än inställd basaldos</string>
+    <string name="pumpshutdown">Pump avstängd</string>
+    <string name="batterydischarged">Pumpbatteri urladdat</string>
+    <string name="occlusion">Ocklusion</string>
+    <string name="emptyreservoir">Tom reservoar</string>
+    <string name="bloodsugarmeasurementalert">Varning om blodsockermätning</string>
+    <string name="remaininsulinalert">Återstående mängd insulin </string>
+    <string name="missedbolus">Missad bolus</string>
+    <string name="invalidpairing">Ogiltig parkopplingsinformation. Begär ny parkoppling</string>
+    <string name="gettingpumpstatus">Hämtar pumpstatus</string>
+    <string name="gettingextendedbolusstatus">Hämtar status för förlängd bolus</string>
+    <string name="gettingbolusstatus">Hämtar status för bolus</string>
+    <string name="gettingtempbasalstatus">Hämtar status för temp basal</string>
+    <string name="gettingpumpsettings">Hämtar pumpinställningar</string>
+    <string name="gettingpumptime">Hämtar tid och datum i pumpen</string>
+    <string name="largetimedifftitle">Stor tidsskillnad</string>
+    <string name="largetimediff">Stor tidsskillnad:\nTiden i pumpen skiljer mer än 1,5 timme.\nVänligen justera tiden manuellt på pumpen och se till att det går att läsa historiken från pumpen utan oväntat beteende.\nOm möjligt, töm historiken i pumpen innan tidsomställning alternativt stäng av loopen i minst DIA timmar efter den senaste felaktiga historikloggen, men minst DIA timmar från nu.</string>
+    <string name="pairfirst">Vänligen parkoppla pumpen.</string>
+    <string name="approachingdailylimit">Maximal daglig dos snart nådd</string>
+    <string name="startingbolus">Påbörjar bolus</string>
+    <string name="waitingforestimatedbolusend">Slutför bolus (%1$d sek)</string>
+    <string name="stoppingtempbasal">Stoppar temp basal</string>
+    <string name="settingextendedbolus">Ställer in förlängd bolus</string>
+    <string name="stoppingextendedbolus">Stoppar förlängd bolus</string>
+    <string name="updatingbasalrates">Uppdaterar basaldoser</string>
+    <string name="settingtempbasal">Ställer in temp basal</string>
+    <string name="waitingfortimesynchronization">Väntar på tidssynkronisering (%1$d sek)</string>
+    <string name="wrongpassword">Fel lösenord</string>
+    <string name="wrongpumppassword">Fel lösenord för pump</string>
+    <string name="danar_history_alarm">Larm</string>
+    <string name="danar_history_basalhours">Basaltimmar</string>
+    <string name="danar_history_bolus">Bolusar</string>
+    <string name="danar_history_carbohydrates">Kolhydrater</string>
+    <string name="danar_history_dailyinsulin">Daglig insulinmängd</string>
+    <string name="danar_history_errors">Fel</string>
+    <string name="danar_history_glucose">BG</string>
+    <string name="danar_history_refill">Påfyllningar</string>
+    <string name="danar_history_syspend">Pauser</string>
+    <string name="danar_history_prime">Förfyllningar</string>
+    <string name="danar_useroptions">Användaralternativ</string>
+    <string name="danar_timedisplay">Format för tidsvisning</string>
+    <string name="danar_buttonscroll">Knapprullning</string>
+    <string name="danar_beep">Pip vid knapptryckning</string>
+    <string name="danar_pumpalarm">Larm</string>
+    <string name="danar_pumpalarm_sound">Ljud</string>
+    <string name="danar_pumpalarm_vibrate">Vibration</string>
+    <string name="danar_pumpalarm_both">Båda</string>
+    <string name="danar_screentimeout">LCD på, tid [sek]</string>
+    <string name="danar_backlight">Bakgrundsbelysning på, tid [sek]</string>
+    <string name="danar_glucoseunits">Glukosenhet</string>
+    <string name="danar_shutdown">Avstängning pump [tim]</string>
+    <string name="danar_lowreservoir">Låg reservoar [Enheter]</string>
+    <string name="danar_saveuseroptions">Spara till pump</string>
+    <string name="description_pump_dana_r">Pumpintegration för DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Pumpintegration för DANA Diabecare R, koreansk version</string>
+    <string name="description_pump_dana_r_v2">Pumpintegration för DANA Diabecare R med uppgraderad firmware</string>
+    <string name="danarpump_shortname">Dana</string>
+    <string name="nobtadapter">Ingen Bluetooth-adapter funnen</string>
+    <string name="devicenotfound">Vald enhet kan inte nås</string>
+    <string name="danar_switchtouhmode">Ändra inställningen från U/d till U/tim i pumpen</string>
+    <string name="danarkoreanpump">Dana R Korea</string>
+    <string name="danarpump">Dana R</string>
+    <string name="pumpdrivercorrected">Pumpdrivrutin justerad</string>
+    <string name="danarv2pump">Dana R v2</string>
+    <string name="danar_disableeasymode">Inaktivera Easy UI-läget i pumpen</string>
+    <string name="profile_set_failed">Lyckades inte sätta basalprofilen</string>
+    <string name="danar_bluetooth_status">Bluetoothstatus</string>
+    <string name="danar_iob_label">Pumpens IOB</string>
+    <string name="basal_step">Basalsteg</string>
+    <string name="bolus_step">Bolussteg</string>
+    <string name="virtualpump_firmware_label">Firmwareversion</string>
+    <string name="danar_pump_settings">Dana R pumpinställningar</string>
+    <string name="timeformat12h">12 tim</string>
+    <string name="timeformat24h">24 tim</string>
+    <string name="option_on">På</string>
+    <string name="option_off">Av</string>
+    <string name="danar_bt_name_title">Dana R Bluetooth Pump</string>
+    <string name="danars_password_title">Pumplösenord (endast v1)</string>
+    <string name="danar_password_title">Pumplösenord</string>
+    <string name="danar_useextended_title">Använd förlängd bolus för &gt;200%% temp basal</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visa förlängd bolus som %%</string>
+    <string name="bolusspeed">Bolushastighet</string>
+    <string name="selectedpump">Vald pump</string>
+    <string name="rs_loginsulinchange_title">Logga reservoarbyten</string>
+    <string name="rs_loginsulinchange_summary">Logga reservoarbyte automatiskt när det upptäcks i historiken</string>
+    <string name="rs_logcanulachange_title">Logga kanylbyten</string>
+    <string name="rs_logcanulachange_summary">Logga kanylbyte automatiskt när det upptäcks i historiken</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Tryck på OK på pumpen och skriv in de två\nnycklarna som visas på pumpens skärm.\n
+\nFör att förhindra att skärmen släcks, tryck\npå minus (-) tills du skrivit in nycklarna.</string>
+    <string name="num1pin">1: (12 tecken)</string>
+    <string name="num2pin">2: (8 tecken)</string>
+</resources>

From 47725ad5d56f66a446eb3d4512483289ee251b9a Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 14 May 2020 12:42:33 +0200
Subject: [PATCH 096/400] Sensitivity Icon (50% alpha if autosens disable)

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt   | 4 ++++
 app/src/main/res/layout/overview_info_layout.xml              | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 227f426da9..b3703d2557 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -757,6 +757,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_uploader?.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
 
         // Sensitivity
+        if(sp.getBoolean(R.string.key_openapsama_useautosens, false))
+            overview_sensitivity_icon?.alpha=1F
+        else
+            overview_sensitivity_icon?.alpha=0.5F
         overview_sensitivity?.text =
             iobCobCalculatorPlugin.getLastAutosensData("Overview")?.let { autosensData ->
                 String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 9f2cdd8c2f..1a2142dbbe 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -222,6 +222,7 @@
         app:layout_constraintTop_toBottomOf="@+id/overview_bg">
 
         <ImageView
+            android:id="@+id/overview_sensitivity_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"

From 66c2bab60f38505f444a39ee2f93fc6723e62e9e Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 14 May 2020 14:39:27 +0200
Subject: [PATCH 097/400] Sensitivity Icon end proposal with a new icon Svg
 file added in icons folder

---
 .../plugins/general/overview/OverviewFragment.kt     | 10 ++++++----
 .../main/res/drawable/ic_x_swap_vert_48px_green.xml  | 10 ++++++++++
 icons/x_swap_vert.svg                                | 12 ++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
 create mode 100644 icons/x_swap_vert.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index b3703d2557..0b4f66be01 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -757,10 +757,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_uploader?.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
 
         // Sensitivity
-        if(sp.getBoolean(R.string.key_openapsama_useautosens, false))
-            overview_sensitivity_icon?.alpha=1F
-        else
-            overview_sensitivity_icon?.alpha=0.5F
+        if (sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
+            overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
+        }else {
+            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green)
+        }
+
         overview_sensitivity?.text =
             iobCobCalculatorPlugin.getLastAutosensData("Overview")?.let { autosensData ->
                 String.format(Locale.ENGLISH, "%.0f%%", autosensData.autosensResult.ratio * 100)
diff --git a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
new file mode 100644
index 0000000000..b094d56057
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
@@ -0,0 +1,10 @@
+<vector
+    android:tint="#008585"
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+    <path android:fillColor="#FF000000" android:pathData="M5.438,12.733l-2.346,2.346l-0.734,-0.733l2.346,-2.346l-2.346,-2.346l0.734,-0.733l2.346,2.346l2.345,-2.346l0.734,0.733l-2.346,2.346l2.346,2.346l-0.734,0.733z"/>
+    <path android:fillColor="#FF000000" android:pathData="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346,-2.346l2.346,2.346l0.592,-0.592L6.029,12L8.375,9.654z"/>
+</vector>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
new file mode 100644
index 0000000000..a09d1324a4
--- /dev/null
+++ b/icons/x_swap_vert.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<path d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+<path fill="none" d="M0,0h24v24H0V0z"/>
+<polygon points="5.438,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.438,11.267 7.783,8.921 8.517,9.654 
+	6.171,12 8.517,14.346 7.783,15.079 "/>
+<path d="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346-2.346l2.346,2.346
+	l0.592-0.592L6.029,12L8.375,9.654z"/>
+</svg>

From 47d5028eba6057250a2432d73248052b123e536c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 14 May 2020 18:29:05 +0200
Subject: [PATCH 098/400] RS fix shipping info message

---
 .../androidaps/danars/comm/DanaRS_Packet.java        |  2 --
 ...DanaRS_Packet_General_Get_Shipping_Information.kt | 12 +++---------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
index eacdfc1ffa..cf10a2d95c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
@@ -174,8 +174,6 @@ public class DanaRS_Packet {
     public String asciiStringFromBuff(byte[] buff, int offset, int length) {
         byte[] strbuff = new byte[length];
         System.arraycopy(buff, offset, strbuff, 0, length);
-        for (int pos = 0; pos < length; pos++)
-            strbuff[pos] += 65; // "A"
         return new String(strbuff, StandardCharsets.UTF_8);
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
index c280f5f126..edcb565f6c 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_Information.kt
@@ -22,15 +22,9 @@ class DanaRS_Packet_General_Get_Shipping_Information(
             failed = true
             return
         } else failed = false
-        var dataIndex = DATA_START
-        var dataSize = 10
-        danaPump.serialNumber = stringFromBuff(data, dataIndex, dataSize)
-        dataIndex += dataSize
-        dataSize = 3
-        danaPump.shippingDate = dateFromBuff(data, dataIndex)
-        dataIndex += dataSize
-        dataSize = 3
-        danaPump.shippingCountry = asciiStringFromBuff(data, dataIndex, dataSize)
+        danaPump.serialNumber = stringFromBuff(data, DATA_START, 10)
+        danaPump.shippingCountry = asciiStringFromBuff(data, DATA_START + 10, 3)
+        danaPump.shippingDate = dateFromBuff(data, DATA_START + 13)
         aapsLogger.debug(LTag.PUMPCOMM, "Serial number: " + danaPump.serialNumber)
         aapsLogger.debug(LTag.PUMPCOMM, "Shipping date: " + dateUtil.dateAndTimeString(danaPump.shippingDate))
         aapsLogger.debug(LTag.PUMPCOMM, "Shipping country: " + danaPump.shippingCountry)

From 6b128998a414a4be4730c9bf97c7ea0f1facf7fd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 14 May 2020 18:33:57 +0200
Subject: [PATCH 099/400] RS fix password check

---
 dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index 9d664faa06..33f92910ac 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -222,7 +222,7 @@ class DanaPump @Inject constructor(
         get() = password == sp.getInt(R.string.key_danar_password, -2)
 
     val isRSPasswordOK: Boolean
-        get() = rsPassword.equals(sp.getString(R.string.key_danars_password, ""), ignoreCase = true)
+        get() = rsPassword.equals(sp.getString(R.string.key_danars_password, ""), ignoreCase = true) || v3RSPump
 
     fun reset() {
         aapsLogger.debug(LTag.PUMP, "DanaRPump reset")

From e6f1e20e8402e75799e5a080df64c6458c98ea2d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 14 May 2020 20:50:45 +0200
Subject: [PATCH 100/400] better handle danapump flag

---
 .../java/info/nightscout/androidaps/danars/services/BLEComm.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 8577810291..0ce9182f80 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -70,7 +70,6 @@ class BLEComm @Inject internal constructor(
         set(newValue) {
             bleEncryption.setEnhancedEncryption(newValue)
             field = newValue
-            danaPump.v3RSPump = newValue
         }
     private var isEasyMode: Boolean = false
     private var isUnitUD: Boolean = false
@@ -437,6 +436,7 @@ class BLEComm @Inject internal constructor(
         if (decryptedBuffer.size == 4 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (OK)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))
             v3Encryption = false
+            danaPump.v3RSPump = false
             // Grab pairing key from preferences if exists
             val pairingKey = sp.getString(resourceHelper.gs(R.string.key_danars_pairingkey) + danaRSPlugin.mDeviceName, "")
             aapsLogger.debug(LTag.PUMPBTCOMM, "Using stored pairing key: $pairingKey")
@@ -450,6 +450,7 @@ class BLEComm @Inject internal constructor(
         } else if (decryptedBuffer.size == 9 && decryptedBuffer[2] == 'O'.toByte() && decryptedBuffer[3] == 'K'.toByte()) {
             // v3 2nd layer encryption
             v3Encryption = true
+            danaPump.v3RSPump = true
             rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
             disconnect("Wrong firmware")
             /*

From 2d3f1323dd6f4f62060e1d3ec2cc6b98de661844 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 14 May 2020 21:07:51 +0200
Subject: [PATCH 101/400] layout update

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 227f426da9..2c7a60ea9e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -478,11 +478,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_iobgraph.removeAllViews()
             for (i in 1 until numOfGraphs) {
                 val label = TextView(context)
-                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -50) }
+                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -90) }
                 overview_iobgraph.addView(label)
                 secondaryGraphsLabel.add(label)
                 val graph = GraphView(context)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, 0, 0, resourceHelper.dpToPx(10)) }
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(5), 0, resourceHelper.dpToPx(10)) }
                 graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false

From c311d593c13948d0ac24dd30e86a1c9058691c62 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 15 May 2020 08:20:09 +0200
Subject: [PATCH 102/400] show actions tab in NSC

---
 .../nightscout/androidaps/dependencyInjection/PluginsModule.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 1e02c6100d..f179580a55 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -64,7 +64,7 @@ abstract class PluginsModule {
     abstract fun bindIobCobCalculatorPlugin(plugin: IobCobCalculatorPlugin): PluginBase
 
     @Binds
-    @NotNSClient
+    @AllConfigs
     @IntoMap
     @IntKey(20)
     abstract fun bindActionsPlugin(plugin: ActionsPlugin): PluginBase

From 1dd579fd1934d1241566992a45b0267d4b2d663f Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 15 May 2020 11:37:09 +0200
Subject: [PATCH 103/400] Add disable vibration in insight settings (local_full
 only) Build works but as it related to pump communication, I prefer to not
 test it on my pump before Tebbe confirmation... (code is very simple, so it
 should work!)

---
 .../plugins/pump/insight/LocalInsightPlugin.java         | 2 ++
 .../app_layer/remote_control/DeliverBolusMessage.java    | 9 ++++++++-
 app/src/main/res/values/strings.xml                      | 2 ++
 app/src/main/res/xml/pref_insight_local_full.xml         | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index f8d1cf1ce5..51c6337df1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -597,6 +597,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     bolusMessage.setDuration(0);
                     bolusMessage.setExtendedAmount(0);
                     bolusMessage.setImmediateAmount(insulin);
+                    bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false));
                     bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
                     bolusCancelled = false;
                 }
@@ -820,6 +821,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             bolusMessage.setDuration(durationInMinutes);
             bolusMessage.setExtendedAmount(insulin);
             bolusMessage.setImmediateAmount(0);
+            bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false));
             int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
             InsightBolusID insightBolusID = new InsightBolusID();
             insightBolusID.bolusID = bolusID;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
index e0d0f2461a..6a4973b42b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/app_layer/remote_control/DeliverBolusMessage.java
@@ -14,6 +14,7 @@ public class DeliverBolusMessage extends AppLayerMessage {
     private double extendedAmount;
     private int duration;
     private int bolusId;
+    private boolean disableVibration = false;
 
     public DeliverBolusMessage() {
         super(MessagePriority.NORMAL, true, true, Service.REMOTE_CONTROL);
@@ -22,7 +23,11 @@ public class DeliverBolusMessage extends AppLayerMessage {
     @Override
     protected ByteBuf getData() {
         ByteBuf byteBuf = new ByteBuf(22);
-        byteBuf.putUInt16LE(252);
+        // 805 => Old value with vibration (2.6.1 and earlier), 252 => new value without vibrations for firmware 3.x
+        if (disableVibration)
+            byteBuf.putUInt16LE(252);
+        else
+            byteBuf.putUInt16LE(805);
         byteBuf.putUInt16LE(BolusTypeIDs.IDS.getID(bolusType));
         byteBuf.putUInt16LE(31);
         byteBuf.putUInt16LE(0);
@@ -57,6 +62,8 @@ public class DeliverBolusMessage extends AppLayerMessage {
         this.duration = duration;
     }
 
+    public void setVibration(boolean disableVibration) { this.disableVibration = disableVibration;}
+
     public int getBolusId() {
         return bolusId;
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a4595fab4..8033c82057 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1016,6 +1016,8 @@
     <string name="log_alerts">Log alerts</string>
     <string name="enable_tbr_emulation">Enable TBR emulation</string>
     <string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string>
+    <string name="disable_vibration">Disable vibrations on bolus delivery</string>
+    <string name="disable_vibration_summary">This setting is only available with Insight firmware 3.x</string>
     <string name="disconnect_delay">Disconnect delay [s]</string>
     <string name="serial_number">Serial number</string>
     <string name="release_software_version">Release software version</string>
diff --git a/app/src/main/res/xml/pref_insight_local_full.xml b/app/src/main/res/xml/pref_insight_local_full.xml
index ceaba15e38..761016b287 100644
--- a/app/src/main/res/xml/pref_insight_local_full.xml
+++ b/app/src/main/res/xml/pref_insight_local_full.xml
@@ -48,6 +48,12 @@
             android:summary="@string/enable_tbr_emulation_summary"
             android:title="@string/enable_tbr_emulation" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="insight_disable_vibration"
+            android:summary="@string/disable_vibration_summary"
+            android:title="@string/disable_vibration" />
+
         <EditTextPreference
             android:defaultValue="5"
             android:inputType="number"

From e98e5ec9def030bcc5ce6969c5a36be4b006afab Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 15 May 2020 21:50:40 +0200
Subject: [PATCH 104/400] fix danars parsing history

---
 .../danars/comm/DanaRS_Packet_History_.kt     | 50 ++++++++++++-------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
index 5026d117d6..c5a0b40ceb 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.db.DanaRHistoryRecord
+import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.dana.comm.RecordTypes
-import info.nightscout.androidaps.events.EventDanaRSyncStatus
 import org.joda.time.DateTime
 import java.util.*
 import javax.inject.Inject
@@ -83,20 +83,17 @@ abstract class DanaRS_Packet_History_(
             val historySecond = byteArrayToInt(getBytes(data, DATA_START + 6, 1))
             val paramByte7 = historySecond.toByte()
             val dailyBolus: Double = ((data[DATA_START + 6].toInt() and 0xFF shl 8) + (data[DATA_START + 7].toInt() and 0xFF)) * 0.01
-            val date = DateTime(2000 + historyYear, historyMonth, historyDay, 0, 0)
-            val datetime = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute)
-            val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
             val historyCode = byteArrayToInt(getBytes(data, DATA_START + 7, 1))
             val paramByte8 = historyCode.toByte()
             val value: Int = (data[DATA_START + 8].toInt() and 0xFF shl 8) + (data[DATA_START + 9].toInt() and 0xFF)
-            aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
             danaRHistoryRecord.setBytes(data)
             // danaRHistoryRecord.recordCode is different from DanaR codes
-// set in switch for every type
+            // set in switch for every type
             var messageType = ""
             when (recordCode) {
                 0x02 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BOLUS
+                    val datetime = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute)
                     danaRHistoryRecord.recordDate = datetime.millis
                     when (0xF0 and paramByte8.toInt()) {
                         0xA0 -> {
@@ -123,61 +120,77 @@ abstract class DanaRS_Packet_History_(
                     }
                     danaRHistoryRecord.recordDuration = (paramByte8.toInt() and 0x0F) * 60 + paramByte7.toInt()
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetime.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x03 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_DAILY
                     messageType += "dailyinsulin"
+                    val date = DateTime(2000 + historyYear, historyMonth, historyDay, 0, 0)
                     danaRHistoryRecord.recordDate = date.millis
                     danaRHistoryRecord.recordDailyBasal = dailyBasal
                     danaRHistoryRecord.recordDailyBolus = dailyBolus
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(date.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x04 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_PRIME
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_PRIME
                     messageType += "prime"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x05 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_REFILL
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_REFILL
                     messageType += "refill"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x0b -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BASALHOUR
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_BASALHOUR
                     messageType += "basal hour"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x99 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_TEMP_BASAL
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_TEMP_BASAL
                     messageType += "tb"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x06 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_GLUCOSE
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_GLUCOSE
                     messageType += "glucose"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x07 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_CARBO
                     messageType += "carbo"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     danaRHistoryRecord.recordValue = value.toDouble()
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x0a -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_ALARM
                     messageType += "alarm"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strAlarm = "None"
                     when (paramByte8.toInt()) {
@@ -188,15 +201,18 @@ abstract class DanaRS_Packet_History_(
                     }
                     danaRHistoryRecord.recordAlarm = strAlarm
                     danaRHistoryRecord.recordValue = value * 0.01
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
 
                 0x09 -> {
-                    danaRHistoryRecord.recordCode = info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_SUSPEND
+                    danaRHistoryRecord.recordCode = RecordTypes.RECORD_TYPE_SUSPEND
                     messageType += "suspend"
+                    val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strRecordValue = "Off"
                     if (paramByte8.toInt() == 79) strRecordValue = "On"
                     danaRHistoryRecord.stringRecordValue = strRecordValue
+                    aapsLogger.debug(LTag.PUMPCOMM, "History packet: " + recordCode + " Date: " + dateUtil.dateAndTimeString(datetimewihtsec.millis) + " Code: " + historyCode + " Value: " + value)
                 }
             }
             databaseHelper.createOrUpdate(danaRHistoryRecord)

From ca94e6cc67654abe47f8d1b29092a40d0792cd64 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 15 May 2020 22:41:14 +0200
Subject: [PATCH 105/400] layout #2

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 232c8c02bf..a7c2517aa2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -478,11 +478,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_iobgraph.removeAllViews()
             for (i in 1 until numOfGraphs) {
                 val label = TextView(context)
-                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -90) }
+                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -120) }
                 overview_iobgraph.addView(label)
                 secondaryGraphsLabel.add(label)
                 val graph = GraphView(context)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(5), 0, resourceHelper.dpToPx(10)) }
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(35), 0, resourceHelper.dpToPx(15)) }
                 graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false

From 8729fe18bd2455b8616ae38db93b0d6d934829fe Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 16 May 2020 22:43:18 +0200
Subject: [PATCH 106/400] fix urgent NS alarm preference

---
 .../general/overview/notifications/NotificationWithAction.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
index 2d8ad45c2b..f492196b29 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
@@ -57,7 +57,7 @@ class NotificationWithAction constructor(
                 id = NSURGENTALARM
                 level = URGENT
                 text = nsAlarm.title()
-                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.urgentalarm
+                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_urgent_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_urgent_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.urgentalarm
             }
         }
         buttonText = R.string.snooze

From 480542a143d2beeecaaceaa198e8450243a127f1 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 17 May 2020 01:58:07 +0200
Subject: [PATCH 107/400] Fix Wear Control Kotlin doesn't like regex... (AAPS
 crashed on these lines with ""\\s+", replaced by a space)

---
 .../androidaps/plugins/general/wear/ActionStringHandler.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index 29ed323ee1..a7f5ee98da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -86,7 +86,7 @@ class ActionStringHandler @Inject constructor(
         var rMessage = ""
         var rAction = ""
         // do the parsing and check constraints
-        val act = actionString.split("\\s+").toTypedArray()
+        val act = actionString.split(" ").toTypedArray()
         if ("fillpreset" == act[0]) { ///////////////////////////////////// PRIME/FILL
             val amount: Double = if ("1" == act[1]) {
                 sp.getDouble("fill_button1", 0.3)
@@ -470,7 +470,7 @@ class ActionStringHandler @Inject constructor(
         if (System.currentTimeMillis() - lastSentTimestamp > TIMEOUT) return
         lastConfirmActionString = null
         // do the parsing, check constraints and enact!
-        val act = actionString.split("\\s+").toTypedArray()
+        val act = actionString.split(" ").toTypedArray()
         if ("fill" == act[0]) {
             val amount = SafeParse.stringToDouble(act[1])
             val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()

From 72e541908cbc0bb94df16e5027eec62781922fce Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 17 May 2020 08:09:58 +0200
Subject: [PATCH 108/400] Revert "Fix Wear Control Kotlin doesn't like regex...
 (AAPS crashed on these lines with ""\\s+", replaced by a space)" => Second
 proposal better than my first one, split works with regex if it is of type
 Regex (it doesn't recognize first \ as a regex string but as an escape
 character...) This reverts commit 480542a1

---
 .../androidaps/plugins/general/wear/ActionStringHandler.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
index a7f5ee98da..3aa96ae31d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
@@ -86,7 +86,7 @@ class ActionStringHandler @Inject constructor(
         var rMessage = ""
         var rAction = ""
         // do the parsing and check constraints
-        val act = actionString.split(" ").toTypedArray()
+        val act = actionString.split("\\s+".toRegex()).toTypedArray()
         if ("fillpreset" == act[0]) { ///////////////////////////////////// PRIME/FILL
             val amount: Double = if ("1" == act[1]) {
                 sp.getDouble("fill_button1", 0.3)
@@ -470,7 +470,7 @@ class ActionStringHandler @Inject constructor(
         if (System.currentTimeMillis() - lastSentTimestamp > TIMEOUT) return
         lastConfirmActionString = null
         // do the parsing, check constraints and enact!
-        val act = actionString.split(" ").toTypedArray()
+        val act = actionString.split("\\s+".toRegex()).toTypedArray()
         if ("fill" == act[0]) {
             val amount = SafeParse.stringToDouble(act[1])
             val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(amount)).value()

From eeb4ce1686d2e5b2dd427dc276cf4aae8c0c121b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 19 May 2020 12:52:01 +0200
Subject: [PATCH 109/400] fix HistoryBrowser injection

---
 .../historyBrowser/HistoryBrowseActivity.kt   | 18 ++++----
 ...in.kt => IobCobCalculatorPluginHistory.kt} |  7 ++--
 .../historyBrowser/TreatmentsPluginHistory.kt | 41 +++++++++++++++++++
 .../general/overview/OverviewFragment.kt      |  4 +-
 .../general/overview/graphData/GraphData.kt   | 11 +++--
 .../plugins/treatments/TreatmentsPlugin.java  |  2 +-
 6 files changed, 64 insertions(+), 19 deletions(-)
 rename app/src/main/java/info/nightscout/androidaps/historyBrowser/{IobCobStaticCalculatorPlugin.kt => IobCobCalculatorPluginHistory.kt} (83%)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/historyBrowser/TreatmentsPluginHistory.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index f59a38d770..5d0df4dbf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -49,7 +49,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
-    @Inject lateinit var iobCobStaticCalculatorPlugin: IobCobStaticCalculatorPlugin
+    @Inject lateinit var iobCobCalculatorPluginHistory: IobCobCalculatorPluginHistory
+    @Inject lateinit var treatmentsPluginHistory: TreatmentsPluginHistory
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
@@ -148,7 +149,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     public override fun onPause() {
         super.onPause()
         disposable.clear()
-        iobCobStaticCalculatorPlugin.stopCalculation("onPause")
+        iobCobCalculatorPluginHistory.stopCalculation("onPause")
     }
 
     public override fun onResume() {
@@ -157,7 +158,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             .toObservable(EventAutosensCalculationFinished::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ event: EventAutosensCalculationFinished ->
-                // catch only events from iobCobStaticCalculatorPlugin
+                // catch only events from iobCobCalculatorPluginHistory
                 if (event.cause === eventCustomCalculationFinished) {
                     aapsLogger.debug(LTag.AUTOSENS, "EventAutosensCalculationFinished")
                     updateGUI("EventAutosensCalculationFinished")
@@ -220,10 +221,11 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     }
 
     private fun runCalculation(from: String) {
+        treatmentsPluginHistory.initializeData(start - T.hours(8).msecs())
         val end = start + T.hours(rangeToDisplay.toLong()).msecs()
-        iobCobStaticCalculatorPlugin.stopCalculation(from)
-        iobCobStaticCalculatorPlugin.clearCache()
-        iobCobStaticCalculatorPlugin.runCalculation(from, end, true, false, eventCustomCalculationFinished)
+        iobCobCalculatorPluginHistory.stopCalculation(from)
+        iobCobCalculatorPluginHistory.clearCache()
+        iobCobCalculatorPluginHistory.runCalculation(from, end, true, false, eventCustomCalculationFinished)
     }
 
     @Synchronized
@@ -242,7 +244,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         GlobalScope.launch(Dispatchers.Main) {
             historybrowse_bggraph ?: return@launch
-            val graphData = GraphData(injector, historybrowse_bggraph, iobCobStaticCalculatorPlugin)
+            val graphData = GraphData(injector, historybrowse_bggraph, iobCobCalculatorPluginHistory, treatmentsPluginHistory)
             val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
 
             // do preparation in different thread
@@ -279,7 +281,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
                 // ------------------ 2nd graph
                 for (g in 0 until secondaryGraphs.size) {
-                    val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobStaticCalculatorPlugin)
+                    val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPluginHistory, treatmentsPluginHistory)
                     var useIobForScale = false
                     var useCobForScale = false
                     var useDevForScale = false
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
rename to app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt
index 03214175d2..bf7401036a 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobStaticCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/IobCobCalculatorPluginHistory.kt
@@ -9,7 +9,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorP
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -18,7 +17,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class IobCobStaticCalculatorPlugin @Inject constructor(
+class IobCobCalculatorPluginHistory @Inject constructor(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     rxBus: RxBusWrapper,
@@ -26,14 +25,14 @@ class IobCobStaticCalculatorPlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     profileFunction: ProfileFunction,
     activePlugin: ActivePluginProvider,
-    treatmentsPlugin: TreatmentsPlugin,
+    treatmentsPluginHistory: TreatmentsPluginHistory,
     sensitivityOref1Plugin: SensitivityOref1Plugin,
     sensitivityAAPSPlugin: SensitivityAAPSPlugin,
     sensitivityWeightedAveragePlugin: SensitivityWeightedAveragePlugin,
     fabricPrivacy: FabricPrivacy,
     dateUtil: DateUtil
 ) : IobCobCalculatorPlugin(injector, aapsLogger, rxBus, sp, resourceHelper, profileFunction,
-    activePlugin, treatmentsPlugin, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil) {
+    activePlugin, treatmentsPluginHistory, sensitivityOref1Plugin, sensitivityAAPSPlugin, sensitivityWeightedAveragePlugin, fabricPrivacy, dateUtil) {
 
     override fun onStart() { // do not attach to rxbus
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/TreatmentsPluginHistory.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/TreatmentsPluginHistory.kt
new file mode 100644
index 0000000000..caa0fb1b1a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/TreatmentsPluginHistory.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.historyBrowser
+
+import android.content.Context
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.treatments.TreatmentService
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TreatmentsPluginHistory @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    rxBus: RxBusWrapper,
+    resourceHelper: ResourceHelper,
+    context: Context,
+    sp: SP,
+    profileFunction: ProfileFunction,
+    activePlugin: ActivePluginProvider,
+    nsUpload: NSUpload,
+    fabricPrivacy: FabricPrivacy, dateUtil: DateUtil
+) : TreatmentsPlugin(injector, aapsLogger, rxBus, resourceHelper, context, sp, profileFunction, activePlugin, nsUpload, fabricPrivacy, dateUtil) {
+
+    init {
+        onStart()
+    }
+
+    override fun onStart() {
+        service = TreatmentService(injector)
+        initializeData(range())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index a7c2517aa2..1188caccf7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -771,7 +771,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         // ****** GRAPH *******
         GlobalScope.launch(Dispatchers.Main) {
             overview_bggraph ?: return@launch
-            val graphData = GraphData(injector, overview_bggraph, iobCobCalculatorPlugin)
+            val graphData = GraphData(injector, overview_bggraph, iobCobCalculatorPlugin, treatmentsPlugin)
             val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
 
             // do preparation in different thread
@@ -834,7 +834,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
                 // ------------------ 2nd graph
                 for (g in 0 until secondaryGraphs.size) {
-                    val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin)
+                    val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin)
                     var useIobForScale = false
                     var useCobForScale = false
                     var useDevForScale = false
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
index 70e4f9f8fc..f3a779af22 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
@@ -34,7 +34,13 @@ import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
-class GraphData(injector: HasAndroidInjector, private val graph: GraphView, private val iobCobCalculatorPlugin: IobCobCalculatorPlugin) {
+class GraphData(
+    injector: HasAndroidInjector,
+    private val graph: GraphView,
+    private val iobCobCalculatorPlugin: IobCobCalculatorPlugin,
+    private val treatmentsPlugin: TreatmentsInterface
+
+) {
 
     // IobCobCalculatorPlugin  Cannot be injected: HistoryBrowser
     @Inject lateinit var aapsLogger: AAPSLogger
@@ -42,8 +48,6 @@ class GraphData(injector: HasAndroidInjector, private val graph: GraphView, priv
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
 
-    private val treatmentsPlugin: TreatmentsInterface
-
     var maxY = Double.MIN_VALUE
     private var minY = Double.MAX_VALUE
     private var bgReadingsArray: List<BgReading>? = null
@@ -53,7 +57,6 @@ class GraphData(injector: HasAndroidInjector, private val graph: GraphView, priv
     init {
         injector.androidInjector().inject(this)
         units = profileFunction.getUnits()
-        treatmentsPlugin = activePlugin.activeTreatments
     }
 
     @Suppress("UNUSED_PARAMETER")
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index f273015441..0af7ac8d33 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -178,7 +178,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         return this.service;
     }
 
-    private long range() {
+    protected long range() {
         double dia = Constants.defaultDIA;
         if (profileFunction.getProfile() != null)
             dia = profileFunction.getProfile().getDia();

From b2b1485c273e6edd4152a0543701cc4329d25137 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 19 May 2020 13:22:02 +0200
Subject: [PATCH 110/400] fix Actions buttons visibility

---
 .../general/actions/ActionsFragment.kt        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 47651ef9ac..22973b3caf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -18,9 +18,9 @@ import info.nightscout.androidaps.events.*
 import info.nightscout.androidaps.historyBrowser.HistoryBrowseActivity
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
 import info.nightscout.androidaps.queue.Callback
@@ -192,17 +192,15 @@ class ActionsFragment : DaggerFragment() {
 
     @Synchronized
     fun updateGui() {
-        actions_profileswitch?.visibility = (activePlugin.activeProfileInterface.profile != null).toVisibility()
 
         val profile = profileFunction.getProfile()
         val pump = activePlugin.activePump
 
-        actions_temptarget?.visibility = (profile != null).toVisibility()
-        actions_historybrowser.visibility = (profile != null).toVisibility()
-
-        val basalProfileEnabled = buildHelper.isEngineeringModeOrRelease() && pump.pumpDescription.isSetBasalProfileCapable
-
-        actions_profileswitch?.visibility = if (!basalProfileEnabled || !pump.isInitialized || pump.isSuspended) View.GONE else View.VISIBLE
+        actions_profileswitch?.visibility = (
+            activePlugin.activeProfileInterface.profile != null &&
+                pump.pumpDescription.isSetBasalProfileCapable &&
+                pump.isInitialized &&
+                !pump.isSuspended).toVisibility()
 
         if (!pump.pumpDescription.isExtendedBolusCapable || !pump.isInitialized || pump.isSuspended || pump.isFakingTempsByExtendedBoluses) {
             actions_extendedbolus?.visibility = View.GONE
@@ -236,12 +234,11 @@ class ActionsFragment : DaggerFragment() {
             }
         }
 
-        actions_fill?.visibility =
-            if (!pump.pumpDescription.isRefillingCapable || !pump.isInitialized || pump.isSuspended) View.GONE
-            else View.VISIBLE
-
-        actions_temptarget?.visibility = config.APS.toVisibility()
+        actions_historybrowser.visibility = (profile != null).toVisibility()
+        actions_fill?.visibility = (pump.pumpDescription.isRefillingCapable && pump.isInitialized && !pump.isSuspended).toVisibility()
+        actions_temptarget?.visibility = (profile != null && config.APS).toVisibility()
         actions_tddstats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
+
         statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, careportal_pbage, null)
         checkPumpCustomActions()
     }

From 28ffd7f945b7855ae83c5ca9d7bded7b03614999 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 19 May 2020 17:04:57 +0200
Subject: [PATCH 111/400] BTC address

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 32aef48cd9..b76376b3d2 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,6 @@
 dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
 
 
-[![Donate via PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Y4LHGJJESAVB8)
\ No newline at end of file
+[![Donate via PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Y4LHGJJESAVB8)
+
+![BTC](https://bitit.io/assets/coins/icon-btc-1e5a37bc0eb730ac83130d7aa859052bd4b53ac3f86f99966627801f7b0410be.svg) 3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2

From 58a7188ec3a7ebe8f6c37235f16fd0edd1853a7d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 19 May 2020 19:27:31 +0200
Subject: [PATCH 112/400] RS hwver 7

---
 ...DanaRS_Packet_APS_Set_Event_HistoryTest.kt |   1 +
 .../DanaRS_Packet_Option_Get_Pump_TimeTest.kt |   2 +-
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt |   2 +-
 .../nightscout/androidaps/data/Profile.java   |   5 +
 .../nightscout/androidaps/dana/DanaPump.kt    |  72 +++++++++---
 .../activities/DanaUserOptionsActivity.kt     |   8 +-
 dana/src/main/res/values/strings.xml          |   3 +
 .../danar/comm/MsgSettingPumpTime.kt          |   7 +-
 .../danars/comm/DanaRSMessageHashTable.kt     |   5 +
 .../androidaps/danars/comm/DanaRS_Packet.java |  23 ++++
 .../comm/DanaRS_Packet_APS_History_Events.kt  | 106 ++++++++++--------
 .../DanaRS_Packet_APS_Set_Event_History.kt    |  34 +++---
 ...DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt |  39 +++++++
 ...DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt |  52 +++++++++
 .../danars/comm/DanaRS_Packet_History_.kt     |  14 ++-
 .../danars/comm/DanaRS_Packet_Notify_Alarm.kt |  10 +-
 .../DanaRS_Packet_Option_Get_Pump_Time.kt     |  28 ++---
 ...Packet_Option_Get_Pump_UTC_And_TimeZone.kt |  41 +++++++
 ...Packet_Option_Set_Pump_UTC_And_TimeZone.kt |  49 ++++++++
 .../androidaps/danars/di/DanaRSCommModule.kt  |   4 +
 .../danars/encryption/BleEncryption.java      |   8 ++
 .../danars/services/DanaRSService.kt          |  52 +++++----
 22 files changed, 433 insertions(+), 132 deletions(-)
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt
 create mode 100644 danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt

diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
index cdd68df473..2bbb735ac2 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_HistoryTest.kt
@@ -20,6 +20,7 @@ class DanaRS_Packet_APS_Set_Event_HistoryTest : DanaRSTestBase() {
                 it.dateUtil = dateUtil
             }
             if (it is DanaRS_Packet_APS_Set_Event_History) {
+                it.danaPump = danaPump
             }
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
index 0cda0fa06c..3a1a8e1256 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_TimeTest.kt
@@ -34,7 +34,7 @@ class DanaRS_Packet_Option_Get_Pump_TimeTest : DanaRSTestBase() {
         putByteToArray(array, 5, 35) // second 35
 
         packet.handleMessage(array)
-        Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaPump.pumpTime)
+        Assert.assertEquals(DateTime(2019, 2, 4, 20, 11, 35).millis, danaPump.getPumpTime())
         Assert.assertEquals("OPTION__GET_PUMP_TIME", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index f99a68d472..600768548f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -25,6 +25,6 @@ class MsgSettingPumpTimeTest : DanaRTestBase() {
             packet.intFromBuff(bytes, 0, 1)
         ).time
         packet.handleMessage(bytes)
-        Assert.assertEquals(time, danaPump.pumpTime)
+        Assert.assertEquals(time, danaPump.getPumpTime())
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
index dc8e08b0df..4aaa5848fb 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -100,6 +100,7 @@ public class Profile {
     }
 
     protected void init(JSONObject json, int percentage, int timeshift) {
+        if (json == null) return;
         units = null;
         dia = Constants.defaultDIA;
         timeZone = TimeZone.getDefault();
@@ -404,6 +405,10 @@ public class Profile {
         return toMgdl(getIsfTimeFromMidnight(secondsFromMidnight(time)), units);
     }
 
+    public double getIsfMgdlTimeFromMidnight(int timeAsSeconds) {
+        return toMgdl(getIsfTimeFromMidnight(timeAsSeconds), units);
+    }
+
     public double getIsfTimeFromMidnight(int timeAsSeconds) {
         if (isf_v == null)
             isf_v = convertToSparseArray(isf);
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index 33f92910ac..e06f924215 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -3,10 +3,11 @@ package info.nightscout.androidaps.dana
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.db.Treatment
 import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.db.Treatment
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONException
@@ -49,8 +50,32 @@ class DanaPump @Inject constructor(
     var bleModel = "" // RS v3:  like BPN-1.0.1
     var isNewPump = true // R only , providing model info
     var password = -1 // R, RSv1
-    var pumpTime: Long = 0
+
+    // time
+    private var pumpTime: Long = 0
+    var zoneOffset: Int = 0 // i (hw 7+)
+
+    fun setPumpTime(value: Long) {
+        pumpTime = value
+    }
+
+    fun setPumpTime(value: Long, zoneOffset: Int) {
+        pumpTime = value + T.hours(zoneOffset.toLong()).msecs()
+        this.zoneOffset = zoneOffset
+    }
+
+    fun resetPumpTime() {
+        pumpTime = 0
+    }
+
+    fun getPumpTime() = pumpTime
+
     var hwModel = 0
+    val usingUTC
+        get() = hwModel >= 7
+    val profile24
+        get() = hwModel >= 7
+
     var protocol = 0
     var productCode = 0
     var errorState: ErrorState = ErrorState.NONE
@@ -90,8 +115,9 @@ class DanaPump @Inject constructor(
     var extendedBolusRemainingMinutes = 0
     var extendedBolusDeliveredSoFar = 0.0 //RS only = 0.0
 
-    // Profile
+    // Profile R,RSv1
     var units = 0
+    var activeProfile = 0
     var easyBasalMode = 0
     var basal48Enable = false
     var currentCIR = 0
@@ -107,7 +133,10 @@ class DanaPump @Inject constructor(
     var eveningCF = 0.0
     var nightCIR = 0
     var nightCF = 0.0
-    var activeProfile = 0
+
+    // Profile I
+    var cf24 = Array<Double>(24) { 0.0 }
+    var cir24 = Array<Double>(24) { 0.0 }
 
     //var pumpProfiles = arrayOf<Array<Double>>()
     var pumpProfiles: Array<Array<Double>>? = null
@@ -151,6 +180,8 @@ class DanaPump @Inject constructor(
     var bolusDone = false // success end
     var lastEventTimeLoaded: Long = 0 // timestamp of last received event
 
+    val lastKnownHistoryId: Int = 0 // hwver 7+, 1-2000
+
     fun createConvertedProfile(): ProfileStore? {
         pumpProfiles?.let {
             val json = JSONObject()
@@ -165,18 +196,30 @@ class DanaPump @Inject constructor(
                 json.put("store", store)
                 profile.put("dia", Constants.defaultDIA)
                 val carbratios = JSONArray()
-                carbratios.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR))
-                carbratios.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR))
-                carbratios.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR))
-                carbratios.put(JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR))
-                carbratios.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR))
+                if (!profile24) {
+                    carbratios.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCIR))
+                    carbratios.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCIR))
+                    carbratios.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCIR))
+                    carbratios.put(JSONObject().put("time", "14:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCIR))
+                    carbratios.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCIR))
+                } else { // 24 values
+                    for (i in 0..23) {
+                        carbratios.put(JSONObject().put("time", String.format("%02d", i) + ":00").put("timeAsSeconds", i * 3600).put("value", cir24[i]))
+                    }
+                }
                 profile.put("carbratio", carbratios)
                 val sens = JSONArray()
-                sens.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF))
-                sens.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF))
-                sens.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCF))
-                sens.put(JSONObject().put("time", "17:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCF))
-                sens.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCF))
+                if (!profile24) {
+                    sens.put(JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", nightCF))
+                    sens.put(JSONObject().put("time", "06:00").put("timeAsSeconds", 6 * 3600).put("value", morningCF))
+                    sens.put(JSONObject().put("time", "11:00").put("timeAsSeconds", 11 * 3600).put("value", afternoonCF))
+                    sens.put(JSONObject().put("time", "17:00").put("timeAsSeconds", 17 * 3600).put("value", eveningCF))
+                    sens.put(JSONObject().put("time", "22:00").put("timeAsSeconds", 22 * 3600).put("value", nightCF))
+                } else { // 24 values
+                    for (i in 0..23) {
+                        sens.put(JSONObject().put("time", String.format("%02d", i) + ":00").put("timeAsSeconds", i * 3600).put("value", cf24[i]))
+                    }
+                }
                 profile.put("sens", sens)
                 val basals = JSONArray()
                 val basalValues = if (basal48Enable) 48 else 24
@@ -270,6 +313,7 @@ class DanaPump @Inject constructor(
         const val PROFILECHANGE = 13
         const val CARBS = 14
         const val PRIMECANNULA = 15
+        const val TIMECHANGE = 16
 
         // Dana R btModel
         const val DOMESTIC_MODEL = 0x01
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
index be38978236..fd9c50fb48 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
@@ -44,6 +44,8 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
     private fun isDanaR() = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaR
     private fun isDanaRv2() = activePlugin.activePump.pumpDescription.pumpType == PumpType.DanaRv2
 
+    var minBacklight = 1
+
     @Synchronized
     override fun onResume() {
         super.onResume()
@@ -65,6 +67,8 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
 
         save_user_options.setOnClickListener { onSaveClick() }
 
+        minBacklight = if (danaPump.hwModel < 7) 1 else 0 // Dana-i allows zero
+
         aapsLogger.debug(LTag.PUMP,
             "UserOptionsLoaded:" + (System.currentTimeMillis() - danaPump.lastConnection) / 1000 + " s ago"
                 + "\ntimeDisplayType:" + danaPump.timeDisplayType
@@ -76,7 +80,7 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
                 + "\nlowReservoir:" + danaPump.lowReservoirRate)
 
         danar_screentimeout.setParams(danaPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
-        danar_backlight.setParams(danaPump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
+        danar_backlight.setParams(danaPump.backlightOnTimeSec.toDouble(), minBacklight.toDouble(), 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
         danar_shutdown.setParams(danaPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
         danar_lowreservoir.setParams(danaPump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
         when (danaPump.beepAndAlarm) {
@@ -136,7 +140,7 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
         // step is 5 seconds, 5 to 240
         danaPump.lcdOnTimeSec = min(max(danar_screentimeout.value.toInt() / 5 * 5, 5), 240)
         // 1 to 60
-        danaPump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), 1), 60)
+        danaPump.backlightOnTimeSec = min(max(danar_backlight.value.toInt(), minBacklight), 60)
 
         danaPump.units = if (danar_units.isChecked) 1 else 0
 
diff --git a/dana/src/main/res/values/strings.xml b/dana/src/main/res/values/strings.xml
index b0fe53ee25..bf26707ffc 100644
--- a/dana/src/main/res/values/strings.xml
+++ b/dana/src/main/res/values/strings.xml
@@ -42,6 +42,9 @@
     <string name="batterydischarged">Pump Battery Discharged</string>
     <string name="occlusion">Occlusion</string>
     <string name="emptyreservoir">Empty reservoir</string>
+    <string name="checkshaft">Check shaft</string>
+    <string name="basalmax">Basal max</string>
+    <string name="dailymax">Daily max</string>
     <string name="bloodsugarmeasurementalert">Blood sugar measurement alert</string>
     <string name="remaininsulinalert">Remaining insulin level</string>
     <string name="missedbolus">Missed bolus</string>
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 5fffb9cf71..d8d216c16e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -1,10 +1,7 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.utils.DateUtil
 import org.joda.time.DateTime
 import java.util.*
 
@@ -27,10 +24,10 @@ class MsgSettingPumpTime(
             intFromBuff(bytes, 0, 1)
         ).millis
         aapsLogger.debug(LTag.PUMPCOMM, "Pump time: " + dateUtil.dateAndTimeString(time) + " Phone time: " + Date())
-        danaPump.pumpTime = time
+        danaPump.setPumpTime(time)
     }
 
     override fun handleMessageNotReceived() {
-        danaPump.pumpTime = 0
+        danaPump.resetPumpTime()
     }
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
index 9280187622..84e0dffa09 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSMessageHashTable.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -37,6 +38,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Bolus_Get_Calculation_Information(injector))
         put(DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(injector))
         put(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
+        put(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
         put(DanaRS_Packet_Bolus_Get_Dual_Bolus(injector))
         put(DanaRS_Packet_Bolus_Get_Extended_Bolus(injector))
         put(DanaRS_Packet_Bolus_Get_Extended_Bolus_State(injector))
@@ -45,6 +47,7 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Bolus_Set_Bolus_Option(injector))
         put(DanaRS_Packet_Bolus_Set_Initial_Bolus(injector))
         put(DanaRS_Packet_Bolus_Set_CIR_CF_Array(injector))
+        put(DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(injector, Profile(injector, null)))
         put(DanaRS_Packet_Bolus_Set_Dual_Bolus(injector))
         put(DanaRS_Packet_Bolus_Set_Extended_Bolus(injector))
         put(DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(injector))
@@ -60,8 +63,10 @@ class DanaRSMessageHashTable @Inject constructor(
         put(DanaRS_Packet_Notify_Delivery_Rate_Display(injector))
         put(DanaRS_Packet_Notify_Missed_Bolus_Alarm(injector))
         put(DanaRS_Packet_Option_Get_Pump_Time(injector))
+        put(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
         put(DanaRS_Packet_Option_Get_User_Option(injector))
         put(DanaRS_Packet_Option_Set_Pump_Time(injector))
+        put(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector))
         put(DanaRS_Packet_Option_Set_User_Option(injector))
         //put(new DanaRS_Packet_History_(injector));
         put(DanaRS_Packet_History_Alarm(injector))
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
index cf10a2d95c..87ff77d0e6 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
@@ -151,6 +151,29 @@ public class DanaRS_Packet {
         return ret;
     }
 
+    protected static int intFromBuffMsbLsb(byte[] b, int srcStart, int srcLength) {
+        int ret;
+
+        switch (srcLength) {
+            case 1:
+                ret = b[DATA_START + srcStart] & 0x000000FF;
+                break;
+            case 2:
+                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 1] & 0x000000FF);
+                break;
+            case 3:
+                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 2] & 0x000000FF);
+                break;
+            case 4:
+                ret = ((b[DATA_START + srcStart] & 0x000000FF) << 24) + ((b[DATA_START + srcStart + 1] & 0x000000FF) << 16) + ((b[DATA_START + srcStart + 2] & 0x000000FF) << 8) + (b[DATA_START + srcStart + 3] & 0x000000FF);
+                break;
+            default:
+                ret = -1;
+                break;
+        }
+        return ret;
+    }
+
     @TargetApi(Build.VERSION_CODES.KITKAT)
     public static String stringFromBuff(byte[] buff, int offset, int length) {
         byte[] strbuff = new byte[length];
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index d2e8bbc3dd..6c351210be 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -18,6 +18,8 @@ import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import java.util.*
 import javax.inject.Inject
 
@@ -34,59 +36,67 @@ open class DanaRS_Packet_APS_History_Events(
     @Inject lateinit var sp: SP
     @Inject lateinit var nsUpload: NSUpload
 
-    private var year = 0
-    private var month = 0
-    private var day = 0
-    private var hour = 0
-    private var min = 0
-    private var sec = 0
-
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_HISTORY_EVENTS
-        val cal = GregorianCalendar()
         if (from > DateUtil.now()) {
             aapsLogger.debug(LTag.PUMPCOMM, "Asked to load from the future")
             from = 0
         }
-        if (from != 0L) cal.timeInMillis = from else cal[2000, 0, 1, 0, 0] = 0
-        year = cal[Calendar.YEAR] - 1900 - 100
-        month = cal[Calendar.MONTH] + 1
-        day = cal[Calendar.DAY_OF_MONTH]
-        hour = cal[Calendar.HOUR_OF_DAY]
-        min = cal[Calendar.MINUTE]
-        sec = cal[Calendar.SECOND]
-        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(cal.timeInMillis))
+        aapsLogger.debug(LTag.PUMPCOMM, "Loading event history from: " + dateUtil.dateAndTimeString(from))
         danaPump.historyDoneReceived = false
     }
 
     override fun getRequestParams(): ByteArray {
+        val date =
+            if (danaPump.usingUTC) DateTime(from).withZone(DateTimeZone.UTC)
+            else DateTime(from)
         val request = ByteArray(6)
-        request[0] = (year and 0xff).toByte()
-        request[1] = (month and 0xff).toByte()
-        request[2] = (day and 0xff).toByte()
-        request[3] = (hour and 0xff).toByte()
-        request[4] = (min and 0xff).toByte()
-        request[5] = (sec and 0xff).toByte()
+        if (from == 0L) {
+            request[0] = 0
+            request[1] = 1
+            request[2] = 1
+            request[3] = 0
+            request[4] = 0
+            request[5] = 0
+        } else {
+            request[0] = (date.year - 2000 and 0xff).toByte()
+            request[1] = (date.monthOfYear and 0xff).toByte()
+            request[2] = (date.dayOfMonth and 0xff).toByte()
+            request[3] = (date.hourOfDay and 0xff).toByte()
+            request[4] = (date.minuteOfHour and 0xff).toByte()
+            request[5] = (date.secondOfMinute and 0xff).toByte()
+        }
         return request
     }
 
     override fun handleMessage(data: ByteArray) {
-        val recordCode = intFromBuff(data, 0, 1).toByte()
+        var recordCode = intFromBuff(data, 0, 1).toByte()
         // Last record
         if (recordCode == 0xFF.toByte()) {
             danaPump.historyDoneReceived = true
             aapsLogger.debug(LTag.PUMPCOMM, "Last record received")
             return
         }
-        val datetime = dateTimeSecFromBuff(data, 1) // 6 bytes
-        val param1 = (intFromBuff(data, 7, 1) shl 8 and 0xFF00) + (intFromBuff(data, 8, 1) and 0xFF)
-        val param2 = (intFromBuff(data, 9, 1) shl 8 and 0xFF00) + (intFromBuff(data, 10, 1) and 0xFF)
-        val temporaryBasal = TemporaryBasal(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
-        val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
+        val datetime: Long
+        val param1 = intFromBuffMsbLsb(data, 7, 2)
+        val param2 = intFromBuffMsbLsb(data, 9, 2)
+        val pumpId: Long
+        var id = 0
+        if (!danaPump.usingUTC) {
+            datetime = dateTimeSecFromBuff(data, 1) // 6 bytes
+            pumpId = datetime
+        } else {
+            datetime = intFromBuffMsbLsb(data, 3, 4) * 1000L
+            recordCode = intFromBuff(data, 2, 1).toByte()
+            id = intFromBuffMsbLsb(data, 0, 2) // range only 1-2000
+            pumpId = datetime shl 16 + id
+        }
+        val temporaryBasal = TemporaryBasal(injector).date(datetime).source(Source.PUMP).pumpId(pumpId)
+        val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(pumpId)
         val status: String
         when (recordCode.toInt()) {
             DanaPump.TEMPSTART         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
@@ -94,13 +104,13 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaPump.TEMPSTOP          -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaPump.EXTENDEDSTART     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
@@ -108,7 +118,7 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaPump.EXTENDEDSTOP      -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
@@ -121,7 +131,7 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
@@ -133,12 +143,12 @@ open class DanaRS_Packet_APS_History_Events(
                 detailedBolusInfo.pumpId = datetime
                 detailedBolusInfo.insulin = param1 / 100.0
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(detailedBolusInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
             DanaPump.DUALEXTENDEDSTART -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
@@ -146,37 +156,37 @@ open class DanaRS_Packet_APS_History_Events(
             }
 
             DanaPump.DUALEXTENDEDSTOP  -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
             DanaPump.SUSPENDON         -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
             DanaPump.SUSPENDOFF        -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
             DanaPump.REFILL            -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
             DanaPump.PRIME             -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
             DanaPump.PROFILECHANGE     -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
@@ -187,17 +197,23 @@ open class DanaRS_Packet_APS_History_Events(
                 emptyCarbsInfo.source = Source.PUMP
                 emptyCarbsInfo.pumpId = datetime
                 val newRecord = activePlugin.activeTreatments.addToHistoryTreatment(emptyCarbsInfo, false)
-                aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
             DanaPump.PRIMECANNULA      -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
 
-            else                                                       -> {
-                aapsLogger.debug(LTag.PUMPCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
+            DanaPump.TIMECHANGE      -> {
+                val oldDateTime = intFromBuffMsbLsb(data, 7, 4) * 1000L
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "EVENT TIMECHANGE(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Previous: " + dateUtil.dateAndTimeString(oldDateTime))
+                status = "TIMECHANGE " + dateUtil.timeString(datetime)
+            }
+
+            else                       -> {
+                aapsLogger.debug(LTag.PUMPCOMM, "[" + id + "] " + "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
         }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
index 67d4643064..802eb09b56 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_Set_Event_History.kt
@@ -1,9 +1,12 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
-import java.util.*
+import info.nightscout.androidaps.logging.LTag
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import javax.inject.Inject
 
 class DanaRS_Packet_APS_Set_Event_History(
     injector: HasAndroidInjector,
@@ -13,29 +16,26 @@ class DanaRS_Packet_APS_Set_Event_History(
     private var param2: Int
 ) : DanaRS_Packet(injector) {
 
+    @Inject lateinit var danaPump: DanaPump
+
     init {
         opCode = BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY
-        if ((packetType == info.nightscout.androidaps.dana.DanaPump.CARBS || packetType == info.nightscout.androidaps.dana.DanaPump.BOLUS) && param1 <= 0) this.param1 = 0
+        if ((packetType == DanaPump.CARBS || packetType == DanaPump.BOLUS) && param1 <= 0) this.param1 = 0
         aapsLogger.debug(LTag.PUMPCOMM, "Set history entry: " + dateUtil.dateAndTimeString(time) + " type: " + packetType + " param1: " + param1 + " param2: " + param2)
     }
 
     override fun getRequestParams(): ByteArray {
-        val cal = GregorianCalendar()
-        cal.timeInMillis = time
-        val year = cal[Calendar.YEAR] - 1900 - 100
-        val month = cal[Calendar.MONTH] + 1
-        val day = cal[Calendar.DAY_OF_MONTH]
-        val hour = cal[Calendar.HOUR_OF_DAY]
-        val min = cal[Calendar.MINUTE]
-        val sec = cal[Calendar.SECOND]
+        val date =
+            if (danaPump.usingUTC) DateTime(time).withZone(DateTimeZone.UTC)
+            else DateTime(time)
         val request = ByteArray(11)
         request[0] = (packetType and 0xff).toByte()
-        request[1] = (year and 0xff).toByte()
-        request[2] = (month and 0xff).toByte()
-        request[3] = (day and 0xff).toByte()
-        request[4] = (hour and 0xff).toByte()
-        request[5] = (min and 0xff).toByte()
-        request[6] = (sec and 0xff).toByte()
+        request[1] = (date.year - 2000 and 0xff).toByte()
+        request[2] = (date.monthOfYear and 0xff).toByte()
+        request[3] = (date.dayOfMonth and 0xff).toByte()
+        request[4] = (date.hourOfDay and 0xff).toByte()
+        request[5] = (date.minuteOfHour and 0xff).toByte()
+        request[6] = (date.secondOfMinute and 0xff).toByte()
         request[7] = (param1 ushr 8 and 0xff).toByte()
         request[8] = (param1 and 0xff).toByte()
         request[9] = (param2 ushr 8 and 0xff).toByte()
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt
new file mode 100644
index 0000000000..5f8be76b2e
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_24_CIR_CF_Array.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import javax.inject.Inject
+
+class DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaPump: DanaPump
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__GET_24_CIR_CF_ARRAY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        danaPump.units = byteArrayToInt(getBytes(data, DATA_START, 1))
+        for (i in 0 .. 23) {
+            val cf =  byteArrayToInt(getBytes(data, DATA_START + 1 + 2 * i, 2)).toDouble()
+            val cir =  if (danaPump.units == DanaPump.UNITS_MGDL)
+                byteArrayToInt(getBytes(data, DATA_START + 1 + 48 + 2 * i, 2)).toDouble()
+            else
+                byteArrayToInt(getBytes(data, DATA_START + 1 + 48 + 2 * i, 2)) / 100.0
+            danaPump.cir24[i] = cir
+            danaPump.cf24[i] = cf
+            aapsLogger.debug(LTag.PUMPCOMM, "$i: CIR: $cir  CF: $cf")
+        }
+        if (danaPump.units < 0 || danaPump.units > 1) failed = true
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__GET_24_ CIR_CF_ARRAY"
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt
new file mode 100644
index 0000000000..7a0e925ab6
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_24_CIR_CF_Array.kt
@@ -0,0 +1,52 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+class DanaRS_Packet_Bolus_Set_24_CIR_CF_Array(
+    injector: HasAndroidInjector,
+    private val profile: Profile?
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaPump: DanaPump
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_BOLUS__SET_24_CIR_CF_ARRAY
+        aapsLogger.debug(LTag.PUMPCOMM, "New message")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val request = ByteArray(96)
+        profile ?: return request // profile is null only in hash table
+        val cfStart = 24 * 2
+        for (i in 0..23) {
+            var isf = profile.getIsfMgdlTimeFromMidnight(i * 3600)
+            if (danaPump.units == DanaPump.UNITS_MMOL) isf *= 10
+            val ic = profile.getIcTimeFromMidnight(i * 3600) * 100
+            request[2 * i] = (isf.toInt() and 0xff).toByte()
+            request[2 * i] = (isf.toInt() ushr 8 and 0xff).toByte()
+            request[cfStart + 2 * i] = (ic.toInt() and 0xff).toByte()
+            request[cfStart + 2 * i] = (ic.toInt() ushr 8 and 0xff).toByte()
+        }
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BOLUS__SET_24_CIR_CF_ARRAY"
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
index c5a0b40ceb..538d9b0bf7 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_History_.kt
@@ -193,11 +193,15 @@ abstract class DanaRS_Packet_History_(
                     val datetimewihtsec = DateTime(2000 + historyYear, historyMonth, historyDay, historyHour, historyMinute, historySecond)
                     danaRHistoryRecord.recordDate = datetimewihtsec.millis
                     var strAlarm = "None"
-                    when (paramByte8.toInt()) {
-                        67 -> strAlarm = "Check"
-                        79 -> strAlarm = "Occlusion"
-                        66 -> strAlarm = "Low Battery"
-                        83 -> strAlarm = "Shutdown"
+                    when (paramByte8) {
+                        'P'.toByte() -> strAlarm = "Basal Compare"
+                        'R'.toByte() -> strAlarm = "Empty Reservoir"
+                        'C'.toByte() -> strAlarm = "Check"
+                        'O'.toByte() -> strAlarm = "Occlusion"
+                        'M'.toByte() -> strAlarm = "Basal max"
+                        'D'.toByte() -> strAlarm = "Daily max"
+                        'B'.toByte() -> strAlarm = "Low Battery"
+                        'S'.toByte() -> strAlarm = "Shutdown"
                     }
                     danaRHistoryRecord.recordAlarm = strAlarm
                     danaRHistoryRecord.recordValue = value * 0.01
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
index fe94033ea8..f397179185 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Alarm.kt
@@ -41,12 +41,18 @@ class DanaRS_Packet_Notify_Alarm(
                 errorString = resourceHelper.gs(R.string.lowbattery)
             0x06       ->  // Basal Compare
                 errorString = resourceHelper.gs(R.string.basalcompare)
-            0x09       ->  // Empty Reservoir
-                errorString = resourceHelper.gs(R.string.emptyreservoir)
             0x07, 0xFF ->  // Blood sugar measurement alert
                 errorString = resourceHelper.gs(R.string.bloodsugarmeasurementalert)
             0x08, 0xFE ->  // Remaining insulin level
                 errorString = resourceHelper.gs(R.string.remaininsulinalert)
+            0x09       ->  // Empty Reservoir
+                errorString = resourceHelper.gs(R.string.emptyreservoir)
+            0x0A       ->  // Check shaft
+                errorString = resourceHelper.gs(R.string.checkshaft)
+            0x0B       ->  // Basal MAX
+                errorString = resourceHelper.gs(R.string.basalmax)
+            0x0C       ->  // Daily MAX
+                errorString = resourceHelper.gs(R.string.dailymax)
             0xFD       ->  // Blood sugar check miss alarm
                 errorString = resourceHelper.gs(R.string.missedbolus)
         }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
index 1b1daf30b7..11659879e3 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_Time.kt
@@ -19,31 +19,19 @@ class DanaRS_Packet_Option_Get_Pump_Time(
     }
 
     override fun handleMessage(data: ByteArray) {
-        var dataIndex = DATA_START
-        var dataSize = 1
-        val year = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val month = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val day = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val hour = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val min = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        dataIndex += dataSize
-        dataSize = 1
-        val sec = byteArrayToInt(getBytes(data, dataIndex, dataSize))
+        val year = byteArrayToInt(getBytes(data, DATA_START, 1))
+        val month = byteArrayToInt(getBytes(data, DATA_START + 1, 1))
+        val day = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
+        val hour = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
+        val min = byteArrayToInt(getBytes(data, DATA_START + 4, 1))
+        val sec = byteArrayToInt(getBytes(data, DATA_START + 5, 1))
         val time = DateTime(2000 + year, month, day, hour, min, sec)
-        danaPump.pumpTime = time.millis
+        danaPump.setPumpTime(time.millis)
         aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time.millis))
     }
 
     override fun handleMessageNotReceived() {
-        danaPump.pumpTime = 0
+        danaPump.resetPumpTime()
     }
 
     override fun getFriendlyName(): String {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt
new file mode 100644
index 0000000000..9f35fcb82c
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import org.joda.time.DateTime
+import javax.inject.Inject
+
+class DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(
+    injector: HasAndroidInjector
+) : DanaRS_Packet(injector) {
+
+    @Inject lateinit var danaPump: DanaPump
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__GET_PUMP_UTC_AND_TIME_ZONE
+        aapsLogger.debug(LTag.PUMPCOMM, "Requesting pump UTC time")
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val year = byteArrayToInt(getBytes(data, DATA_START, 1))
+        val month = byteArrayToInt(getBytes(data, DATA_START + 1, 1))
+        val day = byteArrayToInt(getBytes(data, DATA_START + 2, 1))
+        val hour = byteArrayToInt(getBytes(data, DATA_START + 3, 1))
+        val min = byteArrayToInt(getBytes(data, DATA_START + 4, 1))
+        val sec = byteArrayToInt(getBytes(data, DATA_START + 5, 1))
+        val zoneOffset = getBytes(data, DATA_START + 6, 1)[0].toInt()
+        val time = DateTime(2000 + year, month, day, hour, min, sec)
+        danaPump.setPumpTime(time.millis, zoneOffset)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time ${dateUtil.dateAndTimeString(danaPump.getPumpTime())} ZoneOffset: $zoneOffset")
+    }
+
+    override fun handleMessageNotReceived() {
+        danaPump.resetPumpTime()
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__GET_PUMP_UTC_AND_TIMEZONE"
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt
new file mode 100644
index 0000000000..3fbf79a388
--- /dev/null
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.danars.comm
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.danars.encryption.BleEncryption
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+
+class DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(
+    injector: HasAndroidInjector,
+    private var time: Long = 0,
+    private var zoneOffset: Int = 0
+) : DanaRS_Packet(injector) {
+
+    var error = 0
+
+    init {
+        opCode = BleEncryption.DANAR_PACKET__OPCODE_OPTION__SET_PUMP_UTC_AND_TIME_ZONE
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting UTC pump time ${dateUtil.dateAndTimeString(time)} ZoneOffset: $zoneOffset")
+    }
+
+    override fun getRequestParams(): ByteArray {
+        val date = DateTime(time).withZone(DateTimeZone.UTC)
+        val request = ByteArray(7)
+        request[0] = (date.year - 2000 and 0xff).toByte()
+        request[1] = (date.monthOfYear and 0xff).toByte()
+        request[2] = (date.dayOfMonth and 0xff).toByte()
+        request[3] = (date.hourOfDay and 0xff).toByte()
+        request[4] = (date.minuteOfHour and 0xff).toByte()
+        request[5] = (date.secondOfMinute and 0xff).toByte()
+        request[6] = zoneOffset.toByte()
+        return request
+    }
+
+    override fun handleMessage(data: ByteArray) {
+        val result = intFromBuff(data, 0, 1)
+        if (result == 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "Result OK")
+            failed = false
+        } else {
+            aapsLogger.error("Result Error: $result")
+            failed = true
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "OPTION__SET_PUMP_UTC_AND_TIMEZONE"
+    }
+}
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
index cb7a0dcfcd..f239525f85 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/di/DanaRSCommModule.kt
@@ -25,6 +25,7 @@ abstract class DanaRSCommModule {
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Calculation_Information(): DanaRS_Packet_Bolus_Get_Calculation_Information
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information(): DanaRS_Packet_Bolus_Get_Carbohydrate_Calculation_Information
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_CIR_CF_Array(): DanaRS_Packet_Bolus_Get_CIR_CF_Array
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_24_CIR_CF_Array(): DanaRS_Packet_Bolus_Get_24_CIR_CF_Array
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Dual_Bolus(): DanaRS_Packet_Bolus_Get_Dual_Bolus
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus(): DanaRS_Packet_Bolus_Get_Extended_Bolus
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Get_Extended_Bolus_State(): DanaRS_Packet_Bolus_Get_Extended_Bolus_State
@@ -33,6 +34,7 @@ abstract class DanaRSCommModule {
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Bolus_Option(): DanaRS_Packet_Bolus_Set_Bolus_Option
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Initial_Bolus(): DanaRS_Packet_Bolus_Set_Initial_Bolus
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_CIR_CF_Array(): DanaRS_Packet_Bolus_Set_CIR_CF_Array
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_24_CIR_CF_Array(): DanaRS_Packet_Bolus_Set_24_CIR_CF_Array
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Dual_Bolus(): DanaRS_Packet_Bolus_Set_Dual_Bolus
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus(): DanaRS_Packet_Bolus_Set_Extended_Bolus
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel(): DanaRS_Packet_Bolus_Set_Extended_Bolus_Cancel
@@ -76,4 +78,6 @@ abstract class DanaRSCommModule {
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_APS_Set_Event_History(): DanaRS_Packet_APS_Set_Event_History
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_General_Get_Shipping_Version(): DanaRS_Packet_General_Get_Shipping_Version
     @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Review_Get_Pump_Dec_Ratio(): DanaRS_Packet_Review_Get_Pump_Dec_Ratio
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(): DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone
+    @ContributesAndroidInjector abstract fun contributesDanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(): DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone
 }
\ No newline at end of file
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java b/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
index 418881d6df..fbb441e223 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/encryption/BleEncryption.java
@@ -75,6 +75,8 @@ public class BleEncryption {
     public static final int DANAR_PACKET__OPCODE_BOLUS__SET_CIR_CF_ARRAY = 0x4F;
     public static final int DANAR_PACKET__OPCODE_BOLUS__GET_BOLUS_OPTION = 0x50;
     public static final int DANAR_PACKET__OPCODE_BOLUS__SET_BOLUS_OPTION = 0x51;
+    public static final int DANAR_PACKET__OPCODE_BOLUS__GET_24_CIR_CF_ARRAY = 0x52;
+    public static final int DANAR_PACKET__OPCODE_BOLUS__SET_24_CIR_CF_ARRAY = 0x53;
 
     public static final int DANAR_PACKET__OPCODE_BASAL__SET_TEMPORARY_BASAL = 0x60;
     public static final int DANAR_PACKET__OPCODE_BASAL__TEMPORARY_BASAL_STATE = 0x61;
@@ -104,6 +106,12 @@ public class BleEncryption {
     // Easy Mode
     public static final int DANAR_PACKET__OPCODE_OPTION__GET_EASY_MENU_OPTION = 0x74;
     public static final int DANAR_PACKET__OPCODE_OPTION__SET_EASY_MENU_OPTION = 0x75;
+    public static final int DANAR_PACKET__OPCODE_OPTION__GET_EASY_MENU_STATUS = 0x76;
+    public static final int DANAR_PACKET__OPCODE_OPTION__SET_EASY_MENU_STATUS = 0x77;
+    public static final int DANAR_PACKET__OPCODE_OPTION__GET_PUMP_UTC_AND_TIME_ZONE = 0x78;
+    public static final int DANAR_PACKET__OPCODE_OPTION__SET_PUMP_UTC_AND_TIME_ZONE = 0x79;
+    public static final int DANAR_PACKET__OPCODE_OPTION__GET_PUMP_TIME_ZONE = 0x7A;
+    public static final int DANAR_PACKET__OPCODE_OPTION__SET_PUMP_TIME_ZONE = 0x7B;
 
     public static final int DANAR_PACKET__OPCODE_ETC__SET_HISTORY_SAVE = 0xE0;
     public static final int DANAR_PACKET__OPCODE_ETC__KEEP_CONNECTION = 0xFF;
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index ad5023a849..b1f472decf 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -43,6 +43,9 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.abs
 import kotlin.math.min
@@ -110,6 +113,21 @@ class DanaRSService : DaggerService() {
 
     fun readPumpStatus() {
         try {
+            val now = System.currentTimeMillis()
+            val pump = activePlugin.activePump
+            if (danaPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
+                sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
+                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
+                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
+                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
+                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
+                if (danaPump.profile24) sendMessage(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
+                else sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
+                sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
+                danaPump.lastSettingsRead = now
+            }
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
             sendMessage(DanaRS_Packet_General_Initial_Screen_Information(injector))
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)))
@@ -120,7 +138,6 @@ class DanaRSService : DaggerService() {
             sendMessage(DanaRS_Packet_Basal_Get_Temporary_Basal_State(injector))
             danaPump.lastConnection = System.currentTimeMillis()
             val profile = profileFunction.getProfile()
-            val pump = activePlugin.activePump
             if (profile != null && abs(danaPump.currentBasal - profile.basal) >= pump.pumpDescription.basalStep) {
                 rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
                 sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
@@ -129,9 +146,10 @@ class DanaRSService : DaggerService() {
                 }
             }
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
-            sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
-            var timeDiff = (danaPump.pumpTime - System.currentTimeMillis()) / 1000L
-            if (danaPump.pumpTime == 0L) {
+            if (danaPump.usingUTC) sendMessage(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
+            else sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
+            var timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L
+            if (danaPump.getPumpTime() == 0L) {
                 // initial handshake was not successful
                 // de-initialize pump
                 danaPump.reset()
@@ -139,19 +157,6 @@ class DanaRSService : DaggerService() {
                 rxBus.send(EventInitializationChanged())
                 return
             }
-            val now = System.currentTimeMillis()
-            if (danaPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
-                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
-                sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
-                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
-                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
-                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
-                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
-                sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
-                sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
-                danaPump.lastSettingsRead = now
-            }
             aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
             if (abs(timeDiff) > 3) {
                 if (abs(timeDiff) > 60 * 60 * 1.5) {
@@ -170,15 +175,22 @@ class DanaRSService : DaggerService() {
                     rxBus.send(EventInitializationChanged())
                     return
                 } else {
-                    if (danaPump.protocol >= 6) {
+                    if (danaPump.usingUTC) {
+                        val tz = DateTimeZone.getDefault()
+                        val instant = DateTime.now().millis
+                        val offsetInMilliseconds = tz.getOffset(instant).toLong()
+                        val hours = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds).toInt()
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector, DateUtil.now(), hours))
+                    } else if (danaPump.protocol >= 6) { // can set seconds
                         sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now()))
                     } else {
                         waitForWholeMinute() // Dana can set only whole minute
                         // add 10sec to be sure we are over minute (will be cut off anyway)
                         sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now() + T.secs(10).msecs()))
                     }
-                    sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
-                    timeDiff = (danaPump.pumpTime - System.currentTimeMillis()) / 1000L
+                    if (danaPump.usingUTC) sendMessage(DanaRS_Packet_Option_Get_Pump_UTC_And_TimeZone(injector))
+                    else sendMessage(DanaRS_Packet_Option_Get_Pump_Time(injector))
+                    timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
                 }
             }

From 6229161c9692ec7699f4e34e62ce481f61f52989 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Tue, 19 May 2020 19:32:27 +0200
Subject: [PATCH 113/400] Add constraintChecker for autosens icon in overview

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 1188caccf7..93c112f745 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -757,7 +757,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_uploader?.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.uploader), nsDeviceStatus.extendedUploaderStatus) } }
 
         // Sensitivity
-        if (sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
+        if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
         }else {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green)

From 6a837708828bb456f67633866be5211561949579 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Tue, 19 May 2020 20:22:19 +0200
Subject: [PATCH 114/400] Fix issue #2594 (crash when Preferences are opened on
 Wear variant)

---
 wear/src/main/res/xml/preferences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wear/src/main/res/xml/preferences.xml b/wear/src/main/res/xml/preferences.xml
index e8e48e3f51..3c114cb59c 100644
--- a/wear/src/main/res/xml/preferences.xml
+++ b/wear/src/main/res/xml/preferences.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <CheckBoxPreference
@@ -244,4 +244,4 @@
         android:key="version_number"
         android:summary="Input Design"
         android:title="@string/pref_version" />
-</androidx.preference.PreferenceScreen>
+</PreferenceScreen>

From cbf830353cb05221f37ad84044c4f0ab1949b299 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 19 May 2020 21:22:29 +0200
Subject: [PATCH 115/400] New Crowdin translations (#2645)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.xml (Swedish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (German)

* New translations strings.xml (French)
---
 app/src/main/res/values-fr-rFR/strings.xml  |  2 +-
 app/src/main/res/values-pt-rPT/exam.xml     |  2 +-
 app/src/main/res/values-pt-rPT/strings.xml  | 22 ++++----
 app/src/main/res/values-sv-rSE/exam.xml     |  2 +-
 app/src/main/res/values-sv-rSE/strings.xml  | 14 ++---
 core/src/main/res/values-fr-rFR/strings.xml |  2 +-
 core/src/main/res/values-pt-rPT/strings.xml |  4 +-
 dana/src/main/res/values-de-rDE/strings.xml |  3 ++
 dana/src/main/res/values-pt-rBR/strings.xml | 57 ++++++++++++++++++++-
 dana/src/main/res/values-pt-rPT/strings.xml |  3 ++
 10 files changed, 85 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index f9e0d10cc5..ce6f943445 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -567,7 +567,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smbmaxminutes_summary">Max. minutes de basal pour limiter le SMB</string>
     <string name="uamsmbmaxminutes">SMB RNS minutes max</string>
     <string name="uamsmbmaxminutes_summary">Minutes de basal max pour limiter les SMB des RNS</string>
-    <string name="carbsReqThreshold">Seuil de suggestionde glucides</string>
+    <string name="carbsReqThreshold">Seuil de suggestion de glucides</string>
     <string name="carbsReqThreshold_summary">Quantité de glucides à partir de laquelle une notification est envoyée</string>
     <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index cf9f53bcf4..737c4c23a9 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -115,7 +115,7 @@
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Tópico: Monitorização Remota</string>
     <string name="nsclient_howcanyou">Como pode monitorizar AAPS do seu filho remotamente?</string>
-    <string name="nsclient_nightscout">A usar um site Nightscout.</string>
+    <string name="nsclient_nightscout">Usando um site Nightscout.</string>
     <string name="nsclient_dexcomfollow">App Dex om Follow se estiver a usar a app original Dexcom (Glic apenas).</string>
     <string name="nsclient_dexcomfollowxdrip">Dexcom Follow se estiver a usar a app xDrip.</string>
     <string name="nsclient_xdripfollower">xDrip a correr no modo seguidor.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1b8cc9057a..f496fef1ea 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -143,7 +143,7 @@
     <string name="careportal_newnstreatment_other">Outro</string>
     <string name="careportal_newnstreatment_meter">Medidor</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
-    <string name="careportal_newnstreatment_carbs_label">Hidratos de Carbono</string>
+    <string name="careportal_newnstreatment_carbs_label">Hidratos</string>
     <string name="careportal_newnstreatment_insulin_label">Insulina</string>
     <string name="careportal_newnstreatment_carbtime_label">Tempo Hidratos</string>
     <string name="careportal_newnstreatment_split_label">Dividir</string>
@@ -370,12 +370,12 @@
     <string name="executing">A Executar</string>
     <string name="virtualpump_settings">Definições da bomba virtual</string>
     <string name="virtualpump_uploadstatus_title">Enviar estado para NS</string>
-    <string name="nsclientinternal">NSCliente</string>
-    <string name="nsclientinternal_shortname">NSCI</string>
+    <string name="nsclientinternal">ClienteNS</string>
+    <string name="nsclientinternal_shortname">CLNS</string>
     <string name="nsclientinternal_url">URL:</string>
     <string name="nsclientinternal_autoscroll">Rolar automático</string>
     <string name="restart">Reiniciar</string>
-    <string name="nsclientinternal_title">NSCliente</string>
+    <string name="nsclientinternal_title">ClienteNS</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
     <string name="nsclientinternal_url_dialogmessage">Introduza o Nightscout URL</string>
     <string name="nsclientinternal_secret_title">NS API secret</string>
@@ -388,7 +388,7 @@
     <string name="status">Estado:</string>
     <string name="paused">Em pausa</string>
     <string name="clearlog">Limpar Registo</string>
-    <string name="nowritepermission">NSCliente sem permissões para alterar dados. Tem a senha API correta?</string>
+    <string name="nowritepermission">ClienteNS sem permissões para alterar dados. Tem a senha API correta?</string>
     <string name="wear_settings">Definições Wear</string>
     <string name="wear_detailedIOB_title">Mostrar IOB detalhada</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
@@ -506,7 +506,7 @@
     <string name="mdtp_cancel">Cancelar</string>
     <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
     <string name="valuesnotstored">Valores não guardados!</string>
-    <string name="ns_localbroadcasts">Activar transmissões para outras aplicações (como xDrip). Não habilite se tiver mais de uma instância de AAPS ou NSClient instalado!</string>
+    <string name="ns_localbroadcasts">Activar transmissões para outras aplicações (como xDrip). Não habilite se tiver mais de uma instância de AAPS ou ClienteNS instalado!</string>
     <string name="ns_localbroadcasts_title">Activar partilha local.</string>
     <string name="careportal_activity_label">ACTIVIDADE &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">HIDRATOS &amp; BÓLUS</string>
@@ -570,7 +570,7 @@
     <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
-    <string name="nsclientbg">Glic NSCliente</string>
+    <string name="nsclientbg">Glic ClienteNS</string>
     <string name="overview_editquickwizard_usebg">Cálculos Glic</string>
     <string name="overview_editquickwizard_usebolusiob">Cálculo de Bólus IOB</string>
     <string name="overview_editquickwizard_usebasaliob">Cálculo de Basal IOB</string>
@@ -584,7 +584,7 @@
     <string name="overview_editquickwizard_usetemptarget">Cálculo alvo temporário</string>
     <string name="loopenabled">Loop activado</string>
     <string name="apsselected">APS seleccionado</string>
-    <string name="nsclienthaswritepermission">NSCLiente tem permissão de escrita</string>
+    <string name="nsclienthaswritepermission">ClienteNS tem permissão de escrita</string>
     <string name="closedmodeenabled">Modo fechado ativado</string>
     <string name="maxiobset">IOB máxima definida correctamente</string>
     <string name="hasbgdata">Glicemia disponivel desde a fonte selecionada</string>
@@ -759,7 +759,7 @@
     <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
     <string name="wear_display_settings">Configurações Ecrã</string>
     <string name="wear_general_settings">Configurações Gerais</string>
-    <string name="enable_nsclient">Activar NSCliente</string>
+    <string name="enable_nsclient">Activar ClienteNS</string>
     <string name="welcometosetupwizard">Bem-vindo ao assistente de configuração. Vai guiá-lo(a) através do processo de instalação\n</string>
     <string name="pumpsetup">Configurações da bomba</string>
     <string name="readstatus">Ler estado</string>
@@ -770,7 +770,7 @@
     <string name="sensitivitysetup">Configurar plugin Sensibilidade</string>
     <string name="setupwizard_sensitivity_description">Plugin de Sensibilidade é usado para detecção de sensibilidade e cálculos COB. Para mais info visite:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
-    <string name="nsclientinfotext">NSCliente gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objectivos até que o configure.</string>
+    <string name="nsclientinfotext">ClienteNS gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objectivos até que o configure.</string>
     <string name="diawarning">Lembre-se: novos perfis de insulina requerem diâmetro de pelo menos 5h. DIA 5–6h no novo perfil é igual ao diâmetro 3h nos antigos perfis de insulina.</string>
     <string name="bgsourcesetup">Configure a fonte das glicemias</string>
     <string name="setupwizard_profile_description">Por favor seleccione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o activar executando \"Troca Perfil\"</string>
@@ -821,7 +821,7 @@
     <string name="openaps_noasdata">Sem dados Autosens disponíveis</string>
     <string name="nav_logsettings">Definições de registo</string>
     <string name="resettodefaults">Repor definições por defeito</string>
-    <string name="nsmalfunction">Erro de funcionamento do NSCliente. Pondere reiniciar o NS e NSCliente.</string>
+    <string name="nsmalfunction">Erro de funcionamento do ClienteNS. Pondere reiniciar o NS e ClienteNS.</string>
     <string name="as">AS</string>
     <string name="versionavailable">Disponível %1$s disponível</string>
     <string name="time_offset">Fuso horário</string>
diff --git a/app/src/main/res/values-sv-rSE/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
index 507b63f02f..5a94009f00 100644
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -130,7 +130,7 @@
     <string name="isf_profile">Om du ändrar ISF-värdet i din profil är det tillräckligt för att tillämpa ändringen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Ämne: IC-kvoten</string>
+    <string name="ic_label">Ämne: KH-kvot</string>
     <string name="ic_increasingvalue">Högre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_decreasingvalue">Lägre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_noeffect">Om du har 0 COB, kommer en förändring av IC-kvoten leda till en annan mängd insulin för att korrigera din BG-nivå.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 511f476671..0f432004a8 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -132,12 +132,12 @@ Eversense-appen.</string>
     <string name="closedloop">Closed Loop</string>
     <string name="openloop">Open Loop</string>
     <string name="lowglucosesuspend">Stopp innan lågt</string>
-    <string name="disabledloop">Loop avstängd</string>
+    <string name="disabledloop">Loop inaktiverad</string>
     <string name="disableloop">Inaktivera loop</string>
     <string name="enableloop">Aktivera loop</string>
     <string name="openloop_newsuggestion">Ny rekommendation tillgänglig</string>
     <string name="unsupportednsversion">Versionen av Nightscout stöds inte</string>
-    <string name="loopdisabled">LOOP STOPPAD PGA BEGRÄNSNINGAR</string>
+    <string name="loopdisabled">LOOP INAKTIVERAD PGA BEGRÄNSNINGAR</string>
     <string name="treatments_wizard_basaliob_label">IOB från basal</string>
     <string name="bolusconstraintapplied">Bolusspärr aktiverad</string>
     <string name="carbsconstraintapplied">Kolhydratsspärr aktiverad</string>
@@ -251,9 +251,9 @@ Eversense-appen.</string>
     <string name="uploading">Laddar upp</string>
     <string name="bolusstopped">Bolus avbruten</string>
     <string name="bolusstopping">Avbryter bolus</string>
-    <string name="smscommunicator_loophasbeendisabled">Loop stängdes av. </string>
-    <string name="smscommunicator_loophasbeenenabled">Loop aktiverades</string>
-    <string name="smscommunicator_loopisdisabled">Loop är avstängd</string>
+    <string name="smscommunicator_loophasbeendisabled">Loop inaktiverad.</string>
+    <string name="smscommunicator_loophasbeenenabled">Loop aktiverad</string>
+    <string name="smscommunicator_loopisdisabled">Loop är inaktiverad</string>
     <string name="smscommunicator_loopisenabled">Loop är aktiverad</string>
     <string name="valuelimitedto">%1$.2f begränsat till %2$.2f</string>
     <string name="valueoutofrange">Värdet %1$s är utanför hård begränsning</string>
@@ -423,7 +423,7 @@ Eversense-appen.</string>
     <string name="resume">Återuppta</string>
     <string name="reconnect">Återanslut Pump</string>
     <string name="smscommunicator_wrongduration">Fel duration</string>
-    <string name="smscommunicator_loopsuspended">Loop pausad. </string>
+    <string name="smscommunicator_loopsuspended">Loop pausad</string>
     <string name="smscommunicator_loopresumed">Loop återupptagen</string>
     <string name="treatments_wizard_bgtrend_label">15 min trend</string>
     <string name="treatments_wizard_cob_label">COB</string>
@@ -675,7 +675,7 @@ Eversense-appen.</string>
     <string name="overview_show_basals">Basaler</string>
     <string name="no_action_selected">Ingen åtgärd vald. Inget ändras.</string>
     <string name="start_hypo_tt">Starta \"Hypo\"</string>
-    <string name="closed_loop_disabled_on_dev_branch">Du kör nu dev-versionen. Closed Loop inte tillåtet.</string>
+    <string name="closed_loop_disabled_on_dev_branch">Du kör nu dev-versionen. Closed Loop inaktiverat.</string>
     <string name="engineering_mode_enabled">Engineering Mode aktiverat</string>
     <string name="not_eng_mode_or_release">Engineering Mode inte aktiverat och appen körs inte som release</string>
     <string name="combo_actvity_reading_basal_profile">Läser basalprofil</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 85f5ce3e2f..4f7e558f4d 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -10,7 +10,7 @@
     <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
     <string name="goingtodeliver">%1$.2fU vont être injectées</string>
     <string name="waitingforpump">Attente connection pompe</string>
-    <string name="connectingfor">Connexion à %1$s en cours</string>
+    <string name="connectingfor">Connexion à %1$d en cours</string>
     <string name="bolusdelivering">Injection en cours %1$.2fU</string>
     <string name="handshaking">Connexion</string>
     <string name="connecting">Connection en cours</string>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index eae9d66156..3375afa7a1 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -8,7 +8,7 @@
     <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
     <string name="invalidinput">Entrada Inválida</string>
     <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
-    <string name="goingtodeliver">A ser administrada %1$.2fU</string>
+    <string name="goingtodeliver">Quantidade a ser administrada %1$.2fU</string>
     <string name="waitingforpump">À espera da bomba</string>
     <string name="connectingfor">A ligar durante %1$d s</string>
     <string name="bolusdelivering">A administrar %1$.2fU</string>
@@ -130,7 +130,7 @@
     <string name="careportal_question">Questão</string>
     <string name="careportal_exercise">Exercício</string>
     <string name="careportal_pumpsitechange">Mudança Local Bomba</string>
-    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
+    <string name="careportal_cgmsensorinsert">Colocação Sensor CGM</string>
     <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
     <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
     <string name="careportal_profileswitch">Troca de Perfil</string>
diff --git a/dana/src/main/res/values-de-rDE/strings.xml b/dana/src/main/res/values-de-rDE/strings.xml
index 4d7efc4638..56f9391d6e 100644
--- a/dana/src/main/res/values-de-rDE/strings.xml
+++ b/dana/src/main/res/values-de-rDE/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Pumpenbatterie entladen</string>
     <string name="occlusion">Verstopfung</string>
     <string name="emptyreservoir">Reservoir leer</string>
+    <string name="checkshaft">Gewindestange prüfen</string>
+    <string name="basalmax">max. Basal</string>
+    <string name="dailymax">Tagesmaximum</string>
     <string name="bloodsugarmeasurementalert">Alarm BZ-Messung</string>
     <string name="remaininsulinalert">Restinsulin</string>
     <string name="missedbolus">Versäumter Bolus</string>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index 445b5cfe64..d641178465 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -12,9 +12,11 @@
     <string name="commanderror">Erro no comando</string>
     <string name="speederror">Erro velocidade</string>
     <string name="insulinlimitviolation">Transgressão limite insulina</string>
-    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
+    <string name="boluserrorcode">Pedido: %1$.2fU Administrado: %2$.2fU Código Erro: %3$s</string>
     <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
     <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
+    <string name="resetpairing">Repor as informações de emparelhamento?</string>
+    <string name="dana_model">%1$s\nModelo: %2$02X\nProtocolo: %3$02X\nCódigo: %4$02X</string>
     <string name="processinghistory">A processar acção</string>
     <string name="danar_enableextendedbolus">Habilitar bólus prolongado na bomba</string>
     <string name="overview_bolusprogress_delivered">Administrado</string>
@@ -22,6 +24,7 @@
     <string name="unsupportedfirmware">Firmware bomba não suportado</string>
     <string name="pumperror">Erro Bomba</string>
     <string name="lowbattery">Bateria fraca</string>
+    <string name="basalcompare">A administrar menos que a taxa de base predefinida</string>
     <string name="pumpshutdown">Encerrar Bomba</string>
     <string name="batterydischarged">Bateria da Bomba Descarregada</string>
     <string name="occlusion">Oclusão</string>
@@ -29,6 +32,7 @@
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
     <string name="remaininsulinalert">Nível de insulina restante</string>
     <string name="missedbolus">Bólus não administrado</string>
+    <string name="invalidpairing">Informações de emparelhamento inválidas. A solicitar novo emparelhamento</string>
     <string name="gettingpumpstatus">A obter estado bomba</string>
     <string name="gettingextendedbolusstatus">A procurar o estado do bólus prolongado</string>
     <string name="gettingbolusstatus">A obter estado bólus</string>
@@ -39,7 +43,7 @@
     <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
     <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
     <string name="approachingdailylimit">Aproximação do limite diário de insulina</string>
-    <string name="startingbolus">A iniciar administração de bolus</string>
+    <string name="startingbolus">A iniciar administração de bólus</string>
     <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d seg.</string>
     <string name="stoppingtempbasal">A parar basal temp</string>
     <string name="settingextendedbolus">A configurar bólus prolongado</string>
@@ -61,6 +65,55 @@
     <string name="danar_history_prime">Purgar</string>
     <string name="danar_useroptions">Opções do utilizador</string>
     <string name="danar_timedisplay">Formato hora</string>
+    <string name="danar_buttonscroll">Botão rolamento</string>
+    <string name="danar_beep">Sinal ao pressionar botão</string>
+    <string name="danar_pumpalarm">Alarme</string>
+    <string name="danar_pumpalarm_sound">Som</string>
+    <string name="danar_pumpalarm_vibrate">Vibrar</string>
+    <string name="danar_pumpalarm_both">Ambos</string>
+    <string name="danar_screentimeout">LCD na hora [segundos]</string>
+    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
+    <string name="danar_glucoseunits">Unidades de Glicose</string>
+    <string name="danar_shutdown">Desligar [horas]</string>
+    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
+    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
+    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
+    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware actualizado</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
+    <string name="devicenotfound">Dispositivo seleccionado não foi encontrado</string>
+    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
+    <string name="danarkoreanpump">DanaR Coreana</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Desactivar modo EasyUI na bomba</string>
+    <string name="profile_set_failed">Não foi possível configurar o perfil de basal</string>
+    <string name="danar_bluetooth_status">Estado Bluetooth</string>
+    <string name="danar_iob_label">IOB Bomba</string>
+    <string name="basal_step">Incremento Basal</string>
+    <string name="bolus_step">Incremento Bólus</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Ligado</string>
+    <string name="option_off">Desligado</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danars_password_title">Senha da bomba (apenas v1)</string>
+    <string name="danar_password_title">Senha da bomba</string>
     <string name="danar_useextended_title">Usar bólus prolongado por &gt;200%%</string>
     <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
+    <string name="bolusspeed">Velocidade Bólus</string>
+    <string name="selectedpump">Bomba seleccionada</string>
+    <string name="rs_loginsulinchange_title">Registar mudança de reservatório</string>
+    <string name="rs_loginsulinchange_summary">Adicionar evento \"Mudança de Insulina\" ao careportal quando detectado no histórico</string>
+    <string name="rs_logcanulachange_title">Registar mudança de canula</string>
+    <string name="rs_logcanulachange_summary">Adicionar evento \"Mudança Local Bomba\" ao careportal, quando detectado no histórico</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Pressione OK na bomba\ne digite os 2 números mostrados\nManter o visor da bomba ligado, pressionando o botão menos até que você termine a digitação do código.</string>
+    <string name="num1pin">1: (12 dígitos)</string>
+    <string name="num2pin">2: (8 dígitos)</string>
 </resources>
diff --git a/dana/src/main/res/values-pt-rPT/strings.xml b/dana/src/main/res/values-pt-rPT/strings.xml
index d641178465..2a9b392910 100644
--- a/dana/src/main/res/values-pt-rPT/strings.xml
+++ b/dana/src/main/res/values-pt-rPT/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Bateria da Bomba Descarregada</string>
     <string name="occlusion">Oclusão</string>
     <string name="emptyreservoir">Reservatório vazio</string>
+    <string name="checkshaft">Verificar Eixo</string>
+    <string name="basalmax">Máx Basal</string>
+    <string name="dailymax">Máx Diário</string>
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
     <string name="remaininsulinalert">Nível de insulina restante</string>
     <string name="missedbolus">Bólus não administrado</string>

From 9fc84dbeebedd9afece8cb975507d34191de0f5d Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 00:09:31 +1200
Subject: [PATCH 116/400] Add required functions

---
 .../info/nightscout/androidaps/data/Profile.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
index 4aaa5848fb..972730ca3d 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -523,13 +523,28 @@ public class Profile {
         return ret;
     }
 
+    public double getTargetUnits() {
+        if (units.equals(Constants.MGDL)) {
+            return getTargetMgdl(secondsFromMidnight());
+        } else {
+            return getTargetMmol(secondsFromMidnight());
+        }
+    }
+
     public double getTargetMgdl() {
         return getTargetMgdl(secondsFromMidnight());
     }
 
+    public double getTargetMmol() {
+        return getTargetMmol(secondsFromMidnight());
+    }
+
     public double getTargetMgdl(int timeAsSeconds) {
         return toMgdl((getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds)) / 2, units);
     }
+    public double getTargetMmol(int timeAsSeconds) {
+        return toMmol((getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds)) / 2, units);
+    }
 
     public double getTargetLowMgdl() {
         return toMgdl(getTargetLowTimeFromMidnight(secondsFromMidnight()), units);

From 3c2d5ff3d6d67676a7a6fef22268be1609be51be Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 00:10:16 +1200
Subject: [PATCH 117/400] Add targetBG

---
 app/src/main/assets/OpenAPSSMB/determine-basal.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index 00a9c1d0a2..fbc0a4de9f 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -407,6 +407,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
         , 'bg': bg
         , 'tick': tick
         , 'eventualBG': eventualBG
+        , 'targetBG': target_bg
         , 'insulinReq': 0
         , 'reservoir' : reservoir_data // The expected reservoir volume at which to deliver the microbolus (the reservoir volume from right before the last pumphistory run)
         , 'deliverAt' : deliverAt // The time at which the microbolus should be delivered

From a20008c0dbb6035c025808257ad80fdd9bfed83c Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 00:10:51 +1200
Subject: [PATCH 118/400] Add TargetBG

---
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.java        | 3 +++
 .../info/nightscout/androidaps/plugins/aps/loop/APSResult.java | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index dae170d5d9..f8f72c6c87 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -51,6 +51,9 @@ public class DetermineBasalResultSMB extends APSResult {
             } else {
                 smb = 0d;
             }
+            if (result.has("targetBG")) {
+                targetBG = result.getDouble("targetBG");
+            }
 
             if (result.has("deliverAt")) {
                 String date = result.getString("deliverAt");
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 84ab8e5661..359ed88560 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -62,6 +62,7 @@ public class APSResult {
     public boolean hasPredictions = false;
     public double smb = 0d; // super micro bolus in units
     public long deliverAt = 0;
+    public double targetBG = 0d;
 
     public Constraint<Double> inputConstraints;
 
@@ -184,6 +185,7 @@ public class APSResult {
         newResult.smbConstraint = smbConstraint;
         newResult.percent = percent;
         newResult.usePercent = usePercent;
+        newResult.targetBG = targetBG;
     }
 
 

From 77a5af75e22f5115b637404606057b926361a16c Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 00:11:36 +1200
Subject: [PATCH 119/400] Display when Target BG is overidden

---
 .../general/overview/OverviewFragment.kt      | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 93c112f745..d3038090b6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -646,6 +646,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         } else {
             overview_apsmode_text?.visibility = View.GONE
         }
+        val lastRun = loopPlugin.lastRun
 
         // temp target
         val tempTarget = treatmentsPlugin.tempTargetFromHistory
@@ -654,9 +655,27 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
             overview_temptarget?.text = Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units) + " " + DateUtil.untilString(tempTarget.end(), resourceHelper)
         } else {
-            overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
-            overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-            overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
+            //If the target is not the same as set in the profile then oref has overridden it
+            //show this change to the user if it exists
+            if (lastRun != null){
+                var targetused = lastRun!!.constraintsProcessed!!.targetBG
+                if (units == Constants.MMOL)
+                    targetused *= Constants.MGDL_TO_MMOLL
+
+                if (profile.targetUnits != targetused) {
+                    overview_temptarget?.text = targetused.toString()
+                    overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
+                    overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
+                }else{
+                    overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
+                    overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
+                    overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
+                }
+            }else {
+                overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
+                overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
+                overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
+            }
         }
 
         // Basal, TBR
@@ -741,7 +760,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         }
         overview_cob?.text = cobText
 
-        val lastRun = loopPlugin.lastRun
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
 
         // pump status from ns

From 723c0292289ee4c441ec5d9b94ac245cdb57ef1a Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 02:20:38 +1200
Subject: [PATCH 120/400] Deal with 0.0 if AMA is used

---
 .../plugins/general/overview/OverviewFragment.kt     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index d3038090b6..547dc3d85b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -657,8 +657,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         } else {
             //If the target is not the same as set in the profile then oref has overridden it
             //show this change to the user if it exists
-            if (lastRun != null){
-                var targetused = lastRun!!.constraintsProcessed!!.targetBG
+            var targetused = lastRun?.constraintsProcessed?.targetBG
+            if (targetused != null && targetused != 0.0) {
                 if (units == Constants.MMOL)
                     targetused *= Constants.MGDL_TO_MMOLL
 
@@ -666,12 +666,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                     overview_temptarget?.text = targetused.toString()
                     overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                     overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
-                }else{
+                } else {
                     overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                     overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
                     overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
                 }
-            }else {
+            } else {
                 overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                 overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
                 overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
@@ -696,7 +696,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (activeTemp != null)
             overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
         else
-            overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
+            overview_basebasal_icon.setImageResource(R.drawable.icon_cp_basal_no_tbr)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
@@ -777,7 +777,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         // Sensitivity
         if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
-        }else {
+        } else {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green)
         }
 

From bf412ea798c85488fe28d62c7b69a312f3fae2a6 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 04:19:22 +1200
Subject: [PATCH 121/400] refractor

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 547dc3d85b..3891ba6b7e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -659,11 +659,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             //show this change to the user if it exists
             var targetused = lastRun?.constraintsProcessed?.targetBG
             if (targetused != null && targetused != 0.0) {
-                if (units == Constants.MMOL)
-                    targetused *= Constants.MGDL_TO_MMOLL
 
-                if (profile.targetUnits != targetused) {
-                    overview_temptarget?.text = targetused.toString()
+                if (((profile.targetLowMgdl+profile.targetHighMgdl)/2)!= targetused) {
+                    overview_temptarget?.text = Profile.toTargetRangeString(targetused, targetused, Constants.MGDL, units)
                     overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                     overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
                 } else {

From e053d3601db7729f776113d2e96f72c32b1970e7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 20 May 2020 19:36:22 +0200
Subject: [PATCH 122/400] regional independent test

---
 .../androidaps/utils/DecimalFormatterTest.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
index e02e5fe28b..a7112fae48 100644
--- a/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/utils/DecimalFormatterTest.java
@@ -10,26 +10,26 @@ public class DecimalFormatterTest {
 
     @Test
     public void to0DecimalTest() {
-        Assert.assertEquals("1", DecimalFormatter.to0Decimal(1.33d));
-        Assert.assertEquals("1U", DecimalFormatter.to0Decimal(1.33d, "U"));
+        Assert.assertEquals("1", DecimalFormatter.to0Decimal(1.33d).replace(",", "."));
+        Assert.assertEquals("1U", DecimalFormatter.to0Decimal(1.33d, "U").replace(",", "."));
     }
 
     @Test
     public void to1DecimalTest() {
-        Assert.assertEquals("1.3", DecimalFormatter.to1Decimal(1.33d));
-        Assert.assertEquals("1.3U", DecimalFormatter.to1Decimal(1.33d, "U"));
+        Assert.assertEquals("1.3", DecimalFormatter.to1Decimal(1.33d).replace(",", "."));
+        Assert.assertEquals("1.3U", DecimalFormatter.to1Decimal(1.33d, "U").replace(",", "."));
     }
 
     @Test
     public void to2DecimalTest() {
-        Assert.assertEquals("1.33", DecimalFormatter.to2Decimal(1.3333d));
-        Assert.assertEquals("1.33U", DecimalFormatter.to2Decimal(1.3333d, "U"));
+        Assert.assertEquals("1.33", DecimalFormatter.to2Decimal(1.3333d).replace(",", "."));
+        Assert.assertEquals("1.33U", DecimalFormatter.to2Decimal(1.3333d, "U").replace(",", "."));
     }
 
     @Test
     public void to3DecimalTest() {
-        Assert.assertEquals("1.333", DecimalFormatter.to3Decimal(1.3333d));
-        Assert.assertEquals("1.333U", DecimalFormatter.to3Decimal(1.3333d, "U"));
+        Assert.assertEquals("1.333", DecimalFormatter.to3Decimal(1.3333d).replace(",", "."));
+        Assert.assertEquals("1.333U", DecimalFormatter.to3Decimal(1.3333d, "U").replace(",", "."));
     }
 
     @Test

From 06e97400f7fe07ddfbe327c0cef93316c0826d8f Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Wed, 20 May 2020 22:34:09 +0200
Subject: [PATCH 123/400] Simplify show-targets view logic

---
 .../general/overview/OverviewFragment.kt      | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 3891ba6b7e..c9ea872345 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -655,20 +655,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
             overview_temptarget?.text = Profile.toTargetRangeString(tempTarget.low, tempTarget.high, Constants.MGDL, units) + " " + DateUtil.untilString(tempTarget.end(), resourceHelper)
         } else {
-            //If the target is not the same as set in the profile then oref has overridden it
-            //show this change to the user if it exists
-            var targetused = lastRun?.constraintsProcessed?.targetBG
-            if (targetused != null && targetused != 0.0) {
+            // If the target is not the same as set in the profile then oref has overridden it
+            val targetUsed = lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
-                if (((profile.targetLowMgdl+profile.targetHighMgdl)/2)!= targetused) {
-                    overview_temptarget?.text = Profile.toTargetRangeString(targetused, targetused, Constants.MGDL, units)
-                    overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
-                    overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
-                } else {
-                    overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
-                    overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-                    overview_temptarget?.text = Profile.toTargetRangeString(profile.targetLowMgdl, profile.targetHighMgdl, Constants.MGDL, units)
-                }
+            if (targetUsed != 0.0 && profile.targetMgdl != targetUsed) {
+                overview_temptarget?.text = Profile.toTargetRangeString(targetUsed, targetUsed, Constants.MGDL, units)
+                overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
+                overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))
             } else {
                 overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                 overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
@@ -899,4 +892,4 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
         }
     }
-}
\ No newline at end of file
+}

From 87782377a58f4b0f98d8e060e2deab31f4d2e930 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 21 May 2020 10:21:37 +1200
Subject: [PATCH 124/400] Remove not needed functions

---
 .../info/nightscout/androidaps/data/Profile.java | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
index 972730ca3d..21eb288c09 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -523,29 +523,13 @@ public class Profile {
         return ret;
     }
 
-    public double getTargetUnits() {
-        if (units.equals(Constants.MGDL)) {
-            return getTargetMgdl(secondsFromMidnight());
-        } else {
-            return getTargetMmol(secondsFromMidnight());
-        }
-    }
-
     public double getTargetMgdl() {
         return getTargetMgdl(secondsFromMidnight());
     }
 
-    public double getTargetMmol() {
-        return getTargetMmol(secondsFromMidnight());
-    }
-
     public double getTargetMgdl(int timeAsSeconds) {
         return toMgdl((getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds)) / 2, units);
     }
-    public double getTargetMmol(int timeAsSeconds) {
-        return toMmol((getTargetLowTimeFromMidnight(timeAsSeconds) + getTargetHighTimeFromMidnight(timeAsSeconds)) / 2, units);
-    }
-
     public double getTargetLowMgdl() {
         return toMgdl(getTargetLowTimeFromMidnight(secondsFromMidnight()), units);
     }

From 72943a5236fd6e7ffdb93f7ac235df7c385076a9 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Fri, 22 May 2020 11:08:01 +1200
Subject: [PATCH 125/400] Add back setting adjustment

---
 .../plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
index 6b5f5363b0..8b894e8579 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java
@@ -259,8 +259,8 @@ public class DetermineBasalAdapterSMBJS {
         mProfile.put("low_temptarget_lowers_sensitivity", false);
 
 
-        mProfile.put("sensitivity_raises_target", SMBDefaults.sensitivity_raises_target);
-        mProfile.put("resistance_lowers_target", SMBDefaults.resistance_lowers_target);
+        mProfile.put("sensitivity_raises_target", sp.getBoolean(resourceHelper.gs(R.string.key_sensitivity_raises_target),SMBDefaults.sensitivity_raises_target));
+        mProfile.put("resistance_lowers_target", sp.getBoolean(resourceHelper.gs(R.string.key_resistance_lowers_target),SMBDefaults.resistance_lowers_target));
         mProfile.put("adv_target_adjustments", SMBDefaults.adv_target_adjustments);
         mProfile.put("exercise_mode", SMBDefaults.exercise_mode);
         mProfile.put("half_basal_exercise_target", SMBDefaults.half_basal_exercise_target);

From d40188f04e429283e17b2653ab2b2c363b53805d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 23 May 2020 15:39:05 +0200
Subject: [PATCH 126/400] Default language option

---
 .../nightscout/androidaps/MainActivity.kt     |  2 +-
 .../info/nightscout/androidaps/MainApp.java   |  2 +-
 .../activities/PreferencesActivity.kt         |  2 +-
 .../activities/SingleFragmentActivity.kt      |  2 +-
 .../activities/PrefImportListActivity.kt      |  2 +-
 .../androidaps/setupwizard/SWDefinition.kt    |  2 +-
 .../setupwizard/SetupWizardActivity.kt        |  2 +-
 .../androidaps/utils/JSONFormatter.java       | 25 ++++---------
 app/src/main/res/values/arrays.xml            |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 .../activities/DialogAppCompatActivity.kt     |  2 +-
 .../activities/NoSplashAppCompatActivity.kt   |  2 +-
 .../androidaps/events/EventRebuildTabs.kt     |  2 +-
 .../nightscout/androidaps/utils/HtmlHelper.kt |  7 +---
 .../androidaps/utils/locale/LocaleHelper.kt   | 37 ++++++++++---------
 15 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index c78aaedaf5..f25cf49fc9 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -49,7 +49,7 @@ import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicato
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 126ba47d22..6b78a50599 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -37,7 +37,7 @@ import info.nightscout.androidaps.receivers.NetworkChangeReceiver;
 import info.nightscout.androidaps.receivers.TimeDateOrTZChangeReceiver;
 import info.nightscout.androidaps.services.Intents;
 import info.nightscout.androidaps.utils.ActivityMonitor;
-import info.nightscout.androidaps.utils.LocaleHelper;
+import info.nightscout.androidaps.utils.locale.LocaleHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class MainApp extends DaggerApplication {
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
index ad3961c883..ea90f4b250 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
index 9e62f16c97..0193b690a6 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SingleFragmentActivity.kt
@@ -9,7 +9,7 @@ import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
index 7703166d04..6be8b5e020 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/PrefImportListActivity.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsFormatsHandler
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsMetadataKey
 import info.nightscout.androidaps.plugins.general.maintenance.formats.PrefsStatus
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.maintenance_importlist_activity.*
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index c8e406881b..d0f8c29138 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -34,7 +34,7 @@ import info.nightscout.androidaps.setupwizard.elements.*
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.CryptoUtil
-import info.nightscout.androidaps.utils.LocaleHelper.update
+import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
index b265af0d4c..44af0e1312 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@@ -20,7 +20,7 @@ import info.nightscout.androidaps.setupwizard.elements.SWItem
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.LocaleHelper.update
+import info.nightscout.androidaps.utils.locale.LocaleHelper.update
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.show
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog.showConfirmation
 import info.nightscout.androidaps.utils.resources.ResourceHelper
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
index 9b754ac47a..db1f6af239 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/JSONFormatter.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.utils;
 
-import android.os.Build;
 import android.text.Html;
 import android.text.Spanned;
 
@@ -8,7 +7,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Iterator;
 
@@ -24,33 +22,24 @@ public class JSONFormatter {
         final JsonVisitor visitor = new JsonVisitor(1, '\t');
         try {
             if (jsonString.equals("undefined"))
-                return Html.fromHtml("undefined");
+                return HtmlHelper.INSTANCE.fromHtml("undefined");
             else if (jsonString.getBytes()[0] == '[')
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    return Html.fromHtml(visitor.visit(new JSONArray(jsonString), 0), Html.FROM_HTML_MODE_COMPACT);
-                } else {
-                    return Html.fromHtml(visitor.visit(new JSONArray(jsonString), 0));
-                }
-            else {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    return Html.fromHtml(visitor.visit(new JSONObject(jsonString), 0), Html.FROM_HTML_MODE_COMPACT);
-                } else {
-                    return Html.fromHtml(visitor.visit(new JSONObject(jsonString), 0));
-                }
-            }
+                return HtmlHelper.INSTANCE.fromHtml(visitor.visit(new JSONArray(jsonString), 0));
+            else
+                return HtmlHelper.INSTANCE.fromHtml(visitor.visit(new JSONObject(jsonString), 0));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
-            return Html.fromHtml("");
+            return HtmlHelper.INSTANCE.fromHtml("");
         }
     }
 
     public static Spanned format(final JSONObject object) {
         final JsonVisitor visitor = new JsonVisitor(1, '\t');
         try {
-            return Html.fromHtml(visitor.visit(object, 0));
+            return HtmlHelper.INSTANCE.fromHtml(visitor.visit(object, 0));
         } catch (JSONException e) {
             log.error("Unhandled exception", e);
-            return Html.fromHtml("");
+            return HtmlHelper.INSTANCE.fromHtml("");
         }
     }
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 7ca80a7af9..0d8f4134a1 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -22,6 +22,7 @@
     </string-array>
 
     <string-array name="languagesArray">
+        <item>@string/default_lang</item>
         <item>@string/en_lang</item>
         <item>@string/af_lang</item>
         <item>@string/bg_lang</item>
@@ -45,6 +46,7 @@
         <item>@string/zh_lang</item>
     </string-array>
     <string-array name="languagesValues" translatable="false">
+        <item>default</item>
         <item>en</item>
         <item>af</item>
         <item>bg</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a4595fab4..140c3310cf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
+    <string name="default_lang" translatable="false">System default</string>
     <string name="en_lang" translatable="false">English</string>
     <string name="cs_lang" translatable="false">Czech</string>
     <string name="af_lang" translatable="false">Afrikaans</string>
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
index e2aa70d960..14f941a422 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt
@@ -2,7 +2,7 @@ package info.nightscout.androidaps.activities
 
 import android.content.Context
 import dagger.android.support.DaggerAppCompatActivity
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 
 open class DialogAppCompatActivity : DaggerAppCompatActivity() {
     public override fun attachBaseContext(newBase: Context) {
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
index 060f1a8c2e..6ded8b95b5 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/NoSplashAppCompatActivity.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.core.R
-import info.nightscout.androidaps.utils.LocaleHelper
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 
 //@Suppress("registered")
 open class NoSplashAppCompatActivity : DaggerAppCompatActivity() {
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt b/core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
index aa0db3467a..3d4180f29f 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventRebuildTabs.kt
@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.events
 
-class EventRebuildTabs @JvmOverloads constructor(var recreate: Boolean = false) : Event()
+class EventRebuildTabs constructor(var recreate: Boolean = false) : Event()
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
index b79fe884b4..dd0da3b72f 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/HtmlHelper.kt
@@ -6,11 +6,6 @@ import android.text.Spanned
 
 object HtmlHelper {
     fun fromHtml(source: String): Spanned {
-        // API level 24 to replace call
-        @Suppress("DEPRECATION")
-        return when {
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.N -> Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY)
-            else -> Html.fromHtml(source)
-        }
+        return  Html.fromHtml(source, Html.FROM_HTML_MODE_LEGACY)
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
index 7180bf7927..d7bc0a8ce5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
@@ -1,22 +1,23 @@
-package info.nightscout.androidaps.utils
+package info.nightscout.androidaps.utils.locale
 
 import android.content.Context
 import android.content.ContextWrapper
-import android.os.Build
 import android.os.LocaleList
 import androidx.preference.PreferenceManager
 import info.nightscout.androidaps.core.R
 import java.util.*
 
 object LocaleHelper {
-    private fun currentLanguage(context: Context): String =
-        PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.key_language), "en")
-            ?: "en"
+    private fun selectedLanguage(context: Context): String =
+        PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.key_language), "default")
+            ?: "default"
     // injection not possible because of use in attachBaseContext
     //SP.getString(R.string.key_language, Locale.getDefault().language)
 
     private fun currentLocale(context: Context): Locale {
-        val language = currentLanguage(context)
+        val language = selectedLanguage(context)
+        if (language == "default") return Locale.getDefault()
+
         var locale = Locale(language)
         if (language.contains("_")) {
             // language with country like pt_BR defined in arrays.xml
@@ -27,8 +28,10 @@ object LocaleHelper {
         return locale
     }
 
-    @Suppress("DEPRECATION")
     fun update(context: Context) {
+        // no action for system default language
+        if (selectedLanguage(context) == "default") return
+
         val locale = currentLocale(context)
         Locale.setDefault(locale)
         val resources = context.resources
@@ -39,20 +42,18 @@ object LocaleHelper {
         resources.updateConfiguration(configuration, resources.displayMetrics)
     }
 
-    fun wrap(ctx: Context): ContextWrapper {
+    fun wrap(ctx: Context): Context {
+        // no action for system default language
+        if (selectedLanguage(ctx) == "default") return ctx
+
         val res = ctx.resources
         val configuration = res.configuration
         val newLocale = currentLocale(ctx)
-        val context = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            configuration.setLocale(newLocale)
-            val localeList = LocaleList(newLocale)
-            LocaleList.setDefault(localeList)
-            configuration.locales = localeList
-            ctx.createConfigurationContext(configuration)
-        } else {
-            configuration.setLocale(newLocale)
-            ctx.createConfigurationContext(configuration)
-        }
+        configuration.setLocale(newLocale)
+        val localeList = LocaleList(newLocale)
+        LocaleList.setDefault(localeList)
+        configuration.locales = localeList
+        val context = ctx.createConfigurationContext(configuration)
         return ContextWrapper(context)
     }
 }
\ No newline at end of file

From 4f41890add4b00dca59abffee5edad8068840c78 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 23 May 2020 16:30:03 +0200
Subject: [PATCH 127/400] Add additionnal setting for automated deliveries and
 add both in pumpcontrol pref - previous setting is for manual bolus and
 extended bolus - This new setting is for SMB and temp basal with TBR
 emulation You can change settings name and summary if you find better...

---
 .../plugins/pump/insight/LocalInsightPlugin.java     | 11 ++++++-----
 app/src/main/res/values/strings.xml                  |  8 ++++++--
 app/src/main/res/xml/pref_insight_local_full.xml     |  8 +++++++-
 .../main/res/xml/pref_insight_local_pumpcontrol.xml  | 12 ++++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 51c6337df1..1b4e537f0c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -597,7 +597,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     bolusMessage.setDuration(0);
                     bolusMessage.setExtendedAmount(0);
                     bolusMessage.setImmediateAmount(insulin);
-                    bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false));
+                    bolusMessage.setVibration(sp.getBoolean(detailedBolusInfo.isSMB ? R.string.key_disable_vibration_auto : R.string.key_disable_vibration ,false));
                     bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
                     bolusCancelled = false;
                 }
@@ -721,7 +721,8 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
                     PumpEnactResult cancelTBRResult = cancelTempBasalOnly();
                     if (cancelTBRResult.success) {
                         PumpEnactResult ebResult = setExtendedBolusOnly((absoluteRate - getBaseBasalRate()) / 60D
-                                * ((double) durationInMinutes), durationInMinutes);
+                                * ((double) durationInMinutes), durationInMinutes,
+                                sp.getBoolean(R.string.key_disable_vibration_auto,false));
                         if (ebResult.success) {
                             result.success = true;
                             result.enacted = true;
@@ -799,7 +800,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
     @NonNull @Override
     public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
         PumpEnactResult result = cancelExtendedBolusOnly();
-        if (result.success) result = setExtendedBolusOnly(insulin, durationInMinutes);
+        if (result.success) result = setExtendedBolusOnly(insulin, durationInMinutes, sp.getBoolean(R.string.key_disable_vibration,false));
         try {
             fetchStatus();
             readHistory();
@@ -813,7 +814,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         return result;
     }
 
-    public PumpEnactResult setExtendedBolusOnly(Double insulin, Integer durationInMinutes) {
+    public PumpEnactResult setExtendedBolusOnly(Double insulin, Integer durationInMinutes, boolean disableVibration) {
         PumpEnactResult result = new PumpEnactResult(getInjector());
         try {
             DeliverBolusMessage bolusMessage = new DeliverBolusMessage();
@@ -821,7 +822,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
             bolusMessage.setDuration(durationInMinutes);
             bolusMessage.setExtendedAmount(insulin);
             bolusMessage.setImmediateAmount(0);
-            bolusMessage.setVibration(sp.getBoolean("insight_disable_vibration",false));
+            bolusMessage.setVibration(disableVibration);
             int bolusID = connectionService.requestMessage(bolusMessage).await().getBolusId();
             InsightBolusID insightBolusID = new InsightBolusID();
             insightBolusID.bolusID = bolusID;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8033c82057..c9530266e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1016,8 +1016,12 @@
     <string name="log_alerts">Log alerts</string>
     <string name="enable_tbr_emulation">Enable TBR emulation</string>
     <string name="enable_tbr_emulation_summary">Use extended boluses instead of TBRs to bypass the 250%% limit</string>
-    <string name="disable_vibration">Disable vibrations on bolus delivery</string>
-    <string name="disable_vibration_summary">This setting is only available with Insight firmware 3.x</string>
+    <string name="key_disable_vibration" translatable="false">insight_disable_vibration</string>
+    <string name="disable_vibration">Disable vibrations on manual bolus delivery</string>
+    <string name="disable_vibration_summary">For bolus and extended bolus (only available with Insight firmware 3.x)</string>
+    <string name="key_disable_vibration_auto" translatable="false">insight_disable_vibration_auto</string>
+    <string name="disable_vibration_auto">Disable vibrations on automated bolus delivery</string>
+    <string name="disable_vibration_auto_summary">For SMB and Temp Basal with TBR emulation (only available with Insight firmware 3.x)</string>
     <string name="disconnect_delay">Disconnect delay [s]</string>
     <string name="serial_number">Serial number</string>
     <string name="release_software_version">Release software version</string>
diff --git a/app/src/main/res/xml/pref_insight_local_full.xml b/app/src/main/res/xml/pref_insight_local_full.xml
index 761016b287..820c12d422 100644
--- a/app/src/main/res/xml/pref_insight_local_full.xml
+++ b/app/src/main/res/xml/pref_insight_local_full.xml
@@ -50,10 +50,16 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="insight_disable_vibration"
+            android:key="@string/key_disable_vibration"
             android:summary="@string/disable_vibration_summary"
             android:title="@string/disable_vibration" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_disable_vibration_auto"
+            android:summary="@string/disable_vibration_auto_summary"
+            android:title="@string/disable_vibration_auto" />
+
         <EditTextPreference
             android:defaultValue="5"
             android:inputType="number"
diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
index 780ba686a2..d40a48e1d0 100644
--- a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
+++ b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
@@ -48,6 +48,18 @@
             android:summary="@string/enable_tbr_emulation_summary"
             android:title="@string/enable_tbr_emulation" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_disable_vibration"
+            android:summary="@string/disable_vibration_summary"
+            android:title="@string/disable_vibration" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_disable_vibration_auto"
+            android:summary="@string/disable_vibration_auto_summary"
+            android:title="@string/disable_vibration_auto" />
+
         <EditTextPreference
             android:defaultValue="5"
             android:inputType="number"

From 6e906dda8713ca86c4e21062a3fa4f9c75ff15be Mon Sep 17 00:00:00 2001
From: Tebbe Ubben <TebbeUbben@users.noreply.github.com>
Date: Sat, 23 May 2020 17:49:49 +0200
Subject: [PATCH 128/400] Update pref_insight_local_pumpcontrol.xml

---
 app/src/main/res/xml/pref_insight_local_pumpcontrol.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
index d40a48e1d0..a863e56757 100644
--- a/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
+++ b/app/src/main/res/xml/pref_insight_local_pumpcontrol.xml
@@ -54,12 +54,6 @@
             android:summary="@string/disable_vibration_summary"
             android:title="@string/disable_vibration" />
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_disable_vibration_auto"
-            android:summary="@string/disable_vibration_auto_summary"
-            android:title="@string/disable_vibration_auto" />
-
         <EditTextPreference
             android:defaultValue="5"
             android:inputType="number"

From 8ae817cdda99b6d8794314da41d05f042b5d5e3b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 23 May 2020 21:54:01 +0200
Subject: [PATCH 129/400] nsalarm notifications fix

---
 .../general/nsclient/data/NSDeviceStatus.java |  2 +-
 .../nsclient/services/NSClientService.java    | 47 +++++++++++--------
 .../notifications/NotificationWithAction.kt   |  7 +--
 app/src/main/res/values/strings.xml           | 16 ++-----
 .../main/res/xml/pref_nsclientinternal.xml    | 30 ++----------
 5 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
index 7195435515..757692e655 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.java
@@ -331,7 +331,7 @@ public class NSDeviceStatus {
         // test warning level
         int level = Levels.INFO;
         long now = System.currentTimeMillis();
-        if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + sp.getInt(R.string.key_nsalarm_urgent_staledatavalue, 16) * 60 * 1000L < now)
+        if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + sp.getInt(R.string.key_nsalarm_urgent_staledatavalue, 31) * 60 * 1000L < now)
             level = Levels.URGENT;
         else if (deviceStatusOpenAPSData.clockSuggested != 0 && deviceStatusOpenAPSData.clockSuggested + sp.getInt(R.string.key_nsalarm_staledatavalue, 16) * 60 * 1000L < now)
             level = Levels.WARN;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
index cc5057f7eb..7c4d41ca86 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java
@@ -842,33 +842,42 @@ public class NSClientService extends DaggerService {
     }
 
     private void handleAnnouncement(JSONObject announcement) {
-        NSAlarm nsAlarm = new NSAlarm(announcement);
-        Notification notification = new NotificationWithAction(injector, nsAlarm);
-        rxBus.send(new EventNewNotification(notification));
-        rxBus.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(announcement, "message", "received")));
-        aapsLogger.debug(LTag.NSCLIENT, announcement.toString());
+        boolean defaultVal = config.getNSCLIENT();
+        if (sp.getBoolean(R.string.key_ns_announcements, defaultVal)) {
+            NSAlarm nsAlarm = new NSAlarm(announcement);
+            Notification notification = new NotificationWithAction(injector, nsAlarm);
+            rxBus.send(new EventNewNotification(notification));
+            rxBus.send(new EventNSClientNewLog("ANNOUNCEMENT", JsonHelper.safeGetString(announcement, "message", "received")));
+            aapsLogger.debug(LTag.NSCLIENT, announcement.toString());
+        }
     }
 
     private void handleAlarm(JSONObject alarm) {
-        long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
-        if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-            NSAlarm nsAlarm = new NSAlarm(alarm);
-            Notification notification = new NotificationWithAction(injector, nsAlarm);
-            rxBus.send(new EventNewNotification(notification));
+        boolean defaultVal = config.getNSCLIENT();
+        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
+            long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
+            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                NSAlarm nsAlarm = new NSAlarm(alarm);
+                Notification notification = new NotificationWithAction(injector, nsAlarm);
+                rxBus.send(new EventNewNotification(notification));
+            }
+            rxBus.send(new EventNSClientNewLog("ALARM", JsonHelper.safeGetString(alarm, "message", "received")));
+            aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
         }
-        rxBus.send(new EventNSClientNewLog("ALARM", JsonHelper.safeGetString(alarm, "message", "received")));
-        aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
     }
 
     private void handleUrgentAlarm(JSONObject alarm) {
-        long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
-        if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
-            NSAlarm nsAlarm = new NSAlarm(alarm);
-            Notification notification = new NotificationWithAction(injector, nsAlarm);
-            rxBus.send(new EventNewNotification(notification));
+        boolean defaultVal = config.getNSCLIENT();
+        if (sp.getBoolean(R.string.key_ns_alarms, defaultVal)) {
+            long snoozedTo = sp.getLong(R.string.key_snoozedTo, 0L);
+            if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) {
+                NSAlarm nsAlarm = new NSAlarm(alarm);
+                Notification notification = new NotificationWithAction(injector, nsAlarm);
+                rxBus.send(new EventNewNotification(notification));
+            }
+            rxBus.send(new EventNSClientNewLog("URGENTALARM", JsonHelper.safeGetString(alarm, "message", "received")));
+            aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
         }
-        rxBus.send(new EventNSClientNewLog("URGENTALARM", JsonHelper.safeGetString(alarm, "message", "received")));
-        aapsLogger.debug(LTag.NSCLIENT, alarm.toString());
     }
 
     public void handleNewCal(JSONArray cals, boolean isDelta) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
index f492196b29..4e85b03b5c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationWithAction.kt
@@ -22,8 +22,6 @@ class NotificationWithAction constructor(
     @Inject lateinit var defaultValueHelper: DefaultValueHelper
     @Inject lateinit var nsClientPlugin: NSClientPlugin
 
-    private var nsAlarm: NSAlarm? = null
-
     init {
         injector.androidInjector().inject(this)
     }
@@ -36,7 +34,6 @@ class NotificationWithAction constructor(
     }
 
     constructor (injector: HasAndroidInjector, nsAlarm: NSAlarm) : this(injector) {
-        this.nsAlarm = nsAlarm
         date = System.currentTimeMillis()
         when (nsAlarm.level()) {
             0 -> {
@@ -50,14 +47,14 @@ class NotificationWithAction constructor(
                 id = NSALARM
                 level = NORMAL
                 text = nsAlarm.title()
-                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.alarm
+                soundId = R.raw.alarm
             }
 
             2 -> {
                 id = NSURGENTALARM
                 level = URGENT
                 text = nsAlarm.title()
-                if (nsAlarm.low() && sp.getBoolean(R.string.key_nsalarm_urgent_low, false) || nsAlarm.high() && sp.getBoolean(R.string.key_nsalarm_urgent_high, false) || nsAlarm.timeago() && sp.getBoolean(R.string.key_nsalarm_staledata, false)) soundId = R.raw.urgentalarm
+                soundId = R.raw.urgentalarm
             }
         }
         buttonText = R.string.snooze
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de9f03587e..4908f7d04f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -549,20 +549,12 @@
     <string name="doprofileswitch">Do Profile Switch</string>
     <string name="careportal_pbage_label">Pump battery age</string>
     <string name="ns_alarmoptions">Alarm options</string>
-    <string name="key_nsalarm_urgent_high" translatable="false">nsalarm_urgent_high</string>
-    <string name="key_nsalarm_high" translatable="false">nsalarm_high</string>
-    <string name="key_nsalarm_low" translatable="false">nsalarm_low</string>
-    <string name="key_nsalarm_urgent_low" translatable="false">nsalarm_urgent_low</string>
-    <string name="key_nsalarm_staledata" translatable="false">nsalarm_staledata</string>
-    <string name="key_nsalarm_urgent_staledata" translatable="false">nsalarm_urgent_staledata</string>
+    <string name="key_ns_announcements" translatable="false">ns_announcements</string>
+    <string name="key_ns_alarms" translatable="false">ns_alarms</string>
     <string name="key_nsalarm_staledatavalue" translatable="false">nsalarm_staledatavalue</string>
     <string name="key_nsalarm_urgent_staledatavalue" translatable="false">nsalarm_urgent_staledatavalue</string>
-    <string name="nsalarm_urgenthigh">Urgent high</string>
-    <string name="nsalarm_high">High</string>
-    <string name="nsalarm_low">Low</string>
-    <string name="nsalarm_urgentlow">Urgent low</string>
-    <string name="nsalarm_staledata">Stale data</string>
-    <string name="nsalarm_urgentstaledata">Urgent stale data</string>
+    <string name="ns_alarms">Create notifications from NS alarms</string>
+    <string name="ns_announcements">Create notifications from NS announcements</string>
     <string name="nsalarm_staledatavalue_label">Stale data threshold [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Urgent stale data threshold [min]</string>
     <string name="openapsama_autosens_period">Interval for autosens [h]</string>
diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml
index 6f68d77a7b..a25aeebd2f 100644
--- a/app/src/main/res/xml/pref_nsclientinternal.xml
+++ b/app/src/main/res/xml/pref_nsclientinternal.xml
@@ -42,29 +42,12 @@
             android:title="@string/ns_alarmoptions">
 
             <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_urgent_high"
-                android:title="@string/nsalarm_urgenthigh" />
+                android:key="@string/key_ns_alarms"
+                android:title="@string/ns_alarms" />
 
             <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_high"
-                android:title="@string/nsalarm_high" />
-
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_low"
-                android:title="@string/nsalarm_low" />
-
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_urgent_low"
-                android:title="@string/nsalarm_urgentlow" />
-
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_staledata"
-                android:title="@string/nsalarm_staledata" />
+                android:key="@string/key_ns_announcements"
+                android:title="@string/ns_announcements" />
 
             <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="16"
@@ -79,11 +62,6 @@
                 validate:minNumber="15"
                 validate:testType="numericRange" />
 
-            <SwitchPreference
-                android:defaultValue="false"
-                android:key="@string/key_nsalarm_urgent_staledata"
-                android:title="@string/nsalarm_urgentstaledata" />
-
             <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="31"
                 android:digits="0123456789"

From 3d1b5003953ba1b1e93f2d151056bc590316fbee Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 23 May 2020 22:16:55 +0200
Subject: [PATCH 130/400] fix ProfileSwitch loading

---
 .../info/nightscout/androidaps/db/DatabaseHelper.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 50a7d3ed47..4b8d637c47 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -1531,7 +1531,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             //add last one without duration
             ProfileSwitch last = getLastProfileSwitchWithoutDuration();
             if (last != null) {
-                if (!profileSwitches.contains(last))
+                if (!isInList(profileSwitches, last))
                     profileSwitches.add(last);
             }
             return profileSwitches;
@@ -1541,6 +1541,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return new ArrayList<>();
     }
 
+    boolean isInList(List<ProfileSwitch> profileSwitches, ProfileSwitch last) {
+        for (ProfileSwitch ps : profileSwitches) {
+            if (ps.isEqual(last)) return true;
+        }
+        return false;
+    }
+
     @Nullable
     private ProfileSwitch getLastProfileSwitchWithoutDuration() {
         try {

From 87eb8021de430adf18b313dd095c6f0a2ea6137a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 23 May 2020 22:49:05 +0200
Subject: [PATCH 131/400] configbuilder fix

---
 .../nightscout/androidaps/plugins/configBuilder/PluginStore.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
index 5166248e7d..3958f17d78 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/PluginStore.kt
@@ -108,7 +108,7 @@ class PluginStore @Inject constructor(
             (activeProfile as PluginBase).setPluginEnabled(PluginType.PROFILE, true)
             aapsLogger.debug(LTag.CONFIGBUILDER, "Defaulting ProfileInterface")
         }
-        setFragmentVisiblities((activeSensitivity as PluginBase).name, pluginsInCategory, PluginType.PROFILE)
+        setFragmentVisiblities((activeProfile as PluginBase).name, pluginsInCategory, PluginType.PROFILE)
 
         // PluginType.BGSOURCE
         pluginsInCategory = getSpecificPluginsList(PluginType.BGSOURCE)

From 828612fe6566fd64c15c58b56bc6fbedf2527485 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 18:30:16 +0200
Subject: [PATCH 132/400] default language default

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

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 9ae1ff6b9a..8dd2f98b76 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -14,7 +14,7 @@
             android:title="@string/unitsnosemicolon" />
 
         <ListPreference
-            android:defaultValue="en"
+            android:defaultValue="default"
             android:entries="@array/languagesArray"
             android:entryValues="@array/languagesValues"
             android:key="@string/key_language"

From c8516f7d40bed86c26bddb6227f6bd8959e222a8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 19:07:26 +0200
Subject: [PATCH 133/400] run test in parallel

---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index fe6a38714e..d33f0f9437 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,3 +58,9 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+subprojects {
+    tasks.withType(Test) {
+        maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+    }
+}

From 1cb648c09a28f99dbbd4d8d3ab90e70b2c8b72cd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 20:23:22 +0200
Subject: [PATCH 134/400] fix TriggerRecurringTime

---
 .../automation/triggers/TriggerRecurringTime.kt      |  3 +--
 .../automation/triggers/TriggerRecurringTimeTest.kt  | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
index 08343a3c94..5f6db0494d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
@@ -37,9 +37,8 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
     override fun shouldRun(): Boolean {
         val currentMinSinceMidnight = getMinSinceMidnight(DateUtil.now())
         val scheduledDayOfWeek = Calendar.getInstance()[Calendar.DAY_OF_WEEK]
-        val scheduled = getMinSinceMidnight(time.value.toLong())
         if (days.isSet(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(scheduledDayOfWeek)))) {
-            if (currentMinSinceMidnight >= scheduled && currentMinSinceMidnight - scheduled < 5) {
+            if (currentMinSinceMidnight >= time.value && currentMinSinceMidnight - time.value < 5) {
                 aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
                 return true
             }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
index 566a0b4c7b..ca20e1cee3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
@@ -14,7 +14,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DateUtil::class)
 class TriggerRecurringTimeTest : TriggerTestBase() {
 
-    var now = 1514766900000L
+    var now = 1514766900000L // 95 min from midnight
 
     @Before fun mock() {
         PowerMockito.mockStatic(DateUtil::class.java)
@@ -26,20 +26,14 @@ class TriggerRecurringTimeTest : TriggerTestBase() {
 
     @Test fun shouldRunTest() {
 
-        // limit by validTo
-        var t: TriggerRecurringTime = TriggerRecurringTime(injector).time(94)
+        var t: TriggerRecurringTime = TriggerRecurringTime(injector).time(89)
         t.days.setAll(true)
         Assert.assertFalse(t.shouldRun())
 
         // scheduled 1 min before
-//        t = new TriggerRecurringTime().hour(1).minute(34);
-//        t.setAll(true);
-//        Assert.assertTrue(t.shouldRun());
-
-        // already run
         t = TriggerRecurringTime(injector).time(94)
         t.days.setAll(true)
-        Assert.assertFalse(t.shouldRun())
+        Assert.assertTrue(t.shouldRun())
     }
 
     private var timeJson = "{\"data\":{\"WEDNESDAY\":false,\"MONDAY\":false,\"THURSDAY\":false,\"SUNDAY\":false,\"TUESDAY\":false,\"FRIDAY\":false,\"SATURDAY\":false,\"time\":4444},\"type\":\"info.nightscout.androidaps.plugins.general.automation.triggers.TriggerRecurringTime\"}"

From 0a33f4c0db3b68a7ae6590ac7e35d2cd7650d1d5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 21:10:44 +0200
Subject: [PATCH 135/400] fix TriggerRecurringTime #2

---
 .../general/automation/triggers/TriggerRecurringTime.kt     | 4 ++--
 .../general/automation/triggers/TriggerRecurringTimeTest.kt | 6 +-----
 .../java/info/nightscout/androidaps/utils/DateUtil.java     | 5 +++++
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
index 5f6db0494d..ffc79e39e1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
@@ -34,8 +34,8 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
         return this
     }
 
-    override fun shouldRun(): Boolean {
-        val currentMinSinceMidnight = getMinSinceMidnight(DateUtil.now())
+    override fun shouldRun() : Boolean {
+        val currentMinSinceMidnight = getMinSinceMidnight(dateUtil._now())
         val scheduledDayOfWeek = Calendar.getInstance()[Calendar.DAY_OF_WEEK]
         if (days.isSet(Objects.requireNonNull(InputWeekDay.DayOfWeek.fromCalendarInt(scheduledDayOfWeek)))) {
             if (currentMinSinceMidnight >= time.value && currentMinSinceMidnight - time.value < 5) {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
index ca20e1cee3..46feb70b1c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
@@ -17,11 +17,7 @@ class TriggerRecurringTimeTest : TriggerTestBase() {
     var now = 1514766900000L // 95 min from midnight
 
     @Before fun mock() {
-        PowerMockito.mockStatic(DateUtil::class.java)
-        PowerMockito.`when`(DateUtil.now()).thenReturn(now)
-//        val calendar = GregorianCalendar()
-//        calendar.timeInMillis = now
-//        PowerMockito.`when`(DateUtil.gregorianCalendar()).thenReturn(calendar)
+        PowerMockito.`when`(dateUtil._now()).thenReturn(now)
     }
 
     @Test fun shouldRunTest() {
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index 419729a126..c5c5b68335 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -261,6 +261,10 @@ public class DateUtil {
         return timeFrameString(timestamp - System.currentTimeMillis(), resourceHelper);
     }
 
+    public long _now() {
+        return System.currentTimeMillis();
+    }
+
     public static long now() {
         return System.currentTimeMillis();
     }
@@ -358,6 +362,7 @@ public class DateUtil {
     // singletons to avoid repeated allocation
     private static DecimalFormatSymbols dfs;
     private static DecimalFormat df;
+
     public static String qs(double x, int digits) {
 
         if (digits == -1) {

From c1c87b2e30acc240393e314b09e883cab559f580 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 19:42:58 +0000
Subject: [PATCH 136/400] fix TriggerRecurringTimeTest

---
 .../general/automation/triggers/TriggerRecurringTimeTest.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
index 46feb70b1c..d23b8e8428 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTimeTest.kt
@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.general.automation.triggers
 
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.MidnightTime
+import info.nightscout.androidaps.utils.T
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
@@ -14,9 +16,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DateUtil::class)
 class TriggerRecurringTimeTest : TriggerTestBase() {
 
-    var now = 1514766900000L // 95 min from midnight
+    var now : Long = 0L
 
     @Before fun mock() {
+        now = MidnightTime.calc() + T.mins(95).msecs() // 95 min from midnight
         PowerMockito.`when`(dateUtil._now()).thenReturn(now)
     }
 

From b492e47728ee656809d64314147bd48b9246f487 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 21:57:52 +0200
Subject: [PATCH 137/400] New Crowdin translations (#2660)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Dutch)

* New translations strings.xml (German)

* New translations protection.xml (German)

* New translations insight_exceptions.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)
---
 app/src/main/res/values-af-rZA/strings.xml    |  6 --
 app/src/main/res/values-bg-rBG/strings.xml    |  6 --
 app/src/main/res/values-cs-rCZ/strings.xml    |  6 --
 .../res/values-de-rDE/insight_exceptions.xml  |  2 +-
 app/src/main/res/values-de-rDE/protection.xml |  4 +-
 app/src/main/res/values-de-rDE/strings.xml    | 38 +++++-----
 app/src/main/res/values-el-rGR/strings.xml    |  6 --
 app/src/main/res/values-es-rES/strings.xml    |  6 --
 app/src/main/res/values-fr-rFR/strings.xml    | 10 +--
 app/src/main/res/values-it-rIT/strings.xml    | 12 +--
 app/src/main/res/values-ko-rKR/strings.xml    |  6 --
 app/src/main/res/values-lt-rLT/strings.xml    |  6 --
 app/src/main/res/values-nl-rNL/strings.xml    |  7 +-
 app/src/main/res/values-pl-rPL/strings.xml    |  6 --
 app/src/main/res/values-pt-rBR/strings.xml    | 75 +++++++++++++------
 app/src/main/res/values-pt-rPT/strings.xml    |  6 --
 app/src/main/res/values-ro-rRO/strings.xml    |  6 --
 app/src/main/res/values-ru-rRU/strings.xml    | 10 +--
 app/src/main/res/values-sk-rSK/strings.xml    |  6 --
 app/src/main/res/values-sv-rSE/strings.xml    |  6 --
 app/src/main/res/values-tr-rTR/strings.xml    |  6 --
 app/src/main/res/values-zh-rCN/strings.xml    |  6 --
 core/src/main/res/values-de-rDE/strings.xml   | 19 +++--
 dana/src/main/res/values-cs-rCZ/strings.xml   |  3 +
 dana/src/main/res/values-fr-rFR/strings.xml   |  2 +
 dana/src/main/res/values-it-rIT/strings.xml   |  3 +
 dana/src/main/res/values-ru-rRU/strings.xml   |  3 +
 27 files changed, 109 insertions(+), 163 deletions(-)

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 892dc8ef6b..c0aee58045 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -381,12 +381,6 @@
     <string name="careportal_insulinage_label">Insulien ouderdom</string>
     <string name="careportal_pbage_label">Pomp battery ouderdom</string>
     <string name="ns_alarmoptions">Alarm Opsies</string>
-    <string name="nsalarm_urgenthigh">Nood hoog</string>
-    <string name="nsalarm_high">Hoog</string>
-    <string name="nsalarm_low">Laag</string>
-    <string name="nsalarm_urgentlow">Nood laag</string>
-    <string name="nsalarm_staledata">Ou data</string>
-    <string name="nsalarm_urgentstaledata">Nood ou data</string>
     <string name="nsalarm_staledatavalue_label">Ou data drumpel [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Nood ou data drumpel [min]</string>
     <string name="openapsama_autosens_period">Interval vir autosens [h]</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 80bafc0b29..08b1a5a211 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -410,12 +410,6 @@
     <string name="doprofileswitch">Смени профил</string>
     <string name="careportal_pbage_label">Възраст на батерията на помпата</string>
     <string name="ns_alarmoptions">Опции за аларми</string>
-    <string name="nsalarm_urgenthigh">Много висока</string>
-    <string name="nsalarm_high">Висока</string>
-    <string name="nsalarm_low">Ниска</string>
-    <string name="nsalarm_urgentlow">Много ниска</string>
-    <string name="nsalarm_staledata">Стари данни</string>
-    <string name="nsalarm_urgentstaledata">Много стари данни</string>
     <string name="nsalarm_staledatavalue_label">Когато няма данни повече от [мин]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Много стари данни при повече от [мин]</string>
     <string name="openapsama_autosens_period">Интервал за autosens [ч]</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 9819565981..691837ca7e 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -468,12 +468,6 @@
     <string name="doprofileswitch">Proveďte přepnutí profilu</string>
     <string name="careportal_pbage_label">Stáří baterie v pumpě</string>
     <string name="ns_alarmoptions">Nastavení alarmů</string>
-    <string name="nsalarm_urgenthigh">Urgentně vysoká</string>
-    <string name="nsalarm_high">Vysoká</string>
-    <string name="nsalarm_low">Nízká</string>
-    <string name="nsalarm_urgentlow">Urgentně nízká</string>
-    <string name="nsalarm_staledata">Zastaralá data</string>
-    <string name="nsalarm_urgentstaledata">Urgentně zastaralá data</string>
     <string name="nsalarm_staledatavalue_label">Mezní hodnota pro zastaralá data [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Urgentní mezní hodnota pro zastaralá data [min]</string>
     <string name="openapsama_autosens_period">Interval pro detekci senzitivity [h]</string>
diff --git a/app/src/main/res/values-de-rDE/insight_exceptions.xml b/app/src/main/res/values-de-rDE/insight_exceptions.xml
index 8f8f0015de..43eeeea573 100644
--- a/app/src/main/res/values-de-rDE/insight_exceptions.xml
+++ b/app/src/main/res/values-de-rDE/insight_exceptions.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="connection_failed">Verbindung fehlgeschlagen</string>
     <string name="connection_lost">Verbindung unterbrochen</string>
-    <string name="pairing_rejected">Pairing abgelehnt</string>
+    <string name="pairing_rejected">Kopplung abgelehnt</string>
     <string name="socket_creation_failed">Erstellen des Sockets fehlgeschlagen</string>
     <string name="timeout">Zeitüberschreitung</string>
     <string name="maximum_number_of_bolus_type_already_running">Maximale Anzahl an Boli dieses Typs bereits aktiv</string>
diff --git a/app/src/main/res/values-de-rDE/protection.xml b/app/src/main/res/values-de-rDE/protection.xml
index 0c6f2dd337..83fce7bd9a 100644
--- a/app/src/main/res/values-de-rDE/protection.xml
+++ b/app/src/main/res/values-de-rDE/protection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="biometric_title">Authentifizierung erforderlich</string>
-    <string name="biometric_description">Legen Deinen Finger auf den Fingerabdrucksensors, um Deine Identität zu bestätigen.</string>
+    <string name="biometric_description">Lege Deinen Finger auf den Fingerabdrucksensor, um Deine Identität zu bestätigen.</string>
     <string name="settings_protection">Schutz der Einstellungen</string>
     <string name="application_protection">Schutz der App</string>
     <string name="bolus_protection">Bolus-Schutz</string>
@@ -14,7 +14,7 @@
     <string name="custom_password">Benutzerdefiniertes Passwort</string>
     <string name="noprotection">Kein Schutz</string>
     <string name="protection">Schutz</string>
-    <string name="master_password_missing">Das Master-Passwort ist nicht festgelegt!\n\nLege Dein Master-Passwort bitte in en Einstellungen fest (%1$s &#8594; %2$s)</string>
+    <string name="master_password_missing">Das Master-Passwort ist nicht festgelegt!\n\nLege Dein Master-Passwort bitte in den Einstellungen fest (%1$s &#8594; %2$s)</string>
     <string name="password_set">Passwort festgelegt!</string>
     <string name="password_not_set">Passwort nicht festgelegt</string>
     <string name="password_not_changed">Passwort nicht geändert</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index f496669e05..e084f0475b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -185,7 +185,7 @@
     <string name="check_preferences_import_anyway_btn">Trotzdem importieren (GEFÄHRLICH!)</string>
     <string name="metadata_warning_different_flavour">Einstellungen wurden mit einer anderen Variante von AAPS erstellt (%1$s). Du nutzt: %2$s.\n\nEinige Einstellungen können fehlen oder ungültig sein - überprüfe und aktualisiere Deine Einstellungen nach dem Import .</string>
     <string name="metadata_warning_different_device">Einstellungen wurden auf einem anderen Gerät erstellt. Das ist OK, wenn Du von einem älteren/anderen Handy importierst. Stelle aber sicher, dass die importierten Einstellungen korrekt sind!</string>
-    <string name="metadata_warning_outdated_format">Du verwendest das veraltete Format einer alten AAPS-Version das nicht sicher ist! Verwende dieses nur als letzte Möglichkeit, wenn Du keinen Export im aktuellen JSON-Format hast.</string>
+    <string name="metadata_warning_outdated_format">Du verwendest das veraltete Format einer alten AAPS-Version, das nicht sicher ist! Verwende dieses nur als letzte Möglichkeit, wenn Du keinen Export im aktuellen JSON-Format hast.</string>
     <string name="metadata_warning_old_export">Die importierten Einstellungen sind bereits %1$s Tage alt! Hast Du aktuellere Einstellungen oder evtl. die falsche Datei gewählt? Denke daran, die Einstellungen regelmäßig zu exportieren.</string>
     <string name="metadata_warning_date_format">Ungültiges Datums-/Zeitformat!</string>
     <string name="metadata_warning_different_version">Einstellungen stammen aus einer Vorgängerversion (Nebenversion). Du kannst diese importieren, prüfe aber unbedingt nach dem Import, ob diese noch korrekt sind!</string>
@@ -251,7 +251,7 @@
     <string name="bolusstopped">Bolus gestoppt</string>
     <string name="bolusstopping">Bolus wird gestoppt</string>
     <string name="smscommunicator_loophasbeendisabled">Loop wurde deaktiviert.</string>
-    <string name="smscommunicator_loophasbeenenabled">Loop wurde aktiviert</string>
+    <string name="smscommunicator_loophasbeenenabled">Lopp wurde aktiviert.</string>
     <string name="smscommunicator_loopisdisabled">Loop ist deaktiviert.</string>
     <string name="smscommunicator_loopisenabled">Loop ist aktiviert.</string>
     <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
@@ -266,15 +266,15 @@
     <string name="smscommunicator_suspendreplywithcode">Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s.</string>
     <string name="smscommunicator_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
     <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet</string>
-    <string name="smscommunicator_carbsset">%1$dg Kohlenhydrate erfolgreich erfasst</string>
+    <string name="smscommunicator_carbsset">%1$dg Kohlenhydrate erfolgreich erfasst.</string>
     <string name="smscommunicator_carbsfailed">Eingabe von %1$dg Kohlenhydraten ist fehlgeschlagen.</string>
-    <string name="smscommunicator_tempbasalset_percent">Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt</string>
+    <string name="smscommunicator_tempbasalset_percent">Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt.</string>
     <string name="smscommunicator_tempbasalfailed">Das Starten der TBR ist fehlgeschlagen.</string>
-    <string name="smscommunicator_extendedfailed">Die Abgabe des erweiterten Bolus ist fehlgeschlagen</string>
-    <string name="smscommunicator_basalstopreplywithcode">Antworte mit dem Code %1$s, um die temporäre Basalrate zu beenden</string>
-    <string name="smscommunicator_extendedstopreplywithcode">Antworte mit dem Code %1$s, um den erweiterten Bolus zu beenden</string>
+    <string name="smscommunicator_extendedfailed">Die Abgabe des erweiterten Bolus ist fehlgeschlagen.</string>
+    <string name="smscommunicator_basalstopreplywithcode">Antworte mit dem Code %1$s, um die temporäre Basalrate zu beenden.</string>
+    <string name="smscommunicator_extendedstopreplywithcode">Antworte mit dem Code %1$s, um den erweiterten Bolus zu beenden.</string>
     <string name="smscommunicator_tempbasalcanceled">TBR abgebrochen</string>
-    <string name="smscommunicator_extendedcanceled">Die Abgabe des erweiterten Bolus wurde abgebrochen</string>
+    <string name="smscommunicator_extendedcanceled">Die Abgabe des erweiterten Bolus wurde abgebrochen.</string>
     <string name="smscommunicator_tempbasalcancelfailed">Das Abbrechen der TBR ist fehlgeschlagen.</string>
     <string name="smscommunicator_extendedcancelfailed">Der Abbruch des erweiterten Bolus ist fehlgeschlagen</string>
     <string name="smscommunicator_unknowncommand">Unbekannter Befehl oder falsche Antwort</string>
@@ -326,7 +326,7 @@
     <string name="array_of_elements">Array mit %1$d Elementen.\nWert:</string>
     <string name="openapsma_autosensdata_label">Autosens-Daten</string>
     <string name="openapsma_scriptdebugdata_label">Skript Debug</string>
-    <string name="openapsama_useautosens">Nutze Autosense</string>
+    <string name="openapsama_useautosens">Nutze Autosens</string>
     <string name="refresheventsfromnightscout">Aktualisiere Einträge von Nightscout</string>
     <string name="deletefuturetreatments">Lösche Behandlungen in der Zukunft</string>
     <string name="eatingsoon">Bald essen</string>
@@ -468,12 +468,8 @@
     <string name="doprofileswitch">Profilwechsel durchführen</string>
     <string name="careportal_pbage_label">Batteriealter</string>
     <string name="ns_alarmoptions">Alarm-Optionen</string>
-    <string name="nsalarm_urgenthigh">Sehr hoch</string>
-    <string name="nsalarm_high">Hoch</string>
-    <string name="nsalarm_low">Niedrig</string>
-    <string name="nsalarm_urgentlow">Sehr niedrig</string>
-    <string name="nsalarm_staledata">Veraltete Daten</string>
-    <string name="nsalarm_urgentstaledata">Stark veraltete Daten</string>
+    <string name="ns_alarms">Benachrichtigungen über NS-Alarme</string>
+    <string name="ns_announcements">Benachrichtigungen über NS-Ankündigungen</string>
     <string name="nsalarm_staledatavalue_label">Veraltete Daten seit [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Stark veraltete Daten seit [min]</string>
     <string name="openapsama_autosens_period">Intervall für Autosens [h]</string>
@@ -832,9 +828,9 @@ Unerwartetes Verhalten.</string>
     <string name="loop_openmode_min_change">Minimaler Wert zur Anfrage einer Änderung [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop schlägt neue Änderungen nur dann vor, wenn die Änderung größer als dieser Wert ist. Der Standard-Wert ist 20%.</string>
     <string name="searching_for_devices">Geräte werden gesucht…</string>
-    <string name="pairing_completed">Pairing abgeschlossen</string>
+    <string name="pairing_completed">Kopplung abgeschlossen</string>
     <string name="code_compare">Stimmen die Codes auf diesem Gerät und auf deiner Pumpe überein?</string>
-    <string name="insight_pairing">Insight Pairing</string>
+    <string name="insight_pairing">Insight Kopplung</string>
     <string name="insight_local">Accu-Chek Insight</string>
     <string name="insight_delivered">%1$.2f U / %2$.2f U abgegeben</string>
     <string name="insight_alert_formatter">%1$s: %2$s</string>
@@ -851,6 +847,10 @@ Unerwartetes Verhalten.</string>
     <string name="log_alerts">Alarme protokollieren</string>
     <string name="enable_tbr_emulation">TBR-Emulation aktivieren</string>
     <string name="enable_tbr_emulation_summary">Verzögerte Boli an Stelle von TBRs verwenden, um die Beschränkung auf 250%% zu umgehen</string>
+    <string name="disable_vibration">Vibrationen bei manueller Bolus-Abgabe deaktivieren</string>
+    <string name="disable_vibration_summary">Für Boli und verlängerte Boli (nur mit Insight Firmware 3.x verfügbar)</string>
+    <string name="disable_vibration_auto">Vibrationen bei automatischer Bolus-Abgabe deaktivieren</string>
+    <string name="disable_vibration_auto_summary">Für SMB und Temporäre Basalraten mit TBR Emulation (nur mit Insight Firmware 3.x verfügbar)</string>
     <string name="disconnect_delay">Verbindungsabbau-Verzögerung [s]</string>
     <string name="serial_number">Seriennummer</string>
     <string name="release_software_version">Release-Softwareversion</string>
@@ -862,8 +862,8 @@ Unerwartetes Verhalten.</string>
     <string name="bluetooth_address">Bluetooth-Adresse</string>
     <string name="system_id_appendix">System-ID-Appendix</string>
     <string name="manufacturing_date">Herstellungsdatum</string>
-    <string name="delete_pairing">Pairing löschen</string>
-    <string name="pairing_information">Pairinginformationen</string>
+    <string name="delete_pairing">Kopplung aufheben</string>
+    <string name="pairing_information">Kopplungsinformation</string>
     <string name="start_pump">Pumpe starten</string>
     <string name="stop_pump">Pumpe stoppen</string>
     <string name="operating_mode">Betriebsmodus</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index b40f6e7b2e..f5184d6876 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -386,12 +386,6 @@
     <string name="careportal_insulinage_label">Χρόνος ζωής Ινσουλίνης</string>
     <string name="careportal_pbage_label">Χρόνος ζωής μπαταρίας αντλίας</string>
     <string name="ns_alarmoptions">Επιλογές συναγερμού</string>
-    <string name="nsalarm_urgenthigh">Επείγον υψηλό</string>
-    <string name="nsalarm_high">Υψηλό</string>
-    <string name="nsalarm_low">Χαμηλό</string>
-    <string name="nsalarm_urgentlow">Επείγον χαμηλό</string>
-    <string name="nsalarm_staledata">Παλιά δεδομένα</string>
-    <string name="nsalarm_urgentstaledata">Επείγον παλιά δεδομένα</string>
     <string name="nsalarm_staledatavalue_label">Οριακή τιμή για παλιά δεδομένα [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Επείγουσα οριακή τιμή για παλιά δεδομένα [min]</string>
     <string name="openapsama_autosens_period">Εσωτερικά διαστήματα για autosense [h] </string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2193c826d8..7afa8894ec 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -441,12 +441,6 @@
     <string name="doprofileswitch">Cambio de perfil</string>
     <string name="careportal_pbage_label">Edad batería bomba</string>
     <string name="ns_alarmoptions">Opciones alarma</string>
-    <string name="nsalarm_urgenthigh">Urgente alto</string>
-    <string name="nsalarm_high">Alto</string>
-    <string name="nsalarm_low">Bajo</string>
-    <string name="nsalarm_urgentlow">Urgente bajo</string>
-    <string name="nsalarm_staledata">Datos anticuados</string>
-    <string name="nsalarm_urgentstaledata">Datos antiguos urgentes</string>
     <string name="nsalarm_staledatavalue_label">Datos antiguos limite [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Datos antiguos urgentes limite [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ce6f943445..74f3b85a88 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -469,12 +469,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="doprofileswitch">Changer de profil</string>
     <string name="careportal_pbage_label">Age batterie pompe</string>
     <string name="ns_alarmoptions">Options d\'alarme</string>
-    <string name="nsalarm_urgenthigh">Haute urgent</string>
-    <string name="nsalarm_high">Haute</string>
-    <string name="nsalarm_low">Basse</string>
-    <string name="nsalarm_urgentlow">Basse urgent</string>
-    <string name="nsalarm_staledata">Données obsolètes</string>
-    <string name="nsalarm_urgentstaledata">Urgent données obsolètes</string>
     <string name="nsalarm_staledatavalue_label">Seuil sans nouvelle donnée Glyc. [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Seuil d\'urgence pour les données obsolètes [min]</string>
     <string name="openapsama_autosens_period">Plage pour Autosens [h]</string>
@@ -852,6 +846,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="log_alerts">Enreg. alertes</string>
     <string name="enable_tbr_emulation">Activer l’émulation de DBT</string>
     <string name="enable_tbr_emulation_summary">Utilisez des Bolus étendus au lieu de DBTs pour contourner la limite de 250%%</string>
+    <string name="disable_vibration">Désactiver les vibrations des bolus manuels</string>
+    <string name="disable_vibration_summary">Concerne les bolus et bolus étendus (disponible uniquement pour les firmwares 3.x)</string>
+    <string name="disable_vibration_auto">Désactiver les vibrations des bolus automatiques</string>
+    <string name="disable_vibration_auto_summary">Concerne les SMB et les basal temp avec émulation DBT (disponible uniquement pour les firmwares 3.x)</string>
     <string name="disconnect_delay">Délai de déconnexion [s]</string>
     <string name="serial_number">Numéro de série</string>
     <string name="release_software_version">Version du logiciel</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index d1ef20a32e..6204534b5b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -468,12 +468,8 @@
     <string name="doprofileswitch">Cambia profilo</string>
     <string name="careportal_pbage_label">Età batteria micro</string>
     <string name="ns_alarmoptions">Opzioni allarme</string>
-    <string name="nsalarm_urgenthigh">Molto alto</string>
-    <string name="nsalarm_high">Alto</string>
-    <string name="nsalarm_low">Basso</string>
-    <string name="nsalarm_urgentlow">Molto basso</string>
-    <string name="nsalarm_staledata">Dati non aggiornati</string>
-    <string name="nsalarm_urgentstaledata">Dati non aggiornati da molto tempo</string>
+    <string name="ns_alarms">Crea notifiche da allarmi NS</string>
+    <string name="ns_announcements">Crea notifiche da avvisi NS</string>
     <string name="nsalarm_staledatavalue_label">Soglia dati non aggiornati [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Soglia dati non aggiornati da molto tempo [min]</string>
     <string name="openapsama_autosens_period">Intervallo per autosens [h]</string>
@@ -851,6 +847,10 @@
     <string name="log_alerts">Registra avvisi</string>
     <string name="enable_tbr_emulation">Abilita emulazione TBR</string>
     <string name="enable_tbr_emulation_summary">Usa i bolli estesi invece dei TBR per aggirare il limite del 250%%</string>
+    <string name="disable_vibration">Erogazione bolo manuale: disabilita vibrazioni</string>
+    <string name="disable_vibration_summary">Per bolo e bolo esteso (disponibile solo con firmware Insight 3.x)</string>
+    <string name="disable_vibration_auto">Erogazione bolo automatica: disabilita vibrazioni</string>
+    <string name="disable_vibration_auto_summary">Per SMB e basale temporanea con emulazione TBR (disponibile solo con firmware Insight 3.x)</string>
     <string name="disconnect_delay">Ritardo disconnessione [s]</string>
     <string name="serial_number">Numero seriale</string>
     <string name="release_software_version">Versione Release software</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 0c04ecd8ab..f89d6cb1ab 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -408,12 +408,6 @@
     <string name="doprofileswitch">프로파일 변경 실행</string>
     <string name="careportal_pbage_label">펌프배터리사용기간</string>
     <string name="ns_alarmoptions">알람 옵션</string>
-    <string name="nsalarm_urgenthigh">위험 고혈당</string>
-    <string name="nsalarm_high">고혈당</string>
-    <string name="nsalarm_low">저혈당</string>
-    <string name="nsalarm_urgentlow">위험 저혈당</string>
-    <string name="nsalarm_staledata">누락 데이터</string>
-    <string name="nsalarm_urgentstaledata">위험 누락 데이터</string>
     <string name="nsalarm_staledatavalue_label">누락 데이터 기준값 [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">위험 누락 데이터 기준값 [min]</string>
     <string name="openapsama_autosens_period">autosens 시간 [h]</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 6445d65195..2be090e0be 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -450,12 +450,6 @@
     <string name="doprofileswitch">Profilio keitimas</string>
     <string name="careportal_pbage_label">Baterija</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
-    <string name="nsalarm_urgenthigh">Kritiškai aukštas</string>
-    <string name="nsalarm_high">Aukštas</string>
-    <string name="nsalarm_low">Žemas</string>
-    <string name="nsalarm_urgentlow">Kritiškai žemas</string>
-    <string name="nsalarm_staledata">Seni duomenys</string>
-    <string name="nsalarm_urgentstaledata">Kritiškai seni duomenys</string>
     <string name="nsalarm_staledatavalue_label">Seni duomenys, riba [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Kritiškai seni duomenys, riba [min]</string>
     <string name="openapsama_autosens_period">Autosens intervalas [h]</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 3c4f8dbd28..0ba8a69c9d 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -408,12 +408,6 @@
     <string name="doprofileswitch">Profiel wissel uitvoeren</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="ns_alarmoptions">Alarm opties</string>
-    <string name="nsalarm_urgenthigh">Zeer hoog</string>
-    <string name="nsalarm_high">Hoog</string>
-    <string name="nsalarm_low">Laag</string>
-    <string name="nsalarm_urgentlow">Zeer laag</string>
-    <string name="nsalarm_staledata">Oude gegevens</string>
-    <string name="nsalarm_urgentstaledata">Dringend oude gegevens vernieuwen</string>
     <string name="nsalarm_staledatavalue_label">Oude gegevens sinds [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Alarm oude gegevens sinds [min]</string>
     <string name="openapsama_autosens_period">Interval voor autosens [uur]</string>
@@ -895,6 +889,7 @@
     <string name="recurringTime">Herhaal tijd</string>
     <string name="every">Elke</string>
     <string name="never">Nooit</string>
+    <string name="mins">%1$dmin</string>
     <string name="condition">Voorwaarde:</string>
     <string name="action">Actie:</string>
     <string name="iob_u">IOB [E]:</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 14f82463e8..e9f466ba22 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -459,12 +459,6 @@
     <string name="doprofileswitch">Zmień profil</string>
     <string name="careportal_pbage_label">Czas baterii pompy</string>
     <string name="ns_alarmoptions">Opcje alarmu</string>
-    <string name="nsalarm_urgenthigh">Uwaga wysoki</string>
-    <string name="nsalarm_high">Wysoki</string>
-    <string name="nsalarm_low">Niski</string>
-    <string name="nsalarm_urgentlow">Uwaga niski</string>
-    <string name="nsalarm_staledata">Nieaktualne dane</string>
-    <string name="nsalarm_urgentstaledata">Uwaga, nieaktualne dane</string>
     <string name="nsalarm_staledatavalue_label">Próg nieaktualne dane [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Próg uwaga nieaktualne dane [min]</string>
     <string name="openapsama_autosens_period">Przedział czasowy dla autosens [h]</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 59ef0d4a69..9dabcc46a9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -171,8 +171,8 @@
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
-    <string name="password_preferences_encrypt_prompt">Será perguntado pela password mestre, que será usada para encriptar preferências exportadas.</string>
-    <string name="password_preferences_decrypt_prompt">Será perguntado pela password mestre, que será necessária para desencriptar preferências importadas.</string>
+    <string name="password_preferences_encrypt_prompt">Será perguntado pela senha mestre, que será usada para encriptar preferências exportadas.</string>
+    <string name="password_preferences_decrypt_prompt">Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
     <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
@@ -205,11 +205,11 @@
     <string name="prefdecrypt_settings_secure">Ficheiro de configurações é seguro</string>
     <string name="prefdecrypt_settings_unencrypted">A usar um formato de configurações não seguro e não encriptado</string>
     <string name="prefdecrypt_wrong_json">Erro de formato JSON, campo necessário ausente (formato, conteúdo, metadados ou segurança)</string>
-    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a password inserida não pode desencriptar o ficheiro</string>
+    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a senha inserida não pode desencriptar o ficheiro</string>
     <string name="prefdecrypt_issue_missing_file_hash">Ficheiro de verificação (hash) em falta, não é possível verificar a autenticidade de configurações!</string>
     <string name="prefdecrypt_issue_modified">Ficheiro foi modificado após exportação!</string>
     <string name="prefdecrypt_issue_parsing">Erro Desencriptação, a análise de preferências falhou!</string>
-    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a password é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Password Mestre diferente.</string>
+    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Senha Mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
     <string name="exported_today">exportado hoje</string>
@@ -226,7 +226,7 @@
     <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
-    <string name="smscommunicator_mealbolusreplywithcode">Para dar bólus %1$.2fU responder com código %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Para administrar bólus %1$.2fU responder com código %2$s</string>
     <string name="smscommunicator_temptargetwithcode">Para definir o Alvo Tempo %1$s responda com o código %2$s</string>
     <string name="smscommunicator_temptargetcancel">Para cancelar Alvo Temp responda com o código %1$s</string>
     <string name="smscommunicator_stopsmswithcode">Para desactivar o Serviço Remoto SMS de responda com o código %1$s.\n\nTenha em mente que será capaz de o reactivar directamente apenas a partir do telemóvel mestre do AAPS.</string>
@@ -239,7 +239,7 @@
     <string name="bolusdelivered">Bolus %1$.2fU entregue com sucesso</string>
     <string name="bolusrequested">Vão ser administradas %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU entregue com sucesso</string>
+    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU administrado com sucesso</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
     <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
     <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
@@ -468,12 +468,6 @@
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
-    <string name="nsalarm_urgenthigh">Urgência hiperglicemia</string>
-    <string name="nsalarm_high">Alta</string>
-    <string name="nsalarm_low">Baixa</string>
-    <string name="nsalarm_urgentlow">Urgência hipoglicemia</string>
-    <string name="nsalarm_staledata">Dados Obsoletos</string>
-    <string name="nsalarm_urgentstaledata">Dados obsoletos urgentes</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Tempo limite para Urgência por dados obsoletos [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
@@ -1247,9 +1241,9 @@
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">a partir da app Autenticador para: %1$s</string>
     <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
-    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Password-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
     <string name="smscommunicator_otp_pin">PIN adicional no token final</string>
-    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Password-Única que seja gerada</string>
+    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
     <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
     <string name="smscommunicator_otp_verify_label">OTP para verificar:</string>
     <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
@@ -1258,7 +1252,7 @@
     <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode actualizado para os autenticadores.</string>
     <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
-    <string name="smscommunicator_otp_step3_test_header">3. Teste Uma-Password-Única</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testar Uma-Senha-Única</string>
     <string name="smscommunicator_otp_reset_header">Repor Autenticadores</string>
     <string name="smscommunicator_otp_install_info">Instalar uma app Autenticador que suporte Tokens RFC 6238 TOTP em cada telefone seguidor. Populares aplicativos gratuitos são:\n • Authy\n • o Google Authenticator\n • LastPass Autenticador\n • FreeOTP Autenticador</string>
     <string name="smscommunicator_otp_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</string>
@@ -1269,9 +1263,9 @@
     <string name="overview_show_deviationslope">Desvio de inclinação</string>
     <string name="authorizationfailed">Falha na autorização</string>
     <string name="overview_show_absinsulin">Insulina absoluta</string>
-    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
-    <string name="passwords_dont_match">As passwords não coincidem</string>
-    <string name="current_master_password">Password Mestre actual</string>
+    <string name="master_password_summary">Senha Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
+    <string name="passwords_dont_match">As senhas não coincidem</string>
+    <string name="current_master_password">Senha Mestre actual</string>
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
@@ -1280,11 +1274,13 @@
     <string name="skin">Tema gráfico</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
     <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Beep Bólus Activado</string>
-    <string name="omnipod_config_beep_basal_enabled">Beep Basal Activado</string>
-    <string name="omnipod_config_beep_smb_enabled">Beep SMB Activado</string>
-    <string name="omnipod_config_beep_tbr_enabled">Beep DBT Activado</string>
+    <string name="omnipod_config_beep_bolus_enabled">Sinal Bólus Activado</string>
+    <string name="omnipod_config_beep_basal_enabled">Sinal Basal Activado</string>
+    <string name="omnipod_config_beep_smb_enabled">Sinal SMB Activado</string>
+    <string name="omnipod_config_beep_tbr_enabled">Sinal DBT Activado</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Opções de Depuração do Pod habilitadas</string>
     <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
     <!-- Omnipod - Fragment -->
     <string name="omnipod_pod_mgmt">Gestão Pod</string>
@@ -1301,8 +1297,27 @@
     <!-- Omnipod - Dialogs -->
     <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">A operação não é possível.\n\n Precisa de esperar alguns minutos, até que AAPS tente definir o perfil para a primeira vez.</string>
+    <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
     <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
     <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Falha na comunicação: tempo limite.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Falha na comunicação: ocorreu um erro inesperado. Por favor, reporte!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado.</string>
+    <string name="omnipod_driver_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização.</string>
+    <string name="omnipod_driver_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro.</string>
     <!-- Omnipod - Pod Mgmt -->
     <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
     <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
@@ -1326,19 +1341,29 @@
     <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
     <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
     <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Se pressionar <b>OK</b>, o estado do Pod vai ser forçado a redefinir e você não será capaz de comunicar mais com o Pod. Faça isso somente se você não pode comunicar mais com o Pod. Se ainda pode comunicar com o Pod, por favor, use o <b>Desactivar Pod</b> opção.</string>
+    <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
     <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nPreencher o novo Pod com insulina suficiente para 3 dias.\n\nOuvir dois sinais sonoros a partir do Pod durante o processo de enchimento. Isso indica que a quantidade mínima de 85U foi inserida. Certifique-se de esvaziar completamente a seringa, mesmo depois de ouvir dois sinais sonoros.\n\nDepois de preencher o Pod, por favor, pressione <b>Próximo</b>.\n\n<b>Nota:</b> não remova a tampa da agulha do Pod neste momento.</string>
     <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">A tentar emparelhar com o novo Pod e purgá-lo.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> por favor, mantenha o Pod muito perto do RileyLink neste momento.</string>
     <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare o local de infusão. Remova a tampa da agulha do Pod e o adesivo e fixe o Pod no local de infusão.\n\nSe a canula sair, por favor, pressione <b>Cancelar</b> e descarte o seu Pod.\n\nPressione <b>Próximo</b> para inserir a canula e começar a administração da basal.</string>
     <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">A tentar definir um plano da basal inicial e inserir canula.\n\nQuando todos os itens estiverem verificados, pode pressionar <b>Próximo</b>.</string>
     <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nO Pod está agora activo.\n\nO seu plano de basal foi programado e a canula foi inserida.\n\nPor favor, verifique se a canula foi inserida correctamente e substitua o seu Pod se você se sente que não.</string>
     <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nPressione <b>Próximo</b> para desactivar o Pod.\n\n<b>Nota:</b> Isto irá suspender toda a administração de insulina e desactivar o Pod.</string>
     <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">A desactivar o Pod.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> Se desactivar falhar continuamente, por favor, pressione <b>Cancelar</b> e use o <b>Repor Pod</b> opção para forçar a repor o estado do Pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
     <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
     <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
     <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
     <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
     <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desacitvar Pod</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
@@ -1349,6 +1374,10 @@
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
     <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Pode ter falhado ao definir perfil da basal. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Pode ter falhado ao definir basal temporária. Se houve uma basal temporária já em execução, pode ter sido cancelada! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Pode ter falhado ao definir a hora. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
     <string name="omnipod_rl_stats">Estatísticas RL</string>
     <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index f496fef1ea..6d7acb563b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -468,12 +468,6 @@
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
-    <string name="nsalarm_urgenthigh">Urgência hiperglicemia</string>
-    <string name="nsalarm_high">Alto</string>
-    <string name="nsalarm_low">Baixo</string>
-    <string name="nsalarm_urgentlow">Urgência hipoglicemia</string>
-    <string name="nsalarm_staledata">Dados Obsoletos</string>
-    <string name="nsalarm_urgentstaledata">Dados obsoletos urgentes</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Tempo limite para Urgência por dados obsoletos [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index bd7dedb65d..9a71eb6ffd 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -383,12 +383,6 @@
     <string name="careportal_insulinage_label">Vechime insulină</string>
     <string name="careportal_pbage_label">Vechime baterie pompă</string>
     <string name="ns_alarmoptions">Opțiuni alarmare</string>
-    <string name="nsalarm_urgenthigh">Hiper urgent</string>
-    <string name="nsalarm_high">Hiper</string>
-    <string name="nsalarm_low">Hipo</string>
-    <string name="nsalarm_urgentlow">Hipo urgent</string>
-    <string name="nsalarm_staledata">Date învechite</string>
-    <string name="nsalarm_urgentstaledata">Date mult prea vechi</string>
     <string name="nsalarm_staledatavalue_label">Prag vechime date [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Prag date mult prea vechi [min]</string>
     <string name="openapsama_autosens_period">Interval pentru autosens [o]</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 85fd15c298..e25728c0ba 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -468,12 +468,6 @@
     <string name="doprofileswitch">Переключить профиль</string>
     <string name="careportal_pbage_label">Батарея помпы работает</string>
     <string name="ns_alarmoptions">опции оповещения</string>
-    <string name="nsalarm_urgenthigh">Тревога выс</string>
-    <string name="nsalarm_high">Высокий</string>
-    <string name="nsalarm_low">Низкий</string>
-    <string name="nsalarm_urgentlow">Тревога низкий</string>
-    <string name="nsalarm_staledata">Устаревшие данные</string>
-    <string name="nsalarm_urgentstaledata">Тревога! устаревшие данные</string>
     <string name="nsalarm_staledatavalue_label">Порог оповещения об устаревших данных [min] (мин)</string>
     <string name="nsalarm_urgent_staledatavalue_label">Порог тревоги об устаревших данных [min] (мин)</string>
     <string name="openapsama_autosens_period">Интервал для autosens [h] (ч)</string>
@@ -853,6 +847,10 @@ Context | Edit Context</string>
     <string name="log_alerts">Журнал оповещений</string>
     <string name="enable_tbr_emulation">Включить эмуляцию TBR</string>
     <string name="enable_tbr_emulation_summary">Использовать пролонгированные болюсы вместо временных базалов TBR чтобы обойти лимит в 250%%</string>
+    <string name="disable_vibration">Отключение вибраций при ручном болюсе</string>
+    <string name="disable_vibration_summary">Для болюса и пролонгированного болюса (доступно только для Insight прошивки 3.х)</string>
+    <string name="disable_vibration_auto">Отключение вибрации при ручном болюсе</string>
+    <string name="disable_vibration_auto_summary">Для микроболюсов SMB и временных базалов с эмуляцией TBR (доступно только для Insight с прошивкой версии 3.x)</string>
     <string name="disconnect_delay">Задержка разъединения [s]</string>
     <string name="serial_number">Серийный номер</string>
     <string name="release_software_version">Версия ПО</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 4102738d1d..f696bd3f2c 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -468,12 +468,6 @@
     <string name="doprofileswitch">Vykonajte zmenu profilu</string>
     <string name="careportal_pbage_label">Vek batérie v pumpe</string>
     <string name="ns_alarmoptions">Nastavenie alarmov</string>
-    <string name="nsalarm_urgenthigh">Veľmi vysoká</string>
-    <string name="nsalarm_high">Vysoká</string>
-    <string name="nsalarm_low">Nízka</string>
-    <string name="nsalarm_urgentlow">Veľmi nízka</string>
-    <string name="nsalarm_staledata">Zastaralé dáta</string>
-    <string name="nsalarm_urgentstaledata">Veľmi zastaralé dáta</string>
     <string name="nsalarm_staledatavalue_label">Hraničná hodnota pre zastaralé dáta [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Vysoká hraničná hodnota pre zastaralé dáta [min]</string>
     <string name="openapsama_autosens_period">Interval pre automatickú detekciu citlivosti [h]</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 0f432004a8..f49188b9ff 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -469,12 +469,6 @@ Eversense-appen.</string>
     <string name="doprofileswitch">Genomför profilbyte</string>
     <string name="careportal_pbage_label">Pumpbatteri ålder</string>
     <string name="ns_alarmoptions">Larminställningar</string>
-    <string name="nsalarm_urgenthigh">Akut hög</string>
-    <string name="nsalarm_high">Hög</string>
-    <string name="nsalarm_low">Låg</string>
-    <string name="nsalarm_urgentlow">Akut låg</string>
-    <string name="nsalarm_staledata">BG-data saknas</string>
-    <string name="nsalarm_urgentstaledata">BG-data saknas (akut larm)</string>
     <string name="nsalarm_staledatavalue_label">Första varning efter [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Akut varning efter [min]</string>
     <string name="openapsama_autosens_period">Intervall för autosens [tim]</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 3b916dda38..738a52ea2e 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -355,12 +355,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="careportal_insulinage_label">İnsülin yaşı</string>
     <string name="careportal_pbage_label">Pompa pil yaşı</string>
     <string name="ns_alarmoptions">Alarm türleri</string>
-    <string name="nsalarm_urgenthigh">Aşırı yüksek</string>
-    <string name="nsalarm_high">Yüksek</string>
-    <string name="nsalarm_low">Düşük</string>
-    <string name="nsalarm_urgentlow">Çok düşük</string>
-    <string name="nsalarm_staledata">Eski veriler</string>
-    <string name="nsalarm_urgentstaledata">Acil durum verileri</string>
     <string name="nsalarm_staledatavalue_label">Eski veri eşiği [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Acil durum verileri eşiği [min]</string>
     <string name="openapsama_autosens_period">Autosens [h] için aralık</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b642819c55..295bc3b9f1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -378,12 +378,6 @@
     <string name="careportal_insulinage_label">胰岛素使用时间</string>
     <string name="careportal_pbage_label">泵电池使用时间</string>
     <string name="ns_alarmoptions">报警选项</string>
-    <string name="nsalarm_urgenthigh">紧急高</string>
-    <string name="nsalarm_high">高</string>
-    <string name="nsalarm_low">低</string>
-    <string name="nsalarm_urgentlow">紧急低</string>
-    <string name="nsalarm_staledata">陈旧数据</string>
-    <string name="nsalarm_urgentstaledata">紧急陈旧数据</string>
     <string name="nsalarm_staledatavalue_label">陈旧数据阈值 [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">紧急陈旧数据阈值 [min]</string>
     <string name="openapsama_autosens_period">Autosens间隔的 [h]</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index dd1063e8c7..712b2c3534 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -124,25 +124,24 @@
     <!--    TDD-->
     <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
-    <string name="careportal_bgcheck">BZ Test</string>
+    <string name="careportal_bgcheck">BZ-Test</string>
     <string name="careportal_announcement">Ankündigung</string>
     <string name="careportal_note">Notiz</string>
     <string name="careportal_question">Frage</string>
     <string name="careportal_exercise">Bewegung</string>
-    <string name="careportal_pumpsitechange">Pumpenkatheter Wechsel</string>
+    <string name="careportal_pumpsitechange">Pumpenkatheter-Wechsel</string>
     <string name="careportal_cgmsensorinsert">CGM-Sensor gesetzt</string>
     <string name="careportal_cgmsensorstart">CGM-Sensor Start</string>
-    <string name="careportal_insulincartridgechange">Insulinreservoir Wechsel</string>
+    <string name="careportal_insulincartridgechange">Insulinreservoir-Wechsel</string>
     <string name="careportal_profileswitch">Profilwechsel</string>
-    <string name="careportal_snackbolus">Snack Bolus</string>
-    <string name="careportal_mealbolus">Mahlzeiten Bolus</string>
-    <string name="careportal_correctionbolus">Korrektur Bolus</string>
-    <string name="careportal_combobolus">Combo Bolus</string>
-    <string name="careportal_tempbasalstart">TBR Start</string>
+    <string name="careportal_snackbolus">Snack-Bolus</string>
+    <string name="careportal_mealbolus">Mahlzeiten-Bolus</string>
+    <string name="careportal_correctionbolus">Korrektur-Bolus</string>
+    <string name="careportal_combobolus">Combo-Bolus</string>
     <string name="careportal_tempbasalend">TBR Ende</string>
-    <string name="careportal_carbscorrection">Kohlenhydrat Korrektur</string>
+    <string name="careportal_carbscorrection">Kohlenhydrat-Korrektur</string>
     <string name="careportal_openapsoffline">OpenAPS offline</string>
-    <string name="careportal_pumpbatterychange">Pumpenbatterie Wechsel</string>
+    <string name="careportal_pumpbatterychange">Pumpenbatterie-Wechsel</string>
     <string name="careportal_temporarytarget">Temporäres Ziel</string>
     <string name="careportal_temporarytargetcancel">Temporäres Ziel abbrechen</string>
     <string name="glucosetype_finger">Finger</string>
diff --git a/dana/src/main/res/values-cs-rCZ/strings.xml b/dana/src/main/res/values-cs-rCZ/strings.xml
index 54cb889cc2..695e20aefe 100644
--- a/dana/src/main/res/values-cs-rCZ/strings.xml
+++ b/dana/src/main/res/values-cs-rCZ/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Baterie v pumpě vybitá</string>
     <string name="occlusion">Okluze</string>
     <string name="emptyreservoir">Prázdný zásobník</string>
+    <string name="checkshaft">Zkontrolovat hřídel</string>
+    <string name="basalmax">Max. bazál</string>
+    <string name="dailymax">Max. denní</string>
     <string name="bloodsugarmeasurementalert">Výstraha měření glykémie</string>
     <string name="remaininsulinalert">Zbývající inzulín</string>
     <string name="missedbolus">Chybějící bolus</string>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 7da5f10834..2c45d91871 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -29,6 +29,8 @@
     <string name="batterydischarged">Batterie Pompe Déchargée</string>
     <string name="occlusion">Occlusion</string>
     <string name="emptyreservoir">Réservoir vide</string>
+    <string name="basalmax">Basal max</string>
+    <string name="dailymax">Quotidien max</string>
     <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>
     <string name="remaininsulinalert">Niveau d\'insuline restant</string>
     <string name="missedbolus">Bolus manqués</string>
diff --git a/dana/src/main/res/values-it-rIT/strings.xml b/dana/src/main/res/values-it-rIT/strings.xml
index 3ffadabd3b..11329423d5 100644
--- a/dana/src/main/res/values-it-rIT/strings.xml
+++ b/dana/src/main/res/values-it-rIT/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Batteria del micro scarica</string>
     <string name="occlusion">Occlusione</string>
     <string name="emptyreservoir">Serbatoio vuoto</string>
+    <string name="checkshaft">Controlla asta meccanica (shaft)</string>
+    <string name="basalmax">Max basale</string>
+    <string name="dailymax">Max giornaliero</string>
     <string name="bloodsugarmeasurementalert">Avviso misurazione glicemia</string>
     <string name="remaininsulinalert">Livello insulina rimanente</string>
     <string name="missedbolus">Bolo perso</string>
diff --git a/dana/src/main/res/values-ru-rRU/strings.xml b/dana/src/main/res/values-ru-rRU/strings.xml
index 964feb4428..b62cc03edd 100644
--- a/dana/src/main/res/values-ru-rRU/strings.xml
+++ b/dana/src/main/res/values-ru-rRU/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">батарея помпы разряжена</string>
     <string name="occlusion">закупорка</string>
     <string name="emptyreservoir">Резервуар пуст</string>
+    <string name="checkshaft">Проверьте шток помпы</string>
+    <string name="basalmax">Макс. шаг базала</string>
+    <string name="dailymax">Максимум в день</string>
     <string name="bloodsugarmeasurementalert">Предупреждение при измерении уровня СК</string>
     <string name="remaininsulinalert">Уровень оставшегося инсулина</string>
     <string name="missedbolus">Недоставленный болюс</string>

From 8a731a9187982dab3dd26fa5718e8b427f436af1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 24 May 2020 23:40:51 +0200
Subject: [PATCH 138/400] SMSCommunicator LOOP command auth

---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  | 45 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  3 ++
 .../SmsCommunicatorPluginTest.kt              | 23 ++++++++--
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 7aa94f1dcc..1c8f44e0a8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -308,13 +308,20 @@ class SmsCommunicatorPlugin @Inject constructor(
         when (splitted[1].toUpperCase(Locale.getDefault())) {
             "DISABLE", "STOP" -> {
                 if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                    loopPlugin.setPluginEnabled(PluginType.LOOP, false)
-                    commandQueue.cancelTempBasal(true, object : Callback() {
+                    val passCode = generatePasscode()
+                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode), passCode)
+                    receivedSms.processed = true
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                         override fun run() {
-                            rxBus.send(EventRefreshOverview("SMS_LOOP_STOP"))
-                            val replyText = resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
-                                resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
-                            sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                            loopPlugin.setPluginEnabled(PluginType.LOOP, false)
+                            commandQueue.cancelTempBasal(true, object : Callback() {
+                                override fun run() {
+                                    rxBus.send(EventRefreshOverview("SMS_LOOP_STOP"))
+                                    val replyText = resourceHelper.gs(R.string.smscommunicator_loophasbeendisabled) + " " +
+                                        resourceHelper.gs(if (result.success) R.string.smscommunicator_tempbasalcanceled else R.string.smscommunicator_tempbasalcancelfailed)
+                                    sendSMS(Sms(receivedSms.phoneNumber, replyText))
+                                }
+                            })
                         }
                     })
                 } else
@@ -324,9 +331,16 @@ class SmsCommunicatorPlugin @Inject constructor(
 
             "ENABLE", "START" -> {
                 if (!loopPlugin.isEnabled(PluginType.LOOP)) {
-                    loopPlugin.setPluginEnabled(PluginType.LOOP, true)
-                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)))
-                    rxBus.send(EventRefreshOverview("SMS_LOOP_START"))
+                    val passCode = generatePasscode()
+                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode), passCode)
+                    receivedSms.processed = true
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                        override fun run() {
+                            loopPlugin.setPluginEnabled(PluginType.LOOP, true)
+                            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loophasbeenenabled)))
+                            rxBus.send(EventRefreshOverview("SMS_LOOP_START"))
+                        }
+                    })
                 } else
                     sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopisenabled)))
                 receivedSms.processed = true
@@ -343,9 +357,16 @@ class SmsCommunicatorPlugin @Inject constructor(
             }
 
             "RESUME"          -> {
-                rxBus.send(EventRefreshOverview("SMS_LOOP_RESUME"))
-                loopPlugin.createOfflineEvent(0)
-                sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopresumed)))
+                val passCode = generatePasscode()
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode), passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                    override fun run() {
+                        rxBus.send(EventRefreshOverview("SMS_LOOP_RESUME"))
+                        loopPlugin.createOfflineEvent(0)
+                        sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_loopresumed)))
+                    }
+                })
             }
 
             "SUSPEND"         -> {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4908f7d04f..33cf3f2cc4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,6 +308,9 @@
     <string name="smscommunicator_carbsreplywithcode">To enter %1$dg at %2$s reply with code %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">To start basal %1$d%% for %2$d min reply with code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">To suspend loop for %1$d minutes reply with code %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">To resume loop reply with code %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">To enable loop reply with code %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">To disable loop reply with code %1$s</string>
     <string name="smscommunicator_tempbasalset">Temp basal %1$.2fU/h for %2$d min started successfully</string>
     <string name="smscommunicator_extendedset">Extended bolus %1$.2fU for %2$d min started successfully</string>
     <string name="smscommunicator_carbsset">Carbs %1$dg entered successfully</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index 1e4d27804d..7321131e30 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -223,6 +223,9 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.smscommunicator_mealbolusdelivered_tt)).thenReturn("Target %1\$s for %2\$d minutes")
         `when`(resourceHelper.gs(R.string.sms_actualbg)).thenReturn("BG:")
         `when`(resourceHelper.gs(R.string.sms_lastbg)).thenReturn("Last BG:")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode)).thenReturn("To disable loop reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode)).thenReturn("To enable loop reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode)).thenReturn("To resume loop reply with code %1\$s")
     }
 
     @Test
@@ -344,7 +347,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         Assert.assertFalse(sms.ignored)
         Assert.assertEquals("LOOP DISABLE", smsCommunicatorPlugin.messages[0].text)
-        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages[1].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To disable loop reply with code "))
+        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Loop has been disabled Temp basal canceled", smsCommunicatorPlugin.messages[3].text)
         Assert.assertTrue(hasBeenRun)
 
         //LOOP ENABLE : already enabled
@@ -368,7 +375,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         Assert.assertFalse(sms.ignored)
         Assert.assertEquals("LOOP ENABLE", smsCommunicatorPlugin.messages[0].text)
-        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages[1].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To enable loop reply with code "))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Loop has been enabled", smsCommunicatorPlugin.messages[3].text)
         Assert.assertTrue(hasBeenRun)
 
         //LOOP RESUME : already enabled
@@ -377,7 +388,11 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         smsCommunicatorPlugin.processSms(sms)
         Assert.assertFalse(sms.ignored)
         Assert.assertEquals("LOOP RESUME", smsCommunicatorPlugin.messages[0].text)
-        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.messages[1].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To resume loop reply with code "))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Loop resumed", smsCommunicatorPlugin.messages[3].text)
 
         //LOOP SUSPEND 1 2: wrong format
         smsCommunicatorPlugin.messages = ArrayList()
@@ -402,7 +417,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertFalse(sms.ignored)
         Assert.assertEquals("LOOP SUSPEND 100", smsCommunicatorPlugin.messages[0].text)
         Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To suspend loop for 100 minutes reply with code "))
-        var passCode: String = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
         smsCommunicatorPlugin.processSms(Sms("1234", passCode))
         Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
         Assert.assertEquals("Loop suspended Temp basal canceled", smsCommunicatorPlugin.messages[3].text)

From 7a086450b5c2cfda091a44dd9f3e482f814758cf Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 25 May 2020 08:59:56 +0200
Subject: [PATCH 139/400] typo

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33cf3f2cc4..c3a821332c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1677,7 +1677,7 @@
     <string name="description_pump_omnipod_dash">Pump integration for Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Finish pairing reminder</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Finish setup reminder</string>
-    <string name="omnipod_alert_expiration">Pod wil expire soon</string>
+    <string name="omnipod_alert_expiration">Pod will expire soon</string>
     <string name="omnipod_alert_expiration_advisory">Pod will expire soon</string>
     <string name="omnipod_alert_shutdown_imminent">Shutdown is imminent</string>
     <string name="omnipod_alert_low_reservoir">Low reservoir</string>

From a4c5ecb9996d60f4e467917afd5f6934f4cfa766 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 25 May 2020 22:04:53 +1200
Subject: [PATCH 140/400]  Update message

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a2fd3d82be..c0b38da8cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -738,7 +738,7 @@
     <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
     <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
     <string name="set_neutral_temps_title">Set neutral temp basals</string>
-    <string name="set_neutral_temps_summary">If enabled, it sets basal to neutral before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
+    <string name="set_neutral_temps_summary">If enabled, it will cancel a temporary basal before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
     <string name="enablesmbalways">Enable SMB always</string>
     <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
     <string name="enablesmbaftercarbs">Enable SMB after carbs</string>

From ec3ebd17dbdc17ba436e2dd7925e63224d933375 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 25 May 2020 13:53:59 +0200
Subject: [PATCH 141/400] History activity performance improvement

---
 .../historyBrowser/HistoryBrowseActivity.kt   | 181 ++++++++++--------
 .../iobCobCalculator/IobCobOref1Thread.java   |   2 +
 .../iob/iobCobCalculator/IobCobThread.java    |   2 +
 .../events/EventAutosensBgLoaded.kt           |   6 +
 .../androidaps/utils/FabricPrivacy.kt         |   1 +
 5 files changed, 113 insertions(+), 79 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventAutosensBgLoaded.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index 5d0df4dbf3..f484c086a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.historyBrowser
 import android.app.DatePickerDialog
 import android.graphics.Color
 import android.os.Bundle
-import android.os.SystemClock
 import android.util.DisplayMetrics
 import android.view.ViewGroup
 import android.widget.LinearLayout
@@ -15,12 +14,13 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.events.EventCustomCalculationFinished
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.overview.OverviewMenus
 import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensBgLoaded
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
 import info.nightscout.androidaps.utils.DateUtil
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.activity_historybrowse.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -74,12 +75,10 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         historybrowse_left.setOnClickListener {
             start -= T.hours(rangeToDisplay.toLong()).msecs()
-            updateGUI("onClickLeft")
             runCalculation("onClickLeft")
         }
         historybrowse_right.setOnClickListener {
             start += T.hours(rangeToDisplay.toLong()).msecs()
-            updateGUI("onClickRight")
             runCalculation("onClickRight")
         }
         historybrowse_end.setOnClickListener {
@@ -90,13 +89,12 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             calendar[Calendar.MINUTE] = 0
             calendar[Calendar.HOUR_OF_DAY] = 0
             start = calendar.timeInMillis
-            updateGUI("onClickEnd")
             runCalculation("onClickEnd")
         }
         historybrowse_zoom.setOnClickListener {
             rangeToDisplay += 6
             rangeToDisplay = if (rangeToDisplay > 24) 6 else rangeToDisplay
-            updateGUI("rangeChange")
+            updateGUI("rangeChange", false)
         }
         historybrowse_zoom.setOnLongClickListener {
             val calendar = Calendar.getInstance()
@@ -106,7 +104,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             calendar[Calendar.MINUTE] = 0
             calendar[Calendar.HOUR_OF_DAY] = 0
             start = calendar.timeInMillis
-            updateGUI("resetToMidnight")
             runCalculation("onLongClickZoom")
             true
         }
@@ -120,7 +117,6 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
             start = cal.timeInMillis
             historybrowse_date?.text = dateUtil.dateAndTimeString(start)
-            updateGUI("onClickDate")
             runCalculation("onClickDate")
         }
 
@@ -144,6 +140,11 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
 
         overviewMenus.setupChartMenu(overview_chartMenuButton)
         prepareGraphs()
+        savedInstanceState?.let { bundle ->
+            rangeToDisplay = bundle.getInt("rangeToDisplay", 0)
+            start = bundle.getLong("start", 0)
+        }
+
     }
 
     public override fun onPause() {
@@ -156,12 +157,21 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         super.onResume()
         disposable.add(rxBus
             .toObservable(EventAutosensCalculationFinished::class.java)
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribe({ event: EventAutosensCalculationFinished ->
+            .observeOn(Schedulers.io())
+            .subscribe({
                 // catch only events from iobCobCalculatorPluginHistory
-                if (event.cause === eventCustomCalculationFinished) {
-                    aapsLogger.debug(LTag.AUTOSENS, "EventAutosensCalculationFinished")
-                    updateGUI("EventAutosensCalculationFinished")
+                if (it.cause is EventCustomCalculationFinished) {
+                    updateGUI("EventAutosensCalculationFinished", bgOnly = false)
+                }
+            }) { fabricPrivacy::logException }
+        )
+        disposable.add(rxBus
+            .toObservable(EventAutosensBgLoaded::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({
+                // catch only events from iobCobCalculatorPluginHistory
+                if (it.cause is EventCustomCalculationFinished) {
+                    updateGUI("EventAutosensCalculationFinished", bgOnly = true)
                 }
             }) { fabricPrivacy::logException }
         )
@@ -174,21 +184,32 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             .toObservable(EventRefreshOverview::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                prepareGraphs()
-                updateGUI("EventRefreshOverview")
+                if (it.now) {
+                    prepareGraphs()
+                    updateGUI("EventRefreshOverview", bgOnly = false)
+                }
             }) { fabricPrivacy::logException }
         )
-        // set start of current day
-        val calendar = Calendar.getInstance()
-        calendar.timeInMillis = System.currentTimeMillis()
-        calendar[Calendar.MILLISECOND] = 0
-        calendar[Calendar.SECOND] = 0
-        calendar[Calendar.MINUTE] = 0
-        calendar[Calendar.HOUR_OF_DAY] = 0
-        start = calendar.timeInMillis
-        runCalculation("onResume")
-        SystemClock.sleep(1000)
-        updateGUI("onResume")
+        if (start == 0L) {
+            // set start of current day
+            val calendar = Calendar.getInstance()
+            calendar.timeInMillis = System.currentTimeMillis()
+            calendar[Calendar.MILLISECOND] = 0
+            calendar[Calendar.SECOND] = 0
+            calendar[Calendar.MINUTE] = 0
+            calendar[Calendar.HOUR_OF_DAY] = 0
+            start = calendar.timeInMillis
+            runCalculation("onResume")
+        } else {
+            updateGUI("onResume", bgOnly = false)
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt("rangeToDisplay", rangeToDisplay)
+        outState.putLong("start", start)
+
     }
 
     private fun prepareGraphs() {
@@ -221,29 +242,30 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
     }
 
     private fun runCalculation(from: String) {
-        treatmentsPluginHistory.initializeData(start - T.hours(8).msecs())
-        val end = start + T.hours(rangeToDisplay.toLong()).msecs()
-        iobCobCalculatorPluginHistory.stopCalculation(from)
-        iobCobCalculatorPluginHistory.clearCache()
-        iobCobCalculatorPluginHistory.runCalculation(from, end, true, false, eventCustomCalculationFinished)
+        GlobalScope.launch(Dispatchers.Default) {
+            treatmentsPluginHistory.initializeData(start - T.hours(8).msecs())
+            val end = start + T.hours(rangeToDisplay.toLong()).msecs()
+            iobCobCalculatorPluginHistory.stopCalculation(from)
+            iobCobCalculatorPluginHistory.clearCache()
+            iobCobCalculatorPluginHistory.runCalculation(from, end, true, false, eventCustomCalculationFinished)
+        }
     }
 
-    @Synchronized
-    fun updateGUI(from: String) {
+    fun updateGUI(from: String, bgOnly: Boolean) {
         aapsLogger.debug(LTag.UI, "updateGUI from: $from")
         val pump = activePlugin.activePump
         val profile = profileFunction.getProfile()
 
-        historybrowse_noprofile?.visibility = (profile == null).toVisibility()
-        profile ?: return
-
         val lowLine = defaultValueHelper.determineLowLine()
         val highLine = defaultValueHelper.determineHighLine()
-        historybrowse_date?.text = dateUtil.dateAndTimeString(start)
-        historybrowse_zoom?.text = rangeToDisplay.toString()
 
         GlobalScope.launch(Dispatchers.Main) {
+            historybrowse_noprofile?.visibility = (profile == null).toVisibility()
+            profile ?: return@launch
+
             historybrowse_bggraph ?: return@launch
+            historybrowse_date?.text = dateUtil.dateAndTimeString(start)
+            historybrowse_zoom?.text = rangeToDisplay.toString()
             val graphData = GraphData(injector, historybrowse_bggraph, iobCobCalculatorPluginHistory, treatmentsPluginHistory)
             val secondaryGraphsData: ArrayList<GraphData> = ArrayList()
 
@@ -263,61 +285,62 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                 // set manual x bounds to have nice steps
                 graphData.formatAxis(fromTime, toTime)
 
-                // Treatments
-                graphData.addTreatments(fromTime, toTime)
-                if (overviewMenus.setting[0][OverviewMenus.CharType.ACT.ordinal])
-                    graphData.addActivity(fromTime, toTime, false, 0.8)
-
-                // add basal data
-                if (pump.pumpDescription.isTempBasalCapable && overviewMenus.setting[0][OverviewMenus.CharType.BAS.ordinal]) {
-                    graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
-                }
-
                 // add target line
                 graphData.addTargetLine(fromTime, toTime, profile, null)
 
                 // **** NOW line ****
                 graphData.addNowLine(pointer)
 
-                // ------------------ 2nd graph
-                for (g in 0 until secondaryGraphs.size) {
-                    val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPluginHistory, treatmentsPluginHistory)
-                    var useIobForScale = false
-                    var useCobForScale = false
-                    var useDevForScale = false
-                    var useRatioForScale = false
-                    var useDSForScale = false
-                    var useIAForScale = false
-                    var useABSForScale = false
-                    when {
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
+                if (!bgOnly) {
+                    // Treatments
+                    graphData.addTreatments(fromTime, toTime)
+                    if (overviewMenus.setting[0][OverviewMenus.CharType.ACT.ordinal])
+                        graphData.addActivity(fromTime, toTime, false, 0.8)
+
+                    // add basal data
+                    if (pump.pumpDescription.isTempBasalCapable && overviewMenus.setting[0][OverviewMenus.CharType.BAS.ordinal]) {
+                        graphData.addBasals(fromTime, toTime, lowLine / graphData.maxY / 1.2)
                     }
+                    // ------------------ 2nd graph
+                    for (g in 0 until secondaryGraphs.size) {
+                        val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPluginHistory, treatmentsPluginHistory)
+                        var useIobForScale = false
+                        var useCobForScale = false
+                        var useDevForScale = false
+                        var useRatioForScale = false
+                        var useDSForScale = false
+                        var useIAForScale = false
+                        var useABSForScale = false
+                        when {
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
+                        }
 
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal])
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, toTime, useIAForScale, 0.8)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, toTime, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal])
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, toTime, useCobForScale, if (useCobForScale) 1.0 else 0.5)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, toTime, useDevForScale, 1.0)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, toTime, useRatioForScale, 1.0)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, toTime, useIAForScale, 0.8)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, toTime, useABSForScale, 1.0)
+                        if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, toTime, useDSForScale, 1.0)
 
-                    // set manual x bounds to have nice steps
-                    secondGraphData.formatAxis(fromTime, toTime)
-                    secondGraphData.addNowLine(pointer)
-                    secondaryGraphsData.add(secondGraphData)
+                        // set manual x bounds to have nice steps
+                        secondGraphData.formatAxis(fromTime, toTime)
+                        secondGraphData.addNowLine(pointer)
+                        secondaryGraphsData.add(secondGraphData)
+                    }
                 }
             }
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()
             for (g in 0 until secondaryGraphs.size) {
                 secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
-                secondaryGraphs[g].visibility = (
+                secondaryGraphs[g].visibility = (!bgOnly && (
                     overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
@@ -325,7 +348,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
-                    ).toVisibility()
+                    )).toVisibility()
                 secondaryGraphsData[g].performUpdate()
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index ef891ff62c..eb2e4841bc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -30,6 +30,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensBgLoaded;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
@@ -114,6 +115,7 @@ public class IobCobOref1Thread extends Thread {
                 if (bgDataReload) {
                     iobCobCalculatorPlugin.loadBgData(end);
                     iobCobCalculatorPlugin.createBucketedData();
+                    rxBus.send(new EventAutosensBgLoaded(cause));
                 }
                 List<BgReading> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index d5af67e3b8..6ea2b7f8b3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -28,6 +28,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensBgLoaded;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutosensCalculationFinished;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
@@ -111,6 +112,7 @@ public class IobCobThread extends Thread {
                 if (bgDataReload) {
                     iobCobCalculatorPlugin.loadBgData(end);
                     iobCobCalculatorPlugin.createBucketedData();
+                    rxBus.send(new EventAutosensBgLoaded(cause));
                 }
                 List<BgReading> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventAutosensBgLoaded.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventAutosensBgLoaded.kt
new file mode 100644
index 0000000000..b02e96b67f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventAutosensBgLoaded.kt
@@ -0,0 +1,6 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator.events
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.events.EventLoop
+
+class EventAutosensBgLoaded(var cause: Event) : EventLoop()
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
index 9468f21bd4..c5e16878f5 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
@@ -79,6 +79,7 @@ class FabricPrivacy @Inject constructor(
         try {
             val crashlytics = Crashlytics.getInstance()
             crashlytics.core.logException(throwable)
+            aapsLogger.debug(LTag.CORE, "Exception: ", throwable)
         } catch (e: NullPointerException) {
             aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $throwable")
         } catch (e: IllegalStateException) {

From b9806d0ea900e449ee146e63f2c01b9f90e71f4e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 25 May 2020 17:43:34 +0200
Subject: [PATCH 142/400] RS user options fix

---
 .../androidaps/dana/activities/DanaUserOptionsActivity.kt       | 2 +-
 .../info/nightscout/androidaps/danars/services/DanaRSService.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
index fd9c50fb48..fafebe603d 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaUserOptionsActivity.kt
@@ -82,7 +82,7 @@ class DanaUserOptionsActivity : NoSplashAppCompatActivity() {
         danar_screentimeout.setParams(danaPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
         danar_backlight.setParams(danaPump.backlightOnTimeSec.toDouble(), minBacklight.toDouble(), 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
         danar_shutdown.setParams(danaPump.shutdownHour.toDouble(), 0.0, 24.0, 1.0, DecimalFormat("1"), true, save_user_options)
-        danar_lowreservoir.setParams(danaPump.lowReservoirRate.toDouble(), 10.0, 60.0, 10.0, DecimalFormat("10"), false, save_user_options)
+        danar_lowreservoir.setParams(danaPump.lowReservoirRate.toDouble(), 10.0, 50.0, 10.0, DecimalFormat("10"), false, save_user_options)
         when (danaPump.beepAndAlarm) {
             0x01  -> danar_pumpalarm_sound.isChecked = true
             0x02  -> danar_pumpalarm_vibrate.isChecked = true
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index b1f472decf..469eb2188d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -239,7 +239,7 @@ class DanaRSService : DaggerService() {
     }
 
     fun setUserSettings(): PumpEnactResult {
-        sendMessage(DanaRS_Packet_Option_Get_User_Option(injector))
+        sendMessage(DanaRS_Packet_Option_Set_User_Option(injector))
         return PumpEnactResult(injector).success(true)
     }
 

From f7793a77f9359b653a36c91d9c131c8dd2e6e17f Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Mon, 25 May 2020 22:32:00 +0100
Subject: [PATCH 143/400] - there are some fields hidden between implementatuon
 of MedtronicCommunicationManager and RileyLinkCommunicationManager (it
 becomes visible only if there is error in packets, which at the moment only
 happens with MySentry packets, which we don;t support.

---
 .../pump/medtronic/comm/MedtronicCommunicationManager.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index a8405ea00d..3737dd0226 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -61,14 +61,11 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
 
-    @Inject AAPSLogger aapsLogger;
     @Inject MedtronicPumpStatus medtronicPumpStatus;
     @Inject MedtronicPumpPlugin medtronicPumpPlugin;
     @Inject MedtronicConverter medtronicConverter;
     @Inject MedtronicUtil medtronicUtil;
     @Inject MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
-    @Inject RileyLinkServiceData rileyLinkServiceData;
-    @Inject ServiceTaskExecutor serviceTaskExecutor;
 
     private final int MAX_COMMAND_TRIES = 3;
     private final int DEFAULT_TIMEOUT = 2000;

From 3bbbeed07d05a4b57eb4cfb588499d2238e626de Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Mon, 25 May 2020 22:40:55 +0100
Subject: [PATCH 144/400] - There are few fields hidden between implementations
 MedtronicCommunicationManager and RileyLinkCommunicationManager. If there is
 error in packet (if MySentry is configugured on Pump), there is NPE when
 trying to write to log.

---
 .../pump/medtronic/comm/MedtronicCommunicationManager.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index a8405ea00d..3737dd0226 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -61,14 +61,11 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
  */
 public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
 
-    @Inject AAPSLogger aapsLogger;
     @Inject MedtronicPumpStatus medtronicPumpStatus;
     @Inject MedtronicPumpPlugin medtronicPumpPlugin;
     @Inject MedtronicConverter medtronicConverter;
     @Inject MedtronicUtil medtronicUtil;
     @Inject MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
-    @Inject RileyLinkServiceData rileyLinkServiceData;
-    @Inject ServiceTaskExecutor serviceTaskExecutor;
 
     private final int MAX_COMMAND_TRIES = 3;
     private final int DEFAULT_TIMEOUT = 2000;

From 11f768636e5ac7ff2f17f75efe697662788865f2 Mon Sep 17 00:00:00 2001
From: Lexsus <lucassrus@gmail.com>
Date: Tue, 26 May 2020 12:48:21 +0300
Subject: [PATCH 145/400] add PUMP CONNECT and PUMP DISCONNECT commands

---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  | 88 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  3 +
 2 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 1c8f44e0a8..229f1209e3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -85,7 +85,7 @@ class SmsCommunicatorPlugin @Inject constructor(
         "LOOP" to "LOOP STOP/DISABLE/START/ENABLE/RESUME/STATUS\nLOOP SUSPEND 20",
         "TREATMENTS" to "TREATMENTS REFRESH",
         "NSCLIENT" to "NSCLIENT RESTART",
-        "PUMP" to "PUMP",
+        "PUMP" to "PUMP\nPUMP CONNECT\nPUMP DISCONNECT 30\n",
         "BASAL" to "BASAL STOP/CANCEL\nBASAL 0.3\nBASAL 0.3 20\nBASAL 30%\nBASAL 30% 20\n",
         "BOLUS" to "BOLUS 1.2\nBOLUS 1.2 MEAL",
         "EXTENDED" to "EXTENDED STOP/CANCEL\nEXTENDED 2 120",
@@ -227,8 +227,9 @@ class SmsCommunicatorPlugin @Inject constructor(
                 "NSCLIENT"   ->
                     if (splitted.size == 2) processNSCLIENT(splitted, receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-                "PUMP"       ->
-                    if (splitted.size == 1) processPUMP(receivedSms)
+                "PUMP"       ->//TODO remoteCommandsAllowed
+                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    else if (splitted.size <=3) processPUMP(splitted,receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 "PROFILE"    ->
                     if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
@@ -441,20 +442,77 @@ class SmsCommunicatorPlugin @Inject constructor(
             sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
-    private fun processPUMP(receivedSms: Sms) {
-        commandQueue.readStatus("SMS", object : Callback() {
-            override fun run() {
-                val pump = activePlugin.activePump
-                if (result.success) {
-                    val reply = pump.shortStatus(true)
-                    sendSMS(Sms(receivedSms.phoneNumber, reply))
-                } else {
-                    val reply = resourceHelper.gs(R.string.readstatusfailed)
-                    sendSMS(Sms(receivedSms.phoneNumber, reply))
+    private fun processPUMP(splitted: Array<String>,receivedSms: Sms) {
+        if (splitted.size == 1) {
+            commandQueue.readStatus("SMS", object : Callback() {
+                override fun run() {
+                    val pump = activePlugin.activePump
+                    if (result.success) {
+                        val reply = pump.shortStatus(true)
+                        sendSMS(Sms(receivedSms.phoneNumber, reply))
+                    } else {
+                        val reply = resourceHelper.gs(R.string.readstatusfailed)
+                        sendSMS(Sms(receivedSms.phoneNumber, reply))
+                    }
                 }
+            })
+            receivedSms.processed = true
+        }
+        else if  ((splitted.size == 2) && (splitted[1].equals("CONNECT", ignoreCase = true)))
+        {
+
+            val passCode = generatePasscode()
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpconnect),passCode)
+            receivedSms.processed = true
+            messageToConfirm = AuthRequest(injector,receivedSms,reply,passCode,object : SmsAction(){
+                override fun run() {
+
+                    commandQueue.cancelTempBasal(true, object : Callback() {
+                        override fun run() {
+                            if (!result.success) {
+                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)))
+                            }
+                            else
+                            {
+                                loopPlugin.suspendTo(0L)
+                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.reconnect)))
+                                rxBus.send(EventRefreshOverview("SMS_PUMP_START"))
+                                //rxBus.send(EventRefreshOverview("SMS_PUMP_CONNECT"))
+                                sp.putBoolean(R.string.key_objectiveusereconnect, true)
+                                loopPlugin.createOfflineEvent(0)
+
+
+                            }
+                        }
+                    })
+
+                }
+            })
+        }
+        else if  (splitted.size == 3)
+        {
+            if (splitted[1].equals("DISCONNECT", ignoreCase = true)){
+                val minutes = SafeParse.stringToInt(splitted[2])
+                val passCode = generatePasscode()
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnect),minutes,passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(injector,receivedSms,reply,passCode,object : SmsAction(){
+                    override fun run() {
+                        val profile = profileFunction.getProfile()
+                        loopPlugin.disconnectPump(minutes, profile)
+                        rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
+                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.pumpsuspended)))
+                        //rxBus.send(EventRefreshOverview("suspendmenu"))
+                    }
+                })
             }
-        })
-        receivedSms.processed = true
+            else{
+                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+                return
+            }
+
+        }
+
     }
 
     private fun processPROFILE(splitted: Array<String>, receivedSms: Sms) { // load profiles
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3a821332c..b1916d9769 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,6 +300,9 @@
     <string name="smscommunicator_loopisenabled">Loop is enabled</string>
     <string name="valuelimitedto">%1$.2f limited to %2$.2f</string>
     <string name="valueoutofrange">Value %1$s is out of hard limits</string>
+    <string name="smscommunicator_pumpconnect">To connect pump reply with code %1$s</string>
+    <string name="smscommunicator_pumpdisconnect">To disconnect pump to %1d minutes reply with code %2$s</string>
+    <string name="smscommunicator_pumpconnectfail">To connect pump failed</string>
     <string name="smscommunicator_remotecommandnotallowed">Remote command is not allowed</string>
     <string name="smscommunicator_remotebolusnotallowed">Remote bolus not available. Try again later.</string>
     <string name="smscommunicator_basalreplywithcode">To start basal %1$.2fU/h for %2$d min reply with code %3$s</string>

From c5aa12c5badb36d809e0e0c8c73228b49c7f65d2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 26 May 2020 19:58:50 +0200
Subject: [PATCH 146/400] double SMB fix

---
 .../automation/triggers/TriggerBolusAgo.kt    |  2 +-
 .../plugins/treatments/TreatmentService.java  | 25 ++++++++++++
 .../plugins/treatments/TreatmentsPlugin.java  | 40 ++++++++-----------
 .../triggers/TriggerBolusAgoTest.kt           |  4 +-
 ...Packet_Bolus_Get_Step_Bolus_Information.kt |  6 ++-
 ...aRS_Packet_General_Get_More_Information.kt |  4 +-
 6 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
index db57bb159a..4b7a56771a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
@@ -35,7 +35,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     }
 
     override fun shouldRun(): Boolean {
-        val lastBolusTime = treatmentsPlugin.getLastBolusTime(false)
+        val lastBolusTime = treatmentsPlugin.getLastBolusTime(true)
         if (lastBolusTime == 0L)
             return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) {
                 aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 60bd9b9b8c..18d997178e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -45,6 +45,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.JsonHelper;
 import io.reactivex.disposables.CompositeDisposable;
@@ -588,6 +589,30 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         }
     }
 
+    /**
+     * Returns the newest record with insulin > 0
+     */
+    @Nullable
+    public Treatment getLastBolus(boolean excludeSMB) {
+        try {
+            QueryBuilder<Treatment, Long> queryBuilder = getDao().queryBuilder();
+            Where where = queryBuilder.where();
+            where.gt("insulin", 0);
+            where.and().le("date", DateUtil.now());
+            where.and().eq("isValid", true);
+            if (excludeSMB) where.and().eq("isSMB", false);
+            queryBuilder.orderBy("date", false);
+            queryBuilder.limit(1L);
+
+            List<Treatment> result = getDao().query(queryBuilder.prepare());
+            if (result.isEmpty())
+                return null;
+            return result.get(0);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void deleteNS(JSONObject json) {
         String _id = JsonHelper.safeGetString(json, "_id");
         if (_id != null && !_id.isEmpty())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 0af7ac8d33..8d723cea71 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -335,33 +335,27 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
 
     @Override
     public long getLastBolusTime() {
-        long now = System.currentTimeMillis();
-        long last = 0;
-        synchronized (treatments) {
-            for (Treatment t : treatments) {
-                if (!t.isValid)
-                    continue;
-                if (t.date > last && t.insulin > 0 && t.date <= now)
-                    last = t.date;
-            }
+        Treatment last = getService().getLastBolus(false);
+        if (last == null) {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: NOTHING FOUND");
+            return 0;
+        }
+        else {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + dateUtil.dateAndTimeString(last.date));
+            return last.date;
         }
-        getAapsLogger().debug(LTag.DATATREATMENTS, "Last bolus time: " + dateUtil.dateAndTimeString(last));
-        return last;
     }
 
-    public long getLastBolusTime(boolean isSMB) {
-        long now = System.currentTimeMillis();
-        long last = 0;
-        synchronized (treatments) {
-            for (Treatment t : treatments) {
-                if (!t.isValid)
-                    continue;
-                if (t.date > last && t.insulin > 0 && t.date <= now && isSMB == t.isSMB)
-                    last = t.date;
-            }
+    public long getLastBolusTime(boolean excludeSMB) {
+        Treatment last = getService().getLastBolus(excludeSMB);
+        if (last == null) {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: NOTHING FOUND");
+            return 0;
+        }
+        else {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + dateUtil.dateAndTimeString(last.date));
+            return last.date;
         }
-        getAapsLogger().debug(LTag.DATATREATMENTS, "Last manual bolus time: " + dateUtil.dateAndTimeString(last));
-        return last;
     }
 
     @Override
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
index fbc4cd8a8b..a1400ae55f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -30,7 +30,7 @@ class TriggerBolusAgoTest : TriggerTestBase() {
 
     @Test
     fun shouldRunTest() {
-        `when`(treatmentsPlugin.getLastBolusTime(false)).thenReturn(now) // Set last bolus time to now
+        `when`(treatmentsPlugin.getLastBolusTime(true)).thenReturn(now) // Set last bolus time to now
         `when`(DateUtil.now()).thenReturn(now + 10 * 60 * 1000) // set current time to now + 10 min
         var t = TriggerBolusAgo(injector).setValue(110).comparator(Comparator.Compare.IS_EQUAL)
         Assert.assertEquals(110, t.minutesAgo.value)
@@ -53,7 +53,7 @@ class TriggerBolusAgoTest : TriggerTestBase() {
         Assert.assertTrue(t.shouldRun())
         t = TriggerBolusAgo(injector).setValue(390).comparator(Comparator.Compare.IS_EQUAL_OR_LESSER)
         Assert.assertTrue(t.shouldRun())
-        PowerMockito.`when`(treatmentsPlugin.getLastBolusTime(false)).thenReturn(0L) // Set last bolus time to 0
+        PowerMockito.`when`(treatmentsPlugin.getLastBolusTime(true)).thenReturn(0L) // Set last bolus time to 0
         t = TriggerBolusAgo(injector).comparator(Comparator.Compare.IS_NOT_AVAILABLE)
         Assert.assertTrue(t.shouldRun())
     }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
index d6d7801acc..7cc2d3aa65 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Step_Bolus_Information.kt
@@ -1,10 +1,11 @@
 package info.nightscout.androidaps.danars.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
+import info.nightscout.androidaps.logging.LTag
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import javax.inject.Inject
 
 class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
@@ -24,7 +25,8 @@ class DanaRS_Packet_Bolus_Get_Step_Bolus_Information(
         danaPump.initialBolusAmount = intFromBuff(data, 2, 2) / 100.0
         val hours = intFromBuff(data, 4, 1)
         val minutes = intFromBuff(data, 5, 1)
-        danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        if (danaPump.usingUTC) danaPump.lastBolusTime = DateTime.now().withZone(DateTimeZone.UTC).withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        else danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
         danaPump.lastBolusAmount = intFromBuff(data, 6, 2) / 100.0
         danaPump.maxBolus = intFromBuff(data, 8, 2) / 100.0
         danaPump.bolusStep = intFromBuff(data, 10, 1) / 100.0
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
index 4f9d15410e..0d110deb71 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_More_Information.kt
@@ -5,6 +5,7 @@ import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import javax.inject.Inject
 
 class DanaRS_Packet_General_Get_More_Information(
@@ -30,7 +31,8 @@ class DanaRS_Packet_General_Get_More_Information(
         // val remainRate = intFromBuff(data, 7, 2) / 100.0
         val hours = intFromBuff(data, 9, 1)
         val minutes = intFromBuff(data, 10, 1)
-        danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        if (danaPump.usingUTC) danaPump.lastBolusTime = DateTime.now().withZone(DateTimeZone.UTC).withHourOfDay(hours).withMinuteOfHour(minutes).millis
+        else danaPump.lastBolusTime = DateTime.now().withHourOfDay(hours).withMinuteOfHour(minutes).millis
         danaPump.lastBolusAmount = intFromBuff(data, 11, 2) / 100.0
         // On DanaRS DailyUnits can't be more than 160
         if (danaPump.dailyTotalUnits > 160) failed = true

From 6f7932f1c7b9d8e26857bb48aa75a9d92e7f37b2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 26 May 2020 20:29:59 +0200
Subject: [PATCH 147/400] New Crowdin translations (#2671)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)
---
 app/src/main/res/values-cs-rCZ/strings.xml | 43 ++++++++++++++
 app/src/main/res/values-de-rDE/strings.xml | 69 +++++++++++-----------
 app/src/main/res/values-fr-rFR/strings.xml |  1 -
 app/src/main/res/values-it-rIT/strings.xml |  3 +
 app/src/main/res/values-pt-rBR/strings.xml |  1 -
 app/src/main/res/values-pt-rPT/strings.xml |  1 -
 app/src/main/res/values-ru-rRU/strings.xml |  7 ++-
 app/src/main/res/values-sk-rSK/strings.xml |  1 -
 app/src/main/res/values-sv-rSE/strings.xml |  1 -
 9 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 691837ca7e..aa081ca187 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Pro zadání %1$dg na %2$s odpovězte pomocí SMS s kódem %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Pro spuštění bazálu %1$d%% na %2$d min odpovězte SMS s kódem %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">K pozastavení smyčky na %1$d minut odpověz SMS s kódem %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Chcete-li obnovit smyčku, odpovězte SMS s kódem %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Chcete-li povolit smyčku, odpovězte SMS s kódem %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Chcete-li zakázat smyčku, odpovězte SMS s kódem %1$s</string>
     <string name="smscommunicator_tempbasalset">Dočasný bazál %1$.2fU/h na %2$d minut spuštěn</string>
     <string name="smscommunicator_extendedset">Prodloužený bolus %1$.2fU na %2$d min úspěšně spuštěn</string>
     <string name="smscommunicator_carbsset">Sacharidy %1$dg byly úspěšně zadány</string>
@@ -468,6 +471,8 @@
     <string name="doprofileswitch">Proveďte přepnutí profilu</string>
     <string name="careportal_pbage_label">Stáří baterie v pumpě</string>
     <string name="ns_alarmoptions">Nastavení alarmů</string>
+    <string name="ns_alarms">Vytvořit oznámení z alarmů NS</string>
+    <string name="ns_announcements">Vytvořit oznámení z NS upozornění </string>
     <string name="nsalarm_staledatavalue_label">Mezní hodnota pro zastaralá data [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Urgentní mezní hodnota pro zastaralá data [min]</string>
     <string name="openapsama_autosens_period">Interval pro detekci senzitivity [h]</string>
@@ -845,6 +850,10 @@
     <string name="log_alerts">Zaznamenat výstrahy</string>
     <string name="enable_tbr_emulation">Povolit emulaci dočasných bazálů</string>
     <string name="enable_tbr_emulation_summary">Používat prodloužené bolusy na obejití limitu dočasných bazálů 250%%</string>
+    <string name="disable_vibration">Zakázat vibrace při ručním podání bolusu</string>
+    <string name="disable_vibration_summary">Pro bolus a prodloužený bolus (dostupné pouze s Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Zakázat vibrace při automatickém podání bolusu</string>
+    <string name="disable_vibration_auto_summary">Pro SMB a Dočasný bazál s emulací TBR (k dispozici pouze s Insight firmware 3.x)</string>
     <string name="disconnect_delay">Limit pro odpojení [s]</string>
     <string name="serial_number">Sériové číslo</string>
     <string name="release_software_version">Verze softwaru</string>
@@ -1341,9 +1350,43 @@
     <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
     <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, Sach=%2$.1f g</string>
     <string name="omnipod_cmd_tbr_value">Rychlost: %1$.1f U, doba trvání: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Pokud stisknete <b>OK</b>, stav Podu bude vynuceně resetován a již nebudete moci komunikovat s Podem. Udělejte to pouze v případě, že s Podem již nelze komunikovat. Pokud stále můžete komunikovat s Podem, použijte volbu <b>Deaktivovat Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Historie Podu není v daném okamžiku k dispozici.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Naplňte Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nNaplňte nový Pod dostatkem inzulínu na 3 dny.\n\nSledujte dvě pípnutí z Podu během procesu plnění. Tyto ukazují, že minimální množství 85U bylo naplněno. Ujistěte se, že stříkačka je zcela vyprázdněná a to i po vyslechnutí dvou pípnutí.\n\nPo naplnění Podu, prosím, stiskněte <b>Další</b>.\n\n<b>Poznámka:</b> prozatím nesundavejte kryt jehly.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Plnění</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Snažím se spárovat s novým Podem a naplnit ho.\n\nJakmile budou zaškrtnuty všechny položky, můžete stisknout <b>Další</b>.\n\n<b>Poznámka:</b> ponechte prosím Pod velmi blízko RileyLinku.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Nasaďte Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPřipravte infuzní místo. Odstraňte krytku jehly a náplasti a nalepte Pod.\n\nPokud se kanyla odlepí, stiskněte <b>Zrušit</b> a zahoďte Pod.\n\nStiskněte <b>Další</b> pro vložení kanyly a spuštění bazálů.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Vkládání kanyly</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Snažím se nastavit počáteční základní bazální plán a vložit kanylu.\n\nPři zaškrtnutí všech položek můžete stisknout tlačítko <b>Další</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod je nyní aktivní.\n\nVáš bazál byl naprogramován a kanyla byla vložena.\n\nOvěřte, prosím, že kanyla byla vložena správně a případně vyměňte Pod.</string>
     <string name="omnipod_remove_pod_wizard_step1_title">Deaktivovat Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nStiskněte <b>Další</b> pro deaktivaci Podu.\n\n<b>Poznámka:</b> Zastavíte veškerý výdej inzulínu a deaktivujete Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Deaktivace Podu</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktivace Podu.\n\nKdyž jsou zaškrtnuty všechny položky, můžete stisknout <b>Další</b>.\n\n<b>Poznámka:</b> Pokud deaktivace nepřetržitě selhává, prosím stiskněte <b>Zrušit</b> a použijte možnost <b>Resetovat Pod</b> pro resetování stavu Podu.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod deaktivován.\n\nOdstraňte Pod z těla a znehodnoťte jej.</string>
+    <string name="omnipod_init_pod_pair_pod">Párování Podu</string>
+    <string name="omnipod_init_pod_prime_pod">Plnění Podu</string>
+    <string name="omnipod_init_pod_fill_cannula">Plnění kanyly</string>
     <string name="omnipod_init_pod_set_basal_profile">Nastavit bazální profil</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Zrušit podávání</string>
     <string name="omnipod_deactivate_pod_deactivate_pod">Deaktivovat Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integrace pumpy pro Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Upomínka dokončení párování</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Upomínka dokončení nastavení</string>
+    <string name="omnipod_alert_expiration">Životnost Podu brzy skončí</string>
+    <string name="omnipod_alert_expiration_advisory">Pod brzy vyprší</string>
+    <string name="omnipod_alert_shutdown_imminent">Blíží se vypnutí</string>
+    <string name="omnipod_alert_low_reservoir">Nízký stav zásobníku</string>
+    <string name="omnipod_alert_unknown_alert">Neznámá výstraha</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Nastavení bazálního profilu se možná nezdařilo. Výdej může být pozastaven! Obnovte prosím stav Podu.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Nastavení dočasného bazálu mohlo být neúspěšné. Pokud je dočasný bazál již spuštěn, mohl by být zrušen! Aktualizujte prosím stav Podu.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Nastavení času se možná nezdařilo. Výdej může být pozastaven! Obnovte prosím stav Podu.</string>
+    <string name="omnipod_bolus_failed_uncertain">Nelze ověřit, zda byl bolus úspěšný. Ověřte prosím, zda Váš Pod dodává bolus nebo ho zrušte.</string>
+    <string name="omnipod_rl_stats">Statistika RL</string>
+    <string name="omnipod_read_pulse_log_short">Pulse Log</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e084f0475b..380b19dc9e 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -18,7 +18,7 @@
     <string name="description_actions">Einige Schaltflächen, um auf häufig verwendete Funktionen zugreifen zu können.</string>
     <string name="description_config_builder">Dient zum Konfigurieren der aktiven Plugins</string>
     <string name="description_objectives">Das Programm kennenlernen</string>
-    <string name="description_food">Zeigt die Essens-Vorlagen aus Nightscout an</string>
+    <string name="description_food">Zeigt die Essensvorlagen aus Nightscout an</string>
     <string name="description_insulin_rapid">Insulinprofil für Humalog und NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Insulinprofil für Fiasp</string>
     <string name="description_insulin_free_peak">Erlaubt dir, das Wirkmaximum der Insulinaktivität zu definieren, und sollte nur von erfahrenen Anwendern genutzt werden</string>
@@ -27,26 +27,26 @@
     <string name="description_ma">Stand des Algorithmus in 2016</string>
     <string name="description_ama">Stand des Algorithmus in 2017</string>
     <string name="description_smb">Der aktuellste Algorithmus für erfahrene Nutzer</string>
-    <string name="description_overview">Zeigt den aktuellen Status deines Loops und Knöpfe für die geläufigsten Aktionen an</string>
+    <string name="description_overview">Zeigt den aktuellen Status deines Loops und Schaltflächen für die geläufigsten Aktionen an</string>
     <string name="description_persistent_notification">Zeigt eine fortlaufende Benachrichtigung mit einer kurzen Übersicht darüber, was dein Loop derzeit tut</string>
     <string name="description_profile_local">Definiere ein Profil, was auch offline verfügbar ist.</string>
     <string name="description_profile_nightscout">Stellt das Profil zur Verfügung, das in Nightscout definiert ist</string>
     <string name="description_profile_simple">Definiere ein Profil mit nur einem Zeitblock.</string>
     <string name="description_pump_combo">Pumpen-Integration für Accu-Chek Combo Pumpen; erfordert, dass ruffy installiert ist</string>
-    <string name="description_pump_mdi">Pumpen-Integration für Personen, die täglich mehrere Injektionen für ihre Diabetestherapie vornehmen</string>
-    <string name="description_pump_virtual">Pumpen-Integration für Pumpen, die noch nicht über einen Treiber verfügen (Open Loop)</string>
+    <string name="description_pump_mdi">Pumpenintegration für Personen, die täglich mehrere Injektionen für ihre Diabetestherapie vornehmen</string>
+    <string name="description_pump_virtual">Pumpenintegration für Pumpen, die noch nicht über einen Treiber verfügen (Open Loop)</string>
     <string name="description_sensitivity_aaps">Die Sensitivität wird genauso wie bei Oref0 berechnet, aber Du kannst dafür ein Zeitfenster bestimmen. Die minimale Kohlenhydrat-Absorptionsrate wird aus der maximalen Absorptionsdauer aus den Einstellungen abgeleitet.</string>
     <string name="description_sensitivity_oref1">Die Sensitivität wird aus den Daten der letzten 8 Stunden berechnet und Kohlenhydrate (falls nicht bereits absorbiert) werden nach der in den Einstellungen angegebenen Zeit als absorbiert betrachtet. Das Plugin bezieht Zeiträume, in denen UAM annimmt, dass Kohlenhydrate aktiv waren, nicht mit in die Berechnung ein.</string>
     <string name="description_sensitivity_weighted_average">Die Sensitivität wird aus den Abweichungen errechnet. Dabei werden neuere Abweichungen stärker gewichtet als ältere. Die minimale Kohlenhydrat-Aufnahme wird aus der in den Präferenzen angegebenen maximalen Kohlenhydrat-Resorptionszeit abgeleitet. Dieser Algorithmus reagiert am schnellsten auf Änderungen der Empfindlichkeit.</string>
-    <string name="description_source_eversense">Empfange BZ-Werte von der gepatchten Eversense App.</string>
-    <string name="description_source_glimp">Empfange Blutzucker-Werte von Glimp.</string>
-    <string name="description_source_mm640g">Empfange Blutzucker-Werte vom 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Lade Blutzucker-Daten von Nightscout</string>
-    <string name="description_source_xdrip">Empfange Blutzucker-Werte von xDrip.</string>
+    <string name="description_source_eversense">Empfange BZ-Werte von der gepatchten Eversense-App.</string>
+    <string name="description_source_glimp">Empfange Blutzuckerwerte von Glimp.</string>
+    <string name="description_source_mm640g">Empfange Blutzuckerwerte vom 600SeriesAndroidUploader.</string>
+    <string name="description_source_ns_client">Lade Blutzuckerdaten von Nightscout</string>
+    <string name="description_source_xdrip">Empfange Blutzuckerwerte von xDrip.</string>
     <string name="description_treatments">Speichert alle eingegebenen Behandlungen</string>
     <string name="description_wear">Überwache und steuere AndroidAPS mit Deiner WearOS-Smartwatch.</string>
     <string name="description_xdrip_status_line">Zeige Loop-Informationen auf Deinem xDrip+-Watchface.</string>
-    <string name="description_sms_communicator">Steuere AndroiAPS fern mittels SMS-Anweisungen.</string>
+    <string name="description_sms_communicator">AndroidAPS mit SMS-Befehlen fernsteuern.</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Kohlenhydrate:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -72,7 +72,7 @@
     <string name="openapsma_currenttemp_label">Aktuelle TBR</string>
     <string name="openapsma_iobdata_label">IOB-Daten</string>
     <string name="openapsma_profile_label">Profil</string>
-    <string name="openapsma_mealdata_label">Mahlzeiten-Daten</string>
+    <string name="openapsma_mealdata_label">Mahlzeitendaten</string>
     <string name="result">Ergebnis</string>
     <string name="result_insulin_carbs">Ergebnis: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Keine BZ-Werte verfügbar</string>
@@ -94,7 +94,7 @@
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Welches Profil soll AndroidAPS nutzen?</string>
     <string name="configbuilder_aps">APS</string>
-    <string name="configbuilder_aps_description">Welcher APS-Algorithmus soll Therapie-Anpassungen vornehmen?</string>
+    <string name="configbuilder_aps_description">Welcher APS-Algorithmus soll Therapieanpassungen vornehmen?</string>
     <string name="configbuilder_general">Allgemein</string>
     <string name="configbuilder_general_description">Dies sind einige generelle Plugins, die Du vielleicht hilfreich findest.</string>
     <string name="configbuilder_constraints_description">Welche Beschränkungen werden angewendet?</string>
@@ -117,7 +117,7 @@
     <string name="setbasalquestion">Akzeptiere neue TBR:</string>
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Rechner</string>
-    <string name="constraintapllied">Beschränkungen angewendet!</string>
+    <string name="constraintapllied">Beschränkung angewendet!</string>
     <string name="confirmation">Bestätigung</string>
     <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
@@ -135,7 +135,7 @@
     <string name="disableloop">Deaktiviere Loop</string>
     <string name="enableloop">Aktiviere Loop</string>
     <string name="openloop_newsuggestion">Neue Empfehlung verfügbar</string>
-    <string name="unsupportednsversion">Nicht unterstütze Nightscout-Version</string>
+    <string name="unsupportednsversion">Nicht unterstützte Nightscout-Version</string>
     <string name="loopdisabled">LOOP DEAKTIVIERT DURCH BESCHRÄNKUNGEN</string>
     <string name="treatments_wizard_basaliob_label">Basal-IOB</string>
     <string name="bolusconstraintapplied">Bolus-Beschränkung angewendet</string>
@@ -151,10 +151,10 @@
     <string name="careportal_newnstreatment_percent_label">Prozent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Notiz</string>
-    <string name="event_time_label">Ereignis-Zeit</string>
+    <string name="event_time_label">Ereigniszeit</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Eingegeben durch</string>
-    <string name="careportal_newnstreatment_glucosetype">Glukose-Art</string>
+    <string name="careportal_newnstreatment_glucosetype">Glukoseart</string>
     <string name="noprofile">Bisher noch kein Profil von Nightscout geladen</string>
     <string name="overview_tempbasal_button">TBR</string>
     <string name="overview_extendedbolus_button">Verzögerter Bolus</string>
@@ -167,10 +167,10 @@
     <string name="filenotfound">Datei nicht gefunden</string>
     <string name="nav_export">Einstellungen exportieren</string>
     <string name="nav_import">Einstellungen importieren</string>
-    <string name="openapsma_maxbasal_title">Max IE/h, die als TBR gesetzt werden können</string>
+    <string name="openapsma_maxbasal_title">Max. IE/h, die als TBR gesetzt werden können</string>
     <string name="openapsma_maxbasal_summary">Dieser Wert wird \"max basal\" in OpenAPS genannt.</string>
     <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
-    <string name="openapsma_maxiob_summary">Maximale Menge von nicht Bolus-IOB, die OpenAPs abgeben kann.</string>
+    <string name="openapsma_maxiob_summary">Maximale Menge von Nicht-Bolus-IOB, die OpenAPS abgeben kann.</string>
     <string name="password_preferences_encrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die exportierten Einstellungen verschlüsselt.</string>
     <string name="password_preferences_decrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die importierten Einstellungen entschlüsselt.</string>
     <string name="preferences_export_canceled">Export abgebrochen! Einstellungen wurden NICHT exportiert!</string>
@@ -201,7 +201,7 @@
     <string name="metadata_format_new">Neues verschlüsseltes Format</string>
     <string name="metadata_format_debug">Neues Debugformat (unverschlüsselt)</string>
     <string name="metadata_format_other">Unbekanntes Export-Format</string>
-    <string name="prefdecrypt_settings_tampered">Einstellungen-Datei wurde manipuliert.</string>
+    <string name="prefdecrypt_settings_tampered">Konfigurationsdatei wurde manipuliert.</string>
     <string name="prefdecrypt_settings_secure">Einstellungsdatei ist sicher.</string>
     <string name="prefdecrypt_settings_unencrypted">Nicht sicheres, unverschlüsseltes Einstellungsformat verwenden</string>
     <string name="prefdecrypt_wrong_json">Fehler im JSON-Format, fehlendes erforderliches Feld (Format, Inhalt, Metadaten oder Sicherheit)</string>
@@ -218,23 +218,23 @@
     <string name="exported_less_than_hour_ago">vor weniger als einer Stunde exportiert</string>
     <string name="in_directory" comment="placeholder is for exported file path">in Verzeichnis: %1$s</string>
     <string name="end_user_license_agreement">Endbenutzervereinbarung</string>
-    <string name="end_user_license_agreement_text">DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNEHMEN SIE ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN.</string>
+    <string name="end_user_license_agreement_text">DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNIMMST DU ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN.</string>
     <string name="end_user_license_agreement_i_understand">Ich verstehe und stimme zu.</string>
     <string name="save">Speichern</string>
     <string name="reloadprofile">Profil neuladen</string>
     <string name="smscommunicator">SMS-Kommunikator</string>
     <string name="smscommunicator_allowednumbers">Erlaubte Telefonnummern</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
-    <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
+    <string name="smscommunicator_bolusreplywithcode">Um einen Bolus von %1$.2f IE abzugeben, antworte mit dem Code %2$s.</string>
     <string name="smscommunicator_mealbolusreplywithcode">Um einen Mahlzeitenbolus von %1$.2f IE abzugeben, antworte mit  dem Code %2$s.</string>
-    <string name="smscommunicator_temptargetwithcode">Um ein Temp Target von %1$s zu setzen, antworte mit dem Code %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Um ein temporäres Ziel von %1$s zu setzen, antworte mit dem Code %2$s</string>
     <string name="smscommunicator_temptargetcancel">Um das temporäre Ziel zu stoppen, antworte mit dem Code %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">Um den SMS Remote Service zu deaktivieren, antworte mit dem Code %1$s.\n\nBeachte, dass Du diesen nur am AAPS Master Smartphone wieder aktivieren kannst.</string>
-    <string name="smscommunicator_stoppedsms">SMS Remote Service gestoppt. Verwende das AAPS Master, um ihn wieder zu aktivieren.</string>
+    <string name="smscommunicator_stopsmswithcode">Um die SMS-Fernsteuerung zu deaktivieren, antworte mit dem Code %1$s\n\nBeachte, dass Du diesen nur am AAPS-Master-Smartphone wieder aktivieren kannst.</string>
+    <string name="smscommunicator_stoppedsms">SMS-Fernsteuerung gestoppt. Verwende das AAPS-Master-Smartphone, um sie wieder zu aktivieren.</string>
     <string name="smscommunicator_calibrationreplywithcode">Um die Kalibrierung %1$.2f zu senden, antworte mit dem Code %2$s.</string>
     <string name="smscommunicator_bolusfailed">Bolus fehlgeschlagen</string>
-    <string name="smscommunicator_remotebolusmindistance_summary">Minimale Dauer in Minuten, die nach einem Remote Bolus verstrichen sein muss, bevor ein neuer abgegeben werden kann.</string>
-    <string name="smscommunicator_remotebolusmindistance">Anzahl Minuten, die mindestens zwischen zwei Bolusgaben liegen müssen.</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Minimale Dauer in Minuten, die nach einem Remote-Bolus verstrichen sein muss, bevor ein neuer abgegeben werden kann.</string>
+    <string name="smscommunicator_remotebolusmindistance">Anzahl der Minuten, die mindestens zwischen zwei Remote-Bolusabgaben liegen müssen.</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Aus Sicherheitsgründen musst Du mindestens zwei Telefonnummern eintragen, um diese Voreinstellung zu ändern.</string>
     <string name="bolusdelivered">Bolus %1$.2fIE erfolgreich abgegeben</string>
     <string name="bolusrequested">Werde %1$.2fIE abgeben</string>
@@ -243,7 +243,7 @@
     <string name="smscommunicator_mealbolusdelivered_tt">Ziel %1$s für %2$d Minuten</string>
     <string name="smscommunicator_tt_set">Ziel %1$s für %2$d Minuten erfolgreich gesetzt.</string>
     <string name="smscommunicator_tt_canceled">Temporäres Ziel wurde erfolgreich abgebrochen</string>
-    <string name="smscommunicator_remotecommandsallowed">Erlaube externe Befehle per SMS</string>
+    <string name="smscommunicator_remotecommandsallowed">Erlaube Fernsteuerung per SMS</string>
     <string name="danarprofile">DanaR Profil-Einstellungen</string>
     <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Dauer der Insulinwirkung</string>
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Um %1$dg Kohlenhydrate um %2$s einzugeben, antworte mit dem Code %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Um die Basalrate von %1$d%% für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Um das Loopen für %1$d Minuten zu pausieren, antworte mit dem Code %2$s.</string>
+    <string name="smscommunicator_loopresumereplywithcode">Um den Loop fortzusetzen, antworte mit dem Code %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Um den Loop zu aktivieren, antworte mit dem Code %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Um den Loop zu deaktivieren, antworte mit dem Code %1$s</string>
     <string name="smscommunicator_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
     <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet</string>
     <string name="smscommunicator_carbsset">%1$dg Kohlenhydrate erfolgreich erfasst.</string>
@@ -276,7 +279,7 @@
     <string name="smscommunicator_tempbasalcanceled">TBR abgebrochen</string>
     <string name="smscommunicator_extendedcanceled">Die Abgabe des erweiterten Bolus wurde abgebrochen.</string>
     <string name="smscommunicator_tempbasalcancelfailed">Das Abbrechen der TBR ist fehlgeschlagen.</string>
-    <string name="smscommunicator_extendedcancelfailed">Der Abbruch des erweiterten Bolus ist fehlgeschlagen</string>
+    <string name="smscommunicator_extendedcancelfailed">Der Abbruch des erweiterten Bolus ist fehlgeschlagen.</string>
     <string name="smscommunicator_unknowncommand">Unbekannter Befehl oder falsche Antwort</string>
     <string name="quickwizard">QuickWizard</string>
     <string name="quickwizardsettings">QuickWizard-Einstellungen</string>
@@ -352,7 +355,7 @@
     <string name="profile">Profil</string>
     <string name="openapsama_max_daily_safety_multiplier_summary">Standardwert: 3\nDies ist eine wichtige Sicherheitseinstellung. Sie begrenzt das maximale Basal-IOB auf die dreifache Menge (im Standardfall) deiner größten Basalrate. In der Regel solltest Du diesen Wert nicht ändern. Aber Du solltest wissen, was \"3x max daily, 4x current\" als Sicherheitseinstellung bedeutet.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt das Basal-IOB auf die (im Standardfall) vierfache Menge der aktuellen Basalrate. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
-    <string name="openapsama_autosens_max_summary">Standardwert: 1.2\nDies ist eine Sicherheitsgrenze für Autosens (und bald auch Autotune), die besagt, wie hoch Autosens Basalraten anpassen darf und wie niedrig der ISF (Insulin-Sensitivitäts-Faktor) und der BZ-Zielwert eingestellt werden können. 1.2 ist dabei der Multiplikationsfaktor und erlaubt eine Anpassung um 20%%.</string>
+    <string name="openapsama_autosens_max_summary">Standardwert: 1.2\nDies ist eine Sicherheitsgrenze für Autosens (und bald auch Autotune), die besagt, wie stark Autosens Basalraten erhöhen darf und wie niedrig der ISF (Insulin-Sensitivitäts-Faktor) und der BZ-Zielwert eingestellt werden können. 1.2 ist dabei der Multiplikationsfaktor und erlaubt eine Anpassung um 20%%.</string>
     <string name="openapsama_autosens_min_summary">Standardwert: 0.7\nDies ist die andere Sicherheitsgrenze für autosens. Sie beschränkt, wie weit Basalraten abgesenkt und wie sehr ISF und BZ-Zielwerte erhöht werden können.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens passt Zielwerte ebenfalls an</string>
     <string name="openapsama_autosens_adjusttargets_summary">Vorgabe: erlaubt.\nErlaubt Autosens den Ziel-BZ-Bereich in Verbindung mit ISF und Basal anzupassen.</string>
@@ -401,7 +404,7 @@
     <string name="resistantadult">Insulinresistenter Erwachsener</string>
     <string name="patientage_summary">Bitte wähle das Patientenalter, um die Sicherheits-Limits festzulegen</string>
     <string name="patient_name">Name des Patienten</string>
-    <string name="patient_name_summary">Gib den Namen des Patienten oder einen Spitznamen für die Unterscheidung zwischen mehreren Setups an.</string>
+    <string name="patient_name_summary">Bitte gib den Namen des Patienten oder einen Spitznamen an, um mehrere Setups unterscheiden zu können.</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Nutzer</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s benötigt eine deaktivierte Akku-Leistungsoptimierung, um korrekt arbeiten zu können.</string>
@@ -502,7 +505,7 @@
     <string name="mdtp_cancel">Abbrechen</string>
     <string name="notloadedplugins">Es sind nicht alle Profile geladen!</string>
     <string name="valuesnotstored">Werte nicht gespeichert!</string>
-    <string name="ns_localbroadcasts">Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip). Nicht aktivieren falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast!</string>
+    <string name="ns_localbroadcasts">Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip). Nicht aktivieren, falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast!</string>
     <string name="ns_localbroadcasts_title">Aktiviere lokale Broadcasts</string>
     <string name="careportal_activity_label">AKTIVITÄT &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
@@ -557,10 +560,10 @@
     <string name="bgsource_upload">BZ Upload Einstellungen</string>
     <string name="wear_detailed_delta_title">Zeige detailliertes Delta</string>
     <string name="wear_detailed_delta_summary">Delta wird mit Dezimalstelle angezeigt.</string>
-    <string name="smbinterval_summary">Wie häufig SMBs angegeben werden (in Min.)</string>
+    <string name="smbinterval_summary">Wie häufig SMBs abgegeben werden (in Min.)</string>
     <string name="smbmaxminutes">SMB max. Minuten</string>
     <string name="smbmaxminutes_summary">SMB Basal-Limit in Minuten</string>
-    <string name="uamsmbmaxminutes">UAM SMB max minutes</string>
+    <string name="uamsmbmaxminutes">UAM SMB max. Minuten</string>
     <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
     <string name="carbsReqThreshold">Schwellenwert für KH-Empfehlung</string>
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 74f3b85a88..cf85eb4cbc 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1374,7 +1374,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="description_pump_omnipod_dash">Intégration de la pompe Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
-    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
     <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
     <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
     <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 6204534b5b..7b83a52d8b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Per inserire %1$dg a %2$s rispondi col codice %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Per avviare la basale %1$d%% per %2$d min rispondi col codice %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Per sospendere il loop per %1$d minuti rispondi col codice %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Per riprendere il loop rispondi col codice %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Per abilitare il loop rispondi col codice %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Per disabilitare il loop rispondi col codice %1$s</string>
     <string name="smscommunicator_tempbasalset">Basale temporanea %1$.2fU/h per %2$d min avviata con successo</string>
     <string name="smscommunicator_extendedset">Bolo esteso %1$.2fU/h per %2$d min avviato con successo</string>
     <string name="smscommunicator_carbsset">CHO %1$dg inseriti con successo</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9dabcc46a9..2d3d87cb2b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1369,7 +1369,6 @@
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
-    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
     <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6d7acb563b..9cc2bd4367 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1369,7 +1369,6 @@
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
-    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
     <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e25728c0ba..9fd0272030 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Чтобы ввести %1$d г в %2$s ответьте кодом %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Для начала подачи базала %1$d%% на %2$d мин. ответьте кодом %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">для приостановки цикла на %1$d мин ответьте кодом %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Чтобы возобновить цикл ответьте кодом %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Чтобы включить цикл ответьте кодом %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Чтобы отключить цикл ответьте кодом %1$s</string>
     <string name="smscommunicator_tempbasalset">врем базал %1$.2fU/h на %2$d мин начат успешно</string>
     <string name="smscommunicator_extendedset">Пролонгированный болюс %1$.2fед. на %2$d мин. начат успешно</string>
     <string name="smscommunicator_carbsset">Углеводы %1$d г введены успешно</string>
@@ -468,6 +471,8 @@
     <string name="doprofileswitch">Переключить профиль</string>
     <string name="careportal_pbage_label">Батарея помпы работает</string>
     <string name="ns_alarmoptions">опции оповещения</string>
+    <string name="ns_alarms">Создать уведомления из оповещений NS</string>
+    <string name="ns_announcements">Создать уведомления из оповещений NS</string>
     <string name="nsalarm_staledatavalue_label">Порог оповещения об устаревших данных [min] (мин)</string>
     <string name="nsalarm_urgent_staledatavalue_label">Порог тревоги об устаревших данных [min] (мин)</string>
     <string name="openapsama_autosens_period">Интервал для autosens [h] (ч)</string>
@@ -1375,7 +1380,7 @@ Context | Edit Context</string>
     <string name="description_pump_omnipod_dash">Интеграция с помпой Omnompod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Напоминание о завершении сопряжения</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Напоминание о завершении настройки</string>
-    <string name="omnipod_alert_expiration">Срок Pod\'a истекает в ближайшее время</string>
+    <string name="omnipod_alert_expiration">Срок работы Pod\'a истекает</string>
     <string name="omnipod_alert_expiration_advisory">Срок Pod\'a истекает в ближайшее время</string>
     <string name="omnipod_alert_shutdown_imminent">Остановка неизбежна</string>
     <string name="omnipod_alert_low_reservoir">В резервуаре мало инсулина</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index f696bd3f2c..e2e47f5a97 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1369,7 +1369,6 @@
     <string name="description_pump_omnipod_dash">Integrácia pumpy pre Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
-    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
     <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
     <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
     <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f49188b9ff..5e43c9f113 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1370,7 +1370,6 @@ Eversense-appen.</string>
     <string name="description_pump_omnipod_dash">Pumpintegration för Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Påminnelse att slutföra parkoppling</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
-    <string name="omnipod_alert_expiration">Pod kommer att gå ut inom kort</string>
     <string name="omnipod_alert_expiration_advisory">Pod kommer att gå ut inom kort</string>
     <string name="omnipod_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
     <string name="omnipod_alert_low_reservoir">Låg reservoar</string>

From 3354bb7da400c4c4a226182e7b85516bd27f7c5f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 27 May 2020 22:57:12 +0200
Subject: [PATCH 148/400] OKDialogs ok button guard

---
 .../androidaps/utils/alertDialogs/OKDialog.kt | 138 ++++++++++++------
 .../utils/alertDialogs/WarningDialog.kt       |  36 +++--
 2 files changed, 112 insertions(+), 62 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
index 2d45d2910d..c0fc646258 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.utils.extensions.runOnUiThread
 object OKDialog {
     @SuppressLint("InflateParams")
     fun show(context: Context, title: String, message: String, runnable: Runnable? = null) {
+        var okClicked = false
         var notEmptytitle = title
         if (notEmptytitle.isEmpty()) notEmptytitle = context.getString(R.string.message)
 
@@ -19,18 +20,21 @@ object OKDialog {
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, notEmptytitle))
             .setMessage(message)
             .setPositiveButton(context.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runOnUiThread(runnable)
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runOnUiThread(runnable)
+                }
             }
             .show()
             .setCanceledOnTouchOutside(false)
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun show(activity: Activity, title: String, message: Spanned, runnable: Runnable? = null) {
+        var okClicked = false
         var notEmptytitle = title
         if (notEmptytitle.isEmpty()) notEmptytitle = activity.getString(R.string.message)
 
@@ -38,9 +42,13 @@ object OKDialog {
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, notEmptytitle))
             .setMessage(message)
             .setPositiveButton(activity.getString(R.string.ok)) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runnable?.let { activity.runOnUiThread(it) }
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runnable?.let { activity.runOnUiThread(it) }
+                }
             }
             .show()
             .setCanceledOnTouchOutside(false)
@@ -57,71 +65,89 @@ object OKDialog {
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(activity: Activity, title: String, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
+        var okClicked = false
         AlertDialogHelper.Builder(activity)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                ok?.let { activity.runOnUiThread(it) }
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    ok?.let { activity.runOnUiThread(it) }
+                }
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                cancel?.let { activity.runOnUiThread(it) }
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    cancel?.let { activity.runOnUiThread(it) }
+                }
             }
-            .setNegativeButton(android.R.string.cancel, null)
             .show()
             .setCanceledOnTouchOutside(false)
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
     fun showConfirmation(activity: Activity, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
+        var okClicked = false
         AlertDialogHelper.Builder(activity)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(activity, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                ok?.let { activity.runOnUiThread(it) }
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    ok?.let { activity.runOnUiThread(it) }
+                }
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                cancel?.let { activity.runOnUiThread(it) }
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    cancel?.let { activity.runOnUiThread(it) }
+                }
             }
             .show()
             .setCanceledOnTouchOutside(false)
     }
 
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(context: Context, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
         showConfirmation(context, context.getString(R.string.confirmation), message, ok, cancel)
     }
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: Spanned, ok: Runnable?, cancel: Runnable? = null) {
+        var okClicked = false
         AlertDialogHelper.Builder(context)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runOnUiThread(ok)
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runOnUiThread(ok)
+                }
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runOnUiThread(cancel)
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runOnUiThread(cancel)
+                }
             }
-            .setNegativeButton(android.R.string.cancel, null)
             .show()
             .setCanceledOnTouchOutside(false)
     }
@@ -136,18 +162,27 @@ object OKDialog {
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: Runnable?, cancel: Runnable? = null) {
+        var okClicked = false
         AlertDialogHelper.Builder(context)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runOnUiThread(ok)
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runOnUiThread(ok)
+                }
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                runOnUiThread(cancel)
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    runOnUiThread(cancel)
+                }
             }
             .show()
             .setCanceledOnTouchOutside(false)
@@ -157,18 +192,27 @@ object OKDialog {
     @JvmStatic
     @JvmOverloads
     fun showConfirmation(context: Context, title: String, message: String, ok: DialogInterface.OnClickListener?, cancel: DialogInterface.OnClickListener? = null) {
+        var okClicked = false
         AlertDialogHelper.Builder(context)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title))
             .setPositiveButton(android.R.string.ok) { dialog: DialogInterface, which: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                ok?.onClick(dialog, which)
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    ok?.onClick(dialog, which)
+                }
             }
             .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, which: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                cancel?.onClick(dialog, which)
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    cancel?.onClick(dialog, which)
+                }
             }
             .show()
             .setCanceledOnTouchOutside(false)
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
index 847287d57a..2894f1b8d4 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
@@ -13,31 +13,37 @@ import info.nightscout.androidaps.utils.extensions.runOnUiThread
 object WarningDialog {
 
     @SuppressLint("InflateParams")
-    @JvmStatic
-    @JvmOverloads
     fun showWarning(context: Context, title: String, message: String, @StringRes positiveButton: Int = -1, ok: (() -> Unit)? = null, cancel: (() -> Unit)? = null) {
-
+        var okClicked = false
         val builder = AlertDialogHelper.Builder(context, R.style.AppThemeWarningDialog)
             .setMessage(message)
             .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, title, R.drawable.ic_header_warning, R.style.AppThemeWarningDialog))
             .setNegativeButton(R.string.dismiss) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                if (cancel != null) {
-                    runOnUiThread(Runnable {
-                        cancel()
-                    })
+                if (okClicked) return@setNegativeButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    if (cancel != null) {
+                        runOnUiThread(Runnable {
+                            cancel()
+                        })
+                    }
                 }
             }
 
         if (positiveButton != -1) {
             builder.setPositiveButton(positiveButton) { dialog: DialogInterface, _: Int ->
-                dialog.dismiss()
-                SystemClock.sleep(100)
-                if (ok != null) {
-                    runOnUiThread(Runnable {
-                        ok()
-                    })
+                if (okClicked) return@setPositiveButton
+                else {
+                    okClicked = true
+                    dialog.dismiss()
+                    SystemClock.sleep(100)
+                    if (ok != null) {
+                        runOnUiThread(Runnable {
+                            ok()
+                        })
+                    }
                 }
             }
         }

From 79cafc14f50a9f0f70bf7fef3d5197d86e43b5f3 Mon Sep 17 00:00:00 2001
From: TebbeUbben <tebbe@ubben.eu>
Date: Thu, 28 May 2020 15:24:53 +0200
Subject: [PATCH 149/400] Insight: Log end events five seconds earlier

---
 .../androidaps/plugins/pump/insight/LocalInsightPlugin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index f8d1cf1ce5..1b8331ac41 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1382,7 +1382,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         pumpID.eventID = event.getEventPosition();
         pumpID.pumpSerial = serial;
         pumpID.eventType = "EndOfTBR";
-        pumpID.timestamp = timestamp;
+        pumpID.timestamp = timestamp - 5000L;
         MainApp.getDbHelper().createOrUpdate(pumpID);
         TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
         temporaryBasal.durationInMinutes = 0;

From 1a94d3d55e12594460d9cc777379431bb85520d9 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 28 May 2020 16:26:57 +0200
Subject: [PATCH 150/400] Add Strings for secondary graph title for translation

---
 .../plugins/general/overview/OverviewMenus.kt | 22 +++++++++----------
 app/src/main/res/values/strings.xml           |  6 +++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index 1cc60f0400..02e66e4ae8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -61,16 +61,16 @@ class OverviewMenus @Inject constructor(
     private val config: Config
 ) {
 
-    enum class CharType(@StringRes val nameId: Int, @ColorRes val colorId: Int, val primary: Boolean, val secondary: Boolean) {
-        PRE(R.string.overview_show_predictions, R.color.prediction, primary = true, secondary = false),
-        BAS(R.string.overview_show_basals, R.color.basal, primary = true, secondary = false),
-        IOB(R.string.overview_show_iob, R.color.iob, primary = false, secondary = true),
-        COB(R.string.overview_show_cob, R.color.cob, primary = false, secondary = true),
-        DEV(R.string.overview_show_deviations, R.color.deviations, primary = false, secondary = true),
-        SEN(R.string.overview_show_sensitivity, R.color.ratio, primary = false, secondary = true),
-        ACT(R.string.overview_show_activity, R.color.activity, primary = true, secondary = true),
-        ABS(R.string.overview_show_absinsulin, R.color.iob, primary = false, secondary = true),
-        DEVSLOPE(R.string.overview_show_deviationslope, R.color.devslopepos, primary = false, secondary = true)
+    enum class CharType(@StringRes val nameId: Int, @ColorRes val colorId: Int, val primary: Boolean, val secondary: Boolean, @StringRes val shortnameId: Int) {
+        PRE(R.string.overview_show_predictions, R.color.prediction, primary = true, secondary = false, shortnameId = R.string.prediction_shortname),
+        BAS(R.string.overview_show_basals, R.color.basal, primary = true, secondary = false,shortnameId = R.string.basal_shortname),
+        IOB(R.string.overview_show_iob, R.color.iob, primary = false, secondary = true,shortnameId = R.string.iob),
+        COB(R.string.overview_show_cob, R.color.cob, primary = false, secondary = true,shortnameId = R.string.cob),
+        DEV(R.string.overview_show_deviations, R.color.deviations, primary = false, secondary = true,shortnameId = R.string.deviation_shortname),
+        SEN(R.string.overview_show_sensitivity, R.color.ratio, primary = false, secondary = true,shortnameId = R.string.sensitivity_shortname),
+        ACT(R.string.overview_show_activity, R.color.activity, primary = true, secondary = true,shortnameId = R.string.activity_shortname),
+        ABS(R.string.overview_show_absinsulin, R.color.iob, primary = false, secondary = true,shortnameId = R.string.abs_insulin_shortname),
+        DEVSLOPE(R.string.overview_show_deviationslope, R.color.devslopepos, primary = false, secondary = true,shortnameId = R.string.devslope_shortname)
     }
 
     companion object {
@@ -80,7 +80,7 @@ class OverviewMenus @Inject constructor(
     fun enabledTypes(graph: Int): String {
         val r = StringBuilder()
         for (type in CharType.values()) if (setting[graph][type.ordinal]) {
-            r.append(type.name)
+            r.append(resourceHelper.gs(type.shortnameId))
             r.append(" ")
         }
         return r.toString()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a4595fab4..7c3923fd9f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -527,8 +527,14 @@
     <string name="statuslights_bat_warning">Threshold warning battery level [%]</string>
     <string name="key_statuslights_bat_critical" translatable="false">statuslights_bat_critical</string>
     <string name="statuslights_bat_critical">Threshold critical battery level [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">About</string>
     <string name="smscommunicator_missingsmspermission">Missing SMS permission</string>
     <string name="smscommunicator_missingphonestatepermission">Missing phone state permission</string>

From 9a1993c5f6991f546e2819be1aeabbeeb95718b8 Mon Sep 17 00:00:00 2001
From: Lexsus <lucassrus@gmail.com>
Date: Thu, 28 May 2020 17:33:51 +0300
Subject: [PATCH 151/400] corrections. add some test for sms commands

---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  | 47 +++++++------------
 app/src/main/res/values/strings.xml           |  8 ++--
 .../SmsCommunicatorPluginTest.kt              | 32 +++++++++++++
 3 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 229f1209e3..8ba5c5fb35 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -227,9 +227,9 @@ class SmsCommunicatorPlugin @Inject constructor(
                 "NSCLIENT"   ->
                     if (splitted.size == 2) processNSCLIENT(splitted, receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
-                "PUMP"       ->//TODO remoteCommandsAllowed
-                    if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
-                    else if (splitted.size <=3) processPUMP(splitted,receivedSms)
+                "PUMP"       ->
+                    if (!remoteCommandsAllowed && splitted.size > 1) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
+                    else if (splitted.size <= 3) processPUMP(splitted, receivedSms)
                     else sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 "PROFILE"    ->
                     if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_remotecommandnotallowed)))
@@ -442,7 +442,7 @@ class SmsCommunicatorPlugin @Inject constructor(
             sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
     }
 
-    private fun processPUMP(splitted: Array<String>,receivedSms: Sms) {
+    private fun processPUMP(splitted: Array<String>, receivedSms: Sms) {
         if (splitted.size == 1) {
             commandQueue.readStatus("SMS", object : Callback() {
                 override fun run() {
@@ -457,60 +457,49 @@ class SmsCommunicatorPlugin @Inject constructor(
                 }
             })
             receivedSms.processed = true
-        }
-        else if  ((splitted.size == 2) && (splitted[1].equals("CONNECT", ignoreCase = true)))
-        {
-
+        } else if ((splitted.size == 2) && (splitted[1].equals("CONNECT", ignoreCase = true))) {
             val passCode = generatePasscode()
-            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpconnect),passCode)
+            val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode), passCode)
             receivedSms.processed = true
-            messageToConfirm = AuthRequest(injector,receivedSms,reply,passCode,object : SmsAction(){
+            messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                 override fun run() {
-
                     commandQueue.cancelTempBasal(true, object : Callback() {
                         override fun run() {
                             if (!result.success) {
                                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)))
-                            }
-                            else
-                            {
+                            } else {
                                 loopPlugin.suspendTo(0L)
-                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.reconnect)))
+                                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_reconnect)))
                                 rxBus.send(EventRefreshOverview("SMS_PUMP_START"))
-                                //rxBus.send(EventRefreshOverview("SMS_PUMP_CONNECT"))
                                 sp.putBoolean(R.string.key_objectiveusereconnect, true)
                                 loopPlugin.createOfflineEvent(0)
-
-
                             }
                         }
                     })
-
                 }
             })
-        }
-        else if  (splitted.size == 3)
-        {
-            if (splitted[1].equals("DISCONNECT", ignoreCase = true)){
+        } else if (splitted.size == 3) {
+            if (splitted[1].equals("DISCONNECT", ignoreCase = true)) {
                 val minutes = SafeParse.stringToInt(splitted[2])
                 val passCode = generatePasscode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnect),minutes,passCode)
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), minutes, passCode)
                 receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector,receivedSms,reply,passCode,object : SmsAction(){
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
                     override fun run() {
                         val profile = profileFunction.getProfile()
                         loopPlugin.disconnectPump(minutes, profile)
                         rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
-                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.pumpsuspended)))
-                        //rxBus.send(EventRefreshOverview("suspendmenu"))
+                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
                     }
                 })
-            }
-            else{
+            } else {
                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 return
             }
 
+        } else {
+            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+            return
         }
 
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1916d9769..b1190382b2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,9 +300,11 @@
     <string name="smscommunicator_loopisenabled">Loop is enabled</string>
     <string name="valuelimitedto">%1$.2f limited to %2$.2f</string>
     <string name="valueoutofrange">Value %1$s is out of hard limits</string>
-    <string name="smscommunicator_pumpconnect">To connect pump reply with code %1$s</string>
-    <string name="smscommunicator_pumpdisconnect">To disconnect pump to %1d minutes reply with code %2$s</string>
-    <string name="smscommunicator_pumpconnectfail">To connect pump failed</string>
+    <string name="smscommunicator_pumpconnectwithcode">To connect pump reply with code %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Connection to pump failed</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">To disconnect pump for %1d minutes reply with code %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pump disconnected</string>
+    <string name="smscommunicator_reconnect">Pump reconnected</string>
     <string name="smscommunicator_remotecommandnotallowed">Remote command is not allowed</string>
     <string name="smscommunicator_remotebolusnotallowed">Remote bolus not available. Try again later.</string>
     <string name="smscommunicator_basalreplywithcode">To start basal %1$.2fU/h for %2$d min reply with code %3$s</string>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index 7321131e30..6af5afd171 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -226,6 +226,9 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode)).thenReturn("To disable loop reply with code %1\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode)).thenReturn("To enable loop reply with code %1\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode)).thenReturn("To resume loop reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode)).thenReturn("To connect pump reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_reconnect)).thenReturn("Pump reconnected")
+        `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)).thenReturn("Connection to pump failed")
     }
 
     @Test
@@ -515,6 +518,35 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals("PUMP", smsCommunicatorPlugin.messages[0].text)
         Assert.assertEquals("Virtual Pump", smsCommunicatorPlugin.messages[1].text)
 
+        //PUMP CONNECT 1 2: wrong format
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP CONNECT 1 2")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP CONNECT 1 2", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PUMP CONNECT BLABLA
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP BLABLA")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP BLABLA", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PUMP CONNECT
+        PowerMockito.`when`(loopPlugin.isEnabled(PluginType.LOOP)).thenReturn(true)
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP CONNECT")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP CONNECT", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To connect pump reply with code "))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Pump reconnected", smsCommunicatorPlugin.messages[3].text)
+
         //HELP
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "HELP")

From bef8b38b76d27eb0d600d6f2f6e96f294f9ab5a2 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 28 May 2020 18:06:32 +0200
Subject: [PATCH 152/400] Fix Missing COB in history browser But more
 calculation and slower :(

---
 .../iob/iobCobCalculator/IobCobCalculatorPlugin.java   |  4 ++--
 .../iob/iobCobCalculator/IobCobOref1Thread.java        | 10 ++++++----
 .../plugins/iob/iobCobCalculator/IobCobThread.java     |  8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 01e8aa2ce2..2f49cd9971 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -814,9 +814,9 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + dateUtil.dateAndTimeString(end));
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
             if (sensitivityOref1Plugin.isEnabled())
-                thread = new IobCobOref1Thread(injector, this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+                thread = new IobCobOref1Thread(injector, this, treatmentsPlugin, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             else
-                thread = new IobCobThread(injector, this, from, end, bgDataReload, limitDataToOldestAvailable, cause);
+                thread = new IobCobThread(injector, this, treatmentsPlugin, from, end, bgDataReload, limitDataToOldestAvailable, cause);
             thread.start();
         }
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index ef891ff62c..ec8f711c99 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -35,6 +35,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCa
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -61,7 +62,6 @@ public class IobCobOref1Thread extends Thread {
     @Inject ResourceHelper resourceHelper;
     @Inject ProfileFunction profileFunction;
     @Inject Context context;
-    @Inject ActivePluginProvider activePluginProvider;
     @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
     @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
     @Inject BuildHelper buildHelper;
@@ -71,6 +71,7 @@ public class IobCobOref1Thread extends Thread {
 
     private final HasAndroidInjector injector;
     private final IobCobCalculatorPlugin iobCobCalculatorPlugin; // cannot be injected : HistoryBrowser uses different instance
+    private final TreatmentsPlugin treatmentsPlugin;             // cannot be injected : HistoryBrowser uses different instance
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -78,11 +79,12 @@ public class IobCobOref1Thread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    IobCobOref1Thread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    IobCobOref1Thread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, TreatmentsPlugin treatmentsPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
         injector.androidInjector().inject(this);
         this.injector = injector;
         this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
 
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;
@@ -240,7 +242,7 @@ public class IobCobOref1Thread extends Thread {
                         }
                     }
 
-                    List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
+                    List<Treatment> recentCarbTreatments = treatmentsPlugin.getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
                         boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();
@@ -363,7 +365,7 @@ public class IobCobOref1Thread extends Thread {
                     // add an extra negative deviation if a high temptarget is running and exercise mode is set
                     // TODO AS-FIX
                     if (false && sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
-                        TempTarget tempTarget = activePluginProvider.getActiveTreatments().getTempTargetFromHistory(bgTime);
+                        TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory(bgTime);
                         if (tempTarget != null && tempTarget.target() >= 100) {
                             autosensData.extraDeviation.add(-(tempTarget.target() - 100) / 20);
                         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index d5af67e3b8..f78438772f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -33,6 +33,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCa
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin;
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
 import info.nightscout.androidaps.utils.FabricPrivacy;
@@ -58,7 +59,6 @@ public class IobCobThread extends Thread {
     @Inject ResourceHelper resourceHelper;
     @Inject ProfileFunction profileFunction;
     @Inject Context context;
-    @Inject ActivePluginProvider activePluginProvider;
     @Inject SensitivityAAPSPlugin sensitivityAAPSPlugin;
     @Inject SensitivityWeightedAveragePlugin sensitivityWeightedAveragePlugin;
     @Inject BuildHelper buildHelper;
@@ -68,6 +68,7 @@ public class IobCobThread extends Thread {
 
     private final HasAndroidInjector injector;
     private final IobCobCalculatorPlugin iobCobCalculatorPlugin; // cannot be injected : HistoryBrowser uses different instance
+    private final TreatmentsPlugin treatmentsPlugin;             // cannot be injected : HistoryBrowser uses different instance
     private boolean bgDataReload;
     private boolean limitDataToOldestAvailable;
     private String from;
@@ -75,11 +76,12 @@ public class IobCobThread extends Thread {
 
     private PowerManager.WakeLock mWakeLock;
 
-    @Inject IobCobThread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
+    @Inject IobCobThread(HasAndroidInjector injector, IobCobCalculatorPlugin iobCobCalculatorPlugin, TreatmentsPlugin treatmentsPlugin, String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
         super();
         injector.androidInjector().inject(this);
         this.injector = injector;
         this.iobCobCalculatorPlugin = iobCobCalculatorPlugin;
+        this.treatmentsPlugin = treatmentsPlugin;
 
         this.bgDataReload = bgDataReload;
         this.limitDataToOldestAvailable = limitDataToOldestAvailable;
@@ -237,7 +239,7 @@ public class IobCobThread extends Thread {
                         }
                     }
 
-                    List<Treatment> recentCarbTreatments = activePluginProvider.getActiveTreatments().getCarbTreatments5MinBackFromHistory(bgTime);
+                    List<Treatment> recentCarbTreatments = treatmentsPlugin.getCarbTreatments5MinBackFromHistory(bgTime);
                     for (Treatment recentCarbTreatment : recentCarbTreatments) {
                         autosensData.carbsFromBolus += recentCarbTreatment.carbs;
                         boolean isAAPSOrWeighted = sensitivityAAPSPlugin.isEnabled() || sensitivityWeightedAveragePlugin.isEnabled();

From 02aff75dff9af5d56bec2bcdc3d609ea3058e2b3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 28 May 2020 21:33:36 +0200
Subject: [PATCH 153/400] change delay to 1.5s

---
 .../androidaps/plugins/pump/insight/LocalInsightPlugin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 1b8331ac41..94548a7b30 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1382,7 +1382,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         pumpID.eventID = event.getEventPosition();
         pumpID.pumpSerial = serial;
         pumpID.eventType = "EndOfTBR";
-        pumpID.timestamp = timestamp - 5000L;
+        pumpID.timestamp = timestamp - 1500L;
         MainApp.getDbHelper().createOrUpdate(pumpID);
         TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
         temporaryBasal.durationInMinutes = 0;

From df0e46f47b3a39831dbb4a4e27c9c25c8ec2d2c0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 28 May 2020 22:00:16 +0200
Subject: [PATCH 154/400] remove duplicated files

---
 .../androidaps/plugins/source/RandomBgPlugin.kt  |   4 ++--
 .../res/drawable-mdpi/icon_actions_refill.png    | Bin 1161 -> 0 bytes
 .../res/drawable-mdpi/icon_danar_useropt.png     | Bin 974 -> 0 bytes
 .../main/res/drawable-mdpi/icon_home_profile.png | Bin 1026 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_local_save.png     | Bin 2249 -> 0 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_local_save.png

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index bb008b383b..763d5a7fb4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -55,7 +55,7 @@ class RandomBgPlugin @Inject constructor(
     }
 
     override fun advancedFilteringSupported(): Boolean {
-        return false
+        return true
     }
 
     override fun onStart() {
@@ -69,7 +69,7 @@ class RandomBgPlugin @Inject constructor(
     }
 
     override fun specialEnableCondition(): Boolean {
-        return isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
+        return true //isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
     }
 
     override fun handleNewData(intent: Intent) {
diff --git a/core/src/main/res/drawable-mdpi/icon_actions_refill.png b/core/src/main/res/drawable-mdpi/icon_actions_refill.png
deleted file mode 100644
index 737cca8b004081172db6dae3f0021d3c2e9cc89f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1161
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIppPnv`AsLNtZ}@hEhe{m(c)lm~l~+~Z=}S3*J-arPco|RNaLE!4+|0pg
zo@&Ojc8zORkfSd5EDaYSULUS4tx7^JVZu+ir#)1<!gEC2i0NUzsfF%5<8uaQEQ-(l
zx8GtJzhh4E`<>@^o_{~Dc;08Hr9mr0w5EEcF3Qk0wA#NS+h%=fg5*2j@8N|a@sIyR
z95e2JcjnW}wl&+2r)ll_sPruM`Cj>p&ABhU&%ZlTwx?ac$o`I(qV`9_XG?yw?K_<L
zr*o#$ogkfqVtblQoo*bCXx#s|-^py*YTn};C94ZkTgvl~8Q*AVwdi<Wpf~k?@FR!n
z&Wi^3jxC!~FWmiM=0w*6sx=zN&bja4wEmEwHNV+&r=N-TlgvGBb$c4F^M3oeamSn-
zGtT4peb1{Wm#tGi%Q3U>d+<M9L%U<%;`;=d|MB$kYVVI*ATcrRn8$XB1IItOEqm)_
zGilvc<tgWd6RYk_;mSPjt-1f;kKLCU?%vRUHgjnOgE^n({5h`!R!(?2qjmF-O$YWh
z&V8x$Z2r*-j_nUG-{JCZUE}f6&M?{B+qvao^HR|%eBV?xZ9{%N3=7tJGHuGgds^;7
z*#%tRpGr;R`Y9&9WuNP=g6$H2BByXwhPK?>-1=>?q4LuDCsNyzIxlH0OR76H|CFg-
zZ<K6>jQwKqdeLjfQ{0d4dd*aK)>KdQQnCTd_s1;)SGt)kA_Jc9n)1%CG%ZkTiJ{7U
zwWt-&E_3TjPI0r$UDW#fqhqJ@Ql~cazj_zfTNi5UrCl-QjXuhMQ*qnjn^U+X@0HFI
z;6C_u=2ss<=?$z&$zO{W+8+(fPEfMZ`S-|VBS($d;=bKSDyn$?tK9Z({U^fxQ+Mg+
zBRg)W9mzQ!C&=Muy>Mr2&ayhe?(=N(4u!YwTd*g4uHQ?ZKic2!?5$v5eW{f1KKI4i
zB&Jx6ZHJhZ`jbujM1B?a1}TakJ(ix){p~@qjecMAy91LK-}tXmHhq3a-c=LfQitn(
wzmGN^y7Og?KgW-Q3Eh2O?-*lY>F?1G{)IVxH;U(Wvw}(xPgg&ebxsLQ08v@%WB>pF

diff --git a/core/src/main/res/drawable-mdpi/icon_danar_useropt.png b/core/src/main/res/drawable-mdpi/icon_danar_useropt.png
deleted file mode 100644
index 1fadcd446be0340737c1c7997a79fae7789e4589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 974
zcmV;<12O!GP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uz0fJsC_RA_<iT1{@+Koowhx-UB~>zn|30>}yC8`SJ9d6D!4r6<5y
zSn@991R*D=dxGE_z|y;L0;;Ee6FnwlGal^LLjEK#m>I_J^ZVY<7(N^h2f7q|yci|}
znI2;x(^m{+`if6o+ZC1ZgosA?xXHZqwX1t|S~R0F4vFYN3>8E)>xxikGJ{7RwBa!k
zt-88rmoYPHIDR&qV<swNHtG%^Uo$UFv?YFnz1WKZK5|^GU2JlS84$@K8-+(ATHs>C
zKG$rqgWM93&b9UP%u5@~(UlB8xf_e6dw$a5^VBd;6~w=0Ub-=iSHe|hb-Lf<sjp1N
zL}eVnbKg#QuW@X(U1y$&D6C7p+243rM`fIV^tftmQ@F}(Vxx0-VF818@YX_Gvx1i-
z9y2cuo7&}+njs%)_;&*lHs%RL3Jm{1yve;ncvRupg$TKlK{iu2{B20fgn9PHRpzCW
z%u9V_yc>8-U#pUVa~*Omnlkmidy0_Z6tdciDJ8LqT#p!2HESA`v2~4-a3v$XvNg=B
zr<=>cinR)B;T_#`R<O=yhNh8VKr3MHL}i?#el4RiUSePC=G4kF(6~;7w1Q}Yp1Bq$
z)|>Vl>mIIxt;{AB<3=)>m*$YnR0TWYK*dFsN2`psszqmY%_m&1GE{=>mmq1}H*HgF
zVN1q%^QeqxHQ(9717FZg&Y=Ig2C{0uqGJ3AR%FnE%neiTQYgnoRL1PF7gY8gJh6sc
zUU;6{8F;LAKa~J%?6l5isPHQ~?wSMnq|tBPqFAazs^;(D;Sr3xMJ!4~RZ9M;w>_<r
z(V)n1HTOmR;5aF`;_F{Pe7$uF`Y{5jUln4fl<%4VWPy{d3>)kl+La@~@R`~Ja#Nn*
zLhO_voIHa9w}MpIJ0WBkAiX|CWn6&t7MBlM1xN~eA+ZEw>VY_+^&^0IHxLQ~CEkwA
z;-R#11aKvj8;-z?dzOo;KOiRKXCvl(kTUJVxJL1{M%yP%mR*3Xwnkz&G6-G`an&80
z8^e`MovvA0OEimxw$?XDZ(l*GaqOIP1kkH8AH1%$Q{xyiQkNpK$NDRo)dc1)EsyiN
z=DL@F;v~8>eDz%&`mZkmZGgV*mtiT_5v%s3DY|^uT&4NWe$wcS3^cDdr-kXAL0jnj
wPYoCIW7EIJ@B?jMF_7si1~Prc<&YtwKfx`30dj}THUIzs07*qoM6N<$f^F!>M*si-

diff --git a/core/src/main/res/drawable-mdpi/icon_home_profile.png b/core/src/main/res/drawable-mdpi/icon_home_profile.png
deleted file mode 100644
index f689df10c6be8d709ccdbf9a221a424d39f094a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpB2O2`kc`H+GyJ_p6Ge{A-|3<1@=#0jKg+hYOY$eAOwoH4yn~0!{44J&
zS8nmGZ-jRkP2l1-*E{01m`Tvtz|k?LGqb)<_nD9EvWwR5_uj4My(cd-<M+PjbAH<x
zzdvLB-D{$UicqJE(nJr@Nf($F<YdiWVm+zt&1YlJewA8%RUOW0Vr&6s$9~TKxalkJ
z@+A`<G6_o_{@*>3Wk&I#`%x)pBF`-}FETD?ZPT$a=i5Dz%iulB`5ikY&F$jfu4)N7
zAG}&=Wq8p1qn4iHs=T|tIC|>e{a9@N-RaVvC92)2p4yY@yv|l;sUEORXl|aVWpOz;
zG|Q}Ew?lL65;wQi9gII%zKBS?+_*EVr|s3M)XdsxCD(XsFV26uQ6<yyWzntM%a00r
zhO5K|?2_4R@wjN(WR;iPSH)O1yghfPxoLA;woOUxcIm7`Jw8vS9jx_w!_DrJWNRaQ
z*5DHBnkV~y7`|L=e#PZzmaVo!xN#513s$jWrg>~}Gmm81bYI*3&~DEJzXV0~6qN%f
zJl1`aEzp{szf6!(_P`opW66Y+OIOcEt)Er?&1>$yZ7ROI&)YL)?Y))xI@I{9)Wl1F
z6&^b~+;uOn*%v36`_(MqSKZW)cIM?FmsG9mlryiN)!p%US1-%t=;w2HN^iS=>~`br
z1G{ENZ{JvU`sMkn|Mp#sF5Jv-p?JSx@&Vn1-oKHX=Lm;QHoV}ae0}Z&+k~wSKl)tf
zg|0ri<C>T9@y4^Y=l+Bz@L1#;rX{=PM6I7DDOezSqi9i?XT0?;?xNj|>eD7~WaW8Q
z?EEwQe|D+IE}fS%mRz57ZPgab+@IEy;#MZ`Xa3MX0!sy%b&PWJQ=g?)M6iIeuBWS?
J%Q~loCIAqCoaO)k

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_local_save.png b/core/src/main/res/drawable-xxxhdpi/icon_local_save.png
deleted file mode 100644
index f2ecc45ac029723637b70dfd5093978a97a8c84a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2249
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
At^fc4


From 15717f02714473653d00930f312f8cadd2ba9c2f Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Fri, 29 May 2020 22:42:54 +1200
Subject: [PATCH 155/400] fix duplicate vals

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index b009688e5f..19a0abb8f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -757,7 +757,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             if (cobInfo.futureCarbs > 0) cobText += "(" + DecimalFormatter.to0Decimal(cobInfo.futureCarbs) + ")"
         }
 
-        val lastRun = loopPlugin.lastRun
         if (config.APS && lastRun?.constraintsProcessed != null) {
             if (lastRun.constraintsProcessed!!.carbsReq > 0) {
                 overview_cob?.text = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)

From 4af06620fb0ce944190c31c1fcaf51f89d6655e0 Mon Sep 17 00:00:00 2001
From: Lexsus <lucassrus@gmail.com>
Date: Fri, 29 May 2020 19:15:11 +0300
Subject: [PATCH 156/400] add tests for PUMP DISCONNECT sms command

---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  | 32 ++++++++------
 .../SmsCommunicatorPluginTest.kt              | 42 +++++++++++++++++++
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 8ba5c5fb35..2cc357aee1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -480,18 +480,26 @@ class SmsCommunicatorPlugin @Inject constructor(
             })
         } else if (splitted.size == 3) {
             if (splitted[1].equals("DISCONNECT", ignoreCase = true)) {
-                val minutes = SafeParse.stringToInt(splitted[2])
-                val passCode = generatePasscode()
-                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), minutes, passCode)
-                receivedSms.processed = true
-                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
-                    override fun run() {
-                        val profile = profileFunction.getProfile()
-                        loopPlugin.disconnectPump(minutes, profile)
-                        rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
-                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
-                    }
-                })
+                var duration = SafeParse.stringToInt(splitted[2])
+                duration = Math.max(0, duration)
+                duration = Math.min(120, duration)
+                if (duration == 0) {
+                    receivedSms.processed = true
+                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
+                    return
+                } else {
+                    val passCode = generatePasscode()
+                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
+                    receivedSms.processed = true
+                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                        override fun run() {
+                            val profile = profileFunction.getProfile()
+                            loopPlugin.disconnectPump(duration, profile)
+                            rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
+                            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
+                        }
+                    })
+                }
             } else {
                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
                 return
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index 6af5afd171..e0d6a5b8ef 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -226,9 +226,12 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         `when`(resourceHelper.gs(R.string.smscommunicator_loopdisablereplywithcode)).thenReturn("To disable loop reply with code %1\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_loopenablereplywithcode)).thenReturn("To enable loop reply with code %1\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_loopresumereplywithcode)).thenReturn("To resume loop reply with code %1\$s")
+        `when`(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode)).thenReturn("To disconnect pump for %1d minutes reply with code %2\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectwithcode)).thenReturn("To connect pump reply with code %1\$s")
         `when`(resourceHelper.gs(R.string.smscommunicator_reconnect)).thenReturn("Pump reconnected")
         `when`(resourceHelper.gs(R.string.smscommunicator_pumpconnectfail)).thenReturn("Connection to pump failed")
+        `when`(resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)).thenReturn("Pump disconnected")
+
     }
 
     @Test
@@ -547,6 +550,45 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() {
         Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
         Assert.assertEquals("Pump reconnected", smsCommunicatorPlugin.messages[3].text)
 
+        //PUMP DISCONNECT 1 2: wrong format
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP DISCONNECT 1 2")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP DISCONNECT 1 2", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertEquals("Wrong format", smsCommunicatorPlugin.messages[1].text)
+
+        //PUMP DISCONNECT 0
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP DISCONNECT 0")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("Wrong duration", smsCommunicatorPlugin.messages[1].text)
+
+        //PUMP DISCONNECT 30
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP DISCONNECT 30")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP DISCONNECT 30", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To disconnect pump for"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Pump disconnected", smsCommunicatorPlugin.messages[3].text)
+
+        //PUMP DISCONNECT 30
+        smsCommunicatorPlugin.messages = ArrayList()
+        sms = Sms("1234", "PUMP DISCONNECT 200")
+        smsCommunicatorPlugin.processSms(sms)
+        Assert.assertFalse(sms.ignored)
+        Assert.assertEquals("PUMP DISCONNECT 200", smsCommunicatorPlugin.messages[0].text)
+        Assert.assertTrue(smsCommunicatorPlugin.messages[1].text.contains("To disconnect pump for"))
+        passCode = smsCommunicatorPlugin.messageToConfirm?.confirmCode!!
+        smsCommunicatorPlugin.processSms(Sms("1234", passCode))
+        Assert.assertEquals(passCode, smsCommunicatorPlugin.messages[2].text)
+        Assert.assertEquals("Pump disconnected", smsCommunicatorPlugin.messages[3].text)
+
         //HELP
         smsCommunicatorPlugin.messages = ArrayList()
         sms = Sms("1234", "HELP")

From 5395ca4e71539b2e70a1a71252894afed3cef424 Mon Sep 17 00:00:00 2001
From: Tebbe Ubben <TebbeUbben@users.noreply.github.com>
Date: Fri, 29 May 2020 19:51:13 +0200
Subject: [PATCH 157/400] Update LocalInsightPlugin.java

---
 .../androidaps/plugins/pump/insight/LocalInsightPlugin.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
index 94548a7b30..aebcb7eaf6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
@@ -1382,13 +1382,13 @@ public class LocalInsightPlugin extends PumpPluginBase implements PumpInterface,
         pumpID.eventID = event.getEventPosition();
         pumpID.pumpSerial = serial;
         pumpID.eventType = "EndOfTBR";
-        pumpID.timestamp = timestamp - 1500L;
+        pumpID.timestamp = timestamp;
         MainApp.getDbHelper().createOrUpdate(pumpID);
         TemporaryBasal temporaryBasal = new TemporaryBasal(getInjector());
         temporaryBasal.durationInMinutes = 0;
         temporaryBasal.source = Source.PUMP;
         temporaryBasal.pumpId = pumpID.id;
-        temporaryBasal.date = timestamp;
+        temporaryBasal.date = timestamp - 1500L;
         temporaryBasals.add(temporaryBasal);
     }
 

From 51739c31b7b2bb2547573a284edc182bd84b2d10 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 31 May 2020 00:18:23 +0200
Subject: [PATCH 158/400] ABS Curve in background I didn't change order in
 selection menu (otherwise selected curves are changed in secondary graphs...)

---
 .../plugins/general/overview/OverviewFragment.kt       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index c9ea872345..7aa2fdae69 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -844,29 +844,29 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 // ------------------ 2nd graph
                 for (g in 0 until secondaryGraphs.size) {
                     val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin)
+                    var useABSForScale = false
                     var useIobForScale = false
                     var useCobForScale = false
                     var useDevForScale = false
                     var useRatioForScale = false
                     var useDSForScale = false
                     var useIAForScale = false
-                    var useABSForScale = false
                     when {
+                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]      -> useIobForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]      -> useCobForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]      -> useDevForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]      -> useRatioForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]      -> useIAForScale = true
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]      -> useABSForScale = true
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] -> useDSForScale = true
                     }
 
+                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0)
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal]) secondGraphData.addIob(fromTime, now, useIobForScale, 1.0, overviewMenus.setting[g + 1][OverviewMenus.CharType.PRE.ordinal])
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal]) secondGraphData.addCob(fromTime, now, useCobForScale, if (useCobForScale) 1.0 else 0.5)
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal]) secondGraphData.addDeviations(fromTime, now, useDevForScale, 1.0)
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal]) secondGraphData.addRatio(fromTime, now, useRatioForScale, 1.0)
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal]) secondGraphData.addActivity(fromTime, endTime, useIAForScale, 0.8)
-                    if (overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal]) secondGraphData.addAbsIob(fromTime, now, useABSForScale, 1.0)
                     if (overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal] && buildHelper.isDev()) secondGraphData.addDeviationSlope(fromTime, now, useDSForScale, 1.0)
 
                     // set manual x bounds to have nice steps
@@ -880,12 +880,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             for (g in 0 until secondaryGraphs.size) {
                 secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
                 secondaryGraphs[g].visibility = (
-                    overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                    overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                        overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
                         overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
                     ).toVisibility()
                 secondaryGraphsData[g].performUpdate()

From a39b7be520020bee54aebbd173b3e442aca5cce2 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 31 May 2020 00:52:32 +0200
Subject: [PATCH 159/400] Order in menu changed too for consistency So it's
 necessary to select again curves in secondary graphs...

---
 .../androidaps/plugins/general/overview/OverviewMenus.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index 02e66e4ae8..f5e3c656dc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -64,12 +64,12 @@ class OverviewMenus @Inject constructor(
     enum class CharType(@StringRes val nameId: Int, @ColorRes val colorId: Int, val primary: Boolean, val secondary: Boolean, @StringRes val shortnameId: Int) {
         PRE(R.string.overview_show_predictions, R.color.prediction, primary = true, secondary = false, shortnameId = R.string.prediction_shortname),
         BAS(R.string.overview_show_basals, R.color.basal, primary = true, secondary = false,shortnameId = R.string.basal_shortname),
+        ABS(R.string.overview_show_absinsulin, R.color.iob, primary = false, secondary = true,shortnameId = R.string.abs_insulin_shortname),
         IOB(R.string.overview_show_iob, R.color.iob, primary = false, secondary = true,shortnameId = R.string.iob),
         COB(R.string.overview_show_cob, R.color.cob, primary = false, secondary = true,shortnameId = R.string.cob),
         DEV(R.string.overview_show_deviations, R.color.deviations, primary = false, secondary = true,shortnameId = R.string.deviation_shortname),
         SEN(R.string.overview_show_sensitivity, R.color.ratio, primary = false, secondary = true,shortnameId = R.string.sensitivity_shortname),
         ACT(R.string.overview_show_activity, R.color.activity, primary = true, secondary = true,shortnameId = R.string.activity_shortname),
-        ABS(R.string.overview_show_absinsulin, R.color.iob, primary = false, secondary = true,shortnameId = R.string.abs_insulin_shortname),
         DEVSLOPE(R.string.overview_show_deviationslope, R.color.devslopepos, primary = false, secondary = true,shortnameId = R.string.devslope_shortname)
     }
 

From 04bd98e0e544b8ac8eafc92cb10cb339458c5a6a Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 31 May 2020 16:41:19 +1200
Subject: [PATCH 160/400] Add Last Carb Time

---
 .../plugins/treatments/TreatmentService.java  | 23 +++++++++++++++++++
 .../plugins/treatments/TreatmentsPlugin.java  | 13 +++++++++++
 2 files changed, 36 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 18d997178e..5dfceda204 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -613,6 +613,29 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
         }
     }
 
+    /**
+     * Returns the newest record with carbs > 0
+     */
+    @Nullable
+    public Treatment getLastCarb() {
+        try {
+            QueryBuilder<Treatment, Long> queryBuilder = getDao().queryBuilder();
+            Where where = queryBuilder.where();
+            where.gt("carbs", 0);
+            where.and().le("date", DateUtil.now());
+            where.and().eq("isValid", true);
+            queryBuilder.orderBy("date", false);
+            queryBuilder.limit(1L);
+
+            List<Treatment> result = getDao().query(queryBuilder.prepare());
+            if (result.isEmpty())
+                return null;
+            return result.get(0);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void deleteNS(JSONObject json) {
         String _id = JsonHelper.safeGetString(json, "_id");
         if (_id != null && !_id.isEmpty())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 8d723cea71..68d1be2f23 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -358,6 +358,19 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         }
     }
 
+    public long getLastCarbTime() {
+        Treatment last = getService().getLastCarb();
+        if (last == null) {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last Carb time: NOTHING FOUND");
+            return 0;
+        }
+        else {
+            getAapsLogger().debug(LTag.DATATREATMENTS, "Last Carb time: " + dateUtil.dateAndTimeString(last.date));
+            return last.date;
+        }
+    }
+
+
     @Override
     public boolean isInHistoryRealTempBasalInProgress() {
         return getRealTempBasalFromHistory(System.currentTimeMillis()) != null;

From 28f2630a917f34978c8dfc669722927a0ad90a39 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 31 May 2020 16:42:13 +1200
Subject: [PATCH 161/400] Eliminate Double notifications

---
 .../nightscout/androidaps/plugins/aps/loop/LoopPlugin.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 44418a4106..9cd3e29f82 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -435,20 +435,19 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
             Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
 
             if (closedLoopEnabled.value()) {
-
                 if (allowNotification) {
                     if (resultAfterConstraints.isCarbsRequired()
                             && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0)
-                            && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
+                            && carbsSuggestionsSuspendedUntil < System.currentTimeMillis() && !treatmentTimethreshold(-15)) {
 
-                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local,true)) {
+                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local,true) && !sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)) {
                             Notification carbreqlocal = new Notification(Notification.CARBS_REQUIRED, resultAfterConstraints.getCarbsRequiredText(), Notification.NORMAL);
                             rxBus.send(new EventNewNotification(carbreqlocal));
                         }
                         if (sp.getBoolean(R.string.key_ns_create_announcements_from_carbs_req, false)) {
                             nsUpload.uploadError(resultAfterConstraints.getCarbsRequiredText());
                         }
-                        if (sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)){
+                        if (sp.getBoolean(R.string.key_enable_carbs_required_alert_local,true) && sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)){
                             Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
                             intentAction5m.putExtra("ignoreDuration", 5);
                             PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context, 1, intentAction5m, PendingIntent.FLAG_UPDATE_CURRENT);

From 8aabf15dfe4a992960c66a03ed16fe4a1a15e5e2 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 31 May 2020 16:43:07 +1200
Subject: [PATCH 162/400] snooze carb alerts for 15 min after treatments

---
 .../androidaps/plugins/aps/loop/LoopPlugin.java           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 9cd3e29f82..b97151702b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -337,6 +337,14 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
         }
         return isDisconnected;
     }
+    public boolean treatmentTimethreshold(int duartionMinutes) {
+        long threshold = System.currentTimeMillis() + (duartionMinutes*60*1000);
+        boolean bool = false;
+        if (treatmentsPlugin.getLastBolusTime() > threshold || treatmentsPlugin.getLastCarbTime() > threshold)
+            bool = true;
+
+        return bool;
+    }
 
     public synchronized void invoke(String initiator, boolean allowNotification) {
         invoke(initiator, allowNotification, false);

From f69c11af40098f27be9649f641d6084ad06a5b8a Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sun, 31 May 2020 16:43:32 +1200
Subject: [PATCH 163/400] Refractor to use new function

---
 .../iob/iobCobCalculator/IobCobCalculatorPlugin.java     | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 2f49cd9971..f991661f9c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -722,14 +722,6 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     result.boluses += treatment.insulin;
                 }
             }
-
-            if (t > absorptionTime_ago && t <= now) {
-                if (treatment.carbs >= 1) {
-                    result.carbs += treatment.carbs;
-                    if (t > result.lastCarbTime)
-                        result.lastCarbTime = t;
-                }
-            }
         }
 
         AutosensData autosensData = getLastAutosensDataSynchronized("getMealData()");
@@ -739,6 +731,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             result.slopeFromMaxDeviation = autosensData.slopeFromMaxDeviation;
             result.usedMinCarbsImpact = autosensData.usedMinCarbsImpact;
         }
+        result.lastCarbTime = treatmentsPlugin.getLastCarbTime();
         result.lastBolusTime = treatmentsPlugin.getLastBolusTime();
         return result;
     }

From 31b31775610cd6080ce2a9f64bddcddd44c61595 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 31 May 2020 10:12:36 +0200
Subject: [PATCH 164/400] upgrade fabric to firebase

---
 app/build.gradle                              | 13 +----
 .../info/nightscout/androidaps/MainApp.java   |  4 +-
 build.gradle                                  |  3 +-
 core/build.gradle                             |  7 ++-
 .../nightscout/androidaps/data/Profile.java   |  2 +-
 .../androidaps/utils/FabricPrivacy.kt         | 52 ++-----------------
 6 files changed, 13 insertions(+), 68 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ddd3aae0cc..eb0b57bd1d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,10 @@
 buildscript {
     repositories {
-        maven { url 'https://maven.fabric.io/public' }
         jcenter()
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.+'
         classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
-        classpath 'de.undercouch:gradle-download-task:3.4.3'
     }
 }
 apply plugin: 'com.android.application'
@@ -15,10 +12,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'io.fabric'
 apply plugin: 'jacoco-android'
-apply plugin: 'de.undercouch.download'
-
+apply plugin: 'com.google.firebase.crashlytics'
 
 jacoco {
     toolVersion = "0.8.3"
@@ -33,7 +28,6 @@ ext {
 
 
 repositories {
-    maven { url 'https://maven.fabric.io/public' }
     jcenter { url "https://jcenter.bintray.com/" }
     mavenCentral()
 }
@@ -249,12 +243,9 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
     implementation "com.google.android.gms:play-services-location:17.0.0"
-    implementation 'com.google.firebase:firebase-core:17.4.0'
+    implementation 'com.google.firebase:firebase-core:17.4.2'
     implementation 'com.google.firebase:firebase-auth:19.3.1'
     implementation 'com.google.firebase:firebase-database:19.3.0'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true;
-    }
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 6b78a50599..85bfd24f44 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -69,7 +69,7 @@ public class MainApp extends DaggerApplication {
         sResources = getResources();
         LocaleHelper.INSTANCE.update(this);
         sDatabaseHelper = OpenHelperManager.getHelper(sInstance, DatabaseHelper.class);
-
+/*
         Thread.setDefaultUncaughtExceptionHandler((thread, ex) -> {
             if (ex instanceof InternalError) {
                 // usually the app trying to spawn a thread while being killed
@@ -77,7 +77,7 @@ public class MainApp extends DaggerApplication {
             }
             aapsLogger.error("Uncaught exception crashing app", ex);
         });
-
+*/
         registerActivityLifecycleCallbacks(activityMonitor);
 
         JodaTimeAndroid.init(this);
diff --git a/build.gradle b/build.gradle
index d33f0f9437..e4561df725 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,12 +17,11 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.31.2'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/core/build.gradle b/core/build.gradle
index b05a44d655..dd41752442 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -58,10 +58,9 @@ dependencies {
     //Logger
     implementation 'org.slf4j:slf4j-api:1.7.30'
     //Fabric
-    implementation 'com.google.firebase:firebase-core:17.4.0'
-    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
-        transitive = true;
-    }
+    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.2'
+    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+
     //RxBus
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation 'org.apache.commons:commons-lang3:3.10'
diff --git a/core/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
index 21eb288c09..7f583663bb 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -82,7 +82,7 @@ public class Profile {
             if (units != null)
                 this.units = units;
             else {
-                fabricPrivacy.log("Profile failover failed too");
+                fabricPrivacy.logCustom("Profile failover failed too");
                 this.units = Constants.MGDL;
             }
         }
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
index c5e16878f5..744c692541 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/FabricPrivacy.kt
@@ -2,13 +2,12 @@ package info.nightscout.androidaps.utils
 
 import android.content.Context
 import android.os.Bundle
-import com.crashlytics.android.Crashlytics
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import io.fabric.sdk.android.Fabric
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -27,21 +26,9 @@ class FabricPrivacy @Inject constructor(
     var firebaseAnalytics: FirebaseAnalytics
 
     init {
-        instance = this
         firebaseAnalytics = FirebaseAnalytics.getInstance(context)
         firebaseAnalytics.setAnalyticsCollectionEnabled(!java.lang.Boolean.getBoolean("disableFirebase") && fabricEnabled())
-
-        if (fabricEnabled()) {
-            Fabric.with(context, Crashlytics())
-        }
-    }
-
-    companion object {
-        private lateinit var instance: FabricPrivacy
-
-        @JvmStatic
-        @Deprecated("Use Dagger")
-        fun getInstance(): FabricPrivacy = instance
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!java.lang.Boolean.getBoolean("disableFirebase") && fabricEnabled())
     }
 
     // Analytics logCustom
@@ -76,39 +63,8 @@ class FabricPrivacy @Inject constructor(
 
     // Crashlytics logException
     fun logException(throwable: Throwable) {
-        try {
-            val crashlytics = Crashlytics.getInstance()
-            crashlytics.core.logException(throwable)
-            aapsLogger.debug(LTag.CORE, "Exception: ", throwable)
-        } catch (e: NullPointerException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $throwable")
-        } catch (e: IllegalStateException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $throwable")
-        }
-    }
-
-    // Crashlytics log
-    fun log(msg: String) {
-        try {
-            val crashlytics = Crashlytics.getInstance()
-            crashlytics.core.log(msg)
-        } catch (e: NullPointerException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
-        } catch (e: IllegalStateException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
-        }
-    }
-
-    // Crashlytics log
-    fun log(priority: Int, tag: String?, msg: String) {
-        try {
-            val crashlytics = Crashlytics.getInstance()
-            crashlytics.core.log(priority, tag, msg)
-        } catch (e: NullPointerException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
-        } catch (e: IllegalStateException) {
-            aapsLogger.debug(LTag.CORE, "Ignoring opted out non-initialized log: $msg")
-        }
+        FirebaseCrashlytics.getInstance().recordException(throwable)
+        aapsLogger.debug(LTag.CORE, "Exception: ", throwable)
     }
 
     fun fabricEnabled(): Boolean {

From 09de329934c6d438175279eb9e38bb6684e35585 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 31 May 2020 11:27:12 +0200
Subject: [PATCH 165/400] libs update & cleanup

---
 app/build.gradle                                       | 10 +++++-----
 .../plugins/general/maintenance/ImportExportPrefs.kt   |  5 ++---
 build.gradle                                           |  6 +++---
 core/build.gradle                                      |  2 +-
 dana/build.gradle                                      |  3 +--
 danar/build.gradle                                     |  8 +-------
 danars/build.gradle                                    |  5 +----
 wear/build.gradle                                      |  2 +-
 8 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index eb0b57bd1d..5bda0b7b45 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ jacoco {
 ext {
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
-    retrofit2Version = '2.8.1'
-    okhttp3Version = '4.6.0'
+    retrofit2Version = '2.9.0'
+    okhttp3Version = '4.7.2'
 }
 
 
@@ -256,12 +256,11 @@ dependencies {
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
     implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
@@ -274,6 +273,7 @@ dependencies {
     implementation "com.jjoe64:graphview:4.0.1"
     implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
+    // Omnipod wizard
     implementation(name: "com.atech-software.android.library.wizardpager-1.1.1", ext: "aar")
 
     implementation("com.google.android:flexbox:0.3.0") {
@@ -299,7 +299,7 @@ dependencies {
     implementation 'com.eatthepath:java-otp:0.2.0'
 
     testImplementation "junit:junit:4.13"
-    testImplementation "org.json:json:20190722"
+    testImplementation 'org.json:json:20200518'
     testImplementation "org.mockito:mockito-core:2.8.47"
     testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
     testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index 4fa6c43fce..565b33b77b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -7,7 +7,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.provider.Settings
-import androidx.activity.invoke
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -221,7 +220,7 @@ class ImportExportPrefs @Inject constructor(
                     importSharedPreferences(fragmentAct, it)
                 }
             }
-            callForPrefFile.invoke()
+            callForPrefFile.launch(null)
         }
     }
 
@@ -231,7 +230,7 @@ class ImportExportPrefs @Inject constructor(
                 importSharedPreferences(activity, it)
             }
         }
-        callForPrefFile.invoke()
+        callForPrefFile.launch(null)
     }
 
     private fun importSharedPreferences(activity: Activity, importFile: PrefsFile) {
diff --git a/build.gradle b/build.gradle
index e4561df725..1e9b924fc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,9 +9,9 @@ buildscript {
         rxkotlin_version = '2.4.0'
         room_version = '2.2.5'
         lifecycle_version = '2.2.0'
-        dagger_version = '2.27'
-        coroutinesVersion = '1.3.5'
-        activityVersion = '1.2.0-alpha04'
+        dagger_version = '2.28'
+        coroutinesVersion = '1.3.7'
+        activityVersion = '1.2.0-alpha05'
         ormLiteVersion = "4.46"
     }
     repositories {
diff --git a/core/build.gradle b/core/build.gradle
index dd41752442..5f2fed073e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
     implementation 'org.apache.commons:commons-lang3:3.10'
 
     // Graphview cannot be upgraded
diff --git a/dana/build.gradle b/dana/build.gradle
index 4450b57df6..09205a9337 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -51,10 +51,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
diff --git a/danar/build.gradle b/danar/build.gradle
index 83399cc43a..878641c87a 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -53,14 +53,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-
-    // remove after conversion to aapslogger
-    implementation 'org.slf4j:slf4j-api:1.7.30'
-
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
@@ -74,7 +68,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/danars/build.gradle b/danars/build.gradle
index 80a5623e04..4e991b502d 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -52,11 +52,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.activity:activity:${activityVersion}"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
@@ -70,7 +67,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
     //RxBus
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/wear/build.gradle b/wear/build.gradle
index fbfeeccfbc..94441d025d 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -124,7 +124,7 @@ dependencies {
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
     testImplementation 'junit:junit:4.13'
-    testImplementation 'org.json:json:20190722'
+    testImplementation 'org.json:json:20200518'
     testImplementation ("org.mockito:mockito-core:2.8.47") {
         exclude group: 'net.bytebuddy', module: 'byte-buddy'
         exclude group: 'net.bytebuddy', module: 'byte-buddy-android'

From 55bccafef5d246bc1255d8db622eb43ca565c817 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 31 May 2020 12:02:42 +0200
Subject: [PATCH 166/400] Large display skin

---
 .../nightscout/androidaps/MainActivity.kt     |  1 +
 .../dependencyInjection/SkinsModule.kt        |  7 ++++++
 .../general/overview/OverviewFragment.kt      |  3 ++-
 .../androidaps/skins/SkinButtonsOn.kt         |  4 +++-
 .../androidaps/skins/SkinClassic.kt           |  4 +++-
 .../androidaps/skins/SkinInterface.kt         |  2 ++
 .../androidaps/skins/SkinLargeDisplay.kt      | 23 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  5 ++--
 8 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index f25cf49fc9..7881fea604 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -174,6 +174,7 @@ class MainActivity : NoSplashAppCompatActivity() {
 
     private fun processPreferenceChange(ev: EventPreferenceChange) {
         if (ev.isChanged(resourceHelper, R.string.key_keep_screen_on)) setWakeLock()
+        if (ev.isChanged(resourceHelper, R.string.key_skin)) recreate()
     }
 
     private fun setupViews() {
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SkinsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SkinsModule.kt
index ebd4691f38..cd71cc8fd2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SkinsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/SkinsModule.kt
@@ -8,6 +8,7 @@ import dagger.multibindings.IntoMap
 import info.nightscout.androidaps.skins.SkinButtonsOn
 import info.nightscout.androidaps.skins.SkinClassic
 import info.nightscout.androidaps.skins.SkinInterface
+import info.nightscout.androidaps.skins.SkinLargeDisplay
 import javax.inject.Qualifier
 
 @Module
@@ -25,6 +26,12 @@ open class SkinsModule {
     @IntKey(10)
     fun bindsSkinButtonsOn(skinButtonsOn: SkinButtonsOn): SkinInterface = skinButtonsOn
 
+    @Provides
+    @Skin
+    @IntoMap
+    @IntKey(20)
+    fun bindsSkinLargeDisplay(skinLargeDisplay: SkinLargeDisplay): SkinInterface = skinLargeDisplay
+
     @Qualifier
     annotation class Skin
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index c9ea872345..07dbc14b94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -184,6 +184,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_bggraph?.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
         overview_bggraph?.gridLabelRenderer?.reloadStyles()
         overview_bggraph?.gridLabelRenderer?.labelVerticalWidth = axisWidth
+        overview_bggraph?.layoutParams?.height = resourceHelper.dpToPx(skinProvider.activeSkin().mainGraphHeight)
 
         rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6)
 
@@ -482,7 +483,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 overview_iobgraph.addView(label)
                 secondaryGraphsLabel.add(label)
                 val graph = GraphView(context)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(35), 0, resourceHelper.dpToPx(15)) }
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(35), 0, resourceHelper.dpToPx(15)) }
                 graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
index b2243d3336..9584ce2f4b 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinButtonsOn.kt
@@ -8,7 +8,9 @@ import javax.inject.Singleton
 @Singleton
 class SkinButtonsOn @Inject constructor(private val config: Config) : SkinInterface {
 
-    override val description: Int get() = R.string.buttonson_desrciption
+    override val description: Int get() = R.string.buttonson_description
+    override val mainGraphHeight: Int get() = 200
+    override val secondaryGraphHeight: Int get() = 100
 
     override fun overviewLayout(isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean): Int =
         when {
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
index deef2440f3..9388843db8 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinClassic.kt
@@ -8,7 +8,9 @@ import javax.inject.Singleton
 @Singleton
 class SkinClassic @Inject constructor(private val config: Config): SkinInterface {
 
-    override val description: Int get() = R.string.classic_desrciption
+    override val description: Int get() = R.string.classic_description
+    override val mainGraphHeight: Int get() = 200
+    override val secondaryGraphHeight: Int get() = 100
 
     override fun overviewLayout(isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean): Int =
         when {
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt
index 6a9d055a13..73c047d100 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinInterface.kt
@@ -6,5 +6,7 @@ import androidx.annotation.StringRes
 interface SkinInterface {
     @get:StringRes val description : Int
 
+    val mainGraphHeight : Int // in dp
+    val secondaryGraphHeight : Int // in dp
     @LayoutRes fun overviewLayout(isLandscape : Boolean, isTablet : Boolean, isSmallHeight : Boolean): Int
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt
new file mode 100644
index 0000000000..b28a0e3e0a
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinLargeDisplay.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.skins
+
+import info.nightscout.androidaps.Config
+import info.nightscout.androidaps.R
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SkinLargeDisplay @Inject constructor(private val config: Config): SkinInterface {
+
+    override val description: Int get() = R.string.largedisplay_description
+    override val mainGraphHeight: Int get() = 400
+    override val secondaryGraphHeight: Int get() = 150
+
+    override fun overviewLayout(isLandscape: Boolean, isTablet: Boolean, isSmallHeight: Boolean): Int =
+        when {
+            config.NSCLIENT && isTablet  -> R.layout.overview_fragment_nsclient_tablet
+            config.NSCLIENT              -> R.layout.overview_fragment_nsclient
+            isSmallHeight || isLandscape -> R.layout.overview_fragment_landscape
+            else                         -> R.layout.overview_fragment
+        }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8f40ffbbe3..01a74eb73e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1548,8 +1548,9 @@
     <string name="key_statuslights_copy_ns" translatable="false">statuslights_copy_ns</string>
     <string name="copyexistingvalues">Copy NS settings (if exists)?</string>
     <string name="key_statuslights_overview_advanced" translatable="false">statuslights_overview_advanced</string>
-    <string name="classic_desrciption">Original skin</string>
-    <string name="buttonson_desrciption">Buttons are always displayed on bottom of screen</string>
+    <string name="classic_description">Original skin</string>
+    <string name="buttonson_description">Buttons are always displayed on bottom of screen</string>
+    <string name="largedisplay_description">Large display</string>
     <string name="key_skin" translatable="false">skin</string>
     <string name="skin">Skin</string>
 

From df4b1e267642cf2108c76788a814161cf353e535 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 1 Jun 2020 00:13:28 +1200
Subject: [PATCH 167/400] remove not needed file

---
 app/src/main/jniLibs/README.md | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 app/src/main/jniLibs/README.md

diff --git a/app/src/main/jniLibs/README.md b/app/src/main/jniLibs/README.md
deleted file mode 100644
index 7041df4e10..0000000000
--- a/app/src/main/jniLibs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# danars-support-lib
\ No newline at end of file

From 845c036943faecac6936c508e6508ad169fc066b Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 1 Jun 2020 00:58:22 +1200
Subject: [PATCH 168/400] set min number to 3

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

diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 859a75a82b..7a51647782 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -83,7 +83,7 @@
             android:singleLine="true"
             android:title="@string/smbinterval_summary"
             validate:maxNumber="10"
-            validate:minNumber="1"
+            validate:minNumber="3"
             validate:testType="numericRange" />
 
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference

From 7e30754d187edb03c52a131d7a873f2d7f33dcc0 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 1 Jun 2020 01:17:25 +1200
Subject: [PATCH 169/400] add string to fix up key

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

diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 7a51647782..91d8f2410b 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -77,7 +77,7 @@
             android:defaultValue="3"
             android:digits="0123456789"
             android:inputType="number"
-            android:key="key_smbinterval"
+            android:key="@string/key_smbinterval"
             android:maxLines="20"
             android:selectAllOnFocus="true"
             android:singleLine="true"

From 0c5603c182c25d987f7146e3c51bef89308c00fe Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 1 Jun 2020 02:13:47 +1200
Subject: [PATCH 170/400] remove not used libs

---
 .../main/jniLibs/arm64-v8a/libBleCommandUtil.so | Bin 14000 -> 0 bytes
 .../jniLibs/armeabi-v7a/libBleCommandUtil.so    | Bin 13728 -> 0 bytes
 .../main/jniLibs/armeabi/libBleCommandUtil.so   | Bin 13724 -> 0 bytes
 app/src/main/jniLibs/mips/libBleCommandUtil.so  | Bin 71484 -> 0 bytes
 .../main/jniLibs/mips64/libBleCommandUtil.so    | Bin 14808 -> 0 bytes
 app/src/main/jniLibs/x86/libBleCommandUtil.so   | Bin 13668 -> 0 bytes
 .../main/jniLibs/x86_64/libBleCommandUtil.so    | Bin 14272 -> 0 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/armeabi/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/mips/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/mips64/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/x86/libBleCommandUtil.so
 delete mode 100644 app/src/main/jniLibs/x86_64/libBleCommandUtil.so

diff --git a/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so b/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
deleted file mode 100644
index 69e283b5feb97bb8a055667ad99ef5a9da19f549..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14000
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

diff --git a/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
deleted file mode 100644
index 0c717bc3e836ca2b3bc7a546fa4d7779e1f52334..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13728
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
a1zkzJ0ZhE85RTh`+WnyWD^+48PWL~3K&c}D

diff --git a/app/src/main/jniLibs/armeabi/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi/libBleCommandUtil.so
deleted file mode 100644
index a51a8c7d9a16654b7d0e34c9d6e15b1a866b74f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13724
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
b9efny>4#*|LpbdNqECYFchpEdX}<pgP_0qI

diff --git a/app/src/main/jniLibs/mips/libBleCommandUtil.so b/app/src/main/jniLibs/mips/libBleCommandUtil.so
deleted file mode 100644
index fcff5eb6b250d8a7f2ad4de289cc827108591260..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 71484
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

diff --git a/app/src/main/jniLibs/mips64/libBleCommandUtil.so b/app/src/main/jniLibs/mips64/libBleCommandUtil.so
deleted file mode 100644
index a8a292ea13037eccfe791f25e6526e8947b64a24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14808
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
Vi@KXCds`=a1^r1Ij<dz|{{^|Ld3yi=

diff --git a/app/src/main/jniLibs/x86/libBleCommandUtil.so b/app/src/main/jniLibs/x86/libBleCommandUtil.so
deleted file mode 100644
index 638a9def954cf6ee4f3347adb3ffac94c61f6984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13668
zcmeHO4^SJ|nP0602wP$0Sc#Ry7ptx6LgP}&Aw8&_R2VF9jD>7tj2#yRgD^N4C`iP~
zQA{F~?Ay)OG<C1jxlAu@>bdrsnR=!f((AQ3Fgfs_T!T~J*-p}iB#kW+UrS=w2IFM!
z_w8zhaNLaBxtW`}@nb%H@4fH+`QG=v@7wRaUG}W5@S98~&PZm?%o(KuRCarHN&)BM
ztXwX43+LoAQAIQZv<~QGK^=k7A6YFu?cz9s3@X`m`VaFt?uYm2a6dZi2GF=f=YbA@
zegJfWT+j%JZp=}DvH@<?6BxAMJCO#5i{lJ<0yF}Hz8-WGKbExlQM&>3bpEzsE`s#=
z9cX6;lm#|%KjD3e{}OHAJ^oA6_s;(3h5VnM=-Gbd;OL%8HzKz@RpK}*f8~mD5ak0m
z>wMqH&F5NBcA@+YU@9}<K``;FWcg{}-kUh?d&%;@0N?*N97l{$``-Zj7IEAySOk@C
z1VgSYj{9)FUS6NZ-~zO*C;CE;Q<D8#P`)4YeKlDoeHn@P-*ZLzF_aIW{{hfwzI|8F
z{{dx-Pana~y|4ZN<;7{`f4YLsg+lea>q3pqt#vKU4~MymHLFUvmgepC`JHWqSG9yo
z+IH=#Yi-yRX>OrPy+d6jyt_GqLT99|{((?^(*vQ#y5<&c_3m(es4N@_t!}Lk1wleK
zSl8M4K=`3QOM9@bqv5K=je)CHS2gbnbC{#Jy}hNmzAn<-)=D$g?Fa|zK)JWBt1eXE
zwhQp^uC`D^U29!OC<^XFa~BiZ5ss9G>pLE5kAxd^R_|?X{)@U}kymz4m&lH29adJ~
z6s~^&ymC9jt>F#`uB4-$+f~=n(gqaXRp0&)*GZgoHP`D4=!|sK?`r2l;fA_M9Z+in
z<h;GJlVsfyA+5Bu?MUheis@);Zb+7PC2?n@q5h6Ll7$9MZP*gD|FD(0c>vm5MzSU|
zM5iPGZUE!}412_u<7@!9k!wn1(=Y=qk$)oJLn&KF+AmCmGqx}J5Nbt#ra6ClS+6%}
z)KC9=`5*s1i+H32v(yq%Xq^VH^*87o7-jO0+M0bjJ_#q031$+&Szz=mVK|{l!eH<`
zVF+i6FobfMFbOFwsXwC?sLvR(RG%SfHBpO+aTVzqn!Sn06JuJLxNf4#i9xOGq%!?X
z9MH;(sqCWi(^{FbO}SL=M|or7pOJlJxT^@hq`{p~Vs4a~#hv&8sHkz?H;jr@Ld|)(
z)NPLsMtF4$CEKtvKvd<IpChy}u@%3M3@@EKUa8xPUM^PZwkWaZMpTt%aHVEYx@P;|
zs`WozsPQwEn6Edo-Z$K@M3!>$VmC6+Ev30AZDQ|i+*}>|{bcNHkeyCY)qRf){}{dH
zuUqBVW%OqL0-0m}ayct@)~ZJBo7G@<>_s~plCzlKrhLo(J1jJ2!taLQ`pvT6ruO$?
z7&MWE*jY<Z>+(%8t!gJ1+^l}{hfs0sMXMs8{w*e{wFlQHdOlKB^z*9mLD^p*#8+WA
z$m<r%s~z#f;792DHbx;nEOM=VC%1mH+OLmdXP4Nh99sr*d@#B=cGgA><|ppPfbu3Q
z3dFHSmjux&Rhq<dlT^uz<-AmB7R$|2r9~{aNR=64d4^P(DVAqSm04nWmQ-mK%h5ht
zEYBYC&EsSqlW$g|i#M<nYX6V4CD_5Ayv}*|%a~o*`-H}W(C5RBjZK+^cmcLBYjnuf
z_R&Xa-;k-Xaix5c1#Il4QQzeL{k&<^cixoUzjeenwN-vpUxv^(f|e5a3|e?AU(WME
zGat<0gPD9VOKQsIo2=|mfl02li6!RV4@{7}7_{{MDO+sH=zYH*OPGjbfV;==BlL-2
z_3mSojX#5IIzy<uDnrNK*guD%NYOPjb4=U_PTmk704Mv!wVB%9A(do9WrMoZ*fdmT
zf~wRm+s^Er+~)OazYnsCz37q~9TO#RQLND|_t-}tC$Ui?v5m8Ui@n6&RMt<j<D<Uu
z{rhdEk>W|yi0}8@Nb&oe{BI;aX^B|#j#!&3Zuvk8nZ%mYBE+=ioD|~4nloapL)>y+
z3Yo>4gjl;$-0~+WWD#p7#9F7g<$@H-5NqBQYYW9K7o||9So5A(yF}bFC55uYnzLf<
zo#K{hDP$FE{#&eFE^fKRdX`C{Y_aAKVy#!)GV?Rj&q>4H!|z%9`}>7~#k{X^XviuI
zyyiX1P7O_1Vs8rGQ|#!_+cxh};rSU5hTb-_Q;)nk4o97R$~zsKvPDPb9+%iAh?Vxn
z(Xs_wx61xy@j;=F6e<Nxyqyp7QoDt3H}mZoe0wI}o+Z^}^EFoSc<*_WxWg<yXz^6r
zJY5b?wNvUT^jwr0@AMp({L4L)o_9UJmIAq+Q(|R?6tIbvnNq+ZR%S_ol~iYy0!|V8
zea}28u!Jh+i#u#$*$tB4>p3Zw<%pXF@j+~PD;xl{N4B+dAyk*HRahMC#I}CtLa22^
znp)ixEm)-Nw~zK3I*lKW++}PJGU#XZ-SOV1<A;U5A48N^Ax?Y?_1;0&xRSliYHdon
zGxp|W-ck1Y#ZyX<XVotD7OQqJzgyY8Aa-Vwjpa?T7aK>-`}fP$E^#BzYMmn`W-^_T
z()pILi*GRhvJnmz<QOR}G>w73*v~x>H5a`l=}P#-2h(sRNk2j~xyKz><#kqhlT-M{
z*YRW{Y3P1w1H>_&+~odTj3$fJ!~051T_Qa8TRfrIRBU{l`3q&gQ|NmM6-qEe*;bgL
zSc;h6QFKsv(r+s|h2JHzKUY~<SaeBva-`^_@Z@mOwD9D?6@G{C<e=2Jq_5E?#3l51
z{Z5EKO8DR}h;JeOAPU$t%I+I6hZ4Mr#_`$Va+EE0IZ(&~4(!hU{&PZ`ZxTP&bHbig
z$n2R1D5H!3D51>!*r+RZ&=nhW#fDumzhgXlMD`aJ`Q7ZG9KiH9V5W&m{6Hao8*5y~
z&afVLQYSC7%g~9BXMQK?#04j%)GUa-O*%PAI>{oPIK|C8>v4>fnZGY@azL_Tm0-E}
z8WcFfeP8yw#40DbH(0<o&Xeek&8Lf7jXIM82S4QJ{Vs@ldP!FYdpUMy99oSuu^ucx
z14gCTgrY;80xHp1DYa%4`CT1rWNeinB;`<QASstpZkKy<*_0-qVv<jGN*c)Mf+Cqf
zAVZMMc=SY3kBwc5d_fMlOvmINTiyv8tkj+%*SeLeg}f$g{0IZLh)(g=V&AID=s8-)
zsGLO>#Hn2_JVVF;IL!yzwQY~3;c>f-o~3?g-(Y05Ffiynj4_Szbl0-bdxRZJx|U<?
z$k1Ch?-60(($E<*n@;+bY2o=-yvIt)qyO<9j}fqZIK&obhFIau94U2XZN-mus~oV)
zkLZt|NE^Jp_S~W8&&M7;VxUB<E)`o>$7Vj1YaQJyNVB^w-oplGI%bD{QN3x?ri<^g
zv7y8g)0krMu_Jj0g@MwWOFX6X&BaA8M_;2^Yi%+sfNsg^=}?AYg(v!uk%~>ci7)2)
zVl!WC;fphrwHB`$n|5^s*pb*<<B>99V5(7Q9c>i;c(_q0<c8!Phq7lO`wejb)m4)I
z7J+&QFb4He#hyj9tB1#<zbiV%PGI)PZF$pjwL_`;vN?SP9)8uD=q1gB5ff?L?a{gG
zepury#Z6G>X3ZyY^S{N9Qj!gW(v-E5xEe%o6bVRHG2oYcCedF;O6hTQ-xV9Scn8zh
zqm-MlKi*xURM}0jw?4Y~DrJO$s+;|usw{KSQFbW$I*p6qkHS56RPDkJoa5Z}N45im
zE1ucQCiaqBeg&=uKD5W3cLFwTItHI32b{{b1sQT+nbN(0hvB7I0#O*Sit|N5uC|Hu
zK=Kurl&Jwn^d0zCc0}fr){!fJ-ARuU!#d!2>FI-@A!!~in1?@U9?MeW|F!l32UZ3d
z+hBHLOChYJ5LQx1R#G_EN*b@xN>o^h6ABrfYa-WdA8-{1>7lBr#0Eha&)ZRY2I)F+
zQY1Auj#`O0TIN>x%cJwyloCE)8@lhS!w_lW+y{u-yVB!-djeaDqW_=30mxCSoQc^G
zyjQ2<{d=wm_N&$JkcE<W%1K80)oLozrz%AHsF@S#Bh3E}=0+#)VL0@CL+p^j*Pr3%
zHsWWUoje1@Kgqp`vD4%KkyP}*5RYtx{;Tv!l0knCg8qOO^ar${KcEHu0WIhcXhDBK
z3;F|E&>zr({y-||rxQoDc8)PZeuHH?KjHXvSz2u)_Y7SK17m3>*ElqY8n1VRO%5e2
zv2npW$%ZNP8x{u64V^Z#$<JzG-=y&TIqzigz0qI8Jr643saoi1t~^|tezrU^H2)3=
zVYQuAxNY(`>4YZFL*9uaWt3I9VY{|Z-jfyXo5U*j&0>ptQB2M3UMYXo8XKMQ9)5v5
zb;@$|3_Eo34<B>gj++eEJucIP{EAYyGio(tB5!ls65pDfv%fCOQG5J?(Dx`QaJ4Nq
zmD&9;4rWpgA29I&o)4J$fQ1ia#0F>J+^5L7kHk)E&V720b5|Z-$j;3&c@6%3l3k4C
zkYCTk^V~CUReAK1!D(Z^asJi$i*zM<YbD;mS<e3zKRA!4?D4id$ZV5cKaI;)=-L{8
zB~pPa0C}BF;>A*TrnJfglogxK?Dm57*wBpkf+i%T$Hb=a<W)*DO|kKhE}o<ep1zh$
zPw8@V(KP!A{vHEyP@#2Jg^A;TfckJ>V8{pjcxLYh7=m{)!{q(IV!9v5O$ID;?gujG
zdJOi)dX*f@><s}<3iFb#W5cZLNY=u8pwjRjd+DA4-eU_`Bk%DFyhnU11>W$DGZaW^
z{>m|XhG2f}DF#oWMje~k8?#aQu)LSfAM)dRtiyV2kv5j|$z~Jyj9Bd!TR$7?v69jF
zt;%i~&Fogxa-ZPOKVulpYlsiwFsFHTyYOf=opAQ*kx%47ZS1doEaZ^`R%Hzt2BMxa
zJ<jl58D}VeM<LHO*aO8ow?}Mw(@NC}vk~9eWKoZABApr!yEGos=dIM|Ex-D_h8X_J
z`5}<U^++aCPGQVaEsXh`#!3N++Lsiyvfji_4E=G5(p_YVo%!hE8<Y_Sw%xN-zQ?mo
zFw3_Wjj?0VlMu1+!dhPII$d-qc_><@UBx)r8Kqc=jZZSaC2y2n7G5af<AW?<?^&d*
zHDfm-9K=ml!hRO6H9$8<eTO3}gn=PwTaPCeT{Yf*b<R0ni?_>?@isd&l&}gf49fS&
zwZK(NE*Fgn@o(ddD7-Kvyil>^!=gjPay*Wz)bR$}TJ5r@ovr;2HhzcS0>0Uckd0M%
zVlQ?v9SH2bGfTSeV<&N}ly8n~P^xY<7gbw2Z^EsU++$H3i{yKhJ?5eln53gX&QaDZ
zl&dYu20I&t#!@Go<iQ3<8k}uL$D?nr@Y6jXtm9L%-=bKo7%uOKe7jOHKN%%!=NTWK
zTNluvw~!b14T`WjJz8Niu)HtH>m2Jp9=O3GlcC!MztyDaN3OL9efPm0q!QE0vFMuK
zzvH>6&)67IC!XsVkxw+eODAy)^un}FBk!ftwX{IAOKa#6-@AfO>N_Vn*elVmu^IVa
zsaaf&E}{T|Pkai);GBq2Mwv#!3Z!yg6eOQnEHlY5eM3fX)vf@j#~&w*9vW@-CQ)BI
z<iv)B_;-mJtN>Sk^fs%v$39Pp{}eg>9t#SF-_Z<y&{$JuVjqS!)<iUEEsuz0Eus{Y
zv=&hcFRewCVwTn-O0h_55v63vk82j28iY?&rVT<gX{{B5Y|QR`|8ddU`@s!j(3IL+
zHufr;*?{duM^C6Cb@f*5cn{}f8^ZWTr|gGoU*XS1@Hl2XGucey`2-#g`W<rG^C9)T
zdf?MoVe$Z>Ms2hA#eX~ZX@KzU?~V8|c~gwWM*L{Z*WB9JmfzaEqbbr^-xiJJC*QQx
zwRhr0P9*(>Q*K_xPP}vaVoP1?jxTPEbTqf_SOF<$?@kDt9^Sy2x~-<$Y!-`%o#8;;
zVn7R)L+@3%(j0pr$D-Ad4&11BQ+;ucHO5!wxHjZii-&V8)TfF7^e?5;8)oSd)JH(S
zEsbtpqtorE+n1zUh>k>K{s_>HKJ?C#=8W^JZpc{sSjOX)n3?E@0KxMRJ#dP?W|p2n
z^&sd6{tVrUH3$Ess`QRC)qnM47+s&A-a+?+{;PC)+W6(5doHLdy@O5l_s`DX1o{Ec
zY1dzkE`sj5sH#t-)6>TP5zP-ey~9oQPhUULKUCH2SLsiBN`TItR@HW*=UDwYwtI#7
z5zB7wE4Qxr{Bk#TrJhW;nOB^}IHZTy-%-`$2%#&`&xMx--N07hr+|IHuLIu?d>ObG
z*mg!$_Ypp)s?PyG1$-R10&+hO{4B5o<F!DJ1;94QqYC&b;0W+CtZyH11?GPa*x>0p
zzAl0561Xmb>k_ywf$I{uE`jS3xGsU~61Xmb>k|0?FM<2%yqiooigT~yyGFVt@&NEj
zGxr?sxE;XsT`0j*DARYNP5|9oSOJ$*wT=4FP&GIQ(-i`pZ_$*auhi&U(+SkmeZxNd
z&{6qk_#ynOB&KgQseCk9{!J2(1JgIC^j+tz0Qzo|?jva4TL90ZO!pi#_U!<wp8-EK
z7TyB26@Ur6rfRz%7{^|%9!KT2Zj^BZ*2-x57bp65-bk5P_|1T&fG+|3fNB8e1C*7N
zeA$(YPucTa1^Gq!yIspY-n%^B<#)Pr+dIM?;g)b+XE={5*1zF()zbx%t1H~mi7%R6
zcjbHX@AP;)g&vnHcRLz3xKLYBQN1pWgf}$$`ti}4CI|X%en(qNgUg%m^%60^vkBi5
zN9wk7`K@h{aQ=?gX#VzSb4$Y)nj5(MhKE`^AKInkNC%hSRM*+WX>F2h%qfJ>gZd|F
zA#}hZXb?Tq-V)*R@nJZAJKD65m-E9-p~epSDm#@6H8r3gJ~(d<)pc~#J;dcB8!_@2
zt8Q0wJ?3e{DEP_O2Gs|{H_%)@zU<x=ZUr&599r)e41Q_N*O+Lp(l^Sqf7Acx!RSu=
ziW2QDYD?{Cj}rs|WHYqas2%P3r2wj<cC_~iXzv@z$mXMh?1S2oO%ObtECXrd(U=7Q
z+Nacx_A<fek*6{x!UV+t+TWC?y-q-OlFlEBTo6F}pW2ZP5V(-PvRw#uw4bOQ**pQ+
zJe4UCZ)9st0BW}iK)!;2d<V57yEodkAWv&2vzSC1f_CJMM6#o{UjrEJ$TtyeCr6Y_
z)Q-}F0BW}!a1hRc0In;Qh(@p{iHRQzlt^GV7D06YN(?~liR5tUpxqUsOvz~X9pve=
zZ<3exKQ>S#$-ziQyJt{Aev8_Xk9rpE3>vjH@^m*(GNE?b|Ky-uE*POQC2B|G{~SR4
zQ9XUDe)5a6W1uQE9^IcB?Z}tEj&^QpkW9wBBPbi~I3Eg7nn9zcM*bz_X?~j5;sc-^
z?E@nj?T(>>#sgVP)GnON6CxVHs{pb$BekF%?NcKe<E3~@66hnw_l-utM5pvWNjGMN

diff --git a/app/src/main/jniLibs/x86_64/libBleCommandUtil.so b/app/src/main/jniLibs/x86_64/libBleCommandUtil.so
deleted file mode 100644
index 94873d3732404ea850d7758d70e77e81b415dcc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14272
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
Pob#VbL?SQx73lv3RqkM5


From 4efeb77fdc94ba4a12bf85a932e46869b291ed42 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 1 Jun 2020 00:06:05 +0200
Subject: [PATCH 171/400] remove deprecation

---
 .../omnipod/driver/comm/AapsOmnipodManager.java    |  3 +--
 .../omnipod/driver/ui/OmnipodUIPostprocessor.java  |  3 +--
 .../java/info/nightscout/androidaps/logging/L.kt   | 14 +-------------
 .../plugins/general/nsclient/NSUpload.java         |  3 +--
 .../androidaps/utils/locale/LocaleHelper.kt        |  2 --
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
index 5a47672e8c..575fe385ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
@@ -95,13 +95,12 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
 
     private final OmnipodManager delegate;
 
-    @Deprecated
+    //TODO: remove and use injection
     private static AapsOmnipodManager instance;
 
     private Date lastBolusTime;
     private Double lastBolusUnits;
 
-    @Deprecated
     public static AapsOmnipodManager getInstance() {
         return instance;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
index d206337384..7a6c025433 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUIPostprocessor.java
@@ -7,7 +7,6 @@ import java.util.Date;
 
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.PumpEnactResult;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
@@ -103,7 +102,7 @@ public class OmnipodUIPostprocessor {
 
 
     private boolean isLogEnabled() {
-        return L.isEnabled(LTag.PUMP);
+        return true; //L.isEnabled(LTag.PUMP);
     }
 
     public RxBusWrapper getRxBus() {
diff --git a/core/src/main/java/info/nightscout/androidaps/logging/L.kt b/core/src/main/java/info/nightscout/androidaps/logging/L.kt
index b2156c4080..ad3ca2dad4 100644
--- a/core/src/main/java/info/nightscout/androidaps/logging/L.kt
+++ b/core/src/main/java/info/nightscout/androidaps/logging/L.kt
@@ -12,19 +12,7 @@ class L @Inject constructor(
 
     private var logElements: MutableList<LogElement> = ArrayList()
 
-    companion object {
-        @Deprecated("Use Dagger")
-        lateinit var instance: L
-
-        @Deprecated("Use Dagger")
-        @JvmStatic
-        fun isEnabled(ltag: LTag): Boolean {
-            return instance.findByName(ltag.name).enabled
-        }
-    }
-
     init {
-        instance= this
         LTag.values().forEach { logElements.add(LogElement(it, sp)) }
     }
 
@@ -46,7 +34,7 @@ class L @Inject constructor(
     }
 
     class LogElement {
-        var sp : SP
+        var sp: SP
         var name: String
         var defaultValue: Boolean
         var enabled: Boolean
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
index f6cd44a84b..5aab6d18b6 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java
@@ -232,8 +232,7 @@ public class NSUpload {
                     deviceStatus.enacted.put("requested", requested);
                 }
             } else {
-                if (L.isEnabled(LTag.NSCLIENT))
-                    aapsLogger.debug("OpenAPS data too old to upload, sending iob only");
+                aapsLogger.debug(LTag.NSCLIENT, "OpenAPS data too old to upload, sending iob only");
                 IobTotal[] iob = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
                 if (iob.length > 0) {
                     deviceStatus.iob = iob[0].json();
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
index d7bc0a8ce5..29d53e1e53 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
+++ b/core/src/main/java/info/nightscout/androidaps/utils/locale/LocaleHelper.kt
@@ -38,8 +38,6 @@ object LocaleHelper {
         val configuration = resources.configuration
         context.createConfigurationContext(configuration)
         configuration.setLocale(locale)
-        configuration.locale = locale
-        resources.updateConfiguration(configuration, resources.displayMetrics)
     }
 
     fun wrap(ctx: Context): Context {

From ec188f13293008f9529f6288c99f97dc6c8395ee Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Mon, 1 Jun 2020 12:14:45 +1200
Subject: [PATCH 172/400] revert change

---
 .../iob/iobCobCalculator/IobCobCalculatorPlugin.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index f991661f9c..7720ff4afb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -722,6 +722,13 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     result.boluses += treatment.insulin;
                 }
             }
+            if (t > absorptionTime_ago && t <= now) {
+                if (treatment.carbs >= 1) {
+                    result.carbs += treatment.carbs;
+                    if (t > result.lastCarbTime)
+                        result.lastCarbTime = t;
+                }
+            }
         }
 
         AutosensData autosensData = getLastAutosensDataSynchronized("getMealData()");
@@ -731,7 +738,6 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             result.slopeFromMaxDeviation = autosensData.slopeFromMaxDeviation;
             result.usedMinCarbsImpact = autosensData.usedMinCarbsImpact;
         }
-        result.lastCarbTime = treatmentsPlugin.getLastCarbTime();
         result.lastBolusTime = treatmentsPlugin.getLastBolusTime();
         return result;
     }

From 608142cb741dadda545623a813af25789842482e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 1 Jun 2020 13:54:25 +0200
Subject: [PATCH 173/400] New Crowdin translations (#2685)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Swedish)

* New translations objectives.xml (Bulgarian)

* New translations protection.xml (Bulgarian)
---
 app/src/main/res/values-bg-rBG/objectives.xml |   2 +
 app/src/main/res/values-bg-rBG/protection.xml |  22 +-
 app/src/main/res/values-bg-rBG/strings.xml    | 218 ++++++++++++++++++
 app/src/main/res/values-cs-rCZ/strings.xml    |   4 +-
 app/src/main/res/values-de-rDE/strings.xml    |  13 +-
 app/src/main/res/values-fr-rFR/strings.xml    |   2 -
 app/src/main/res/values-it-rIT/strings.xml    |  13 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  20 +-
 app/src/main/res/values-pt-rPT/strings.xml    |  23 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  10 +-
 app/src/main/res/values-sk-rSK/strings.xml    |  14 +-
 app/src/main/res/values-sv-rSE/strings.xml    |  31 ++-
 core/src/main/res/values-bg-rBG/strings.xml   |  49 ++++
 core/src/main/res/values-pt-rPT/strings.xml   |   2 +-
 dana/src/main/res/values-sk-rSK/strings.xml   |   3 +
 dana/src/main/res/values-sv-rSE/strings.xml   |   3 +
 16 files changed, 405 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/objectives.xml b/app/src/main/res/values-bg-rBG/objectives.xml
index 16339650fd..2d575aaaac 100644
--- a/app/src/main/res/values-bg-rBG/objectives.xml
+++ b/app/src/main/res/values-bg-rBG/objectives.xml
@@ -20,7 +20,9 @@
     <string name="objectives_autosens_gate">Една седмица успешно дневно използване с редовно въвеждане на въглехидрати</string>
     <string name="objectives_ama_objective">Активиране на допълнителни функции за дневно използване, включително и advanced meal assist (АМА)</string>
     <string name="objectives_smb_objective">Добавяне на допълнителни функции за използване през деня, като SMB</string>
+    <string name="objectives_auto_objective">Разрешаване на автоматизация</string>
     <string name="objectives_smb_gate">Трябва да прочетете wiki и увеличите maxIOB за да може SMB да работи добре! Добро начало е maxIOB = средния болус за хранене + 3 пъти най-големия базал от профила</string>
+    <string name="objectives_auto_gate">Прочетете документацията как работи автоматизацията. Настройте първите си прости правила. Вместо да прави действия нека AAPS покаже само известие. Когато сте сигурни, автоматизацията се задейства в точното време, за да заменете известяването с реални действия. (https: //androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">КЗ да се вижда в NS</string>
     <string name="objectives_pumpstatusavailableinns">Статуса на помпата да е достъпен в NS</string>
     <string name="objectives_manualenacts">Ръчно приложени</string>
diff --git a/app/src/main/res/values-bg-rBG/protection.xml b/app/src/main/res/values-bg-rBG/protection.xml
index 3ea04e700d..868fec0b53 100644
--- a/app/src/main/res/values-bg-rBG/protection.xml
+++ b/app/src/main/res/values-bg-rBG/protection.xml
@@ -1,2 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Изисква се удостоверяване</string>
+    <string name="biometric_description">Поставете пръста си върху четеца на пръстови отпечатъци, за да потвърдите самоличността си</string>
+    <string name="settings_protection">Защита на настройките</string>
+    <string name="application_protection">Защита на приложението</string>
+    <string name="bolus_protection">Защита от болус</string>
+    <string name="master_password">Главна парола</string>
+    <string name="settings_password">Парола за настройки</string>
+    <string name="application_password">Парола за приложението</string>
+    <string name="bolus_password">Парола за болус</string>
+    <string name="biometric">Биометрични данни</string>
+    <string name="custom_password">Допълнителна парола</string>
+    <string name="noprotection">Няма защита</string>
+    <string name="protection">Защита</string>
+    <string name="master_password_missing">Главната парола не е зададена!\n\nМоля, настройте Вашата главна парола в Предпочитания (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Паролата е зададена!</string>
+    <string name="password_not_set">Паролата не е зададена</string>
+    <string name="password_not_changed">Паролата не е променена</string>
+    <string name="password_cleared">Паролата е изчистена!</string>
+    <string name="password_hint">Въведете парола</string>
+</resources>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 08b1a5a211..8360491ecf 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -130,6 +130,7 @@
     <string name="apsmode_title">APS режим</string>
     <string name="closedloop">Затворен кръг</string>
     <string name="openloop">Отворен кръг</string>
+    <string name="lowglucosesuspend">Спиране на базал при ниска КЗ</string>
     <string name="disabledloop">Loop изключен</string>
     <string name="disableloop">Изключи Loop</string>
     <string name="enableloop">Включи Loop</string>
@@ -170,6 +171,52 @@
     <string name="openapsma_maxbasal_summary">Макс. лимит на временен базал [Е/ч] </string>
     <string name="openapsma_maxiob_title">Максимален IOB</string>
     <string name="openapsma_maxiob_summary">Този параметър се нарича максимален IOB в OpenAPS и подразбиране е 0. След няколко дни или седмици можете да го увеличите.</string>
+    <string name="password_preferences_encrypt_prompt">Главна парола, която ще бъде използвана за криптиране на експортирани настройки.</string>
+    <string name="password_preferences_decrypt_prompt">Парола, която е била използвана за криптиране на експортираните настройки.</string>
+    <string name="preferences_export_canceled">Експорт неуспешен! Настройките не са експортирани!</string>
+    <string name="preferences_import_canceled">Импорт неуспешен! Настройките не са импортирани!</string>
+    <string name="preferences_import_list_title">Изберете файл</string>
+    <string name="check_preferences_before_import">Моля, проверете насстройките преди импортирането:</string>
+    <string name="check_preferences_cannot_import">Настройите не могат да бъдат импортирани!</string>
+    <string name="check_preferences_dangerous_import">Настройите не трябва да бъдат импортирани! (опасни)</string>
+    <string name="check_preferences_details_btn">Разясняване на проблеми с импорт…</string>
+    <string name="check_preferences_details_title">Подробности за проблеми с импорта</string>
+    <string name="check_preferences_import_btn">Импорт</string>
+    <string name="check_preferences_import_anyway_btn">Импортирай все пак (ОПАСНО!)</string>
+    <string name="metadata_warning_different_flavour">Настройките са създадени с различен вариант на AAPS (%1$s) докато Вие сте с: %2$s.\n\nНякои настройки може да липсват или са невалидни!След импортиране, моля, проверете и актуализирайте своите настройки.</string>
+    <string name="metadata_warning_different_device">Настройките са създадени на друго устройство. Това е ОК, ако импортирате от по-стар/различен телефон, но се уверете, че тези настройки са правилни!</string>
+    <string name="metadata_warning_outdated_format">Използвате остарял формат от старите версии на AAPS, който не е защитен! Използвайте го само като крайна мярка, или експортирайте в JSON формат.</string>
+    <string name="metadata_warning_old_export">Импортираните настройки са стари %1$s дни! Може би имате по-актуални настройки или сте избрали грешен файл? Не забравяйте да експортирате настройки редовно!</string>
+    <string name="metadata_warning_date_format">Невалиден формат на датата!</string>
+    <string name="metadata_warning_different_version">Настройки от различна под-версия на приложението. Това е ОК, ако импортирате след надстройка, но проверете след вноса, ако настройки са все още правилни!</string>
+    <string name="metadata_urgent_different_version">Настройки от различна главна версия на приложението. Основните версии се различават значително и могат да имат несъвместими настройки! Уверете се, че след импорт, че преференциите са все още правилни!</string>
+    <string name="metadata_label_format">Формат на файла</string>
+    <string name="metadata_label_created_at">Създаден на</string>
+    <string name="metadata_label_aaps_version">Версия на AAPS</string>
+    <string name="metadata_label_aaps_flavour">вариант</string>
+    <string name="metadata_label_device_name">Име на пациента</string>
+    <string name="metadata_label_device_model">Модел на телефона:</string>
+    <string name="metadata_label_encryption">Криптиране</string>
+    <string name="metadata_format_old">Стар формат</string>
+    <string name="metadata_format_new">Нов формат</string>
+    <string name="metadata_format_debug">Нов формат (некриптирани)</string>
+    <string name="metadata_format_other">Непознат формат</string>
+    <string name="prefdecrypt_settings_tampered">Файлът с настройки е преправян</string>
+    <string name="prefdecrypt_settings_secure">Файлът с настройки е сигурен</string>
+    <string name="prefdecrypt_settings_unencrypted">Използване на нешифровани настройки е рисково</string>
+    <string name="prefdecrypt_wrong_json">Грешка във формат JSON, липсва поле (формат, съдържание, метаданни или сигурност)</string>
+    <string name="prefdecrypt_wrong_password">Грешка при декриптиране, грешна парола</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Контролна сума (hash) липсва, не може да се провери автентичността на настройките!</string>
+    <string name="prefdecrypt_issue_modified">Файлът е бил модифициран след експорт!</string>
+    <string name="prefdecrypt_issue_parsing">Грешка при декриптиране, възстановяването неуспешно!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Грешка при декриптиране, грешна парола или файлът с настройки е модифициран! Възможно е импортираният файл да е експортиран с различна парола.</string>
+    <string name="prefdecrypt_issue_wrong_format">Липсва конфигурация на шифроване, форматът на настройките е невалиден!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Неподдържан или непотвърден алгоритъм за криптиране!</string>
+    <string name="exported_today">експортирани днес</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">от преди %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">от %1$s</string>
+    <string name="exported_less_than_hour_ago">от преди по-малко от час</string>
+    <string name="in_directory" comment="placeholder is for exported file path">в директория: %1$s</string>
     <string name="end_user_license_agreement">Лицензионно споразумение с краен потребител</string>
     <string name="end_user_license_agreement_text">НЕ ТРЯБВА ДА СЕ ИЗПОЛЗВА ЗА ВЗЕМАНЕ НА МЕДИЦИНСКИ РЕШЕНИЯ. НЯМА ГАРАНЦИЯ ЗА ПРОГРАМАТА, ДО СТЕПЕНТА, ПОЗВОЛЕНА ОТ ПРИЛОЖИМОТО ПРАВО. ОСВЕН КОГАТО Е ПОСОЧЕНО ДРУГО В ПИСМЕН ВИД, ПРИТЕЖАТЕЛИТЕ НА АВТОРСКОТО ПРАВО И/ИЛИ ДРУГИ СТРАНИ ПРЕДОСТАВЯТ ПРОГРАМАТА \"КАКТО Е\", БЕЗ ГАРАНЦИИ ОТ ВСЯКАКЪВ ВИД,  ИЗРАЗЕНИ ИЛИ ПОДРАЗБИРАЩИ СЕ, ВКЛЮЧИТЕЛНО, НО НЕ САМО, ПОДРАЗБИРАЩИ СЕ ГАРАНЦИИ ЗА ПРОДАВАЕМОСТ И ПРИГОДНОСТ ЗА  КОНКРЕТНА ЦЕЛ. ЦЕЛИЯ РИСК ПО ОТНОШЕНИЕ НА КАЧЕСТВОТО И ЕФЕКТИВНОСТТА НА ПРОГРАМАТА Е САМО ВАШ. АКО ПРОГРАМАТА НЕ СРАБОТИ, ВИЕ ПОЕМАТЕ  ВСИЧКИ НЕОБХОДИМИ РАЗХОДИ ЗА ОБСЛУЖВАНЕ, РЕМОНТ ИЛИ КОРЕКЦИЯ.</string>
     <string name="end_user_license_agreement_i_understand">Разбирам и приемам</string>
@@ -217,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">За да въведете %1$dг в %2$s отговорете с код %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">За да стартирате базал от %1$d%%Е/ч за %2$d мин отговорете с код %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">За да спрете APS за %1$d минути отговорете с код %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">За възстановяване на кръга отговорете с код %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">За активирнае на кръга отговорете с код %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">За изключване на кръга отговорете с код %1$s</string>
     <string name="smscommunicator_tempbasalset">Временен базал от %1$.2fЕ/ч за %2$d мин стартиран успешно</string>
     <string name="smscommunicator_extendedset">Удължен болус %1$.2fU за %2$d мин стартиран успешно</string>
     <string name="smscommunicator_carbsset">Въглехидрати %1$dг въведени</string>
@@ -353,6 +403,9 @@
     <string name="adult">Възрастен</string>
     <string name="resistantadult">Възрастни с голяма инсулинова резистентност</string>
     <string name="patientage_summary">Изберете възраст за определяне лимитите на безопасност</string>
+    <string name="patient_name">Име на пациента</string>
+    <string name="patient_name_summary">Моля, посочете име на пациента или измислено име, за да се различават</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Потребител</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s се нуждае от изключване от списъка за оптимизиране на батерията за пълна функционалност</string>
     <string name="loopsuspended">Loop изключен</string>
@@ -387,12 +440,26 @@
     <string name="enablesuperbolus">Разреши използването на Суперболус</string>
     <string name="enablesuperbolus_summary">Разреши функцията суперболус в съветника. Не я разрешавайте докато не научите какво наистина прави. ТОВА МОЖЕ ДА СЪЗДАДЕ ОПАСНОСТ ОТ ПРЕДОЗИРАНЕ С ИНСУЛИН.</string>
     <string name="show_statuslights">Покажи статус светлини на началния екран</string>
+    <string name="statuslights_cage_warning">Праг за възраст на канюла [часа]</string>
+    <string name="statuslights_cage_critical">Праг за критична възраст на канюла [часа]</string>
+    <string name="statuslights_iage_warning">Праг за инсулинова възраст [часа]</string>
+    <string name="statuslights_iage_critical">Праг за критична инсулинова възраст [часа]</string>
+    <string name="statuslights_sage_warning">Праг за възраст на сензор [часа]</string>
+    <string name="statuslights_sage_critical">Праг за критична възраст на сензор [часа]</string>
+    <string name="statuslights_bage_warning">Аларма при възраст на батерия над [часа]</string>
+    <string name="statuslights_bage_critical">Праг за критична възраст на батерията над [часа]</string>
     <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
     <string name="statuslights_res_critical">Критично ниво на останал инсулин в резервоар [Е]</string>
     <string name="statuslights_bat_warning">Аларма при заряд на батерия под [%]</string>
     <string name="statuslights_bat_critical">Критично ниво на батерията под [%]</string>
+    <string name="prediction_shortname">Предв</string>
     <string name="iob">IOB</string>
     <string name="cob">СОВ</string>
+    <string name="basal_shortname">БАЗА</string>
+    <string name="deviation_shortname">Откл</string>
+    <string name="activity_shortname">АКТ</string>
+    <string name="abs_insulin_shortname">АБС</string>
+    <string name="devslope_shortname">ОТК.НАКЛ</string>
     <string name="nav_about">За приложението</string>
     <string name="smscommunicator_missingsmspermission">SMS команда забранена</string>
     <string name="smscommunicator_missingphonestatepermission">Липсва разрешение до данни от телефона</string>
@@ -410,6 +477,8 @@
     <string name="doprofileswitch">Смени профил</string>
     <string name="careportal_pbage_label">Възраст на батерията на помпата</string>
     <string name="ns_alarmoptions">Опции за аларми</string>
+    <string name="ns_alarms">Известяване при NS аларми</string>
+    <string name="ns_announcements">Създаване на известия от NS съобщения</string>
     <string name="nsalarm_staledatavalue_label">Когато няма данни повече от [мин]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Много стари данни при повече от [мин]</string>
     <string name="openapsama_autosens_period">Интервал за autosens [ч]</string>
@@ -497,8 +566,13 @@
     <string name="bgsource_upload">Настройки при качване на КЗ към Nightscout</string>
     <string name="wear_detailed_delta_title">Показвай подробна делта</string>
     <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
+    <string name="smbinterval_summary">Интервал между SMB в минути</string>
     <string name="smbmaxminutes">Максимум минути СМБ</string>
     <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
+    <string name="uamsmbmaxminutes">Максимум минути за отчитане на необявени хранения UAM</string>
+    <string name="uamsmbmaxminutes_summary">Максимални минути за ограничаване на базала при SMB за UAM</string>
+    <string name="carbsReqThreshold">Праг на предложение за въгл.</string>
+    <string name="carbsReqThreshold_summary">Когато се предлагат въгл., при колко да се покаже уведомление</string>
     <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
@@ -557,6 +631,8 @@
     <string name="extendedbolusdeliveryerror">Грешка при доставяне на удължен болус</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">преди</string>
+    <string name="set_neutral_temps_title">Прилагане на неутрални временни базали</string>
+    <string name="set_neutral_temps_summary">Ако е вкл, то ще анулира временен базал на всеки час. Това може да помогне за спиране на  звук/вибрация от някой помпи на всеки час.</string>
     <string name="enablesmbalways">Разреши SMB постоянно</string>
     <string name="enablesmbalways_summary">Разрешава SMB постоянно и независимо от болусите. Възможно само с източник на КЗ с добра филтрация като G5  </string>
     <string name="enablesmbaftercarbs">Разреши SMB след въглехидрати</string>
@@ -728,6 +804,10 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Да вдигам ли чувствителността при цели над 5.6]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Ниските цели да свалят ли чувствителността ?</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Да се понижава ли чувствителността при цели < 5.6 ммол/л?]]></string>
+    <string name="resistance_lowers_target_title">Съпротивление намалява целта</string>
+    <string name="resistance_lowers_target_summary">Когато се установи резистентност, намалява целевата глюкоза.</string>
+    <string name="sensitivity_raises_target_title">Чувствителността увеличава целта</string>
+    <string name="sensitivity_raises_target_summary">Когато се установи чувствителност, повишаване на целевата глюкоза</string>
     <string name="combo_invalid_setup">Невалидни настройки на помпата, проверете wiki и се уверете че меню Quick Info се казва QUICK INFO, с помощта на 360 софтуера.</string>
     <string name="custom">По избор</string>
     <string name="careportal_removestartedevents"> AndroidAPS стартира</string>
@@ -736,6 +816,7 @@
     <string name="error_adding_treatment_title">Данните за лечението не са пълни</string>
     <string name="maintenance_settings">Настройки за поддръжка</string>
     <string name="maintenance_email">Имейл</string>
+    <string name="maintenance_encrypt_exported_prefs">Криптиране на експортирани настройки</string>
     <string name="maintenance_amount">Брой логове за изпращане</string>
     <string name="maintenance">Поддръжка</string>
     <string name="maintenance_shortname">ПОДДР</string>
@@ -777,6 +858,10 @@
     <string name="log_alerts">Записвай аларми</string>
     <string name="enable_tbr_emulation">Разреши емулация на временни базали</string>
     <string name="enable_tbr_emulation_summary">Използвайте удължени болуси вместо временни базали да се заобиколи ограничението от 250%%</string>
+    <string name="disable_vibration">Изключи вибрациите при ръчен болус</string>
+    <string name="disable_vibration_summary">За болус и разширен болус (само на разположение с Insight фърмуер 3.x)</string>
+    <string name="disable_vibration_auto">Изключи вибрациите при автоматичен болус</string>
+    <string name="disable_vibration_auto_summary">За SMB и временни базали с емулация (достъпна само с Insight фърмуер 3.x)</string>
     <string name="disconnect_delay">Забавяне при прекъсване на връзката [сек]</string>
     <string name="serial_number">Сериен номер</string>
     <string name="release_software_version">Софтуер версия</string>
@@ -921,6 +1006,8 @@
     <string name="exists">съществува</string>
     <string name="notexists">не съществува</string>
     <string name="temptargetcompared">Временна цел %1$s</string>
+    <string name="btdevicecompared">Bluetooth връзка към устройство %1$s %2$s</string>
+    <string name="btdevice">Връзка с Bluetooth устройство </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Аутосенс %1$s %2$s %%</string>
     <string name="autosenslabel">Аутосенс %</string>
@@ -975,6 +1062,7 @@
     <string name="medtronic_pump_battery_alkaline">Алкални</string>
     <string name="medtronic_pump_battery_lithium">Литиева</string>
     <string name="medtronic_pump_battery_nizn">NiZn батерия</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (батерия)</string>
     <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">СКАНИРАЙ</string>
@@ -1116,6 +1204,7 @@
     <string name="objectives_button_unfinish">Изчисти приключение</string>
     <string name="objectives_button_unstart">Изчисти стартираните</string>
     <string name="doyouwantresetstart">Искате ли да нулирате прогреса си?</string>
+    <string name="time_or_timezone_change">Време и/или промяна на часовата зона на помпата</string>
     <string name="nopumpselected">Не е избрана помпа</string>
     <string name="setupwizard_units_prompt">Изберете единиците, в които искате да работите</string>
     <string name="ns_ploadlocalprofile">Качване на локални промени в НС профила</string>
@@ -1165,19 +1254,148 @@
     <string name="loop_smbexecution_time_label">Макс. време за изпълнение за SMB</string>
     <string name="loop_tbrrequest_time_label">Диапазон между временни базали</string>
     <string name="loop_tbrexecution_time_label">Продължителност на временни базали</string>
+    <string name="insight_alert_notification_channel">Информация за Insight Pump</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">от приложението AUTHENTICATOR за: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Активиране на удостоверител</string>
+    <string name="smscommunicator_otp_enabled_summary">Удостоверяване чрез еднократна парола, генерирана с Google Authenticator или подобна програма за 2-факторна оторизация.</string>
+    <string name="smscommunicator_otp_pin">Допълнителен PIN в края на токен</string>
+    <string name="smscommunicator_otp_pin_summary">Допълнителни цифри, които следва да бъдат залепени в края на всяка генерирана еднократна парола</string>
+    <string name="smscomunicator_tab_otp_label">Настройка на удостоверителя</string>
+    <string name="smscommunicator_otp_verify_label">ОТР за проверка:</string>
+    <string name="smscommunicator_otp_reset_btn">Нулиране на удостоверители</string>
+    <string name="smscommunicator_otp_reset_title">Нулиране на ключва</string>
+    <string name="smscommunicator_otp_reset_prompt">Сигурни ли сте, че ще анулирате ключа на Authenticator? Той ще направи всички конфигурирани в момента аудиентикатори невалидни, и вие ще трябва да ги настроите отново.</string>
+    <string name="smscommunicator_otp_reset_successful">Генериран е нов ключ! Моля, използвайте актуализирания QRCode.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Инсталиране на удостоверител</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Сканиране на кода за настройка на AndroidAPS OTP </string>
+    <string name="smscommunicator_otp_step3_test_header">3. Тест на еднократна парола</string>
+    <string name="smscommunicator_otp_reset_header">Нулиране на удостоверители</string>
+    <string name="smscommunicator_otp_install_info">На всеки следящ телефона инсталирайте приложение Аутентификатор, който поддържа RFC 6238 ТОТР токени. Популярни безплатни приложения:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">Не давайте този код е онлайн!\nИзползвайте го само за сканиране на телефони последовател.</string>
+    <string name="smscommunicator_otp_reset_warning">При нулиране на на удостоверителя, всички вече използвани удостоверения са невалидни. Ще трябва да ги настроите отново!</string>
+    <string name="onconnect">При свързване</string>
+    <string name="ondisconnect">При изключване</string>
     <string name="overview_show_predictions">Прогнозни КЗ</string>
+    <string name="overview_show_deviationslope">Наклон на отклонението</string>
+    <string name="authorizationfailed">Удостоверяването неуспешно</string>
+    <string name="overview_show_absinsulin">Абсолютен инсулин</string>
+    <string name="master_password_summary">Главната парола се използва за архивиране на настройки и за подмяна на защитата в приложението. Запомни я или я пази на сигурно място.</string>
+    <string name="passwords_dont_match">Паролите не съвпадат</string>
+    <string name="current_master_password">Сегашна главна парола</string>
+    <string name="statuslights">Индикатори</string>
+    <string name="statuslights_copy_ns">Копиране на настройки от NS</string>
+    <string name="copyexistingvalues">Копиране на профил от NS (ако има)?</string>
+    <string name="classic_description">Оригинален изглед</string>
+    <string name="buttonson_description">Бутоните винаги се показват на дъното на екрана.</string>
+    <string name="largedisplay_description">Голям екран</string>
+    <string name="skin">Тема</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Интеграция на помпата Omnipod, изисква RileyLink устройство (с фърмуер минимум 2.0 ) .</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Звук при болус активен</string>
+    <string name="omnipod_config_beep_basal_enabled">Звук при базал активен</string>
+    <string name="omnipod_config_beep_smb_enabled">Звук при SMB активен</string>
+    <string name="omnipod_config_beep_tbr_enabled">Звук при временен базал активен</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Опции за отстраняване на грешки в под активирани</string>
+    <string name="omnipod_config_timechange_enabled">Разрешено е DST/Timezone</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Под Mgmt</string>
+    <string name="omnipod_pod_status">Статус на под</string>
+    <string name="omnipod_reservoir_left">%1$.2f Е остават</string>
+    <string name="omnipod_reservoir_over50">Над 50 Е</string>
+    <string name="omnipod_pod_address">Адрес на под</string>
+    <string name="omnipod_pod_expiry">Срокът на пода изтича</string>
+    <string name="omnipod_pod_name_no_info">Няма информация.</string>
+    <string name="omnipod_pod_no_pod_connected">Няма активен под</string>
+    <string name="omnipod_pod_not_initalized">Под не е инициализиран</string>
+    <string name="omnipod_pod_active_alerts">Сигнали за активен под</string>
+    <string name="omnipod_ack_short">Ack Предупреждения</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Операцията не е възможна.\n\n Трябва да изчакате няколко минути, докато AAPS се опита да зададе профил за първи път.</string>
+    <string name="omnipod_error_illegal_init_action_type">Неправилен PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Няма активен под.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Грешка при проверка на командата</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Непредвидена грешка. Моля, докладвайте! (тип: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Неуспешна комуникация: получени грешни входни параметри.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Връзката е неуспешна: таймаут.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Комуникацията е неуспешна: възникнала е неочаквана грешка. Моля, докладвайте!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Неуспешна комуникация: проверката на целостта на съобщението е неуспешна.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Неуспешна комуникация: получени грешни входни параметри.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Съобщението е неуспешно: Pod е в лошо състояние.</string>
+    <string name="omnipod_driver_error_invalid_response">Неуспешна комуникация: получени грешни входни параметри.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Неуспешна комуникация: получени грешни входни параметри.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Комуникацията е неуспешна: nonce ресинхронизирането е неуспешно.</string>
+    <string name="omnipod_driver_error_not_enough_data">Комуникацията е неуспешна: няма достатъчно данни, получени от Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Грешка на Pod (%1$03d %2$s). Моля, деактивирайте вашия Pod и стартирайте нов.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Комуникацията е неуспешна: Pod върна отговор с грешка.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Управление на Pod</string>
+    <string name="omnipod_cmd_init_pod">Инициализация на Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Деактивирай под</string>
+    <string name="omnipod_cmd_reset_pod">Нулиране на под</string>
+    <string name="omnipod_cmd_pod_history">История на под</string>
     <string name="omnipod_cmd_set_bolus">Стартирай болус</string>
+    <string name="omnipod_cmd_cancel_bolus">Отмяна на болус</string>
     <string name="omnipod_cmd_set_tbr">Приложи временен базал</string>
+    <string name="omnipod_cmd_cancel_tbr">Отказ на базал</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Отказ на базал</string>
+    <string name="omnipod_cmd_set_basal_schedule">Задаване на график за базал</string>
+    <string name="omnipod_cmd_get_pod_status">Получу статус на под</string>
+    <string name="omnipod_cmd_get_pod_info">Получи информация за Pod</string>
+    <string name="omnipod_cmd_set_time">Задаване на час</string>
+    <string name="omnipod_cmd_configure_alerts">Конфигуриране на аларми</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Потвърждение на аларми</string>
+    <string name="omnipod_cmd_suspend_delivery">Спиране на доставката на инсулин</string>
+    <string name="omnipod_cmd_resume_delivery">Подновяване на доставката</string>
+    <string name="omnipod_cmd_unknown_entry">Непознат запис</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1fЕ</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Скорост: %1$.1f U, Продължителност: %2$d мин.</string>
+    <string name="omnipod_cmd_reset_pod_desc">Ако натиснете <b>OK</b>, състоянието на Pod ще бъде нулирано и няма да можете да общувате с него повече. Правете това, само ако вече не можеш да се свързвате с него. Ако все още можете да общувате с Под, моля, използвайте опцията <b>Деактивирай Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Историята на Pod не е достъпна в момента.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Напълни Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nНапълнете с достатъчно инсулин за 3 дни.\n\nИзчакайте два сигнала от Pod по време на процеса на зареждане. Те показват, че е вмъкнат минималният размер от 85U. Уверете се, че сте изпразнил напълно спринцовката, дори след като сте чули двата сигнала.\n\nСлед пълнене на Pod, моля натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> не вадете капачката на капсулата на Podв този момент.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Пълнене</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Прикрепете Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nПодгответе мястото за инфузия. Отстранете капачката на Pod и лепенката и прикрепете капсулата към мястото за инфузия.\n\nАко канюла стърчи, моля натиснете <b>Отказ</b> и изхвърлете вашия Pod.\n\nПрес <b>Следваща</b> да се вмъкне канюлата и да започне базалната доставка.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Вмъкване на канюла</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Опитвам се да определя първоначалния базален график и да вмъкна канюлата.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Информация за Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\Podе активна.\n\nВашият базален график е програмиран и канюлата вмъкната.\n\nМоля, проверете дали канюлата е поставена правилно или заменете Pod, ако чувствате, че не е.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Деактивирай Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nНатиснете <b>Следващ</b> , за да деактивирате Pod.\n\n<b>Забележка:</b> Това ще спре всички доставки на инсулин и деактивира Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Деактивиране на Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Деактивиране на Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> Ако деактивирането непрекъснато се проваля, моля натиснете <b>Отказ</b> и използвайте опция <b>Нулирай Pod</b> , за да възстановите състоянието на Pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod изключен.\n\nмоля, извадете Pod от тялото си и го хвърли.</string>
+    <string name="omnipod_init_pod_pair_pod">Сдвояване на под</string>
+    <string name="omnipod_init_pod_prime_pod">Пълнене на под</string>
+    <string name="omnipod_init_pod_fill_cannula">Напълни канула</string>
     <string name="omnipod_init_pod_set_basal_profile">Приложи базалният профил</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Отмяна</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Деактивирай под</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Интеграция на Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Край на напомняне за сдвояване</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Край на напомнянето за настройка</string>
+    <string name="omnipod_alert_expiration">Подът скоро ще изтече</string>
+    <string name="omnipod_alert_expiration_advisory">Подът скоро ще изтече</string>
+    <string name="omnipod_alert_shutdown_imminent">Спирането е неизбежно</string>
     <string name="omnipod_alert_low_reservoir">Минимален инсулин в резервоара</string>
+    <string name="omnipod_alert_unknown_alert">Непозната аларма</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Задаването на базален профил може да е неуспешно. Доставката на инсулин може да бъде спряна! Моля, опреснете статуса на под.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Стартиране на временен базал неуспешно. Ако е имало вече такъв, той може да е бил отменен! Моля, обновете статуса на пода.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Задаването на време може да е неуспешно. Доставката на инсулин може да бъде спряна! Моля, опреснете статуса на под.</string>
+    <string name="omnipod_bolus_failed_uncertain">Не може да се провери статус на болус. Моля, уверете се, че вашият под е стартирал болус или го отменете.</string>
+    <string name="omnipod_rl_stats">Статистика на RL</string>
+    <string name="omnipod_read_pulse_log_short">Pulse лог</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index aa081ca187..c395dac6e2 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -625,6 +625,8 @@
     <string name="extendedbolusdeliveryerror">Chyba spuštění extended bolusu</string>
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">zpět</string>
+    <string name="set_neutral_temps_title">Nastavit neutrální dočasný bazál</string>
+    <string name="set_neutral_temps_summary">Je-li povoleno, zastaví dočasný bazál před koncem každé hodiny. To může u některých pump pomoci zastavit pípání/vibrace v celou hodinu.</string>
     <string name="enablesmbalways">Vždy povolit SMB</string>
     <string name="enablesmbalways_summary">Povolit SMB nezávisle na bolusech. Možno pouze se zdroji glykémií s dobrým filtrováním dat, jako např. G5</string>
     <string name="enablesmbaftercarbs">Povolit SMB po jídle</string>
@@ -1278,8 +1280,6 @@
     <string name="statuslights">Stavové indikátory</string>
     <string name="statuslights_copy_ns">Zkopírovat nastavení z NS</string>
     <string name="copyexistingvalues">Zkopírovat nastavení NS (existuje-li)?</string>
-    <string name="classic_desrciption">Původní vzhled</string>
-    <string name="buttonson_desrciption">Tlačítka jsou vždy zobrazena v dolní části obrazovky</string>
     <string name="skin">Vzhled</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 380b19dc9e..4801ec3215 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -452,8 +452,14 @@
     <string name="statuslights_res_critical">Warnschwelle kritischer Reservoirstand [IE]</string>
     <string name="statuslights_bat_warning">Warnschwelle Batteriestand [%]</string>
     <string name="statuslights_bat_critical">Warnschwelle kritischer Batteriestand [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Über</string>
     <string name="smscommunicator_missingsmspermission">SMS-Steuerung nicht erlaubt</string>
     <string name="smscommunicator_missingphonestatepermission">Fehlende Berechtigung für den Zugriff auf den Telefonstatus</string>
@@ -624,6 +630,8 @@
     <string name="extendedbolusdeliveryerror">Fehler bei der Abgabe eines verzögerten Bolus</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">her</string>
+    <string name="set_neutral_temps_title">Neutrale TBR setzen</string>
+    <string name="set_neutral_temps_summary">Wenn diese Option aktiviert ist, wird die TBR vor Ende jeder Stunde abgebrochen. Dies kann dazu beitragen, einige Pumpen davon abzuhalten, zur vollen Stunde zu vibrieren / zu piepsen.</string>
     <string name="enablesmbalways">SMB immer aktivieren</string>
     <string name="enablesmbalways_summary">Aktiviere SMB immer, unabhängig von Boli. Dies ist nur möglich, wenn eine BZ-Quelle genutzt wird, die die Daten besonders gut filtert wie z. B. G5.</string>
     <string name="enablesmbaftercarbs">Aktiviere SMB nach Mahlzeiten.</string>
@@ -1278,8 +1286,9 @@ Unerwartetes Verhalten.</string>
     <string name="statuslights">Statusanzeige</string>
     <string name="statuslights_copy_ns">Einstellung aus NS kopieren</string>
     <string name="copyexistingvalues">NS-Einstellungen kopieren (falls vorhanden)?</string>
-    <string name="classic_desrciption">Ursprüngliches Erscheinungsbild</string>
-    <string name="buttonson_desrciption">Schaltflächen werden immer am unteren Rand des Bildschirms angezeigt</string>
+    <string name="classic_description">Ursprüngliches Erscheinungsbild</string>
+    <string name="buttonson_description">Schaltflächen werden immer am unteren Rand des Bildschirms angezeigt</string>
+    <string name="largedisplay_description">Großer Bildschirm</string>
     <string name="skin">Erscheinungsbild</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index cf85eb4cbc..ecb04b75ca 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1274,8 +1274,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights">Voyants d\'état</string>
     <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
     <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
-    <string name="classic_desrciption">Thème d\'origine</string>
-    <string name="buttonson_desrciption">Les boutons sont toujours affichés en bas de l\'écran</string>
     <string name="skin">Thème</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 7b83a52d8b..b0b5939317 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -452,8 +452,14 @@
     <string name="statuslights_res_critical">Soglia livello serbatoio critico [U]</string>
     <string name="statuslights_bat_warning">Soglia di avviso livello batteria [%]</string>
     <string name="statuslights_bat_critical">Soglia livello batteria critico [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ATT</string>
+    <string name="abs_insulin_shortname">ASS</string>
+    <string name="devslope_shortname">PENDEV</string>
     <string name="nav_about">Informazioni su</string>
     <string name="smscommunicator_missingsmspermission">Autorizzazione SMS mancante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorizzazione stato telefono mancante</string>
@@ -625,6 +631,8 @@
     <string name="extendedbolusdeliveryerror">Errore erogazione bolo esteso</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">fa</string>
+    <string name="set_neutral_temps_title">Imposta basali temporanee neutre</string>
+    <string name="set_neutral_temps_summary">Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora.</string>
     <string name="enablesmbalways">Abilita SMB sempre</string>
     <string name="enablesmbalways_summary">Abilita SMB sempre, indipendentemente dai boli. Possibile solo con sorgente glicemia con un buon filtraggio dei dati, come G5</string>
     <string name="enablesmbaftercarbs">Abilita SMB dopo i CHO</string>
@@ -1278,8 +1286,9 @@
     <string name="statuslights">Indicatori di stato</string>
     <string name="statuslights_copy_ns">Copia impostazioni da NS</string>
     <string name="copyexistingvalues">Copiare impostazioni NS (se esiste)?</string>
-    <string name="classic_desrciption">Tema originale</string>
-    <string name="buttonson_desrciption">I tasti vengono sempre visualizzati nella parte inferiore dello schermo</string>
+    <string name="classic_description">Tema originale</string>
+    <string name="buttonson_description">I tasti vengono sempre visualizzati nella parte inferiore dello schermo</string>
+    <string name="largedisplay_description">Visualizzazione ampia</string>
     <string name="skin">Tema</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2d3d87cb2b..6ba8a86ce2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Para retomar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Para activar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Para desactivar o loop responda com o código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
@@ -449,8 +452,14 @@
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
     <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
+    <string name="prediction_shortname">PREV</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DESV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DESVINCLI</string>
     <string name="nav_about">Sobre</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -468,6 +477,8 @@
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
+    <string name="ns_alarms">Criar notificações dos alarmes NS</string>
+    <string name="ns_announcements">Criar notificações a partir dos anúncios NS</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Tempo limite para Urgência por dados obsoletos [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
@@ -620,6 +631,8 @@
     <string name="extendedbolusdeliveryerror">Erro na entrega Bólus Estendido</string>
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
+    <string name="set_neutral_temps_title">Definir basais temporárias neutras</string>
+    <string name="set_neutral_temps_summary">Se activado, ele irá cancelar basal temporária antes do final de cada hora. Este método pode ajudar a parar o sinal sonoro/vibração em algumas bombas, de hora em hora.</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
@@ -845,6 +858,10 @@
     <string name="log_alerts">Alertas de registo</string>
     <string name="enable_tbr_emulation">Ativar a emulação TBR</string>
     <string name="enable_tbr_emulation_summary">Usar bólus prolongados em vez de basais temporárias para contornar o limite de 250%%</string>
+    <string name="disable_vibration">Desactivar vibrações na entrega manual de bólus</string>
+    <string name="disable_vibration_summary">Para bólus e bólus estendidos (só disponível com o firmware Insight 3.x)</string>
+    <string name="disable_vibration_auto">Desactivar vibrações na entrega automática de bólus</string>
+    <string name="disable_vibration_auto_summary">Para SMB e Basal Temp com emulação DBT (só disponível com firmware Insight 3.x)</string>
     <string name="disconnect_delay">Atraso de desconexão [s]</string>
     <string name="serial_number">Número de série</string>
     <string name="release_software_version">Lançar versão de software</string>
@@ -1269,8 +1286,6 @@
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
-    <string name="classic_desrciption">Tema gráfico original</string>
-    <string name="buttonson_desrciption">Os botões são sempre exibidos na parte inferior do ecrã</string>
     <string name="skin">Tema gráfico</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
@@ -1369,6 +1384,7 @@
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
+    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
     <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 9cc2bd4367..9705931fa8 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Para retomar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Para activar o loop responda com o código %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Para desactivar o loop responda com o código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus prolongado %1$.2fU/h para %2$d min iniciado com êxito</string>
     <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
@@ -449,8 +452,14 @@
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
     <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
+    <string name="prediction_shortname">PREV</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DESV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DESVINCLI</string>
     <string name="nav_about">Acerca</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -468,6 +477,8 @@
     <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
+    <string name="ns_alarms">Criar notificações dos alarmes NS</string>
+    <string name="ns_announcements">Criar notificações a partir dos anúncios NS</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Tempo limite para Urgência por dados obsoletos [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
@@ -620,6 +631,8 @@
     <string name="extendedbolusdeliveryerror">Erro na administração Bólus Prolongado</string>
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
+    <string name="set_neutral_temps_title">Definir basais temporárias neutras</string>
+    <string name="set_neutral_temps_summary">Se activado, ele irá cancelar basal temporária antes do final de cada hora. Este método pode ajudar a parar o sinal sonoro/vibração em algumas bombas, de hora em hora.</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Activar SMB após hidratos</string>
@@ -845,6 +858,10 @@
     <string name="log_alerts">Alertas de registo</string>
     <string name="enable_tbr_emulation">Activar a emulação DBT</string>
     <string name="enable_tbr_emulation_summary">Usar bólus prolongados em vez de basais temporárias para contornar o limite de 250%%</string>
+    <string name="disable_vibration">Desactivar vibrações na entrega manual de bólus</string>
+    <string name="disable_vibration_summary">Para bólus e bólus estendidos (só disponível com o firmware Insight 3.x)</string>
+    <string name="disable_vibration_auto">Desactivar vibrações na entrega automática de bólus</string>
+    <string name="disable_vibration_auto_summary">Para SMB e Basal Temp com emulação DBT (só disponível com firmware Insight 3.x)</string>
     <string name="disconnect_delay">Atraso de desconexão [s]</string>
     <string name="serial_number">Número de série</string>
     <string name="release_software_version">Lançar versão de software</string>
@@ -1269,8 +1286,9 @@
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
-    <string name="classic_desrciption">Tema gráfico original</string>
-    <string name="buttonson_desrciption">Os botões são sempre exibidos na parte inferior do ecrã</string>
+    <string name="classic_description">Tema Gráfico Original</string>
+    <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
+    <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema gráfico</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
@@ -1369,6 +1387,7 @@
     <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
+    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
     <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
     <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
     <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9fd0272030..ca8e62ca3d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -452,8 +452,14 @@
     <string name="statuslights_res_critical">Порог критического уровня наполненности резервуара [U]</string>
     <string name="statuslights_bat_warning">Порог предупреждения о разрядке батареи [%]</string>
     <string name="statuslights_bat_critical">Порог предупреждения о критическом уровне разрядки батареи [%]</string>
+    <string name="prediction_shortname">ОЖИД</string>
     <string name="iob">IOB акт инс</string>
     <string name="cob">акт углев</string>
+    <string name="basal_shortname">БАЗ</string>
+    <string name="deviation_shortname">ОТКЛН</string>
+    <string name="activity_shortname">НАГР</string>
+    <string name="abs_insulin_shortname">НАДО</string>
+    <string name="devslope_shortname">ЛИНОТКЛН</string>
     <string name="nav_about">о приложении</string>
     <string name="smscommunicator_missingsmspermission">отсутствует смс подтверждение</string>
     <string name="smscommunicator_missingphonestatepermission">Отсутствует разрешение телефона</string>
@@ -625,6 +631,8 @@
     <string name="extendedbolusdeliveryerror">Подача пролонгированного болюса не состоялась</string>
     <string name="insightpump_shortname">Поле обзора</string>
     <string name="ago">тому назад</string>
+    <string name="set_neutral_temps_title">Установить нейтральные временные базалы</string>
+    <string name="set_neutral_temps_summary">Если эта опция включена, то она отменяет временный базал до конца каждого часа. Такой метод помогает прекратить почасовую вибрацию некоторых помп.</string>
     <string name="enablesmbalways">Всегда включать супер микро болюс SMB</string>
     <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
     <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
@@ -1280,8 +1288,6 @@ Context | Edit Context</string>
     <string name="statuslights">Индикаторы состояния</string>
     <string name="statuslights_copy_ns">Копировать параметры из NS</string>
     <string name="copyexistingvalues">Копировать настройки NS (если есть)?</string>
-    <string name="classic_desrciption">Исходная тема оформления</string>
-    <string name="buttonson_desrciption">Кнопки всегда отображаются в нижней части экрана</string>
     <string name="skin">Тема оформления</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index e2e47f5a97..12f7de2d68 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -264,6 +264,9 @@
     <string name="smscommunicator_carbsreplywithcode">Pre zadanie %1$dg na %2$s odpovedz SMS kódom %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Pre spustenie bazálu %1$d%% na %2$d min odpovedzte SMS s kódom %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Pre pozastavenie uzavretého okruhu na %1$d minút odpovedaj SMS s kódom %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Pre obnovenie uzavretého okruhu, odpovedzte SMS s kódom %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Pre povolenie uzavretého okruhu, odpovedzte SMS s kódom %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Pre zakázanie uzavretého okruhu, odpovedzte SMS s kódom %1$s</string>
     <string name="smscommunicator_tempbasalset">Dočasný bazál %1$.2fJI/h spustený na %2$d minút</string>
     <string name="smscommunicator_extendedset">Predĺžený bolus %1$.2fJI na %2$d min úspešne spustený</string>
     <string name="smscommunicator_carbsset">Sacharidy %1$dg zadané úspešne</string>
@@ -468,6 +471,8 @@
     <string name="doprofileswitch">Vykonajte zmenu profilu</string>
     <string name="careportal_pbage_label">Vek batérie v pumpe</string>
     <string name="ns_alarmoptions">Nastavenie alarmov</string>
+    <string name="ns_alarms">Vytvoriť oznámenia z alarmov NS</string>
+    <string name="ns_announcements">Vytvoriť oznámenia z upozornení NS</string>
     <string name="nsalarm_staledatavalue_label">Hraničná hodnota pre zastaralé dáta [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Vysoká hraničná hodnota pre zastaralé dáta [min]</string>
     <string name="openapsama_autosens_period">Interval pre automatickú detekciu citlivosti [h]</string>
@@ -620,6 +625,8 @@
     <string name="extendedbolusdeliveryerror">Chyba pri podávaní predĺženého bolusu</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">pred</string>
+    <string name="set_neutral_temps_title">Nastaviť neutrálny dočasný bazál</string>
+    <string name="set_neutral_temps_summary">Ak je povolená táto možnosť, zastaví sa dočasný bazál pred koncom každej hodiny. To môže u niektorých púmp pomôcť zastaviť pípanie/vibrácie na celú hodinu.</string>
     <string name="enablesmbalways">Vždy povoliť SMB</string>
     <string name="enablesmbalways_summary">Povoliť SMB nezávisle na bolusoch. Možno iba zo zdrojom glykémií s dobrým filtrovaním dát, ako napr. G5</string>
     <string name="enablesmbaftercarbs">Povoliť SMB po jedle</string>
@@ -845,6 +852,10 @@
     <string name="log_alerts">Zaznamenať výstrahy</string>
     <string name="enable_tbr_emulation">Povoliť emuláciu dočasných bazálov</string>
     <string name="enable_tbr_emulation_summary">Používať predĺžené bolusy namiesto dočasných bázalov, aby sme sa vyhli 250%% limitu</string>
+    <string name="disable_vibration">Zakázať vibrácie pri ručnom podaní bolusu</string>
+    <string name="disable_vibration_summary">Pre bolus a predĺžený bolus (dostupné iba s Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Zakázať vibrácie pri automatickom podaní bolusu</string>
+    <string name="disable_vibration_auto_summary">Pre SMB a Dočasný bazál s emuláciou TBR (k dispozícii iba s Insight firmware 3.x)</string>
     <string name="disconnect_delay">Oneskorenie odpojenia [s]</string>
     <string name="serial_number">Sériové číslo</string>
     <string name="release_software_version">Verzia softwaru</string>
@@ -1269,8 +1280,6 @@
     <string name="statuslights">Indikátory stavu</string>
     <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
     <string name="copyexistingvalues">Skopírovať nastavenia NS (ak existujú)?</string>
-    <string name="classic_desrciption">Pôvodný vzhľad</string>
-    <string name="buttonson_desrciption">Tlačidlá sú vždy zobrazené v spodnej časti obrazovky</string>
     <string name="skin">Vzhľad</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
@@ -1369,6 +1378,7 @@
     <string name="description_pump_omnipod_dash">Integrácia pumpy pre Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Pripomienka ukončenia párovania</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Pripomienka ukončenia nastavenia</string>
+    <string name="omnipod_alert_expiration">Pod čoskoro expiruje</string>
     <string name="omnipod_alert_expiration_advisory">Pod čoskoro expiruje</string>
     <string name="omnipod_alert_shutdown_imminent">Vypnutie je bezprostredné</string>
     <string name="omnipod_alert_low_reservoir">Nízka hladina zásobníka</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 5e43c9f113..fe88fd2393 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -265,6 +265,9 @@ Eversense-appen.</string>
     <string name="smscommunicator_carbsreplywithcode">Om du vill ange %1$dg kl. %2$s, svara med kod %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">För att starta temp basal %1$d%% i %2$d min, svara med kod %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">För att pausa loop i %1$d minuter, svara med kod %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">För att återuppta loopen, svara med kod %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">För att aktivera loopen, svara med kod %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">För att inaktivera loopen, svara med kod %1$s</string>
     <string name="smscommunicator_tempbasalset">Temp basal %1$.2f enheter/tim i %2$d min startad</string>
     <string name="smscommunicator_extendedset">Förlängd bolus %1$.2f enheter över %2$d min har startats</string>
     <string name="smscommunicator_carbsset">%1$dg kolhydrater registrerat</string>
@@ -279,8 +282,8 @@ Eversense-appen.</string>
     <string name="smscommunicator_tempbasalcancelfailed">Misslyckades med att avbryta temp basal</string>
     <string name="smscommunicator_extendedcancelfailed">Avbryter förlängd bolus</string>
     <string name="smscommunicator_unknowncommand">Okänt kommando eller fel svar</string>
-    <string name="quickwizard">Kalkylator</string>
-    <string name="quickwizardsettings">Kalkylatorinställningar</string>
+    <string name="quickwizard">Snabbsteg</string>
+    <string name="quickwizardsettings">Inställningar för snabbsteg</string>
     <string name="overview_editquickwizard_buttontext">Knapptext:</string>
     <string name="overview_editquickwizard_carbs">KH:</string>
     <string name="overview_editquickwizard_valid">Giltig:</string>
@@ -450,8 +453,14 @@ Eversense-appen.</string>
     <string name="statuslights_res_critical">Akut varningsnivå för reservoar [U]</string>
     <string name="statuslights_bat_warning">Varningsnivå för batteri [%]</string>
     <string name="statuslights_bat_critical">Akut varningsnivå för batteri [%]</string>
+    <string name="prediction_shortname">Prog</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">Bas</string>
+    <string name="deviation_shortname">Dev</string>
+    <string name="activity_shortname">Akt</string>
+    <string name="abs_insulin_shortname">Abs</string>
+    <string name="devslope_shortname">Devslope</string>
     <string name="nav_about">Om</string>
     <string name="smscommunicator_missingsmspermission">Saknar behörighet att skicka SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Behörighet saknas</string>
@@ -469,6 +478,8 @@ Eversense-appen.</string>
     <string name="doprofileswitch">Genomför profilbyte</string>
     <string name="careportal_pbage_label">Pumpbatteri ålder</string>
     <string name="ns_alarmoptions">Larminställningar</string>
+    <string name="ns_alarms">Skapa aviseringar från NS-larm</string>
+    <string name="ns_announcements">Skapa aviseringar från NS-meddelanden</string>
     <string name="nsalarm_staledatavalue_label">Första varning efter [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Akut varning efter [min]</string>
     <string name="openapsama_autosens_period">Intervall för autosens [tim]</string>
@@ -621,6 +632,8 @@ Eversense-appen.</string>
     <string name="extendedbolusdeliveryerror">Förlängd bolus misslyckad</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">sedan</string>
+    <string name="set_neutral_temps_title">Sätt neutrala temp basaler</string>
+    <string name="set_neutral_temps_summary">Om aktiverad, kommer en eventuell temporär basal automatiskt avbrytas före utgången av varje timme. Denna metod kan förhindra att vissa pumpar piper/vibrerar.</string>
     <string name="enablesmbalways">Använd alltid SMB</string>
     <string name="enablesmbalways_summary">Använd alltid SMB oberoende av bolus. Endast möjligt med en bra filtrerad BG-källa, t ex Dexcom G5.</string>
     <string name="enablesmbaftercarbs">Använd SMB efter kolhydrater</string>
@@ -646,7 +659,7 @@ Eversense-appen.</string>
     <string name="ns_create_announcements_from_errors_title">Skapa notiser vid fel</string>
     <string name="ns_create_announcements_from_errors_summary">Skapa notiser i Nightscout vid fel eller lokala meddelanden (även synliga i Careportal/Behandlingar)</string>
     <string name="wear_predictions_summary">Visa BG-prognos på klockan.</string>
-    <string name="wear_predictions_title">Prognos</string>
+    <string name="wear_predictions_title">BG-prognos</string>
     <string name="data_choices">Dataval</string>
     <string name="fabric_upload">Uppladdning till Fabric</string>
     <string name="allow_automated_crash_reporting">Tillåt automatisk rapportering av appkrascher och användningsinformation till utvecklarna via fabric.io-tjänsten.</string>
@@ -846,6 +859,10 @@ Eversense-appen.</string>
     <string name="log_alerts">Logga varningar</string>
     <string name="enable_tbr_emulation">Aktivera emulering av temp basal</string>
     <string name="enable_tbr_emulation_summary">Använda förlängda bolusar istället för temp basaler för att kringgå 250%%-begränsningen</string>
+    <string name="disable_vibration">Inaktivera vibration för manuell bolus</string>
+    <string name="disable_vibration_summary">För bolus och förlängd bolus (endast tillgängligt med Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Inaktivera vibration för automatisk bolus</string>
+    <string name="disable_vibration_auto_summary">För SMB och temp basal med TBR-emulering (endast tillgängligt med Insight firmware 3.x)</string>
     <string name="disconnect_delay">Fördröjning av frånkoppling [s]</string>
     <string name="serial_number">Serienummer</string>
     <string name="release_software_version">Mjukvaruversion Release</string>
@@ -1260,7 +1277,7 @@ Eversense-appen.</string>
     <string name="smscommunicator_otp_reset_warning">Genom att återställa autentiseringsfunktionen kommer alla redan driftsatta autentiserare bli ogiltiga. Du kommer behöva sätta upp dem igen!</string>
     <string name="onconnect">Vid anslutning</string>
     <string name="ondisconnect">Vid frånkoppling</string>
-    <string name="overview_show_predictions">Beräknade resultat</string>
+    <string name="overview_show_predictions">BG-prognos</string>
     <string name="overview_show_deviationslope">Avvikelsekurva</string>
     <string name="authorizationfailed">Behörighetskontroll misslyckades</string>
     <string name="overview_show_absinsulin">Absolut insulinmängd</string>
@@ -1270,8 +1287,9 @@ Eversense-appen.</string>
     <string name="statuslights">Statuslampor</string>
     <string name="statuslights_copy_ns">Kopiera inställningar från NS</string>
     <string name="copyexistingvalues">Kopiera NS-inställningar (om det finns)?</string>
-    <string name="classic_desrciption">Ursprungligt tema</string>
-    <string name="buttonson_desrciption">Knappar visas alltid längst ned på skärmen</string>
+    <string name="classic_description">Ursprungligt tema</string>
+    <string name="buttonson_description">Knappar visas alltid längst ned på skärmen</string>
+    <string name="largedisplay_description">Stor skärm</string>
     <string name="skin">Tema</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
@@ -1370,6 +1388,7 @@ Eversense-appen.</string>
     <string name="description_pump_omnipod_dash">Pumpintegration för Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Påminnelse att slutföra parkoppling</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Påminnelse att slutföra installation</string>
+    <string name="omnipod_alert_expiration">Pod löper snart ut</string>
     <string name="omnipod_alert_expiration_advisory">Pod kommer att gå ut inom kort</string>
     <string name="omnipod_alert_shutdown_imminent">Pod kommer snart att stängas av</string>
     <string name="omnipod_alert_low_reservoir">Låg reservoar</string>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 4c45586f82..e0560d2206 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -1,20 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    General-->
+    <string name="error">Грешка</string>
+    <string name="not_set_short">Не е зададен</string>
+    <string name="failedupdatebasalprofile">Неуспешно обновяване на базалния профил</string>
+    <string name="profile_set_ok">Профила на помпата е обновен</string>
+    <string name="invalidinput">Грешни данни</string>
+    <string name="tempbasaldeliveryerror">Грешка при подаване на временен базал</string>
+    <string name="goingtodeliver">Ще стартира %1$.2fЕ болус</string>
+    <string name="waitingforpump">Чакаме помпата</string>
+    <string name="connectingfor">Свързване %1$d сек</string>
+    <string name="bolusdelivering">Пускам %1$.2fЕ</string>
+    <string name="handshaking">Сдвояване</string>
+    <string name="connecting">Свързване</string>
+    <string name="connected">Свързана</string>
+    <string name="disconnected">Не е сврзана</string>
+    <string name="disconnecting">Разкачане</string>
+    <string name="androidaps_start">Стартиран AndroidAPS</string>
+    <string name="formatinsulinunits">%1$.2fЕ</string>
+    <string name="reservoirvalue">%1$.0f / %2$d Е</string>
+    <string name="pump_basebasalrate">%1$.2f Е/ч</string>
+    <string name="format_hours">%1$.2f ч</string>
+    <string name="format_mins">%1$d мин</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Помпата е заета</string>
+    <string name="connectionerror">Грешка при връзка с помпата</string>
+    <string name="youareonallowedlimit">Достигнахте лимита</string>
+    <string name="objectives">Цели</string>
+    <string name="close">Затвори</string>
+    <string name="please_wait">Моля изчакайте...</string>
+    <string name="mute">Заглушаване</string>
+    <string name="reload">Презареди</string>
+    <string name="stoppressed">Натиснат е СТОП!</string>
+    <string name="stop">Стоп</string>
+    <string name="carbs">въглехидрати</string>
+    <string name="invalidprofile">Грешен профил !!!</string>
+    <string name="noprofileset">НЕ Е АКТИВИРАН ПРОФИЛ</string>
+    <string name="date">Дата</string>
+    <string name="units_label">Единици</string>
+    <string name="dia_label">DIA (Време на действие на инсулина):</string>
+    <string name="ic_label">IC (Инсулин/въглехидр.):</string>
+    <string name="isf_label">ISF (Инс.чувствителност):</string>
+    <string name="basal_label">Базал</string>
+    <string name="target_label">Целeва КЗ:</string>
+    <string name="initializing">Инициализация ...</string>
+    <string name="serialnumber">Сериен номер</string>
+    <string name="battery_label">Батерия</string>
+    <string name="lastconnection_label">Последна връзка</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <string name="minago">преди %1$d мин</string>
     <!--    Profile-->
     <!--    ProfileFunction-->
     <!--    PumpType-->
     <!--    APSResult-->
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
+    <string name="mins">%1$dмин</string>
     <!--    TDD-->
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
     <!--    TDDStatsActivity-->
+    <string name="stats">Статистика</string>
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 3375afa7a1..eb03777b55 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -8,7 +8,7 @@
     <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
     <string name="invalidinput">Entrada Inválida</string>
     <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
-    <string name="goingtodeliver">Quantidade a ser administrada %1$.2fU</string>
+    <string name="goingtodeliver">A ser administrado %1$.2fU</string>
     <string name="waitingforpump">À espera da bomba</string>
     <string name="connectingfor">A ligar durante %1$d s</string>
     <string name="bolusdelivering">A administrar %1$.2fU</string>
diff --git a/dana/src/main/res/values-sk-rSK/strings.xml b/dana/src/main/res/values-sk-rSK/strings.xml
index c7cd8251bb..9e6e2cfd8e 100644
--- a/dana/src/main/res/values-sk-rSK/strings.xml
+++ b/dana/src/main/res/values-sk-rSK/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Batéria v pumpe vybitá</string>
     <string name="occlusion">Oklúzia</string>
     <string name="emptyreservoir">Prázdny zásobník</string>
+    <string name="checkshaft">Skontrolovať hriadeľ</string>
+    <string name="basalmax">Max. bazál</string>
+    <string name="dailymax">Max. denný</string>
     <string name="bloodsugarmeasurementalert">Výstraha merania glykémie</string>
     <string name="remaininsulinalert">Zostávajúci inzulín</string>
     <string name="missedbolus">Chýbajúci bolus</string>
diff --git a/dana/src/main/res/values-sv-rSE/strings.xml b/dana/src/main/res/values-sv-rSE/strings.xml
index 0edf825c1d..94bc25e158 100644
--- a/dana/src/main/res/values-sv-rSE/strings.xml
+++ b/dana/src/main/res/values-sv-rSE/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Pumpbatteri urladdat</string>
     <string name="occlusion">Ocklusion</string>
     <string name="emptyreservoir">Tom reservoar</string>
+    <string name="checkshaft">Kontrollera axel</string>
+    <string name="basalmax">Max basal</string>
+    <string name="dailymax">Max daglig</string>
     <string name="bloodsugarmeasurementalert">Varning om blodsockermätning</string>
     <string name="remaininsulinalert">Återstående mängd insulin </string>
     <string name="missedbolus">Missad bolus</string>

From 94390ca32fecd657c7f917b7fa3b8cd7233c1f2a Mon Sep 17 00:00:00 2001
From: Lexsus <lucassrus@gmail.com>
Date: Mon, 1 Jun 2020 19:29:37 +0300
Subject: [PATCH 174/400] fixed after review.

---
 .../smsCommunicator/SmsCommunicatorPlugin.kt  | 46 ++++++++-----------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 2cc357aee1..60bba0fd13 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -471,45 +471,37 @@ class SmsCommunicatorPlugin @Inject constructor(
                                 loopPlugin.suspendTo(0L)
                                 sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_reconnect)))
                                 rxBus.send(EventRefreshOverview("SMS_PUMP_START"))
-                                sp.putBoolean(R.string.key_objectiveusereconnect, true)
                                 loopPlugin.createOfflineEvent(0)
                             }
                         }
                     })
                 }
             })
-        } else if (splitted.size == 3) {
-            if (splitted[1].equals("DISCONNECT", ignoreCase = true)) {
-                var duration = SafeParse.stringToInt(splitted[2])
-                duration = Math.max(0, duration)
-                duration = Math.min(120, duration)
-                if (duration == 0) {
-                    receivedSms.processed = true
-                    sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
-                    return
-                } else {
-                    val passCode = generatePasscode()
-                    val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
-                    receivedSms.processed = true
-                    messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
-                        override fun run() {
-                            val profile = profileFunction.getProfile()
-                            loopPlugin.disconnectPump(duration, profile)
-                            rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
-                            sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
-                        }
-                    })
-                }
-            } else {
-                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
+        } else if ((splitted.size == 3) && (splitted[1].equals("DISCONNECT", ignoreCase = true))) {
+            var duration = SafeParse.stringToInt(splitted[2])
+            duration = Math.max(0, duration)
+            duration = Math.min(120, duration)
+            if (duration == 0) {
+                receivedSms.processed = true
+                sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_wrongduration)))
                 return
+            } else {
+                val passCode = generatePasscode()
+                val reply = String.format(resourceHelper.gs(R.string.smscommunicator_pumpdisconnectwithcode), duration, passCode)
+                receivedSms.processed = true
+                messageToConfirm = AuthRequest(injector, receivedSms, reply, passCode, object : SmsAction() {
+                    override fun run() {
+                        val profile = profileFunction.getProfile()
+                        loopPlugin.disconnectPump(duration, profile)
+                        rxBus.send(EventRefreshOverview("SMS_PUMP_DISCONNECT"))
+                        sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.smscommunicator_pumpdisconnected)))
+                    }
+                })
             }
-
         } else {
             sendSMS(Sms(receivedSms.phoneNumber, resourceHelper.gs(R.string.wrongformat)))
             return
         }
-
     }
 
     private fun processPROFILE(splitted: Array<String>, receivedSms: Sms) { // load profiles

From 2c2201129b9057029d0864cd19532b2a40afb50f Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Wed, 3 Jun 2020 00:17:05 +1200
Subject: [PATCH 175/400] Remove oref SMB carbs required preference

---
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.java    | 7 +++----
 app/src/main/res/values/strings.xml                        | 3 ---
 app/src/main/res/xml/pref_openapssmb.xml                   | 6 ------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index c56151feb1..640d1b1585 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -38,10 +38,9 @@ public class DetermineBasalResultSMB extends APSResult {
             if (result.has("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
 
-            if (sp.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
-                if (result.has("carbsReq")) carbsReq = result.getInt("carbsReq");
-                if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
-            }
+            if (result.has("carbsReq")) carbsReq = result.getInt("carbsReq");
+            if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
+            
 
             if (result.has("rate") && result.has("duration")) {
                 tempBasalRequested = true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 39dd4562cd..2c1eefd556 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -613,14 +613,11 @@
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
-    <string name="key_smb_enable_carbs_suggestions" translatable="false">smb_enable_carbs_suggestions</string>
     <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">smb_enable_carbs_suggestions_threshold</string>
     <string name="enableuam">Enable UAM</string>
     <string name="enablesmb">Enable SMB</string>
-    <string name="enablecarbssuggestions">Enable Carbs Suggestions</string>
     <string name="enablesmb_summary">Use Super Micro Boluses instead of temp basal for faster action</string>
     <string name="enableuam_summary">Detection of Unannounced meals</string>
-    <string name="enablecarbssuggestions_summary">Enable carbs suggestions when BG is predicted to go below threshold</string>
     <string name="key_insulin_oref_peak" translatable="false">insulin_oref_peak</string>
     <string name="insulin_oref_peak">IOB Curve Peak Time</string>
     <string name="insulin_peak_time">Peak Time [min]</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 08b934f763..252ce1ccf4 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -142,12 +142,6 @@
             android:key="@string/key_low_temptarget_lowers_sensitivity"
             android:summary="@string/low_temptarget_lowers_sensitivity_summary"
             android:title="@string/low_temptarget_lowers_sensitivity_title" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/key_smb_enable_carbs_suggestions"
-            android:summary="@string/enablecarbssuggestions_summary"
-            android:title="@string/enablecarbssuggestions" />
             
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:key="@string/key_carbsReqThreshold"

From 484f3a2a98adc2d10f322cd4d8408d7092d9fcd7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 2 Jun 2020 19:28:56 +0200
Subject: [PATCH 176/400] invalidate cache including bg after bg change

---
 .../nightscout/androidaps/db/DatabaseHelper.java  |  4 +++-
 .../iobCobCalculator/IobCobCalculatorPlugin.java  | 15 +++++++++++----
 .../events/EventNewHistoryBgData.kt               |  5 +++++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryBgData.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 4b8d637c47..4d4c52df43 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -52,6 +52,7 @@ import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryBgData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightBolusID;
 import info.nightscout.androidaps.plugins.pump.insight.database.InsightHistoryOffset;
@@ -386,7 +387,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 old.copyFrom(bgReading);
                 getDaoBgReadings().update(old);
                 aapsLogger.debug(LTag.DATABASE, "BG: Updating record from: " + from + " New data: " + old.toString());
-                scheduleBgChange(bgReading);
+                rxBus.send(new EventNewHistoryBgData(old.date)); // trigger cache invalidation
+                scheduleBgChange(bgReading); // trigger new calculation
                 return false;
             }
         } catch (SQLException e) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 2f49cd9971..205717dc59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -39,6 +39,7 @@ import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.interfaces.ProfileFunction;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.data.AutosensData;
+import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryBgData;
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin;
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin;
@@ -159,7 +160,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     runCalculation("onNewProfile", System.currentTimeMillis(), false, true, event);
                 }, fabricPrivacy::logException)
         );
-        // EventNewBG
+        // EventNewBG .... cannot be used for invalidating because only event with last BG is fired
         disposable.add(rxBus
                 .toObservable(EventNewBG.class)
                 .observeOn(Schedulers.io())
@@ -203,7 +204,13 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         disposable.add(rxBus
                 .toObservable(EventNewHistoryData.class)
                 .observeOn(Schedulers.io())
-                .subscribe(this::newHistoryData, fabricPrivacy::logException)
+                .subscribe(event -> newHistoryData(event, false), fabricPrivacy::logException)
+        );
+        // EventNewHistoryBgData
+        disposable.add(rxBus
+                .toObservable(EventNewHistoryBgData.class)
+                .observeOn(Schedulers.io())
+                .subscribe(event -> newHistoryData(new EventNewHistoryData(event.getTimestamp()), true), fabricPrivacy::logException)
         );
     }
 
@@ -822,7 +829,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     }
 
     // When historical data is changed (comming from NS etc) finished calculations after this date must be invalidated
-    private void newHistoryData(EventNewHistoryData ev) {
+    private void newHistoryData(EventNewHistoryData ev, boolean bgDataReload) {
         //log.debug("Locking onNewHistoryData");
         stopCalculation("onEventNewHistoryData");
         synchronized (dataLock) {
@@ -862,7 +869,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 }
             }
         }
-        runCalculation("onEventNewHistoryData", System.currentTimeMillis(), false, true, ev);
+        runCalculation("onEventNewHistoryData", System.currentTimeMillis(), bgDataReload, true, ev);
         //log.debug("Releasing onNewHistoryData");
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryBgData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryBgData.kt
new file mode 100644
index 0000000000..5f546c2d9f
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/events/EventNewHistoryBgData.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventNewHistoryBgData(val timestamp: Long) : Event()
\ No newline at end of file

From 15378fb2b8db1336b5ec822e805e4a1cf448d2b2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 2 Jun 2020 21:59:51 +0200
Subject: [PATCH 177/400] InMemoryGlucoseValue

---
 .../iobCobCalculator/InMemoryGlucoseValue.kt  |  8 ++++
 .../IobCobCalculatorPlugin.java               | 48 +++++++++----------
 .../iobCobCalculator/IobCobOref1Thread.java   | 14 +++---
 .../iob/iobCobCalculator/IobCobThread.java    | 14 +++---
 4 files changed, 46 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt
new file mode 100644
index 0000000000..55acd27b40
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator
+
+import info.nightscout.androidaps.db.BgReading
+
+class InMemoryGlucoseValue constructor(var timestamp: Long = 0L, var value: Double = 0.0) {
+
+    constructor(gv: BgReading) : this(gv.date, gv.value)
+}
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 205717dc59..9563519107 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -80,7 +80,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     private LongSparseArray<BasalData> basalDataTable = new LongSparseArray<>(); // oldest at index 0
 
     private volatile List<BgReading> bgReadings = null; // newest at index 0
-    private volatile List<BgReading> bucketed_data = null;
+    private volatile List<InMemoryGlucoseValue> bucketed_data = null;
 
     private final Object dataLock = new Object();
 
@@ -232,7 +232,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         this.bgReadings = bgReadings;
     }
 
-    public List<BgReading> getBucketedData() {
+    public List<InMemoryGlucoseValue> getBucketedData() {
         return bucketed_data;
     }
 
@@ -342,15 +342,15 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 break;
 
             if (older.date == newer.date) { // direct hit
-                bucketed_data.add(newer);
+                bucketed_data.add(new InMemoryGlucoseValue(newer));
             } else {
                 double bgDelta = newer.value - older.value;
                 long timeDiffToNew = newer.date - currentTime;
 
                 double currentBg = newer.value - (double) timeDiffToNew / (newer.date - older.date) * bgDelta;
-                BgReading newBgreading = new BgReading(injector);
-                newBgreading.date = currentTime;
-                newBgreading.value = Math.round(currentBg);
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
+                newBgreading.setTimestamp(currentTime);
+                newBgreading.setValue(Math.round(currentBg));
                 bucketed_data.add(newBgreading);
                 //log.debug("BG: " + newBgreading.value + " (" + new Date(newBgreading.date).toLocaleString() + ") Prev: " + older.value + " (" + new Date(older.date).toLocaleString() + ") Newer: " + newer.value + " (" + new Date(newer.date).toLocaleString() + ")");
             }
@@ -367,7 +367,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         }
 
         bucketed_data = new ArrayList<>();
-        bucketed_data.add(bgReadings.get(0));
+        bucketed_data.add(new InMemoryGlucoseValue(bgReadings.get(0)));
         getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgReadings.get(0).date) + " lastbgTime: " + "none-first-value" + " " + bgReadings.get(0).toString());
         int j = 0;
         for (int i = 1; i < bgReadings.size(); ++i) {
@@ -388,12 +388,12 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 while (elapsed_minutes > 5) {
                     nextbgTime = lastbgTime - 5 * 60 * 1000;
                     j++;
-                    BgReading newBgreading = new BgReading(injector);
-                    newBgreading.date = nextbgTime;
+                    InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
+                    newBgreading.setTimestamp(nextbgTime);
                     double gapDelta = bgReadings.get(i).value - lastbg;
                     //console.error(gapDelta, lastbg, elapsed_minutes);
                     double nextbg = lastbg + (5d / elapsed_minutes * gapDelta);
-                    newBgreading.value = Math.round(nextbg);
+                    newBgreading.setValue(Math.round(nextbg));
                     //console.error("Interpolated", bucketed_data[j]);
                     bucketed_data.add(newBgreading);
                     getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
@@ -403,38 +403,38 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     lastbgTime = nextbgTime;
                 }
                 j++;
-                BgReading newBgreading = new BgReading(injector);
-                newBgreading.value = bgReadings.get(i).value;
-                newBgreading.date = bgTime;
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
+                newBgreading.setValue(bgReadings.get(i).value);
+                newBgreading.setTimestamp(bgTime);
                 bucketed_data.add(newBgreading);
                 getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else if (Math.abs(elapsed_minutes) > 2) {
                 j++;
-                BgReading newBgreading = new BgReading(injector);
-                newBgreading.value = bgReadings.get(i).value;
-                newBgreading.date = bgTime;
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
+                newBgreading.setValue(bgReadings.get(i).value);
+                newBgreading.setTimestamp(bgTime);
                 bucketed_data.add(newBgreading);
                 getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else {
-                bucketed_data.get(j).value = (bucketed_data.get(j).value + bgReadings.get(i).value) / 2;
+                bucketed_data.get(j).setValue((bucketed_data.get(j).getValue() + bgReadings.get(i).value) / 2);
                 //log.error("***** Average");
             }
         }
 
         // Normalize bucketed data
         for (int i = bucketed_data.size() - 2; i >= 0; i--) {
-            BgReading current = bucketed_data.get(i);
-            BgReading previous = bucketed_data.get(i + 1);
-            long msecDiff = current.date - previous.date;
+            InMemoryGlucoseValue current = bucketed_data.get(i);
+            InMemoryGlucoseValue previous = bucketed_data.get(i + 1);
+            long msecDiff = current.getTimestamp() - previous.getTimestamp();
             long adjusted = (msecDiff - T.mins(5).msecs()) / 1000;
-            getAapsLogger().debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.date) + " to: " + DateUtil.toISOString(previous.date + T.mins(5).msecs()) + " by " + adjusted + " sec");
+            getAapsLogger().debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.getTimestamp()) + " to: " + DateUtil.toISOString(previous.getTimestamp() + T.mins(5).msecs()) + " by " + adjusted + " sec");
             if (Math.abs(adjusted) > 90) {
                 // too big adjustment, fallback to non 5 min data
                 getAapsLogger().debug(LTag.AUTOSENS, "Fallback to non 5 min data");
                 createBucketedDataRecalculated();
                 return;
             }
-            current.date = previous.date + T.mins(5).msecs();
+            current.setTimestamp(previous.getTimestamp() + T.mins(5).msecs());
         }
 
         getAapsLogger().debug(LTag.AUTOSENS, "Bucketed data created. Size: " + bucketed_data.size());
@@ -551,8 +551,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         if (bucketed_data == null)
             return null;
         for (int index = 0; index < bucketed_data.size(); index++) {
-            if (bucketed_data.get(index).date <= time)
-                return bucketed_data.get(index).date;
+            if (bucketed_data.get(index).getTimestamp() <= time)
+                return bucketed_data.get(index).getTimestamp();
         }
         return null;
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
index e0e6edf0c4..431d27f63c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java
@@ -119,7 +119,7 @@ public class IobCobOref1Thread extends Thread {
                     iobCobCalculatorPlugin.createBucketedData();
                     rxBus.send(new EventAutosensBgLoaded(cause));
                 }
-                List<BgReading> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
+                List<InMemoryGlucoseValue> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
                 if (bucketed_data == null || bucketed_data.size() < 3) {
@@ -127,7 +127,7 @@ public class IobCobOref1Thread extends Thread {
                     return;
                 }
 
-                long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
+                long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).getTimestamp());
                 aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + dateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
@@ -141,7 +141,7 @@ public class IobCobOref1Thread extends Thread {
                         return;
                     }
                     // check if data already exists
-                    long bgTime = bucketed_data.get(i).date;
+                    long bgTime = bucketed_data.get(i).getTimestamp();
                     bgTime = IobCobCalculatorPlugin.roundUpTime(bgTime);
                     if (bgTime > IobCobCalculatorPlugin.roundUpTime(now()))
                         continue;
@@ -173,14 +173,14 @@ public class IobCobOref1Thread extends Thread {
                     double bg;
                     double avgDelta;
                     double delta;
-                    bg = bucketed_data.get(i).value;
-                    if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
+                    bg = bucketed_data.get(i).getValue();
+                    if (bg < 39 || bucketed_data.get(i + 3).getValue() < 39) {
                         aapsLogger.error("! value < 39");
                         continue;
                     }
                     autosensData.bg = bg;
-                    delta = (bg - bucketed_data.get(i + 1).value);
-                    avgDelta = (bg - bucketed_data.get(i + 3).value) / 3;
+                    delta = (bg - bucketed_data.get(i + 1).getValue());
+                    avgDelta = (bg - bucketed_data.get(i + 3).getValue()) / 3;
 
                     IobTotal iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTemps(bgTime, profile);
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
index 8cdb88c817..d2d73c1ba9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobThread.java
@@ -116,7 +116,7 @@ public class IobCobThread extends Thread {
                     iobCobCalculatorPlugin.createBucketedData();
                     rxBus.send(new EventAutosensBgLoaded(cause));
                 }
-                List<BgReading> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
+                List<InMemoryGlucoseValue> bucketed_data = iobCobCalculatorPlugin.getBucketedData();
                 LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
                 if (bucketed_data == null || bucketed_data.size() < 3) {
@@ -124,7 +124,7 @@ public class IobCobThread extends Thread {
                     return;
                 }
 
-                long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).date);
+                long prevDataTime = IobCobCalculatorPlugin.roundUpTime(bucketed_data.get(bucketed_data.size() - 3).getTimestamp());
                 aapsLogger.debug(LTag.AUTOSENS, "Prev data time: " + dateUtil.dateAndTimeString(prevDataTime));
                 AutosensData previous = autosensDataTable.get(prevDataTime);
                 // start from oldest to be able sub cob
@@ -138,7 +138,7 @@ public class IobCobThread extends Thread {
                         return;
                     }
                     // check if data already exists
-                    long bgTime = bucketed_data.get(i).date;
+                    long bgTime = bucketed_data.get(i).getTimestamp();
                     bgTime = IobCobCalculatorPlugin.roundUpTime(bgTime);
                     if (bgTime > IobCobCalculatorPlugin.roundUpTime(now()))
                         continue;
@@ -170,14 +170,14 @@ public class IobCobThread extends Thread {
                     double bg;
                     double avgDelta;
                     double delta;
-                    bg = bucketed_data.get(i).value;
-                    if (bg < 39 || bucketed_data.get(i + 3).value < 39) {
+                    bg = bucketed_data.get(i).getValue();
+                    if (bg < 39 || bucketed_data.get(i + 3).getValue() < 39) {
                         aapsLogger.error("! value < 39");
                         continue;
                     }
                     autosensData.bg = bg;
-                    delta = (bg - bucketed_data.get(i + 1).value);
-                    avgDelta = (bg - bucketed_data.get(i + 3).value) / 3;
+                    delta = (bg - bucketed_data.get(i + 1).getValue());
+                    avgDelta = (bg - bucketed_data.get(i + 3).getValue()) / 3;
 
                     IobTotal iob = iobCobCalculatorPlugin.calculateFromTreatmentsAndTemps(bgTime, profile);
 

From fbb15cac7036e9d35f9a655ebaa7f48b428ec1b7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 2 Jun 2020 22:47:32 +0200
Subject: [PATCH 178/400] fix tests

---
 .../IobCobCalculatorPluginTest.kt             | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
index a34d8b5022..93a30ca973 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
@@ -143,8 +143,8 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(bgReadingList[3].date, iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(bgReadingList[3].date, iobCobCalculatorPlugin.bucketedData[3].timestamp)
         Assert.assertEquals(bgReadingList.size.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
 
         // Missing value should be replaced
@@ -155,8 +155,8 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(bgReadingList[2].date, iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(bgReadingList[0].date, iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(bgReadingList[2].date, iobCobCalculatorPlugin.bucketedData[3].timestamp)
         Assert.assertEquals(bgReadingList.size + 1.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
 
         // drift should be cleared
@@ -169,10 +169,10 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(T.mins(15).msecs(), iobCobCalculatorPlugin.bucketedData[1].date)
-        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.bucketedData[2].date)
-        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.bucketedData[3].date)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(T.mins(15).msecs(), iobCobCalculatorPlugin.bucketedData[1].timestamp)
+        Assert.assertEquals(T.mins(10).msecs(), iobCobCalculatorPlugin.bucketedData[2].timestamp)
+        Assert.assertEquals(T.mins(5).msecs(), iobCobCalculatorPlugin.bucketedData[3].timestamp)
         Assert.assertEquals(bgReadingList.size.toLong(), iobCobCalculatorPlugin.bucketedData.size.toLong())
 
         // bucketed data should return null if not enough bg data
@@ -192,8 +192,8 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].date)
+        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].timestamp)
         Assert.assertEquals(7, iobCobCalculatorPlugin.bucketedData.size.toLong())
         Assert.assertEquals(100.0, iobCobCalculatorPlugin.bucketedData[0].value, 1.0)
         Assert.assertEquals(90.0, iobCobCalculatorPlugin.bucketedData[1].value, 1.0)
@@ -208,8 +208,8 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(false, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].date)
+        Assert.assertEquals(T.mins(50).msecs(), iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(T.mins(20).msecs(), iobCobCalculatorPlugin.bucketedData[6].timestamp)
         Assert.assertEquals(7, iobCobCalculatorPlugin.bucketedData.size.toLong())
         Assert.assertEquals(100.0, iobCobCalculatorPlugin.bucketedData[0].value, 1.0)
         Assert.assertEquals(90.0, iobCobCalculatorPlugin.bucketedData[1].value, 1.0)
@@ -342,8 +342,8 @@ class IobCobCalculatorPluginTest : TestBase() {
         iobCobCalculatorPlugin.bgReadings = bgReadingList
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
-        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T13:34:57Z").time, iobCobCalculatorPlugin.bucketedData[0].date)
-        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T03:44:57Z").time, iobCobCalculatorPlugin.bucketedData[iobCobCalculatorPlugin.bucketedData.size - 1].date)
+        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T13:34:57Z").time, iobCobCalculatorPlugin.bucketedData[0].timestamp)
+        Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T03:44:57Z").time, iobCobCalculatorPlugin.bucketedData[iobCobCalculatorPlugin.bucketedData.size - 1].timestamp)
 
         // 5min 4sec data
         bgReadingList.clear()

From 064389d066f66bc17665cab485f3975db012f8e8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 4 Jun 2020 14:34:40 +0200
Subject: [PATCH 179/400] fix HistoryBrowser crash

---
 .../historyBrowser/HistoryBrowseActivity.kt   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index f484c086a3..0fdf8b6068 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -338,19 +338,20 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             }
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()
-            for (g in 0 until secondaryGraphs.size) {
-                secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
-                secondaryGraphs[g].visibility = (!bgOnly && (
-                    overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
-                        overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
-                    )).toVisibility()
-                secondaryGraphsData[g].performUpdate()
-            }
+            if (!bgOnly)
+                for (g in 0 until secondaryGraphs.size) {
+                    secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
+                    secondaryGraphs[g].visibility = (!bgOnly && (
+                        overviewMenus.setting[g + 1][OverviewMenus.CharType.IOB.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.COB.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEV.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.SEN.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ACT.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||
+                            overviewMenus.setting[g + 1][OverviewMenus.CharType.DEVSLOPE.ordinal]
+                        )).toVisibility()
+                    secondaryGraphsData[g].performUpdate()
+                }
         }
     }
 }
\ No newline at end of file

From 8b45464f30c9d54e9aaa5750571ddad707b75494 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 4 Jun 2020 16:24:53 +0200
Subject: [PATCH 180/400] secondary graphs layout improvements

---
 .../historyBrowser/HistoryBrowseActivity.kt   | 22 ++++++---
 .../general/overview/OverviewFragment.kt      | 46 +++++++------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index 0fdf8b6068..79fa0c4446 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import android.widget.TextView
 import com.jjoe64.graphview.GraphView
 import dagger.android.HasAndroidInjector
@@ -222,19 +223,28 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             secondaryGraphsLabel.clear()
             history_iobgraph.removeAllViews()
             for (i in 1 until numOfGraphs) {
-                val label = TextView(this)
-                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -50) }
-                history_iobgraph.addView(label)
-                secondaryGraphsLabel.add(label)
+                val relativeLayout = RelativeLayout(this)
+                relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
                 val graph = GraphView(this)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, 0, 0, resourceHelper.dpToPx(10)) }
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(100)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
                 graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
                 graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
                 graph.gridLabelRenderer?.numVerticalLabels = 3
                 graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray
-                history_iobgraph.addView(graph)
+                relativeLayout.addView(graph)
+
+                val label = TextView(this)
+                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
+                label.layoutParams = layoutParams
+                relativeLayout.addView(label)
+                secondaryGraphsLabel.add(label)
+
+                history_iobgraph.addView(relativeLayout)
                 secondaryGraphs.add(graph)
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 6a7952d167..2488a5e2ec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -19,6 +19,7 @@ import android.view.View
 import android.view.View.OnLongClickListener
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.text.toSpanned
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -478,19 +479,28 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             secondaryGraphsLabel.clear()
             overview_iobgraph.removeAllViews()
             for (i in 1 until numOfGraphs) {
-                val label = TextView(context)
-                label.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(100, 0, 0, -120) }
-                overview_iobgraph.addView(label)
-                secondaryGraphsLabel.add(label)
+                val relativeLayout = RelativeLayout(context)
+                relativeLayout.layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
                 val graph = GraphView(context)
-                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(35), 0, resourceHelper.dpToPx(15)) }
+                graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resourceHelper.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, resourceHelper.dpToPx(15), 0, resourceHelper.dpToPx(10)) }
                 graph.gridLabelRenderer?.gridColor = resourceHelper.gc(R.color.graphgrid)
                 graph.gridLabelRenderer?.reloadStyles()
                 graph.gridLabelRenderer?.isHorizontalLabelsVisible = false
                 graph.gridLabelRenderer?.labelVerticalWidth = axisWidth
                 graph.gridLabelRenderer?.numVerticalLabels = 3
                 graph.viewport.backgroundColor = Color.argb(20, 255, 255, 255) // 8% of gray
-                overview_iobgraph.addView(graph)
+                relativeLayout.addView(graph)
+
+                val label = TextView(context)
+                val layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).also { it.setMargins(resourceHelper.dpToPx(30), resourceHelper.dpToPx(25), 0, 0) }
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP)
+                layoutParams.addRule(RelativeLayout.ALIGN_PARENT_LEFT)
+                label.layoutParams = layoutParams
+                relativeLayout.addView(label)
+                secondaryGraphsLabel.add(label)
+
+                overview_iobgraph.addView(relativeLayout)
                 secondaryGraphs.add(graph)
             }
         }
@@ -583,65 +593,41 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 loopPlugin.isEnabled() && loopPlugin.isSuperBolus                       -> {
                     overview_apsmode.setImageResource(R.drawable.loop_superbolus)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
-                    //overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend())
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                 }
 
                 loopPlugin.isDisconnected                                               -> {
                     overview_apsmode.setImageResource(R.drawable.loop_disconnected)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
-//                    overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend())
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextCritical))
                 }
 
                 loopPlugin.isEnabled() && loopPlugin.isSuspended                        -> {
                     overview_apsmode.setImageResource(R.drawable.loop_paused)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
-//                    overview_apsmode_text?.text = String.format(resourceHelper.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                 }
 
                 pump.isSuspended                                                        -> {
                     overview_apsmode.setImageResource(R.drawable.loop_paused)
                     overview_apsmode_text?.text = ""
-//                    overview_apsmode_text?.text = resourceHelper.gs(R.string.pumpsuspended)
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonWarning))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> {
                     overview_apsmode.setImageResource(R.drawable.loop_lgs)
                     overview_apsmode_text?.text = ""
-//                    overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value()                     -> {
                     overview_apsmode.setImageResource(R.drawable.loop_closed)
                     overview_apsmode_text?.text = ""
-//                    overview_apsmode_text?.text = resourceHelper.gs(R.string.closedloop)
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                 }
 
                 loopPlugin.isEnabled() && !closedLoopEnabled.value()                    -> {
                     overview_apsmode.setImageResource(R.drawable.loop_open)
                     overview_apsmode_text?.text = ""
-//                    overview_apsmode_text?.text = resourceHelper.gs(R.string.openloop)
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonDefault))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextDefault))
                 }
 
                 else                                                                    -> {
                     overview_apsmode.setImageResource(R.drawable.loop_disabled)
                     overview_apsmode_text?.text = ""
-//                    overview_apsmode_text?.text = resourceHelper.gs(R.string.disabledloop)
-//                    overview_apsmode_text?.setBackgroundColor(resourceHelper.gc(R.color.ribbonCritical))
-//                    overview_apsmode_text?.setTextColor(resourceHelper.gc(R.color.ribbonTextCritical))
                 }
             }
         } else {

From ac9c4ec77df65c960c2ac83a2cb34c459ca0e697 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Wed, 10 Jun 2020 15:29:51 +0200
Subject: [PATCH 181/400] Delete Double identical strings in app folder already
 exist in core

---
 app/src/main/res/values/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01a74eb73e..9270f40166 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -135,8 +135,6 @@
     <string name="loop_constraintsprocessed_label">After processed constraints</string>
     <string name="loop_tbrsetbypump_label">Temp basal set by pump</string>
     <string name="openapsma_lastenact_label">Last enacted</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
     <string name="noapsselected">NO APS SELECTED OR PROVIDED RESULT</string>
     <string name="safety">Safety</string>
     <string name="openapsma_disabled">Plugin is disabled</string>
@@ -147,8 +145,6 @@
     <string name="overview_treatment_label">Treatment</string>
     <string name="overview_calculator_label">Calculator</string>
     <string name="constraintapllied">Constraint applied!</string>
-    <string name="confirmation">Confirmation</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -1471,7 +1467,6 @@
     <string name="invalidweight">Invalid weight entry</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Average</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Activity monitor</string>
     <string name="doyouwantresetstats">Do you want to reset activity stats?</string>

From ac98f2e14488e0958a2fef82a7127eea7c92dcdb Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Wed, 10 Jun 2020 15:38:26 +0200
Subject: [PATCH 182/400] Rename Exam double Strings

---
 .../constraints/objectives/objectives/Objective2.java       | 6 +++---
 app/src/main/res/values/exam.xml                            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
index 68c9ee7112..62eb212ee3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.java
@@ -19,7 +19,7 @@ public class Objective2 extends Objective {
 
     @Override
     protected void setupTasks(List<Task> tasks) {
-        tasks.add(new ExamTask(R.string.dia_label, R.string.dia_whatmeansdia,"dia")
+        tasks.add(new ExamTask(R.string.dia_label_exam, R.string.dia_whatmeansdia,"dia")
                 .option(new Option(R.string.dia_minimumis3h, false))
                 .option(new Option(R.string.dia_minimumis5h, true))
                 .option(new Option(R.string.dia_meaningisequaltodiapump, false))
@@ -160,7 +160,7 @@ public class Objective2 extends Objective {
                 .option(new Option(R.string.nsclient_spikeiphone, true))
                 .hint(new Hint(R.string.nsclient_hint1))
         );
-        tasks.add(new ExamTask(R.string.isf_label, R.string.whatistrue,"isf")
+        tasks.add(new ExamTask(R.string.isf_label_exam, R.string.whatistrue,"isf")
                 .option(new Option(R.string.isf_increasingvalue, true))
                 .option(new Option(R.string.isf_decreasingvalue, false))
                 .option(new Option(R.string.isf_noeffect, false))
@@ -169,7 +169,7 @@ public class Objective2 extends Objective {
                 .hint(new Hint(R.string.isf_hint1))
                 .hint(new Hint(R.string.isf_hint2))
         );
-        tasks.add(new ExamTask(R.string.ic_label, R.string.whatistrue,"ic")
+        tasks.add(new ExamTask(R.string.ic_label_exam, R.string.whatistrue,"ic")
                 .option(new Option(R.string.ic_increasingvalue, true))
                 .option(new Option(R.string.ic_decreasingvalue, false))
                 .option(new Option(R.string.ic_noeffect, false))
diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 356f97a00f..49dc294fa1 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">What is true about DIA?</string>
-    <string name="dia_label">Topic: Duration of Insulin Action</string>
+    <string name="dia_label_exam">Topic: Duration of Insulin Action</string>
     <string name="dia_minimumis3h">The minimum value is 3 hours.</string>
     <string name="dia_minimumis5h">The minimum value is 5 hours.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +122,7 @@
     <string name="nsclient_looponiphone">Loop app on iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app on iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Topic: Insulin Sensitivity Factor</string>
+    <string name="isf_label_exam">Topic: Insulin Sensitivity Factor</string>
     <string name="isf_increasingvalue">Higher ISF values lead to less insulin delivery when AAPS corrects for high BG.</string>
     <string name="isf_decreasingvalue">Lower ISF values lead to less insulin delivery when AAPS corrects for high BG.</string>
     <string name="isf_noeffect">Changing ISF values has no effect on the amount of insulin delivered when AAPS corrects for high BG.</string>
@@ -130,7 +130,7 @@
     <string name="isf_profile">Changing the ISF value in your profile is enough to apply the change.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Topic: The IC Ratio</string>
+    <string name="ic_label_exam">Topic: The IC Ratio</string>
     <string name="ic_increasingvalue">Higher IC ratios lead to less insulin delivered for a given amount of carbs.</string>
     <string name="ic_decreasingvalue">Lower IC ratios lead to less insulin delivered for a given amount of carbs.</string>
     <string name="ic_noeffect">If you have 0 COB, changing the IC ratio will lead to a different amount of insulin to correct a given BG value.</string>

From af085e4cc732a1a0e78a08c2d827706cad025163 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Wed, 10 Jun 2020 16:00:03 +0200
Subject: [PATCH 183/400] double strings with different text I renamed weight
 to keep it (consistency in layout with ":") and I deleted mins in app/strings

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

diff --git a/app/src/main/res/layout/survey_activity.xml b/app/src/main/res/layout/survey_activity.xml
index 868995c2d5..d465a88663 100644
--- a/app/src/main/res/layout/survey_activity.xml
+++ b/app/src/main/res/layout/survey_activity.xml
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:labelFor="@+id/survey_weight"
-                    android:text="@string/weight"
+                    android:text="@string/weight_label"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
                 <EditText
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9270f40166..b033a9d76e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1158,7 +1158,6 @@
     <string name="recurringTime">Recurring time</string>
     <string name="every">Every</string>
     <string name="never">Never</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Condition:</string>
     <string name="action">Action:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1457,7 +1456,7 @@
     <string name="reorder_label">Reorder</string>
 
     <string name="age">Age:</string>
-    <string name="weight">Weight:</string>
+    <string name="weight_label">Weight:</string>
     <string name="id">ID:</string>
     <string name="submit">Submit</string>
     <string name="mostcommonprofile">Most common profile:</string>

From 8d2139fb59ee2babfeac958a107e8884f8fe7eb6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 11:34:33 +0200
Subject: [PATCH 184/400] history browser x-axis fix

---
 .../historyBrowser/HistoryBrowseActivity.kt          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
index 79fa0c4446..df22cabde6 100644
--- a/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/historyBrowser/HistoryBrowseActivity.kt
@@ -113,9 +113,13 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
         val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
             val cal = Calendar.getInstance()
             cal.timeInMillis = start
-            cal.set(Calendar.YEAR, year)
-            cal.set(Calendar.MONTH, monthOfYear)
-            cal.set(Calendar.DAY_OF_MONTH, dayOfMonth)
+            cal[Calendar.YEAR] = year
+            cal[Calendar.MONTH] = monthOfYear
+            cal[Calendar.DAY_OF_MONTH] = dayOfMonth
+            cal[Calendar.MILLISECOND] = 0
+            cal[Calendar.SECOND] = 0
+            cal[Calendar.MINUTE] = 0
+            cal[Calendar.HOUR_OF_DAY] = 0
             start = cal.timeInMillis
             historybrowse_date?.text = dateUtil.dateAndTimeString(start)
             runCalculation("onClickDate")
@@ -282,7 +286,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
             // do preparation in different thread
             withContext(Dispatchers.Default) {
                 val fromTime: Long = start + T.secs(100).msecs()
-                val toTime: Long = start + T.hours(rangeToDisplay.toLong()).msecs()
+                val toTime: Long = start + T.hours(rangeToDisplay.toLong()).msecs() + T.secs(100).msecs()
                 aapsLogger.debug(LTag.UI, "Period: " + dateUtil.dateAndTimeString(fromTime) + " - " + dateUtil.dateAndTimeString(toTime))
                 val pointer = System.currentTimeMillis()
 

From 5432fce13d27aa650466436a170060311e4322c6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 11:45:06 +0200
Subject: [PATCH 185/400] statuslights scale

---
 app/src/main/res/layout/overview_statuslights_layout.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml
index 930f996736..13b9fd1815 100644
--- a/app/src/main/res/layout/overview_statuslights_layout.xml
+++ b/app/src/main/res/layout/overview_statuslights_layout.xml
@@ -16,6 +16,8 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:scaleType="centerInside"
+        android:scaleX="2"
+        android:scaleY="2"
         android:src="@drawable/icon_cp_age_canula" />
 
     <TextView
@@ -33,6 +35,8 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:scaleType="centerInside"
+        android:scaleX="2"
+        android:scaleY="2"
         android:src="@drawable/icon_cp_age_insulin" />
 
     <TextView
@@ -57,6 +61,8 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:scaleType="centerInside"
+        android:scaleX="2"
+        android:scaleY="2"
         android:src="@drawable/icon_cp_age_sensor" />
 
     <TextView
@@ -74,6 +80,8 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:scaleType="centerInside"
+        android:scaleX="2"
+        android:scaleY="2"
         android:src="@drawable/icon_cp_age_battery" />
 
     <TextView

From deb99f236b730bc2b982afd3f3cb901e0cfc71cd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 12:26:38 +0200
Subject: [PATCH 186/400] better automation logging

---
 .../plugins/general/automation/AutomationPlugin.kt           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index b4f9ec425e..bde4182aef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -177,10 +177,9 @@ class AutomationPlugin @Inject constructor(
 
     @Synchronized
     private fun processActions() {
-        if (!isEnabled(PluginType.GENERAL))
-            return
-        if (loopPlugin.isSuspended || !loopPlugin.isEnabled(PluginType.LOOP)) {
+        if (loopPlugin.isSuspended || !loopPlugin.isEnabled()) {
             aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated")
+            executionLog.add(resourceHelper.gs(R.string.smscommunicator_loopisdisabled))
             return
         }
         val enabled = constraintChecker.isAutomationEnabled()

From 17d71d218b4f623f75a5cba4efbcba33f24a45d8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 14:55:29 +0200
Subject: [PATCH 187/400] allow RandomBg upload

---
 .../androidaps/plugins/source/RandomBgPlugin.kt    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index 763d5a7fb4..12af6cfe04 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -12,12 +12,14 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.extensions.isRunningTest
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -29,13 +31,14 @@ class RandomBgPlugin @Inject constructor(
     injector: HasAndroidInjector,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val virtualPumpPlugin: VirtualPumpPlugin,
-    private val buildHelper: BuildHelper
+    private val sp: SP,
+    private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
     .pluginName(R.string.randombg)
     .shortName(R.string.randombg_short)
+    .preferencesId(R.xml.pref_bgsource)
     .description(R.string.description_source_randombg),
     aapsLogger, resourceHelper, injector
 ), BgSourceInterface {
@@ -85,7 +88,12 @@ class RandomBgPlugin @Inject constructor(
         bgReading.value = bgMgdl
         bgReading.date = DateUtil.now()
         bgReading.raw = bgMgdl
-        MainApp.getDbHelper().createIfNotExists(bgReading, "RandomBG")
+        if (MainApp.getDbHelper().createIfNotExists(bgReading, "RandomBG")) {
+            if (sp.getBoolean(R.string.key_dexcomg5_nsupload, false))
+                nsUpload.uploadBg(bgReading, "AndroidAPS-RandomBG")
+            if (sp.getBoolean(R.string.key_dexcomg5_xdripupload, false))
+                nsUpload.sendToXdrip(bgReading)
+        }
         aapsLogger.debug(LTag.BGSOURCE, "Generated BG: $bgReading")
     }
 }

From ced103b77eefc4cac5274b1bee1cf2d1aca4371c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 20:03:31 +0200
Subject: [PATCH 188/400] New Crowdin translations (#2695)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Welsh)

* New translations insight_alert_codes.xml (Welsh)

* New translations insight_alert_descriptions.xml (Welsh)

* New translations insight_alert_titles.xml (Welsh)

* New translations insight_exceptions.xml (Welsh)

* New translations exam.xml (Welsh)

* New translations objectives.xml (Welsh)

* New translations strings.xml (Welsh)

* New translations protection.xml (Welsh)

* New translations strings.xml (Welsh)

* New translations strings.xml (Welsh)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Arabic)

* New translations insight_alert_codes.xml (Arabic)

* New translations insight_alert_descriptions.xml (Arabic)

* New translations insight_alert_titles.xml (Arabic)

* New translations insight_exceptions.xml (Arabic)

* New translations exam.xml (Arabic)

* New translations objectives.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations protection.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations objectives.xml (Dutch)

* New translations strings.xml (Bulgarian)

* New translations protection.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Czech)

* New translations strings.xml (German)
---
 app/src/main/res/values-ar-rSA/exam.xml       |   2 +
 .../res/values-ar-rSA/insight_alert_codes.xml |   2 +
 .../insight_alert_descriptions.xml            |   2 +
 .../values-ar-rSA/insight_alert_titles.xml    |   2 +
 .../res/values-ar-rSA/insight_exceptions.xml  |   2 +
 app/src/main/res/values-ar-rSA/objectives.xml |   2 +
 app/src/main/res/values-ar-rSA/protection.xml |   2 +
 app/src/main/res/values-ar-rSA/strings.xml    |  29 ++++
 app/src/main/res/values-cs-rCZ/strings.xml    |  12 ++
 app/src/main/res/values-cy-rGB/exam.xml       |   2 +
 .../res/values-cy-rGB/insight_alert_codes.xml |   2 +
 .../insight_alert_descriptions.xml            |   2 +
 .../values-cy-rGB/insight_alert_titles.xml    |   2 +
 .../res/values-cy-rGB/insight_exceptions.xml  |   2 +
 app/src/main/res/values-cy-rGB/objectives.xml |   2 +
 app/src/main/res/values-cy-rGB/protection.xml |   2 +
 app/src/main/res/values-cy-rGB/strings.xml    |  29 ++++
 app/src/main/res/values-de-rDE/strings.xml    |   8 +-
 app/src/main/res/values-fr-rFR/strings.xml    |  33 +++-
 app/src/main/res/values-lt-rLT/strings.xml    |  17 ++
 app/src/main/res/values-nl-rNL/objectives.xml |   2 +
 app/src/main/res/values-nl-rNL/protection.xml |  15 +-
 app/src/main/res/values-nl-rNL/strings.xml    |   3 +-
 app/src/main/res/values-pl-rPL/strings.xml    |  13 ++
 app/src/main/res/values-pt-rBR/strings.xml    |   3 +
 app/src/main/res/values-pt-rPT/strings.xml    |   5 +
 app/src/main/res/values-ru-rRU/strings.xml    |   3 +
 app/src/main/res/values-sk-rSK/strings.xml    |   9 +
 core/src/main/res/values-ar-rSA/strings.xml   |  20 +++
 core/src/main/res/values-cy-rGB/strings.xml   |  20 +++
 core/src/main/res/values-de-rDE/strings.xml   |   1 +
 core/src/main/res/values-nl-rNL/strings.xml   | 160 ++++++++++++++++++
 core/src/main/res/values-pl-rPL/strings.xml   |  87 ++++++++++
 dana/src/main/res/values-ar-rSA/strings.xml   |   2 +
 dana/src/main/res/values-bg-rBG/strings.xml   |  21 ++-
 dana/src/main/res/values-cy-rGB/strings.xml   |   2 +
 dana/src/main/res/values-nl-rNL/strings.xml   | 121 ++++++++++++-
 wear/src/main/res/values-ar-rSA/strings.xml   |   2 +
 wear/src/main/res/values-cy-rGB/strings.xml   |   2 +
 39 files changed, 634 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/values-ar-rSA/exam.xml
 create mode 100644 app/src/main/res/values-ar-rSA/insight_alert_codes.xml
 create mode 100644 app/src/main/res/values-ar-rSA/insight_alert_descriptions.xml
 create mode 100644 app/src/main/res/values-ar-rSA/insight_alert_titles.xml
 create mode 100644 app/src/main/res/values-ar-rSA/insight_exceptions.xml
 create mode 100644 app/src/main/res/values-ar-rSA/objectives.xml
 create mode 100644 app/src/main/res/values-ar-rSA/protection.xml
 create mode 100644 app/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 app/src/main/res/values-cy-rGB/exam.xml
 create mode 100644 app/src/main/res/values-cy-rGB/insight_alert_codes.xml
 create mode 100644 app/src/main/res/values-cy-rGB/insight_alert_descriptions.xml
 create mode 100644 app/src/main/res/values-cy-rGB/insight_alert_titles.xml
 create mode 100644 app/src/main/res/values-cy-rGB/insight_exceptions.xml
 create mode 100644 app/src/main/res/values-cy-rGB/objectives.xml
 create mode 100644 app/src/main/res/values-cy-rGB/protection.xml
 create mode 100644 app/src/main/res/values-cy-rGB/strings.xml
 create mode 100644 core/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 core/src/main/res/values-cy-rGB/strings.xml
 create mode 100644 dana/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 dana/src/main/res/values-cy-rGB/strings.xml
 create mode 100644 wear/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 wear/src/main/res/values-cy-rGB/strings.xml

diff --git a/app/src/main/res/values-ar-rSA/exam.xml b/app/src/main/res/values-ar-rSA/exam.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/exam.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/insight_alert_codes.xml b/app/src/main/res/values-ar-rSA/insight_alert_codes.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/insight_alert_codes.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/insight_alert_descriptions.xml b/app/src/main/res/values-ar-rSA/insight_alert_descriptions.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/insight_alert_descriptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/insight_alert_titles.xml b/app/src/main/res/values-ar-rSA/insight_alert_titles.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/insight_alert_titles.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/insight_exceptions.xml b/app/src/main/res/values-ar-rSA/insight_exceptions.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/insight_exceptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/objectives.xml b/app/src/main/res/values-ar-rSA/objectives.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/objectives.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/protection.xml b/app/src/main/res/values-ar-rSA/protection.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/protection.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..70cc9c5d48
--- /dev/null
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- Pump Abstract -->
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!-- MDT Pump Status -->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index c395dac6e2..68aa7385b8 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -256,6 +256,9 @@
     <string name="smscommunicator_loopisenabled">Smyčka je povolena</string>
     <string name="valuelimitedto">%1$.2f omezeno na %2$.2f</string>
     <string name="valueoutofrange">Hodnota %1$s je mimo přednastavený rozsah</string>
+    <string name="smscommunicator_pumpconnectfail">Připojení k pumpě selhalo</string>
+    <string name="smscommunicator_pumpdisconnected">Pumpa odpojena</string>
+    <string name="smscommunicator_reconnect">Pumpa byla znovu připojena</string>
     <string name="smscommunicator_remotecommandnotallowed">Vzdálený příkaz není povolen</string>
     <string name="smscommunicator_remotebolusnotallowed">Vzdálený bolus není momentálně povolen. Zkuste to později.</string>
     <string name="smscommunicator_basalreplywithcode">Pro spuštění bazálu %1$.2fU/h na %2$d min odpovězte SMS s kódem %3$s</string>
@@ -452,8 +455,14 @@
     <string name="statuslights_res_critical">Úroveň kritického varování stavu zásobníku [U]</string>
     <string name="statuslights_bat_warning">Úroveň varování stavu baterie [%]</string>
     <string name="statuslights_bat_critical">Úroveň kritického varování stavu baterie [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAZ</string>
+    <string name="deviation_shortname">ODCH</string>
+    <string name="activity_shortname">AKT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">O aplikaci</string>
     <string name="smscommunicator_missingsmspermission">Chybějící povolení SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Chybí oprávnění pro zjišťování stavu telefonu</string>
@@ -1280,6 +1289,9 @@
     <string name="statuslights">Stavové indikátory</string>
     <string name="statuslights_copy_ns">Zkopírovat nastavení z NS</string>
     <string name="copyexistingvalues">Zkopírovat nastavení NS (existuje-li)?</string>
+    <string name="classic_description">Původní vzhled</string>
+    <string name="buttonson_description">Tlačítka jsou vždy zobrazena v dolní části obrazovky</string>
+    <string name="largedisplay_description">Velký displej</string>
     <string name="skin">Vzhled</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-cy-rGB/exam.xml b/app/src/main/res/values-cy-rGB/exam.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/exam.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/insight_alert_codes.xml b/app/src/main/res/values-cy-rGB/insight_alert_codes.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/insight_alert_codes.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/insight_alert_descriptions.xml b/app/src/main/res/values-cy-rGB/insight_alert_descriptions.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/insight_alert_descriptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/insight_alert_titles.xml b/app/src/main/res/values-cy-rGB/insight_alert_titles.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/insight_alert_titles.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/insight_exceptions.xml b/app/src/main/res/values-cy-rGB/insight_exceptions.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/insight_exceptions.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/objectives.xml b/app/src/main/res/values-cy-rGB/objectives.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/objectives.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/protection.xml b/app/src/main/res/values-cy-rGB/protection.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/protection.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/app/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..70cc9c5d48
--- /dev/null
+++ b/app/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    <string name="fi_lang" translatable="false">Finnish</string> -->
+    <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
+    <!--    <string name="ga_lang" translatable="false">Irish</string> -->
+    <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
+    <!-- Pump Abstract -->
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!-- MDT Pump Status -->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- SMS Communicator & OTP Authenticator -->
+    <!-- Omnipod -->
+    <!-- Omnipod - Base -->
+    <!-- Omnipod Configuration -->
+    <!-- Omnipod - Fragment -->
+    <!-- Omnipod - Dialogs -->
+    <!-- Omnipod - Error -->
+    <!-- Omnipod - Pod Mgmt -->
+    <!-- Omnipod Dash -->
+    <!-- Omnipod - Base -->
+</resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4801ec3215..e2d8a45283 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -256,6 +256,11 @@
     <string name="smscommunicator_loopisenabled">Loop ist aktiviert.</string>
     <string name="valuelimitedto">%1$.2f limitiert auf %2$.2f</string>
     <string name="valueoutofrange">Wert %1$s ist außerhalb des festen Limits.</string>
+    <string name="smscommunicator_pumpconnectwithcode">Um die Pumpe zu verbinden, antworte mit dem Code %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Verbindung zur Pumpe fehlgeschlagen</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Um die Verbindung zur Pumpe für %1d Minuten zu trennen, antworte mit dem Code %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Verbindung zur Pumpe getrennt</string>
+    <string name="smscommunicator_reconnect">Verbindung zur Pumpe wiederhergestellt</string>
     <string name="smscommunicator_remotecommandnotallowed">Ferngesteuerte Befehle sind nicht erlaubt.</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolusabgabe aus der Ferne nicht verfügbar. Versuche es später erneut.</string>
     <string name="smscommunicator_basalreplywithcode">Um eine Basalrate von %1$.2fIE/h für %2$d Minuten zu setzen, antworte mit dem Code %3$s</string>
@@ -572,6 +577,7 @@
     <string name="uamsmbmaxminutes">UAM SMB max. Minuten</string>
     <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
     <string name="carbsReqThreshold">Schwellenwert für KH-Empfehlung</string>
+    <string name="carbsReqThreshold_summary">Falls Kohlenhydrate vorgeschlagen werden, Menge ab der eine Benachrichtigung angezeigt wird</string>
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
@@ -991,7 +997,7 @@ Unerwartetes Verhalten.</string>
     <string name="running_invalid_version">Wir haben festgestellt, dass Du eine ungültige Version verwendest. Loop deaktiviert!</string>
     <string name="old_version">Vorherige Version</string>
     <string name="very_old_version">sehr alte Version</string>
-    <string name="new_version_warning">Neue Version für mindestens %1$d Tage verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach %2$d Tagen, Loop wird nach  %3$d Tagen deaktiviert.</string>
+    <string name="new_version_warning">Neue Version seit mindestens %1$d Tagen verfügbar! Rückfall zur sensorunterstützten Pumpentherapie nach %2$d Tagen, Loop wird nach  %3$d Tagen deaktiviert.</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">gepatchte Dexcom App</string>
     <string name="dexcom_short">DXCM</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ecb04b75ca..a4a8a441ac 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -265,6 +265,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_carbsreplywithcode">Pour entrer %1$dg à %2$s renvoyer le code %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Pour démarrer la Basal %1$d%% pendant %2$d min, renvoyer le code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Envoyer le code %2$s pour suspendre la Boucle pour %1$d minutes</string>
+    <string name="smscommunicator_loopresumereplywithcode">Pour reprendre la veuillez répondre avec le code %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Pour activer la boucle veuillez répondre avec le code %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Pour désactiver la boucle veuillez répondre avec le code %1$s</string>
     <string name="smscommunicator_tempbasalset">Démarrage réussi pour %1$.2fU/h de basal temporaire pour %2$d min</string>
     <string name="smscommunicator_extendedset">Le Bolus étendu %1$.2fU pendant %2$d min a commencé avec succès</string>
     <string name="smscommunicator_carbsset">Les %1$dg de glucides entrés avec succès</string>
@@ -444,14 +447,20 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights_iage_critical">Seuil critique âge insuline [h]</string>
     <string name="statuslights_sage_warning">Seuil d\'alerte âge capteur [h]</string>
     <string name="statuslights_sage_critical">Seuil critique âge capteur [h]</string>
-    <string name="statuslights_bage_warning">Seuil d\'alerte niveau pile [h]</string>
-    <string name="statuslights_bage_critical">Seuil critique niveau pile [h]</string>
-    <string name="statuslights_res_warning">Seuil d\'avertissement de niveau du réservoir [U]</string>
-    <string name="statuslights_res_critical">Seuil critique de niveau du réservoir [U]</string>
-    <string name="statuslights_bat_warning">Seuil d’avertissement du niveau de batterie [%]</string>
-    <string name="statuslights_bat_critical">Seuil critique du niveau de la batterie [%]</string>
+    <string name="statuslights_bage_warning">Seuil d\'alerte âge pile [h]</string>
+    <string name="statuslights_bage_critical">Seuil critique âge pile [h]</string>
+    <string name="statuslights_res_warning">Seuil d\'alerte niveau réservoir [U]</string>
+    <string name="statuslights_res_critical">Seuil critique de niveau réservoir [U]</string>
+    <string name="statuslights_bat_warning">Seuil d’alerte niveau pile [%]</string>
+    <string name="statuslights_bat_critical">Seuil critique niveau pile [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IA</string>
     <string name="cob">GA</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">PENTEDEV</string>
     <string name="nav_about">À propos</string>
     <string name="smscommunicator_missingsmspermission">Autorisation SMS manquante</string>
     <string name="smscommunicator_missingphonestatepermission">Autorisation du téléphone manquante</string>
@@ -467,8 +476,10 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="careportal_canulaage_label">Age Cathéter</string>
     <string name="careportal_insulinage_label">Age Insuline</string>
     <string name="doprofileswitch">Changer de profil</string>
-    <string name="careportal_pbage_label">Age batterie pompe</string>
+    <string name="careportal_pbage_label">Age Pile Pompe</string>
     <string name="ns_alarmoptions">Options d\'alarme</string>
+    <string name="ns_alarms">Créer des notifications à partir des alarmes NS</string>
+    <string name="ns_announcements">Créer des notifications à partir des notifications NS</string>
     <string name="nsalarm_staledatavalue_label">Seuil sans nouvelle donnée Glyc. [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Seuil d\'urgence pour les données obsolètes [min]</string>
     <string name="openapsama_autosens_period">Plage pour Autosens [h]</string>
@@ -548,7 +559,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="localalertsettings_title">Alertes locales</string>
     <string name="enable_missed_bg_readings_alert">Alerte pas nouvelle donnée glycémique</string>
     <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors de portée</string>
-    <string name="pump_unreachable_threshold">Seuil alerte pompe hors de portée [min]</string>
+    <string name="pump_unreachable_threshold">Seuil d\'alerte pompe hors de portée [min]</string>
     <string name="urgent_alarm">Alarme d\'urgence</string>
     <string name="info">INFO</string>
     <string name="eversense">App Eversense (patché)</string>
@@ -621,6 +632,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="extendedbolusdeliveryerror">Erreur administration bolus étendu</string>
     <string name="insightpump_shortname">AC-I</string>
     <string name="ago">passé(e)s</string>
+    <string name="set_neutral_temps_title">Définir des basals temp neutres</string>
+    <string name="set_neutral_temps_summary">Si activé, cela annulera une basal temp avant la fin de chaque heure. Cela peut aider à supprimer les bips/vibrations à chaque heure.</string>
     <string name="enablesmbalways">Activer en permanence les SMB</string>
     <string name="enablesmbalways_summary">Activer toujours SMB de manière autonome pour les bolus. Ceci est possible uniquement avec une source de glycémie ayant un très bon filtrage de données comme le G5</string>
     <string name="enablesmbaftercarbs">Activer SMB après ingestion de glucides</string>
@@ -1274,6 +1287,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="statuslights">Voyants d\'état</string>
     <string name="statuslights_copy_ns">Copier les paramètres depuis NS</string>
     <string name="copyexistingvalues">Copier les paramètres NS (s\'ils existent)?</string>
+    <string name="classic_description">Thème d\'origine</string>
+    <string name="buttonson_description">Les boutons sont toujours affichés en bas de l\'écran</string>
+    <string name="largedisplay_description">Grand écran</string>
     <string name="skin">Thème</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
@@ -1372,6 +1388,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="description_pump_omnipod_dash">Intégration de la pompe Omnipod Dash.</string>
     <string name="omnipod_alert_finish_pairing_reminder">Rappel fin d\'appairage</string>
     <string name="omnipod_alert_finish_setup_reminder_reminder">Rappel fin de configuration</string>
+    <string name="omnipod_alert_expiration">Le Pod expire bientôt</string>
     <string name="omnipod_alert_expiration_advisory">Le Pod expire bientôt</string>
     <string name="omnipod_alert_shutdown_imminent">Arrêt imminent</string>
     <string name="omnipod_alert_low_reservoir">Réservoir bas</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 2be090e0be..691ca8ee82 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1214,10 +1214,27 @@
     <string name="loop_tbrexecution_time_label">Laikinos bazės įvykdymo laikas</string>
     <string name="insight_alert_notification_channel">Insight pompos aliarmai</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_otp_step1_install_header">1. Įdiegti Authenticator</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Nuskanuoti kodą AndroidAPS OTP kodų nustatymyu</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Patikrinti vienkartinį slaptažodį</string>
+    <string name="onconnect">Sujungimo metu</string>
+    <string name="ondisconnect">Išjungimo metu</string>
+    <string name="authorizationfailed">Autorizacija nepavyko</string>
+    <string name="overview_show_absinsulin">Insulinas absoliučiais vienetais</string>
+    <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
+    <string name="current_master_password">Dabartinis pagrindinis slaptažodis</string>
+    <string name="statuslights_copy_ns">Kopijuoti nustatymus iš NS</string>
+    <string name="copyexistingvalues">Kopijuoti NS nustatymus (jei yra)?</string>
+    <string name="classic_description">Originali išvaizda</string>
+    <string name="buttonson_description">Mygtukai visada rodomi ekrano apačioje</string>
+    <string name="skin">Išvaizda</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_reservoir_left">liko %1$.2f U</string>
+    <string name="omnipod_reservoir_over50">Daugiau nei 50 U</string>
+    <string name="omnipod_pod_name_no_info">Nėra informacijos</string>
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
diff --git a/app/src/main/res/values-nl-rNL/objectives.xml b/app/src/main/res/values-nl-rNL/objectives.xml
index 613bcfa9e6..60da77c374 100644
--- a/app/src/main/res/values-nl-rNL/objectives.xml
+++ b/app/src/main/res/values-nl-rNL/objectives.xml
@@ -20,7 +20,9 @@
     <string name="objectives_autosens_gate">Gedurende 1 week succesvol overdag loopen met regelmatige invoer van koolhydraten</string>
     <string name="objectives_ama_objective">Activeren van extra functies overdag zoals AMA (geavanceerde maaltijdhulp, Advanced Meal Assist)</string>
     <string name="objectives_smb_objective">Activeren van extra functies overdag zoals SMB (super micro bolus)</string>
+    <string name="objectives_auto_objective">Automatisering inschakelen</string>
     <string name="objectives_smb_gate">Lees de wiki en verhoog maxIOB om SMB goed werkend te krijgen. Een goed begin is maxIOB=gemiddelde maaltijdbolus + 3 x max dagelijkse basaal</string>
+    <string name="objectives_auto_gate">Zorg ervoor dat je goed begrijpt hoe automatisering werkt voordat je jouw eerste eenvoudige regel aanmaakt. In plaats van de regel een actie te laten uitvoeren, laat hem alleen een notificatie tonen. Pas als je zeker weet dat de automatisering op het juiste moment wordt geactiveerd, vervang je de melding door een echte actie. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">BG beschikbaar in NS</string>
     <string name="objectives_pumpstatusavailableinns">Pomp status beschikbaar in NS</string>
     <string name="objectives_manualenacts">Handmatige aanpassingen</string>
diff --git a/app/src/main/res/values-nl-rNL/protection.xml b/app/src/main/res/values-nl-rNL/protection.xml
index 3ea04e700d..8b73d107d3 100644
--- a/app/src/main/res/values-nl-rNL/protection.xml
+++ b/app/src/main/res/values-nl-rNL/protection.xml
@@ -1,2 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_description">Plaats uw vinger op de vingerafdruklezer om uw identiteit te verifiëren</string>
+    <string name="settings_protection">Instellingen beveiliging</string>
+    <string name="settings_password">Instellingen wachtwoord</string>
+    <string name="bolus_password">Bolus wachtwoord</string>
+    <string name="unlock_settings">Instellingen ontgrendelen</string>
+    <string name="biometric">Biometrisch</string>
+    <string name="custom_password">Aangepast wachtwoord</string>
+    <string name="password_set">Wachtwoord ingesteld!</string>
+    <string name="password_not_set">Wachtwoord niet ingesteld</string>
+    <string name="password_not_changed">Wachtwoord niet gewijzigd</string>
+    <string name="password_cleared">Wachtwoord gewist!</string>
+    <string name="password_hint">Vul hier het wachtwoord in</string>
+</resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0ba8a69c9d..41cf3d387e 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -462,7 +462,7 @@
     <string name="invalid">Ongeldig</string>
     <string name="careportal_newnstreatment_percentage_label">Percentage</string>
     <string name="careportal_newnstreatment_timeshift_label">Tijd verschuiving</string>
-    <string name="default_temptargets">Standaard tijdelijk basaal</string>
+    <string name="default_temptargets">Standaard tijdelijke streefdoelen</string>
     <string name="eatingsoon_duration">Eet binnenkort periode</string>
     <string name="eatingsoon_target">Eet binnenkort doel</string>
     <string name="activity_duration">Periode van inspanning</string>
@@ -1170,6 +1170,7 @@
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_cmd_set_bolus">Bolus instellen</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index e9f466ba22..0f79080d04 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -174,6 +174,7 @@
     <string name="password_preferences_decrypt_prompt">Zostaniesz poproszony o hasło główne, które jest potrzebne do odszyfrowania zaimportowanych preferencji.</string>
     <string name="preferences_export_canceled">Eksportowanie anulowane! Ustawienia NIE zostały wyeksportowane!</string>
     <string name="preferences_import_canceled">Import anulowany! Ustawienia NIE zostały zaimportowane!</string>
+    <string name="preferences_import_list_title">Wybierz plik do zaimportowania</string>
     <string name="check_preferences_before_import">Proszę sprawdzić ustawienia przed importem:</string>
     <string name="check_preferences_cannot_import">Ustawienia nie mogą być zaimportowane!</string>
     <string name="check_preferences_dangerous_import">Ustawienia nie powinny być importowane!</string>
@@ -186,6 +187,8 @@
     <string name="metadata_warning_outdated_format">Używasz przestarzałego formatu ze starych wersji AAPS, który nie jest bezpieczny! Używaj go tylko w ostateczności, jeśli nie masz eksportu w aktualnym formacie JSON.</string>
     <string name="metadata_warning_old_export">Zaimportowane ustawienia mają już %1$s dni! Może masz bardziej aktualne ustawienia lub wybierzesz niewłaściwy plik? Pamiętaj o regularnym eksporcie ustawień!</string>
     <string name="metadata_warning_date_format">Niepoprawny format daty i czasu!</string>
+    <string name="metadata_warning_different_version">Importujesz ustawienia z innej, nieco starszej wersji aplikacji. Prawdopodobnie to jest OK bo np.: importujesz ustawienia po aktualizacji do nowej wersji, ale sprawdź po zaimportowaniu, czy ustawienia są nadal poprawne!</string>
+    <string name="metadata_urgent_different_version">Importujesz ustawienia ze znacząco innej wersji aplikacji. Zmiana głównego numeru wersji aplikacji oznacza znaczące zmiany, i może oznaczać niekompatybilność niektórych ustawień. Upewnij się po imporcie, że ustawienia są nadal poprawne!</string>
     <string name="metadata_label_format">Format pliku</string>
     <string name="metadata_label_created_at">Data utworzenia</string>
     <string name="metadata_label_aaps_version">Wersja AAPS</string>
@@ -208,6 +211,11 @@
     <string name="prefdecrypt_issue_wrong_pass">Błąd deszyfrowania, podane hasło jest niepoprawne lub plik ustawień został zmodyfikowany! Może się zdarzyć, że zaimportowany plik został wyeksportowany z innym hasłem głównym.</string>
     <string name="prefdecrypt_issue_wrong_format">Brak konfiguracji szyfrowania, format ustawień jest nieprawidłowy!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nieobsługiwany lub nieokreślony algorytm szyfrowania!</string>
+    <string name="exported_today">wyeksportowano dzisiaj</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">wyeksportowano %1$s temu</string>
+    <string name="exported_at" comment="at placeholder we add export date">wyeksportowano w dniu %1$s</string>
+    <string name="exported_less_than_hour_ago">wyeksportowano mniej niż godzinę temu</string>
+    <string name="in_directory" comment="placeholder is for exported file path">w katalogu: %1$s</string>
     <string name="end_user_license_agreement">Umowa licencyjna użytkownika końcowego</string>
     <string name="end_user_license_agreement_text">NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM \"W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE\" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!!</string>
     <string name="end_user_license_agreement_i_understand">ROZUMIEM I WYRAŻAM ZGODĘ</string>
@@ -384,6 +392,7 @@
     <string name="wear_detailedIOB_title">Pokaż szczegóły IOB</string>
     <string name="wear_detailedIOB_summary">Rozłóż IOB na bolus i IOB bazy na zegarku</string>
     <string name="nosuccess">nie udało się - proszę sprawdzić telefon</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Wiek pacjenta</string>
     <string name="child">Dziecko</string>
     <string name="teenage">Nastolatek</string>
@@ -1267,6 +1276,10 @@
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_cmd_set_bolus">Podanie bolusa</string>
+    <string name="omnipod_cmd_cancel_bolus">Anulowanie bolusa</string>
+    <string name="omnipod_cmd_set_tbr">Ustaw tymczasową dawkę bazową</string>
+    <string name="omnipod_init_pod_set_basal_profile">Ustaw profil dawki bazowej</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6ba8a86ce2..befeef8af7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1286,6 +1286,9 @@
     <string name="statuslights">Luzes de Estado</string>
     <string name="statuslights_copy_ns">Copiar definições do NS</string>
     <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
+    <string name="classic_description">Tema Gráfico Original</string>
+    <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
+    <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema gráfico</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 9705931fa8..698f37a475 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -256,6 +256,11 @@
     <string name="smscommunicator_loopisenabled">Loop activado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
+    <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Para desligar a bomba por %1d minutos responda com o código %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Bomba desligada</string>
+    <string name="smscommunicator_reconnect">Bomba ligada novamente</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bólus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante %2$d min responda com o código %3$s</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ca8e62ca3d..280df00ce0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1288,6 +1288,9 @@ Context | Edit Context</string>
     <string name="statuslights">Индикаторы состояния</string>
     <string name="statuslights_copy_ns">Копировать параметры из NS</string>
     <string name="copyexistingvalues">Копировать настройки NS (если есть)?</string>
+    <string name="classic_description">Исходная тема оформления</string>
+    <string name="buttonson_description">Кнопки всегда отображаются в нижней части экрана</string>
+    <string name="largedisplay_description">Большой дисплей</string>
     <string name="skin">Тема оформления</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 12f7de2d68..0afa591591 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -452,8 +452,14 @@
     <string name="statuslights_res_critical">Prah kritickej úrovne hladiny zásobníka [JI]</string>
     <string name="statuslights_bat_warning">Prah upozornenia na úroveň batérie [%]</string>
     <string name="statuslights_bat_critical">Prah kritickej úrovne batérie [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAZ</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">AKT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">O aplikácii</string>
     <string name="smscommunicator_missingsmspermission">Chýbajúce povolenie SMS príkazov</string>
     <string name="smscommunicator_missingphonestatepermission">Chýba oprávnenia pre zisťovanie stavu telefónu</string>
@@ -1280,6 +1286,9 @@
     <string name="statuslights">Indikátory stavu</string>
     <string name="statuslights_copy_ns">Kopírovať nastavenia z NS</string>
     <string name="copyexistingvalues">Skopírovať nastavenia NS (ak existujú)?</string>
+    <string name="classic_description">Pôvodný vzhľad</string>
+    <string name="buttonson_description">Tlačidlá sú vždy zobrazené v spodnej časti obrazovky</string>
+    <string name="largedisplay_description">Veľký displej</string>
     <string name="skin">Vzhľad</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
diff --git a/core/src/main/res/values-ar-rSA/strings.xml b/core/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-cy-rGB/strings.xml b/core/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..4c45586f82
--- /dev/null
+++ b/core/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    General-->
+    <!--    Constraints-->
+    <!--    Dialogs-->
+    <!--    BlePreCheck-->
+    <!--    DateUtil-->
+    <!--    Profile-->
+    <!--    ProfileFunction-->
+    <!--    PumpType-->
+    <!--    APSResult-->
+    <!--    ProfileSwitch-->
+    <!--    Temptarget-->
+    <!--    TDD-->
+    <!--    Translator-->
+    <!--    Command-->
+    <!--    PumpEnactResult-->
+    <!--    TDDStatsActivity-->
+    <!--    Ntp-->
+</resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 712b2c3534..554e429a1d 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -138,6 +138,7 @@
     <string name="careportal_mealbolus">Mahlzeiten-Bolus</string>
     <string name="careportal_correctionbolus">Korrektur-Bolus</string>
     <string name="careportal_combobolus">Combo-Bolus</string>
+    <string name="careportal_tempbasalstart">TBR Start</string>
     <string name="careportal_tempbasalend">TBR Ende</string>
     <string name="careportal_carbscorrection">Kohlenhydrat-Korrektur</string>
     <string name="careportal_openapsoffline">OpenAPS offline</string>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 4c45586f82..e23142709c 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -1,20 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Koppelen</string>
     <!--    General-->
+    <string name="error">Fout</string>
+    <string name="not_set_short">Niet ingesteld</string>
+    <string name="failedupdatebasalprofile">Update basaal profiel mislukt</string>
+    <string name="profile_set_ok">Basaal profiel in pomp bijgewerkt</string>
+    <string name="invalidinput">Ongeldige invoer</string>
+    <string name="tempbasaldeliveryerror">Storing toedienen tijdelijk basaal</string>
+    <string name="goingtodeliver">Er worden %1$.2fE toegediend</string>
+    <string name="waitingforpump">Wacht op pomp</string>
+    <string name="connectingfor">Verbinding maken gedurende %1$d s</string>
+    <string name="bolusdelivering">Toedienen van %1$.2fE</string>
+    <string name="handshaking">Handshaking</string>
+    <string name="connecting">Verbining maken</string>
+    <string name="connected">Verbonden</string>
+    <string name="disconnected">Verbinding verbroken</string>
+    <string name="disconnecting">Verbinding aan het verbreken</string>
+    <string name="androidaps_start">AndroidAPS gestart</string>
+    <string name="formatinsulinunits">%1$.2fE</string>
+    <string name="reservoirvalue">%1$.0f / %2$d E</string>
+    <string name="pump_basebasalrate">%1$.2f E/uur</string>
+    <string name="format_hours">%1$.2f u</string>
+    <string name="format_mins">%1$d minuten</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pomp is bezig</string>
+    <string name="connectionerror">Pomp verbindingsstoring</string>
+    <string name="youareonallowedlimit">Limiet bereikt</string>
+    <string name="objectives">Doelen</string>
+    <string name="close">Sluiten</string>
+    <string name="please_wait">Even geduld a.u.b.…</string>
+    <string name="mute">Geluid dempen</string>
+    <string name="reload">Vernieuw</string>
+    <string name="stoppressed">STOP INGEDRUKT</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">Koolhydraten</string>
+    <string name="invalidprofile">Ongeldig profiel !!!</string>
+    <string name="noprofileset">Geen profiel ingesteld</string>
+    <string name="date">Datum</string>
+    <string name="units_label">Eenheden</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">KH ratio</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basaal</string>
+    <string name="target_label">Streefdoel</string>
+    <string name="initializing">Initialiseren...</string>
+    <string name="serialnumber">Serie nummer</string>
+    <string name="battery_label">Batterij</string>
+    <string name="lastconnection_label">Laatste verbinding</string>
+    <string name="lastbolus_label">Laatste bolus</string>
+    <string name="dailyunits">Dag totaal</string>
+    <string name="basebasalrate_label">Basis basale dosis</string>
+    <string name="tempbasal_label">Tijdelijk basaal</string>
+    <string name="virtualpump_extendedbolus_label">Vertraagde bolus</string>
+    <string name="reservoir_label">Reservoir</string>
+    <string name="pumphistory">Historiek</string>
+    <string name="viewprofile">Profiel bekijken</string>
+    <string name="eventtype">Gebeurtenis type</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Geavanceerde instellingen</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Zet de bluetooth van de telefoon even kort uit en weer aan. Dit kan op sommige gsm\'s een vastgelopen bluetooth service verhelpen.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Beperken van basaal tot max %1$.2f E/uur wegens de %2$s</string>
+    <string name="pumplimit">Pomp limiet</string>
+    <string name="limitingpercentrate">Begrezen van max procentuele wijzigen tot %1$d%% wegens de %2$s</string>
+    <string name="itmustbepositivevalue">dit moet een positieve waarde zijn</string>
+    <string name="limitingbolus">Bolus beperkt tot %1$.1f E doordat %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pomp niet geïnitialiseerd, profiel niet ingesteld!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Bevestiging</string>
+    <string name="message">Bericht</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Afbreken</string>
+    <string name="dismiss">AFWIJZEN</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy wordt niet ondersteund.</string>
+    <string name="ble_not_enabled">Bluetooth niet ingeschakeld.</string>
+    <string name="location_not_found_title">Locatie is niet ingeschakeld</string>
+    <string name="location_not_found_message">Om Bluetooth discovery met nieuwere apparaten te laten werken moet locatie worden ingeschakeld. AAPS volgt je locatie niet en locatie kan ook weer worden uitgeschakeld nadat het koppelen is gelukt.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$dm geleden</string>
+    <string name="hoursago">%1$.1fu geleden</string>
+    <string name="shorthour">u</string>
+    <string name="days">dagen</string>
+    <string name="hours">uren</string>
+    <string name="unit_second">seconde</string>
+    <string name="unit_minute">minuut</string>
+    <string name="unit_hour">uur</string>
+    <string name="unit_day">dag</string>
+    <string name="unit_week">week</string>
+    <string name="unit_seconds">seconden</string>
+    <string name="unit_minutes">minuten</string>
+    <string name="unit_hours">uren</string>
+    <string name="unit_days">dagen</string>
+    <string name="unit_weeks">weken</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Basaalstanden niet ingesteld in hele uren: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Basale waarde vervangen door minimaal ondersteunde waarde; %1$s</string>
+    <string name="maximumbasalvaluereplaced">Basale waarde vervangen door maximale ondersteunde waarde: %1$s</string>
+    <string name="profile_per_unit">/E</string>
+    <string name="profile_ins_units_per_hour">E/u</string>
+    <string name="profile_carbs_per_unit">g/E</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Geen profiel geselecteerd</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Alleen absolute waardes (geen van-tot bereik) worden ondersteund voor basaal / bolus in virtuele pomp.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Annuleer tijdelijk basaal</string>
+    <string name="let_temp_basal_run">Laat tijdelijk basaal lopen</string>
+    <string name="rate">Dosis</string>
+    <string name="duration">Gedurende</string>
+    <string name="reason">Reden</string>
+    <string name="nochangerequested">Geen aanpassing noodzakelijk</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Ongeldig profiel: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">BG Controle</string>
+    <string name="careportal_announcement">Mededeling</string>
+    <string name="careportal_note">Notitie</string>
+    <string name="careportal_question">Vraag</string>
+    <string name="careportal_exercise">Sport</string>
+    <string name="careportal_pumpsitechange">Infuus wissel</string>
+    <string name="careportal_cgmsensorinsert">CGM Sens. ingebracht</string>
+    <string name="careportal_cgmsensorstart">CGM Sens. Start</string>
+    <string name="careportal_insulincartridgechange">Insulinereservoir wissel</string>
+    <string name="careportal_profileswitch">Profiel wissel</string>
+    <string name="careportal_snackbolus">Snack bolus</string>
+    <string name="careportal_mealbolus">Maaltijd bolus</string>
+    <string name="careportal_correctionbolus">Correctie bolus</string>
+    <string name="careportal_combobolus">Combinatie-Bolus</string>
+    <string name="careportal_tempbasalstart">Start tijd. basaal</string>
+    <string name="careportal_tempbasalend">Einde tijd. basaal</string>
+    <string name="careportal_carbscorrection">Koolhydraten correctie</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Pomp bat. wissel</string>
+    <string name="careportal_temporarytarget">Tijdelijk streefdoel</string>
+    <string name="careportal_temporarytargetcancel">Tijdelijk streefdoel annuleren</string>
+    <string name="glucosetype_finger">Vingerprik</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manueel</string>
+    <string name="unknown">onbekend</string>
     <!--    Command-->
+    <string name="connectiontimedout">Connectie verlopen</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Uitgevoerd</string>
+    <string name="comment">Commentaar</string>
+    <string name="success">Succes</string>
+    <string name="percent">Procent</string>
+    <string name="absolute">Absoluut</string>
+    <string name="configbuilder_insulin">Insuline</string>
+    <string name="insulin_unit_shortname">E</string>
+    <string name="waitingforpumpresult">Wachtend op resultaat</string>
+    <string name="smb_shortname">SMB</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistieken</string>
+    <string name="cumulative_tdd">Cumulatieve TDD</string>
+    <string name="expweight">Exponentieel gewogen TDD</string>
+    <string name="basalrate">Basaal</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Ratio</string>
+    <string name="amount_days"># Dagen</string>
+    <string name="weight">Gewicht</string>
+    <string name="warning_Message">Mogelijks inaccuraat bij gebruik van bolussen om infusieset te vullen!</string>
+    <string name="olddata_Message">Oude gegevens, druk op \"VERNIEUW\"</string>
+    <string name="tbb">Totaal basaal</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Tijd detectie</string>
 </resources>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 4c45586f82..2661e237be 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -1,20 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Parowanie</string>
     <!--    General-->
+    <string name="error">Błąd</string>
+    <string name="not_set_short">Nie ustawiono</string>
+    <string name="failedupdatebasalprofile">Nieudane uaktualnienie profilu bazy</string>
+    <string name="profile_set_ok">Profil bazowy w pompie uaktualniony</string>
+    <string name="invalidinput">Błędne dane wejściowe</string>
+    <string name="tempbasaldeliveryerror">Błąd podania bazy tymczasowej</string>
+    <string name="goingtodeliver">Zamierzam podać %1$.2fU</string>
+    <string name="waitingforpump">Czekam na pompę</string>
+    <string name="connectingfor">Łączenie przez %1$d s</string>
+    <string name="bolusdelivering">Dostarczam %1$.2fU</string>
+    <string name="handshaking">Uściskdłoni</string>
+    <string name="connecting">Łączę</string>
+    <string name="connected">Połączono</string>
+    <string name="disconnected">Rozłączono</string>
+    <string name="disconnecting">Rozłączanie</string>
+    <string name="androidaps_start">AndroidAPS uruchomiony</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min.</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pompa jest zajęta</string>
+    <string name="connectionerror">Błąd połączenia z pompą</string>
+    <string name="youareonallowedlimit">Osiągnąłeś dozwolony limit</string>
+    <string name="objectives">Zadania</string>
+    <string name="close">Zamknij</string>
+    <string name="please_wait">Proszę czekać…</string>
+    <string name="mute">Wycisz</string>
+    <string name="reload">Załaduj ponownie</string>
+    <string name="stoppressed">NACIŚNIĘTY STOP</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">Węglowodany</string>
+    <string name="invalidprofile">Nieprawidłowy profil !!!</string>
+    <string name="noprofileset">NIE USTAWIONO PROFILU</string>
+    <string name="date">Data</string>
+    <string name="units_label">Jednostki</string>
     <!--    Constraints-->
     <!--    Dialogs-->
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <string name="unit_hours">godzin</string>
+    <string name="unit_days">dni</string>
+    <string name="unit_weeks">tygodni</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Wartości bazy nie są ustawione w pełnych godzinach: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Wartość bazy zastąpiona minimalną obsługiwaną wartością: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Wartość bazy zastąpiona maksymalną obsługiwaną wartością: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Nie wybrano profilu</string>
     <!--    PumpType-->
+    <string name="def_extended_note">*Tylko wartości dyskretne, nie zakresy są wspierane jako dawki bazowe/bolusy w pompie wirtualnej.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Wyłącz bazę tymczasową</string>
+    <string name="let_temp_basal_run">Pozwól na działanie bazy tymczasowej</string>
+    <string name="rate">Wartość</string>
+    <string name="duration">Czas trwania</string>
+    <string name="reason">Powód</string>
+    <string name="nochangerequested">Zmiana nie wymagana</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Nieprawidłowy profil: %1$s</string>
     <!--    Temptarget-->
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Sprawdź BG</string>
+    <string name="careportal_announcement">Powiadomienie</string>
+    <string name="careportal_note">Notatka</string>
+    <string name="careportal_question">Pytanie</string>
+    <string name="careportal_exercise">Ćwiczenia</string>
+    <string name="careportal_pumpsitechange">Zmiana wkłucia</string>
+    <string name="careportal_cgmsensorinsert">Założenie sensora CGM</string>
+    <string name="careportal_cgmsensorstart">Uruchomienie sensora CGM</string>
+    <string name="careportal_insulincartridgechange">Zmiana zasobnika insuliny</string>
+    <string name="careportal_profileswitch">Zmiana profilu</string>
+    <string name="careportal_snackbolus">Bolus na przekąskę</string>
+    <string name="careportal_mealbolus">Bolus na posiłek</string>
+    <string name="careportal_correctionbolus">Bolus korekcyjny</string>
+    <string name="careportal_combobolus">Bolus złożony</string>
+    <string name="careportal_tempbasalstart">Dawka Tymczasowa Start</string>
+    <string name="careportal_tempbasalend">Dawka Tymczasowa Koniec</string>
+    <string name="careportal_carbscorrection">Węglow. korekcyjne</string>
+    <string name="careportal_openapsoffline">OpenAPS Rozłączony (Offline)</string>
+    <string name="careportal_pumpbatterychange">Zmiana baterii pompy</string>
+    <string name="careportal_temporarytarget">Cel tymczasowy (TT)</string>
+    <string name="careportal_temporarytargetcancel">Odrzuć Cel tymczasowy</string>
+    <string name="glucosetype_finger">Palec</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Ręczne</string>
+    <string name="unknown">nieznany</string>
     <!--    Command-->
+    <string name="connectiontimedout">Przekroczono limit czasu połączenia</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Wykonane</string>
+    <string name="comment">Komentarz</string>
+    <string name="success">Sukces</string>
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/dana/src/main/res/values-ar-rSA/strings.xml b/dana/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/dana/src/main/res/values-bg-rBG/strings.xml
index 3ea04e700d..dfbc3f46c8 100644
--- a/dana/src/main/res/values-bg-rBG/strings.xml
+++ b/dana/src/main/res/values-bg-rBG/strings.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="resetpairing">Нулиране на сдвояването?</string>
+    <string name="dana_model">Модел: %1$02X Протокол: %2$02X Код: %3$02X</string>
+    <string name="basalcompare">Доставяне на по-малко от предварително зададена базал</string>
+    <string name="checkshaft">Проверете вал</string>
+    <string name="basalmax">Базал макс</string>
+    <string name="dailymax">Дневния максимум</string>
+    <string name="missedbolus">Пропуснат болус</string>
+    <string name="invalidpairing">Невалидна информация при сдвояване. Нов опит </string>
+    <string name="danars_password_title">Парола на помпата (само v1)</string>
+    <string name="rs_loginsulinchange_title">Записвай смените на резервоар</string>
+    <string name="rs_loginsulinchange_summary">Добави \"Смяна на резервоар\" в НС, когато е открит в историята</string>
+    <string name="rs_logcanulachange_title">Записвай смяна на канюла</string>
+    <string name="rs_logcanulachange_summary">Добави \"смяна на канюла\" в НС, когато е открит в историята</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Натиснете OK на помпата\nи въведете двата номера\nДръжте дисплея на помпата включен чрез натискане минус бутон, докато завършите въвеждане на код.</string>
+    <string name="num1pin">1: (12 цифри)</string>
+    <string name="num2pin">2: (8 цифри)</string>
+</resources>
diff --git a/dana/src/main/res/values-cy-rGB/strings.xml b/dana/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/dana/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
index 3ea04e700d..c6598c41dd 100644
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -1,2 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Aan het koppelen</string>
+    <string name="danars_nodeviceavailable">Nog geen apparaat gevonden</string>
+    <string name="danars_pairingok">Koppeling geslaagd</string>
+    <string name="danars_pairingtimedout">Koppeling verlopen</string>
+    <string name="danars_waitingforpairing">Wachten op koppelen van de pomp</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Pomp integratie voor DANA Diabecare RS pompen</string>
+    <string name="maxbolusviolation">Max bolus overschrijding</string>
+    <string name="commanderror">Opdracht fout</string>
+    <string name="speederror">Snelheid fout</string>
+    <string name="insulinlimitviolation">Insuline limiet overschrijding</string>
+    <string name="boluserrorcode">Gevraagd: %1$.2fE Toegediend: %2$.2fE Error code: %3$s</string>
+    <string name="danar_valuenotsetproperly">Waarde niet correct ingesteld</string>
+    <string name="danar_setbasalstep001">Zet de basale stapgrootte op 0,01 E/uur</string>
+    <string name="resetpairing">Reset pomp koppeling?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCode: %4$02X</string>
+    <string name="processinghistory">Gebeurtenis wordt uitgevoerd</string>
+    <string name="danar_enableextendedbolus">Activeer vertraagde bolussen op de pomp</string>
+    <string name="overview_bolusprogress_delivered">Toegediend</string>
+    <string name="overview_bolusprogress_stoped">Gestopt</string>
+    <string name="unsupportedfirmware">Niet ondersteunde pomp firmware</string>
+    <string name="pumperror">Pomp storing</string>
+    <string name="lowbattery">Batterij bijna leeg</string>
+    <string name="basalcompare">Toedienen van minder dan vooringestelde basaal</string>
+    <string name="pumpshutdown">Pomp uitschakelen</string>
+    <string name="batterydischarged">Pomp Batterij Leeg</string>
+    <string name="occlusion">Afsluiting</string>
+    <string name="emptyreservoir">Reservoir leeg</string>
+    <string name="basalmax">Max basaal</string>
+    <string name="dailymax">Max per dag</string>
+    <string name="bloodsugarmeasurementalert">Bloed glucose meting alarm</string>
+    <string name="remaininsulinalert">Resterende insuline hoeveelheid</string>
+    <string name="missedbolus">Gemiste bolus</string>
+    <string name="invalidpairing">Ongeldige koppelingsinformatie. Nieuwe koppelingspoging wordt uitgevoerd</string>
+    <string name="gettingpumpstatus">Opvragen pomp status</string>
+    <string name="gettingextendedbolusstatus">Vertraagde bolus status ophalen</string>
+    <string name="gettingbolusstatus">Bolus status ophalen</string>
+    <string name="gettingtempbasalstatus">Ophalen van tijdelijke basaal status</string>
+    <string name="gettingpumpsettings">Pomp instellingen ophalen</string>
+    <string name="gettingpumptime">Pomp tijd ophalen</string>
+    <string name="largetimedifftitle">Groot tijdsverschil</string>
+    <string name="largetimediff">Groot tijdsverschil:\nDe tijd in de pomp wijkt meer dan 1,5 uur af.\nStel de tijd handmatig in op de pomp en zorg ervoor dat het uitlezen van de geschiedenis van de pomp geen onverwacht gedrag veroorzaakt.\nIndien mogelijk verwijder de geschiedenis uit de pomp pomp voor het wijzigen van de tijd of schakel de Closed Loop uit voor één DIA na de laatste verkeerde invoer van de geschiedenis, maar vanaf nu minstens één DIA.</string>
+    <string name="pairfirst">Aub de pomp koppelen met je telefoon!</string>
+    <string name="approachingdailylimit">Insuline daglimiet bereikt</string>
+    <string name="startingbolus">Bolus toediening gestart</string>
+    <string name="waitingforestimatedbolusend">Wachten op complete bolus toediening. Resterend %1$d sec.</string>
+    <string name="stoppingtempbasal">Stoppen van tijdelijk basaal</string>
+    <string name="settingextendedbolus">Instellen van vertraagde bolus</string>
+    <string name="stoppingextendedbolus">Stoppen van vertraagde bolus</string>
+    <string name="updatingbasalrates">Bijwerken basaal profiel</string>
+    <string name="settingtempbasal">Instellen tijdelijk basaal</string>
+    <string name="waitingfortimesynchronization">Wachten op tijdsynchronisatie (%1$d sec)</string>
+    <string name="wrongpassword">Verkeerd wachtwoord</string>
+    <string name="wrongpumppassword">Verkeerd pomp wachtwoord!</string>
+    <string name="danar_history_alarm">Alarmen</string>
+    <string name="danar_history_basalhours">Basale uren</string>
+    <string name="danar_history_bolus">Bolussen</string>
+    <string name="danar_history_carbohydrates">Koolhydraten</string>
+    <string name="danar_history_dailyinsulin">Dagtotaal insuline</string>
+    <string name="danar_history_errors">Storing</string>
+    <string name="danar_history_glucose">Glucose</string>
+    <string name="danar_history_refill">Reservoirvullen</string>
+    <string name="danar_history_syspend">Onderbreken</string>
+    <string name="danar_history_prime">Vullen</string>
+    <string name="danar_useroptions">Gebruikersopties</string>
+    <string name="danar_timedisplay">Tijdnotatie</string>
+    <string name="danar_buttonscroll">Scroll-functie</string>
+    <string name="danar_beep">Geef een \'piep\' als op een knop gedrukt wordt</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Geluid</string>
+    <string name="danar_pumpalarm_vibrate">Trillen</string>
+    <string name="danar_pumpalarm_both">Beide</string>
+    <string name="danar_screentimeout">LCD-aan tijd [sec.]</string>
+    <string name="danar_backlight">Achtergrondverlichting-aan tijd [sec.]</string>
+    <string name="danar_glucoseunits">Glucose eenheden</string>
+    <string name="danar_shutdown">Afsluiten [uren]</string>
+    <string name="danar_lowreservoir">Laag reservoir (Eenheden)</string>
+    <string name="danar_saveuseroptions">Opties op de pomp opslaan</string>
+    <string name="description_pump_dana_r">Pomp integratie voor DANA Diabecare R pompen</string>
+    <string name="description_pump_dana_r_korean">Pomp integratie voor Koreaanse DANA Diabecare R pompen</string>
+    <string name="description_pump_dana_r_v2">Pomp integratie voor DANA Diabecare R pompen met geupgrade firmware</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Geen bluetooth adapter gevonden</string>
+    <string name="devicenotfound">Geselecteerd toestel niet gevonden</string>
+    <string name="danar_switchtouhmode">Wijzig de modus E/dag naar E/uur op de pomp</string>
+    <string name="danarkoreanpump">DanaR Koreaans</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pomp driver gecorrigeerd</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">EasyUI modus in pomp deactiveren</string>
+    <string name="profile_set_failed">Instellen van basaal profiel mislukt</string>
+    <string name="danar_bluetooth_status">Bluetooh status</string>
+    <string name="danar_iob_label">Pomp IOB</string>
+    <string name="basal_step">Basaal Stap</string>
+    <string name="bolus_step">Bolus Stap</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Dana pomp instellingen</string>
+    <string name="timeformat12h">12u</string>
+    <string name="timeformat24h">24u</string>
+    <string name="option_on">Aan</string>
+    <string name="option_off">Uit</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth apparaat</string>
+    <string name="danars_password_title">Pomp wachtwoord (alleen v1)</string>
+    <string name="danar_password_title">Pomp wachtwoord</string>
+    <string name="danar_useextended_title">Gebruik vertraagde bolussen voor &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Geef vertraagde bolus weer in %%</string>
+    <string name="bolusspeed">Bolus snelheid</string>
+    <string name="selectedpump">Geselecteerde pomp</string>
+    <string name="rs_loginsulinchange_title">Reservoir wissel noteren</string>
+    <string name="rs_loginsulinchange_summary">Voeg \"Reservoir wissel\" gebeurtenis toe aan de careportal als deze in pompgeschiedenis wordt uitgelezen</string>
+    <string name="rs_logcanulachange_title">Infuus wissel noteren</string>
+    <string name="rs_logcanulachange_summary">Voeg \"Infuuswissel\" gebeurtenis toe aan de careportal als deze in pompgeschiedenis wordt uitgelezen</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Druk op OK op de pomp\nen voer 2 weergegeven nummers in.\nHoud het scherm vd pomp actief door de min-knop op de pomp ingedrukt te houden totdat je klaar bent met het invoeren van de codes.</string>
+    <string name="num1pin">1: (12 cijfers)</string>
+    <string name="num2pin">2: (8 cijfers)</string>
+</resources>
diff --git a/wear/src/main/res/values-ar-rSA/strings.xml b/wear/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/wear/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/wear/src/main/res/values-cy-rGB/strings.xml b/wear/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..3ea04e700d
--- /dev/null
+++ b/wear/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

From 0e624a803fbbde8775f02976eb71697792c20163 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 23:20:36 +0200
Subject: [PATCH 189/400] bump 2.6.7-dev

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5bda0b7b45..5ceed5c438 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,7 +122,7 @@ android {
         targetSdkVersion 28
         multiDexEnabled true
         versionCode 1500
-        version "2.6.6-dev"
+        version "2.6.7-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

From dae717d5247e9733e0e4b971566c757f451212a7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Jun 2020 23:33:29 +0200
Subject: [PATCH 190/400] try to fix crash

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 9cc93eca9d..be9370d27c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -883,7 +883,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()
-            for (g in 0 until secondaryGraphs.size) {
+            for (g in 0 until secondaryGraphsData.size) {
                 secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
                 secondaryGraphs[g].visibility = (
                     overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||

From d3e98fb09bbb0267d903d0a959ed7e6335b2f04c Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 12 Jun 2020 22:17:15 +0200
Subject: [PATCH 191/400] Create vector icon to replace png

---
 .../general/automation/triggers/TriggerCOB.kt |   2 +-
 .../general/overview/OverviewFragment.kt      |   4 +-
 app/src/main/res/drawable/anim_carbs.xml      |   4 +-
 .../drawable/ic_actions_cancelextbolus.xml    |  16 ++
 .../res/drawable/ic_actions_startextbolus.xml |   9 ++
 app/src/main/res/drawable/ic_bolus.xml        |   8 +
 app/src/main/res/drawable/ic_calculator.xml   |  14 ++
 app/src/main/res/drawable/ic_calibration.xml  |  15 ++
 .../main/res/drawable/ic_cp_basal_no_tbr.xml  |   8 +
 .../res/drawable/ic_cp_basal_tbr_high.xml     |   8 +
 .../main/res/drawable/ic_cp_basal_tbr_low.xml |   8 +
 .../main/res/drawable/ic_cp_bolus_carbs.xml   |   8 +
 .../res/drawable/ic_cp_bolus_carbs_red.xml    |   8 +
 app/src/main/res/drawable/ic_quickwizard.xml  |  12 ++
 .../drawable/ic_x_swap_vert_48px_green.xml    |   1 -
 app/src/main/res/drawable/ic_xdrip.xml        |   8 +
 .../main/res/drawable/icon_insulin_carbs.xml  |   4 +-
 app/src/main/res/layout/actions_fragment.xml  |   4 +-
 .../main/res/layout/careportal_fragment.xml   |   2 +-
 .../main/res/layout/dialog_calibration.xml    |   2 +-
 app/src/main/res/layout/dialog_carbs.xml      |   2 +-
 .../main/res/layout/dialog_extendedbolus.xml  |   2 +-
 .../res/layout/overview_buttons_layout.xml    |  12 +-
 .../overview_fragment_nsclient_tablet.xml     |   6 +-
 .../main/res/layout/overview_info_layout.xml  |   6 +-
 .../automation/triggers/TriggerCOBTest.kt     |   2 +-
 icons/actions_cancelextbolus.svg              | 133 +++++++++++++++
 icons/actions_startextbolus.svg               | 129 +++++++++++++++
 icons/bolus.svg                               |  39 +++++
 icons/calculator.svg                          |  83 ++++++++++
 icons/calibration.svg                         | 151 ++++++++++++++++++
 icons/cp_basal_no_tbr.svg                     |  26 +++
 icons/cp_basal_tbr_high.svg                   |  26 +++
 icons/cp_basal_tbr_low.svg                    |  26 +++
 icons/cp_bolus_carbs.svg                      | 106 ++++++++++++
 icons/quickwizard.svg                         |  58 +++++++
 icons/x_swap_vert.svg                         |   2 -
 icons/xdrip.svg                               | 140 ++++++++++++++++
 38 files changed, 1065 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_actions_cancelextbolus.xml
 create mode 100644 app/src/main/res/drawable/ic_actions_startextbolus.xml
 create mode 100644 app/src/main/res/drawable/ic_bolus.xml
 create mode 100644 app/src/main/res/drawable/ic_calculator.xml
 create mode 100644 app/src/main/res/drawable/ic_calibration.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_carbs.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml
 create mode 100644 app/src/main/res/drawable/ic_quickwizard.xml
 create mode 100644 app/src/main/res/drawable/ic_xdrip.xml
 create mode 100644 icons/actions_cancelextbolus.svg
 create mode 100644 icons/actions_startextbolus.svg
 create mode 100644 icons/bolus.svg
 create mode 100644 icons/calculator.svg
 create mode 100644 icons/calibration.svg
 create mode 100644 icons/cp_basal_no_tbr.svg
 create mode 100644 icons/cp_basal_tbr_high.svg
 create mode 100644 icons/cp_basal_tbr_low.svg
 create mode 100644 icons/cp_bolus_carbs.svg
 create mode 100644 icons/quickwizard.svg
 create mode 100644 icons/xdrip.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
index 82aa8cd6f1..6d07ef1188 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
@@ -77,7 +77,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.cobcompared, resourceHelper.gs(comparator.value.stringRes), cob.value)
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_cp_bolus_carbs)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bolus_carbs)
 
     override fun duplicate(): Trigger = TriggerCOB(injector, this)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index be9370d27c..a5d21ba956 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -679,9 +679,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             ?: resourceHelper.gc(R.color.defaulttextcolor))
 
         if (activeTemp != null)
-            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
+            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low)
         else
-            overview_basebasal_icon.setImageResource(R.drawable.icon_cp_basal_no_tbr)
+            overview_basebasal_icon.setImageResource(R.drawable.ic_cp_basal_no_tbr)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
diff --git a/app/src/main/res/drawable/anim_carbs.xml b/app/src/main/res/drawable/anim_carbs.xml
index 28ae262b46..f3b7c5cc7f 100644
--- a/app/src/main/res/drawable/anim_carbs.xml
+++ b/app/src/main/res/drawable/anim_carbs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:oneshot="false">
-    <item android:drawable="@drawable/icon_cp_bolus_carbs" android:duration="1200" />
-    <item android:drawable="@drawable/icon_cp_bolus_carbs_red" android:duration="1200" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs" android:duration="1200" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs_red" android:duration="1200" />
 </animation-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
new file mode 100644
index 0000000000..da158703a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -0,0 +1,16 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.164,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.312c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C23.218,10.989 22.001,8.909 20.164,7.697zM16.448,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S19.63,19.119 16.448,19.119z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M16.45,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C20.983,10.85 18.95,8.816 16.45,8.814z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M4.729,9.857l-2.346,2.346l-0.733,-0.733l2.346,-2.346l-2.346,-2.346l0.733,-0.733l2.346,2.346l2.346,-2.346l0.733,0.733l-2.345,2.346l2.345,2.346l-0.733,0.733z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_actions_startextbolus.xml b/app/src/main/res/drawable/ic_actions_startextbolus.xml
new file mode 100644
index 0000000000..6436cad1d7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_startextbolus.xml
@@ -0,0 +1,9 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#67DFE8" android:pathData="M15.714,7.697l0.353,-0.684c0.18,-0.348 0.043,-0.775 -0.305,-0.955c-0.351,-0.181 -0.775,-0.043 -0.955,0.305l-0.354,0.685c-0.379,-0.148 -0.772,-0.265 -1.18,-0.344V6.106c0.45,-0.061 0.802,-0.431 0.802,-0.897c0,-0.509 -0.412,-0.921 -0.921,-0.921h-2.313c-0.509,0 -0.921,0.413 -0.921,0.921c0,0.467 0.352,0.836 0.802,0.897v0.598c-3.125,0.599 -5.495,3.349 -5.495,6.646c0,3.732 3.037,6.77 6.77,6.77c3.732,0 6.77,-3.037 6.77,-6.77C18.768,10.989 17.551,8.909 15.714,7.697zM11.998,19.119c-3.182,0 -5.77,-2.588 -5.77,-5.77s2.588,-5.77 5.77,-5.77s5.77,2.588 5.77,5.77S15.18,19.119 11.998,19.119z"/>
+    <path android:fillColor="#67DFE8" android:pathData="M12,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C16.533,10.85 14.5,8.816 12,8.814z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bolus.xml b/app/src/main/res/drawable/ic_bolus.xml
new file mode 100644
index 0000000000..752e99ce35
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bolus.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#67DFE8" android:pathData="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092,-0.07 -0.212,-0.09 -0.323,-0.055L5.115,5.89L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116 0.047,0.226 0.14,0.296l9.895,7.502l-0.428,0.564c-0.26,0.343 -0.193,0.832 0.15,1.092s0.832,0.193 1.092,-0.15l1.653,-2.18l2.219,1.683l-0.719,0.948c-0.26,0.343 -0.193,0.832 0.15,1.092c0.343,0.26 0.832,0.193 1.092,-0.15l2.379,-3.138c0.26,-0.343 0.193,-0.832 -0.15,-1.092c-0.343,-0.26 -0.832,-0.193 -1.092,0.15l-0.719,0.948l-2.219,-1.683l1.653,-2.18c0.26,-0.343 0.193,-0.832 -0.15,-1.092S18.762,11.659 18.501,12.002zM5.458,6.524l2.44,-0.783l9.748,7.39L17.26,13.64l-5.754,-4.362c-0.091,-0.069 -0.221,-0.053 -0.293,0.035L9.087,11.91l-0.67,-0.508l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027l-1.538,1.848l-0.769,-0.583l1.526,-1.833c0.002,-0.002 0.004,-0.005 0.006,-0.008c0.068,-0.09 0.054,-0.219 -0.033,-0.291c-0.09,-0.075 -0.224,-0.063 -0.299,0.027L6.97,10.305L6.201,9.721l1.526,-1.833C7.728,7.886 7.731,7.882 7.732,7.88c0.068,-0.09 0.054,-0.219 -0.033,-0.291C7.609,7.513 7.475,7.526 7.4,7.616L5.861,9.464L5.362,9.085L5.458,6.524z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_calculator.xml b/app/src/main/res/drawable/ic_calculator.xml
new file mode 100644
index 0000000000..300e971bf4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calculator.xml
@@ -0,0 +1,14 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#67E86A" android:pathData="M17.625,15.345h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292c0,0.063 0.051,0.113 0.113,0.113h4.083c0.063,0 0.113,-0.051 0.113,-0.113v-1.292C17.738,15.396 17.688,15.345 17.625,15.345z"/>
+    <path android:fillColor="#67E86A" android:pathData="M16.343,14.036c0,-0.063 -0.051,-0.113 -0.113,-0.113h-1.292c-0.063,0 -0.113,0.051 -0.113,0.113v1.016h1.519V14.036z"/>
+    <path android:fillColor="#67E86A" android:pathData="M14.824,18.119c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.017h-1.519V18.119z"/>
+    <path android:fillColor="#67E86A" android:pathData="M19.836,1.96h-15.1c-0.344,0 -0.624,0.279 -0.624,0.624v18.375c0,0.345 0.279,0.624 0.624,0.624h15.1c0.345,0 0.624,-0.279 0.624,-0.624V2.583C20.46,2.239 20.181,1.96 19.836,1.96zM19.212,20.334H5.36V7.04h13.852V20.334zM19.212,5.793H5.36V3.207h13.852V5.793z"/>
+    <path android:fillColor="#67E86A" android:pathData="M13.542,11.363h4.083c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113h-4.083c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C13.429,11.313 13.479,11.363 13.542,11.363z"/>
+    <path android:fillColor="#67E86A" android:pathData="M7.042,11.363h1.283v1.282c0,0.063 0.051,0.113 0.113,0.113h1.292c0.063,0 0.113,-0.051 0.113,-0.113v-1.282h1.283c0.063,0 0.113,-0.051 0.113,-0.113V9.958c0,-0.063 -0.051,-0.113 -0.113,-0.113H9.842V8.563c0,-0.063 -0.051,-0.113 -0.113,-0.113H8.438c-0.063,0 -0.113,0.051 -0.113,0.113v1.283H7.042c-0.063,0 -0.113,0.051 -0.113,0.113v1.292C6.928,11.313 6.979,11.363 7.042,11.363z"/>
+    <path android:fillColor="#67E86A" android:pathData="M10.157,16.078l0.907,-0.907c0.021,-0.021 0.033,-0.05 0.033,-0.08s-0.012,-0.059 -0.033,-0.08l-0.914,-0.913c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.907,0.907l-0.907,-0.907c-0.044,-0.045 -0.116,-0.045 -0.16,0l-0.913,0.913c-0.044,0.044 -0.044,0.116 0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044 -0.044,0.116 0,0.16l0.913,0.914c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.907,-0.907l0.907,0.907c0.021,0.021 0.05,0.033 0.08,0.033s0.059,-0.012 0.08,-0.033l0.914,-0.914c0.044,-0.044 0.044,-0.116 0,-0.16L10.157,16.078z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_calibration.xml b/app/src/main/res/drawable/ic_calibration.xml
new file mode 100644
index 0000000000..26511d7cbf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calibration.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.305,4.482c1.782,2.914 4.332,5.382 3.916,9.05c-0.256,2.254 -2.529,3.635 -4.783,3.199c-2.145,-0.415 -3.625,-2.546 -3.171,-4.728C3.858,9.168 5.537,6.894 7.305,4.482zM5.08,10.061c-0.212,0.638 -0.489,1.262 -0.621,1.916c-0.205,1.017 -0.065,1.994 0.764,2.731c0.297,0.264 0.68,0.354 1.038,0.077c0.242,-0.187 0.269,-0.46 0.096,-0.692C5.468,12.903 5.032,11.589 5.08,10.061z"
+      android:fillColor="#E83258"/>
+  <path
+      android:pathData="M17.959,4.566c1.073,1.453 2.073,2.837 2.489,4.535c0.28,1.143 -0.069,2.1 -1.037,2.763c-0.943,0.645 -1.961,0.655 -2.904,0.009c-0.967,-0.662 -1.318,-1.635 -1.041,-2.769C15.88,7.408 16.875,6.019 17.959,4.566z"
+      android:fillColor="#E83258"/>
+  <path
+      android:pathData="M14.82,14.425c0.797,1.094 1.535,2.104 1.819,3.355c0.188,0.826 -0.096,1.498 -0.784,1.965c-0.669,0.454 -1.393,0.467 -2.067,0.014c-0.688,-0.462 -0.985,-1.13 -0.8,-1.959C13.272,16.531 14.004,15.503 14.82,14.425z"
+      android:fillColor="#E83258"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
new file mode 100644
index 0000000000..71abd83757
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M3.667,11.646h15.417v0.709h-15.417z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
new file mode 100644
index 0000000000..140ba3ad92
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M19.083,17.896l-2.354,0l0,-11.042l-4,0l0,11.042l-9.062,0l0,-0.708l8.354,0l0,-11.042l5.417,0l0,11.042l1.645,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
new file mode 100644
index 0000000000..53ce1c5c6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M17.438,17.854l-5.417,0l0,-11.041l-8.354,0l0,-0.709l9.062,0l0,11.042l4,0l0,-11.042l2.354,0l0,0.709l-1.645,0z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml
new file mode 100644
index 0000000000..e21b236b4e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FEAD01" android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml
new file mode 100644
index 0000000000..c6206204cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#F20606" android:pathData="M16.074,14.883c-0.332,0.416 -0.691,0.722 -1.09,0.993c-0.378,0.257 -0.843,0.39 -1.203,0.468c-0.688,0.125 -0.25,0.188 0.096,0.657c-1.247,1.781 -3.348,1.9 -5.102,0.991c-0.141,-0.073 -0.272,-0.165 -0.403,-0.255c-0.276,-0.19 -0.398,-0.236 -0.63,0.004c-0.187,0.193 -0.628,0.618 -0.852,0.838L6.4,18.047c0.241,-0.219 0.518,-0.491 0.718,-0.678c0.435,-0.408 0.336,-0.458 -0.011,-0.955c-1.205,-1.725 -0.836,-3.976 0.859,-5.236c0.722,0.462 0.566,0.353 0.801,-0.327c0.251,-0.726 0.677,-1.345 1.325,-1.777c0.659,0.582 0.549,0.316 0.814,-0.351c0.286,-0.721 0.734,-1.309 1.353,-1.806c0.695,0.458 1.014,0.966 1.252,1.538c0.273,0.656 0.379,0.435 0.858,-0.03c1.023,-0.992 2.273,-1.385 3.491,-1.087c0.287,1.586 -0.39,3.005 -1.859,3.932c0.771,0.208 1.5,0.625 2.215,1.468c-0.439,0.643 -1.213,1.259 -1.993,1.39C15.105,14.317 15.734,14.359 16.074,14.883zM17.184,8.469c0.013,-0.442 -0.128,-0.559 -0.51,-0.508c-1.244,0.167 -2.413,1.284 -2.621,2.504c-0.072,0.422 0.15,0.648 0.571,0.551c0.267,-0.062 0.538,-0.144 0.783,-0.265C16.39,10.263 17,9.484 17.184,8.469zM13.259,10.211c0.011,-0.699 -0.231,-1.258 -0.566,-1.784c-0.322,-0.506 -0.546,-0.505 -0.868,-0.011c-0.744,1.138 -0.442,2.461 0.152,3.433c0.19,0.311 0.445,0.313 0.669,0.011C13.017,11.357 13.273,10.801 13.259,10.211zM10.925,17.86c0.517,0 1.245,-0.233 1.618,-0.515c0.317,-0.24 0.344,-0.436 0.03,-0.652c-1.164,-0.802 -2.354,-0.977 -3.585,-0.119c-0.414,0.289 -0.391,0.523 0.063,0.79C9.629,17.703 10.26,17.846 10.925,17.86zM11.109,12.297c0.02,-0.666 -0.231,-1.243 -0.569,-1.786c-0.316,-0.507 -0.532,-0.495 -0.854,0.026c-0.622,1.004 -0.57,2.408 0.126,3.37c0.241,0.334 0.449,0.355 0.707,0.03C10.896,13.459 11.123,12.916 11.109,12.297zM15.068,13.639c0.661,-0.003 1.381,-0.217 1.756,-0.502c0.32,-0.244 0.329,-0.403 0.036,-0.66c-0.936,-0.82 -2.634,-0.874 -3.605,-0.113c-0.351,0.275 -0.358,0.527 0.019,0.737C13.85,13.423 14.46,13.658 15.068,13.639zM7.124,14.258c-0.023,0.548 0.124,1.116 0.447,1.633c0.305,0.489 0.569,0.494 0.893,0.036c0.704,-0.995 0.645,-2.507 -0.135,-3.438c-0.254,-0.303 -0.471,-0.302 -0.713,0.03C7.253,13.017 7.116,13.587 7.124,14.258zM12.831,13.928c-0.667,-0.031 -1.25,0.192 -1.77,0.589c-0.26,0.198 -0.271,0.416 -0.005,0.636c0.852,0.704 2.692,0.765 3.599,0.114c0.367,-0.263 0.376,-0.482 0.005,-0.726C14.106,14.175 13.512,13.911 12.831,13.928z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_quickwizard.xml b/app/src/main/res/drawable/ic_quickwizard.xml
new file mode 100644
index 0000000000..b2d1f2569b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_quickwizard.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FEAF05" android:pathData="M10.751,6.59c-0.561,0.69 -0.796,1.057 -1.25,1.797c-2.517,0.238 -3.932,2.751 -3.379,4.664c0.244,0.843 0.779,1.476 1.498,1.958c2.348,1.573 6.243,1.429 8.487,-0.306c1.187,-0.918 1.723,-2.084 1.334,-3.576c-0.412,-1.58 -1.445,-2.585 -3.039,-2.87c-1.112,-0.199 -1.973,0.37 -2.558,1.313c-0.494,0.796 -0.72,1.616 -1.628,2.345c-0.389,-0.431 -0.458,-0.961 -0.483,-1.481c-0.12,-2.486 2.019,-4.439 4.595,-4.213c2.365,0.207 4.466,1.956 5.114,4.256c0.611,2.172 -0.226,4.432 -2.19,5.909c-2.995,2.253 -7.895,2.327 -10.943,0.165c-2.057,-1.459 -2.88,-3.881 -2.099,-6.18C5.023,7.978 7.368,6.304 9.77,6.4C10.072,6.412 10.365,6.459 10.751,6.59z"/>
+    <path android:fillColor="#FEAF06" android:pathData="M7.141,13.406c0.526,-0.103 1.178,-0.22 1.665,-0.322c1.522,-0.319 2.625,-1.229 3.273,-2.678c0.289,-0.647 0.702,-1.125 1.448,-1.42c0.418,0.811 0.454,1.641 0.223,2.493c-0.284,1.049 -0.889,1.863 -1.819,2.429c-0.616,0.376 -1.284,0.638 -1.966,0.867C8.814,15.163 7.797,14.773 7.141,13.406z"/>
+    <path android:fillColor="#FEAF06" android:pathData="M12.313,14.203c0.734,-0.537 1.25,-1.089 1.469,-1.612c0.894,0.159 1.92,0.314 2.804,0.471C16.036,14.799 13.922,15.203 12.313,14.203z"/>
+    <path android:fillColor="#FEAF06" android:pathData="M2.377,13.882c0.179,-0.123 0.756,-0.189 1.192,-0.123c0.259,0.631 0.587,1.225 1.108,1.923c-0.572,0.116 -1.037,0.253 -1.567,0.224c-0.493,-0.027 -0.993,-0.353 -1.063,-0.989C2.013,14.61 2.047,14.109 2.377,13.882z"/>
+    <path android:fillColor="#FEAF06" android:pathData="M19.143,15.22c0.196,-0.497 0.362,-0.961 0.561,-1.411c0.235,-0.531 0.618,-0.76 1.121,-0.681c0.419,0.066 0.575,0.376 0.644,0.756c0.098,0.541 -0.078,0.989 -0.529,1.213C20.38,15.377 19.787,15.293 19.143,15.22z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
index b094d56057..9484c2cd6f 100644
--- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
+++ b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
@@ -6,5 +6,4 @@
     android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
     <path android:fillColor="#FF000000" android:pathData="M5.438,12.733l-2.346,2.346l-0.734,-0.733l2.346,-2.346l-2.346,-2.346l0.734,-0.733l2.346,2.346l2.345,-2.346l0.734,0.733l-2.346,2.346l2.346,2.346l-0.734,0.733z"/>
-    <path android:fillColor="#FF000000" android:pathData="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346,-2.346l2.346,2.346l0.592,-0.592L6.029,12L8.375,9.654z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_xdrip.xml b/app/src/main/res/drawable/ic_xdrip.xml
new file mode 100644
index 0000000000..54f88823ba
--- /dev/null
+++ b/app/src/main/res/drawable/ic_xdrip.xml
@@ -0,0 +1,8 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#B92929" android:pathData="M12.143,3.619c1.326,1.335 2.613,2.639 3.908,3.934c0.86,0.86 1.735,1.695 2.294,2.811c1.242,2.477 0.847,5.53 -1.039,7.698c-1.763,2.026 -4.813,2.845 -7.35,1.973c-4.996,-1.716 -6.424,-7.776 -2.71,-11.543C8.837,6.878 10.458,5.294 12.143,3.619zM12.08,6.135c-1.258,1.251 -2.447,2.427 -3.628,3.61c-1.148,1.149 -1.65,2.542 -1.541,4.158c0.177,2.618 2.665,4.888 5.169,4.688C12.08,14.471 12.08,10.35 12.08,6.135z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_insulin_carbs.xml b/app/src/main/res/drawable/icon_insulin_carbs.xml
index 6dcd511598..5268a2eb70 100644
--- a/app/src/main/res/drawable/icon_insulin_carbs.xml
+++ b/app/src/main/res/drawable/icon_insulin_carbs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_cp_bolus_carbs" />
-    <item android:drawable="@drawable/icon_bolus" />
+    <item android:drawable="@drawable/ic_cp_bolus_carbs" />
+    <item android:drawable="@drawable/ic_bolus" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 0290c1cf8a..ce86d871ea 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -91,7 +91,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_startextbolus"
+                android:drawableTop="@drawable/ic_actions_startextbolus"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_extendedbolus_button"
@@ -106,7 +106,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_cancelextbolus"
+                android:drawableTop="@drawable/ic_actions_cancelextbolus"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_extendedbolus_cancel_button"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index d4f79965a5..1f2da353da 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -152,7 +152,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                        android:drawableTop="@drawable/ic_cp_bolus_carbs"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_carbscorrection"
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 1dbd83bd40..5cf87640eb 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_calibration"
-                android:src="@drawable/icon_calibration" />
+                android:src="@drawable/ic_calibration" />
 
             <TextView
                 android:id="@+id/actions_care_title"
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index fdf83cff5b..1a4d722517 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/icon_cp_bolus_carbs" />
+                android:src="@drawable/ic_cp_bolus_carbs" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 26c15117a7..4fde69c44b 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/virtualpump_extendedbolus_label"
-                android:src="@drawable/icon_actions_startextbolus" />
+                android:src="@drawable/ic_actions_startextbolus" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml
index 5c97104159..f16ab04176 100644
--- a/app/src/main/res/layout/overview_buttons_layout.xml
+++ b/app/src/main/res/layout/overview_buttons_layout.xml
@@ -45,7 +45,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_bolus"
+            android:drawableTop="@drawable/ic_bolus"
             android:text="@string/overview_insulin_label"
             android:textColor="@color/colorInsulinButton"
             android:textSize="10sp" />
@@ -57,7 +57,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_cp_bolus_carbs"
+            android:drawableTop="@drawable/ic_cp_bolus_carbs"
             android:text="@string/overview_carbs_label"
             android:textColor="@color/colorCarbsButton"
             android:textSize="10sp" />
@@ -69,7 +69,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_calculator"
+            android:drawableTop="@drawable/ic_calculator"
             android:text="@string/overview_calculator_label"
             android:textColor="@color/colorCalculatorButton"
             android:textSize="10sp" />
@@ -81,7 +81,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_calibration"
+            android:drawableTop="@drawable/ic_calibration"
             android:text="@string/overview_calibration"
             android:textColor="@color/colorCalibrationButton"
             android:textSize="10sp"
@@ -94,7 +94,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_xdrip"
+            android:drawableTop="@drawable/ic_xdrip"
             android:text="@string/overview_cgm"
             android:textColor="@color/colorCalibrationButton"
             android:textSize="10sp"
@@ -107,7 +107,7 @@
             android:layout_height="fill_parent"
             android:layout_marginEnd="-4dp"
             android:layout_weight="0.5"
-            android:drawableTop="@drawable/icon_quickwizard"
+            android:drawableTop="@drawable/ic_quickwizard"
             android:text="@string/quickwizard"
             android:textColor="@color/colorQuickWizardButton"
             android:textSize="10sp" />
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 5c4340eea6..85920acfd0 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -512,7 +512,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:drawableTop="@drawable/ic_cp_bolus_carbs"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_carbs_label"
@@ -527,7 +527,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_calculator"
+                    android:drawableTop="@drawable/ic_calculator"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_calculator_label"
@@ -542,7 +542,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:drawableTop="@drawable/ic_quickwizard"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="Quick wizard"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 2d1adfc257..ecc5ee7183 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -112,7 +112,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_bolus" />
+            android:src="@drawable/ic_bolus" />
 
         <TextView
             android:id="@+id/overview_iob"
@@ -170,7 +170,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_cp_basal_start" />
+            android:src="@drawable/ic_cp_basal_no_tbr" />
 
         <TextView
             android:id="@+id/overview_basebasal"
@@ -198,7 +198,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/icon_actions_startextbolus" />
+            android:src="@drawable/ic_actions_startextbolus" />
 
         <TextView
             android:id="@+id/overview_extendedbolus"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
index b864e0aed8..0c2a942a3e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt
@@ -70,7 +70,7 @@ class TriggerCOBTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bolus_carbs), TriggerCOB(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon())
     }
 
     fun generateCobInfo(): CobInfo {
diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
new file mode 100644
index 0000000000..39c3677207
--- /dev/null
+++ b/icons/actions_cancelextbolus.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<g>
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 4.729,8.391 7.075,6.045 
+		7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+</svg>
diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg
new file mode 100644
index 0000000000..5b5b57d634
--- /dev/null
+++ b/icons/actions_startextbolus.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus">
+	<path fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+		l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+		h-2.313c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+		c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119
+		c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198c0,0.08,0.029,0.157,0.083,0.217
+		l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001c0.08,0,0.157-0.029,0.217-0.083
+		c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="Layer_10" display="none">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.716,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598C7.6,7.303,5.23,10.053,5.23,13.35c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.77,10.989,17.553,8.909,15.716,7.697z M12,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		S8.819,7.58,12,7.58s5.77,2.588,5.77,5.77S15.182,19.119,12,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12.002,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.535,10.85,14.502,8.816,12.002,8.814z"/>
+</g>
+</svg>
diff --git a/icons/bolus.svg b/icons/bolus.svg
new file mode 100644
index 0000000000..7afcbe0dfa
--- /dev/null
+++ b/icons/bolus.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Layer_5">
+	<path fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89L1.571,3.501
+		L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564c-0.26,0.343-0.193,0.832,0.15,1.092
+		s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948c-0.26,0.343-0.193,0.832,0.15,1.092
+		c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092c-0.343-0.26-0.832-0.193-1.092,0.15
+		l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783
+		l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035L9.087,11.91l-0.67-0.508l1.526-1.833
+		c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848
+		l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833C7.728,7.886,7.731,7.882,7.732,7.88
+		c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464L5.362,9.085L5.458,6.524z"/>
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+</svg>
diff --git a/icons/calculator.svg b/icons/calculator.svg
new file mode 100644
index 0000000000..51033925b5
--- /dev/null
+++ b/icons/calculator.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator">
+	<path display="none" fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292c0,0.063,0.051,0.113,0.113,0.113h4.083
+		c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g>
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375c0,0.345,0.279,0.624,0.624,0.624h15.1
+		c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z M19.212,20.334H5.36V7.04h13.852V20.334z
+		 M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113h-4.083
+		c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.282
+		h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438
+		c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"
+		/>
+	<path fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08l-0.914-0.913
+		c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+</svg>
diff --git a/icons/calibration.svg b/icons/calibration.svg
new file mode 100644
index 0000000000..75d9d9be9a
--- /dev/null
+++ b/icons/calibration.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
+		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+<g id="xdrip" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
+		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+<g id="calibration">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
+		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
+		c-0.205,1.017-0.065,1.994,0.764,2.731c0.297,0.264,0.68,0.354,1.038,0.077c0.242-0.187,0.269-0.46,0.096-0.692
+		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
+	<path fill="#E83258" d="M17.959,4.566c1.073,1.453,2.073,2.837,2.489,4.535c0.28,1.143-0.069,2.1-1.037,2.763
+		c-0.943,0.645-1.961,0.655-2.904,0.009c-0.967-0.662-1.318-1.635-1.041-2.769C15.88,7.408,16.875,6.019,17.959,4.566z"/>
+	<path fill="#E83258" d="M14.82,14.425c0.797,1.094,1.535,2.104,1.819,3.355c0.188,0.826-0.096,1.498-0.784,1.965
+		c-0.669,0.454-1.393,0.467-2.067,0.014c-0.688-0.462-0.985-1.13-0.8-1.959C13.272,16.531,14.004,15.503,14.82,14.425z"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
new file mode 100644
index 0000000000..970cede3cd
--- /dev/null
+++ b/icons/cp_basal_no_tbr.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr">
+	<path fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
new file mode 100644
index 0000000000..de6ff777ce
--- /dev/null
+++ b/icons/cp_basal_tbr_high.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 3.667,17.896 3.667,17.188 
+		12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
new file mode 100644
index 0000000000..c7459314a8
--- /dev/null
+++ b/icons/cp_basal_tbr_low.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 12.729,17.146 
+		16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg
new file mode 100644
index 0000000000..867515d55a
--- /dev/null
+++ b/icons/cp_bolus_carbs.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+</svg>
diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg
new file mode 100644
index 0000000000..e84fda2d37
--- /dev/null
+++ b/icons/quickwizard.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="Layer_6">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index a09d1324a4..9a9087c413 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -7,6 +7,4 @@
 <path fill="none" d="M0,0h24v24H0V0z"/>
 <polygon points="5.438,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.438,11.267 7.783,8.921 8.517,9.654 
 	6.171,12 8.517,14.346 7.783,15.079 "/>
-<path d="M8.375,9.654L7.783,9.063l-2.346,2.346L3.092,9.063L2.5,9.654L4.846,12L2.5,14.346l0.592,0.592l2.346-2.346l2.346,2.346
-	l0.592-0.592L6.029,12L8.375,9.654z"/>
 </svg>
diff --git a/icons/xdrip.svg b/icons/xdrip.svg
new file mode 100644
index 0000000000..a0b9c3ecdd
--- /dev/null
+++ b/icons/xdrip.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
+		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
+		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
+		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
+		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+</g>
+<g id="xdrip">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
+		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+</svg>

From 732e8c5b55494b8d3f14cc5c677d2b1ab9391b37 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 12 Jun 2020 22:49:29 +0200
Subject: [PATCH 192/400] Update source svg files

---
 icons/actions_cancelextbolus.svg | 112 --------------------------
 icons/actions_startextbolus.svg  | 112 --------------------------
 icons/bolus.svg                  |  22 +----
 icons/calculator.svg             |  52 ------------
 icons/calibration.svg            | 134 -------------------------------
 icons/cp_basal_no_tbr.svg        |  16 ----
 icons/cp_basal_tbr_high.svg      |  15 ----
 icons/cp_basal_tbr_low.svg       |  17 +---
 icons/cp_bolus_carbs.svg         |  77 ------------------
 icons/quickwizard.svg            |  36 +--------
 icons/xdrip.svg                  | 127 -----------------------------
 11 files changed, 3 insertions(+), 717 deletions(-)

diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
index 39c3677207..5c5b4070cb 100644
--- a/icons/actions_cancelextbolus.svg
+++ b/icons/actions_cancelextbolus.svg
@@ -3,118 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
-<g id="actions_x5F_startextbolus" display="none">
-	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
-</g>
 <g id="actions_x5F_cancelextbolus">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<g>
diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg
index 5b5b57d634..0c5d79384a 100644
--- a/icons/actions_startextbolus.svg
+++ b/icons/actions_startextbolus.svg
@@ -3,106 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
 <g id="actions_x5F_startextbolus">
 	<path fill="none" d="M-0.002,0h24v24h-24V0z"/>
 	<path fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
@@ -114,16 +14,4 @@
 		l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001c0.08,0,0.157-0.029,0.217-0.083
 		c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
 </g>
-<g id="Layer_10" display="none">
-	<path fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.716,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598C7.6,7.303,5.23,10.053,5.23,13.35c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.77,10.989,17.553,8.909,15.716,7.697z M12,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		S8.819,7.58,12,7.58s5.77,2.588,5.77,5.77S15.182,19.119,12,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12.002,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.535,10.85,14.502,8.816,12.002,8.814z"/>
-</g>
 </svg>
diff --git a/icons/bolus.svg b/icons/bolus.svg
index 7afcbe0dfa..24108f0e2e 100644
--- a/icons/bolus.svg
+++ b/icons/bolus.svg
@@ -3,27 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Layer_5">
+<g id="bolus">
 	<path fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89L1.571,3.501
 		L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564c-0.26,0.343-0.193,0.832,0.15,1.092
 		s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948c-0.26,0.343-0.193,0.832,0.15,1.092
diff --git a/icons/calculator.svg b/icons/calculator.svg
index 51033925b5..5a8b336a61 100644
--- a/icons/calculator.svg
+++ b/icons/calculator.svg
@@ -3,58 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
 <g id="calculator">
 	<path display="none" fill="none" d="M0,0h24v24H0V0z"/>
 	<path fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292c0,0.063,0.051,0.113,0.113,0.113h4.083
diff --git a/icons/calibration.svg b/icons/calibration.svg
index 75d9d9be9a..8db9f88fe9 100644
--- a/icons/calibration.svg
+++ b/icons/calibration.svg
@@ -3,140 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
-<g id="actions_x5F_startextbolus" display="none">
-	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
-</g>
-<g id="actions_x5F_cancelextbolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<g display="inline">
-		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
-			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
-			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
-			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
-			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
-		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
-	</g>
-	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
-		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
-</g>
-<g id="xdrip" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
-		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
-		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
-		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
-</g>
 <g id="calibration">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<path fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
index 970cede3cd..392131c288 100644
--- a/icons/cp_basal_no_tbr.svg
+++ b/icons/cp_basal_no_tbr.svg
@@ -3,22 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
 <g id="cp_x5F_basal_x5F_no_x5F_tbr">
 	<path fill="none" d="M0,0.021h24v24H0V0.021z"/>
 	<rect x="3.667" y="11.646" fill="#CF8BFE" width="15.417" height="0.709"/>
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
index de6ff777ce..ab4c194894 100644
--- a/icons/cp_basal_tbr_high.svg
+++ b/icons/cp_basal_tbr_high.svg
@@ -3,24 +3,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
 <g id="cp_x5F_basal_x5F_tbr_x5F_high">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<polygon fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 3.667,17.896 3.667,17.188 
 		12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
 </g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
 </svg>
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
index c7459314a8..4b2fe0df38 100644
--- a/icons/cp_basal_tbr_low.svg
+++ b/icons/cp_basal_tbr_low.svg
@@ -3,24 +3,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
 <g id="cp_x5F_basal_x5F_tbr_x5F_low">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 12.729,17.146 
+	<polygon fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 12.729,17.146
 		16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
 </g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
 </svg>
diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg
index 867515d55a..b62b07c538 100644
--- a/icons/cp_bolus_carbs.svg
+++ b/icons/cp_bolus_carbs.svg
@@ -3,83 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
 <g id="cp_x5F_bolus_x5F_carbs">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<path fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg
index e84fda2d37..bdfab6bdd9 100644
--- a/icons/quickwizard.svg
+++ b/icons/quickwizard.svg
@@ -3,41 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="Layer_6">
+<g id="quickwizard">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<path fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
 		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
diff --git a/icons/xdrip.svg b/icons/xdrip.svg
index a0b9c3ecdd..6d9cdefd0d 100644
--- a/icons/xdrip.svg
+++ b/icons/xdrip.svg
@@ -3,133 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-	<polygon display="inline" points="5.437,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.437,11.267 
-		7.783,8.921 8.517,9.654 6.171,12 8.517,14.346 7.783,15.079 	"/>
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 
-		12.729,17.146 16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 
-		3.667,17.896 3.667,17.188 12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" display="inline" fill="#CF8BFE" width="15.417" height="0.709"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
-<g id="actions_x5F_startextbolus" display="none">
-	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
-</g>
-<g id="actions_x5F_cancelextbolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<g display="inline">
-		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
-			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
-			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
-			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
-			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
-		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
-	</g>
-	<polygon display="inline" fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 
-		4.729,8.391 7.075,6.045 7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
-</g>
 <g id="xdrip">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
 	<path fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811

From 5ef52ea90f676e098ee857e42359cb53b9b3dccd Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 13 Jun 2020 17:37:52 +0200
Subject: [PATCH 193/400] Some new vector icons again

---
 .../automation/triggers/TriggerBolusAgo.kt    |  2 +-
 .../general/overview/OverviewFragment.kt      |  2 +-
 .../drawable/ic_actions_cancelextbolus.xml    | 12 ++++++-----
 .../drawable/ic_actions_starttempbasal.xml    |  9 ++++++++
 app/src/main/res/drawable/ic_cancelbasal.xml  | 10 +++++++++
 app/src/main/res/drawable/ic_cp_basal_end.xml | 10 +++++++++
 .../main/res/drawable/ic_cp_basal_no_tbr.xml  | 11 +++++-----
 .../main/res/drawable/ic_cp_basal_start.xml   |  9 ++++++++
 .../res/drawable/ic_cp_basal_tbr_high.xml     | 11 +++++-----
 .../main/res/drawable/ic_cp_basal_tbr_low.xml | 11 +++++-----
 .../res/drawable/ic_cp_bolus_correction.xml   | 12 +++++++++++
 app/src/main/res/drawable/ic_x_swap_vert.xml  | 10 +++++++++
 .../drawable/ic_x_swap_vert_48px_green.xml    |  9 --------
 app/src/main/res/layout/actions_fragment.xml  |  4 ++--
 .../main/res/layout/careportal_fragment.xml   |  8 +++----
 app/src/main/res/layout/omnipod_fragment.xml  |  2 +-
 .../triggers/TriggerBolusAgoTest.kt           |  2 +-
 icons/actions_cancelextbolus.svg              |  8 +++++--
 icons/cp_basal_end.svg                        | 16 ++++++++++++++
 icons/cp_basal_no_tbr.svg                     |  2 +-
 icons/cp_basal_tbr_high.svg                   |  4 ++--
 icons/cp_basal_tbr_low.svg                    |  4 ++--
 icons/cp_bolus_correction.svg                 | 21 +++++++++++++++++++
 icons/x_swap_vert.svg                         | 18 ++++++++++------
 24 files changed, 155 insertions(+), 52 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_actions_starttempbasal.xml
 create mode 100644 app/src/main/res/drawable/ic_cancelbasal.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_basal_end.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_basal_start.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_correction.xml
 create mode 100644 app/src/main/res/drawable/ic_x_swap_vert.xml
 delete mode 100644 app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
 create mode 100644 icons/cp_basal_end.svg
 create mode 100644 icons/cp_bolus_correction.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
index 4b7a56771a..2e2360daf3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
@@ -77,7 +77,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.lastboluscompared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.getMinutes())
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_bolus)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bolus)
 
     override fun duplicate(): Trigger = TriggerBolusAgo(injector, this)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index a5d21ba956..320cf82112 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -775,7 +775,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
             overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
         } else {
-            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green)
+            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert)
         }
 
         overview_sensitivity?.text =
diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
index da158703a1..913b1b9aeb 100644
--- a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
+++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml
@@ -1,7 +1,6 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
@@ -11,6 +10,9 @@
       android:pathData="M16.45,8.814c-0.086,0 -0.169,0.035 -0.23,0.096s-0.096,0.144 -0.096,0.23v4.198c0,0.08 0.029,0.157 0.083,0.217l2.789,3.14c0.058,0.064 0.139,0.104 0.226,0.108c0.006,0.001 0.013,0.001 0.019,0.001c0.08,0 0.157,-0.029 0.217,-0.083c0.971,-0.866 1.527,-2.095 1.527,-3.372C20.983,10.85 18.95,8.816 16.45,8.814z"
       android:fillColor="#FEAF05"/>
   <path
-      android:pathData="M4.729,9.857l-2.346,2.346l-0.733,-0.733l2.346,-2.346l-2.346,-2.346l0.733,-0.733l2.346,2.346l2.346,-2.346l0.733,0.733l-2.345,2.346l2.345,2.346l-0.733,0.733z"
+      android:pathData="M1.972,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C2.228,12.333 2.1,12.381 1.972,12.381z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M7.486,12.381c-0.128,0 -0.256,-0.049 -0.354,-0.146L1.618,6.721c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C7.743,12.333 7.614,12.381 7.486,12.381z"
       android:fillColor="#FEAF05"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_actions_starttempbasal.xml b/app/src/main/res/drawable/ic_actions_starttempbasal.xml
new file mode 100644
index 0000000000..1b7781daed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_starttempbasal.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cancelbasal.xml b/app/src/main/res/drawable/ic_cancelbasal.xml
new file mode 100644
index 0000000000..76640a4534
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cancelbasal.xml
@@ -0,0 +1,10 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_end.xml b/app/src/main/res/drawable/ic_cp_basal_end.xml
new file mode 100644
index 0000000000..76640a4534
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_end.xml
@@ -0,0 +1,10 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#CF8BFE" android:pathData="M3.923,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708l-5.514,5.514C4.179,11.972 4.051,12.021 3.923,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M9.438,12.021c-0.128,0 -0.256,-0.049 -0.354,-0.146L3.569,6.361c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C9.694,11.972 9.566,12.021 9.438,12.021z"/>
+    <path android:fillColor="#CF8BFE" android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
index 71abd83757..840a639f9c 100644
--- a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     android:viewportWidth="24"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#CF8BFE" android:pathData="M3.667,11.646h15.417v0.709h-15.417z"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.517,11.496h15.717v1.009h-15.717z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml
new file mode 100644
index 0000000000..1b7781daed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_basal_start.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
index 140ba3ad92..1b7781daed 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     android:viewportWidth="24"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#CF8BFE" android:pathData="M19.083,17.896l-2.354,0l0,-11.042l-4,0l0,11.042l-9.062,0l0,-0.708l8.354,0l0,-11.042l5.417,0l0,11.042l1.645,0z"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
index 53ce1c5c6c..9f3d94563f 100644
--- a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
+++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml
@@ -1,8 +1,9 @@
-<vector
-    android:height="48dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="48dp"
-    android:viewportHeight="24"
+    android:height="48dp"
     android:viewportWidth="24"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#CF8BFE" android:pathData="M17.438,17.854l-5.417,0l0,-11.041l-8.354,0l0,-0.709l9.062,0l0,11.042l4,0l0,-11.042l2.354,0l0,0.709l-1.645,0z"/>
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.871,18.026l0,-11.042l-8.354,0l0,-1.009l9.363,0l0,11.041l3.698,0l0,-11.041l2.655,0l0,1.009l-1.645,0l0,11.042z"
+      android:fillColor="#CF8BFE"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_correction.xml b/app/src/main/res/drawable/ic_cp_bolus_correction.xml
new file mode 100644
index 0000000000..e14bb7c14f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_correction.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.578,18.026l0,-11.042l-3.698,0l0,11.042l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M2.852,13.946c-0.248,0 -0.498,-0.123 -0.74,-0.366c-0.49,-0.49 -0.492,-0.986 -0.004,-1.474l3.125,-3.125C5.106,8.737 5.048,8.435 5.048,8.136c0,-1.336 1.172,-2.508 2.508,-2.508c0.282,0 0.572,0.055 0.864,0.163c0.186,0.069 0.347,0.148 0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046,-1.116l0.374,-0.374c0.171,0.154 0.25,0.315 0.319,0.501c0.108,0.292 0.163,0.583 0.163,0.864c0,0.67 -0.261,1.3 -0.734,1.773c-0.473,0.474 -1.103,0.734 -1.773,0.735c-0.298,0 -0.6,-0.058 -0.898,-0.173l-3.072,3.113C3.346,13.824 3.099,13.946 2.852,13.946zM7.556,6.237c-0.507,0 -0.984,0.198 -1.342,0.556C5.855,7.152 5.657,7.629 5.657,8.136c0,0.153 0.024,0.313 0.076,0.5c0.046,0.168 0.114,0.326 0.2,0.47l0.022,0.037c0,0 -0.139,0.115 -0.168,0.146l-3.249,3.248c-0.26,0.26 -0.227,0.381 0.004,0.612c0.134,0.134 0.219,0.186 0.304,0.186c0.085,0 0.184,-0.058 0.308,-0.182l3.249,-3.249c0.03,-0.03 0.104,-0.12 0.104,-0.12l0.078,-0.026c0.146,0.087 0.304,0.155 0.471,0.2c0.186,0.052 0.344,0.076 0.499,0.076c1.009,0 1.896,-0.887 1.898,-1.898c0,-0.134 -0.018,-0.274 -0.054,-0.43L8.342,8.872C8.284,8.929 8.208,8.961 8.126,8.961c-0.081,0 -0.158,-0.032 -0.215,-0.089L6.82,7.78c-0.119,-0.119 -0.119,-0.313 0,-0.431l1.143,-1.142C7.886,6.235 7.807,6.241 7.729,6.241C7.67,6.241 7.556,6.237 7.556,6.237z"
+      android:fillColor="#E93057"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert.xml b/app/src/main/res/drawable/ic_x_swap_vert.xml
new file mode 100644
index 0000000000..f5182fe7b4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_x_swap_vert.xml
@@ -0,0 +1,10 @@
+<vector
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#008585" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+    <path android:fillColor="#008585" android:pathData="M2.756,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146c-0.195,-0.195 -0.195,-0.512 0,-0.707l5.514,-5.515c0.196,-0.195 0.512,-0.196 0.708,0c0.195,0.195 0.195,0.512 0,0.708L3.11,15.124C3.012,15.222 2.884,15.271 2.756,15.271z"/>
+    <path android:fillColor="#008585" android:pathData="M8.271,15.271c-0.128,0 -0.256,-0.049 -0.354,-0.146L2.403,9.61c-0.196,-0.196 -0.196,-0.512 0,-0.708c0.195,-0.196 0.512,-0.196 0.708,0l5.514,5.515c0.196,0.195 0.196,0.512 0,0.707C8.527,15.222 8.399,15.271 8.271,15.271z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
deleted file mode 100644
index 9484c2cd6f..0000000000
--- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector
-    android:tint="#008585"
-    android:height="48dp"
-    android:width="48dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.375,17.01V10h-2v7.01h-3l4,3.99l4,-3.99H19.375zM12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-    <path android:fillColor="#FF000000" android:pathData="M5.438,12.733l-2.346,2.346l-0.734,-0.733l2.346,-2.346l-2.346,-2.346l0.734,-0.733l2.346,2.346l2.345,-2.346l0.734,0.733l-2.346,2.346l2.346,2.346l-0.734,0.733z"/>
-</vector>
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index ce86d871ea..9b126fb8d1 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -60,7 +60,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_starttempbasal"
+                android:drawableTop="@drawable/ic_actions_starttempbasal"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/overview_tempbasal_button"
@@ -75,7 +75,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_cancelbasal"
+                android:drawableTop="@drawable/ic_cancelbasal"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/canceltemp"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 1f2da353da..44d5f957f0 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -138,7 +138,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:drawableTop="@drawable/ic_cp_bolus_correction"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_correctionbolus"
@@ -166,7 +166,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_correction"
+                        android:drawableTop="@drawable/ic_cp_bolus_correction"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_combobolus"
@@ -180,7 +180,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_basal_start"
+                        android:drawableTop="@drawable/ic_cp_basal_start"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_tempbasalstart"
@@ -194,7 +194,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_basal_end"
+                        android:drawableTop="@drawable/ic_cp_basal_end"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_tempbasalend"
diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml
index e5e450c141..f6d13171ce 100644
--- a/app/src/main/res/layout/omnipod_fragment.xml
+++ b/app/src/main/res/layout/omnipod_fragment.xml
@@ -618,7 +618,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_cp_bolus_correction"
+                    android:drawableTop="@drawable/ic_cp_bolus_correction"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_read_pulse_log_short"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
index a1400ae55f..b1aefd5b3a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt
@@ -79,6 +79,6 @@ class TriggerBolusAgoTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_bolus), TriggerBolusAgo(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_bolus), TriggerBolusAgo(injector).icon())
     }
 }
\ No newline at end of file
diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
index 5c5b4070cb..98c7fa503b 100644
--- a/icons/actions_cancelextbolus.svg
+++ b/icons/actions_cancelextbolus.svg
@@ -15,7 +15,11 @@
 			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
 			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
 	</g>
-	<polygon fill="#FEAF05" points="4.729,9.857 2.383,12.203 1.65,11.47 3.996,9.124 1.65,6.778 2.383,6.045 4.729,8.391 7.075,6.045 
-		7.808,6.778 5.463,9.124 7.808,11.47 7.075,12.203 	"/>
+	<g>
+		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
+		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
+	</g>
 </g>
 </svg>
diff --git a/icons/cp_basal_end.svg b/icons/cp_basal_end.svg
new file mode 100644
index 0000000000..f510137ad0
--- /dev/null
+++ b/icons/cp_basal_end.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_basal_x5F_end">
+	<g>
+		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
+		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
+	</g>
+	<polygon fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 11.871,17.016 
+		11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
index 392131c288..198afcf383 100644
--- a/icons/cp_basal_no_tbr.svg
+++ b/icons/cp_basal_no_tbr.svg
@@ -5,6 +5,6 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_no_x5F_tbr">
 	<path fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.667" y="11.646" fill="#CF8BFE" width="15.417" height="0.709"/>
+	<rect x="3.517" y="11.496" fill="#CF8BFE" width="15.717" height="1.009"/>
 </g>
 </svg>
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
index ab4c194894..eaa4f986ff 100644
--- a/icons/cp_basal_tbr_high.svg
+++ b/icons/cp_basal_tbr_high.svg
@@ -5,7 +5,7 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_high">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon fill="#CF8BFE" points="19.083,17.896 16.729,17.896 16.729,6.854 12.729,6.854 12.729,17.896 3.667,17.896 3.667,17.188 
-		12.021,17.188 12.021,6.146 17.438,6.146 17.438,17.188 19.083,17.188 	"/>
+	<polygon fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 11.871,17.023 
+		11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
 </g>
 </svg>
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
index 4b2fe0df38..d591a1941f 100644
--- a/icons/cp_basal_tbr_low.svg
+++ b/icons/cp_basal_tbr_low.svg
@@ -5,7 +5,7 @@
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_low">
 	<path fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon fill="#CF8BFE" points="17.438,17.854 12.021,17.854 12.021,6.813 3.667,6.813 3.667,6.104 12.729,6.104 12.729,17.146
-		16.729,17.146 16.729,6.104 19.083,6.104 19.083,6.813 17.438,6.813 	"/>
+	<polygon fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 16.578,17.016 
+		16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
 </g>
 </svg>
diff --git a/icons/cp_bolus_correction.svg b/icons/cp_bolus_correction.svg
new file mode 100644
index 0000000000..1ccec87132
--- /dev/null
+++ b/icons/cp_bolus_correction.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_correction">
+	<polygon fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 11.871,17.016 
+		11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+	<path fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474l3.125-3.125
+		C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
+		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
+		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
+		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
+		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
+		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
+		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
+		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
+		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
+		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index 9a9087c413..6af56d0df4 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<path d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
-<path fill="none" d="M0,0h24v24H0V0z"/>
-<polygon points="5.438,12.733 3.092,15.079 2.358,14.346 4.704,12 2.358,9.654 3.092,8.921 5.438,11.267 7.783,8.921 8.517,9.654 
-	6.171,12 8.517,14.346 7.783,15.079 "/>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert">
+	<path fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3L12.375,3z"/>
+	<g>
+		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
+		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
+	</g>
+</g>
 </svg>

From 129c3d82d698a2cee4ab3cd574ce33d6ffdd810b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 14 Jun 2020 01:57:54 +0200
Subject: [PATCH 194/400] Seven loop icons done

---
 .../general/overview/OverviewFragment.kt      |  16 +-
 app/src/main/res/drawable/ic_loop_closed.xml  |   9 +
 .../main/res/drawable/ic_loop_disabled.xml    |  15 +
 .../res/drawable/ic_loop_disconnected.xml     |  12 +
 app/src/main/res/drawable/ic_loop_lgs.xml     |  24 ++
 app/src/main/res/drawable/ic_loop_open.xml    |  27 ++
 app/src/main/res/drawable/ic_loop_paused.xml  |  15 +
 .../main/res/drawable/ic_loop_superbolus.xml  |  12 +
 .../main/res/layout/overview_info_layout.xml  |   2 +-
 icons/loop_closed.svg                         |  13 +
 icons/loop_disabled.svg                       |  19 +
 icons/loop_disconnected.svg                   |  17 +
 icons/loop_lgs.svg                            | 334 +++++++++++++++++
 icons/loop_open.svg                           | 347 ++++++++++++++++++
 icons/loop_paused.svg                         |  15 +
 icons/loop_superbolus.svg                     |  34 ++
 16 files changed, 902 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_loop_closed.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_disabled.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_disconnected.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_lgs.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_open.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_paused.xml
 create mode 100644 app/src/main/res/drawable/ic_loop_superbolus.xml
 create mode 100644 icons/loop_closed.svg
 create mode 100644 icons/loop_disabled.svg
 create mode 100644 icons/loop_disconnected.svg
 create mode 100644 icons/loop_lgs.svg
 create mode 100644 icons/loop_open.svg
 create mode 100644 icons/loop_paused.svg
 create mode 100644 icons/loop_superbolus.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 320cf82112..37c3d17b61 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -598,42 +598,42 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_apsmode?.visibility = View.VISIBLE
             when {
                 loopPlugin.isEnabled() && loopPlugin.isSuperBolus                       -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_superbolus)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_superbolus)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 loopPlugin.isDisconnected                                               -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_disconnected)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_disconnected)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 loopPlugin.isEnabled() && loopPlugin.isSuspended                        -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_paused)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_paused)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 pump.isSuspended                                                        -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_paused)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_paused)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_lgs)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_lgs)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value()                     -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_closed)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_closed)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && !closedLoopEnabled.value()                    -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_open)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_open)
                     overview_apsmode_text?.text = ""
                 }
 
                 else                                                                    -> {
-                    overview_apsmode.setImageResource(R.drawable.loop_disabled)
+                    overview_apsmode.setImageResource(R.drawable.ic_loop_disabled)
                     overview_apsmode_text?.text = ""
                 }
             }
diff --git a/app/src/main/res/drawable/ic_loop_closed.xml b/app/src/main/res/drawable/ic_loop_closed.xml
new file mode 100644
index 0000000000..1cb9278a1a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_closed.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#00C03E"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_disabled.xml b/app/src/main/res/drawable/ic_loop_disabled.xml
new file mode 100644
index 0000000000..ed79c96429
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_disabled.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#FF1313"/>
+  <path
+      android:pathData="M10.2429,8.7408l5.0162,5.0162l-1.5026,1.5026l-5.0162,-5.0162z"
+      android:fillColor="#FF1313"/>
+  <path
+      android:pathData="M8.7408,13.7571l5.0162,-5.0162l1.5026,1.5026l-5.0162,5.0162z"
+      android:fillColor="#FF1313"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_disconnected.xml b/app/src/main/res/drawable/ic_loop_disconnected.xml
new file mode 100644
index 0000000000..81450ade17
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_disconnected.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.523,3.764c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938c0,1.803 0.484,3.49 1.325,4.945l-0.319,0.365c-0.001,0.842 0.325,1.681 1.01,2.277l2.416,2.103l0.872,-1.002l1.746,1.523l0.472,-0.542l-1.747,-1.523l1.272,-1.461l1.748,1.524l0.472,-0.542l-1.749,-1.525l0.872,-1.001l-2.416,-2.103c-0.684,-0.596 -1.557,-0.803 -2.39,-0.687l-0.277,0.318c-0.335,-0.825 -0.528,-1.723 -0.528,-2.67c0,-3.952 3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784L17.523,3.764z"
+      android:fillColor="#939393"/>
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,0.938 -0.183,1.833 -0.511,2.653l-0.263,-0.302c-0.833,-0.116 -1.706,0.091 -2.39,0.687l-2.416,2.103l3.96,4.549l2.416,-2.103c0.685,-0.596 1.011,-1.435 1.01,-2.277l-0.346,-0.397C21.51,15.526 22,13.855 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#939393"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_lgs.xml b/app/src/main/res/drawable/ic_loop_lgs.xml
new file mode 100644
index 0000000000..c7b5dcd0b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_lgs.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M12.922,2.189l0.003,2.773c0.754,0.093 1.472,0.301 2.135,0.608c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538C16.182,2.88 14.61,2.336 12.922,2.189z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M4.963,11.199c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351L4.963,11.199z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156c-2.345,0 -4.42,-1.133 -5.725,-2.876l-2.421,1.401C5.712,20.315 8.689,22 12.063,22C17.551,22 22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#00C03E"/>
+  <path
+      android:pathData="M5.478,14.867c-0.262,-0.614 -0.436,-1.272 -0.517,-1.96L2.168,12.91c0.101,1.191 0.414,2.319 0.898,3.353L5.478,14.867z"
+      android:fillColor="#00C03E"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_open.xml b/app/src/main/res/drawable/ic_loop_open.xml
new file mode 100644
index 0000000000..3f00a12c23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_open.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.349,7.767c0.408,-0.542 0.89,-1.022 1.433,-1.429L6.38,3.917C5.424,4.584 4.593,5.415 3.924,6.37L6.349,7.767z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M3.072,7.85c-0.485,1.034 -0.801,2.16 -0.903,3.351l2.795,-0.003c0.083,-0.687 0.259,-1.345 0.523,-1.958L3.072,7.85z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M21.059,7.862l-2.412,1.396c0.262,0.614 0.437,1.272 0.518,1.96l2.793,-0.003C21.856,10.024 21.543,8.896 21.059,7.862z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M17.787,7.781l2.421,-1.401c-0.668,-0.956 -1.499,-1.787 -2.454,-2.456l-1.397,2.425C16.9,6.757 17.38,7.238 17.787,7.781z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M19.162,12.926c-0.427,3.544 -3.44,6.293 -7.099,6.293c-3.666,0 -6.684,-2.758 -7.102,-6.312L2.168,12.91C2.599,18.001 6.86,22 12.063,22c5.198,0 9.457,-3.992 9.894,-9.077L19.162,12.926z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M9.258,5.478c0.613,-0.262 1.272,-0.436 1.959,-0.517l-0.003,-2.793c-1.191,0.101 -2.318,0.414 -3.352,0.898L9.258,5.478z"
+      android:fillColor="#4983D7"/>
+  <path
+      android:pathData="M12.925,4.963c0.687,0.083 1.345,0.259 1.958,0.522l1.391,-2.414c-1.034,-0.485 -2.161,-0.801 -3.352,-0.903L12.925,4.963z"
+      android:fillColor="#4983D7"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_paused.xml b/app/src/main/res/drawable/ic_loop_paused.xml
new file mode 100644
index 0000000000..4b7951d4d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_paused.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#FFFF13"/>
+  <path
+      android:pathData="M8.813,8.453h2.125v7.094h-2.125z"
+      android:fillColor="#FFFF13"/>
+  <path
+      android:pathData="M13.063,8.453h2.125v7.094h-2.125z"
+      android:fillColor="#FFFF13"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loop_superbolus.xml b/app/src/main/res/drawable/ic_loop_superbolus.xml
new file mode 100644
index 0000000000..2f94edf2c4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_loop_superbolus.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,9.343l-5.781,-3.968l-1.328,6.688l2.102,-1.757c0.014,0.056 0.03,0.111 0.043,0.168c0.116,0.512 0.183,1.042 0.183,1.589c0,3.952 -3.204,7.156 -7.156,7.156s-7.156,-3.204 -7.156,-7.156s3.204,-7.156 7.156,-7.156c1.072,0 2.085,0.242 2.998,0.665c0.325,0.151 0.639,0.321 0.936,0.517l0.002,-0.002l-0.352,-1.784l1.876,-0.538c-1.567,-1.033 -3.442,-1.639 -5.46,-1.639c-5.488,0 -9.938,4.449 -9.938,9.938S6.574,22 12.063,22S22,17.551 22,12.063c0,-0.759 -0.093,-1.496 -0.254,-2.206c-0.04,-0.176 -0.085,-0.35 -0.134,-0.523L24,9.343L24,9.343z"
+      android:fillColor="#FEAD01"/>
+  <path
+      android:pathData="M15.026,13.715c-0.267,0.334 -0.555,0.58 -0.875,0.798c-0.304,0.206 -0.678,0.313 -0.966,0.376c-0.552,0.1 -0.201,0.151 0.077,0.528c-1.002,1.431 -2.69,1.526 -4.098,0.796c-0.113,-0.059 -0.219,-0.132 -0.324,-0.205c-0.222,-0.152 -0.32,-0.189 -0.506,0.003c-0.151,0.155 -0.504,0.496 -0.684,0.673l-0.394,-0.427c0.193,-0.176 0.417,-0.394 0.577,-0.545c0.349,-0.328 0.27,-0.368 -0.009,-0.767c-0.968,-1.386 -0.672,-3.195 0.69,-4.207c0.58,0.372 0.455,0.284 0.643,-0.263c0.201,-0.583 0.544,-1.081 1.064,-1.427c0.529,0.467 0.441,0.254 0.654,-0.282c0.23,-0.58 0.59,-1.052 1.087,-1.451c0.559,0.368 0.815,0.776 1.006,1.236c0.219,0.527 0.304,0.35 0.689,-0.024c0.822,-0.797 1.826,-1.113 2.805,-0.873c0.23,1.274 -0.314,2.414 -1.494,3.159c0.619,0.167 1.205,0.502 1.78,1.179c-0.352,0.516 -0.974,1.011 -1.601,1.117C14.247,13.26 14.753,13.295 15.026,13.715zM15.918,8.562c0.01,-0.355 -0.102,-0.449 -0.41,-0.408c-0.999,0.134 -1.939,1.031 -2.105,2.011c-0.058,0.339 0.121,0.52 0.459,0.442c0.215,-0.049 0.432,-0.116 0.629,-0.213C15.279,10.004 15.77,9.378 15.918,8.562zM12.764,9.962c0.009,-0.561 -0.185,-1.011 -0.454,-1.433c-0.259,-0.406 -0.438,-0.405 -0.697,-0.009c-0.598,0.914 -0.355,1.977 0.122,2.758c0.152,0.25 0.358,0.252 0.537,0.009C12.57,10.882 12.775,10.436 12.764,9.962zM10.889,16.107c0.415,0 1,-0.187 1.3,-0.414c0.255,-0.193 0.276,-0.35 0.024,-0.524c-0.935,-0.644 -1.891,-0.785 -2.88,-0.096c-0.333,0.232 -0.314,0.421 0.05,0.635C9.848,15.981 10.355,16.096 10.889,16.107zM11.037,11.638c0.016,-0.535 -0.186,-0.998 -0.457,-1.435c-0.254,-0.407 -0.427,-0.398 -0.686,0.021c-0.5,0.806 -0.458,1.935 0.101,2.707c0.194,0.268 0.361,0.285 0.568,0.024C10.866,12.571 11.048,12.136 11.037,11.638zM14.217,12.716c0.531,-0.002 1.109,-0.174 1.411,-0.403c0.257,-0.196 0.264,-0.324 0.029,-0.53c-0.752,-0.659 -2.116,-0.702 -2.896,-0.091c-0.282,0.221 -0.288,0.423 0.015,0.592C13.239,12.543 13.729,12.732 14.217,12.716zM7.835,13.214c-0.019,0.44 0.1,0.897 0.359,1.312c0.245,0.392 0.457,0.397 0.717,0.029c0.566,-0.8 0.518,-2.014 -0.108,-2.762c-0.204,-0.244 -0.378,-0.243 -0.573,0.024C7.939,12.217 7.829,12.674 7.835,13.214zM12.42,12.948c-0.536,-0.025 -1.004,0.155 -1.422,0.473c-0.209,0.159 -0.218,0.334 -0.004,0.511c0.685,0.566 2.162,0.614 2.891,0.091c0.295,-0.212 0.302,-0.387 0.004,-0.583C13.445,13.147 12.968,12.935 12.42,12.948z"
+      android:fillColor="#FEAD01"/>
+</vector>
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index ecc5ee7183..9794abeaff 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -83,7 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="-4dp"
-            android:src="@drawable/loop_closed" />
+            android:src="@drawable/ic_loop_closed" />
 
         <TextView
             android:id="@+id/overview_apsmode_text"
diff --git a/icons/loop_closed.svg b/icons/loop_closed.svg
new file mode 100644
index 0000000000..2621c3348b
--- /dev/null
+++ b/icons/loop_closed.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="loop_x5F_closed">
+	<path fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+</svg>
diff --git a/icons/loop_disabled.svg b/icons/loop_disabled.svg
new file mode 100644
index 0000000000..d5b8858159
--- /dev/null
+++ b/icons/loop_disabled.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="loop_x5F_disabled">
+	<path fill="#FF1313" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<g>
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12 -4.9706)" fill="#FF1313" width="7.094" height="2.125"/>
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.9706 12)" fill="#FF1313" width="7.094" height="2.125"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/loop_disconnected.svg b/icons/loop_disconnected.svg
new file mode 100644
index 0000000000..27f651704e
--- /dev/null
+++ b/icons/loop_disconnected.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="loop_x5F_disconnected">
+	<path fill="#939393" d="M17.523,3.764c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938
+		c0,1.803,0.484,3.49,1.325,4.945l-0.319,0.365c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l0.872-1.002l1.746,1.523
+		l0.472-0.542l-1.747-1.523l1.272-1.461l1.748,1.524l0.472-0.542l-1.749-1.525l0.872-1.001l-2.416-2.103
+		c-0.684-0.596-1.557-0.803-2.39-0.687l-0.277,0.318c-0.335-0.825-0.528-1.723-0.528-2.67c0-3.952,3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784L17.523,3.764z"/>
+	<path fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,0.938-0.183,1.833-0.511,2.653l-0.263-0.302c-0.833-0.116-1.706,0.091-2.39,0.687
+		l-2.416,2.103l3.96,4.549l2.416-2.103c0.685-0.596,1.011-1.435,1.01-2.277l-0.346-0.397C21.51,15.526,22,13.855,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+</svg>
diff --git a/icons/loop_lgs.svg b/icons/loop_lgs.svg
new file mode 100644
index 0000000000..5dc70ea8dc
--- /dev/null
+++ b/icons/loop_lgs.svg
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3
+		L12.375,3z"/>
+	<g display="inline">
+		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
+		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
+	</g>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 
+		16.578,17.016 16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 
+		11.871,17.023 11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.517" y="11.496" display="inline" fill="#CF8BFE" width="15.717" height="1.009"/>
+</g>
+<g id="cp_x5F_basal_x5F_end" display="none">
+	<g display="inline">
+		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
+		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
+	</g>
+	<polygon display="inline" fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
+		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+</g>
+<g id="cp_x5F_bolus_x5F_correction" display="none">
+	<polygon display="inline" fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
+		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+	<path display="inline" fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474
+		l3.125-3.125C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
+		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
+		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
+		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
+		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
+		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
+		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
+		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
+		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
+		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<g display="inline">
+		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
+		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
+	</g>
+</g>
+<g id="xdrip" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
+		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+<g id="calibration" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
+		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
+		c-0.205,1.017-0.065,1.994,0.764,2.731c0.297,0.264,0.68,0.354,1.038,0.077c0.242-0.187,0.269-0.46,0.096-0.692
+		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
+	<path display="inline" fill="#E83258" d="M17.959,4.566c1.073,1.453,2.073,2.837,2.489,4.535c0.28,1.143-0.069,2.1-1.037,2.763
+		c-0.943,0.645-1.961,0.655-2.904,0.009c-0.967-0.662-1.318-1.635-1.041-2.769C15.88,7.408,16.875,6.019,17.959,4.566z"/>
+	<path display="inline" fill="#E83258" d="M14.82,14.425c0.797,1.094,1.535,2.104,1.819,3.355c0.188,0.826-0.096,1.498-0.784,1.965
+		c-0.669,0.454-1.393,0.467-2.067,0.014c-0.688-0.462-0.985-1.13-0.8-1.959C13.272,16.531,14.004,15.503,14.82,14.425z"/>
+</g>
+<g id="Raw_x5F_Objects" display="none">
+	<circle fill="#00CD40" cx="12.063" cy="12.063" r="9.938"/>
+	<circle fill="#FFFFFF" cx="12.063" cy="12.063" r="7.156"/>
+	<polygon fill="#00CD40" points="16.891,12.063 20.162,9.328 24,9.343 18.219,5.375 	"/>
+	
+		<line display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" x1="12.063" y1="4.953" x2="12.063" y2="2.125"/>
+	
+		<circle display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
+	<g display="inline">
+		<path fill="#939393" d="M5.299,19.329l1.944-1.987c-1.433-1.309-2.337-3.186-2.337-5.279c0-3.952,3.204-7.156,7.156-7.156
+			c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+			c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938C2.125,14.935,3.351,17.515,5.299,19.329z"/>
+		<path fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+			c0.116,0.512,0.183,1.042,0.183,1.589c0,2.461-1.243,4.63-3.134,5.918l2.1,1.899C20.504,18.06,22,15.239,22,12.063
+			c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	</g>
+	<g display="inline">
+		<g>
+			<g>
+				<g>
+					
+						<rect x="8.17" y="20.061" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -13.0797 13.707)" fill="#939393" width="0.719" height="2.344"/>
+					
+						<rect x="9.916" y="18.059" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -10.9723 14.3365)" fill="#939393" width="0.719" height="2.344"/>
+				</g>
+				<path fill="#939393" d="M5.711,14.414l-2.58,2.959c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l3.96-4.549l-2.416-2.103
+					C7.417,14.506,6.544,14.298,5.711,14.414z"/>
+			</g>
+		</g>
+		<g>
+			<g>
+				<path fill="#939393" d="M18.444,14.414l2.58,2.959c0.001,0.842-0.325,1.681-1.01,2.277l-2.416,2.103l-3.96-4.549l2.416-2.103
+					C16.738,14.506,17.612,14.298,18.444,14.414z"/>
+			</g>
+		</g>
+	</g>
+	<g display="inline">
+		
+			<rect x="-0.623" y="14.395" transform="matrix(0.8655 -0.5009 0.5009 0.8655 -6.7608 5.3183)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="-1.474" y="11.198" transform="matrix(1 -0.001 0.001 1 -0.0125 0.0059)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="-0.613" y="8.004" transform="matrix(0.8665 0.4991 -0.4991 0.8665 5.2929 -2.0783)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="1.729" y="5.668" transform="matrix(0.5009 0.8655 -0.8655 0.5009 10.0749 -4.4262)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="4.926" y="4.817" transform="matrix(0.001 1 -1 0.001 17.7304 -6.4067)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="8.12" y="5.678" transform="matrix(-0.4991 0.8665 -0.8665 -0.4991 28.5462 -3.4363)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="10.456" y="8.021" transform="matrix(-0.8655 0.5009 -0.5009 -0.8655 37.2824 7.7403)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="11.308" y="11.218" transform="matrix(-1 0.001 -0.001 -1 36.9192 24.1257)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="10.446" y="14.413" transform="matrix(-0.8665 -0.4991 0.4991 -0.8665 25.2167 37.2764)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="8.103" y="16.748" transform="matrix(-0.5009 -0.8655 0.8655 -0.5009 7.652 39.6179)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="4.906" y="17.6" transform="matrix(-0.001 -1 1 -0.001 -6.3894 30.525)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="1.712" y="16.738" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -10.8081 16.4877)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+	</g>
+	
+		<circle display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
+</g>
+<g id="loop_x5F_closed" display="none">
+	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+<g id="loop_x5F_disconnected" display="none">
+	<path display="inline" fill="#939393" d="M17.523,3.764c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938
+		c0,1.803,0.484,3.49,1.325,4.945l-0.319,0.365c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l0.872-1.002l1.746,1.523
+		l0.472-0.542l-1.747-1.523l1.272-1.461l1.748,1.524l0.472-0.542l-1.749-1.525l0.872-1.001l-2.416-2.103
+		c-0.684-0.596-1.557-0.803-2.39-0.687l-0.277,0.318c-0.335-0.825-0.528-1.723-0.528-2.67c0-3.952,3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784L17.523,3.764z"/>
+	<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,0.938-0.183,1.833-0.511,2.653l-0.263-0.302c-0.833-0.116-1.706,0.091-2.39,0.687
+		l-2.416,2.103l3.96,4.549l2.416-2.103c0.685-0.596,1.011-1.435,1.01-2.277l-0.346-0.397C21.51,15.526,22,13.855,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+<g id="loop_x5F_superbolus" display="none">
+	<path display="inline" fill="#FEAD01" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<path display="inline" fill="#FEAD01" d="M15.026,13.715c-0.267,0.334-0.555,0.58-0.875,0.798
+		c-0.304,0.206-0.678,0.313-0.966,0.376c-0.552,0.1-0.201,0.151,0.077,0.528c-1.002,1.431-2.69,1.526-4.098,0.796
+		c-0.113-0.059-0.219-0.132-0.324-0.205c-0.222-0.152-0.32-0.189-0.506,0.003c-0.151,0.155-0.504,0.496-0.684,0.673l-0.394-0.427
+		c0.193-0.176,0.417-0.394,0.577-0.545c0.349-0.328,0.27-0.368-0.009-0.767c-0.968-1.386-0.672-3.195,0.69-4.207
+		c0.58,0.372,0.455,0.284,0.643-0.263c0.201-0.583,0.544-1.081,1.064-1.427c0.529,0.467,0.441,0.254,0.654-0.282
+		c0.23-0.58,0.59-1.052,1.087-1.451c0.559,0.368,0.815,0.776,1.006,1.236c0.219,0.527,0.304,0.35,0.689-0.024
+		c0.822-0.797,1.826-1.113,2.805-0.873c0.23,1.274-0.314,2.414-1.494,3.159c0.619,0.167,1.205,0.502,1.78,1.179
+		c-0.352,0.516-0.974,1.011-1.601,1.117C14.247,13.26,14.753,13.295,15.026,13.715z M15.918,8.562
+		c0.01-0.355-0.102-0.449-0.41-0.408c-0.999,0.134-1.939,1.031-2.105,2.011c-0.058,0.339,0.121,0.52,0.459,0.442
+		c0.215-0.049,0.432-0.116,0.629-0.213C15.279,10.004,15.77,9.378,15.918,8.562z M12.764,9.962c0.009-0.561-0.185-1.011-0.454-1.433
+		c-0.259-0.406-0.438-0.405-0.697-0.009c-0.598,0.914-0.355,1.977,0.122,2.758c0.152,0.25,0.358,0.252,0.537,0.009
+		C12.57,10.882,12.775,10.436,12.764,9.962z M10.889,16.107c0.415,0,1-0.187,1.3-0.414c0.255-0.193,0.276-0.35,0.024-0.524
+		c-0.935-0.644-1.891-0.785-2.88-0.096c-0.333,0.232-0.314,0.421,0.05,0.635C9.848,15.981,10.355,16.096,10.889,16.107z
+		 M11.037,11.638c0.016-0.535-0.186-0.998-0.457-1.435c-0.254-0.407-0.427-0.398-0.686,0.021c-0.5,0.806-0.458,1.935,0.101,2.707
+		c0.194,0.268,0.361,0.285,0.568,0.024C10.866,12.571,11.048,12.136,11.037,11.638z M14.217,12.716
+		c0.531-0.002,1.109-0.174,1.411-0.403c0.257-0.196,0.264-0.324,0.029-0.53c-0.752-0.659-2.116-0.702-2.896-0.091
+		c-0.282,0.221-0.288,0.423,0.015,0.592C13.239,12.543,13.729,12.732,14.217,12.716z M7.835,13.214
+		c-0.019,0.44,0.1,0.897,0.359,1.312c0.245,0.392,0.457,0.397,0.717,0.029c0.566-0.8,0.518-2.014-0.108-2.762
+		c-0.204-0.244-0.378-0.243-0.573,0.024C7.939,12.217,7.829,12.674,7.835,13.214z M12.42,12.948
+		c-0.536-0.025-1.004,0.155-1.422,0.473c-0.209,0.159-0.218,0.334-0.004,0.511c0.685,0.566,2.162,0.614,2.891,0.091
+		c0.295-0.212,0.302-0.387,0.004-0.583C13.445,13.147,12.968,12.935,12.42,12.948z"/>
+</g>
+<g id="loop_x5F_disabled" display="none">
+	<path display="inline" fill="#FF1313" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<g display="inline">
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12 -4.9706)" fill="#FF1313" width="7.094" height="2.125"/>
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.9706 12)" fill="#FF1313" width="7.094" height="2.125"/>
+	</g>
+</g>
+<g id="loop_x5F_paused" display="none">
+	<path display="inline" fill="#FFFF13" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<rect x="8.813" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
+	<rect x="13.063" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
+</g>
+<g id="loop_x5F_lgs">
+	<path fill="#00C03E" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917C5.424,4.584,4.593,5.415,3.924,6.37
+		L6.349,7.767z"/>
+	<path fill="#00C03E" d="M9.258,5.478c0.613-0.262,1.272-0.436,1.959-0.517l-0.003-2.793c-1.191,0.101-2.318,0.414-3.352,0.898
+		L9.258,5.478z"/>
+	<path fill="#00C03E" d="M12.922,2.189l0.003,2.773c0.754,0.093,1.472,0.301,2.135,0.608c0.325,0.151,0.639,0.321,0.936,0.517
+		l0.002-0.002l-0.352-1.784l1.876-0.538C16.182,2.88,14.61,2.336,12.922,2.189z"/>
+	<path fill="#00C03E" d="M4.963,11.199c0.083-0.687,0.259-1.345,0.523-1.958L3.072,7.85c-0.485,1.034-0.801,2.16-0.903,3.351
+		L4.963,11.199z"/>
+	<path fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156c-2.345,0-4.42-1.133-5.725-2.876l-2.421,1.401
+		C5.712,20.315,8.689,22,12.063,22C17.551,22,22,17.551,22,12.063c0-0.759-0.093-1.496-0.254-2.206
+		c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<path fill="#00C03E" d="M5.478,14.867c-0.262-0.614-0.436-1.272-0.517-1.96L2.168,12.91c0.101,1.191,0.414,2.319,0.898,3.353
+		L5.478,14.867z"/>
+</g>
+</svg>
diff --git a/icons/loop_open.svg b/icons/loop_open.svg
new file mode 100644
index 0000000000..a9b27c4e43
--- /dev/null
+++ b/icons/loop_open.svg
@@ -0,0 +1,347 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="x_x5F_swap_x5F_vert" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3
+		L12.375,3z"/>
+	<g display="inline">
+		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
+		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
+	</g>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 
+		16.578,17.016 16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<polygon display="inline" fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 
+		11.871,17.023 11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
+</g>
+<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
+	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
+	<rect x="3.517" y="11.496" display="inline" fill="#CF8BFE" width="15.717" height="1.009"/>
+</g>
+<g id="cp_x5F_basal_x5F_end" display="none">
+	<g display="inline">
+		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
+		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
+	</g>
+	<polygon display="inline" fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
+		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+</g>
+<g id="cp_x5F_bolus_x5F_correction" display="none">
+	<polygon display="inline" fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
+		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
+	<path display="inline" fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474
+		l3.125-3.125C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
+		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
+		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
+		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
+		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
+		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
+		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
+		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
+		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
+		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
+</g>
+<g id="Bolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
+		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
+		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
+		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
+		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
+		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
+		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
+		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
+		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
+		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
+		L5.362,9.085L5.458,6.524z"/>
+</g>
+<g id="quickwizard" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
+		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
+		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
+		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
+		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
+		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
+	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
+		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
+		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
+	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
+		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
+	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
+		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
+	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
+		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
+</g>
+<g id="calculator" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
+		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
+	<g display="inline">
+		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
+			V14.036z"/>
+		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
+			V18.119z"/>
+	</g>
+	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
+		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
+		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
+	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
+		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
+		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
+		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
+		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
+	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
+		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
+		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
+		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
+		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
+</g>
+<g id="cp_x5F_bolus_x5F_carbs" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
+		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
+		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
+		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
+		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
+		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
+		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
+		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
+		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
+		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
+		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
+		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
+		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
+		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
+		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
+		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
+		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
+		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
+		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
+		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
+</g>
+<g id="actions_x5F_startextbolus" display="none">
+	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
+	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
+		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
+		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
+		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
+		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
+		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
+	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
+</g>
+<g id="actions_x5F_cancelextbolus" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<g display="inline">
+		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
+			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
+			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
+			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
+			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
+		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
+			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
+			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
+	</g>
+	<g display="inline">
+		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
+			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
+		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
+			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
+	</g>
+</g>
+<g id="xdrip" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
+		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
+		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
+		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
+</g>
+<g id="calibration" display="none">
+	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
+	<path display="inline" fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
+		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
+		c-0.205,1.017-0.065,1.994,0.764,2.731c0.297,0.264,0.68,0.354,1.038,0.077c0.242-0.187,0.269-0.46,0.096-0.692
+		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
+	<path display="inline" fill="#E83258" d="M17.959,4.566c1.073,1.453,2.073,2.837,2.489,4.535c0.28,1.143-0.069,2.1-1.037,2.763
+		c-0.943,0.645-1.961,0.655-2.904,0.009c-0.967-0.662-1.318-1.635-1.041-2.769C15.88,7.408,16.875,6.019,17.959,4.566z"/>
+	<path display="inline" fill="#E83258" d="M14.82,14.425c0.797,1.094,1.535,2.104,1.819,3.355c0.188,0.826-0.096,1.498-0.784,1.965
+		c-0.669,0.454-1.393,0.467-2.067,0.014c-0.688-0.462-0.985-1.13-0.8-1.959C13.272,16.531,14.004,15.503,14.82,14.425z"/>
+</g>
+<g id="Raw_x5F_Objects" display="none">
+	<circle fill="#00CD40" cx="12.063" cy="12.063" r="9.938"/>
+	<circle fill="#FFFFFF" cx="12.063" cy="12.063" r="7.156"/>
+	<polygon fill="#00CD40" points="16.891,12.063 20.162,9.328 24,9.343 18.219,5.375 	"/>
+	<line fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" x1="12.063" y1="4.953" x2="12.063" y2="2.125"/>
+	<circle fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
+	<g>
+		<path display="inline" fill="#939393" d="M5.299,19.329l1.944-1.987c-1.433-1.309-2.337-3.186-2.337-5.279
+			c0-3.952,3.204-7.156,7.156-7.156c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784
+			l1.876-0.538c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938C2.125,14.935,3.351,17.515,5.299,19.329z"/>
+		<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+			c0.116,0.512,0.183,1.042,0.183,1.589c0,2.461-1.243,4.63-3.134,5.918l2.1,1.899C20.504,18.06,22,15.239,22,12.063
+			c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	</g>
+	<g>
+		<g display="inline">
+			<g>
+				<g>
+					
+						<rect x="8.17" y="20.061" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -13.0797 13.707)" fill="#939393" width="0.719" height="2.344"/>
+					
+						<rect x="9.916" y="18.059" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -10.9723 14.3365)" fill="#939393" width="0.719" height="2.344"/>
+				</g>
+				<path fill="#939393" d="M5.711,14.414l-2.58,2.959c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l3.96-4.549l-2.416-2.103
+					C7.417,14.506,6.544,14.298,5.711,14.414z"/>
+			</g>
+		</g>
+		<g display="inline">
+			<g>
+				<path fill="#939393" d="M18.444,14.414l2.58,2.959c0.001,0.842-0.325,1.681-1.01,2.277l-2.416,2.103l-3.96-4.549l2.416-2.103
+					C16.738,14.506,17.612,14.298,18.444,14.414z"/>
+			</g>
+		</g>
+	</g>
+	<g display="inline">
+		
+			<rect x="-0.623" y="14.395" transform="matrix(0.8655 -0.5009 0.5009 0.8655 -6.7608 5.3183)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="-1.474" y="11.198" transform="matrix(1 -0.001 0.001 1 -0.0125 0.0059)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="-0.613" y="8.004" transform="matrix(0.8665 0.4991 -0.4991 0.8665 5.2929 -2.0783)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="1.729" y="5.668" transform="matrix(0.5009 0.8655 -0.8655 0.5009 10.0749 -4.4262)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="4.926" y="4.817" transform="matrix(0.001 1 -1 0.001 17.7304 -6.4067)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="8.12" y="5.678" transform="matrix(-0.4991 0.8665 -0.8665 -0.4991 28.5462 -3.4363)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="10.456" y="8.021" transform="matrix(-0.8655 0.5009 -0.5009 -0.8655 37.2824 7.7403)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="11.308" y="11.218" transform="matrix(-1 0.001 -0.001 -1 36.9192 24.1257)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="10.446" y="14.413" transform="matrix(-0.8665 -0.4991 0.4991 -0.8665 25.2167 37.2764)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="8.103" y="16.748" transform="matrix(-0.5009 -0.8655 0.8655 -0.5009 7.652 39.6179)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="4.906" y="17.6" transform="matrix(-0.001 -1 1 -0.001 -6.3894 30.525)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+		
+			<rect x="1.712" y="16.738" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -10.8081 16.4877)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
+	</g>
+	<circle fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
+</g>
+<g id="loop_x5F_open">
+	<path fill="#4983D7" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917C5.424,4.584,4.593,5.415,3.924,6.37
+		L6.349,7.767z"/>
+	<path fill="#4983D7" d="M3.072,7.85c-0.485,1.034-0.801,2.16-0.903,3.351l2.795-0.003c0.083-0.687,0.259-1.345,0.523-1.958
+		L3.072,7.85z"/>
+	<path fill="#4983D7" d="M21.059,7.862l-2.412,1.396c0.262,0.614,0.437,1.272,0.518,1.96l2.793-0.003
+		C21.856,10.024,21.543,8.896,21.059,7.862z"/>
+	<path fill="#4983D7" d="M17.787,7.781l2.421-1.401c-0.668-0.956-1.499-1.787-2.454-2.456l-1.397,2.425
+		C16.9,6.757,17.38,7.238,17.787,7.781z"/>
+	<path fill="#4983D7" d="M19.162,12.926c-0.427,3.544-3.44,6.293-7.099,6.293c-3.666,0-6.684-2.758-7.102-6.312L2.168,12.91
+		C2.599,18.001,6.86,22,12.063,22c5.198,0,9.457-3.992,9.894-9.077L19.162,12.926z"/>
+	<path fill="#4983D7" d="M9.258,5.478c0.613-0.262,1.272-0.436,1.959-0.517l-0.003-2.793c-1.191,0.101-2.318,0.414-3.352,0.898
+		L9.258,5.478z"/>
+	<path fill="#4983D7" d="M12.925,4.963c0.687,0.083,1.345,0.259,1.958,0.522l1.391-2.414c-1.034-0.485-2.161-0.801-3.352-0.903
+		L12.925,4.963z"/>
+</g>
+<g id="loop_x5F_closed" display="none">
+	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+<g id="loop_x5F_disconnected" display="none">
+	<path display="inline" fill="#939393" d="M17.523,3.764c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938
+		c0,1.803,0.484,3.49,1.325,4.945l-0.319,0.365c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l0.872-1.002l1.746,1.523
+		l0.472-0.542l-1.747-1.523l1.272-1.461l1.748,1.524l0.472-0.542l-1.749-1.525l0.872-1.001l-2.416-2.103
+		c-0.684-0.596-1.557-0.803-2.39-0.687l-0.277,0.318c-0.335-0.825-0.528-1.723-0.528-2.67c0-3.952,3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784L17.523,3.764z"/>
+	<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,0.938-0.183,1.833-0.511,2.653l-0.263-0.302c-0.833-0.116-1.706,0.091-2.39,0.687
+		l-2.416,2.103l3.96,4.549l2.416-2.103c0.685-0.596,1.011-1.435,1.01-2.277l-0.346-0.397C21.51,15.526,22,13.855,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+</g>
+<g id="loop_x5F_superbolus" display="none">
+	<path display="inline" fill="#FEAD01" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<path display="inline" fill="#FEAD01" d="M15.026,13.715c-0.267,0.334-0.555,0.58-0.875,0.798
+		c-0.304,0.206-0.678,0.313-0.966,0.376c-0.552,0.1-0.201,0.151,0.077,0.528c-1.002,1.431-2.69,1.526-4.098,0.796
+		c-0.113-0.059-0.219-0.132-0.324-0.205c-0.222-0.152-0.32-0.189-0.506,0.003c-0.151,0.155-0.504,0.496-0.684,0.673l-0.394-0.427
+		c0.193-0.176,0.417-0.394,0.577-0.545c0.349-0.328,0.27-0.368-0.009-0.767c-0.968-1.386-0.672-3.195,0.69-4.207
+		c0.58,0.372,0.455,0.284,0.643-0.263c0.201-0.583,0.544-1.081,1.064-1.427c0.529,0.467,0.441,0.254,0.654-0.282
+		c0.23-0.58,0.59-1.052,1.087-1.451c0.559,0.368,0.815,0.776,1.006,1.236c0.219,0.527,0.304,0.35,0.689-0.024
+		c0.822-0.797,1.826-1.113,2.805-0.873c0.23,1.274-0.314,2.414-1.494,3.159c0.619,0.167,1.205,0.502,1.78,1.179
+		c-0.352,0.516-0.974,1.011-1.601,1.117C14.247,13.26,14.753,13.295,15.026,13.715z M15.918,8.562
+		c0.01-0.355-0.102-0.449-0.41-0.408c-0.999,0.134-1.939,1.031-2.105,2.011c-0.058,0.339,0.121,0.52,0.459,0.442
+		c0.215-0.049,0.432-0.116,0.629-0.213C15.279,10.004,15.77,9.378,15.918,8.562z M12.764,9.962c0.009-0.561-0.185-1.011-0.454-1.433
+		c-0.259-0.406-0.438-0.405-0.697-0.009c-0.598,0.914-0.355,1.977,0.122,2.758c0.152,0.25,0.358,0.252,0.537,0.009
+		C12.57,10.882,12.775,10.436,12.764,9.962z M10.889,16.107c0.415,0,1-0.187,1.3-0.414c0.255-0.193,0.276-0.35,0.024-0.524
+		c-0.935-0.644-1.891-0.785-2.88-0.096c-0.333,0.232-0.314,0.421,0.05,0.635C9.848,15.981,10.355,16.096,10.889,16.107z
+		 M11.037,11.638c0.016-0.535-0.186-0.998-0.457-1.435c-0.254-0.407-0.427-0.398-0.686,0.021c-0.5,0.806-0.458,1.935,0.101,2.707
+		c0.194,0.268,0.361,0.285,0.568,0.024C10.866,12.571,11.048,12.136,11.037,11.638z M14.217,12.716
+		c0.531-0.002,1.109-0.174,1.411-0.403c0.257-0.196,0.264-0.324,0.029-0.53c-0.752-0.659-2.116-0.702-2.896-0.091
+		c-0.282,0.221-0.288,0.423,0.015,0.592C13.239,12.543,13.729,12.732,14.217,12.716z M7.835,13.214
+		c-0.019,0.44,0.1,0.897,0.359,1.312c0.245,0.392,0.457,0.397,0.717,0.029c0.566-0.8,0.518-2.014-0.108-2.762
+		c-0.204-0.244-0.378-0.243-0.573,0.024C7.939,12.217,7.829,12.674,7.835,13.214z M12.42,12.948
+		c-0.536-0.025-1.004,0.155-1.422,0.473c-0.209,0.159-0.218,0.334-0.004,0.511c0.685,0.566,2.162,0.614,2.891,0.091
+		c0.295-0.212,0.302-0.387,0.004-0.583C13.445,13.147,12.968,12.935,12.42,12.948z"/>
+</g>
+<g id="loop_x5F_disabled" display="none">
+	<path display="inline" fill="#FF1313" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<g display="inline">
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12 -4.9706)" fill="#FF1313" width="7.094" height="2.125"/>
+		
+			<rect x="8.453" y="10.938" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.9706 12)" fill="#FF1313" width="7.094" height="2.125"/>
+	</g>
+</g>
+<g id="loop_x5F_paused" display="none">
+	<path display="inline" fill="#FFFF13" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<rect x="8.813" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
+	<rect x="13.063" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
+</g>
+<g id="loop_x5F_lgs" display="none">
+	<path display="inline" fill="#00C03E" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917
+		C5.424,4.584,4.593,5.415,3.924,6.37L6.349,7.767z"/>
+	<path display="inline" fill="#00C03E" d="M9.258,5.478c0.613-0.262,1.272-0.436,1.959-0.517l-0.003-2.793
+		c-1.191,0.101-2.318,0.414-3.352,0.898L9.258,5.478z"/>
+	<path display="inline" fill="#00C03E" d="M12.922,2.189l0.003,2.773c0.754,0.093,1.472,0.301,2.135,0.608
+		c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538C16.182,2.88,14.61,2.336,12.922,2.189z"/>
+	<path display="inline" fill="#00C03E" d="M4.963,11.199c0.083-0.687,0.259-1.345,0.523-1.958L3.072,7.85
+		c-0.485,1.034-0.801,2.16-0.903,3.351L4.963,11.199z"/>
+	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156c-2.345,0-4.42-1.133-5.725-2.876l-2.421,1.401
+		C5.712,20.315,8.689,22,12.063,22C17.551,22,22,17.551,22,12.063c0-0.759-0.093-1.496-0.254-2.206
+		c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<path display="inline" fill="#00C03E" d="M5.478,14.867c-0.262-0.614-0.436-1.272-0.517-1.96L2.168,12.91
+		c0.101,1.191,0.414,2.319,0.898,3.353L5.478,14.867z"/>
+</g>
+</svg>
diff --git a/icons/loop_paused.svg b/icons/loop_paused.svg
new file mode 100644
index 0000000000..8056c4e66b
--- /dev/null
+++ b/icons/loop_paused.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="loop_x5F_paused">
+	<path fill="#FFFF13" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<rect x="8.813" y="8.453" fill="#FFFF13" width="2.125" height="7.094"/>
+	<rect x="13.063" y="8.453" fill="#FFFF13" width="2.125" height="7.094"/>
+</g>
+</svg>
diff --git a/icons/loop_superbolus.svg b/icons/loop_superbolus.svg
new file mode 100644
index 0000000000..99baf408a4
--- /dev/null
+++ b/icons/loop_superbolus.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="loop_x5F_superbolus">
+	<path fill="#FEAD01" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
+		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
+		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
+		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
+		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
+	<path fill="#FEAD01" d="M15.026,13.715c-0.267,0.334-0.555,0.58-0.875,0.798c-0.304,0.206-0.678,0.313-0.966,0.376
+		c-0.552,0.1-0.201,0.151,0.077,0.528c-1.002,1.431-2.69,1.526-4.098,0.796c-0.113-0.059-0.219-0.132-0.324-0.205
+		c-0.222-0.152-0.32-0.189-0.506,0.003c-0.151,0.155-0.504,0.496-0.684,0.673l-0.394-0.427c0.193-0.176,0.417-0.394,0.577-0.545
+		c0.349-0.328,0.27-0.368-0.009-0.767c-0.968-1.386-0.672-3.195,0.69-4.207c0.58,0.372,0.455,0.284,0.643-0.263
+		c0.201-0.583,0.544-1.081,1.064-1.427c0.529,0.467,0.441,0.254,0.654-0.282c0.23-0.58,0.59-1.052,1.087-1.451
+		c0.559,0.368,0.815,0.776,1.006,1.236c0.219,0.527,0.304,0.35,0.689-0.024c0.822-0.797,1.826-1.113,2.805-0.873
+		c0.23,1.274-0.314,2.414-1.494,3.159c0.619,0.167,1.205,0.502,1.78,1.179c-0.352,0.516-0.974,1.011-1.601,1.117
+		C14.247,13.26,14.753,13.295,15.026,13.715z M15.918,8.562c0.01-0.355-0.102-0.449-0.41-0.408
+		c-0.999,0.134-1.939,1.031-2.105,2.011c-0.058,0.339,0.121,0.52,0.459,0.442c0.215-0.049,0.432-0.116,0.629-0.213
+		C15.279,10.004,15.77,9.378,15.918,8.562z M12.764,9.962c0.009-0.561-0.185-1.011-0.454-1.433
+		c-0.259-0.406-0.438-0.405-0.697-0.009c-0.598,0.914-0.355,1.977,0.122,2.758c0.152,0.25,0.358,0.252,0.537,0.009
+		C12.57,10.882,12.775,10.436,12.764,9.962z M10.889,16.107c0.415,0,1-0.187,1.3-0.414c0.255-0.193,0.276-0.35,0.024-0.524
+		c-0.935-0.644-1.891-0.785-2.88-0.096c-0.333,0.232-0.314,0.421,0.05,0.635C9.848,15.981,10.355,16.096,10.889,16.107z
+		 M11.037,11.638c0.016-0.535-0.186-0.998-0.457-1.435c-0.254-0.407-0.427-0.398-0.686,0.021c-0.5,0.806-0.458,1.935,0.101,2.707
+		c0.194,0.268,0.361,0.285,0.568,0.024C10.866,12.571,11.048,12.136,11.037,11.638z M14.217,12.716
+		c0.531-0.002,1.109-0.174,1.411-0.403c0.257-0.196,0.264-0.324,0.029-0.53c-0.752-0.659-2.116-0.702-2.896-0.091
+		c-0.282,0.221-0.288,0.423,0.015,0.592C13.239,12.543,13.729,12.732,14.217,12.716z M7.835,13.214
+		c-0.019,0.44,0.1,0.897,0.359,1.312c0.245,0.392,0.457,0.397,0.717,0.029c0.566-0.8,0.518-2.014-0.108-2.762
+		c-0.204-0.244-0.378-0.243-0.573,0.024C7.939,12.217,7.829,12.674,7.835,13.214z M12.42,12.948
+		c-0.536-0.025-1.004,0.155-1.422,0.473c-0.209,0.159-0.218,0.334-0.004,0.511c0.685,0.566,2.162,0.614,2.891,0.091
+		c0.295-0.212,0.302-0.387,0.004-0.583C13.445,13.147,12.968,12.935,12.42,12.948z"/>
+</g>
+</svg>

From 73d7a016c90ee2b0ae1f9326674e1d8fb1b88b4b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 14 Jun 2020 02:13:30 +0200
Subject: [PATCH 195/400] Clean svg files

---
 icons/loop_lgs.svg  | 312 ------------------------------------------
 icons/loop_open.svg | 325 --------------------------------------------
 2 files changed, 637 deletions(-)

diff --git a/icons/loop_lgs.svg b/icons/loop_lgs.svg
index 5dc70ea8dc..6e0754a490 100644
--- a/icons/loop_lgs.svg
+++ b/icons/loop_lgs.svg
@@ -3,318 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3
-		L12.375,3z"/>
-	<g display="inline">
-		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
-		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
-	</g>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 
-		16.578,17.016 16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 
-		11.871,17.023 11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.517" y="11.496" display="inline" fill="#CF8BFE" width="15.717" height="1.009"/>
-</g>
-<g id="cp_x5F_basal_x5F_end" display="none">
-	<g display="inline">
-		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
-		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
-	</g>
-	<polygon display="inline" fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
-		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
-</g>
-<g id="cp_x5F_bolus_x5F_correction" display="none">
-	<polygon display="inline" fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
-		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
-	<path display="inline" fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474
-		l3.125-3.125C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
-		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
-		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
-		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
-		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
-		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
-		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
-		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
-		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
-		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
-<g id="actions_x5F_startextbolus" display="none">
-	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
-</g>
-<g id="actions_x5F_cancelextbolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<g display="inline">
-		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
-			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
-			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
-			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
-			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
-		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
-	</g>
-	<g display="inline">
-		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
-		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
-	</g>
-</g>
-<g id="xdrip" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
-		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
-		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
-		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
-</g>
-<g id="calibration" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
-		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
-		c-0.205,1.017-0.065,1.994,0.764,2.731c0.297,0.264,0.68,0.354,1.038,0.077c0.242-0.187,0.269-0.46,0.096-0.692
-		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
-	<path display="inline" fill="#E83258" d="M17.959,4.566c1.073,1.453,2.073,2.837,2.489,4.535c0.28,1.143-0.069,2.1-1.037,2.763
-		c-0.943,0.645-1.961,0.655-2.904,0.009c-0.967-0.662-1.318-1.635-1.041-2.769C15.88,7.408,16.875,6.019,17.959,4.566z"/>
-	<path display="inline" fill="#E83258" d="M14.82,14.425c0.797,1.094,1.535,2.104,1.819,3.355c0.188,0.826-0.096,1.498-0.784,1.965
-		c-0.669,0.454-1.393,0.467-2.067,0.014c-0.688-0.462-0.985-1.13-0.8-1.959C13.272,16.531,14.004,15.503,14.82,14.425z"/>
-</g>
-<g id="Raw_x5F_Objects" display="none">
-	<circle fill="#00CD40" cx="12.063" cy="12.063" r="9.938"/>
-	<circle fill="#FFFFFF" cx="12.063" cy="12.063" r="7.156"/>
-	<polygon fill="#00CD40" points="16.891,12.063 20.162,9.328 24,9.343 18.219,5.375 	"/>
-	
-		<line display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" x1="12.063" y1="4.953" x2="12.063" y2="2.125"/>
-	
-		<circle display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
-	<g display="inline">
-		<path fill="#939393" d="M5.299,19.329l1.944-1.987c-1.433-1.309-2.337-3.186-2.337-5.279c0-3.952,3.204-7.156,7.156-7.156
-			c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-			c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938C2.125,14.935,3.351,17.515,5.299,19.329z"/>
-		<path fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-			c0.116,0.512,0.183,1.042,0.183,1.589c0,2.461-1.243,4.63-3.134,5.918l2.1,1.899C20.504,18.06,22,15.239,22,12.063
-			c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	</g>
-	<g display="inline">
-		<g>
-			<g>
-				<g>
-					
-						<rect x="8.17" y="20.061" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -13.0797 13.707)" fill="#939393" width="0.719" height="2.344"/>
-					
-						<rect x="9.916" y="18.059" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -10.9723 14.3365)" fill="#939393" width="0.719" height="2.344"/>
-				</g>
-				<path fill="#939393" d="M5.711,14.414l-2.58,2.959c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l3.96-4.549l-2.416-2.103
-					C7.417,14.506,6.544,14.298,5.711,14.414z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path fill="#939393" d="M18.444,14.414l2.58,2.959c0.001,0.842-0.325,1.681-1.01,2.277l-2.416,2.103l-3.96-4.549l2.416-2.103
-					C16.738,14.506,17.612,14.298,18.444,14.414z"/>
-			</g>
-		</g>
-	</g>
-	<g display="inline">
-		
-			<rect x="-0.623" y="14.395" transform="matrix(0.8655 -0.5009 0.5009 0.8655 -6.7608 5.3183)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="-1.474" y="11.198" transform="matrix(1 -0.001 0.001 1 -0.0125 0.0059)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="-0.613" y="8.004" transform="matrix(0.8665 0.4991 -0.4991 0.8665 5.2929 -2.0783)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="1.729" y="5.668" transform="matrix(0.5009 0.8655 -0.8655 0.5009 10.0749 -4.4262)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="4.926" y="4.817" transform="matrix(0.001 1 -1 0.001 17.7304 -6.4067)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="8.12" y="5.678" transform="matrix(-0.4991 0.8665 -0.8665 -0.4991 28.5462 -3.4363)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="10.456" y="8.021" transform="matrix(-0.8655 0.5009 -0.5009 -0.8655 37.2824 7.7403)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="11.308" y="11.218" transform="matrix(-1 0.001 -0.001 -1 36.9192 24.1257)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="10.446" y="14.413" transform="matrix(-0.8665 -0.4991 0.4991 -0.8665 25.2167 37.2764)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="8.103" y="16.748" transform="matrix(-0.5009 -0.8655 0.8655 -0.5009 7.652 39.6179)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="4.906" y="17.6" transform="matrix(-0.001 -1 1 -0.001 -6.3894 30.525)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="1.712" y="16.738" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -10.8081 16.4877)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-	</g>
-	
-		<circle display="inline" fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
-</g>
-<g id="loop_x5F_closed" display="none">
-	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-</g>
-<g id="loop_x5F_disconnected" display="none">
-	<path display="inline" fill="#939393" d="M17.523,3.764c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938
-		c0,1.803,0.484,3.49,1.325,4.945l-0.319,0.365c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l0.872-1.002l1.746,1.523
-		l0.472-0.542l-1.747-1.523l1.272-1.461l1.748,1.524l0.472-0.542l-1.749-1.525l0.872-1.001l-2.416-2.103
-		c-0.684-0.596-1.557-0.803-2.39-0.687l-0.277,0.318c-0.335-0.825-0.528-1.723-0.528-2.67c0-3.952,3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784L17.523,3.764z"/>
-	<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,0.938-0.183,1.833-0.511,2.653l-0.263-0.302c-0.833-0.116-1.706,0.091-2.39,0.687
-		l-2.416,2.103l3.96,4.549l2.416-2.103c0.685-0.596,1.011-1.435,1.01-2.277l-0.346-0.397C21.51,15.526,22,13.855,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-</g>
-<g id="loop_x5F_superbolus" display="none">
-	<path display="inline" fill="#FEAD01" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<path display="inline" fill="#FEAD01" d="M15.026,13.715c-0.267,0.334-0.555,0.58-0.875,0.798
-		c-0.304,0.206-0.678,0.313-0.966,0.376c-0.552,0.1-0.201,0.151,0.077,0.528c-1.002,1.431-2.69,1.526-4.098,0.796
-		c-0.113-0.059-0.219-0.132-0.324-0.205c-0.222-0.152-0.32-0.189-0.506,0.003c-0.151,0.155-0.504,0.496-0.684,0.673l-0.394-0.427
-		c0.193-0.176,0.417-0.394,0.577-0.545c0.349-0.328,0.27-0.368-0.009-0.767c-0.968-1.386-0.672-3.195,0.69-4.207
-		c0.58,0.372,0.455,0.284,0.643-0.263c0.201-0.583,0.544-1.081,1.064-1.427c0.529,0.467,0.441,0.254,0.654-0.282
-		c0.23-0.58,0.59-1.052,1.087-1.451c0.559,0.368,0.815,0.776,1.006,1.236c0.219,0.527,0.304,0.35,0.689-0.024
-		c0.822-0.797,1.826-1.113,2.805-0.873c0.23,1.274-0.314,2.414-1.494,3.159c0.619,0.167,1.205,0.502,1.78,1.179
-		c-0.352,0.516-0.974,1.011-1.601,1.117C14.247,13.26,14.753,13.295,15.026,13.715z M15.918,8.562
-		c0.01-0.355-0.102-0.449-0.41-0.408c-0.999,0.134-1.939,1.031-2.105,2.011c-0.058,0.339,0.121,0.52,0.459,0.442
-		c0.215-0.049,0.432-0.116,0.629-0.213C15.279,10.004,15.77,9.378,15.918,8.562z M12.764,9.962c0.009-0.561-0.185-1.011-0.454-1.433
-		c-0.259-0.406-0.438-0.405-0.697-0.009c-0.598,0.914-0.355,1.977,0.122,2.758c0.152,0.25,0.358,0.252,0.537,0.009
-		C12.57,10.882,12.775,10.436,12.764,9.962z M10.889,16.107c0.415,0,1-0.187,1.3-0.414c0.255-0.193,0.276-0.35,0.024-0.524
-		c-0.935-0.644-1.891-0.785-2.88-0.096c-0.333,0.232-0.314,0.421,0.05,0.635C9.848,15.981,10.355,16.096,10.889,16.107z
-		 M11.037,11.638c0.016-0.535-0.186-0.998-0.457-1.435c-0.254-0.407-0.427-0.398-0.686,0.021c-0.5,0.806-0.458,1.935,0.101,2.707
-		c0.194,0.268,0.361,0.285,0.568,0.024C10.866,12.571,11.048,12.136,11.037,11.638z M14.217,12.716
-		c0.531-0.002,1.109-0.174,1.411-0.403c0.257-0.196,0.264-0.324,0.029-0.53c-0.752-0.659-2.116-0.702-2.896-0.091
-		c-0.282,0.221-0.288,0.423,0.015,0.592C13.239,12.543,13.729,12.732,14.217,12.716z M7.835,13.214
-		c-0.019,0.44,0.1,0.897,0.359,1.312c0.245,0.392,0.457,0.397,0.717,0.029c0.566-0.8,0.518-2.014-0.108-2.762
-		c-0.204-0.244-0.378-0.243-0.573,0.024C7.939,12.217,7.829,12.674,7.835,13.214z M12.42,12.948
-		c-0.536-0.025-1.004,0.155-1.422,0.473c-0.209,0.159-0.218,0.334-0.004,0.511c0.685,0.566,2.162,0.614,2.891,0.091
-		c0.295-0.212,0.302-0.387,0.004-0.583C13.445,13.147,12.968,12.935,12.42,12.948z"/>
-</g>
-<g id="loop_x5F_disabled" display="none">
-	<path display="inline" fill="#FF1313" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<g display="inline">
-		
-			<rect x="8.453" y="10.938" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12 -4.9706)" fill="#FF1313" width="7.094" height="2.125"/>
-		
-			<rect x="8.453" y="10.938" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.9706 12)" fill="#FF1313" width="7.094" height="2.125"/>
-	</g>
-</g>
-<g id="loop_x5F_paused" display="none">
-	<path display="inline" fill="#FFFF13" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<rect x="8.813" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
-	<rect x="13.063" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
-</g>
 <g id="loop_x5F_lgs">
 	<path fill="#00C03E" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917C5.424,4.584,4.593,5.415,3.924,6.37
 		L6.349,7.767z"/>
diff --git a/icons/loop_open.svg b/icons/loop_open.svg
index a9b27c4e43..73aeaff092 100644
--- a/icons/loop_open.svg
+++ b/icons/loop_open.svg
@@ -3,247 +3,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
-<g id="x_x5F_swap_x5F_vert" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#008585" d="M19.375,17.01V10h-2v7.01h-3l4,3.99l4-3.99H19.375z M12.375,3l-4,3.99h3V14h2V6.99h3
-		L12.375,3z"/>
-	<g display="inline">
-		<path fill="#008585" d="M2.756,15.271c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708L3.11,15.124C3.012,15.222,2.884,15.271,2.756,15.271z"/>
-		<path fill="#008585" d="M8.271,15.271c-0.128,0-0.256-0.049-0.354-0.146L2.403,9.61c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C8.527,15.222,8.399,15.271,8.271,15.271z"/>
-	</g>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_low" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="11.871,18.026 11.871,6.984 3.517,6.984 3.517,5.975 12.88,5.975 12.88,17.016 
-		16.578,17.016 16.578,5.975 19.233,5.975 19.233,6.984 17.588,6.984 17.588,18.026 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_tbr_x5F_high" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<polygon display="inline" fill="#CF8BFE" points="16.578,18.033 16.578,6.99 12.88,6.99 12.88,18.033 3.517,18.033 3.517,17.023 
-		11.871,17.023 11.871,5.982 17.588,5.982 17.588,17.023 19.233,17.023 19.233,18.033 	"/>
-</g>
-<g id="cp_x5F_basal_x5F_no_x5F_tbr" display="none">
-	<path display="inline" fill="none" d="M0,0.021h24v24H0V0.021z"/>
-	<rect x="3.517" y="11.496" display="inline" fill="#CF8BFE" width="15.717" height="1.009"/>
-</g>
-<g id="cp_x5F_basal_x5F_end" display="none">
-	<g display="inline">
-		<path fill="#CF8BFE" d="M3.923,12.021c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C4.179,11.972,4.051,12.021,3.923,12.021z"/>
-		<path fill="#CF8BFE" d="M9.438,12.021c-0.128,0-0.256-0.049-0.354-0.146L3.569,6.361c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C9.694,11.972,9.566,12.021,9.438,12.021z"/>
-	</g>
-	<polygon display="inline" fill="#CF8BFE" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
-		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
-</g>
-<g id="cp_x5F_bolus_x5F_correction" display="none">
-	<polygon display="inline" fill="#E93057" points="16.578,18.026 16.578,6.984 12.88,6.984 12.88,18.026 3.517,18.026 3.517,17.016 
-		11.871,17.016 11.871,5.975 17.588,5.975 17.588,17.016 19.233,17.016 19.233,18.026 	"/>
-	<path display="inline" fill="#E93057" d="M2.852,13.946c-0.248,0-0.498-0.123-0.74-0.366c-0.49-0.49-0.492-0.986-0.004-1.474
-		l3.125-3.125C5.106,8.737,5.048,8.435,5.048,8.136c0-1.336,1.172-2.508,2.508-2.508c0.282,0,0.572,0.055,0.864,0.163
-		c0.186,0.069,0.347,0.148,0.493,0.242L8.547,6.484L7.431,7.6l0.731,0.661l1.046-1.116l0.374-0.374
-		c0.171,0.154,0.25,0.315,0.319,0.501c0.108,0.292,0.163,0.583,0.163,0.864c0,0.67-0.261,1.3-0.734,1.773
-		c-0.473,0.474-1.103,0.734-1.773,0.735c-0.298,0-0.6-0.058-0.898-0.173l-3.072,3.113C3.346,13.824,3.099,13.946,2.852,13.946z
-		 M7.556,6.237c-0.507,0-0.984,0.198-1.342,0.556C5.855,7.152,5.657,7.629,5.657,8.136c0,0.153,0.024,0.313,0.076,0.5
-		c0.046,0.168,0.114,0.326,0.2,0.47l0.022,0.037c0,0-0.139,0.115-0.168,0.146l-3.249,3.248c-0.26,0.26-0.227,0.381,0.004,0.612
-		c0.134,0.134,0.219,0.186,0.304,0.186c0.085,0,0.184-0.058,0.308-0.182l3.249-3.249c0.03-0.03,0.104-0.12,0.104-0.12l0.078-0.026
-		c0.146,0.087,0.304,0.155,0.471,0.2c0.186,0.052,0.344,0.076,0.499,0.076c1.009,0,1.896-0.887,1.898-1.898
-		c0-0.134-0.018-0.274-0.054-0.43L8.342,8.872C8.284,8.929,8.208,8.961,8.126,8.961c-0.081,0-0.158-0.032-0.215-0.089L6.82,7.78
-		c-0.119-0.119-0.119-0.313,0-0.431l1.143-1.142C7.886,6.235,7.807,6.241,7.729,6.241C7.67,6.241,7.556,6.237,7.556,6.237z"/>
-</g>
-<g id="Bolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67DFE8" d="M18.501,12.002l-0.428,0.564L8.179,5.064c-0.092-0.07-0.212-0.09-0.323-0.055L5.115,5.89
-		L1.571,3.501L4.755,6.36L4.647,9.243c-0.004,0.116,0.047,0.226,0.14,0.296l9.895,7.502l-0.428,0.564
-		c-0.26,0.343-0.193,0.832,0.15,1.092s0.832,0.193,1.092-0.15l1.653-2.18l2.219,1.683l-0.719,0.948
-		c-0.26,0.343-0.193,0.832,0.15,1.092c0.343,0.26,0.832,0.193,1.092-0.15l2.379-3.138c0.26-0.343,0.193-0.832-0.15-1.092
-		c-0.343-0.26-0.832-0.193-1.092,0.15l-0.719,0.948l-2.219-1.683l1.653-2.18c0.26-0.343,0.193-0.832-0.15-1.092
-		S18.762,11.659,18.501,12.002z M5.458,6.524l2.44-0.783l9.748,7.39L17.26,13.64l-5.754-4.362c-0.091-0.069-0.221-0.053-0.293,0.035
-		L9.087,11.91l-0.67-0.508l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008c0.068-0.09,0.054-0.219-0.033-0.291
-		c-0.09-0.075-0.224-0.063-0.299,0.027l-1.538,1.848l-0.769-0.583l1.526-1.833c0.002-0.002,0.004-0.005,0.006-0.008
-		c0.068-0.09,0.054-0.219-0.033-0.291c-0.09-0.075-0.224-0.063-0.299,0.027L6.97,10.305L6.201,9.721l1.526-1.833
-		C7.728,7.886,7.731,7.882,7.732,7.88c0.068-0.09,0.054-0.219-0.033-0.291C7.609,7.513,7.475,7.526,7.4,7.616L5.861,9.464
-		L5.362,9.085L5.458,6.524z"/>
-</g>
-<g id="quickwizard" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAF05" d="M10.751,6.59c-0.561,0.69-0.796,1.057-1.25,1.797c-2.517,0.238-3.932,2.751-3.379,4.664
-		c0.244,0.843,0.779,1.476,1.498,1.958c2.348,1.573,6.243,1.429,8.487-0.306c1.187-0.918,1.723-2.084,1.334-3.576
-		c-0.412-1.58-1.445-2.585-3.039-2.87c-1.112-0.199-1.973,0.37-2.558,1.313c-0.494,0.796-0.72,1.616-1.628,2.345
-		c-0.389-0.431-0.458-0.961-0.483-1.481c-0.12-2.486,2.019-4.439,4.595-4.213c2.365,0.207,4.466,1.956,5.114,4.256
-		c0.611,2.172-0.226,4.432-2.19,5.909c-2.995,2.253-7.895,2.327-10.943,0.165c-2.057-1.459-2.88-3.881-2.099-6.18
-		C5.023,7.978,7.368,6.304,9.77,6.4C10.072,6.412,10.365,6.459,10.751,6.59z"/>
-	<path display="inline" fill="#FEAF06" d="M7.141,13.406c0.526-0.103,1.178-0.22,1.665-0.322c1.522-0.319,2.625-1.229,3.273-2.678
-		c0.289-0.647,0.702-1.125,1.448-1.42c0.418,0.811,0.454,1.641,0.223,2.493c-0.284,1.049-0.889,1.863-1.819,2.429
-		c-0.616,0.376-1.284,0.638-1.966,0.867C8.814,15.163,7.797,14.773,7.141,13.406z"/>
-	<path display="inline" fill="#FEAF06" d="M12.313,14.203c0.734-0.537,1.25-1.089,1.469-1.612c0.894,0.159,1.92,0.314,2.804,0.471
-		C16.036,14.799,13.922,15.203,12.313,14.203z"/>
-	<path display="inline" fill="#FEAF06" d="M2.377,13.882c0.179-0.123,0.756-0.189,1.192-0.123c0.259,0.631,0.587,1.225,1.108,1.923
-		c-0.572,0.116-1.037,0.253-1.567,0.224c-0.493-0.027-0.993-0.353-1.063-0.989C2.013,14.61,2.047,14.109,2.377,13.882z"/>
-	<path display="inline" fill="#FEAF06" d="M19.143,15.22c0.196-0.497,0.362-0.961,0.561-1.411c0.235-0.531,0.618-0.76,1.121-0.681
-		c0.419,0.066,0.575,0.376,0.644,0.756c0.098,0.541-0.078,0.989-0.529,1.213C20.38,15.377,19.787,15.293,19.143,15.22z"/>
-</g>
-<g id="calculator" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#67E86A" d="M17.625,15.345h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292
-		c0,0.063,0.051,0.113,0.113,0.113h4.083c0.063,0,0.113-0.051,0.113-0.113v-1.292C17.738,15.396,17.688,15.345,17.625,15.345z"/>
-	<g display="inline">
-		<path fill="#67E86A" d="M16.343,14.036c0-0.063-0.051-0.113-0.113-0.113h-1.292c-0.063,0-0.113,0.051-0.113,0.113v1.016h1.519
-			V14.036z"/>
-		<path fill="#67E86A" d="M14.824,18.119c0,0.063,0.051,0.113,0.113,0.113h1.292c0.063,0,0.113-0.051,0.113-0.113v-1.017h-1.519
-			V18.119z"/>
-	</g>
-	<path display="inline" fill="#67E86A" d="M19.836,1.96h-15.1c-0.344,0-0.624,0.279-0.624,0.624v18.375
-		c0,0.345,0.279,0.624,0.624,0.624h15.1c0.345,0,0.624-0.279,0.624-0.624V2.583C20.46,2.239,20.181,1.96,19.836,1.96z
-		 M19.212,20.334H5.36V7.04h13.852V20.334z M19.212,5.793H5.36V3.207h13.852V5.793z"/>
-	<path display="inline" fill="#67E86A" d="M13.542,11.363h4.083c0.063,0,0.113-0.051,0.113-0.113V9.958
-		c0-0.063-0.051-0.113-0.113-0.113h-4.083c-0.063,0-0.113,0.051-0.113,0.113v1.292C13.429,11.313,13.479,11.363,13.542,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M7.042,11.363h1.283v1.282c0,0.063,0.051,0.113,0.113,0.113h1.292
-		c0.063,0,0.113-0.051,0.113-0.113v-1.282h1.283c0.063,0,0.113-0.051,0.113-0.113V9.958c0-0.063-0.051-0.113-0.113-0.113H9.842
-		V8.563c0-0.063-0.051-0.113-0.113-0.113H8.438c-0.063,0-0.113,0.051-0.113,0.113v1.283H7.042c-0.063,0-0.113,0.051-0.113,0.113
-		v1.292C6.928,11.313,6.979,11.363,7.042,11.363z"/>
-	<path display="inline" fill="#67E86A" d="M10.157,16.078l0.907-0.907c0.021-0.021,0.033-0.05,0.033-0.08s-0.012-0.059-0.033-0.08
-		l-0.914-0.913c-0.044-0.045-0.116-0.045-0.16,0l-0.907,0.907l-0.907-0.907c-0.044-0.045-0.116-0.045-0.16,0l-0.913,0.913
-		c-0.044,0.044-0.044,0.116,0,0.16l0.907,0.907l-0.907,0.907c-0.044,0.044-0.044,0.116,0,0.16l0.913,0.914
-		c0.021,0.021,0.05,0.033,0.08,0.033s0.059-0.012,0.08-0.033l0.907-0.907l0.907,0.907c0.021,0.021,0.05,0.033,0.08,0.033
-		s0.059-0.012,0.08-0.033l0.914-0.914c0.044-0.044,0.044-0.116,0-0.16L10.157,16.078z"/>
-</g>
-<g id="cp_x5F_bolus_x5F_carbs" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#FEAD01" d="M16.074,14.883c-0.332,0.416-0.691,0.722-1.09,0.993c-0.378,0.257-0.843,0.39-1.203,0.468
-		c-0.688,0.125-0.25,0.188,0.096,0.657c-1.247,1.781-3.348,1.9-5.102,0.991c-0.141-0.073-0.272-0.165-0.403-0.255
-		c-0.276-0.19-0.398-0.236-0.63,0.004c-0.187,0.193-0.628,0.618-0.852,0.838L6.4,18.047c0.241-0.219,0.518-0.491,0.718-0.678
-		c0.435-0.408,0.336-0.458-0.011-0.955c-1.205-1.725-0.836-3.976,0.859-5.236c0.722,0.462,0.566,0.353,0.801-0.327
-		c0.251-0.726,0.677-1.345,1.325-1.777c0.659,0.582,0.549,0.316,0.814-0.351c0.286-0.721,0.734-1.309,1.353-1.806
-		c0.695,0.458,1.014,0.966,1.252,1.538c0.273,0.656,0.379,0.435,0.858-0.03c1.023-0.992,2.273-1.385,3.491-1.087
-		c0.287,1.586-0.39,3.005-1.859,3.932c0.771,0.208,1.5,0.625,2.215,1.468c-0.439,0.643-1.213,1.259-1.993,1.39
-		C15.105,14.317,15.734,14.359,16.074,14.883z M17.184,8.469c0.013-0.442-0.128-0.559-0.51-0.508
-		c-1.244,0.167-2.413,1.284-2.621,2.504c-0.072,0.422,0.15,0.648,0.571,0.551c0.267-0.062,0.538-0.144,0.783-0.265
-		C16.39,10.263,17,9.484,17.184,8.469z M13.259,10.211c0.011-0.699-0.231-1.258-0.566-1.784c-0.322-0.506-0.546-0.505-0.868-0.011
-		c-0.744,1.138-0.442,2.461,0.152,3.433c0.19,0.311,0.445,0.313,0.669,0.011C13.017,11.357,13.273,10.801,13.259,10.211z
-		 M10.925,17.86c0.517,0,1.245-0.233,1.618-0.515c0.317-0.24,0.344-0.436,0.03-0.652c-1.164-0.802-2.354-0.977-3.585-0.119
-		c-0.414,0.289-0.391,0.523,0.063,0.79C9.629,17.703,10.26,17.846,10.925,17.86z M11.109,12.297c0.02-0.666-0.231-1.243-0.569-1.786
-		c-0.316-0.507-0.532-0.495-0.854,0.026c-0.622,1.004-0.57,2.408,0.126,3.37c0.241,0.334,0.449,0.355,0.707,0.03
-		C10.896,13.459,11.123,12.916,11.109,12.297z M15.068,13.639c0.661-0.003,1.381-0.217,1.756-0.502
-		c0.32-0.244,0.329-0.403,0.036-0.66c-0.936-0.82-2.634-0.874-3.605-0.113c-0.351,0.275-0.358,0.527,0.019,0.737
-		C13.85,13.423,14.46,13.658,15.068,13.639z M7.124,14.258c-0.023,0.548,0.124,1.116,0.447,1.633
-		c0.305,0.489,0.569,0.494,0.893,0.036c0.704-0.995,0.645-2.507-0.135-3.438c-0.254-0.303-0.471-0.302-0.713,0.03
-		C7.253,13.017,7.116,13.587,7.124,14.258z M12.831,13.928c-0.667-0.031-1.25,0.192-1.77,0.589c-0.26,0.198-0.271,0.416-0.005,0.636
-		c0.852,0.704,2.692,0.765,3.599,0.114c0.367-0.263,0.376-0.482,0.005-0.726C14.106,14.175,13.512,13.911,12.831,13.928z"/>
-</g>
-<g id="actions_x5F_startextbolus" display="none">
-	<path display="inline" fill="none" d="M-0.002,0h24v24h-24V0z"/>
-	<path display="inline" fill="#67DFE8" d="M15.714,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955
-		c-0.351-0.181-0.775-0.043-0.955,0.305l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106
-		c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921h-2.313c-0.509,0-0.921,0.413-0.921,0.921
-		c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646c0,3.732,3.037,6.77,6.77,6.77
-		c3.732,0,6.77-3.037,6.77-6.77C18.768,10.989,17.551,8.909,15.714,7.697z M11.998,19.119c-3.182,0-5.77-2.588-5.77-5.77
-		s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S15.18,19.119,11.998,19.119z"/>
-	<path display="inline" fill="#67DFE8" d="M12,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-		c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-		c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C16.533,10.85,14.5,8.816,12,8.814z"/>
-</g>
-<g id="actions_x5F_cancelextbolus" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<g display="inline">
-		<path fill="#FEAF05" d="M20.164,7.697l0.353-0.684c0.18-0.348,0.043-0.775-0.305-0.955c-0.351-0.181-0.775-0.043-0.955,0.305
-			l-0.354,0.685c-0.379-0.148-0.772-0.265-1.18-0.344V6.106c0.45-0.061,0.802-0.431,0.802-0.897c0-0.509-0.412-0.921-0.921-0.921
-			h-2.312c-0.509,0-0.921,0.413-0.921,0.921c0,0.467,0.352,0.836,0.802,0.897v0.598c-3.125,0.599-5.495,3.349-5.495,6.646
-			c0,3.732,3.037,6.77,6.77,6.77c3.732,0,6.77-3.037,6.77-6.77C23.218,10.989,22.001,8.909,20.164,7.697z M16.448,19.119
-			c-3.182,0-5.77-2.588-5.77-5.77s2.588-5.77,5.77-5.77s5.77,2.588,5.77,5.77S19.63,19.119,16.448,19.119z"/>
-		<path fill="#FEAF05" d="M16.45,8.814c-0.086,0-0.169,0.035-0.23,0.096s-0.096,0.144-0.096,0.23v4.198
-			c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001
-			c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/>
-	</g>
-	<g display="inline">
-		<path fill="#FEAF05" d="M1.972,12.381c-0.128,0-0.256-0.049-0.354-0.146c-0.195-0.195-0.195-0.512,0-0.707l5.514-5.515
-			c0.196-0.195,0.512-0.196,0.708,0c0.195,0.195,0.195,0.512,0,0.708l-5.514,5.514C2.228,12.333,2.1,12.381,1.972,12.381z"/>
-		<path fill="#FEAF05" d="M7.486,12.381c-0.128,0-0.256-0.049-0.354-0.146L1.618,6.721c-0.196-0.196-0.196-0.512,0-0.708
-			c0.195-0.196,0.512-0.196,0.708,0l5.514,5.515c0.196,0.195,0.196,0.512,0,0.707C7.743,12.333,7.614,12.381,7.486,12.381z"/>
-	</g>
-</g>
-<g id="xdrip" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#B92929" d="M12.143,3.619c1.326,1.335,2.613,2.639,3.908,3.934c0.86,0.86,1.735,1.695,2.294,2.811
-		c1.242,2.477,0.847,5.53-1.039,7.698c-1.763,2.026-4.813,2.845-7.35,1.973c-4.996-1.716-6.424-7.776-2.71-11.543
-		C8.837,6.878,10.458,5.294,12.143,3.619z M12.08,6.135c-1.258,1.251-2.447,2.427-3.628,3.61c-1.148,1.149-1.65,2.542-1.541,4.158
-		c0.177,2.618,2.665,4.888,5.169,4.688C12.08,14.471,12.08,10.35,12.08,6.135z"/>
-</g>
-<g id="calibration" display="none">
-	<path display="inline" fill="none" d="M0,0h24v24H0V0z"/>
-	<path display="inline" fill="#E83258" d="M7.305,4.482c1.782,2.914,4.332,5.382,3.916,9.05c-0.256,2.254-2.529,3.635-4.783,3.199
-		c-2.145-0.415-3.625-2.546-3.171-4.728C3.858,9.168,5.537,6.894,7.305,4.482z M5.08,10.061c-0.212,0.638-0.489,1.262-0.621,1.916
-		c-0.205,1.017-0.065,1.994,0.764,2.731c0.297,0.264,0.68,0.354,1.038,0.077c0.242-0.187,0.269-0.46,0.096-0.692
-		C5.468,12.903,5.032,11.589,5.08,10.061z"/>
-	<path display="inline" fill="#E83258" d="M17.959,4.566c1.073,1.453,2.073,2.837,2.489,4.535c0.28,1.143-0.069,2.1-1.037,2.763
-		c-0.943,0.645-1.961,0.655-2.904,0.009c-0.967-0.662-1.318-1.635-1.041-2.769C15.88,7.408,16.875,6.019,17.959,4.566z"/>
-	<path display="inline" fill="#E83258" d="M14.82,14.425c0.797,1.094,1.535,2.104,1.819,3.355c0.188,0.826-0.096,1.498-0.784,1.965
-		c-0.669,0.454-1.393,0.467-2.067,0.014c-0.688-0.462-0.985-1.13-0.8-1.959C13.272,16.531,14.004,15.503,14.82,14.425z"/>
-</g>
-<g id="Raw_x5F_Objects" display="none">
-	<circle fill="#00CD40" cx="12.063" cy="12.063" r="9.938"/>
-	<circle fill="#FFFFFF" cx="12.063" cy="12.063" r="7.156"/>
-	<polygon fill="#00CD40" points="16.891,12.063 20.162,9.328 24,9.343 18.219,5.375 	"/>
-	<line fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" x1="12.063" y1="4.953" x2="12.063" y2="2.125"/>
-	<circle fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
-	<g>
-		<path display="inline" fill="#939393" d="M5.299,19.329l1.944-1.987c-1.433-1.309-2.337-3.186-2.337-5.279
-			c0-3.952,3.204-7.156,7.156-7.156c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784
-			l1.876-0.538c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938C2.125,14.935,3.351,17.515,5.299,19.329z"/>
-		<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-			c0.116,0.512,0.183,1.042,0.183,1.589c0,2.461-1.243,4.63-3.134,5.918l2.1,1.899C20.504,18.06,22,15.239,22,12.063
-			c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	</g>
-	<g>
-		<g display="inline">
-			<g>
-				<g>
-					
-						<rect x="8.17" y="20.061" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -13.0797 13.707)" fill="#939393" width="0.719" height="2.344"/>
-					
-						<rect x="9.916" y="18.059" transform="matrix(0.6572 -0.7537 0.7537 0.6572 -10.9723 14.3365)" fill="#939393" width="0.719" height="2.344"/>
-				</g>
-				<path fill="#939393" d="M5.711,14.414l-2.58,2.959c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l3.96-4.549l-2.416-2.103
-					C7.417,14.506,6.544,14.298,5.711,14.414z"/>
-			</g>
-		</g>
-		<g display="inline">
-			<g>
-				<path fill="#939393" d="M18.444,14.414l2.58,2.959c0.001,0.842-0.325,1.681-1.01,2.277l-2.416,2.103l-3.96-4.549l2.416-2.103
-					C16.738,14.506,17.612,14.298,18.444,14.414z"/>
-			</g>
-		</g>
-	</g>
-	<g display="inline">
-		
-			<rect x="-0.623" y="14.395" transform="matrix(0.8655 -0.5009 0.5009 0.8655 -6.7608 5.3183)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="-1.474" y="11.198" transform="matrix(1 -0.001 0.001 1 -0.0125 0.0059)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="-0.613" y="8.004" transform="matrix(0.8665 0.4991 -0.4991 0.8665 5.2929 -2.0783)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="1.729" y="5.668" transform="matrix(0.5009 0.8655 -0.8655 0.5009 10.0749 -4.4262)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="4.926" y="4.817" transform="matrix(0.001 1 -1 0.001 17.7304 -6.4067)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="8.12" y="5.678" transform="matrix(-0.4991 0.8665 -0.8665 -0.4991 28.5462 -3.4363)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="10.456" y="8.021" transform="matrix(-0.8655 0.5009 -0.5009 -0.8655 37.2824 7.7403)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="11.308" y="11.218" transform="matrix(-1 0.001 -0.001 -1 36.9192 24.1257)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="10.446" y="14.413" transform="matrix(-0.8665 -0.4991 0.4991 -0.8665 25.2167 37.2764)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="8.103" y="16.748" transform="matrix(-0.5009 -0.8655 0.8655 -0.5009 7.652 39.6179)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="4.906" y="17.6" transform="matrix(-0.001 -1 1 -0.001 -6.3894 30.525)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-		
-			<rect x="1.712" y="16.738" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -10.8081 16.4877)" fill="#FFFFFF" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" width="14.292" height="1.708"/>
-	</g>
-	<circle fill="none" stroke="#CF8BFE" stroke-width="0.0057" stroke-miterlimit="10" cx="12.063" cy="12.063" r="8.547"/>
-</g>
 <g id="loop_x5F_open">
 	<path fill="#4983D7" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917C5.424,4.584,4.593,5.415,3.924,6.37
 		L6.349,7.767z"/>
@@ -260,88 +19,4 @@
 	<path fill="#4983D7" d="M12.925,4.963c0.687,0.083,1.345,0.259,1.958,0.522l1.391-2.414c-1.034-0.485-2.161-0.801-3.352-0.903
 		L12.925,4.963z"/>
 </g>
-<g id="loop_x5F_closed" display="none">
-	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-</g>
-<g id="loop_x5F_disconnected" display="none">
-	<path display="inline" fill="#939393" d="M17.523,3.764c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938
-		c0,1.803,0.484,3.49,1.325,4.945l-0.319,0.365c-0.001,0.842,0.325,1.681,1.01,2.277l2.416,2.103l0.872-1.002l1.746,1.523
-		l0.472-0.542l-1.747-1.523l1.272-1.461l1.748,1.524l0.472-0.542l-1.749-1.525l0.872-1.001l-2.416-2.103
-		c-0.684-0.596-1.557-0.803-2.39-0.687l-0.277,0.318c-0.335-0.825-0.528-1.723-0.528-2.67c0-3.952,3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784L17.523,3.764z"/>
-	<path display="inline" fill="#939393" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,0.938-0.183,1.833-0.511,2.653l-0.263-0.302c-0.833-0.116-1.706,0.091-2.39,0.687
-		l-2.416,2.103l3.96,4.549l2.416-2.103c0.685-0.596,1.011-1.435,1.01-2.277l-0.346-0.397C21.51,15.526,22,13.855,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-</g>
-<g id="loop_x5F_superbolus" display="none">
-	<path display="inline" fill="#FEAD01" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<path display="inline" fill="#FEAD01" d="M15.026,13.715c-0.267,0.334-0.555,0.58-0.875,0.798
-		c-0.304,0.206-0.678,0.313-0.966,0.376c-0.552,0.1-0.201,0.151,0.077,0.528c-1.002,1.431-2.69,1.526-4.098,0.796
-		c-0.113-0.059-0.219-0.132-0.324-0.205c-0.222-0.152-0.32-0.189-0.506,0.003c-0.151,0.155-0.504,0.496-0.684,0.673l-0.394-0.427
-		c0.193-0.176,0.417-0.394,0.577-0.545c0.349-0.328,0.27-0.368-0.009-0.767c-0.968-1.386-0.672-3.195,0.69-4.207
-		c0.58,0.372,0.455,0.284,0.643-0.263c0.201-0.583,0.544-1.081,1.064-1.427c0.529,0.467,0.441,0.254,0.654-0.282
-		c0.23-0.58,0.59-1.052,1.087-1.451c0.559,0.368,0.815,0.776,1.006,1.236c0.219,0.527,0.304,0.35,0.689-0.024
-		c0.822-0.797,1.826-1.113,2.805-0.873c0.23,1.274-0.314,2.414-1.494,3.159c0.619,0.167,1.205,0.502,1.78,1.179
-		c-0.352,0.516-0.974,1.011-1.601,1.117C14.247,13.26,14.753,13.295,15.026,13.715z M15.918,8.562
-		c0.01-0.355-0.102-0.449-0.41-0.408c-0.999,0.134-1.939,1.031-2.105,2.011c-0.058,0.339,0.121,0.52,0.459,0.442
-		c0.215-0.049,0.432-0.116,0.629-0.213C15.279,10.004,15.77,9.378,15.918,8.562z M12.764,9.962c0.009-0.561-0.185-1.011-0.454-1.433
-		c-0.259-0.406-0.438-0.405-0.697-0.009c-0.598,0.914-0.355,1.977,0.122,2.758c0.152,0.25,0.358,0.252,0.537,0.009
-		C12.57,10.882,12.775,10.436,12.764,9.962z M10.889,16.107c0.415,0,1-0.187,1.3-0.414c0.255-0.193,0.276-0.35,0.024-0.524
-		c-0.935-0.644-1.891-0.785-2.88-0.096c-0.333,0.232-0.314,0.421,0.05,0.635C9.848,15.981,10.355,16.096,10.889,16.107z
-		 M11.037,11.638c0.016-0.535-0.186-0.998-0.457-1.435c-0.254-0.407-0.427-0.398-0.686,0.021c-0.5,0.806-0.458,1.935,0.101,2.707
-		c0.194,0.268,0.361,0.285,0.568,0.024C10.866,12.571,11.048,12.136,11.037,11.638z M14.217,12.716
-		c0.531-0.002,1.109-0.174,1.411-0.403c0.257-0.196,0.264-0.324,0.029-0.53c-0.752-0.659-2.116-0.702-2.896-0.091
-		c-0.282,0.221-0.288,0.423,0.015,0.592C13.239,12.543,13.729,12.732,14.217,12.716z M7.835,13.214
-		c-0.019,0.44,0.1,0.897,0.359,1.312c0.245,0.392,0.457,0.397,0.717,0.029c0.566-0.8,0.518-2.014-0.108-2.762
-		c-0.204-0.244-0.378-0.243-0.573,0.024C7.939,12.217,7.829,12.674,7.835,13.214z M12.42,12.948
-		c-0.536-0.025-1.004,0.155-1.422,0.473c-0.209,0.159-0.218,0.334-0.004,0.511c0.685,0.566,2.162,0.614,2.891,0.091
-		c0.295-0.212,0.302-0.387,0.004-0.583C13.445,13.147,12.968,12.935,12.42,12.948z"/>
-</g>
-<g id="loop_x5F_disabled" display="none">
-	<path display="inline" fill="#FF1313" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<g display="inline">
-		
-			<rect x="8.453" y="10.938" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12 -4.9706)" fill="#FF1313" width="7.094" height="2.125"/>
-		
-			<rect x="8.453" y="10.938" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -4.9706 12)" fill="#FF1313" width="7.094" height="2.125"/>
-	</g>
-</g>
-<g id="loop_x5F_paused" display="none">
-	<path display="inline" fill="#FFFF13" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156s-7.156-3.204-7.156-7.156s3.204-7.156,7.156-7.156
-		c1.072,0,2.085,0.242,2.998,0.665c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538
-		c-1.567-1.033-3.442-1.639-5.46-1.639c-5.488,0-9.938,4.449-9.938,9.938S6.574,22,12.063,22S22,17.551,22,12.063
-		c0-0.759-0.093-1.496-0.254-2.206c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<rect x="8.813" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
-	<rect x="13.063" y="8.453" display="inline" fill="#FFFF13" width="2.125" height="7.094"/>
-</g>
-<g id="loop_x5F_lgs" display="none">
-	<path display="inline" fill="#00C03E" d="M6.349,7.767c0.408-0.542,0.89-1.022,1.433-1.429L6.38,3.917
-		C5.424,4.584,4.593,5.415,3.924,6.37L6.349,7.767z"/>
-	<path display="inline" fill="#00C03E" d="M9.258,5.478c0.613-0.262,1.272-0.436,1.959-0.517l-0.003-2.793
-		c-1.191,0.101-2.318,0.414-3.352,0.898L9.258,5.478z"/>
-	<path display="inline" fill="#00C03E" d="M12.922,2.189l0.003,2.773c0.754,0.093,1.472,0.301,2.135,0.608
-		c0.325,0.151,0.639,0.321,0.936,0.517l0.002-0.002l-0.352-1.784l1.876-0.538C16.182,2.88,14.61,2.336,12.922,2.189z"/>
-	<path display="inline" fill="#00C03E" d="M4.963,11.199c0.083-0.687,0.259-1.345,0.523-1.958L3.072,7.85
-		c-0.485,1.034-0.801,2.16-0.903,3.351L4.963,11.199z"/>
-	<path display="inline" fill="#00C03E" d="M24,9.343l-5.781-3.968l-1.328,6.688l2.102-1.757c0.014,0.056,0.03,0.111,0.043,0.168
-		c0.116,0.512,0.183,1.042,0.183,1.589c0,3.952-3.204,7.156-7.156,7.156c-2.345,0-4.42-1.133-5.725-2.876l-2.421,1.401
-		C5.712,20.315,8.689,22,12.063,22C17.551,22,22,17.551,22,12.063c0-0.759-0.093-1.496-0.254-2.206
-		c-0.04-0.176-0.085-0.35-0.134-0.523L24,9.343L24,9.343z"/>
-	<path display="inline" fill="#00C03E" d="M5.478,14.867c-0.262-0.614-0.436-1.272-0.517-1.96L2.168,12.91
-		c0.101,1.191,0.414,2.319,0.898,3.353L5.478,14.867z"/>
-</g>
 </svg>

From bb5157bcca4dabca5d63ff68c467aeb24d8dd545 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 15 Jun 2020 11:21:39 +0200
Subject: [PATCH 196/400] synchronized updateGui

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index be9370d27c..43095cb86b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -476,6 +476,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
     }
 
+    @Synchronized
     private fun prepareGraphs() {
         val numOfGraphs = overviewMenus.setting.size
 
@@ -530,6 +531,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         scheduledUpdate = worker.schedule(task, 500, TimeUnit.MILLISECONDS)
     }
 
+    @Synchronized
     @SuppressLint("SetTextI18n")
     fun updateGUI(from: String) {
         aapsLogger.debug("UpdateGUI from $from")

From dae39d43792e38c509495e66574ba542258d75a9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 15 Jun 2020 11:23:06 +0200
Subject: [PATCH 197/400] fix NPE

---
 .../plugins/pump/medtronic/comm/message/PumpMessage.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
index 8c7eb0bcee..2d235de20d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
@@ -30,8 +30,8 @@ public class PumpMessage implements RLMessage {
 
 
     public PumpMessage(AAPSLogger aapsLogger, byte[] rxData) {
-        init(rxData);
         this.aapsLogger = aapsLogger;
+        init(rxData);
     }
 
 

From acfd9621b75c052e68c1ab5a27201a6733f349ae Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 15 Jun 2020 16:45:42 +0200
Subject: [PATCH 198/400] replace 4 LowRes Icons (add, remove, clone and as)
 For add, remove and clone I set width and height to 16dp (automatically
 scaled in Local Profile layout but not in automation) for as, I replaced low
 res icon by double arrows of overview fragment (size a little bit increased
 because in automation icons are very small)

---
 .../plugins/general/automation/triggers/Trigger.kt  |  6 +++---
 .../automation/triggers/TriggerAutosensValue.kt     |  2 +-
 .../nightscout/androidaps/utils/TimeListEdit.java   |  2 +-
 app/src/main/res/drawable/ic_add.xml                | 10 ++++++++++
 app/src/main/res/drawable/ic_as.xml                 | 10 ++++++++++
 app/src/main/res/drawable/ic_clone.xml              |  9 +++++++++
 app/src/main/res/drawable/ic_remove.xml             | 10 ++++++++++
 app/src/main/res/layout/localprofile_fragment.xml   |  8 +++++---
 app/src/main/res/layout/timelistedit_element.xml    |  4 ++--
 .../res/layout/timelistedit_element_vertical.xml    |  4 ++--
 .../automation/triggers/TriggerAutosensValueTest.kt |  2 +-
 icons/add.svg                                       | 12 ++++++++++++
 icons/as.svg                                        | 11 +++++++++++
 icons/clone.svg                                     | 11 +++++++++++
 icons/remove.svg                                    | 13 +++++++++++++
 15 files changed, 101 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_add.xml
 create mode 100644 app/src/main/res/drawable/ic_as.xml
 create mode 100644 app/src/main/res/drawable/ic_clone.xml
 create mode 100644 app/src/main/res/drawable/ic_remove.xml
 create mode 100644 icons/add.svg
 create mode 100644 icons/as.svg
 create mode 100644 icons/clone.svg
 create mode 100644 icons/remove.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
index 357e4b462d..fce6bb41c4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
@@ -98,7 +98,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
         )
         params.gravity = Gravity.CENTER
         buttonAdd.layoutParams = params
-        buttonAdd.setImageResource(R.drawable.add)
+        buttonAdd.setImageResource(R.drawable.ic_add)
         buttonAdd.contentDescription = resourceHelper.gs(R.string.add_short)
         buttonAdd.setOnClickListener {
             scanForActivity(context)?.supportFragmentManager?.let {
@@ -124,7 +124,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
         )
         params.gravity = Gravity.CENTER
         buttonRemove.layoutParams = params
-        buttonRemove.setImageResource(R.drawable.remove)
+        buttonRemove.setImageResource(R.drawable.ic_remove)
         buttonRemove.contentDescription = resourceHelper.gs(R.string.delete_short)
         buttonRemove.setOnClickListener {
             rxBus.send(EventTriggerRemove(trigger))
@@ -141,7 +141,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
         )
         params.gravity = Gravity.CENTER
         buttonClone.layoutParams = params
-        buttonClone.setImageResource(R.drawable.clone)
+        buttonClone.setImageResource(R.drawable.ic_clone)
         buttonClone.contentDescription = resourceHelper.gs(R.string.copy_short)
         buttonClone.setOnClickListener {
             rxBus.send(EventTriggerClone(trigger))
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
index d6f8a607ff..3b3dbe1f68 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
@@ -68,7 +68,7 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.autosenscompared, resourceHelper.gs(comparator.value.stringRes), autosens.value)
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.`as`)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.`ic_as`)
 
     override fun duplicate(): Trigger = TriggerAutosensValue(injector, this)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 3386dd9235..7010a82c12 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -111,7 +111,7 @@ public class TimeListEdit {
         // last "plus" to append new interval
         float factor = layout.getContext().getResources().getDisplayMetrics().density;
         finalAdd = new ImageView(context);
-        finalAdd.setImageResource(R.drawable.add);
+        finalAdd.setImageResource(R.drawable.ic_add);
         LinearLayout.LayoutParams illp = new LinearLayout.LayoutParams((int) (35d * factor), (int) (35 * factor));
         illp.setMargins(0, 25, 0, 25); // llp.setMargins(left, top, right, bottom);
         illp.gravity = Gravity.CENTER;
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..d9bfc40f83
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.5,8.784h-7.283V1.5c0,-0.313 -0.254,-0.567 -0.567,-0.567H9.351c-0.313,0 -0.567,0.254 -0.567,0.567v7.284H1.5c-0.313,0 -0.567,0.254 -0.567,0.567v5.299c0,0.313 0.254,0.567 0.567,0.567h7.284V22.5c0,0.313 0.254,0.567 0.567,0.567h5.299c0.313,0 0.567,-0.254 0.567,-0.567v-7.283H22.5c0.313,0 0.567,-0.254 0.567,-0.567V9.351C23.067,9.038 22.813,8.784 22.5,8.784z"
+      android:fillColor="#00C03E"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_as.xml b/app/src/main/res/drawable/ic_as.xml
new file mode 100644
index 0000000000..152a314c2d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_as.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.615,17.78V9.692h-2.308v8.088h-3.461l4.615,4.604l4.615,-4.604H16.615zM8.539,1.616L3.924,6.22h3.461v8.088h2.308V6.22h3.461L8.539,1.616z"
+      android:fillColor="#008585"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_clone.xml b/app/src/main/res/drawable/ic_clone.xml
new file mode 100644
index 0000000000..9f566e27cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.964,12.509V2.983l-2.932,2.932c-4.317,-3.412 -9.981,-3.694 -13.245,-0.43c-3.581,3.581 -2.909,10.058 1.5,14.467c0.427,0.427 0.877,0.807 1.338,1.163c-0.548,-0.841 -1.031,-1.781 -1.411,-2.812C4.438,13.481 5.49,8.653 8.565,7.519c1.867,-0.688 4.047,0.152 5.872,1.99l-3,3H20.964z"
+      android:fillColor="#005AF9"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_remove.xml b/app/src/main/res/drawable/ic_remove.xml
new file mode 100644
index 0000000000..e5b9715945
--- /dev/null
+++ b/app/src/main/res/drawable/ic_remove.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.548,12l5.15,-5.15c0.222,-0.221 0.222,-0.581 0.001,-0.802l-3.746,-3.747c-0.213,-0.213 -0.591,-0.213 -0.802,0L12,7.452L6.85,2.301c-0.213,-0.213 -0.589,-0.213 -0.802,0L2.301,6.048c-0.106,0.106 -0.166,0.25 -0.166,0.401s0.06,0.294 0.166,0.401L7.452,12l-5.151,5.151c-0.106,0.105 -0.166,0.25 -0.166,0.4s0.06,0.295 0.166,0.401l3.747,3.746c0.111,0.11 0.256,0.166 0.401,0.166s0.29,-0.056 0.401,-0.167l5.15,-5.15l5.151,5.151c0.11,0.11 0.255,0.166 0.4,0.166s0.29,-0.056 0.401,-0.167l3.745,-3.745c0.222,-0.222 0.222,-0.581 0.001,-0.802L16.548,12z"
+      android:fillColor="#FF1313"/>
+</vector>
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 79ae5c862a..306d7bdcb4 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -63,7 +63,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="15dp"
                 android:contentDescription="@string/addnew"
-                android:src="@drawable/add" />
+                android:src="@drawable/ic_add" />
 
             <ImageView
                 android:id="@+id/localprofile_profile_clone"
@@ -72,7 +72,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="15dp"
                 android:contentDescription="@string/clone_label"
-                android:src="@drawable/clone" />
+                android:src="@drawable/ic_clone" />
 
             <ImageView
                 android:id="@+id/localprofile_profile_remove"
@@ -81,7 +81,9 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="15dp"
                 android:contentDescription="@string/remove_label"
-                android:src="@drawable/remove" />
+                android:scaleX="1"
+                android:scaleY="1"
+                android:src="@drawable/ic_remove" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index a57dc29998..07c64a5ea4 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -37,7 +37,7 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/add" />
+        android:src="@drawable/ic_add" />
 
     <ImageView
         android:id="@+id/timelistedit_remove"
@@ -45,5 +45,5 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/remove" />
+        android:src="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/timelistedit_element_vertical.xml b/app/src/main/res/layout/timelistedit_element_vertical.xml
index 7a92b77221..7ecb7d7956 100644
--- a/app/src/main/res/layout/timelistedit_element_vertical.xml
+++ b/app/src/main/res/layout/timelistedit_element_vertical.xml
@@ -37,7 +37,7 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/add" />
+        android:src="@drawable/ic_add" />
 
     <ImageView
         android:id="@+id/timelistedit_remove"
@@ -45,5 +45,5 @@
         android:layout_height="35dp"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="15dp"
-        android:src="@drawable/remove" />
+        android:src="@drawable/ic_remove" />
 </LinearLayout>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
index 27b042afa1..54c4381923 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt
@@ -110,7 +110,7 @@ class TriggerAutosensValueTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.`as`), TriggerAutosensValue(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.`ic_as`), TriggerAutosensValue(injector).icon())
     }
 
     @Before
diff --git a/icons/add.svg b/icons/add.svg
new file mode 100644
index 0000000000..ee6825ecad
--- /dev/null
+++ b/icons/add.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="add">
+	<path display="none" fill="none" d="M0,0h24v24H0V0z"/>
+	<path fill="#00C03E" d="M22.5,8.784h-7.283V1.5c0-0.313-0.254-0.567-0.567-0.567H9.351c-0.313,0-0.567,0.254-0.567,0.567v7.284H1.5
+		c-0.313,0-0.567,0.254-0.567,0.567v5.299c0,0.313,0.254,0.567,0.567,0.567h7.284V22.5c0,0.313,0.254,0.567,0.567,0.567h5.299
+		c0.313,0,0.567-0.254,0.567-0.567v-7.283H22.5c0.313,0,0.567-0.254,0.567-0.567V9.351C23.067,9.038,22.813,8.784,22.5,8.784z"/>
+</g>
+</svg>
diff --git a/icons/as.svg b/icons/as.svg
new file mode 100644
index 0000000000..0ea0090571
--- /dev/null
+++ b/icons/as.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="as">
+	<path fill="#008585" d="M16.615,17.78V9.692h-2.308v8.088h-3.461l4.615,4.604l4.615-4.604H16.615z M8.539,1.616L3.924,6.22h3.461
+		v8.088h2.308V6.22h3.461L8.539,1.616z"/>
+	<rect fill="none" width="24" height="24"/>
+</g>
+</svg>
diff --git a/icons/clone.svg b/icons/clone.svg
new file mode 100644
index 0000000000..fadc866c1c
--- /dev/null
+++ b/icons/clone.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="clone">
+	<path fill="#005AF9" d="M20.964,12.509V2.983l-2.932,2.932c-4.317-3.412-9.981-3.694-13.245-0.43
+		c-3.581,3.581-2.909,10.058,1.5,14.467c0.427,0.427,0.877,0.807,1.338,1.163c-0.548-0.841-1.031-1.781-1.411-2.812
+		C4.438,13.481,5.49,8.653,8.565,7.519c1.867-0.688,4.047,0.152,5.872,1.99l-3,3H20.964z"/>
+</g>
+</svg>
diff --git a/icons/remove.svg b/icons/remove.svg
new file mode 100644
index 0000000000..cf47d09ad1
--- /dev/null
+++ b/icons/remove.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="remove">
+	<path fill="#FF1313" d="M16.548,12l5.15-5.15c0.222-0.221,0.222-0.581,0.001-0.802l-3.746-3.747c-0.213-0.213-0.591-0.213-0.802,0
+		L12,7.452L6.85,2.301c-0.213-0.213-0.589-0.213-0.802,0L2.301,6.048c-0.106,0.106-0.166,0.25-0.166,0.401s0.06,0.294,0.166,0.401
+		L7.452,12l-5.151,5.151c-0.106,0.105-0.166,0.25-0.166,0.4s0.06,0.295,0.166,0.401l3.747,3.746c0.111,0.11,0.256,0.166,0.401,0.166
+		s0.29-0.056,0.401-0.167l5.15-5.15l5.151,5.151c0.11,0.11,0.255,0.166,0.4,0.166s0.29-0.056,0.401-0.167l3.745-3.745
+		c0.222-0.222,0.222-0.581,0.001-0.802L16.548,12z"/>
+</g>
+</svg>

From 87f7dc042218d3ba0d6fa9afbe6c204502b5db70 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 15 Jun 2020 19:15:06 +0200
Subject: [PATCH 199/400] Delta added and clone lightened

---
 .../general/automation/triggers/TriggerDelta.kt     |  2 +-
 app/src/main/res/drawable/ic_auto_delta.xml         | 10 ++++++++++
 app/src/main/res/drawable/ic_clone.xml              |  2 +-
 .../general/automation/triggers/TriggerDeltaTest.kt |  2 +-
 icons/auto_delta.svg                                | 13 +++++++++++++
 icons/clone.svg                                     |  2 +-
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_auto_delta.xml
 create mode 100644 icons/auto_delta.svg

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
index 0a7972461a..78702bb975 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
@@ -108,7 +108,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.deltacompared, resourceHelper.gs(comparator.value.stringRes), delta.value, resourceHelper.gs(delta.deltaType.stringRes))
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_auto_delta)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_auto_delta)
 
     override fun duplicate(): Trigger = TriggerDelta(injector, this)
 
diff --git a/app/src/main/res/drawable/ic_auto_delta.xml b/app/src/main/res/drawable/ic_auto_delta.xml
new file mode 100644
index 0000000000..9e9eaafd0e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_auto_delta.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4L5.087,20h13.826L12,4zM11.375,8.236l4.614,10.678H6.761L11.375,8.236z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_clone.xml b/app/src/main/res/drawable/ic_clone.xml
index 9f566e27cb..fa8c8e0c51 100644
--- a/app/src/main/res/drawable/ic_clone.xml
+++ b/app/src/main/res/drawable/ic_clone.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M20.964,12.509V2.983l-2.932,2.932c-4.317,-3.412 -9.981,-3.694 -13.245,-0.43c-3.581,3.581 -2.909,10.058 1.5,14.467c0.427,0.427 0.877,0.807 1.338,1.163c-0.548,-0.841 -1.031,-1.781 -1.411,-2.812C4.438,13.481 5.49,8.653 8.565,7.519c1.867,-0.688 4.047,0.152 5.872,1.99l-3,3H20.964z"
-      android:fillColor="#005AF9"/>
+      android:fillColor="#739BE0"/>
 </vector>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
index 97c26dbcd0..acbc3bb5dd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt
@@ -93,7 +93,7 @@ class TriggerDeltaTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_auto_delta), TriggerDelta(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_auto_delta), TriggerDelta(injector).icon())
     }
 
     @Test fun initializerTest() {
diff --git a/icons/auto_delta.svg b/icons/auto_delta.svg
new file mode 100644
index 0000000000..ce90280726
--- /dev/null
+++ b/icons/auto_delta.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="auto_x5F_delta">
+	<g>
+		<g>
+			<path fill="#36FF00" d="M12,4L5.087,20h13.826L12,4z M11.375,8.236l4.614,10.678H6.761L11.375,8.236z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/icons/clone.svg b/icons/clone.svg
index fadc866c1c..16226c69c9 100644
--- a/icons/clone.svg
+++ b/icons/clone.svg
@@ -4,7 +4,7 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="clone">
-	<path fill="#005AF9" d="M20.964,12.509V2.983l-2.932,2.932c-4.317-3.412-9.981-3.694-13.245-0.43
+	<path fill="#739BE0" d="M20.964,12.509V2.983l-2.932,2.932c-4.317-3.412-9.981-3.694-13.245-0.43
 		c-3.581,3.581-2.909,10.058,1.5,14.467c0.427,0.427,0.877,0.807,1.338,1.163c-0.548-0.841-1.031-1.781-1.411-2.812
 		C4.438,13.481,5.49,8.653,8.565,7.519c1.867-0.688,4.047,0.152,5.872,1.99l-3,3H20.964z"/>
 </g>

From 1691d29420af4d03953f35d268d4e10bfb6f4452 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 16 Jun 2020 15:13:21 +0200
Subject: [PATCH 200/400] New Crowdin translations (#2713)

* New translations strings.xml (Finnish)

* New translations strings.xml (Polish)

* New translations strings.xml (Arabic)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (Greek)

* New translations strings.xml (Irish)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Welsh)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations exam.xml (Italian)

* New translations exam.xml (French)

* New translations exam.xml (Spanish)

* New translations exam.xml (Czech)

* New translations exam.xml (German)

* New translations exam.xml (Greek)

* New translations exam.xml (Korean)

* New translations exam.xml (Lithuanian)

* New translations exam.xml (Dutch)

* New translations exam.xml (Polish)

* New translations exam.xml (Portuguese)

* New translations exam.xml (Russian)

* New translations exam.xml (Slovak)

* New translations exam.xml (Swedish)

* New translations exam.xml (Portuguese, Brazilian)

* New translations exam.xml (Romanian)

* New translations strings.xml (French)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Greek)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (German)

* New translations exam.xml (German)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations exam.xml (Italian)
---
 app/src/main/res/values-af-rZA/strings.xml  |  5 -----
 app/src/main/res/values-bg-rBG/strings.xml  | 14 +++++-------
 app/src/main/res/values-cs-rCZ/exam.xml     |  3 ---
 app/src/main/res/values-cs-rCZ/strings.xml  | 21 +++++++++--------
 app/src/main/res/values-de-rDE/exam.xml     |  6 ++---
 app/src/main/res/values-de-rDE/strings.xml  | 20 +++++++++--------
 app/src/main/res/values-el-rGR/exam.xml     |  3 ---
 app/src/main/res/values-el-rGR/strings.xml  |  5 -----
 app/src/main/res/values-es-rES/exam.xml     |  3 ---
 app/src/main/res/values-es-rES/strings.xml  |  8 -------
 app/src/main/res/values-fr-rFR/exam.xml     |  3 ---
 app/src/main/res/values-fr-rFR/strings.xml  | 24 ++++++++++++--------
 app/src/main/res/values-it-rIT/exam.xml     |  6 ++---
 app/src/main/res/values-it-rIT/strings.xml  | 25 +++++++++++++--------
 app/src/main/res/values-ko-rKR/exam.xml     |  3 ---
 app/src/main/res/values-ko-rKR/strings.xml  |  7 ------
 app/src/main/res/values-lt-rLT/exam.xml     |  3 ---
 app/src/main/res/values-lt-rLT/strings.xml  |  9 --------
 app/src/main/res/values-nl-rNL/exam.xml     |  3 ---
 app/src/main/res/values-nl-rNL/strings.xml  |  7 ------
 app/src/main/res/values-pl-rPL/exam.xml     |  3 ---
 app/src/main/res/values-pl-rPL/strings.xml  |  9 --------
 app/src/main/res/values-pt-rBR/exam.xml     | 17 ++++++--------
 app/src/main/res/values-pt-rBR/strings.xml  | 21 +++++++++--------
 app/src/main/res/values-pt-rPT/exam.xml     |  3 ---
 app/src/main/res/values-pt-rPT/strings.xml  | 16 ++++++-------
 app/src/main/res/values-ro-rRO/exam.xml     |  1 -
 app/src/main/res/values-ro-rRO/strings.xml  |  5 -----
 app/src/main/res/values-ru-rRU/exam.xml     |  3 ---
 app/src/main/res/values-ru-rRU/strings.xml  | 24 ++++++++++++--------
 app/src/main/res/values-sk-rSK/exam.xml     |  3 ---
 app/src/main/res/values-sk-rSK/strings.xml  |  9 --------
 app/src/main/res/values-sv-rSE/exam.xml     |  3 ---
 app/src/main/res/values-sv-rSE/strings.xml  | 24 ++++++++++++--------
 app/src/main/res/values-tr-rTR/strings.xml  |  4 ----
 app/src/main/res/values-zh-rCN/strings.xml  |  4 ----
 core/src/main/res/values-af-rZA/strings.xml |  1 +
 core/src/main/res/values-ar-rSA/strings.xml |  1 +
 core/src/main/res/values-bg-rBG/strings.xml |  1 +
 core/src/main/res/values-cs-rCZ/strings.xml |  1 +
 core/src/main/res/values-cy-rGB/strings.xml |  1 +
 core/src/main/res/values-de-rDE/strings.xml |  2 ++
 core/src/main/res/values-el-rGR/strings.xml |  1 +
 core/src/main/res/values-es-rES/strings.xml |  1 +
 core/src/main/res/values-fi-rFI/strings.xml |  1 +
 core/src/main/res/values-fr-rFR/strings.xml |  2 ++
 core/src/main/res/values-ga-rIE/strings.xml |  1 +
 core/src/main/res/values-hr-rHR/strings.xml |  1 +
 core/src/main/res/values-it-rIT/strings.xml |  2 ++
 core/src/main/res/values-iw-rIL/strings.xml |  1 +
 core/src/main/res/values-ko-rKR/strings.xml |  1 +
 core/src/main/res/values-lt-rLT/strings.xml |  1 +
 core/src/main/res/values-nl-rNL/strings.xml |  1 +
 core/src/main/res/values-pl-rPL/strings.xml |  1 +
 core/src/main/res/values-pt-rBR/strings.xml | 21 ++++++++++++-----
 core/src/main/res/values-pt-rPT/strings.xml |  1 +
 core/src/main/res/values-ro-rRO/strings.xml |  1 +
 core/src/main/res/values-ru-rRU/strings.xml |  2 ++
 core/src/main/res/values-sk-rSK/strings.xml |  1 +
 core/src/main/res/values-sl-rSI/strings.xml |  1 +
 core/src/main/res/values-sv-rSE/strings.xml |  2 ++
 core/src/main/res/values-tr-rTR/strings.xml |  1 +
 core/src/main/res/values-zh-rCN/strings.xml |  1 +
 dana/src/main/res/values-fr-rFR/strings.xml |  1 +
 64 files changed, 168 insertions(+), 212 deletions(-)

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index c0aee58045..d5efacdd54 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -103,8 +103,6 @@
     <string name="loop_constraintsprocessed_label">Na verwerkte beperkings</string>
     <string name="loop_tbrsetbypump_label">Tydelike basale gestel deur pomp</string>
     <string name="openapsma_lastenact_label">Laaste per hand</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Kanselleer</string>
     <string name="noapsselected">GEEN APS GEKIES OF UITSLAG VERSKAF</string>
     <string name="safety">Veiligheid</string>
     <string name="openapsma_disabled">Plugin is gedeaktiveer</string>
@@ -114,8 +112,6 @@
     <string name="overview_treatment_label">Behandeling</string>
     <string name="overview_calculator_label">Rekenaar</string>
     <string name="constraintapllied">Beperking toegepas!</string>
-    <string name="confirmation">Bevestiging</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale:</string>
@@ -856,7 +852,6 @@
     <string name="recurringTime">Herhaaltyd</string>
     <string name="every">Elke</string>
     <string name="never">Nooit</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Voorwaarde:</string>
     <string name="action">Aksie:</string>
     <string name="iob_u">IAB [U]:</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 8360491ecf..f3c9582648 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">След ограничения</string>
     <string name="loop_tbrsetbypump_label">Временният базал зададен от помпата</string>
     <string name="openapsma_lastenact_label">Последно зададено</string>
-    <string name="ok">ОК</string>
-    <string name="cancel">Откажи</string>
     <string name="noapsselected">НЕ Е ИЗБРАН APS ИЛИ НЯМА РЕЗУЛТАТ ОТ НЕГО</string>
     <string name="safety">Сигурност</string>
     <string name="openapsma_disabled">Модула е изключен</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Болус</string>
     <string name="overview_calculator_label">Калкулатор</string>
     <string name="constraintapllied">Приложено ограничение!</string>
-    <string name="confirmation">Потвърждение</string>
-    <string name="bolus">Болус</string>
     <string name="sms_bolus">Болус:</string>
     <string name="basal">Базал</string>
     <string name="sms_basal">Базал:</string>
@@ -256,6 +252,11 @@
     <string name="smscommunicator_loopisenabled">APS е включен</string>
     <string name="valuelimitedto">%1$.2f ограничен до %2$.2f</string>
     <string name="valueoutofrange">Стойността %1$s е извън ограниченията</string>
+    <string name="smscommunicator_pumpconnectwithcode">За свързване с помпа отговорете с код %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Връзката с помпата е неуспешна</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">За да спрете помпата за %1d минути отговорете с код %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Помпата е разкачена</string>
+    <string name="smscommunicator_reconnect">Връзката с помпа е възстановена</string>
     <string name="smscommunicator_remotecommandnotallowed">Отдалеченото управление е забранено</string>
     <string name="smscommunicator_remotebolusnotallowed">Отдалечено стартиране на болус не е възможно. Опитайте отново по-късно.</string>
     <string name="smscommunicator_basalreplywithcode">За да стартирате базал от %1$.2fЕ/ч за %2$d мин отговорете с код %3$s</string>
@@ -571,8 +572,6 @@
     <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
     <string name="uamsmbmaxminutes">Максимум минути за отчитане на необявени хранения UAM</string>
     <string name="uamsmbmaxminutes_summary">Максимални минути за ограничаване на базала при SMB за UAM</string>
-    <string name="carbsReqThreshold">Праг на предложение за въгл.</string>
-    <string name="carbsReqThreshold_summary">Когато се предлагат въгл., при колко да се покаже уведомление</string>
     <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
@@ -977,7 +976,6 @@
     <string name="recurringTime">Повтарящо се време</string>
     <string name="every">Всеки</string>
     <string name="never">Никога</string>
-    <string name="mins">%1$dмин</string>
     <string name="condition">Условие:</string>
     <string name="action">Действие:</string>
     <string name="iob_u">IOB [Ед]:</string>
@@ -1221,7 +1219,6 @@
     <string name="high_mark_comment">Високата граница на диапазона (графика)</string>
     <string name="reorder_label">Подреди</string>
     <string name="age">Възраст:</string>
-    <string name="weight">Тегло:</string>
     <string name="id">Номер:</string>
     <string name="submit">Изпрати</string>
     <string name="mostcommonprofile">Най-често използван профил:</string>
@@ -1231,7 +1228,6 @@
     <string name="invalidweight">Невалидно тегло</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Ниски: <b>%2$02d%%</b> В: <b>%3$02d%%</b> Вис: <b>%4$02d%%</b>]]></string>
     <string name="average">Средно</string>
-    <string name="tdd">ТДД</string>
     <string name="tir">Време в границите</string>
     <string name="activitymonitor">Мониторинг на активност</string>
     <string name="doyouwantresetstats">Искате да нулирате статистиката?</string>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
index 90cb04d818..67b1930191 100644
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
-    <string name="dia_label">Téma: Doba trvání účinku inzulínu</string>
     <string name="dia_minimumis3h">Minimální hodnota je 3 hodiny.</string>
     <string name="dia_minimumis5h">Minimální hodnota je 5 hodin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Aplikace Loop na iPhone.</string>
     <string name="nsclient_spikeiphone">Aplikace Spike na iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
-    <string name="isf_label">Téma: Citlivost na inzulín</string>
     <string name="isf_increasingvalue">Vyšší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
     <string name="isf_decreasingvalue">Nižší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
     <string name="isf_noeffect">Změna hodnoty ISF nemá vliv na dávku inzulínu při korigování vysoké glykémie.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Změna hodnoty citlivosti ve vašem profilu postačuje k tomu, aby se tato změna použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
-    <string name="ic_label">Téma: Inzulino-sacharidový poměr</string>
     <string name="ic_increasingvalue">Vyšší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
     <string name="ic_decreasingvalue">Nižší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
     <string name="ic_noeffect">Pokud máte 0 COB změna inzulino-sacharidového poměru povede k jinému množství inzulínu vydanému pro korekci glykémie.</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 68aa7385b8..c7ccc964d1 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Po zpracování omezení</string>
     <string name="loop_tbrsetbypump_label">Bazál nastavený pumpou</string>
     <string name="openapsma_lastenact_label">Poslední provedení</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Zrušit</string>
     <string name="noapsselected">ŽÁDNÉ APS NEVYBRÁNO NEBO NEVRÁTILO VÝSLEDEK</string>
     <string name="safety">Bezpečnost</string>
     <string name="openapsma_disabled">Modul zakázán</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
     <string name="constraintapllied">Aplikováno omezení!</string>
-    <string name="confirmation">Potvrzení</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Zakázat smyčku</string>
     <string name="enableloop">Povolit smyčku</string>
     <string name="openloop_newsuggestion">Dostupné nové doporučení</string>
+    <string name="carbssuggestion">Návrh sacharidů</string>
     <string name="unsupportednsversion">Nepodporovaná verze Nightscoutu</string>
     <string name="loopdisabled">SMYČKA ZAKÁZÁNA OMEZENÍM</string>
     <string name="treatments_wizard_basaliob_label">Bazální IOB</string>
@@ -256,7 +253,9 @@
     <string name="smscommunicator_loopisenabled">Smyčka je povolena</string>
     <string name="valuelimitedto">%1$.2f omezeno na %2$.2f</string>
     <string name="valueoutofrange">Hodnota %1$s je mimo přednastavený rozsah</string>
+    <string name="smscommunicator_pumpconnectwithcode">Chcete-li připojit pumpu, odpovězte pomocí SMS s kódem %1$s</string>
     <string name="smscommunicator_pumpconnectfail">Připojení k pumpě selhalo</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Chcete-li odpojit pumpu na %1d minut, odpovězte pomocí SMS s kódem %2$s</string>
     <string name="smscommunicator_pumpdisconnected">Pumpa odpojena</string>
     <string name="smscommunicator_reconnect">Pumpa byla znovu připojena</string>
     <string name="smscommunicator_remotecommandnotallowed">Vzdálený příkaz není povolen</string>
@@ -562,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Výstraha při nedostupných glykémiích</string>
     <string name="enable_pump_unreachable_alert">Výstraha při nedostupné pumpě</string>
     <string name="pump_unreachable_threshold">Limit pro nedostupnost pumpy [min]</string>
+    <string name="enable_carbs_req_alert">Výstraha, jsou-li vyžadovány sacharidy</string>
     <string name="urgent_alarm">Urgentní alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense aplikace (upravená)</string>
@@ -574,8 +574,8 @@
     <string name="smbmaxminutes_summary">Maximální počet minut bazálu, ke kterým se limituje SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB max. minut</string>
     <string name="uamsmbmaxminutes_summary">Maximální počet minut bazálu, ke kterým se limituje SMB pro UAM</string>
-    <string name="carbsReqThreshold">Prahová hodnota doporučení sacharidů</string>
-    <string name="carbsReqThreshold_summary">Po navržení sacharidů, kolik sacharidů vyvolá upozornění</string>
+    <string name="carbsReqThreshold">Minimální množství sacharidů potřebných pro návrh</string>
+    <string name="carbsReqThreshold_summary">Minimální množství sacharidů v gramech, které spustí upozornění návrhu sacharidů. Množství sacharidů pod touto hodnotou nespustí oznámení.</string>
     <string name="dexcomg5_xdripupload_title">Odesílat data do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dat 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
@@ -655,11 +655,17 @@
     <string name="insulin_increment_button_message">Množství inzulínu přidané po stisknutí tlačítka</string>
     <string name="error_starting_cgm">Nelze spustit aplikace CGM. Ujistěte se, že je nainstalovaná.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorovat 5 m</string>
+    <string name="ignore15m">Ignorovat 15 m</string>
+    <string name="ignore30m">Ignorovat 30 m</string>
+    <string name="required">pož.</string>
     <string name="nav_historybrowser">Prohlížeč historie</string>
     <string name="wear_notifysmb_title">Oznámení při SMB</string>
     <string name="wear_notifysmb_summary">Ukazovat SMB na hodinkách jako normální bolus.</string>
     <string name="ns_create_announcements_from_errors_title">Vytvořit oznámení pro chyby</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Vytvořit oznámení z výstrahy vyžadovaných sacharidů</string>
     <string name="ns_create_announcements_from_errors_summary">Vytvořit oznámení v NS pro chyby a místní výstrahy (zobrazitelné v Péči pod Ošetřením)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Pro výstrahy vyžadovaných sacharidů vytvořit oznámení v Nightscoutu</string>
     <string name="wear_predictions_summary">Zobrazovat predikce na hodinkách.</string>
     <string name="wear_predictions_title">Predikce</string>
     <string name="data_choices">Možnosti dat</string>
@@ -980,7 +986,6 @@
     <string name="recurringTime">Opakující se čas</string>
     <string name="every">Každé</string>
     <string name="never">Nikdy</string>
-    <string name="mins">%1$dminut</string>
     <string name="condition">Podmínka:</string>
     <string name="action">Akce:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1224,7 +1229,6 @@
     <string name="high_mark_comment">Horní hodnota oblasti v rozsahu (pouze zobrazování)</string>
     <string name="reorder_label">Změna pořadí</string>
     <string name="age">Věk:</string>
-    <string name="weight">Váha:</string>
     <string name="id">ID:</string>
     <string name="submit">Odeslat</string>
     <string name="mostcommonprofile">Nejběžnější profil:</string>
@@ -1234,7 +1238,6 @@
     <string name="invalidweight">Neplatná položka váhy</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Průměr</string>
-    <string name="tdd">CDD</string>
     <string name="tir">Čas v rozsahu</string>
     <string name="activitymonitor">Monitor aktivity</string>
     <string name="doyouwantresetstats">Chcete resetovat statistiky aktivity?</string>
diff --git a/app/src/main/res/values-de-rDE/exam.xml b/app/src/main/res/values-de-rDE/exam.xml
index 551a31ebf9..4a963701f2 100644
--- a/app/src/main/res/values-de-rDE/exam.xml
+++ b/app/src/main/res/values-de-rDE/exam.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Welche Aussagen zum DIA stimmen?</string>
-    <string name="dia_label">Thema: Insulinwirkdauer</string>
+    <string name="dia_label_exam">Thema: Insulinwirkdauer</string>
     <string name="dia_minimumis3h">Der Mindestwert ist 3 Stunden.</string>
     <string name="dia_minimumis5h">Der Mindestwert ist 5 Stunden.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Configuration/Config-Builder.html#insulin</string>
@@ -122,7 +122,7 @@
     <string name="nsclient_looponiphone">Loop App auf einem iPhone.</string>
     <string name="nsclient_spikeiphone">Spike App auf einem iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Children/Children.html</string>
-    <string name="isf_label">Thema: Korrekturfaktoren (ISF)</string>
+    <string name="isf_label_exam">Thema: Korrekturfaktoren (ISF)</string>
     <string name="isf_increasingvalue">Höhere ISF-Werte (Insulinempfindlichkeit) führen zu niedrigerer Insulin-Abgabe, wenn AAPS hohe Glukosewerte korrigiert.</string>
     <string name="isf_decreasingvalue">Niedrigere ISF-Werte (Insulinempfindlichkeit) führen zu niedrigerer Insulin-Abgabe, wenn AAPS hohe Glukosewerte korrigiert.</string>
     <string name="isf_noeffect">Das Ändern von ISF-Werten hat keinen Einfluss auf die abgegebene Menge an Insulin, wenn AAPS hohe Glukosewerte korrigiert.</string>
@@ -130,7 +130,7 @@
     <string name="isf_profile">Wenn Du einen ISF-Wert im Profil änderst, wird dies sofort vom Loop berücksichtigt.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Getting-Started/FAQ.html#korrekturfaktor-isf-mg-dl-ie-oder-mmol-l-ie</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/de/Usage/Profiles.html</string>
-    <string name="ic_label">Thema: Das IC-Verhältnis (Insulin-Kohlenhydrate)</string>
+    <string name="ic_label_exam">Thema: Das IC-Verhältnis (Insulin-Kohlenhydrate)</string>
     <string name="ic_increasingvalue">Ein höheres IC-Verhältnis bedeutet, dass weniger Insulin für die selbe Menge an KH abgegeben wird.</string>
     <string name="ic_decreasingvalue">Ein niedrigeres IC-Verhältnis bedeutet, dass weniger Insulin für die selbe Menge an KH abgegeben wird.</string>
     <string name="ic_noeffect">Das Ändern des IC-Verhältnisses bedeutet, dass bei 0 COB eine andere Menge an Insulin zur Korrektur eines vorgegebenen BZ-Wertes abgegeben wird.</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e2d8a45283..ff8135d71b 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Beschränkungen angewendet</string>
     <string name="loop_tbrsetbypump_label">TBR der Pumpe</string>
     <string name="openapsma_lastenact_label">Zuletzt abgegeben</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Abbrechen</string>
     <string name="noapsselected">KEIN APS AUSGEWÄHLT ODER KEIN ERGEBNIS VORHANDEN</string>
     <string name="safety">Sicherheit</string>
     <string name="openapsma_disabled">Plugin ist deaktiviert</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Rechner</string>
     <string name="constraintapllied">Beschränkung angewendet!</string>
-    <string name="confirmation">Bestätigung</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Deaktiviere Loop</string>
     <string name="enableloop">Aktiviere Loop</string>
     <string name="openloop_newsuggestion">Neue Empfehlung verfügbar</string>
+    <string name="carbssuggestion">Kohlenhydrate Vorschlag</string>
     <string name="unsupportednsversion">Nicht unterstützte Nightscout-Version</string>
     <string name="loopdisabled">LOOP DEAKTIVIERT DURCH BESCHRÄNKUNGEN</string>
     <string name="treatments_wizard_basaliob_label">Basal-IOB</string>
@@ -564,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Alarm, wenn keine Glukose-Daten empfangen werden</string>
     <string name="enable_pump_unreachable_alert">Alarm, wenn die Pumpe nicht erreichbar ist</string>
     <string name="pump_unreachable_threshold">Grenzwert Pumpe ist nicht erreichbar [min]</string>
+    <string name="enable_carbs_req_alert">Warnung, wenn Kohlenhydrate nötig sind</string>
     <string name="urgent_alarm">Wichtiger Alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (gepatcht)</string>
@@ -576,8 +574,8 @@
     <string name="smbmaxminutes_summary">SMB Basal-Limit in Minuten</string>
     <string name="uamsmbmaxminutes">UAM SMB max. Minuten</string>
     <string name="uamsmbmaxminutes_summary">SMB Basal-Limit in Minuten für UAM</string>
-    <string name="carbsReqThreshold">Schwellenwert für KH-Empfehlung</string>
-    <string name="carbsReqThreshold_summary">Falls Kohlenhydrate vorgeschlagen werden, Menge ab der eine Benachrichtigung angezeigt wird</string>
+    <string name="carbsReqThreshold">Minimale KH-Menge, die für einen Vorschlag erforderlich ist</string>
+    <string name="carbsReqThreshold_summary">Minimale KH-Menge in Gramm, die Vorschlags-Alarm erforderlich ist. Vorschläge unterhalb dieser Menge, lösen keine Benachrichtigung aus.</string>
     <string name="dexcomg5_xdripupload_title">Sende BZ-Werte zu xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Wähle in xDrip+ 640g/Eversense als Daten-Quelle.</string>
     <string name="nsclientbg">Nightscout-Client BZ</string>
@@ -657,11 +655,17 @@
     <string name="insulin_increment_button_message">Menge an Insulin, die hinzugefügt werden soll, wenn die Schaltfläche gedrückt wird</string>
     <string name="error_starting_cgm">CGM-Anwendung konnte nicht geöffnet werden. Stelle sicher, dass diese installiert ist.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignoriere für 5 Min.</string>
+    <string name="ignore15m">Ignoriere für 15 Min.</string>
+    <string name="ignore30m">Ignoriere für 30 Min.</string>
+    <string name="required">Anfrage</string>
     <string name="nav_historybrowser">Historie</string>
     <string name="wear_notifysmb_title">Bei SMB benachrichtigen</string>
     <string name="wear_notifysmb_summary">Zeige SMB auf der Uhr wie einen normalen Bolus an.</string>
     <string name="ns_create_announcements_from_errors_title">Ankündigungen aus Fehlern generieren</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Benachrichtigungen aus KH-Vorschlags-Alarmen erzeugen</string>
     <string name="ns_create_announcements_from_errors_summary">Erstelle Nightscout-Ankündigungen für Fehler-Dialoge und lokale Alarme (auch einsehbar im Careportal unter \"Behandlungen\").</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Nightscout-Benachrichtigungen aus KH-Vorschlags-Alarmen erzeugen</string>
     <string name="wear_predictions_summary">Zeige Vorhersagen auf dem Watchface.</string>
     <string name="wear_predictions_title">Vorhersagen</string>
     <string name="data_choices">Datenübermittlung</string>
@@ -983,7 +987,6 @@ Unerwartetes Verhalten.</string>
     <string name="recurringTime">Wiederholungszeit</string>
     <string name="every">Jeder/jede/jedes</string>
     <string name="never">Nie</string>
-    <string name="mins">%1$d Minuten</string>
     <string name="condition">Bedingung:</string>
     <string name="action">Aktion:</string>
     <string name="iob_u">IOB [IE]:</string>
@@ -1227,7 +1230,7 @@ Unerwartetes Verhalten.</string>
     <string name="high_mark_comment">Oberer Wert des Zielbereichs (nur Anzeige)</string>
     <string name="reorder_label">Umsortieren</string>
     <string name="age">Alter:</string>
-    <string name="weight">Gewicht:</string>
+    <string name="weight_label">Gewicht:</string>
     <string name="id">ID:</string>
     <string name="submit">Senden</string>
     <string name="mostcommonprofile">Meistgenutztes Profil:</string>
@@ -1237,7 +1240,6 @@ Unerwartetes Verhalten.</string>
     <string name="invalidweight">Ungültige Gewichtsangabe</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Durchschnitt</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Aktivitätsmonitor</string>
     <string name="doyouwantresetstats">Willst Du die Aktivitätsstatistik zurücksetzen?</string>
diff --git a/app/src/main/res/values-el-rGR/exam.xml b/app/src/main/res/values-el-rGR/exam.xml
index 1e3c242290..b65ee7b54a 100644
--- a/app/src/main/res/values-el-rGR/exam.xml
+++ b/app/src/main/res/values-el-rGR/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Ποια είναι η αλήθεια για το DIA;</string>
-    <string name="dia_label">Θέμα: η Διάρκεια της Δράσης Ινσουλίνη</string>
     <string name="dia_minimumis3h">Η ελάχιστη τιμή είναι 3 ώρες.</string>
     <string name="dia_minimumis5h">Η ελάχιστη τιμή είναι 5 ώρες.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">App κύκλωμα για το iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app για iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Θέμα: ISF Διορθωτικός Παράγοντας</string>
     <string name="isf_increasingvalue">Υψηλότερη τιμή ISF οδηγεί σε λιγότερη χορήγηση ινσουλίνης, όταν το AAPS διορθώνει την υψηλή BG.</string>
     <string name="isf_decreasingvalue">Χαμηλότερη τιμή ISF οδηγεί σε λιγότερη χορήγηση ινσουλίνης, όταν το AAPS διορθώνει την υψηλή BG.</string>
     <string name="isf_noeffect">Αλλάζοντας την τιμή του ISF δεν έχει καμία επίδραση στην ποσότητα ινσουλίνης που χορηγείται όταν το AAPS διορθώνει την υψηλή BG.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Η αλλαγή της τιμής της ISF στο προφίλ σας είναι αρκετό για να εφαρμόσετε την αλλαγή αυτή.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Θέμα: IC Αναλογία Υδατανθράκων</string>
     <string name="ic_increasingvalue">Υψηλή αναλογία IC οδηγεί σε λιγότερη χορήγηση ινσουλίνης για μια δεδομένη ποσότητα υδατανθράκων.</string>
     <string name="ic_decreasingvalue">Μικρή αναλογία IC οδηγεί σε λιγότερη χορήγηση ινσουλίνης για μια δεδομένη ποσότητα υδατανθράκων.</string>
     <string name="ic_noeffect">Αν έχετε 0 COB Ενεργούς Υδατ., αλλάζοντας την αναλογία IC θα οδηγήσει σε μια διαφορετική ποσότητα ινσουλίνης για να διορθωθεί μια συγκεκριμένη τιμή BG.</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index f5184d6876..27bbf06e8f 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -105,8 +105,6 @@
     <string name="loop_constraintsprocessed_label">Μετά από επεξεργασία περιορισμών</string>
     <string name="loop_tbrsetbypump_label">Προσωρινός Ρυθμός ορίστηκε από την αντλία</string>
     <string name="openapsma_lastenact_label">Τελευταία εφαρμογή</string>
-    <string name="ok">ΟΚ</string>
-    <string name="cancel">Ακύρωση</string>
     <string name="noapsselected">ΔΕΝ ΕΠΙΛΕΧΘΗΚΕ APS Ή ΒΡΕΘΗΚΕ ΑΠΟΤΕΛΕΣΜΑ</string>
     <string name="safety">Ασφάλεια</string>
     <string name="openapsma_disabled">Προσθήκη απενεργοποιημένη</string>
@@ -116,8 +114,6 @@
     <string name="overview_treatment_label">Θεραπεία</string>
     <string name="overview_calculator_label">Υπολογιστής</string>
     <string name="constraintapllied">Εφαρμόστηκαν Περιορισμοί!</string>
-    <string name="confirmation">Επιβεβαίωση</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Βασικός Ρυθμός</string>
     <string name="sms_basal">Βασικός Ρυθμός:</string>
@@ -863,7 +859,6 @@
     <string name="recurringTime">Χρόνος επαναλαμβανόμενων</string>
     <string name="every">Κάθε</string>
     <string name="never">Ποτέ</string>
-    <string name="mins">%1$dλ</string>
     <string name="condition">Κατάσταση:</string>
     <string name="action">Ενέργεια:</string>
     <string name="iob_u">ΙΟΒ [U]:</string>
diff --git a/app/src/main/res/values-es-rES/exam.xml b/app/src/main/res/values-es-rES/exam.xml
index 6b5006b5f0..e5fde44174 100644
--- a/app/src/main/res/values-es-rES/exam.xml
+++ b/app/src/main/res/values-es-rES/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">¿Qué es cierto acerca de DIA?</string>
-    <string name="dia_label">Tema: la Duración de la Acción de la Insulina</string>
     <string name="dia_minimumis3h">El valor mínimo es de 3 horas.</string>
     <string name="dia_minimumis5h">El valor mínimo es de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Aplicación de Loop en el iPhone.</string>
     <string name="nsclient_spikeiphone">App de Spike en el iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Tema: Factor de sensibilidad de la insulina</string>
     <string name="isf_increasingvalue">Los valores más altos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
     <string name="isf_decreasingvalue">Los valores más bajos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
     <string name="isf_noeffect">El cambio de los valores de ISF no afecta a la cantidad de insulina que se entrega cuando AAPS corrige para compensar los valores altos de glucemia.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">El cambio del valor de ISF en el perfil es suficiente para aplicar el cambio.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Tema: El ratio IC</string>
     <string name="ic_increasingvalue">Los ratios IC más altos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
     <string name="ic_decreasingvalue">Los ratios IC más bajos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
     <string name="ic_noeffect">Si tiene 0 COB, cambiar la ratio IC conducirá a una cantidad distinta de insulina para corregir un valor de glucemia determinado.</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7afa8894ec..b77a72edf8 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -105,8 +105,6 @@
     <string name="loop_constraintsprocessed_label">Tras procesar las restricciones</string>
     <string name="loop_tbrsetbypump_label">Basal temporal en la bomba</string>
     <string name="openapsma_lastenact_label">Última aceptada</string>
-    <string name="ok">Ok</string>
-    <string name="cancel">Cancelar</string>
     <string name="noapsselected">NO APS Seleccionado o resultado entregado</string>
     <string name="safety">Seguridad</string>
     <string name="openapsma_disabled">Complemento desactivado</string>
@@ -117,8 +115,6 @@
     <string name="overview_treatment_label">Tratamiento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restricción aplicada!</string>
-    <string name="confirmation">Confirmación</string>
-    <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Dosis Basal</string>
     <string name="sms_basal">Dosis Basal:</string>
@@ -533,7 +529,6 @@
     <string name="smbmaxminutes_summary">Minutos máximos de basal para limitar SMB</string>
     <string name="uamsmbmaxminutes">Minutos máximos de UAM SMB</string>
     <string name="uamsmbmaxminutes_summary">Minutos máximos de basal para limitar SMB para UAM</string>
-    <string name="carbsReqThreshold">Umbral de sugerencia de Carbohidratos</string>
     <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -928,7 +923,6 @@
     <string name="recurringTime">Hora de Repetición</string>
     <string name="every">Cada</string>
     <string name="never">Nunca</string>
-    <string name="mins">%1$dminutos</string>
     <string name="condition">Condición:</string>
     <string name="action">Acción:</string>
     <string name="iob_u">IOB (Insulina a Bordo) [U]:</string>
@@ -1170,7 +1164,6 @@
     <string name="high_mark_comment">Valor superior al área de rango (sólo visualización)</string>
     <string name="reorder_label">Repetir</string>
     <string name="age">Edad:</string>
-    <string name="weight">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil más común:</string>
@@ -1180,7 +1173,6 @@
     <string name="invalidweight">Peso no válido</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Promedio</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Monitor de actividad</string>
     <string name="doyouwantresetstats">¿Desea restablecer las estadísticas de actividad?</string>
diff --git a/app/src/main/res/values-fr-rFR/exam.xml b/app/src/main/res/values-fr-rFR/exam.xml
index 7bfc32a3ff..315c87dd71 100644
--- a/app/src/main/res/values-fr-rFR/exam.xml
+++ b/app/src/main/res/values-fr-rFR/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Qu\'est-ce qu\'il y a de vrai pour le DAI (Durée Action Insuline)?</string>
-    <string name="dia_label">Rubrique : Durée de l\'Action de l\'Insuline</string>
     <string name="dia_minimumis3h">La valeur minimale est de 3 heures.</string>
     <string name="dia_minimumis5h">La valeur minimale est de 5 heures.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Application Loop sur iPhone.</string>
     <string name="nsclient_spikeiphone">Application Spike sur iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Children/Children.html</string>
-    <string name="isf_label">Rubrique : Sensibilité à l\'Insuline (SI)</string>
     <string name="isf_increasingvalue">Les valeurs de SI plus élevées conduisent à moins d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
     <string name="isf_decreasingvalue">Des valeurs plus faibles de SI entraînent une diminution de l\'administration d\'insuline lorsque l\'AAPS corrige une hyperglycémie.</string>
     <string name="isf_noeffect">Changer les valeurs de SI n\'a aucun effet sur la quantité d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">La modification de la SI dans le profil est suffisant pour appliquer le changement.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Profiles.html</string>
-    <string name="ic_label">Rubrique : Ratio Glucides/Insuline</string>
     <string name="ic_increasingvalue">Les ratios G/I plus élevés conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_decreasingvalue">Les ratios G/I plus faibles conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_noeffect">Si vous avez 0 GA, changer le ratio G/I conduira à différentes quantités d\'insuline pour corriger une valeur de glycémie donnée.</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index a4a8a441ac..2b042ede0f 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Après traitement des restrictions</string>
     <string name="loop_tbrsetbypump_label">Basal temporaire défini par la pompe</string>
     <string name="openapsma_lastenact_label">Dernière activation</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Annuler</string>
     <string name="noapsselected">Pas d\'APS séléctionné ou pas de résultat fourni</string>
     <string name="safety">Sécurité</string>
     <string name="openapsma_disabled">Plugin désactivé</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Traitement</string>
     <string name="overview_calculator_label">Assistant</string>
     <string name="constraintapllied">Restriction appliquée !</string>
-    <string name="confirmation">Confirmation</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Désactiver la Boucle</string>
     <string name="enableloop">Activer la Boucle</string>
     <string name="openloop_newsuggestion">Nouvelle recommendation disponible</string>
+    <string name="carbssuggestion">Suggestion de glucides</string>
     <string name="unsupportednsversion">Version incompatible de Nightscout</string>
     <string name="loopdisabled">BOUCLE DÉSACTIVÉE PAR RESTRICTIONS</string>
     <string name="treatments_wizard_basaliob_label">Basal IA</string>
@@ -257,6 +254,11 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smscommunicator_loopisenabled">La Boucle est activée</string>
     <string name="valuelimitedto">%1$.2f limité à %2$.2f</string>
     <string name="valueoutofrange">La valeur %1$s est en dehors des limites</string>
+    <string name="smscommunicator_pumpconnectwithcode">Pour connecter la pompe, répondre avec le code %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Echec de la connexion pompe</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Pour déconnecter la pompe pendant %1d minutes, répondre avec le code %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pompe déconnectée</string>
+    <string name="smscommunicator_reconnect">Pompe reconnectée</string>
     <string name="smscommunicator_remotecommandnotallowed">La commande à distance n\'est pas autorisée</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus à distance non disponible. Réessayez plus tard.</string>
     <string name="smscommunicator_basalreplywithcode">Pour démarrer la Basal %1$.2fU/h pendant %2$d min, renvoyer le code %3$s</string>
@@ -560,6 +562,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enable_missed_bg_readings_alert">Alerte pas nouvelle donnée glycémique</string>
     <string name="enable_pump_unreachable_alert">Alerte si la pompe est hors de portée</string>
     <string name="pump_unreachable_threshold">Seuil d\'alerte pompe hors de portée [min]</string>
+    <string name="enable_carbs_req_alert">Alerte si glucides requis</string>
     <string name="urgent_alarm">Alarme d\'urgence</string>
     <string name="info">INFO</string>
     <string name="eversense">App Eversense (patché)</string>
@@ -572,8 +575,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="smbmaxminutes_summary">Max. minutes de basal pour limiter le SMB</string>
     <string name="uamsmbmaxminutes">SMB RNS minutes max</string>
     <string name="uamsmbmaxminutes_summary">Minutes de basal max pour limiter les SMB des RNS</string>
-    <string name="carbsReqThreshold">Seuil de suggestion de glucides</string>
-    <string name="carbsReqThreshold_summary">Quantité de glucides à partir de laquelle une notification est envoyée</string>
+    <string name="carbsReqThreshold">Glucides minimum requis pour suggestion</string>
+    <string name="carbsReqThreshold_summary">Quantité de glucides minimum en g pour afficher une alerte de suggestion de glucides. Les suggestions inférieures ne déclencheront pas de notification.</string>
     <string name="dexcomg5_xdripupload_title">Transmettre les Gly vers xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Dans xDrip+ veuillez séléctionner 640g/Eversense comme source de données</string>
     <string name="nsclientbg">Glycémie NSClient</string>
@@ -653,11 +656,17 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="insulin_increment_button_message">Quantité d’insuline à ajouter lorsque vous appuyez sur le bouton</string>
     <string name="error_starting_cgm">Impossible d’exécuter l’application de MGC. Assurez-vous de que celle-ci est installée.</string>
     <string name="overview_cgm">MGC</string>
+    <string name="ignore5m">Ignorer 5m</string>
+    <string name="ignore15m">Ignorer 15m</string>
+    <string name="ignore30m">Ignorer 30m</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">Historique</string>
     <string name="wear_notifysmb_title">Notifier en SMB</string>
     <string name="wear_notifysmb_summary">Afficher SMB sur la montre comme un bolus standard.</string>
     <string name="ns_create_announcements_from_errors_title">Créer des messages d’erreurs</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Créer des annonces à partir des alertes Glucides requis</string>
     <string name="ns_create_announcements_from_errors_summary">Créer une annonce Nightscout pour les messages d\'erreur et les alertes locales (également visible dans la section Careportal de l\'onglet traitements)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Créer des annonces Nightscout pour les alertes besoins de glucides</string>
     <string name="wear_predictions_summary">Affichez les prédictions sur l\'écran de montre.</string>
     <string name="wear_predictions_title">Prédictions</string>
     <string name="data_choices">Choix de données</string>
@@ -978,7 +987,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="recurringTime">Période répétitive</string>
     <string name="every">Chaque</string>
     <string name="never">Jamais</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">État :</string>
     <string name="action">Action :</string>
     <string name="iob_u">IA [U]:</string>
@@ -1222,7 +1230,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="high_mark_comment">Valeur supérieure dans la plage (affichage uniquement)</string>
     <string name="reorder_label">Réordonner</string>
     <string name="age">Âge :</string>
-    <string name="weight">Poids :</string>
     <string name="id">ID :</string>
     <string name="submit">Envoyer</string>
     <string name="mostcommonprofile">Profil le plus courant :</string>
@@ -1232,7 +1239,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="invalidweight">Poids invalide</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Cible: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
-    <string name="tdd">DTI</string>
     <string name="tir">Cible Gly</string>
     <string name="activitymonitor">Moniteur d\'activité</string>
     <string name="doyouwantresetstats">Voulez-vous réinitialiser les stats d\'activité ?</string>
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 9859eec532..34cc88ff23 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Cosa è vero riguardo DIA?</string>
-    <string name="dia_label">Argomento: durata dell\'azione dell\'insulina</string>
+    <string name="dia_label_exam">Argomento: durata dell\'azione dell\'insulina</string>
     <string name="dia_minimumis3h">Il valore minimo è 3 ore.</string>
     <string name="dia_minimumis5h">Il valore minimo è 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +122,7 @@
     <string name="nsclient_looponiphone">App Loop su iPhone.</string>
     <string name="nsclient_spikeiphone">App Spike su iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Argomento: fattore di sensibilità all\'insulina</string>
+    <string name="isf_label_exam">Argomento: fattore di sensibilità all\'insulina</string>
     <string name="isf_increasingvalue">Valori ISF più alti portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
     <string name="isf_decreasingvalue">Valori ISF più bassi portano a una minore erogazione di insulina quando AAPS corregge glicemie alte.</string>
     <string name="isf_noeffect">Cambiare i valori di ISF non ha alcun effetto sulla quantità di insulina erogata quando AAPS corregge glicemie alte.</string>
@@ -130,7 +130,7 @@
     <string name="isf_profile">Cambiare il valore ISF nel tuo profilo è sufficiente per applicare la modifica.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Argomento: il rapporto IC</string>
+    <string name="ic_label_exam">Argomento: il rapporto IC</string>
     <string name="ic_increasingvalue">Rapporti IC più alti portano a una minore insulina erogata per una data quantità di carboidrati.</string>
     <string name="ic_decreasingvalue">Rapporti IC più bassi portano a una minore insulina erogata per una data quantità di carboidrati.</string>
     <string name="ic_noeffect">Se hai 0 COB, cambiare il rapporto IC porterà a una differente quantità di insulina necessaria a correggere una determinata glicemia.</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index b0b5939317..45d3d91f63 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Dopo elaborazione vincoli</string>
     <string name="loop_tbrsetbypump_label">Basale temporanea impostata dal micro</string>
     <string name="openapsma_lastenact_label">Ultima attivazione</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Annulla</string>
     <string name="noapsselected">NESSUN APS SELEZIONATO O RISULTATO FORNITO</string>
     <string name="safety">Sicurezza</string>
     <string name="openapsma_disabled">Il plugin è disabilitato</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Trattamento</string>
     <string name="overview_calculator_label">Calcolatore</string>
     <string name="constraintapllied">Vincolo applicato!</string>
-    <string name="confirmation">Conferma</string>
-    <string name="bolus">Bolo</string>
     <string name="sms_bolus">Bolo:</string>
     <string name="basal">Basale</string>
     <string name="sms_basal">Basale:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Disabilita loop</string>
     <string name="enableloop">Abilita loop</string>
     <string name="openloop_newsuggestion">Nuovo suggerimento disponibile</string>
+    <string name="carbssuggestion">Suggerimento CHO</string>
     <string name="unsupportednsversion">Versione non supportata di Nightscout</string>
     <string name="loopdisabled">LOOP DISABILITATO DAI VINCOLI</string>
     <string name="treatments_wizard_basaliob_label">IOB da basale</string>
@@ -256,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Il loop è abilitato</string>
     <string name="valuelimitedto">%1$.2f limitato a %2$.2f</string>
     <string name="valueoutofrange">Il valore %1$s è fuori limite massimo</string>
+    <string name="smscommunicator_pumpconnectwithcode">Per connettere il micro rispondi col codice %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Connessione al micro fallita</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Per disconnettere il micro per %1d minuti rispondi col codice %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Micro disconnesso</string>
+    <string name="smscommunicator_reconnect">Micro riconnesso</string>
     <string name="smscommunicator_remotecommandnotallowed">Il comando da remoto non è permesso</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolo remoto non disponibile. Riprova più tardi.</string>
     <string name="smscommunicator_basalreplywithcode">Per avviare la basale %1$.2fU/h per %2$d min rispondi col codice %3$s</string>
@@ -559,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Avviso se non si ricevono dati BG</string>
     <string name="enable_pump_unreachable_alert">Avviso se il micro è irraggiungibile</string>
     <string name="pump_unreachable_threshold">Soglia micro irraggiungibile [min]</string>
+    <string name="enable_carbs_req_alert">Avviso se sono richiesti CHO</string>
     <string name="urgent_alarm">Allarme urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense app (modificata)</string>
@@ -571,8 +574,8 @@
     <string name="smbmaxminutes_summary">Max minuti di basale a cui limitare SMB</string>
     <string name="uamsmbmaxminutes">SMB UAM max minuti</string>
     <string name="uamsmbmaxminutes_summary">Max minuti di basale a cui limitare SMB per UAM</string>
-    <string name="carbsReqThreshold">Soglia proposta CHO</string>
-    <string name="carbsReqThreshold_summary">Quando vengono proposti carboidrati, la quantità minima per la quale verrà mostrata una notifica</string>
+    <string name="carbsReqThreshold">CHO minimi richiesti per il suggerimento</string>
+    <string name="carbsReqThreshold_summary">Quantità minima di carboidrati (in grammi) necessaria per visualizzare un avviso di suggerimento CHO. Al di sotto di questo numero non verrà attivata alcuna notifica.</string>
     <string name="dexcomg5_xdripupload_title">Invia dati BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ seleziona origine dati 640g/Eversense</string>
     <string name="nsclientbg">BG NSClient</string>
@@ -652,11 +655,17 @@
     <string name="insulin_increment_button_message">Quantità di insulina da aggiungere quando si preme il tasto</string>
     <string name="error_starting_cgm">Impossibile avviare l\'applicazione CGM. Assicurati che sia installata.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignora | 5m</string>
+    <string name="ignore15m">Ignora | 15m</string>
+    <string name="ignore30m">Ignora | 30m</string>
+    <string name="required">ric</string>
     <string name="nav_historybrowser">Storico</string>
     <string name="wear_notifysmb_title">Notifica SMB</string>
     <string name="wear_notifysmb_summary">Mostra SMB sullo smartwatch come un bolo standard.</string>
     <string name="ns_create_announcements_from_errors_title">Crea avvisi da errori</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Crea avvisi da CHO richiesti</string>
     <string name="ns_create_announcements_from_errors_summary">Crea avviso su Nightscout per finestre di errore e allarmi locali (visualizzabile anche nella sezione Portale sotto la voce Trattamenti)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Crea avvisi su Nightscout dagli avvisi per CHO richiesti</string>
     <string name="wear_predictions_summary">Mostra le predizioni sulla watchface.</string>
     <string name="wear_predictions_title">Predizioni</string>
     <string name="data_choices">Scelta dei dati</string>
@@ -977,7 +986,6 @@
     <string name="recurringTime">Tempo ricorrente</string>
     <string name="every">Ogni</string>
     <string name="never">Mai</string>
-    <string name="mins">%1$dmin</string>
     <string name="condition">Condizione:</string>
     <string name="action">Azione:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1221,7 +1229,7 @@
     <string name="high_mark_comment">Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
     <string name="reorder_label">Riordina</string>
     <string name="age">Età:</string>
-    <string name="weight">Peso:</string>
+    <string name="weight_label">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Invia</string>
     <string name="mostcommonprofile">Profilo più comune:</string>
@@ -1231,7 +1239,6 @@
     <string name="invalidweight">Inserimento peso non valido</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Basso: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Alto: <b>%4$02d%%</b>]]></string>
     <string name="average">Media</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Monitor attività</string>
     <string name="doyouwantresetstats">Vuoi resettare le statistiche sull\'attività?</string>
diff --git a/app/src/main/res/values-ko-rKR/exam.xml b/app/src/main/res/values-ko-rKR/exam.xml
index 7169780910..ee3cb67160 100644
--- a/app/src/main/res/values-ko-rKR/exam.xml
+++ b/app/src/main/res/values-ko-rKR/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">DIA에 대하여 올바른 것은?</string>
-    <string name="dia_label">주제: Duration of Insulin Action(DIA)</string>
     <string name="dia_minimumis3h">최소값은 3시간입니다.</string>
     <string name="dia_minimumis5h">최소값은 5시간입니다.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">아이폰에서 Loop앱을 이용합니다.</string>
     <string name="nsclient_spikeiphone">아이폰에서 Spike앱을 이용합니다.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Children/Children.html</string>
-    <string name="isf_label">주제: ISF(인슐린 민감도)</string>
     <string name="isf_increasingvalue">높은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
     <string name="isf_decreasingvalue">낮은 ISF 값은 AAPS가 고혈당을 잡으려고 할때 보다 적은 인슐린 주입을 하게끔 합니다.</string>
     <string name="isf_noeffect">ISF 값 변경은 AAPS가 고혈당을 잡으려고 할때의 인슐린양에 아무런 영향을 주지 않습니다.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">변경사항을 적용하는데 프로파일에서 ISF 값 변경하는 것으로 충분합니다.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/ko/Usage/Profiles.html</string>
-    <string name="ic_label">주제: IC(인슐린-탄수화물 비)</string>
     <string name="ic_increasingvalue">높은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
     <string name="ic_decreasingvalue">낮은 IC 비율은 탄수화물 섭취시 인슐린이 보다 덜 주입되게 합니다.</string>
     <string name="ic_noeffect">COB가 0 인 경우 IC 비율을 변경하면 혈당을 교정하기 위해 다른 양의 인슐린이 주입됩니다.</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index f89d6cb1ab..0d5475a46a 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -105,8 +105,6 @@
     <string name="loop_constraintsprocessed_label">제약 적용 후</string>
     <string name="loop_tbrsetbypump_label">펌프에 의한 임시Basal 설정</string>
     <string name="openapsma_lastenact_label">최근 실행</string>
-    <string name="ok">네</string>
-    <string name="cancel">취소</string>
     <string name="noapsselected">APS가 선택되지 않았거나 계산된 결과가 없습니다.</string>
     <string name="safety">안전성</string>
     <string name="openapsma_disabled">플러그인이 사용불가능 합니다</string>
@@ -117,8 +115,6 @@
     <string name="overview_treatment_label">관리</string>
     <string name="overview_calculator_label">계산기</string>
     <string name="constraintapllied">제한 적용!</string>
-    <string name="confirmation">확인</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -889,7 +885,6 @@
     <string name="recurringTime">반복 시간</string>
     <string name="every">매일</string>
     <string name="never">절대</string>
-    <string name="mins">%1$d분</string>
     <string name="condition">상태:</string>
     <string name="action">실행:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1128,7 +1123,6 @@
     <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
     <string name="reorder_label">정렬</string>
     <string name="age">나이:</string>
-    <string name="weight">몸무게:</string>
     <string name="id">ID:</string>
     <string name="submit">확인</string>
     <string name="mostcommonprofile">가장 많이 사용된 프로파일:</string>
@@ -1138,7 +1132,6 @@
     <string name="invalidweight">유효하지 않은 몸무게입니다</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">평균</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">활동 모니터</string>
     <string name="doyouwantresetstats">활동 통계를 초기화하시겠습니까?</string>
diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index 2eb97c9785..2deb998a72 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Koks atsakymas apie IVT yra teisingas?</string>
-    <string name="dia_label">Tema: Insulino veikimo trukmė</string>
     <string name="dia_minimumis3h">Mažiausia reikšmė - 3 valandos.</string>
     <string name="dia_minimumis5h">Mažiausia reikšmė - 5 valandos.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Loop app iPhone telefone.</string>
     <string name="nsclient_spikeiphone">Spike iPhone telefone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Tema: Jautrumo Insulinui Faktorius</string>
     <string name="isf_increasingvalue">Didesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
     <string name="isf_decreasingvalue">Mažesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
     <string name="isf_noeffect">JIF reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Jei profilyje pakeisite JIF vertę, Ciklas į pokytį iškart atsižvelgs.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Tema: IA santykis</string>
     <string name="ic_increasingvalue">Didesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_decreasingvalue">Mažesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_noeffect">Jei turite 0 AAO (aktyvių angliavandenių organizme), pakeitus IA, glikemija bus koreguojama kitokiu insulino kiekiu.</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 691ca8ee82..dc9d389eeb 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Pritaikius apribojimus</string>
     <string name="loop_tbrsetbypump_label">Laikina bazė nustatyta pompoje</string>
     <string name="openapsma_lastenact_label">Paskutinis veiksmas</string>
-    <string name="ok">Gerai</string>
-    <string name="cancel">Atšaukti</string>
     <string name="noapsselected">NEPASIRINKTA DKS ARBA NĖRA REZULTATO</string>
     <string name="safety">Saugumas</string>
     <string name="openapsma_disabled">Įskiepis išjungtas</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Terapija</string>
     <string name="overview_calculator_label">Skaičiuotuvas</string>
     <string name="constraintapllied">Taikomas ribojimas!</string>
-    <string name="confirmation">Patvirtinimas</string>
-    <string name="bolus">Bolusas</string>
     <string name="sms_bolus">Bolusas:</string>
     <string name="basal">Valandinė bazė</string>
     <string name="sms_basal">Valandinė bazė:</string>
@@ -542,8 +538,6 @@
     <string name="smbmaxminutes_summary">SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
     <string name="uamsmbmaxminutes">NDM SMB maks. min.</string>
     <string name="uamsmbmaxminutes_summary">NDM SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
-    <string name="carbsReqThreshold">Angliavandenių pasiūlymo riba</string>
-    <string name="carbsReqThreshold_summary">Kai angliavandeniai yra siūlomi, kaip gramų angliavandenių aktyvuos pranešimą</string>
     <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
     <string name="nsclientbg">NSClient KG</string>
@@ -940,7 +934,6 @@
     <string name="recurringTime">Pasikartojantis laikas</string>
     <string name="every">Kiekvienas</string>
     <string name="never">Niekada</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Sąlyga:</string>
     <string name="action">Veiksmas:</string>
     <string name="iob_u">AIO [U]:</string>
@@ -1179,7 +1172,6 @@
     <string name="high_mark_comment">Didžiausia tikslinės srities vertė (tik rodymui)</string>
     <string name="reorder_label">Pertvarkyti</string>
     <string name="age">Amžius:</string>
-    <string name="weight">Svoris:</string>
     <string name="id">ID:</string>
     <string name="submit">Pateikti</string>
     <string name="mostcommonprofile">Dažniausiai naudojamas profilis:</string>
@@ -1189,7 +1181,6 @@
     <string name="invalidweight">Neteisingas svorio įrašas</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Žemas: <b>%2$02d%%</b> Norma: <b>%3$02d%%</b> Aukštas: <b>%4$02d%%</b>]]></string>
     <string name="average">Vidutinis</string>
-    <string name="tdd">BPD</string>
     <string name="tir">TIR (Laikas normos ribose)</string>
     <string name="activitymonitor">Aktyvumo stebėjimas</string>
     <string name="doyouwantresetstats">Ar norite iš naujo nustatyti aktyvumo statistiką?</string>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index c530434d0b..9762b98a8a 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Wat is waar over DIA?</string>
-    <string name="dia_label">Thema: duur van de Insuline-actie</string>
     <string name="dia_minimumis3h">De minimumwaarde is 3 uur.</string>
     <string name="dia_minimumis5h">De minimumwaarde is 5 uur.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Config-Builder.html#insuline</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Loop app op de iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app op de iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/Children.html</string>
-    <string name="isf_label">Onderwerp: Insulinegevoeligheidsfactor</string>
     <string name="isf_increasingvalue">Hogere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_decreasingvalue">Lagere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_noeffect">Het wijzigen van de ISF-waarden heeft geen effect op de hoeveelheid insuline die wordt geleverd wanneer AAPS voor hoge BG corrigeert.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Het wijzigen van de ISF-waarde in uw profiel is voldoende om de wijziging toe te passen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#insuline-gevoeligheids-factor-insulin-sensitivity-factor-ISF-mmol-l-E-of-mg-dl-E</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html</string>
-    <string name="ic_label">Onderwerp: De KH ratio</string>
     <string name="ic_increasingvalue">Hogere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_decreasingvalue">Lagere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_noeffect">Als je 0 COB hebt zal het veranderen van KH ratio leiden tot een andere hoeveelheid insuline om jouw BG te corrigeren.</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 41cf3d387e..7cc7557dbd 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -105,8 +105,6 @@
     <string name="loop_constraintsprocessed_label">Berekening met toepassing van limieten</string>
     <string name="loop_tbrsetbypump_label">Tijdelijk basaal gezet door pomp</string>
     <string name="openapsma_lastenact_label">Laatste uitvoering</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Annuleer</string>
     <string name="noapsselected">GEEN APS GESELECTEERD OF TOEGEKEND RESULTAAT</string>
     <string name="safety">Veiligheid</string>
     <string name="openapsma_disabled">Plugin is gedeactiveerd</string>
@@ -117,8 +115,6 @@
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Bolus wizard</string>
     <string name="constraintapllied">Beperking toegepast!</string>
-    <string name="confirmation">Bevestiging</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basaal</string>
     <string name="sms_basal">Basaal:</string>
@@ -889,7 +885,6 @@
     <string name="recurringTime">Herhaal tijd</string>
     <string name="every">Elke</string>
     <string name="never">Nooit</string>
-    <string name="mins">%1$dmin</string>
     <string name="condition">Voorwaarde:</string>
     <string name="action">Actie:</string>
     <string name="iob_u">IOB [E]:</string>
@@ -1128,7 +1123,6 @@
     <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
     <string name="reorder_label">Sorteren</string>
     <string name="age">Leeftijd:</string>
-    <string name="weight">Gewicht:</string>
     <string name="id">ID:</string>
     <string name="submit">Verzenden</string>
     <string name="mostcommonprofile">Meest voorkomende profiel:</string>
@@ -1138,7 +1132,6 @@
     <string name="invalidweight">Ongeldige gewicht invoer</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Laag: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Hoog: <b>%4$02d%%</b>]]></string>
     <string name="average">Gemiddelde</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Activiteitsmonitor</string>
     <string name="doyouwantresetstats">Wil je de activiteitenstatistieken resetten?</string>
diff --git a/app/src/main/res/values-pl-rPL/exam.xml b/app/src/main/res/values-pl-rPL/exam.xml
index 1c8f99b7e9..fd3f73b858 100644
--- a/app/src/main/res/values-pl-rPL/exam.xml
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co jest prawdą w przypadku DIA?</string>
-    <string name="dia_label">Temat: Czas działania aktywnej insuliny</string>
     <string name="dia_minimumis3h">Wartość minimalna to 3 godziny.</string>
     <string name="dia_minimumis5h">Wartość minimalna to 5 godzin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Aplikacja Loop na iPhone\'a.</string>
     <string name="nsclient_spikeiphone">Aplikacja Spike na iPhone\'a.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Temat: Współczynnik wrażliwości na insulinę</string>
     <string name="isf_increasingvalue">Wyższe wartości ISF prowadzą do mniejszej ilości podanej insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
     <string name="isf_decreasingvalue">Niższe wartości ISF prowadzą do mniejszej dawki insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
     <string name="isf_noeffect">Zmiana wartości ISF nie ma wpływu na ilość insuliny dostarczanej, gdy AAPS koryguje wysoki poziom cukru.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Zmiana wartości ISF w profilu wystarczy, aby zastosować zmianę.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Temat: Wartość przelicznika IC</string>
     <string name="ic_increasingvalue">Wyższe wartości ICprowadzą do mniejszej ilości insuliny dostarczonej do podanej ilości węglowodanów.</string>
     <string name="ic_decreasingvalue">Niższe wartości IC prowadzą do mniejszej ilości insuliny podanej do wprowadzonej ilości węglowodanów.</string>
     <string name="ic_noeffect">Załóżmy, że masz 0 COB. Zmiana IC doprowadzi do podania innej ilości insuliny w celu skorygowania twojej wartości BG.</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 0f79080d04..e0b4435a1a 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Po ograniczeniach</string>
     <string name="loop_tbrsetbypump_label">Baza tymczasowa ustawiona przez pompę</string>
     <string name="openapsma_lastenact_label">Ostatnie działanie</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Anuluj</string>
     <string name="noapsselected">NIE WYBRANO APS LUB NIE UZYSKANO WYNIKU</string>
     <string name="safety">Zabezpieczenia</string>
     <string name="openapsma_disabled">Wtyczka jest wyłączona</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Leczenie</string>
     <string name="overview_calculator_label">Kalkulator</string>
     <string name="constraintapllied">Ograniczenie nałożone!</string>
-    <string name="confirmation">Potwierdzenie</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Baza</string>
     <string name="sms_basal">Baza:</string>
@@ -560,8 +556,6 @@
     <string name="smbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB</string>
     <string name="uamsmbmaxminutes">Maksymalna liczba minut UAM SMB</string>
     <string name="uamsmbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB dla UAM</string>
-    <string name="carbsReqThreshold">Próg sugerowania węglowodanów</string>
-    <string name="carbsReqThreshold_summary">Kiedy sugeruje się węglowodany, ile węglowodanów spowoduje powiadomienie</string>
     <string name="dexcomg5_xdripupload_title">Prześlij dane BG do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -960,7 +954,6 @@
     <string name="recurringTime">Powtarzający się czas</string>
     <string name="every">Każdy/Każdego</string>
     <string name="never">Nigdy</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Warunek:</string>
     <string name="action">Działanie:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1204,7 +1197,6 @@
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="reorder_label">Zmień kolejność</string>
     <string name="age">Wiek:</string>
-    <string name="weight">Waga:</string>
     <string name="id">ID:</string>
     <string name="submit">Wyślij</string>
     <string name="mostcommonprofile">Najczęściej używany profil:</string>
@@ -1214,7 +1206,6 @@
     <string name="invalidweight">Nieprawidłowy wpis wagi</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Od: <b>%2$02d%%</b> Cel: <b>%3$02d%%</b> Do: <b>%4$02d%%</b>]]></string>
     <string name="average">Średnio</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Monitor aktywności</string>
     <string name="doyouwantresetstats">Czy chcesz zresetować statystyki aktywności?</string>
diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml
index 26e394fb99..d0abb5b77c 100644
--- a/app/src/main/res/values-pt-rBR/exam.xml
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre o DIA?</string>
-    <string name="dia_label">Tópico: Duração da Ação de Insulina</string>
     <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
     <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -18,7 +17,7 @@
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Tópico: Desconectando-se da bomba</string>
     <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
-    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser entregue.</string>
+    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser administrada.</string>
     <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
     <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
@@ -51,7 +50,7 @@
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">Tópico: Loop Desactivado/Suspenso</string>
     <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
-    <string name="suspendloop_yes">Sim, a insulina basal continua a ser entregue.</string>
+    <string name="suspendloop_yes">Sim, a insulina basal continua a ser administrada.</string>
     <string name="suspendloop_no">Não, a entrega da insulina está parada.</string>
     <string name="basaltest_label">Tópico: Testando Basal, ISF e IC</string>
     <string name="basaltest_when">Quando devo validar os valores de basal, ISF e IC?</string>
@@ -122,17 +121,15 @@
     <string name="nsclient_looponiphone">Aplicativo Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">Aplicativo Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Tópico: Fator de Sensibilidade de Insulina</string>
-    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma entrega de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma entrega de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina entregue quando a AAPS corrige Glic alta.</string>
+    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
+    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
+    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
     <string name="isf_preferences">Você precisa inserir o ISF nas Preferências.</string>
     <string name="isf_profile">Alterar o valor do ISF no seu perfil é o suficiente para aplicar a alteração.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Tópico: Rácio IC</string>
-    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina entregue para uma dada quantidade de hidratos.</string>
-    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina entregue para uma dada quantidade de hidratos.</string>
+    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
+    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
     <string name="ic_different">O IC será diferente se você contar a unidade de pão como 10g ou 12g.</string>
     <string name="ic_meaning">O significado do IC é: Quantos pães são cobertas por 1U de insulina.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index befeef8af7..fbff230423 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Depois das restrições processadas</string>
     <string name="loop_tbrsetbypump_label">Basal temporária definida pela bomba</string>
     <string name="openapsma_lastenact_label">Ultima execução</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
     <string name="noapsselected">SEM APS SELECIONADO OU RESULTADO FORNECIDO</string>
     <string name="safety">Segurança</string>
     <string name="openapsma_disabled">Plugin está desativado</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restrição aplicada!</string>
-    <string name="confirmation">Confirmação</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Desativar loop</string>
     <string name="enableloop">Ativar loop</string>
     <string name="openloop_newsuggestion">Nova sugestão disponível</string>
+    <string name="carbssuggestion">Sugestão de Hidratos</string>
     <string name="unsupportednsversion">Versão não suportada do Nightscout</string>
     <string name="loopdisabled">LOOP DESATIVADO POR RESTRIÇÕES</string>
     <string name="treatments_wizard_basaliob_label">IOB Basal</string>
@@ -256,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Loop ativado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
+    <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Para desligar a bomba por %1d minutos responda com o código %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Bomba desligada</string>
+    <string name="smscommunicator_reconnect">Bomba ligada novamente</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bolus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
@@ -559,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Alerta caso nenhuma glicemia seja recebida</string>
     <string name="enable_pump_unreachable_alert">Alerta caso não seja possivel alcançar a bomba</string>
     <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
+    <string name="enable_carbs_req_alert">Alertar se forem necessários Hidratos</string>
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
@@ -571,8 +574,7 @@
     <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
-    <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
-    <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
+    <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
@@ -652,6 +654,10 @@
     <string name="insulin_increment_button_message">Unidades de insulina a adicionar quando o botão é premido</string>
     <string name="error_starting_cgm">Não foi possível lançar aplicação de monitorização contínua. Por favor verifique que está instalada.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorar 5m</string>
+    <string name="ignore15m">Ignorar 15m</string>
+    <string name="ignore30m">Ignorar 30m</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">Navegador do histórico</string>
     <string name="wear_notifysmb_title">Notificar no SMB</string>
     <string name="wear_notifysmb_summary">Mostrar SMB no relogio como bolus normal.</string>
@@ -977,7 +983,6 @@
     <string name="recurringTime">Tempo recorrente</string>
     <string name="every">Todo</string>
     <string name="never">Nunca</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Condição:</string>
     <string name="action">Acção:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1221,7 +1226,6 @@
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
     <string name="reorder_label">Reordenar</string>
     <string name="age">Idade:</string>
-    <string name="weight">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil mais comum:</string>
@@ -1231,7 +1235,6 @@
     <string name="invalidweight">Entrada de peso inválida</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Monitor de actividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de actividade?</string>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index 737c4c23a9..829be46b50 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre DIA?</string>
-    <string name="dia_label">Tópico: Duração da Acção de Insulina (DIA)</string>
     <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
     <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">App de Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">App Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Tópico: Factor de Sensibilidade de Insulina</string>
     <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
     <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
     <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">A alteração do valor do FSI no seu perfil é suficiente para aplicar a mudança.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Tópico: Rácio IC</string>
     <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 698f37a475..3a82cec679 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Depois das restrições processadas</string>
     <string name="loop_tbrsetbypump_label">Basal temporária definida pela bomba</string>
     <string name="openapsma_lastenact_label">Ultima execução</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
     <string name="noapsselected">NÃO EXISTE NENHUM APS SELECIONADO OU RESULTADO FORNECIDO</string>
     <string name="safety">Segurança</string>
     <string name="openapsma_disabled">Plugin está desativado</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Tratamento</string>
     <string name="overview_calculator_label">Calculadora</string>
     <string name="constraintapllied">Restrição aplicada!</string>
-    <string name="confirmation">Confirmação</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Desactivar Loop</string>
     <string name="enableloop">Activar Loop</string>
     <string name="openloop_newsuggestion">Disponível nova sugestão</string>
+    <string name="carbssuggestion">Sugestão de Hidratos</string>
     <string name="unsupportednsversion">Versão sem suporte do Nightscout</string>
     <string name="loopdisabled">LOOP DESATIVADO POR RESTRIÇÕES</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
@@ -564,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Alerta caso nenhuma glicemia seja recebida</string>
     <string name="enable_pump_unreachable_alert">Alerta caso não seja possivel alcançar a bomba</string>
     <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
+    <string name="enable_carbs_req_alert">Alertar se forem necessários Hidratos</string>
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
@@ -576,8 +574,7 @@
     <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
-    <string name="carbsReqThreshold">Limite Sugestão de Hidratos</string>
-    <string name="carbsReqThreshold_summary">Quando Hidratos são sugeridos, quantos hidratos irá solicitar uma notificação</string>
+    <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic ClienteNS</string>
@@ -657,6 +654,10 @@
     <string name="insulin_increment_button_message">Unidades de insulina a adicionar quando o botão é premido</string>
     <string name="error_starting_cgm">Não foi possível lançar aplicação de monitorização contínua. Por favor verifique que está instalada.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorar 5m</string>
+    <string name="ignore15m">Ignorar 15m</string>
+    <string name="ignore30m">Ignorar 30m</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">Navegador do histórico</string>
     <string name="wear_notifysmb_title">Notificar no SMB</string>
     <string name="wear_notifysmb_summary">Mostrar SMB no relogio como bolus normal.</string>
@@ -982,7 +983,6 @@
     <string name="recurringTime">Tempo recorrente</string>
     <string name="every">Todo</string>
     <string name="never">Nunca</string>
-    <string name="mins">%1$dmins</string>
     <string name="condition">Condição:</string>
     <string name="action">Acção:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1226,7 +1226,6 @@
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
     <string name="reorder_label">Reordenar</string>
     <string name="age">Idade:</string>
-    <string name="weight">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil mais comum:</string>
@@ -1236,7 +1235,6 @@
     <string name="invalidweight">Entrada de peso inválida</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Monitor de actividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de actividade?</string>
diff --git a/app/src/main/res/values-ro-rRO/exam.xml b/app/src/main/res/values-ro-rRO/exam.xml
index 90db41d280..c5d07b7e4b 100644
--- a/app/src/main/res/values-ro-rRO/exam.xml
+++ b/app/src/main/res/values-ro-rRO/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Care afirmații despre DIA sunt adevărate?</string>
-    <string name="dia_label">Subiect: Durata Acțiunii Insulinei</string>
     <string name="dia_minimumis3h">Valoarea minimă este de 3 ore.</string>
     <string name="dia_minimumis5h">Valoarea minimă este de 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 9a71eb6ffd..8a63c33001 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -104,8 +104,6 @@
     <string name="loop_constraintsprocessed_label">Constrângeri după procesare</string>
     <string name="loop_tbrsetbypump_label">Bazală Temporală programată în pompă</string>
     <string name="openapsma_lastenact_label">Ultima acțiune executată</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Renunță</string>
     <string name="noapsselected">NU AȚI SELECTAT APS SAU NU EXISTĂ REZULTAT GENERAT</string>
     <string name="safety">Siguranță</string>
     <string name="openapsma_disabled">Modul inactiv</string>
@@ -115,8 +113,6 @@
     <string name="overview_treatment_label">Tratament</string>
     <string name="overview_calculator_label">Calculator</string>
     <string name="constraintapllied">Limitare aplicată!</string>
-    <string name="confirmation">Confirmare</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazală</string>
     <string name="sms_basal">Bazală:</string>
@@ -860,7 +856,6 @@
     <string name="recurringTime">Timp recurent</string>
     <string name="every">La fiecare</string>
     <string name="never">Niciodată</string>
-    <string name="mins">%1$dmin</string>
     <string name="condition">Condiție:</string>
     <string name="action">Acțiune:</string>
     <string name="iob_u">IOB [U]:</string>
diff --git a/app/src/main/res/values-ru-rRU/exam.xml b/app/src/main/res/values-ru-rRU/exam.xml
index 61c1650a5b..0489d0b9cd 100644
--- a/app/src/main/res/values-ru-rRU/exam.xml
+++ b/app/src/main/res/values-ru-rRU/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Что верно о длительности работы инсулина DIA?</string>
-    <string name="dia_label">Тема: продолжительность действия инсулина DIA</string>
     <string name="dia_minimumis3h">Минимальное значение 3 часа.</string>
     <string name="dia_minimumis5h">Минимальное значение 5 часов.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -124,7 +123,6 @@ Context | Edit Context</string>
     <string name="nsclient_looponiphone">Приложения Loop на iPhone.</string>
     <string name="nsclient_spikeiphone">Приложения Spike на iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Тема: Коэффициент чувствительности к инсулину</string>
     <string name="isf_increasingvalue">Более высокие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
     <string name="isf_decreasingvalue">Более низкие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
     <string name="isf_noeffect">Изменение значений ISF никак не влияет на количество инсулина, подаваемого AAPS при коррекции высокой ГК.</string>
@@ -132,7 +130,6 @@ Context | Edit Context</string>
     <string name="isf_profile">Изменение значения ISF в профиле достаточно для применения изменений.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Тема: Сотношение инсулин-углеводы IC</string>
     <string name="ic_increasingvalue">Более высокие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
     <string name="ic_decreasingvalue">Более низкие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
     <string name="ic_noeffect">Если у вас 0 активных углеводов COB, изменение соотношения инсулин-углеводы IC приведет к иному количеству инсулина на коррекцию данной ГК.</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 280df00ce0..2ddb9ef219 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">после наложенных ограничений</string>
     <string name="loop_tbrsetbypump_label">Временный базал определяется помпой</string>
     <string name="openapsma_lastenact_label">Последнее предпринятое</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Отменить</string>
     <string name="noapsselected">APS не выбрана или не выдала результат</string>
     <string name="safety">безопасность</string>
     <string name="openapsma_disabled">модуль не активен</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">болюс</string>
     <string name="overview_calculator_label">калькулятор</string>
     <string name="constraintapllied">применено ограничение!</string>
-    <string name="confirmation">подтверждение</string>
-    <string name="bolus">болюс</string>
     <string name="sms_bolus">болюс:</string>
     <string name="basal">базал</string>
     <string name="sms_basal">базал: </string>
@@ -135,6 +131,7 @@
     <string name="disableloop">Деактивировать цикличность</string>
     <string name="enableloop">Активировать цикличность</string>
     <string name="openloop_newsuggestion">есть новое предложение</string>
+    <string name="carbssuggestion">Предложены углеводы</string>
     <string name="unsupportednsversion">Неподдерживаемая версия Nightscout</string>
     <string name="loopdisabled">ЗЦ ОТМЕНЕН ОГРАНИЧЕНИЯМИ</string>
     <string name="treatments_wizard_basaliob_label">базал IOB</string>
@@ -256,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">зцикл работает</string>
     <string name="valuelimitedto">%1$.2f ограничено до %2$.2f</string>
     <string name="valueoutofrange">Величина %1$s недопустима</string>
+    <string name="smscommunicator_pumpconnectwithcode">Чтобы подсоединить помпу ответьте кодом %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Ошибка подключения к помпе</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Для разъединения с помпой на %1d мин ответьте кодом %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Помпа отключена</string>
+    <string name="smscommunicator_reconnect">Связь с помпой возобновлена</string>
     <string name="smscommunicator_remotecommandnotallowed">удаленная команда не разрешена</string>
     <string name="smscommunicator_remotebolusnotallowed">Удаленный болюс недоступен, повторите попытку позже.</string>
     <string name="smscommunicator_basalreplywithcode">Чтобы подать базал %1$.2fед./ч в течение %2$d мин. ответьте кодом %3$s</string>
@@ -559,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Оповещать при отсутствии данных СК</string>
     <string name="enable_pump_unreachable_alert">Оповещать в случае недоступности помпы</string>
     <string name="pump_unreachable_threshold">Порог недоступности помпы [min]</string>
+    <string name="enable_carbs_req_alert">Оповещать если требуются углеводы</string>
     <string name="urgent_alarm">Сигнал тревоги</string>
     <string name="info">ИНФОРМАЦИЯ</string>
     <string name="eversense">Приложение Eversense (пропатченное)</string>
@@ -571,8 +574,8 @@
     <string name="smbmaxminutes_summary">Верхний лимит минут базала на SMB</string>
     <string name="uamsmbmaxminutes">Максимум минут микроболюса SMB для непредвиденного приема пищи UAM</string>
     <string name="uamsmbmaxminutes_summary">Максимум минут базала ограничивающего микроболюсы SMB на непредвиденный прием пищи UAM</string>
-    <string name="carbsReqThreshold">Порог предлагаемых углеводов</string>
-    <string name="carbsReqThreshold_summary">Когда предлагаются углеводы, какое количество инициирует уведомление</string>
+    <string name="carbsReqThreshold">Минимальный порог для напоминания о необходимых углеводах</string>
+    <string name="carbsReqThreshold_summary">Минимум граммов для активации предложения углеводов. Предложения ниже этой величины не будут инициировать уведомление.</string>
     <string name="dexcomg5_xdripupload_title">Отправить данные СК на xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip + выберите источник данных 640g/Eversense</string>
     <string name="nsclientbg">СК с клиента Nightscout</string>
@@ -652,11 +655,17 @@
     <string name="insulin_increment_button_message">Количество инсулина, вводимого при нажатии кнопки</string>
     <string name="error_starting_cgm">Не удалось запустить приложения мониторинга СК. Убедитесь, что оно установлено.</string>
     <string name="overview_cgm">Мониторинг СК</string>
+    <string name="ignore5m">Игнорировать 5 м</string>
+    <string name="ignore15m">Игнорировать 15 м</string>
+    <string name="ignore30m">Игнорировать 30 м</string>
+    <string name="required">надо</string>
     <string name="nav_historybrowser">История</string>
     <string name="wear_notifysmb_title">Сообщить о супер микро болюсе SMB</string>
     <string name="wear_notifysmb_summary">Показывать супер микро болюс SMB на часах как стандартный болюс.</string>
     <string name="ns_create_announcements_from_errors_title">Создавать оповещение на основе названия ошибки</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Создавать оповещения из напоминаний о необходимых углеводах</string>
     <string name="ns_create_announcements_from_errors_summary">Создать оповещение NS с диалогом об ошибке и оповещения на месте (также видимые в портале назначений в разделе лечение)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Создавать оповещения Nightscout из напоминаний о необходимых углеводах</string>
     <string name="wear_predictions_summary">Показывать линию тренда на смарт-часах.</string>
     <string name="wear_predictions_title">Прогнозирование</string>
     <string name="data_choices">Отбор данных</string>
@@ -979,7 +988,6 @@ Context | Edit Context</string>
     <string name="recurringTime">Время повторения</string>
     <string name="every">Раз в</string>
     <string name="never">Никогда</string>
-    <string name="mins">%1$d мин</string>
     <string name="condition">Условие:</string>
     <string name="action">Действие:</string>
     <string name="iob_u">Акт инс IOB [U]:</string>
@@ -1223,7 +1231,6 @@ Context | Edit Context</string>
     <string name="high_mark_comment">Большее значение диапазона целевых значений (только для дисплея)</string>
     <string name="reorder_label">Повторный заказ</string>
     <string name="age">Возраст:</string>
-    <string name="weight">Вес:</string>
     <string name="id">Идентификатор:</string>
     <string name="submit">Отправить</string>
     <string name="mostcommonprofile">Наиболее часто применяемый профиль:</string>
@@ -1233,7 +1240,6 @@ Context | Edit Context</string>
     <string name="invalidweight">Некорректное значение вес</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Низкий: <b>%2$02d%%</b> В целевом диапазоне: <b>%3$02d%%</b> Высокий: <b>%4$02d%%</b>]]></string>
     <string name="average">Средний</string>
-    <string name="tdd">TDD/общая суточная доза</string>
     <string name="tir">Время в целевом диапазоне TIR</string>
     <string name="activitymonitor">Монитор активности</string>
     <string name="doyouwantresetstats">Хотите сбросить статистику активности?</string>
diff --git a/app/src/main/res/values-sk-rSK/exam.xml b/app/src/main/res/values-sk-rSK/exam.xml
index 5ec0375bd5..ecbfd646d9 100644
--- a/app/src/main/res/values-sk-rSK/exam.xml
+++ b/app/src/main/res/values-sk-rSK/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Čo je pravda o DIA?</string>
-    <string name="dia_label">Téma: Doba trvania účinku inzulínu</string>
     <string name="dia_minimumis3h">Minimálna hodnota je 3 hodiny.</string>
     <string name="dia_minimumis5h">Minimálna hodnota je 5 hodín.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Aplikácia Loop na iPhone.</string>
     <string name="nsclient_spikeiphone">Aplikácia Spike na iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
-    <string name="isf_label">Téma: Citlivosť na inzulín</string>
     <string name="isf_increasingvalue">Vyššie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
     <string name="isf_decreasingvalue">Nižšie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
     <string name="isf_noeffect">Zmena hodnoty ISF nemá vplyv na dávku inzulínu, keď AAPS koriguje vysokú glykémiu.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Zmena hodnoty citlivosti vo vašom profile stačí k tomu, aby se táto zmena použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
-    <string name="ic_label">Téma: Inzulíno-sacharidový pomer</string>
     <string name="ic_increasingvalue">Vyššie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_decreasingvalue">Nižšie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_noeffect">Pokiaľ máte 0 COB, zmena inzulíno-sacharidového pomeru povedie k inému množstvu inzulínu vydanému pre korekciu glykémie.</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 0afa591591..61b125dbb9 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -106,8 +106,6 @@
     <string name="loop_constraintsprocessed_label">Po spracovaní obmedzení</string>
     <string name="loop_tbrsetbypump_label">Bazál nastavený pumpou</string>
     <string name="openapsma_lastenact_label">Naposledy podané</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Zrušiť</string>
     <string name="noapsselected">NEVYBRANÉ ŽIADNE APS, ALEBO NEVRÁTILO VÝSLEDOK</string>
     <string name="safety">Bezpečnosť</string>
     <string name="openapsma_disabled">Modul je deaktivovaný</string>
@@ -118,8 +116,6 @@
     <string name="overview_treatment_label">Bolus</string>
     <string name="overview_calculator_label">Kalkulačka</string>
     <string name="constraintapllied">Aplikované obmedzenie!</string>
-    <string name="confirmation">Potvrdenie</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazál</string>
     <string name="sms_basal">Bazál:</string>
@@ -571,8 +567,6 @@
     <string name="smbmaxminutes_summary">Maximálny počet minút bazálu, ku ktorým se limituje SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB max. minút</string>
     <string name="uamsmbmaxminutes_summary">Maximální počet minút bazálu, ku ktorým sa limituje SMB pre UAM</string>
-    <string name="carbsReqThreshold">Prahová hodnota doporučenia sacharidov</string>
-    <string name="carbsReqThreshold_summary">Po navrhnutí sacharidov, aké množstvo sacharidov vyvolá upozornenie</string>
     <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
@@ -977,7 +971,6 @@
     <string name="recurringTime">Čas zotavovania</string>
     <string name="every">Každých</string>
     <string name="never">Nikdy</string>
-    <string name="mins">%1$dminút</string>
     <string name="condition">Podmienka:</string>
     <string name="action">Akcia:</string>
     <string name="iob_u">IOB [JI]:</string>
@@ -1221,7 +1214,6 @@
     <string name="high_mark_comment">Horná hodnota v oblasti cieľového rozsahu (iba zobrazovanie)</string>
     <string name="reorder_label">Zmena poradia</string>
     <string name="age">Vek:</string>
-    <string name="weight">Váha:</string>
     <string name="id">ID:</string>
     <string name="submit">Odoslať</string>
     <string name="mostcommonprofile">Najčastejšie používaný profil:</string>
@@ -1231,7 +1223,6 @@
     <string name="invalidweight">Neplatný záznam váhy</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Priemer</string>
-    <string name="tdd">CDD</string>
     <string name="tir">Čas v rozsahu</string>
     <string name="activitymonitor">Monitor aktivity</string>
     <string name="doyouwantresetstats">Chcete resetovať štatistiky aktivity?</string>
diff --git a/app/src/main/res/values-sv-rSE/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
index 5a94009f00..e7ddb72089 100644
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Vad är sant om DIA?</string>
-    <string name="dia_label">Ämne: Insulinduration</string>
     <string name="dia_minimumis3h">Minimivärdet är 3 timmar.</string>
     <string name="dia_minimumis5h">Minimivärdet är 5 timmar.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -122,7 +121,6 @@
     <string name="nsclient_looponiphone">Appen Loop för iPhone.</string>
     <string name="nsclient_spikeiphone">Appen Spike för iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label">Ämne: Insulinkänslighetsfaktor (ISF)</string>
     <string name="isf_increasingvalue">Högre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
     <string name="isf_decreasingvalue">Lägre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
     <string name="isf_noeffect">Ändringar av ISF-värden påverkar inte det insulin som levereras när AAPS korrigerar för högt BG.</string>
@@ -130,7 +128,6 @@
     <string name="isf_profile">Om du ändrar ISF-värdet i din profil är det tillräckligt för att tillämpa ändringen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_label">Ämne: KH-kvot</string>
     <string name="ic_increasingvalue">Högre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_decreasingvalue">Lägre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_noeffect">Om du har 0 COB, kommer en förändring av IC-kvoten leda till en annan mängd insulin för att korrigera din BG-nivå.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index fe88fd2393..5659d7aec2 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -107,8 +107,6 @@ Eversense-appen.</string>
     <string name="loop_constraintsprocessed_label">Efter begränsningar</string>
     <string name="loop_tbrsetbypump_label">Temp basal satt i pump</string>
     <string name="openapsma_lastenact_label">Senaste justering</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Avbryt</string>
     <string name="noapsselected">INGEN APS VALD</string>
     <string name="safety">Säkerhet</string>
     <string name="openapsma_disabled">Insticksprogram inaktiverat</string>
@@ -119,8 +117,6 @@ Eversense-appen.</string>
     <string name="overview_treatment_label">Behandling</string>
     <string name="overview_calculator_label">Kalkylator</string>
     <string name="constraintapllied">Begränsning nådd</string>
-    <string name="confirmation">Bekräfta</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Basal</string>
     <string name="sms_basal">Basal:</string>
@@ -136,6 +132,7 @@ Eversense-appen.</string>
     <string name="disableloop">Inaktivera loop</string>
     <string name="enableloop">Aktivera loop</string>
     <string name="openloop_newsuggestion">Ny rekommendation tillgänglig</string>
+    <string name="carbssuggestion">KH-förslag</string>
     <string name="unsupportednsversion">Versionen av Nightscout stöds inte</string>
     <string name="loopdisabled">LOOP INAKTIVERAD PGA BEGRÄNSNINGAR</string>
     <string name="treatments_wizard_basaliob_label">IOB från basal</string>
@@ -257,6 +254,11 @@ Eversense-appen.</string>
     <string name="smscommunicator_loopisenabled">Loop är aktiverad</string>
     <string name="valuelimitedto">%1$.2f begränsat till %2$.2f</string>
     <string name="valueoutofrange">Värdet %1$s är utanför hård begränsning</string>
+    <string name="smscommunicator_pumpconnectwithcode">För att ansluta pumpen, svara med kod %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Anslutning till pump misslyckades</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">För att koppla från pumpen i %1d minuter, svara med kod %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pump frånkopplad</string>
+    <string name="smscommunicator_reconnect">Pump återansluten</string>
     <string name="smscommunicator_remotecommandnotallowed">Otillåtet fjärrkommando</string>
     <string name="smscommunicator_remotebolusnotallowed">Fjärrbolus inte tillgängligt. Försök igen senare.</string>
     <string name="smscommunicator_basalreplywithcode">För att starta temp basal %1$.2f enheter/tim i %2$d min, svara med kod %3$s</string>
@@ -560,6 +562,7 @@ Eversense-appen.</string>
     <string name="enable_missed_bg_readings_alert">Varna om BG-data saknas</string>
     <string name="enable_pump_unreachable_alert">Varna om pumpen inte går att nå</string>
     <string name="pump_unreachable_threshold">Pumpen ses som ej nåbar efter [min]</string>
+    <string name="enable_carbs_req_alert">Varna om kolhydrater behövs</string>
     <string name="urgent_alarm">Akut larm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (modifierad)</string>
@@ -572,8 +575,8 @@ Eversense-appen.</string>
     <string name="smbmaxminutes_summary">Max antal minuter som kan bli SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB max minuter</string>
     <string name="uamsmbmaxminutes_summary">Max antal minuter basal som kan bli SMB vid UAM</string>
-    <string name="carbsReqThreshold">Min föreslagen mängd kolhydrater</string>
-    <string name="carbsReqThreshold_summary">När kolhydrater rekommenderas som korrektion, ange minsta mängd KH som ger notifiering</string>
+    <string name="carbsReqThreshold">Minimigräns för KH-förslag</string>
+    <string name="carbsReqThreshold_summary">Gränsvärde för om systemet ska föreslå en KH-korrektion. Förslag som är mindre än detta värde kommer inte att visas som notis.</string>
     <string name="dexcomg5_xdripupload_title">Skicka BG-data till xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Välj \"640G/Eversense\" som datakälla i xDrip+</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -653,11 +656,17 @@ Eversense-appen.</string>
     <string name="insulin_increment_button_message">Mängd insulin att lägga till när man trycker på knappen</string>
     <string name="error_starting_cgm">Kunde inte starta CGM-appen. Kontrollera att den är installerad.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorera 5 min</string>
+    <string name="ignore15m">Ignorera 15 min</string>
+    <string name="ignore30m">Ignorera 30 min</string>
+    <string name="required">beh</string>
     <string name="nav_historybrowser">Historikläsare</string>
     <string name="wear_notifysmb_title">Skicka notis vid SMB</string>
     <string name="wear_notifysmb_summary">Visa SMB på klockan som en standardbolus.</string>
     <string name="ns_create_announcements_from_errors_title">Skapa notiser vid fel</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Skapa aviseringar för KH-förslag</string>
     <string name="ns_create_announcements_from_errors_summary">Skapa notiser i Nightscout vid fel eller lokala meddelanden (även synliga i Careportal/Behandlingar)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Skapa Nightscout-aviseringar för KH-förslag</string>
     <string name="wear_predictions_summary">Visa BG-prognos på klockan.</string>
     <string name="wear_predictions_title">BG-prognos</string>
     <string name="data_choices">Dataval</string>
@@ -978,7 +987,6 @@ Eversense-appen.</string>
     <string name="recurringTime">Återkommande tid</string>
     <string name="every">Varje</string>
     <string name="never">Aldrig</string>
-    <string name="mins">%1$d min</string>
     <string name="condition">Villkor:</string>
     <string name="action">Åtgärd:</string>
     <string name="iob_u">IOB [U]:</string>
@@ -1222,7 +1230,6 @@ Eversense-appen.</string>
     <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
     <string name="reorder_label">Ändra ordning</string>
     <string name="age">Ålder:</string>
-    <string name="weight">Vikt:</string>
     <string name="id">ID:</string>
     <string name="submit">Spara</string>
     <string name="mostcommonprofile">Den vanligaste profilen:</string>
@@ -1232,7 +1239,6 @@ Eversense-appen.</string>
     <string name="invalidweight">Ogiltig inmatning (vikt)</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Låg: <b>%2$02d%%</b> Mål: <b>%3$02d%%</b> Hög: <b>%4$02d%%</b>]]></string>
     <string name="average">Medel</string>
-    <string name="tdd">TDD</string>
     <string name="tir">TIR</string>
     <string name="activitymonitor">Aktivitetsövervakare</string>
     <string name="doyouwantresetstats">Vill du återställa aktivitetsstatistiken?</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 738a52ea2e..496fdef5db 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -101,8 +101,6 @@
     <string name="loop_constraintsprocessed_label">İşlenmiş kısıtlamalardan sonra</string>
     <string name="loop_tbrsetbypump_label">Geçici bazal pompa tarafından ayarla</string>
     <string name="openapsma_lastenact_label">Enson gönderilen</string>
-    <string name="ok">Tamam</string>
-    <string name="cancel">İptal</string>
     <string name="noapsselected">SEÇİLEN VEYA SAĞLANAN SONUCU APS YOK</string>
     <string name="safety">Güvenlik</string>
     <string name="openapsma_disabled">Eklenti devre dışı</string>
@@ -112,8 +110,6 @@
     <string name="overview_treatment_label">Tedavi</string>
     <string name="overview_calculator_label">Hesap makinesi</string>
     <string name="constraintapllied">Sınırlaması uygulanır!</string>
-    <string name="confirmation">Onaylama</string>
-    <string name="bolus">Bolus</string>
     <string name="sms_bolus">Bolus:</string>
     <string name="basal">Bazal</string>
     <string name="sms_basal">Bazal:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 295bc3b9f1..bfbda9b2e9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -102,8 +102,6 @@
     <string name="loop_constraintsprocessed_label">通过约束条件之后</string>
     <string name="loop_tbrsetbypump_label">通过泵设置临时基础率</string>
     <string name="openapsma_lastenact_label">上次制定</string>
-    <string name="ok">确定</string>
-    <string name="cancel">取消</string>
     <string name="noapsselected">APS没有被选择或者提供结果</string>
     <string name="safety">安全性</string>
     <string name="openapsma_disabled">插件已禁用</string>
@@ -113,8 +111,6 @@
     <string name="overview_treatment_label">治疗</string>
     <string name="overview_calculator_label">计算器</string>
     <string name="constraintapllied">应用约束!</string>
-    <string name="confirmation">确认</string>
-    <string name="bolus">大剂量</string>
     <string name="sms_bolus">大剂量:</string>
     <string name="basal">基础率</string>
     <string name="sms_basal">基础率:</string>
diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/src/main/res/values-af-rZA/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-af-rZA/strings.xml
+++ b/core/src/main/res/values-af-rZA/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-ar-rSA/strings.xml b/core/src/main/res/values-ar-rSA/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-ar-rSA/strings.xml
+++ b/core/src/main/res/values-ar-rSA/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index e0560d2206..04395399e2 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -63,6 +63,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <!--    Ntp-->
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 24af7efece..2a6d73f169 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -161,6 +161,7 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">Čekání na výsledek</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiky</string>
     <string name="cumulative_tdd">Kumulativní CDD</string>
diff --git a/core/src/main/res/values-cy-rGB/strings.xml b/core/src/main/res/values-cy-rGB/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-cy-rGB/strings.xml
+++ b/core/src/main/res/values-cy-rGB/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 554e429a1d..e5c4ba6b93 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -161,6 +161,8 @@
     <string name="insulin_unit_shortname">IE</string>
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
+    <string name="carbsreq">\"%dg zusätzliche Kohlenhydrate innerhalb von %d Minuten erforderlich.</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulative TDD</string>
diff --git a/core/src/main/res/values-el-rGR/strings.xml b/core/src/main/res/values-el-rGR/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-el-rGR/strings.xml
+++ b/core/src/main/res/values-el-rGR/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-fi-rFI/strings.xml b/core/src/main/res/values-fi-rFI/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-fi-rFI/strings.xml
+++ b/core/src/main/res/values-fi-rFI/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 4f7e558f4d..5a5de873fe 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -161,6 +161,8 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">Attente de résultat</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
+    <string name="carbsreq">\"%dg Glucides Supplémentaires Requis Dans %d Minutes</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Stats</string>
     <string name="cumulative_tdd">DTI cumulé</string>
diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/src/main/res/values-hr-rHR/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-hr-rHR/strings.xml
+++ b/core/src/main/res/values-hr-rHR/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 39663746a4..41abc12106 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -161,6 +161,8 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
+    <string name="carbsreq">\"%dg di CHO aggiuntivi richiesti entro %d minuti</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiche</string>
     <string name="cumulative_tdd">TDD cumulativo</string>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index e23142709c..3648be0016 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -161,6 +161,7 @@
     <string name="insulin_unit_shortname">E</string>
     <string name="waitingforpumpresult">Wachtend op resultaat</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Statistieken</string>
     <string name="cumulative_tdd">Cumulatieve TDD</string>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 2661e237be..c0d40219a0 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -102,6 +102,7 @@
     <string name="enacted">Wykonane</string>
     <string name="comment">Komentarz</string>
     <string name="success">Sukces</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 17473920e9..12c36e5b7b 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -7,11 +7,11 @@
     <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
     <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
     <string name="invalidinput">Entrada Inválida</string>
-    <string name="tempbasaldeliveryerror">Erro na entrega da Basal Temp</string>
-    <string name="goingtodeliver">A ser administrada %1$.2fU</string>
+    <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
+    <string name="goingtodeliver">A ser administrado %1$.2fU</string>
     <string name="waitingforpump">À espera da bomba</string>
     <string name="connectingfor">A ligar durante %1$d s</string>
-    <string name="bolusdelivering">A enviar %1$.2fU</string>
+    <string name="bolusdelivering">A administrar %1$.2fU</string>
     <string name="handshaking">Cumprimento</string>
     <string name="connecting">A ligar</string>
     <string name="connected">Ligado</string>
@@ -40,6 +40,7 @@
     <string name="date">Data</string>
     <string name="units_label">Unidades</string>
     <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
     <string name="isf_label">FSI</string>
     <string name="basal_label">Basal</string>
     <string name="target_label">Alvo</string>
@@ -47,7 +48,14 @@
     <string name="serialnumber">Número de série</string>
     <string name="battery_label">Bateria</string>
     <string name="lastconnection_label">Última ligação</string>
+    <string name="lastbolus_label">Último bólus</string>
+    <string name="dailyunits">Unidades diárias</string>
+    <string name="basebasalrate_label">Taxa Basal de base</string>
+    <string name="tempbasal_label">Basal temp</string>
     <string name="virtualpump_extendedbolus_label">Bólus Prolongado</string>
+    <string name="reservoir_label">Reservatório</string>
+    <string name="pumphistory">Histórico da Bomba</string>
+    <string name="viewprofile">Ver perfil</string>
     <string name="eventtype">Tipo de evento</string>
     <string name="mgdl">mg/dL</string>
     <string name="mmol">mmol/L</string>
@@ -119,10 +127,10 @@
     <string name="careportal_bgcheck">Verificar Glic</string>
     <string name="careportal_announcement">Anúncio</string>
     <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Pergunta</string>
+    <string name="careportal_question">Questão</string>
     <string name="careportal_exercise">Exercício</string>
-    <string name="careportal_pumpsitechange">Mudança de Cateter</string>
-    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
+    <string name="careportal_pumpsitechange">Mudança Local Bomba</string>
+    <string name="careportal_cgmsensorinsert">Colocação Sensor CGM</string>
     <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
     <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
     <string name="careportal_profileswitch">Troca de Perfil</string>
@@ -153,6 +161,7 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Dose diária acumulativa</string>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index eb03777b55..12c36e5b7b 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -161,6 +161,7 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Dose diária acumulativa</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 467eb5eb59..51b23371ee 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -161,6 +161,8 @@
     <string name="insulin_unit_shortname">Ед</string>
     <string name="waitingforpumpresult">Ожидание результата</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
+    <!--    CarbsReq-->
+    <string name="carbsreq">\"%d г Необходимы дополнительные углеводы в течение %d минут\"</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">накопительные TDD</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 2dd270300c..0f8eaf1405 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -161,6 +161,7 @@
     <string name="insulin_unit_shortname">JI</string>
     <string name="waitingforpumpresult">Čakanie na výsledok</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <string name="stats">Štatistiky</string>
     <string name="cumulative_tdd">Kumulatívny TDD</string>
diff --git a/core/src/main/res/values-sl-rSI/strings.xml b/core/src/main/res/values-sl-rSI/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-sl-rSI/strings.xml
+++ b/core/src/main/res/values-sl-rSI/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index d44a3b7bc8..d0981235d8 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -161,6 +161,8 @@
     <string name="insulin_unit_shortname">U</string>
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
+    <!--    CarbsReq-->
+    <string name="carbsreq">\"%dg kolhydrater krävs inom %d minuter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulativ TDD</string>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 4c45586f82..accb96c26b 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -15,6 +15,7 @@
     <!--    Translator-->
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
 </resources>
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 2c45d91871..21eec0d92f 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -29,6 +29,7 @@
     <string name="batterydischarged">Batterie Pompe Déchargée</string>
     <string name="occlusion">Occlusion</string>
     <string name="emptyreservoir">Réservoir vide</string>
+    <string name="checkshaft">Vérifier l\'axe</string>
     <string name="basalmax">Basal max</string>
     <string name="dailymax">Quotidien max</string>
     <string name="bloodsugarmeasurementalert">Alerte de mesure de glycémie</string>

From 5c2c8b519039d3562fd3f9f80c682ea3f4b4db5b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Tue, 16 Jun 2020 19:46:42 +0200
Subject: [PATCH 201/400] Safe Delete done Forgotten usage added

---
 .../triggers/TriggerPumpLastConnection.kt       |   2 +-
 .../icon_actions_cancelextbolus.png             | Bin 2293 -> 0 bytes
 .../icon_actions_startextbolus.png              | Bin 1877 -> 0 bytes
 .../icon_actions_starttempbasal.png             | Bin 745 -> 0 bytes
 app/src/main/res/drawable-hdpi/icon_bolus.png   | Bin 1834 -> 0 bytes
 .../main/res/drawable-hdpi/icon_calculator.png  | Bin 1380 -> 0 bytes
 .../main/res/drawable-hdpi/icon_calibration.png | Bin 1629 -> 0 bytes
 .../main/res/drawable-hdpi/icon_cancelbasal.png | Bin 1296 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_basal_end.png     | Bin 1155 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_basal_no_tbr.png  | Bin 17474 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_basal_start.png   | Bin 698 -> 0 bytes
 .../drawable-hdpi/icon_cp_basal_tbr_high.png    | Bin 17644 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_basal_tbr_low.png | Bin 17650 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_bolus_carbs.png   | Bin 1935 -> 0 bytes
 .../drawable-hdpi/icon_cp_bolus_carbs_red.png   | Bin 1520 -> 0 bytes
 .../drawable-hdpi/icon_cp_bolus_correction.png  | Bin 1338 -> 0 bytes
 .../main/res/drawable-hdpi/icon_quickwizard.png | Bin 2033 -> 0 bytes
 app/src/main/res/drawable-hdpi/icon_xdrip.png   | Bin 1793 -> 0 bytes
 app/src/main/res/drawable-hdpi/loop_closed.png  | Bin 3129 -> 0 bytes
 .../main/res/drawable-hdpi/loop_disabled.png    | Bin 3975 -> 0 bytes
 .../res/drawable-hdpi/loop_disconnected.png     | Bin 4301 -> 0 bytes
 app/src/main/res/drawable-hdpi/loop_lgs.png     | Bin 3933 -> 0 bytes
 app/src/main/res/drawable-hdpi/loop_open.png    | Bin 4178 -> 0 bytes
 app/src/main/res/drawable-hdpi/loop_pause.png   | Bin 3394 -> 0 bytes
 .../main/res/drawable-hdpi/loop_superbolus.png  | Bin 5713 -> 0 bytes
 .../icon_actions_cancelextbolus.png             | Bin 1493 -> 0 bytes
 .../icon_actions_startextbolus.png              | Bin 1249 -> 0 bytes
 .../icon_actions_starttempbasal.png             | Bin 651 -> 0 bytes
 app/src/main/res/drawable-mdpi/icon_bolus.png   | Bin 1354 -> 0 bytes
 .../main/res/drawable-mdpi/icon_calculator.png  | Bin 1092 -> 0 bytes
 .../main/res/drawable-mdpi/icon_calibration.png | Bin 1163 -> 0 bytes
 .../main/res/drawable-mdpi/icon_cancelbasal.png | Bin 941 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_basal_end.png     | Bin 867 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_basal_no_tbr.png  | Bin 17622 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_basal_start.png   | Bin 616 -> 0 bytes
 .../drawable-mdpi/icon_cp_basal_tbr_high.png    | Bin 17558 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_basal_tbr_low.png | Bin 17558 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_bolus_carbs.png   | Bin 1257 -> 0 bytes
 .../drawable-mdpi/icon_cp_bolus_carbs_red.png   | Bin 905 -> 0 bytes
 .../drawable-mdpi/icon_cp_bolus_correction.png  | Bin 948 -> 0 bytes
 .../main/res/drawable-mdpi/icon_quickwizard.png | Bin 1393 -> 0 bytes
 app/src/main/res/drawable-mdpi/icon_xdrip.png   | Bin 1099 -> 0 bytes
 app/src/main/res/drawable-mdpi/loop_closed.png  | Bin 2105 -> 0 bytes
 .../main/res/drawable-mdpi/loop_disabled.png    | Bin 2623 -> 0 bytes
 .../res/drawable-mdpi/loop_disconnected.png     | Bin 2814 -> 0 bytes
 app/src/main/res/drawable-mdpi/loop_lgs.png     | Bin 2505 -> 0 bytes
 app/src/main/res/drawable-mdpi/loop_open.png    | Bin 2849 -> 0 bytes
 app/src/main/res/drawable-mdpi/loop_paused.png  | Bin 2237 -> 0 bytes
 .../main/res/drawable-mdpi/loop_superbolus.png  | Bin 3548 -> 0 bytes
 .../icon_actions_cancelextbolus.png             | Bin 3060 -> 0 bytes
 .../icon_actions_startextbolus.png              | Bin 2448 -> 0 bytes
 .../icon_actions_starttempbasal.png             | Bin 832 -> 0 bytes
 app/src/main/res/drawable-xhdpi/icon_bolus.png  | Bin 2543 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_calculator.png | Bin 1675 -> 0 bytes
 .../res/drawable-xhdpi/icon_calibration.png     | Bin 2073 -> 0 bytes
 .../res/drawable-xhdpi/icon_cancelbasal.png     | Bin 1629 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_basal_end.png    | Bin 1434 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_basal_no_tbr.png | Bin 17522 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_basal_start.png  | Bin 785 -> 0 bytes
 .../drawable-xhdpi/icon_cp_basal_tbr_high.png   | Bin 17703 -> 0 bytes
 .../drawable-xhdpi/icon_cp_basal_tbr_low.png    | Bin 17692 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_bolus_carbs.png  | Bin 2524 -> 0 bytes
 .../drawable-xhdpi/icon_cp_bolus_carbs_red.png  | Bin 2057 -> 0 bytes
 .../drawable-xhdpi/icon_cp_bolus_correction.png | Bin 1692 -> 0 bytes
 .../res/drawable-xhdpi/icon_quickwizard.png     | Bin 2701 -> 0 bytes
 app/src/main/res/drawable-xhdpi/icon_xdrip.png  | Bin 2374 -> 0 bytes
 app/src/main/res/drawable-xhdpi/loop_closed.png | Bin 4189 -> 0 bytes
 .../main/res/drawable-xhdpi/loop_disabled.png   | Bin 5236 -> 0 bytes
 .../res/drawable-xhdpi/loop_disconnected.png    | Bin 5814 -> 0 bytes
 app/src/main/res/drawable-xhdpi/loop_lgs.png    | Bin 5284 -> 0 bytes
 app/src/main/res/drawable-xhdpi/loop_open.png   | Bin 5372 -> 0 bytes
 app/src/main/res/drawable-xhdpi/loop_paused.png | Bin 4447 -> 0 bytes
 .../main/res/drawable-xhdpi/loop_superbolus.png | Bin 8032 -> 0 bytes
 .../icon_actions_cancelextbolus.png             | Bin 4456 -> 0 bytes
 .../icon_actions_startextbolus.png              | Bin 3649 -> 0 bytes
 .../icon_actions_starttempbasal.png             | Bin 935 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/icon_bolus.png | Bin 3609 -> 0 bytes
 .../res/drawable-xxhdpi/icon_calculator.png     | Bin 2316 -> 0 bytes
 .../res/drawable-xxhdpi/icon_calibration.png    | Bin 3013 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cancelbasal.png    | Bin 2136 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_basal_end.png   | Bin 1814 -> 0 bytes
 .../drawable-xxhdpi/icon_cp_basal_no_tbr.png    | Bin 17667 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_basal_start.png | Bin 897 -> 0 bytes
 .../drawable-xxhdpi/icon_cp_basal_tbr_high.png  | Bin 17926 -> 0 bytes
 .../drawable-xxhdpi/icon_cp_basal_tbr_low.png   | Bin 17932 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_bolus_carbs.png | Bin 3767 -> 0 bytes
 .../drawable-xxhdpi/icon_cp_bolus_carbs_red.png | Bin 3253 -> 0 bytes
 .../icon_cp_bolus_correction.png                | Bin 2449 -> 0 bytes
 .../res/drawable-xxhdpi/icon_quickwizard.png    | Bin 3927 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/icon_xdrip.png | Bin 3803 -> 0 bytes
 .../main/res/drawable-xxhdpi/loop_closed.png    | Bin 6933 -> 0 bytes
 .../main/res/drawable-xxhdpi/loop_disabled.png  | Bin 8594 -> 0 bytes
 .../res/drawable-xxhdpi/loop_disconnected.png   | Bin 8677 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/loop_lgs.png   | Bin 8145 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/loop_open.png  | Bin 8665 -> 0 bytes
 .../main/res/drawable-xxhdpi/loop_paused.png    | Bin 7414 -> 0 bytes
 .../res/drawable-xxhdpi/loop_superbolus.png     | Bin 13108 -> 0 bytes
 .../icon_actions_cancelextbolus.png             | Bin 6123 -> 0 bytes
 .../icon_actions_startextbolus.png              | Bin 4813 -> 0 bytes
 .../icon_actions_starttempbasal.png             | Bin 1089 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_bolus.png    | Bin 5092 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_calculator.png    | Bin 2958 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_calibration.png   | Bin 4090 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cancelbasal.png   | Bin 2861 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_basal_end.png  | Bin 2234 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_basal_no_tbr.png   | Bin 15488 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_basal_start.png    | Bin 1038 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_basal_tbr_high.png | Bin 15631 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_basal_tbr_low.png  | Bin 15636 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_bolus_carbs.png    | Bin 5055 -> 0 bytes
 .../icon_cp_bolus_carbs_red.png                 | Bin 4514 -> 0 bytes
 .../icon_cp_bolus_correction.png                | Bin 3170 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_quickwizard.png   | Bin 5427 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_xdrip.png    | Bin 5279 -> 0 bytes
 .../main/res/drawable-xxxhdpi/loop_closed.png   | Bin 9246 -> 0 bytes
 .../main/res/drawable-xxxhdpi/loop_disabled.png | Bin 11210 -> 0 bytes
 .../res/drawable-xxxhdpi/loop_disconnected.png  | Bin 11432 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/loop_lgs.png  | Bin 10821 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/loop_open.png | Bin 11428 -> 0 bytes
 .../main/res/drawable-xxxhdpi/loop_paused.png   | Bin 9729 -> 0 bytes
 .../res/drawable-xxxhdpi/loop_superbolus.png    | Bin 18296 -> 0 bytes
 app/src/main/res/drawable/add.png               | Bin 420 -> 0 bytes
 app/src/main/res/drawable/as.png                | Bin 1639 -> 0 bytes
 app/src/main/res/drawable/clone.png             | Bin 643 -> 0 bytes
 .../drawable/icon_actions_cancelextbolus.png    | Bin 1493 -> 0 bytes
 .../res/drawable/icon_actions_startextbolus.png | Bin 1249 -> 0 bytes
 .../drawable/icon_actions_starttempbasal.png    | Bin 651 -> 0 bytes
 app/src/main/res/drawable/icon_auto_delta.png   | Bin 392 -> 0 bytes
 app/src/main/res/drawable/icon_bolus.png        | Bin 1354 -> 0 bytes
 app/src/main/res/drawable/icon_calculator.png   | Bin 1092 -> 0 bytes
 app/src/main/res/drawable/icon_calibration.png  | Bin 1163 -> 0 bytes
 app/src/main/res/drawable/icon_cancelbasal.png  | Bin 941 -> 0 bytes
 app/src/main/res/drawable/icon_cp_basal_end.png | Bin 867 -> 0 bytes
 .../main/res/drawable/icon_cp_basal_no_tbr.png  | Bin 17622 -> 0 bytes
 .../main/res/drawable/icon_cp_basal_start.png   | Bin 616 -> 0 bytes
 .../res/drawable/icon_cp_basal_tbr_high.png     | Bin 17558 -> 0 bytes
 .../main/res/drawable/icon_cp_basal_tbr_low.png | Bin 17558 -> 0 bytes
 .../main/res/drawable/icon_cp_bolus_carbs.png   | Bin 1257 -> 0 bytes
 .../res/drawable/icon_cp_bolus_carbs_red.png    | Bin 905 -> 0 bytes
 .../res/drawable/icon_cp_bolus_correction.png   | Bin 948 -> 0 bytes
 app/src/main/res/drawable/icon_quickwizard.png  | Bin 1393 -> 0 bytes
 app/src/main/res/drawable/remove.png            | Bin 741 -> 0 bytes
 app/src/main/res/layout/dialog_insulin.xml      |   2 +-
 app/src/main/res/layout/dialog_tempbasal.xml    |   2 +-
 app/src/main/res/layout/dialog_treatment.xml    |   2 +-
 app/src/main/res/layout/dialog_wizard.xml       |   2 +-
 app/src/main/res/layout/dialog_wizardinfo.xml   |   2 +-
 .../overview_fragment_nsclient_tablet.xml       |   2 +-
 .../layout/overview_quickwizardlist_item.xml    |   2 +-
 .../triggers/TriggerPumpLastConnectionTest.kt   |   2 +-
 150 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_xdrip.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_closed.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_disabled.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_disconnected.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_lgs.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_open.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_pause.png
 delete mode 100644 app/src/main/res/drawable-hdpi/loop_superbolus.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_xdrip.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_closed.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_disabled.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_disconnected.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_lgs.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_open.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_paused.png
 delete mode 100644 app/src/main/res/drawable-mdpi/loop_superbolus.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_xdrip.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_closed.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_disabled.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_disconnected.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_lgs.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_open.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_paused.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/loop_superbolus.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_xdrip.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_closed.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_disabled.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_disconnected.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_lgs.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_open.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_paused.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/loop_superbolus.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_xdrip.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_closed.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_disabled.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_disconnected.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_lgs.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_open.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_paused.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/loop_superbolus.png
 delete mode 100644 app/src/main/res/drawable/add.png
 delete mode 100644 app/src/main/res/drawable/as.png
 delete mode 100644 app/src/main/res/drawable/clone.png
 delete mode 100644 app/src/main/res/drawable/icon_actions_cancelextbolus.png
 delete mode 100644 app/src/main/res/drawable/icon_actions_startextbolus.png
 delete mode 100644 app/src/main/res/drawable/icon_actions_starttempbasal.png
 delete mode 100644 app/src/main/res/drawable/icon_auto_delta.png
 delete mode 100644 app/src/main/res/drawable/icon_bolus.png
 delete mode 100644 app/src/main/res/drawable/icon_calculator.png
 delete mode 100644 app/src/main/res/drawable/icon_calibration.png
 delete mode 100644 app/src/main/res/drawable/icon_cancelbasal.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_basal_end.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_basal_no_tbr.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_basal_start.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_high.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_basal_tbr_low.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_carbs.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_carbs_red.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_correction.png
 delete mode 100644 app/src/main/res/drawable/icon_quickwizard.png
 delete mode 100644 app/src/main/res/drawable/remove.png

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
index 0e2228cf5e..3248269997 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
@@ -77,7 +77,7 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.automation_trigger_pump_last_connection_compared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.value)
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.remove)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_remove)
 
     override fun duplicate(): Trigger = TriggerPumpLastConnection(injector, this)
 
diff --git a/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png
deleted file mode 100644
index 95761084a9acace3081eea185dfe94b12980c837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2293
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

diff --git a/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png
deleted file mode 100644
index a67d52838c72e9b38dd5b6ed2ee6edd4f03bb347..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
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

diff --git a/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png
deleted file mode 100644
index 8772df62a4ec9beb694bec0dc983a6e8c41237b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2ojdb&7<RLpsMd!rsppp4r`XMw3+PKz$Aa9tTv!O)rEV$+b(a!oqNrf~!R
z0@3vgLpp-i3a|=s9des?#=N-Pr?Bp7%Cmd*d46fTVkfA0PEzr_WG}sX*N0u-%}y2n
zN#(o2woK|w1;e?<=ZXB`eXCMuWE3=*=`hqL>^-n1^+7{?Q>bCw1A)aQ9y0?Nst-g>
zW{j=hyo`O_?*qQQlF|oWJ^z|A`EZHtwFTS{HXYmNx-Z%E(%17Ff_p>_!VW|*CbLq7
z(fEXY$MFMtZ`tPQ+PoL3_*M9x>&E&`mYrK!by#2T&Zs-FS61to*S$%*6LK@xAE-UM
zcRTO=de3`nd=u0n;xBQ3h$w!~S#Zq#Lt?$u3hQuS5CGBJYW7D)vOJQZldgbLsHdx+
J%Q~loCIH#b3pxM*

diff --git a/app/src/main/res/drawable-hdpi/icon_bolus.png b/app/src/main/res/drawable-hdpi/icon_bolus.png
deleted file mode 100644
index b212194219bd0d5a6f2a09553f681239818cdc15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1834
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

diff --git a/app/src/main/res/drawable-hdpi/icon_calculator.png b/app/src/main/res/drawable-hdpi/icon_calculator.png
deleted file mode 100644
index 2eb2a3b96c194c8c314d7de6b99a7e286085f251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1380
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUE1oWnAr*7p-uBLjb(J~((SJ*(VDF9<QKF);9T6@e1q&ZVuihe(E2^v4
zBBrUa<my!JwR&CBD>b_K1$4Cb1+c7K#PRA<?}C7ugrgi?x)E1`*5uAQa&*pw$rGyI
z&pczP{(aidLlY|J{5=2U_|Nk{&!;%4O+J}oG}A|I^9df^Esvk=<<~j<dIzuiRkOv<
zW**YN@##~Sc-hes8@<E}(FM~F3Uz&Gn$!PwqipaIEA55(_62@9?W&y3XG<T}Z%{uN
zce&?5Q;_8^S5Lugz1biAdcVzj;J%r)Tj?n8^P&}Q(Y}QiON-|w@!oQh_nn(0`#EK!
z(upM32}ipYoV$?7y>9KrxVt(>TQ%8UiM;MolHHtQ-lNbh>Nq#=$CQ8f-tj!HowGB5
zxwPvm@4j^x<AmQ#R|qRR%&{p#@XE`!&>bw>#eV+(kaPO6`o(P#w>PW{xu+>3#mADn
z`{AZ($5&6?ljeG1i*#Ian*BDHh|Q;LdhU1sQQXtIST<+vkx<d&wq5)m!k^9zTadYN
z-tnWcx3-_vtY2Qd=9|hjx1L(Ad3_c8)c-zfbKkW^Rz5R3^OVc8#rKa`E%d&fvSe-N
zl+H8mm-BYWP8a>Dm~-S)&~Lvt+Mn1r?(SZj&SJjykj1^#HmAExbg%7pot35<HvLp|
zX#ZwA{Y#53=I7nG4h({f>fM{YJ02Zxm3WZ=alXE2rozcQ2}d#QrfqjO_+5KAPszUX
z_=n)h%-dA2P2IuVKSMV1ez)k2jSRD2w`R|}T=POg;B{7w&YeBhqO(~JnmrO#+$4Wc
zSoe%-=dz<#u^i%VU7u<Xv3-wzD3bVV)zim6MAy6Bm{)D6`*Kl~=q$0<{xyxay-TIL
zLehBVf8DTE=J~W!`HxpC*{ja!j*ZiLf9<b`@~mY?XC1hENZ$N<NktmZ^@rQ#w#6Np
zE12B>XlKXs>Pv1f3S1(3j$3V6FBG#u{BB?Vv&TnH0L8=RY!yo{&!`SKRA05lQ#$_e
z*NWihlh0jz^gJwa?aL$CY3E+A{t$R%^VE!}HJ@1)wt1IUe`MFwz1sVz`tJAM;`7JM
zW^#I|e+WoiY&fgzu;HFSt@nq&I=%Uty0WfcAn8Z}bDq{Et<6XCTbA8lqj@L($@K?r
ze*&h2KNg;&$Z_L!_Kp`@Hm3P<=@lFCO?mbI=-ER*uQgWw`kGX)X|KAYeDRjbR|fMH
z+O4mICx-m!;^W-!{`mRlpB-vVI$<o4YrsiM^O^$3e3Ro=&h4^?rY((^Jmv~co?Dc7
zxi*UXPKrA{!#CGnXm7HI;OpRr%TC?rG!tts{L|wuUabVoRN%aI;Qv##{*VpjSzkeg
Nqo=E%%Q~loCIG<&XsZAK

diff --git a/app/src/main/res/drawable-hdpi/icon_calibration.png b/app/src/main/res/drawable-hdpi/icon_calibration.png
deleted file mode 100644
index 605635f41da19b9469c7b7f0b328bb2acf2617ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1629
zcmYLKdsNbA7zVu1C{o<iCY8Va%1q_1rl3G5n)is|WaKHisbpM+IM7^@T1Rs<-CRqn
zt=m~s)O6FFGmWgov?yJvsTH-9(0M60v*m2qTKmrVzV~}C=XuWa{_(!Wtb{E{ga-lw
zfgq!!m~5MkUAoI0ZEtWw&Nu`Djg@e?DsFrnMJSiz_#(MLjMGRJwmbw9O4lg(!VIwr
z5Qx(xGAcOTdJzO9A}W{^7*B{-gp1Q9Q8`NShdBuxVNQmSECT5?M5u;h1CWYUd_W`J
zEz6{6sNic{itWD?#)H7?5>*BjWGoQ^+;|ocE?0_yK-?y*kmw%_1d(yXKyolC00WQ+
z#7%et8BYwr5{MK6nL;1}Zw^R90HI1zDuvCAd_!jQs9?HErJ&&PYPA}t_Q%PUX?P-;
zOvV#PcoGR~tH5Sv%T#;~R+hPL3F2Q2rZ`imlqggZxeQps<O}3kDk=!#mq_q$SZwm}
zZ}r)nw;dA8Y;956^aIg#6bQurMl_Sb(Hxtsloq)rt}^DSe{E_?9O%Axg8gj&{Sif?
z%Pzn0Vv>umPh8B&a>6ap%P(gi0n@lCA9Dl2sb3JW&iL&8!RgM>*al|4Pf@9$ywI_|
z_A||t`S;(Cw_37I75kT4;62APE!h=+KOm=>vQ3-UyA(6QvZ((IJET0I)3||Jt;?g<
z@0@tAw83!c!dKWm^dtxUY+I#ooc&(tnA?%l9?SQ6YKbRdZeIPYl;yV|xrHNqyKB15
zZ~|h`KG_9K-zKPq%5a`ecI}%B(aR11^xL<Tt!ua_P=OLqSA-saG392y0aGSE`cv5+
za1K`6zAwBa3t3OIjJTK&8D9L@2<`FB-RYE@pQc`c?Wd%OzE1uQ_Kkz7;?S!P2pcU6
zoRl(oJ_`exnlPrWp83ddOtKa(n>40+DOv&<8yg~_`ZZE_JGDdiQH9UUfr5KcX0MDd
zS%O-}Iz=NE>Io^Z8+Ekq7@!Q{9C?`Nu%bJMR8V9P^rmAMk`zfjS1*Sg=DEB$m<Yd6
zqP)u)b3Jj_pKidUH1=7dAHP%8kyO*t^<ifR!5nyV0WyoE-7vKAygeJnKS6W!4bDf*
z59zCZHa^*NvH#MR8V5tx+C|`1%?oQGrpiOtKFNdYxdqzMs<~+4YHjut<1zaI?-Z}P
zehT+$CGzvFO&3X>(3VzT?6&0KiL#{03|GH4)}s4-|0-`j?fjIgYn{cD2QT3YwG~x!
z#zCX5@L^O_SkGRwmS_oDN;viI+0pbZp~*KRB1?D4@*caK!$)N#jBD^SA&L%X@1A>I
zBe6Y{lyCYhWb;-jSj*KJ8aXc~o>_>}M~K^YYLA7SQqP$^TZUa94~$fwa@FhZJ2Xyr
zfA<n|&5v;Pi5k}8zteuPyTKaS$;&L>c#d`0I3E{+vO=Dz-cM^QJvQ%Qg6d0~##N$U
zPob<bI?4>cbMQ{N<gEAUqh-8ir@QlR33kIhd5qpqFV9xY&D?&<Gt)2jJZwChcQXBI
z_sYlCHD8^M3YvLX|2i;!y)jKZq@O{f!>Ah(48MLx&a1y>wWzAOkI&Ti3x7VmHs$Ok
zxuHHTh90{nsJHn_-#ZJtidxaZkJ5*=C;O}=5j88#n(DUIntdf`=h{I;j-TuKX~;BM
zso|q0JVh;~tgz1Nb%wQ%O?|R6GUgP<eGEwaBEnG69lC=X8*tRx>MV^+HHVis%=JFM
zR}@-V<`dJwGslQ&{xtDunsaaN6IiO5MxQv*9E=^EcC`0wFs*yJA8(gd-tMkNc9np}
zmksep7^5VU&>-zz*pS=YfdkIDG(opp^SVppoMiBCJN`aYZFk>9PJ-RPd|q7@*1GBX
zZ$W01*;iB|@nCP0!WJXPQjZ%}?*8cyxb|A2X=}us!}<3GA@9c26rPTHKI9x+*YnXU
zHo{Hc<*o=PdNeo7z85}VXP$DqQdvB#;dHczOfs=WSp^-R?&c>kq(xZ?{O#$~8n-Ls
z?7_w4!9*5X@LBP&Y4(E^=(8TX7&ZP~*V~5d=hn~I|ANzh?{)<?kE)=ll7a{JV~!@z
zA={QweXw6r4eQVR*n2R}^_O0q<o_|^QmlDOf1s;fso18|ENzA8hy-R`SW5msQ@+S7

diff --git a/app/src/main/res/drawable-hdpi/icon_cancelbasal.png b/app/src/main/res/drawable-hdpi/icon_cancelbasal.png
deleted file mode 100644
index 91803a3f3c9db6ba3c9817f4ebf5b59c6f9001b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1296
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJU22U5qkcv5PZ~L!_36?qV(cf0C(j`~RDR)+z=*EnsgNOeAnjWUHQo*HD
z!NyZt(A8s$(nf)LF_*<HTRc^_I0{VkQgQW|C!ly^gTt*By*(FJY_#}3^JU4h;&Xf7
zKRtWo{qC7R@0QnnpHp-H@7(HlGbNi8I1s2Z?cf5oVE-)%y4Mnv<1#PYKfFWg^+&g~
zb1LtSL^RhWim!YB{kZWp-jIhM&h*J0amqP%|HiDD*H0=}tf<-_HgAn*&Vh@jzh0+#
ze!UfbLxJyf&iAyhR&CQaF4{1^daG;cynKPxXZlu1uFIY@r#kg+&*MVHz5`}4ZQqTH
z-XC}@`*Cw@q2Bg{Rc>-`ju@I2|5pybW*5^~UTAh~qwMLA7ZpF{9WlOD{5b7SX!?R5
zV)L(`xf^f%o}uWpz_LP1yVZ|4SI(LCHFH1L>@BXjlh^fy{WNHA7K+>;KK;RIt+<Zu
zg;C+Vy+5w{Ci_M=GimPB{~u}swYa}MP^yVP+WkRpTG+>(mqJbAj><ofS~<mimer;Q
z;&a;NSN~w~JQaFFajHg*&Rxsp(mjP4E3~=m4*mSGv&;Wj_O0@{nlU~0QeO;1OeVT&
z9esM^Zt0)wl_B5FZ2kva3=vy-<ln2poF~s$<jp!2rQ`dqdv~Ay<aZ6i?5RBlzA3ts
z!af+EkJ(+g`kQF!v@Hd)_7<fkE45!+cwSi<`e(Mu&HV~*wa#$tKG1l&W8$*DHOU|O
z{MJ8u*ZPX@rD1v+<1Qxs%za0V-cLC-Yl7G7Gg|YGdDUFHnx~z2xo%5j@AH&5^LdR`
zHyvAAdc`tykAGB4-Hqjc)$UvtTz_zK>tkuHqSW5R?vT7CLeaWYA1|!n;x9Q;{`le~
zMm}N7O=1sRV<M0Kf1tK!-p%7|HrE8#AFrLc)7iCeO?IL4*L|(Gr@lXYzkj*)quyKQ
z9TOLpG{v_+&;Dkr8N1N9=T6G}&B41|C;i&}XYc2@ElXTq`(@64-p%%WmUvOhR+Ha9
zR!{zWiCs?lWR8u;|9p-})|NF)PGO9Ss~aYSI-Jl_ND&p-#D!b<NnP|$6&cIv%r6fI
z78jgTwe9<>_1L@Ia#Pr;|1VEyd~ohhzW;EFW2a?mMbgKDXKg$Gc>TC^(D&22HU1xa
zfBwC7L9XViLjCS9$?f)E_1?zvo|9#96o8=%6Y3fNZ|JIi8}efjs37xn^>bP0l+XkK
Dy3{=@

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png
deleted file mode 100644
index b9cdf5cc1fd93151afca55976d3216fca566179f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1155
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp&z>%hAr*7p-a5ZJG*slk$NrB_T0ES>olagY9J-6$TwC-_ybrQjt#F*o
zk)_b+(R@IIi^t@Uy~C0PY<yZA@n5t=CN2=*lyMPh5fz%YG`0Vf{Q85trkC$MSzR9g
zeOufb{TPe(z1Jgu*I7P)Q+v%)#d8uG`g8is&MV9{`;v?J<c?ndvBscA(d?1#A0y}c
z>;>f?8GZ`qKX~44y6%S2j;4u<lfD=0-#Zdt!SbG8qMZ3#vS!|~X_>#)y?(Nz?1bUE
zV{AS=lKobj_8kb+Ic6Qv&!5&2+0x&-qF7@7!vDceS0v}?N!;dm_E1sh;KZgI^#w<l
zvXomiPW{1G+`1w3@|SoGm%CanwrOdRvBwHy559l6X}^)JY05!!iKE|laJ?`4_Iqbs
z$1dNFDw%4n-i4N1Qv}U_1j-z~TEYMQ`xgBJ?h$G(wu*UgHn+{%^gvtj4ZC8F{yX96
zN7{GDPOcDIAAaucoLie7cq_iKSSNVsTXL&r;BM(BxqjS{M|do|<d5cTiRq}4+AZ}o
z$4@)*$k~4x=l`+rnV-2nCv4NR#4}gAes9^Ka=b8n@tm`nimR*V?^?cjf8?1ib;Ed$
z-J2cnJ-agPsx|YW%@w{eb*l@!&h$LqvAF2nvnx}s?%!6$cf0x)|3gQ`oW=+*oz*k;
z1D*bL{jK@Ow{?H{9b(h;=hdOBf7UE$TeGv`_La{Mx+^kg{hOblTUY+D_)+~lsZDVQ
zXPx_Yx+1Y*M)M<{*#e>+hN4;7Yga0+jyAg4wwAS!-DU18^TKJqVG`cKSywi1OH!|s
zQYw?rJ0vf9?BX1$O%i?~(}SlTyD(>3zx99XpfE<w)eTcZ9ZqQ}q>4`1#N`pmx?~L#
zs&K$!m(M(Anb9v}LLN#aKWg5scfTv>$4y860OxBfegwQJD%iK-|IT@DrGMYb6MS#M
zzHa%|313(J*!Hl<;D!2(SibIZCgmNQ*1z2m8B*bclH!&q)-#`ZSgn}KE(I<;JYD@<
J);T3K0RRyZ<iY>|

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
deleted file mode 100644
index b94fac29866402036735ff47b8b1ef3f159ca867..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17474
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
PKbeWq$<n98hmQXP8&ePg

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png
deleted file mode 100644
index d79ca15f86036c73c3cac65fe76c44ef101912af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 698
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2o{dAc};RLpsM%g~G2QO50~xM9{q&Naeon8L!My2>|fI4R2Ve!(=kV|EFt
z6R+v{3j8(^R21u8B-C_&4YT8Y{%yDZo<C=|O=g0M=Oi#PExFYA@$8~wcGD!8+F6U&
zA22nDEc^UG>E9Fn*+(ar&Sl<y!0+K7!vZFo|F`-g?nf*)S(tVp*<d^O8)oJO=j}Vc
z=J|Y{{^yFI!Ky9dW?8y_#3i*8)--HnI>seICL=)THCIH)zH?soFD75yZo2$H*lbqs
zq_4O37<>`3vyU&#@1M5Oi*Iu*Q+aNj)DHgn^$UJ#Z*SC#KYzyV;vAJJP>+dLGjCdL
V^lt;#)M!wW^K|udS?83{1ORk9_ZR>G

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
deleted file mode 100644
index a213f1955f7405a230eea9a87e9e9d6dbc576f2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17644
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
Z+I%cwtkJ(%=Dm+(aN|&J--eyP{SS23YQq2k

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
deleted file mode 100644
index 23aeee14d43cc081272f4c5746839dfd1e85bbb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17650
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

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png
deleted file mode 100644
index ed6be099aa62c0fe947d34685d8a54e3446a5dbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1935
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

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index f5f02cc24210d9b26469057bccb3f9c3d36e0d03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00odqL_t(|+U=TYY!y`)hMxjWg<7O|
zi_lb%#ehIdk%)*JF?tg~Q4}yD8VDK`H71IHaruFU#3ccvjaw5D0<ro7+{$8b!Ne44
zSR`0#nu1zXXc5}V(psoL=ACdd&a_v#)4Sxn37Ny3bH17T&bOa}g@uKMg@uKMg@uKM
zg@uKMg@uKMg@uJhf{_t#fz4T2@eq>_M1UXSAuOk*B`&|MM-qO(!N6BQU*HyCdklLr
zfw4fLh|UE50Nw*mrK@IL3{(Ka^#6KbJa8~z{Rm(Ya2L?WXTBKN6EDr`mSkG>u0a$)
z9`G@6foEM7@G`I$m@lH5fK9;nrUl0H<&uf4slasL3@{lO2^<58fThN|T;NOKDY=oY
zz%*&)WZ-(BO>6&3SF)bb^-XC=74Wp~Jt1Gz8`ua;1e$?+fSZ9&4T5qEUwkN?qG1Nm
z4h#qO1FgUyIcN7{R?9RSL`Z+2Q6yFR$h=kL{UTYUgU=cU>;awyR_NZ>22lWKff9`)
zA_`zm08s#Qb^ScvFPx~<;WA(wFhJqn#SWjf8w@f5)&rjf$h{i4Q`-7Yyk9yIn$=Sg
zZh+66pF=(<|K#Gu0J#?dYh>CV0=v_Jtfh)@jldH5Di;?9>^Y`uC9u<HzBf<~Tn^L$
zkB9N%T}@U*NhH8S%9Umqk!)x{5Qu2}iO>9%B5|TVz;xhnI*@fg&`a7;rhEGg|1#cZ
zPoef8&2h_{sgkin_nUxd2aZ1_$QlUD0<wXHx>qVE>|%u?-w<GoXa7uNd>>E)9Fdcs
zW&DP<p6os4$SPDJTm~F9%<K!#x*Fg+jUV&WiVHn!hX&MvGnL7wWQ!(WL=||JoK?!w
z?zz8Q8G9QrPVJfZWx6h!l#A5@r-6RJ1eHb@er<u7uO)knCPQJo063w{JXdoqK15-3
z7J8_p*{2o_z^}jyGPRRFd#?bV1m;P*u2JCFmI`J#1Gq^<jZ?N>YvfruoqV`_gQ!iw
zD0L)G20X6{ct8=cR^5s%!0c2YYl*I}sJ8nPc*GO#y%-!IYn3M{?Fid}WkwsPM1C)6
z$r>STYE=gTLqm3HJjG{UG(g^Kih|u^c=lLevBs@9O~IqdOx7e_D-_~Qlp6U~mS;~<
zfV@k9)xb}{bNUe7JY~-9z(>llMv9=Q`d&$GhNE=#D@(TM+TSqCOi!WgEpz_Xc!*4_
zQogGO_+4u@$WLY{O(_DtNrkRMUtJq~<__R=Lc0Uc8yZlo`O}J`Yo(cP%pWd?zW^95
ztu#xc6WaGW@MBncRv2Wpbs+nUG$A7MS!K*^1|AlnUR3K}32+DSsx-~T?0~v4=`;9x
zBmDb4&oBF~Q>}NP6WQ(RXB7iK8~3m3io!MwvUVAbIKK{opT^|@H~fcZ^f8L-M)j{!
zlB}&Vw<4txChiT`lcjy@fonUE-4EwfXSWD$RwUfp6=a1~8<yi7OO*l-YN`OI(U%>A
zm^wwXL!3LL812!_3Y9neI};YK+Au7#t^>Z6kBQ<O$CrB&&uZ0xRX9iN1vqDZlT;D~
zVW$$+H32nd%8}(Jp!1bU9|kTpnth8D{rrAx1b9?yvOR_N-T$X&l?r6_QpAcF)2n5c
ztucri2&^-FSh*r5i6Se^=HDs)eOj|IMxwwuBsDYpF#%~ummy5Dmf@Tans{60)iZ|u
zw*f0PK8|w`aXgV^g=K~-Id>fOhBRt1aHH-WQ4O~l=Ty2u?@}NKKM$vY=SIe9M*fyC
zGYo^Qxj27B2F@RQEH|Dt2dCpXC<amOzy~6|{(RmknaRqN#*_gs1(<#m=YU}X&M{V|
zG5;IR$<15mqfMz44Kt0_N-W65X*D;6;g{k?mW73dg@uKMg@uKMg@uKMg@uJhn&KZs
WM?wa;(ngs80000<MNUMnLSTX(2&_&3

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png
deleted file mode 100644
index 8ad786440618b237be1180f03fd2c943a3e567c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1338
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJURh}-6Ar*7p-tx|f4HY@|@qX{Zj;&o8p7CKTY9#_UC_FmS_{hc8gs;XY
z#H9CX<BBaIx?LR#w~`z~UU6TU*yURDfLqrpupo)`D7)Q<&bJFR%(iV^W)-16qlM-C
z$-CEM9{)Q0^v;{w^H$pO+3)vWyVtJbISCC(E(?9`ZtcHw$=viaM{imz{Po*?PvczP
zw>d`+nAGlI*7v`5ar@($x7@0h|NLNe=IGlUVxQH%^geKn>AIhN<5t7&TOXdX&S@>b
zwc(=S#%WzIB3t`ESll~$u|mrILG9O;rpK#Z=h<98&~Ldz$Ts56gMFSaTOvMxP@DEJ
zE$5J<&H-Vk6<=@I9PGExy77<ky2*#99*SXtRbG-(huzj3Si8fWV=G5~cjarf$E{LF
zyk$QuwpgmXTHN`^l?umgNvi9PGbi6-|LF0x)^eZ58~;Er_iI@)t?8~Vy_fo9D~fz>
zODSI25Ha<<<{R%qukO;E(!VuMznxzkUY&GK>d@gIQj053E;_VNWce2ZnU(8`)wbjd
zCapP~?zCfl!Lp7c|5=tQXPYeYo3kXp_Ulj9+XZa<4zCRTuijd#>G$%)udTbj`Ci<A
z^GD}?)u2Y^WhXZ5?wmBSwCBXBhd*b1zteH~2-nWt3-o0dPKo&Js<caL`_J@^Rj!A2
zMe^*o=Kgsx(2M8r&kAn!ZkI3b3~Q%9juAACPvY+r*M1OG)A9L3F{8be-|nQZiMwZ9
zFn@4w)n3)MYo)<=zV~*l(S3Ej-Pq4MNmsz>t91P9tsfTL$i30m?Xq`=Q2V3knjZVx
z72kRcVmFF$DTZ}M<$GVfC&c;U)~f$Cf7C9uzQ6rx3-^q^i0)Pa?E>a^>u*IbVv`Y?
z{Fl{fMWl1^#%UZ2r%A_)Y<Ky&$?Z)t?~GKZi#}^qlV+#RoUvnj*jwE|0sdJ>L1N2W
z0<!<^U3;n7y-+kx-07|E%LMa4bIn+du6wy^;;&3&GQ_xD|DKQ%^#1!W>4t36@q$)?
zEQa4!4}r?U*Tg<r@X)A6VOzqlk6kAge=9$-TW|5nIi*`Qy!FHaw|TzVF8`t-KGsus
z<F~HRf>lCk*DiNno*U`ib+ticHKS%2bI=;LB@w(H8>Ir0`0Moi!apC~k-2F}L+|7x
z-ldCq9`99S^Xk~@w<q%Y+dDzE$2Lh>zmn20<Z0)=vBLZE=A*TbTr!RLvUYd}DQ$Wu
zod5W*^ymBjy!HFzWp>J{m3bZex4-%bn<Hv2`CtBzsrAJCjYZ!*{Xj*Yr>mdKI;Vst
E03X^=C;$Ke

diff --git a/app/src/main/res/drawable-hdpi/icon_quickwizard.png b/app/src/main/res/drawable-hdpi/icon_quickwizard.png
deleted file mode 100644
index 67a020c05eb6b8a2951de4b40e45b0e4b9ec8fa0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2033
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

diff --git a/app/src/main/res/drawable-hdpi/icon_xdrip.png b/app/src/main/res/drawable-hdpi/icon_xdrip.png
deleted file mode 100644
index bda51738e77e3051a7dc5e2aa6102c7b17615bb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1793
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

diff --git a/app/src/main/res/drawable-hdpi/loop_closed.png b/app/src/main/res/drawable-hdpi/loop_closed.png
deleted file mode 100644
index 066dd4c26a55c21f2084332009be79a7ebf364d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3129
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
T|NF?M00000NkvXXu0mjfnQlKo

diff --git a/app/src/main/res/drawable-hdpi/loop_disabled.png b/app/src/main/res/drawable-hdpi/loop_disabled.png
deleted file mode 100644
index 268a9bc76b93903b37248d64428598b556819645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3975
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

diff --git a/app/src/main/res/drawable-hdpi/loop_disconnected.png b/app/src/main/res/drawable-hdpi/loop_disconnected.png
deleted file mode 100644
index bfff44ea1ebe18928a53ad7a80799768903a2328..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4301
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
SvI7qw02t_)-fz@)N&G*MLM<f#

diff --git a/app/src/main/res/drawable-hdpi/loop_lgs.png b/app/src/main/res/drawable-hdpi/loop_lgs.png
deleted file mode 100644
index e45fda615bbc2ee6f0327b963c0a7fcc8db65534..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3933
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

diff --git a/app/src/main/res/drawable-hdpi/loop_open.png b/app/src/main/res/drawable-hdpi/loop_open.png
deleted file mode 100644
index cdefc55ce8c4c36c12311f52392132f9f37ef27a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4178
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

diff --git a/app/src/main/res/drawable-hdpi/loop_pause.png b/app/src/main/res/drawable-hdpi/loop_pause.png
deleted file mode 100644
index bb97008a077d01203d7165c18baf65677705da40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3394
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
Y1M9}itDdU+G5`Po07*qoM6N<$f&*z;LI3~&

diff --git a/app/src/main/res/drawable-hdpi/loop_superbolus.png b/app/src/main/res/drawable-hdpi/loop_superbolus.png
deleted file mode 100644
index d9cec8f0471745d3067b77d9d93b7688d5d64fbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5713
zcmV-X7Ov@uP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000&kNkl<Zc%1EA
zdstM}+JBkZYY)R^xQhZJ<_!ZZB@Gi574eEDiHd1>Ez`8@Xk}RscItHdP90ObopZiQ
zty7(obKxR45d?$*1~M<{5llPhboJ9xM48!p|GqzFZya$L2Gp$Y>wTW}JUV-?wcqty
zYrVJiz7YLJztL~>8~r~bfIPCYNR^aC91(Fuq$VO25qUUiY9iv2l8DR7A{9U$H;3yR
zOaOVLr<0oO6TVhbr>B$p{{&cBS)?NSE^#C-Dc(2wwUxSzn$5arn|JAUUMh+yu@=YG
zTZ>{X_7+orv1E8<i^>1ff4=MY@?X~bE=eEf6(1HB=GAU2wfv1=7s;#Jwp$`1BD9;9
z2TuAiH|i~G)zo9C9VMW8Fi;)|><tBq0)fInpdjFKD+~ZidH`h+K-D0i<_@5C#;NlK
zgFf2+xNd%Qv~Q5ZCsn^DpxS_$mgslOH@kXlLfx!Jm}Bh|&hdd@;2`LkAQ+iVG%}lH
zWCDy#bZnB536g;cqLJAI1G5Qw24s8N!K@kxSf+jRQ+~fKYtsGV9l!lcK6;9vrPRcL
z$p0z0Z8Izr&Y`p?knIgY&qT?{Y%nnq*-V0op&Lz<j7$*pOc0Hpz@8AGZn${9a^~Nk
zm>(S934b@0)I>yCSy`%Yi~}A+{lwGQ69U1YfvAAeJwQ5c*-R1*%-Xt(*^n0u)Qu9F
ztLN-kKR;psUDkrX2;zu{)@JmKvDPoxhq7=81`Q-5Z@Y$_;$F-51InX-ns}gUk`<+~
z$IqHVR%c~psfcc}Oajm*h!5}VGasKNokOlSL<8#{FxgDHqILG}Zk=Sy3I0#rX7<5~
zY3d~!4Gp-dfH;yPIH${|y@>sTVAE>=6EC<6hGdilu$~Emfk859+nQ+LAn5IayiJHZ
zfF>B24f}7wQ}g(Z?RmTD+RPE0vz2pRM_CwzT~|(^!)9cHsAqy?^aKk0fb!meIS!~v
z0IJ5cpla+zn3FD{W=tz;MgZnm`#S}Gkg~Okpce!^v!bFe_CBw9i-^=wQRLYkn5-;P
z$;Ro=4i47_&fcC7^vvo8IHF)+67qb2iYTBq`Al>1(7gSd12#O8?lo=PQ19D<g0$g*
zTIwAZppER?%d^kK;oi4Dwa_=UW^2&K=7QU@Q8(p#R1E|Q0$}}=i6{#fzTKfQ$*j2o
z;%8O;91+p!vRN;pw3i*6&NYpITpz$3gO-Za^1_#cm&HVR_w4G2!^3@pwyq7D*<3RA
zW7Leii1J9ZW(S+)$87*8yXKwMY|)0fd|Lb8ZzQRSh)#XncLAyfLeO_6jCoPebHKg`
zT&kT@vE_F?Cbb(+MMPYBy4_uH*5pZX)J`KUn-(<qd{z1fII{i+BJw0^v))O5pU!{6
z8*w}nxmo;6$~$zm+jHGWMMSjW-k!JOv#~9<U7TxU&&Uf>wid9AKL54;mPZ_z_n>ZW
zd1nsqH~KzPA|iBw%5z74tp$S)pg2r|c_^&K{p+JbDM8`kx(ad!p{%ymXI6<h8X#Ni
zLR;}RDMt$&nDhDLiz4C_rs(>3@<i08sjix&!^C@{I;9!8eh_vsD@q~&%XHh0$M~lm
z`dzo(q$VQz&M;&h%EIk-j!SU7ARWBVJZWS^;PqytJ++rB%KwKB;Ksn50MY0v!o(mM
zn1~#mgu3Cd<p=Kb;VD+`a&1no+}UIN$e?gEO#D&MyEs}#UJ!FUfrFXmX^D{m@(|tH
zHQm)ZauAL-&SR@!j<efK4hlmsFdItyK(fqi-gF;(xP8Cwklo%X9JvL1f+0Jb&IPi`
z6F4yU&~*f-Ly#1Cl$2zTHntbgme)PsK}D3}2VTLeWMBgF0)V;%T*~vyC8Apte!H|V
z%GMh*Jg_$!lAA??#`*5aW|FAqMAVJCuyJ9p!OF+F0*d3r<$o&M{wjt$QP&<sM6G#!
zs<0;nl94%=mDx-ZO`bOF>kFY~#_83mY>}JeUqKuZ(GR=AHlZ}s>1x2lAR3r}vT%H@
zAN;Umzpj!Dj*5shw#uY^jqk86@*_uv72vdEW4VbhFIGMFk1Xz)ut05Zhj(<gvhhD)
zw+=A5Hef{q6ObPaSQ7F5N8TS1kz${@-c9mDkBEo}E$Y%vN!i|j^N@ug<$9sDcAlBq
zR5-e8wW^7Til1eF#No-nk=a-}QN2)p)@BPml&W4Tny35=O^blfrT~ri;qJS*6lIVQ
zf4Uv!(U449cO7O)G-++990;L0<zKT$sXI3=l?R)a1x|!H4ual!JV($o5!JWi%|}AV
zJ5I8z<e*9V;)@4tjqk9M3kJSkw9NjFh_uSMN8i@IfyM<8>*kzE9idvCm7(4y9hxhK
z29RP-(1r}pOqhpUDWE%Pl1U4}sI{S>Cs02L2jABGnTY&d@yrns{b-7M8+&_5lF7-(
zj7*Snz0p#cRwei8uDVpk#1KzJ^!7^b34FN-L=-ouH_gP!2QX#0I+cj%4-45NXj%ws
zj$a88g%c6ka{Mep?ff5zNTYmz&-0pBvA>`D0Ofj1C>;n?jRb1ON~oSB;8-SXN1i^s
zYKCUwRopt9JtkD8HX_Hz>G2ZuOh9E63SJ0V;t1+BkjKB@<Bekdf=guIF}-nox%Bd4
zZX*$Si3jh$AnYG|iiiS;h@Q{Xti_4@@cyHGmfW8wBKm$OmyfbAySD1oPvn4#*p}p>
zp2-2;6gQ+F9~&0LNBj9vzajnj*il0?gRbII+3rd4zR{>1CD?=I?Sx%6lSHEis7pRO
zFw8f&9k88}gFsdZg<&7Rwv0VOL}beetPu7ke=ollgkvkPW`=4*QjB^YzPuOV0W^(>
z==YhLwfJHIY*iDF5s{8A$HO(&l7y2e2tZr#-_UWmSI{#N<~Yns)F!&UjEekuZi&x5
zFvr?=O8YZwWC98UaG~(dJh@v}kC&Q==x^)zXYtQ8;P65aQQU{?)$ikArd56(iKhFd
zjM1vqZ>~^p6KhAc&Kjv&*J{#Lp)mtu?ewpB-Y$C-LoY<9=@0V+o0RPX7?_BBKVVM~
zVC(=OBeS6*5_Ma3&yal79i8Ql7M&v^s(Ib#8B|2t2WdaBf!R>e8~Zowo|ae6?c?Pj
zko(|^2d$PraoIv?^w&Rq$ja{?rFsZW86ct&V~40S@Z~ZP(Fj|9)P5YB1RP5T4lJ`4
zzreN;QG~KM%A!sfrk;+P;b`5(E}=9W!tU^s`Oo>jggv2<oTz-!$ZRO-fo5aihmH&9
z*6KEY>iq%s_Ht_f2zn;K9ES~aeWyFFpgUtL0(tvd?in;b03y<@oW}hQM=~%VLY*d7
zrJT2#_|L3`y-tYL(@qkRdRRYh{ICJ)G$I;FmqQnh{BlG@J0Inr!u}Wmd;3GENp2#d
zzFI9spl*aH8lBigMkb;#5El#MDiyHZnS_dn=;H1HMJNh%YK@9UCZRS#923XK5p^pV
z<zdVAFBSJs{x=bkmlqAgiA*UeR=r@}7}Y8qoemt%Kxhz+CnC~mDdDx{+>8Htk1Mw2
z1z4=vn&RgcagP#FFL^wUi0G?#wIAT~L|FIUUPH2`3l8?`h3au<rEIUOWvPjY$n{2R
z#iT}(g}ghm)Psn~T6B9uo3Lvqpe2(Qs2<xA6r>F&avdml5Xf};6YU#|Cwa{zBC_R%
zes0V5uaTei$I(UD{<zO3A|j!vZ_eiXxu=LIpf%U408RG;haQAAzn{fs@-Gwijr|J8
zmq4gr@Z<9iPN!JE^c!2*z%nB8m48wZ5o;|S`z7*xoX!QgK9DLWen)m;-xYvj>Rkhr
z)Do!GMsx-c$w&6h72H#3Oo!O8@Ej5KJoQ(uSge}%4UxQqnifm{wUn);%l=mn>EPNk
zIFO8GlU3`TjC-rKp!W$JpN)pC-Y@(3`1G*u8@HY8Hj(45=B=fPCz0pd0YKgmD<*ua
zfO>ra3Um#S!|zczvb^=o-}p+=JfU@W7TdmN2KO|MF9Z<<Jv>9T9w(OJwp+MF8Bk9m
z3i|3j{zDv2gEc?w=o52Pk4J{m1Ya%PHGR1H-qM%YC#W3{!7}Icy-DiX5fKquh4*$E
zh_{xGb^(x2HvuY)`>c~Ac0sEpmq$zy-tRxcKa1nbKtv%QKgRxy1L<O)9+ZZLS;Dcm
zSfQ||-+zS4$xS570Y~c7Q$5v|uWP{Z#lVT>!13k4iKW2Nl{mGX|AdGJI=-(=(9z(v
zmfrPcCjfQnh}ng7(e33Z3<BB<>1-y6Mo*w-l<l@#Gy`1$q>N=Ph^`a%jyOR?G$vM^
zh7+04dC|1Ltl?h8k%_?JIf(AXO(G&17{NwtTf=3Y`-C@LH1PRP%;B=UHIza`Bkqb(
z&wFyNYV|C;LmBDt9d-N3DgXBKqX1M-I4$Kk5z-1km6N_AyU*tqKx!hQ7K831?Csf+
znio-X8&==#okG;P785HcpS0;&DG{l(j7FewDY7zDPY{vXR+naZ@jlg)L=<pN&u63Q
zLEz{rh!rVc31x{*IJ^>QT8@i3tb*vWQ>rXLXUF@FL7G9R86^k?Cmw;3iOBay>z?6t
zayPfU0gj01(A&N*p}e;XL$NQ4UhrK{t_?*GA|i3`okwkXkq3#0hV|nn<HRCq?M&55
z`5m5!`iu4RzC*)AteC2Lg5=dysAm985h_NV#j$1h{X({sh`9K8Vy-5k9Pg}5-x)4E
z0vq-O<3diqU2?b1%@t+fZL7WSMRm0EflbVYq9B~lkNwouz{*&Mx3Qf#oM|H>^-GJn
z=g_ni10&c7xgQG);-jrqQ@_B$6x46wa^s@ZGl{4l5k-UqP~wZ3+$*S_Ac&tYKDT-%
zKbxrS3dj}NZKE9lub`|0gI9JnYV58?TOXICY|W|h-f^f&fS`Bk$B3fI6R4Z=U2t%4
zhtgk}MCu*tDL6JC|JcCZ6N>x%Tiie8BsmetYtvLuissbwXj%vyTMisqW*5v&527_!
zljp<Jt@5kxSiBxY<Z-ETS_ATY0n^nBt#|}aW%#B#^6Qe6iAF_{r(~XX5;@MJiGrR9
z*gpU}H-yY4*T+mnL~85qLFH%|4II83BL=GPCL#*)r=f4G;vTPlRlOsBlY0Bo6xF&O
zL3H<^NcHSBGgVLRSjWAxHchoMG@$L8hRBU$AWziep&7w<pf+A~8t_vh61C%6hV*yK
zp1Xq7L`3Iuqu)nKNQVJ4<m=E}Hnq?d;|`a6y~V?;zWK`<{trYHcy^a22Td!1#+49j
z=baJv-~AnqtpJWLgk=k-C!*f%hU&^4mObE?H{?z12}Z~K`{82g#B#Zh`=MfGtG&4<
zXjVsZ2qp$m&qUPTA*^2zJd8TNJ$3xBw+~M-Vr}Zzs82y=vT7X>g*ZM>8K%A;waLKI
z2ZZ%${9JNFAUl$Bmp3{-xECxFeiRLy(}XP1$ZRO@jk;}t>*TKP2mF*{);};%2TSVr
zlF6x~XAisX_C|BnoZWKQD*$r53KlFWdlKWgWFm?d>+bm%8dC7rht+TTYH1V^g%MF0
zW0bIUmHKs<$3Xl%^W2K5>gnX3Kz1bi?kOI(4aLr#ZI~ED11F(wv~|WvUH^8xcI`uF
za|izkCBYqE`{<c~%6_PSr}sR^ehwcDwe27MIZi!{ch`9?mwyYX-^Tumf3C7y#YYwc
zhZg~jOMu2@xRmEt=);q8$L99dSAcxu(eMP+4iiMZ^TaO6$OIJlNf*i{=g3{V9#2;$
zn2{0`4NIa`?D*PQ6!mHm4O6~PPYUTt)TZ7&e0?ccJowNlG(LbQ=Xg4cUEi`{E_<Nj
zk8F$iHTK4fOH_}BhtTZ~&)sHRzHU-QMMZf^pJf~pOrB1aOPhkJiNm(FJ=`*MU6GoI
z=zQsv4^R}~T-ceI{a!v-18e=gdy|rqlshan5&2k4ZvA-ka<;+|oc5XcPN+*MDvoJ^
z=c?zvFBSMfGIp3RDM)$VxM-eRMRYk7(=Ad2-u<aT(XfoZDD2`o%te%pynuW^v{)AD
zWsuq*4X5cU%Kf_1x+)8<%9$+b;Ub4Xv3+9j-%o@l%R^jqT8^5C=uE+wS5VReqLJ_L
z<C2lLp}-$4mPPvX^z^oP4Bfb#<+jP$b0$Mwrsqf|-X<0J;C$5r_g#z5NIBa>LPNcA
zAmf-|;^8XY*A9{&F4kq_r`#3VLt*54W_8I&lp`V<84;oVsp6jZP|~B5+$AOodX0z!
zQ_rL&1x65&hn#SJT}Vwtv|~f>(Xhlzf}V4kpC}o40eL<^L+Z)huSU#r9OqhUz1o*o
zy}rKJXsKat0}A~+y(kn6%!aCgIP`9mqHV8xQl~xBEPwQ4*caY;hO3bmM56|%ipEdn
zlRwN%4UB0wURweuKpxIoyF|`5N=^)jJX4gg1+_y(WP7<1$g<7DTTvW@v*ok4D&M}|
z;IvJOi0G%9B|A~%4^hv%2Fb)kQO`u=>j2BBOFtD3-?8a|pb6b&aP{24gfqE=w!t#~
zEQ*5_N7`kfjAZ0(Qmz)Z&zF|T%HvuxP+XIuG2-LnS&L<f9tHmP)o~3HVB`fs&)I9e
z%yF<*O+Rw_9|2o8ukxFdG{h&ir;kqv*@d}AZoE#X3rvXh8T`U>zk5#Z2zaHXe6j^K
z!+<@(5Dl7+lcTOY>Q*sF3mnQ+awe}$t-DDcMC6f_l*F}ImgrIF4?)j&o^3DJX9xx+
zA;-&JX;?i7sJRm`PdM9JI`*WsH1VXhbo5DU>0MvKoO~KJ2_mWo17*E{TyF?^ITqzc
z*@I}{t;q8Q4qcHm`Loq=s1%US*Dm@SN_#=r#l+6G`xQs;ib57oAlDnn^Oc)7kgaX2
zOzcw4SvHe|T}(i6FfKLRS9Gm8liemI3yp~AhvJb>qh<(1qo-ZXy9ZL+gpkdo_9dBa
zl|^0Ec$=X21gZw$OvQ{hWSOHZ=uM%vGi`Xe&r}?^rxC@05Dc7j)osX)ZGxa@A`1L~
zhRNR_+8LRt@ORV8qhwMO5hcd?1)M2MeiOBK3dr||V6e-b8&Y{_-*t9i@^pYX2Iu$B
z{QLZ=z4|CT-7sy{O=>&iS<6Bbnk%N5P&*7L3WR9zw1-8m6)YJPyZqvS0)KlIQFU6`
zyBm8=cE-yuirRbWSxZ6^e<~WW9hT&CsED!`#u+^!=$R<kD+w=`gkN2fDZ<DE$;fPi
zEYL-x2FTah>+LOLE}btMXW05^$W#Xwel_*;R}`Bh#s@^^zZAUULg|<S)J^;m<{>~u
zAA22rfxlgY<@&U1-u9}*k`R00ZuPA|-T3B~vT>y~Zw0TLG0xX9fAG2%%lvHQ?C*8N
zM0xkzxKKB>{7<@#&4!>4E*1{0Y^|7dT&$e%tynSsTd`uow_-)|ch>Th6BqZ~Ufpa8
z{jh4YF6)&QzO#nMYOf09|LkR#H-a3T%#OA{NA~OrAG!IGlY29nJcy{vaid=iITXez
ze;UV?rfK^VIf`TZbMW|!qmI1!o6Xm6^c(#~H=O<#dv#fyIv6lZ00000NkvXXu0mjf
DZHXkp

diff --git a/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png
deleted file mode 100644
index 4ad378e374a0add202bbbca73d029476d8bdcd32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@S5Ftmkc`H+H!3^ALq*s>^v|4pGpV~RQ>1mKtJ)>Epc`?^TyH5!%~ZW9
z@5+)Ud6R9HfotOyfxt&w0s@k^cyzN){p#+z<ziN<gy_yxsTrqz>gSjn=g)h;-R7ft
z<DU2S@Ap=}-}%1gz3ulo#r&#XQ#1k>xpc;|@7=`vcI|CbQ=#JzL}eys-ELZLuy<O)
z`p&m=-|v2#bC&B-+Fefv`Iu(qZl5XcPgs0b2mg!d(fxFo=UQk+{^4gz!cPTvGIAGI
z^WOA~XtM79W6)gr!*Y2oU!CW@^$y10)|my$O|*<?+}RW&cWg1MbYZP;sdlpVzEhe1
z<L2BCp8WsJp{G~XZrLt>8$PGGd?SPO292xrYV-W3NVNNRzvS~f?A!TA&hoE*g6^ym
z-EY&cs-010I$daY@1Stf)A%DNBj%jwJ<i^GC0#)7AWP2Spgo#psl5uN5^l*#d>&7(
zJ(!#&e7$JDx~lyx;q4utFUU`Sw6saZ?SZaL%kskMe?DJqyf>rir$m#wp|g&I#{8oF
zUyn>Qd=&8A*?O5;m&n15N#(y)KdrS)UX~zHC(ylJEAxK%k*VEBDrZi6ak1A!^|IGv
z_dioLKJxF=^+>AUqxI%*$yDEzZ8uDnG`2l3bIeHkWE(0lcedy{Q33X@sWLs!TRL?G
zwPW;W6|N|_9{Sd%)lO+sz2dp2W--0|t(E;}xI&aS$=?$b{1)ePY^y}Wb;B)ut!-Tz
ze<kj%nCv3eEVT2nOT!$!zQcds9Po1a<~2pOvAu-#c<Z5DKEbjY4_?=_NAY)pJ^sFX
zp}%IK=ZvpP4+HzX_)jTc64&q6%{|yV^B?OD=5}s<lMPKwdkbe4T(5t_(Jaz;ZK{i%
zLRqR)m4n>Gbe9X+qG=cB8K>#JJ6y1_*w-@I?UBPq4QuA>s^{0c&XJz{?#$<?#X?Wj
zynnutxua!sGbOR>rpo%miZvlV_q!xC&*a$J9n*YyZjY>FA9s<+=|!<mlA52SZ)8_L
zKebfrR@m_weOKyIKi&6xB6w5h{v54D@78boP8Mg+{d{F}v8>u2&tr3>D>vSnVDtOB
zW!<z}oG)Hone+OxY_G~Dn@Yab#eb^iEH9e2ThLzh{oz!fZ4+JYiKmsjG0wbd!F~V9
z7hSQmTPm9#=S4axcdj{XG?7Q_pw^tV+3uY0Z_e2h-%;C={?=u2H~)FA?UoC#9pI@G
z-k9V1>F<Iao4*L9XKwYW$ugNJR``5|`hT?uUTxNy?WIdS!aI8wM=r6O`=WE#HH*OA
zRWacu_XK+c%rA*9y0m%c^4C%8JOAXgoro$=S?boQv%^<JaU1tF+t3BGHH&uKT(rSp
zLBkuBJ?f_%ABXO^@l|AE?v9`vzmER!OS#aj-Sb|ztKQp{Yk$}sz3HL94*n1PE!+Fs
z_0sjW^R4c`f>TaA7wlQFAm`BH9n$sb>RM4X86tj1R2LmH4Y`wT_Ncr@t!#1Vl%}GI
kYC*t^ECkHaH>Q4&Kc@VAnty8d15jz~>FVdQ&MBb@0D^UiN&o-=

diff --git a/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png
deleted file mode 100644
index 338df773c2f8cd0837f81bd8044653656e98036f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1249
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUKu;IPkc`H+H=@_XJBu9u=)Zc^tZ5vgE8DXcdBlgbtXkq?^WlMzs-Tp}
z#8vG4uY^2{T>|861e8oH3OSV~?oe}o#lhP-X<4cFk+rT>_OC8!`8~OESZd?>`~R2x
zpSkyZ_nZ8pP3h<BubugGZeHZ(YZoqo!KeR;PMsGo_1><^EK`*`q&Rg~e4+5X8}mOV
zZ|*-e>++E`*DCL%ZsB-Yd$fYbY@SnDf8hRf8#ZZw#nT3N0>86QTlR@DBC>M*(IskD
zlFhynht7E2&CBt9D!RjVD*K1nxd&&78F5a3$ady?e7X_y{UqZ)zta5))xyl?N11H;
zb{?{}Z7=_zT6fq)rhjum+|j%Mot;r8s!ysOX0=~zXD_+`=6#YV-_fEwP27c|^Hv!*
zs<r4GR{kL({&;oYef6%r22K4Rw?+8XRtV}ZwBPz#f38ccBKOhhKRBL0Sgx0w_UPTI
z-~Bu6|JF|XRl(igmHMOZq|2)v_nVIxNgiU|)&0Wk*ux#-*+G@;=Z?qOG;69(Ua6eI
z=_jD*?r-SL&V9sfzE;fpvomyU;>=20bi}j&wMx~_>0l4uDIfp9jnyz=<%G!w?iI@?
z9<uxQFzVqZ_ak;QTPGJ=Yl;?`eS7%T>9>|}L8;dMN%OctVn+UR&N;V!n>%OXyxALq
zYZmHwwaRqr+HU*1y4~z}*s1%=|83R~Eix$kdZSEx-%bD7E2n;XuVi#?QOJq&k9c0R
z*6whb^DKGe;vhSxj*~z^H<{^)`yJ=}N$!lCK9Bv8#K!PV8ls;XIsQCLy|G3#@cli#
z{d;H4Ti!Xjw)S0%S1V74M|t70yVXi_R(Ab7xWD~X(nFcB=YA_fPU!9F$u5Xk_I5$X
zr1qo#cKSV0-t2PY^Q?k{kykha-yJNu6P{q*;JQOJf7!07Gj#IeH?35DB5b4cZ*e!*
zoBIL_Z6-#<>V2B^=C9-5=qa~9D9$srsy+KKXd>Sl(fAb|yPW=s>^yQk>HL?Mwvn@S
zrd|H5wE9g6Q>01Z`mMstyO$O%_o!Siu)N-US!c)h;)zWBk9-#MAI+JytL8>?cgyvi
z%>La^H~GoTyWLVgyE*u1<VM#gzgJ)JXO-H^Cv|YLQmk#b&eY&b#k+nK-F9W#8dY=f
g-0Tz6AVBO7uX*ySL&~pygo8>ZPgg&ebxsLQ06nZ9yZ`_I

diff --git a/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png
deleted file mode 100644
index 18fbd8c1119ef94c546a23b9ad17975dc4123225..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 651
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`43D_H=O!$!L6gV`J8#0Ewd?_lHWqTp(g4TB2)J`myki*L;UxB6)qXyMJ)_
z`Pnsu2+Wba!{W%YbP3-{1*f8XrwRQ9b*EKNp4@vsQop04!=p0flAWI0f7kipth3~H
z3K#6D{b}bTw|!duvNLgwk{_N;{L9RC;7IxBYO$Y6S{vE;`f~UslDC{l-c!d=?EX#s
zMas=TisxO#R(6<bCG~biELOU<0*&dL+4Uoao%KL4V>+wlzskPr0ymbk#=1%!V5>N3
z=rZYo@pY!M@bmKzln31ieZu3@xbFEwz37CO6Mr-Qa*$pje3x}S*DOaD7ndh-db@?C
UmMFDa%mt+(Pgg&ebxsLQ0Kz-w1poj5

diff --git a/app/src/main/res/drawable-mdpi/icon_bolus.png b/app/src/main/res/drawable-mdpi/icon_bolus.png
deleted file mode 100644
index c083219b450a124d1aaad7c17702afd09f8eac4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUU7jwEAsLNtZ)A6bq)Ht4IDhSI1<|M95>E<klh(PrxZ{99m)GvRoYaY~
zE{WTh>S(PvG3ml5=i99vTa`Mvv^JesvWa`5n8c=?8E!7Qn`S1JD2f@IzCK)>liqK=
z`T3c1XX-5LC1zBf|Gnq4&2yXU&W>Qv$f>M*?(O{|p1Nc2dqdT&ZFAQiu6rMxcK>?D
z@t!K}5baZvOz{uI?{qV}S*8b_HCZ*utL*^WmjuCcT9Nt3ZdPzfe-yvx;4NEn=ExDA
z>VFR6&mMQVEE8s5B%lB2_me95b%#z>X+(EkoOeR5jN7%}fqmYAP79gxN0M_|<UerA
zohU5xJ@Gr8{c)^~&bvCz*)6|yz1HpT593u@uNeFxI_vF@6xp(ej%N;i{NZ&Z=<dp6
z6E58<(uh0!Z)L4^%j??7HSr43HetSU&a*boS9DhEcG&NmvTnA)=9K?pbCmDAu@kfo
zKE5J9@{@!SqqXaS!$NzsMCLR~Z{+f|(75@TUyQ4{??_aPLE2h(g?>fr4;=3fWKBFd
z??_@r*pg?Cf#vHwQ`Q~XzUbVXhB%$WNgrFX-R?<5HoPue!|^QGRq>6`)+b_tBJ;&w
z{$QQB$o{a*oc`a2`jNBE(zu0Io&2iL#XReSD%%Ica{_L0+LylER_g26{l8+<HkTzY
zon5%zuZa7rxJoxlx<G2)@l>U-Dg)`;A9qcB|E=}V-m=FjHGNAL9q3ybFYW#Ht{PKK
zAIF1}Czng7hfSE>=3mIHcP#dhYWPCkt=mIq1}gjN-s%W1=+c-{yTi2kjEhaz(~8I)
zsof{CrYFbOG@Px_?-ttns(s(#my4dCI_wkpSDiEbx5tjBR&!>*vGg}tA-Xa(`TO=0
zadQ_XpF0&2*uCq><qCH9=`r=1rz^j{2$<frd$(1)&t#9cuX*3|RTUObV}5lt>pS=U
z_s8~IKDp&uBXBvh-9u|}(D|8(%V&h@9a?XhTHdk6ZbIk+!Ncc^0-t{N>7D%{d7gdd
z6%liVRX?2qdE6KK9yzYM@@w@G-j_byCPgxLRe!CCyb+alKH=ndu|29$v(p|f>rb?r
z=gn<avd%9;(dwb;%CEgiE<0kE6fIhHUbwZa@Z`OFUlu-2<XHG(%B1_ZTcmSE*Uwni
zeP(-m*~CQ;)t!?M{qLEs7~cJDp2zv?lK+g7dp!hB2Nm6Rt;z9|w}@-|(mA8C{fN)x
zv<vqRUym`gdgB@!&k>TK+9zat<(5(PGwHaeyIpr1DLqc*SbV+H+k0Pq$8POhIsNOW
ooXr1;Tz;POQEBl42oU<u7-+of%+9y0!Js10)78&qol`;+0AhGdRR910

diff --git a/app/src/main/res/drawable-mdpi/icon_calculator.png b/app/src/main/res/drawable-mdpi/icon_calculator.png
deleted file mode 100644
index 056722a440337b9e6dfea55ec42ac88074e4f307..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1092
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpEuJopAsLNtZ}@ji4V5_l@w`uv+k*+ZGHgYHTRBP=@6hHD6=chjS=DN)
z7o*YYA?VV!K>NS`k=A;TM6sl94{@O_nNeG^OT-s-NOKwn9@JdB?26cPo;&aM7#H6w
zJ|E-$tnT55ec$hVwt4>Zquuj8=c`{_Sm@loymQ@^#_0UI8X@^dJ8yC?pS1tu+0J{5
zoiFpgTKBNP<F{)^@jm;@3s_BM?4;K(mN?m|(P;m{f6x0v)e#pBzE8O#Xml|0&FKxN
zQ(aFjuv%%leCBnhXG?y}F*WLNUCKPOsdOcCam$*XT)&CREXO`<NKp{AS$u5rdBIKM
z@o6`nZeX_#Vtb}@XCu$-m`Tr1`L5Nf`k?jhagpPG&nb7j${#cB(|=(+bCQ!9*Qw{+
zzkHTmy%N>c-@=q%`X;)^`G>gu!`*7L>-Jdoo)6v;Wj-OSRp+?4sGWWHcm3HqDakp(
zg^_I&!h&C~m;ASX{*CJ=_RevL68+RXAuQHH_V>Gl#5cEt5;reBxNOzj)0|75B>lII
zljoSfJa_4n>L=ncN47TEP1e+Wl9A)zV)-+7qO+!A?Z5ghS7v9JYb|+nE{s`2F-27G
zVTZ!A*qGzbIk#zl<ciBT?GVa-(hy*fci3o;;NN$L4Dx)Ft$U`6Sj1_4bg?@ywc`IY
zg-49{0(BoLygO#5FhyIqwtRz~dWVox-h+zZ`~8PbZ|bt!W8oUzqiX3m#bd4GoBUU=
zk0;hN9ryiTt35{}>|?|YhOA(x6KM}UKKn0>_#?7Daq@?izoIYy*u3#zZenlE(p_^r
zm$_u+9;wVZV7PFO{K2Tnt|pg-*XwVQa_LkzYTGVd_rJ@ubKC9K$&=<s^Dav1oOF0&
zP~WrC&P#qDPZmF2a*aW5=AO0FmPOyVHF<?{O3aP4@T1rKj-^WlsQaE<VljvH*vGHJ
iGqyXo^U0=7{LjF&KkfTNPlwx}%<t*y=d#Wzp$PysEzNQO

diff --git a/app/src/main/res/drawable-mdpi/icon_calibration.png b/app/src/main/res/drawable-mdpi/icon_calibration.png
deleted file mode 100644
index 0929d3690d508035460c27b29f33aeef69e307e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1163
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp-<~dxAsLNtZ}_hWbCo#$v47h2BYO9G+XR!GI3g$LJ=tZ@)U?j=ro1w%
z;vrwBuKL2q^L>~WbKL0=%XK;-#wzyWkn1Gw&X^b1LYg*h=-@K?A{8rctbbSfz4dd;
z=UctIKetYQK4)h7Jj?y%Y3FQ;GcqCI=Y7Maryjmi)}Oj+`(r7-d+XQ_@x>gR__6i-
zoZmZcyf|lPC39@H#Nq2duj?Pa(H>aSn!kv5x!IcnF}p)1JP$P3q>sHaV3vP2!}#-8
z*^9?~TV)RXDg4e|6lwqFDD&fY?Hdhm?dY5!xaZE&KcZ_g1o*|0il=|NJ42Q;ApC>^
zpZF_&&&!MS@?Y+YYhN;P)sl4+Y-fb8nBN|2nyh!oxb;`*jA+p%eG^zKbRTTj{Owj5
zS}84Yp;pU(LEnVGGvq$Z*4yi}c#7NN!>6>`S4?Q%pcVgL^h3O^?gOnfP5-NW-m7F5
zIc@VgTrX(P@@IKc^acGxFWz#PwD`^Yr1y@uY+uw@wV&F0>`8N17j<w{#@#B-e^C5!
z%d<Qi=?~S`4?g=%b#^&1`R2R>-+vfiSa#Us!1E1T{(ni*?+az^<cOT}_GQj_wp%3;
zVjm<ASFJfH`A5-r=j2QBAFGxuK4CI*{@e1Ka)%dBeDLUX=adS$wGZtZPjuWlQKoU5
z|AV(d-Q3I@;)06en`(7#-(Pyy+UbYQMSVfV<C|;wzCV4f{9}{b?f-K+COBVWn$zgN
z#3pOm6y~Wr+P-sr&3|yv;lHAi)4BxjeQ{mhKYXozOu5k{Uwx%FVfmIF%0Hu3FN!>@
z6&5~t>2{uv*Z1n)V+nocto+{X%lECE{P*24?n}#Vbaz)o%`)42<LUgZZl@l<TmMle
zcI9u;r@@-Ok&RD-o>_I}7jnfvc<=Ok=Zz2RH~HP#zwOy(p9LqMFPQy9=l`oseC4H@
z^?_EK|KCwin^o_cc`DfU6#EAk`$qNX6LXwmpYGgqB!ydZuC~^B8CA9D6LvB0gX)5+
yB2CgZwaz*IIH=0FYyJ}bDcV!-m+3-)U>>9K@xtF%k9=$el_8$4elF{r5}E*_vifxZ

diff --git a/app/src/main/res/drawable-mdpi/icon_cancelbasal.png b/app/src/main/res/drawable-mdpi/icon_cancelbasal.png
deleted file mode 100644
index c48a20792d27d1bf0c025efc98f0a76304e674b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8Sx*<okc`H+H_mqZCdwT6cwQoZV}kKQ9i1s>mqbo(-QL-@$Uw|Q^`z6n
z6Z;)}$|g?|656Psq{w}9;>ymJJ*KLaCvQ|rUVmg6Y<{=;o#i{*XGcD-y<BYlyuAMV
zciZQd=ilFPRuSrSQJPrazO9O#tv`e>!My6j2FH0PEqe7z9#!|wn7O0tsARUZqkdk<
z`!~13cR%6O>~u3!_q;Mw=(?Uqj*y?vQolQaH&qkZ^b)hCJusPA$FqRh+;G2}kF+0$
z(BX(q`O;6NDvxJ9sqWoo-g#t7nyc20*2yz^t!I3neT3oH2QlxDR;T;L9A|Mjrdgj$
z*2_~>e%ST)NcBT68~qi>e0<Ib7<a8bq#CDwBIdYUjhnfgXlO#%rVfFyg>f;*v~&(k
zfATrOaOu;<7q6^(HoIVc&qpr*s3>3ICxSN{n}2jE>Krlk(O<CcPKxNu!-k1nxd()7
z4k*PO+~TzAw4>O>UZ?dxI(41O<pkgLD<<CDt5Nd3aPh<wQF8>Vj+w=*u=?g0Q8qux
z^xVmP6<g+*Ow4=e<1h5<=t?QW_ZwvNH^fzhWabz4&h!wr)b^Ra*J7TKd5`GH9g#D-
z>gR4*S>TaTktvkC=ZMjp<9o%fOr32q@vvpFt?;xLg^K?2nx=tEa$F{E5_CP~CZZ_~
z<opp=+TQv-YVED6e;bbVhg!b7#_d)8Ywho*-JEt03y<CSeQ5rc$k5+iD>T6o=JE0e
YtEfuOr7rp8YEUloboFyt=akR{06MmG>Hq)$

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png
deleted file mode 100644
index be8474f0024ea2b29a8b1bfeeeb9ea9838598e1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 867
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2o*_H=O!$!L6gV{f*Iqr~x#=PUOuXid`fkovtvQ>TXU;IU(F0xqmar=MbR
z2{2itq}D68Z=qvgAh)aZMxj6KNA^2x5!%S1#nn|Mw%NU}VEXQxwr9l7Z@+nWW_nuP
z{=4bvY10)rnn37<v$Fb+w<Xy;?1e1%t6SC{61{Wyb!F-40!is#JYU(=KWvXRu-drc
z%F<e^Ip@9J9OKyb*nRr1^cy|PV{iFC5V%*~^=46~_PvM4791+--7~4@&hg?m2I*-#
zRqD9EJ$9Y`ZFTo!jeTDvl5Oo0a{D%@S{`KWS6Mh)<)QYOnK#;)cLXoG@AbrPqFMRH
zBf2&R^);{ZJ^og(<Z0kFjx!$qkFyGG`(95Kow~#)Yinjwa^by05rNw@rkGxu5|km{
z_gJFrQKPF-u-aCs9i6rot=_V=zMk(-$NiCPJK%WI^wNZT&9xTY#j>TBFTE+1+rM<?
zT2q!@=84%UL9^oYAC*l1#eL~jE!+I1TYl?5k^0#&`BLorqf54U{L|51#k13G9j}D>
zRP7~Nq08<^3A(*<lUOO8xFoM-;;xCiH}!i*f8Vs`bcd~0t<;1vu6}W@bEcm}H_yzq
ynt9ZFZ@tX{b(<+=m$JJy<%=HU0S7Zj(-C{AU+$WI@BP|AdBfAy&t;ucLK6TjYF29i

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
deleted file mode 100644
index a9d84303f68bc2af7358914def6e289932977b39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17622
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

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png
deleted file mode 100644
index 34cd31f14b37e577162e1ce7eeb5712dc71374fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 616
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`42&@N{tu$!L6g-J0uAfJn>3ctIT&&WKwPI~d-+xzn^`T0^wJ7O`%fW2!fP
zYs574CMb4@dFr?n<qJ)1J{SJf(EPcNq=2BH;6(qGJD6Vod@EbL>%a}e_e?GaG;1$#
z&wXusr7LfmGjjxEZvPtr2~o*Uy-K=|gp3nrPV8=|yQp|yW0Doq@1F0^jpWx)v&`x2
zidd|4ZAFKvR#Gp5dG@@>$Ddbu8!j0C_A+)iV_0_bD`UhDxi69HoMV>EOJ0~Bp78p_
mn+8S$&v)ieG?YN#ll{BT?jp+;2ClsWN+6!DelF{r5}E+C>DLJW

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
deleted file mode 100644
index ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17558
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
H^L@Vql|()h

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
deleted file mode 100644
index 0479c1a3afeef3c6788613cf3731dcb5160a0faa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17558
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
Fe+RtnL@fXS

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png
deleted file mode 100644
index 561703fb06d4996975f91b5cca1fbd7b2a63930c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1257
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUNKY5Xkc`H+H>y|MFP1s}@%YUR&d2+n1gx7FmQ*xz)16L@L#LE-T9fp)
zDxPv$x48A}q^&=aFB?vA&C_k4b=rRN)-5Kc(mT(qC3C!%so%5D{&{)bxw1d|?ic_2
zZTI^6_isPHRPNvR{`B*|e*=SIz?exkRgHH|M)s|LJ4C-fSTA_&ZJ+#x#mToEqRo1<
zvrB%LEaWdwI%#lz`2z81mjl;#>^<X@teaxTcX;!Rz&{B#a>uh|+SLnMD{}gcxZj3d
zy%bx(v2OB)sFpmNuJ0cd^bVhm=&2LjE^>cbWR6bDo9@kqqWd4teDv>bM7ytqfTF(n
zS!>@tA0219x<`9#-}7;C_iMX9fpgX$mzvWO&MSJcv3lb+iR)&I=PG*_XxQnlE8k*s
zKSJjD);skMHb%SO99pcI!nG_}%<owFq!(v>ro7s+Ysb5Zdv<VdPYAtv)LnVYE<;D5
za^*M?|1*b~WHdPUEPvv=UF8Skjs-JzOZbNyE?VVY^+9ppA)h^o26N`=_nC_xkG$dj
z>0wojlG1~kIiW`<XgOJZU{dpZ+46q&y!@%Wd1i8xY;LsuF68-k%yEa%?2ml&LX5mt
zwOli)>`p(y_itH?xAEhR)1Mp=lhJ=9l_P#$_jrt;HK+LF^JP6NA5D}#`s4dYu`nqq
zIrh`i`4?J^m(I^x>ikXY$HjHkn-YNvR_<8)a+mn&0=;|Fw66H5&pUkhQLAavpOlql
z?x)V#Uth4|zi*`CZ%@%%S4!3g2FV{3oS{5BalJ_6*+)ycRr94f|83`()93GXD>%yI
zac`;F-P>_8{u7FR?F?DWt6LmDX<D78-}DcAwk?tUA7tjf?U6cXH=Fy`o}aS&-=zE#
z58C!{_9Qc&g<gGo+D<Rs^6l}gY0oDg)js`UmxO)bt#7Lfxx}Pqr7vBnl+vj3M)rq~
z3$MrG9bEgpH1~#R#WdGxvORxrm+LkE!mbHhE6yY^?~n_B_;^}jaY1v)YQ3L!kr9b^
z6Ib3^RCA?d-<^8b39Gi8NVsj6IKy!2N~I?*HmbVS^6w67Tlkk1Z`wRx>uLG2Ek8eN
zuh|)Vs_mM^#{+Dd8*dj(oN{&QByIcCahEmM{^q%<f2>8To?W(E-_^yq{d9Oj{}$!f
nOL{X`muG!{zhD*|2>xWB8M|?M){dXPpc2Z{)z4*}Q$iB}Oq?h6

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index 19534dfdfb4738e9c1dd4d0aec20d4a82c48a14e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00SvWL_t(&-tE|1h*f162H<Bj8w+)!
znu4+;Aw(HQ6C|C3qM)b=5~9+ZpzHv4B2WrCS_zd&BvMd@S{Fe<8qpMVx*4g9kSHiE
zva=JJ9hfrh=H0N`?AXoTv-ix!|H5V+{<Zf1zw7(n_xskOprD|jprD|jpr8qQTDfUg
zZ|_(xKLoepZv5Hgx@q_xyJwD$j%iI(I{ct!U<h|&O@r|Ptiz5F*pAy<nW)o5R^TW+
zgN6CQR6L4d%)?{2G7;Oim5KK0Ac-SzZPIEL`tUH`!Tq=bH(@pQgxquZX0i}D5a(e&
ze#6r_e;2l38}^3COO^Z1Of=q`3}WxY`#2%TLpZ-OK8#cGG6w6`@fHri$uQAkUxOp@
zagKM_jc?6%dENQ@5|JgXPCTAO2Cx8&aT>mj(5sjgcN)%de{``FH{<PACm#=u^r1Jx
z-HI0ziRE}4heg2qMK^sB_@THc_pZiM?JT0*i1bGjUttk8R?=yGwl`+GI2!1|b+{}f
z;6j``QAB$10_Maz;k(NCNDAB%JP;l1#JxBXGjTYs!Vh>8PqdmP?WES_d5UMJf^SN?
zR52C%M*}<JNZTvpzb0}Uuq<Tf;8KisD<U^!@$cd_yk3_cv-8BO?aDdnry50fZ}xv|
z(vyvQMCRkR%JDj^P2G4SE>y*IJdXzxg%7j%xpBMWQu&uvNOhdZ!EvE&b;S-I!m+po
ze}v%1=wLQ3j&5o~|0@I+;G=H0@dqX62UDdbjjH+odEDr;27hsM>c?4lB@Xs4bgQzD
z;HRWT4ae7A^E-a|kNdxfZNt|S{bKcO`lh+*Ue~7;SLaG=@oE-7D{cEVI2|jav%lMo
zNIOL4MX*cpX{D1LN~^IeRyvsKUc;W4!6RuD8={*;YA;T;H@Z)7H9n}jd>XEgTg`~j
zS2mlY+uiTx%KnB1Bx<g-suHnY9Y8xoPQjCD*@tjX9PENr^IBy;Blf!}ZT^bM^c7`F
zQfVX>yAzk>OUXbA+Rv#q)6=@&k$UmJ&`ph;gfBy)ieutt{n5vkv@v5^*;t7b6ciK`
f6ciK`6g0&@hTXmQkgT6c00000NkvXXu0mjfe73L;

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png
deleted file mode 100644
index 582472dc9273600f30c9038e07b0e7fc04b739ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 948
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH86;Bt(kc`H+H_mtaCQ2Omc%G+Ms-<(vi47Z+rkt>MIMoznCc^FADRkH=
zQeazGP+D?^*U3X7%KOVs9qMm2nes;?XT}VX!x1*+yDmSuSA2e_@tmW-*IwTHea?4V
z+xwsQyf420eS(LIP^XL1M30mULGK?O552wl*Y-qpvt%~50>S>QE%UpjBW4%gXUsY9
z`l9e>`R~`>8klNdveI#quUjO&xll&_ir7sx6}`vNy=J*LT5T<EWf-`+Miuh%ZxBCS
zz<#{tOv##qe+&P*xjTs8yRzfEj^d?R>I)VrNxQOrd$?Uf?|G=|uM3T$tncT~j=7c`
z(LY;4%ztMn&(t!-kFuwa?)j-MBKlL+h*9}Q)8UFfMMLofui%SM7reMo)n1xhXMZqj
z%@N%kA<^^=Gaq~ka7o#?Lhbpnx%Kgu&mNlinTki*ed;QCq_^%-&kW({kD~Kk!gjfs
z?lwpaG;@%f=oi}A{OIKO$L%xJWh*+Fr<(nr;^sPyqccuM=>LVk6<v3eKK&1uS{dbC
z$R8e}nx{RH<)#w1t6J5O8~U+oZYPCa9xIgzoLaFgMJT1ar0eS?Cc`;invUB}aK;?c
zwh0O1+_XAu`w188IG;L;qnS(o?3?>VL#<&^_pwV8T~4{(b4~8PAt|=h*8O(ojNqSk
zD|Y?=sa@&n*OltEx#!AGvzVWE;w>MnsW1<iyhq9Q$DGaQEB1BtM(Vb0U^YJ5&5^Wu
e8Z6dKj?16d%QSzz*8d_Xvw6DuxvX<aXaWE=8+vm9

diff --git a/app/src/main/res/drawable-mdpi/icon_quickwizard.png b/app/src/main/res/drawable-mdpi/icon_quickwizard.png
deleted file mode 100644
index d65347f235d4048a7f840a7c7ae45ece6d55eb04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1393
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUhn_BuAsLNtZ$$UR7K<GJcs^vSbLicsWum!(<z2h9SBAwlPdTzwLuu)k
z#*T^woo=s$TG-_TRE@5f_)O_q;_MtFeI!-m)!IVo(2H3vTjze<aL)7lpY!+9&spxd
zdH+euxyb+j?^Un;ANTru{QreZVBpDrr|63g_2CZ#<k}yX_#7$7ap0e~uE+m?>5R6&
z8@aDN)ZWvX{vp_z@BEwdTlsU3-Ih6b=<bX;#%0QGkLu1GEIaw*-qiCZItP+x^!Ki{
zFj_LT+kmJ0!>&IH(;m9+Y2TUE>~T}h{IRgioi69KESs38b%mT<EPj2V^OBfTVSjpj
zEt7>m>ZzH&4%ytubI@C9>86}x+&hHa!|jYGS!Nq>TPK>hJyfchcjh+l`lRz|ve|97
z3(Jyz^SD1W`Y2X+B=qDQxs9jxN`!CBb(-#Rw)NznjTNgTkI&*vvA;9*Mp#l;z<ixx
zqx=7l{Ct#K+P&rUCf4#Ur}IT}e%V)crZMgG6{(zBx+7riDIUSBkf(7A<M=su>Yw^w
z{lPJ5_VpFTy=<4%!c0#y1#Z!-UD5ToyuyJcc<Qga-19EB{}#G!$)*>l*vnS5LgRwg
z?3~+gKK)o^lrH9XZ0F34Rnqsln6Kuz^PVbPEd6NT$@l(O@9z+MZ2qt$+~}L%+}CDZ
zt`=s=(rd$RW@VU62t4`zp5rt79_FK5{bz5OKi=uM&R2Xze!zPZxf8#hln2feo_$N^
zPRqBHH-c}Jr@Z!FShm`=A@rE~^*<LnntRzMoqC<}MrX-aiG?nc3zYhFcDS3*J08up
z@8SN9T*0ozmU_n999gQiuDG0jbY6(_UI)Izo<BmL{LI>T>xkER;jAw!{?x7ZlAk9s
z`ySWUOe>!g@2YHO^yrHI_Af2A5q5uKyJTKg>EptSe`NKe-s*fVoD;CjM)lQUZKV^^
zM`lY+G=86YN9j^t*0Fo~S#PiPyj`G_{(A4kSnc}TTKqE=Kh^mhz1R12hAvZVhp|id
zCKrwCv(EgT*7?iA^-GfT$B7<O`C{hS)KAO^;6Hg|nuule`-HD;7TO^*b+5cKWxoBX
zuB7YR)7y)FKQ&;w{)q3*)Sj;$4gLam4~JcRRKDfxoBNZ>H&-?G2>L4h>C1Q7cuur^
z!IxWhd-PvrF1^9ODaeY4y~8$1OD`Z=|45S0@$WnN#ODY^+rElZ;;Km5>-oc5<95N%
zuM;=PgeT-)Y+2+GWvf`m6&jrr9Y585w?#aU*pa9h{d1PBj#n06b?9)~7voW~JmPO!
zq-x)e#~)jMbq7ta|9zhQhrskMli7X2t=Iey$USoT(Y|7H{1L}D$$NU&|8IUieF_Yi
a9J4pAI`N>8T}>KPQhK`jxvX<aXaWHIeQqlN

diff --git a/app/src/main/res/drawable-mdpi/icon_xdrip.png b/app/src/main/res/drawable-mdpi/icon_xdrip.png
deleted file mode 100644
index 700e274f5bd0b1bd6ed0be5ed1018677f6175b8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CMNkl<ZXhZFo
zT}V_x7>3Ur-Swu>C<rP-G|wtp24Oc9vE<Jhc9VJ44-|A!5e6lcL26M3DO3bONL^%C
z{oGWTno3kR34x{T?(qkMl7ylpAza;^-r06-U3NV)v$KS-2gD=JyzlpX-#2H@9HK4p
zi!AZ@wG_bru3)MHsR|^Rfuy$33&Xg;;&Yki#RTJwJ3VOtEO<gl6LY4NHY5uoDFBhd
zhf|j<2&Dj2(@3{rT%&}Xj#YC)X=|Bj*1;4*)m+K|;snnEUErY_LJ2^;;8BS>1l$sx
zYn2d60J;pLC8}*G3*P1Nw01fiG24Yfl$++6L>nn#fEWvQK6n;fJOEWsr-T5kg0})t
z0U-^*6Fd(<q7YI5o%#8V*qs_8`q!@!a=gOhxf9*fi?z^#vDox5zfp8e2m^HF=kL`i
zeF!5xWJYmwqRi{P9m|{>K+^&NLTV~Ko+ly@LI8b+vC2ot01Vd5n-Efu%r(a|6#!ro
z6Lw0Aou>JX7eWXCt<#LwIXnM)plNL`ulML;W`Y3N_Q+Kv<eYMV?wp*=fXy}v;gw7r
z<ezLaGn<{`<3E)GXxevub~d+cY;1}Lg1Z99<bDXYM~K!|c)d5ROoS`&SMUI|A6RLJ
z63H`6)4CjvyVz0>herQKude6mRT%(e^<KHxdxR%4kqUf(;6^42kRJ4YDUX2+0CYd1
z0-JdBMF3c@X9mkg=`Fm+oa8Z(1egLq7LUFNfFFXvXFn=%2^9z)7p*QyfB*o}th9yJ
z00No81ba|a;87<D-~&L0YJkrWTpOakk41Kf$3PO`3jo&f=!>*aF9e+-Q8xezd5(sX
z0KEX%r4#^fpO^8Kp*}21b$yG=?S5}%A_IUA09Wu8<Ghu&&>HA4j1rxYcM+oP$kIV8
z6B&R2rCTdav)@Wv2!Ne?v6;Qbq-`PLIaH*y+~aw*n2`j)TeRm6p7s<1V1w~8SB00k
zrx5{<`ThQ#yGKUY0*`qK0}!$YFLTd$vM&q}gm5_6Szup;!GJwI-Q^q_`Wnkr5a1Eo
zvW7Q!DS($nMXUWj-y7@&8zPKGHC;be;dXaNn{xwDI+A9$Z!aAjoJ=Y}unGkQML0io
z;`ZOchHcQ4KF8;jwv6=j9#mvHR56~fa1%&C1rjhQ61-Fe!Uo-Wc?AJoe~iBiVwg^2
z5xVg>oJ6InEP`_Dfk1WH@UUAn_=Eu1<i5hfWxlyNcDS#_k4-RuS&YAd_0trtmf-y0
zaPFOWF>!2i#rXdzJXWjmd$~m*zfc)gx$D@h*!eo4O9?<Yg1+qRtXaF=iKZ_BOfCXl
z5zG=HKX5+^vwoY;*JpJM6(LdzAY!a)YzjbCCS`R}6_CxGs(GmjsLG_Q&L4d{u|UW{
RKmz~(002ovPDHLkV1hU5;yC~S

diff --git a/app/src/main/res/drawable-mdpi/loop_closed.png b/app/src/main/res/drawable-mdpi/loop_closed.png
deleted file mode 100644
index ba4283035b5dad69aba4d9a6f2726a183c553482..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2105
zcmV-92*&q`P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000O8Nkl<ZXo2lo
zZA=`;8Gi2gumMHj01l4bSgAuD2Z)887^h};j{{%ezQLTKs#@1^t5}hmI{k;*S~M0>
z|Flu0{HavcacnnssGFoolS+X-kZmA!uu%xAVq+7a#V#C|8qOx=_V(?M*}dI8-(etk
z#FhF;Bf;&?JI}oHe$C7R|3?B4Oonz(gJ42ys~HwcI)F4FE@2aZG*~R@@cGj2jY$!i
z6w>jK4q&y?G7`Si+G<V-w*^7Ow5h>_9R*L|=cPZvJKPCewDn-raTO!>F^t&9FzUR9
z!KXjMyOk%=TJ}>sRkS0ff0`n51>o~(1LtS0$Ey`Bm~an3Y9M^!B8=1$hH41?R%08i
zX3xHG5yJI^Dfg%N?arU!;k=D2L!3b+pNDp#4YF?<(@w(2RfJBCAo5}O`7r!~gf2c}
zXnsM0pASRi!w@+c7pe$19E6B3h!3qVqjc>iAXN^}mY3P;vs>(-=Bt=;5JZJEBT0tV
z&CBTGWppbo_PNMMaH*Pb+e7)Zk1)6Q4QyYN3&5P*N$APHSN+QjY9jOsjJTdyH!njJ
zBt^r7a{{5)!kV8W_&J$96C{X&gim+Ncx&g!D9>#K@SrkUl2<@ae%NyqArGO0lhCcx
zcsDOY<R$ny!etv_)=jwWB?LS(m~c*G(iue1eG9j}gc&z`r=yba54(gTrN`oq>q8R4
ztUl5VdyZn#PUz(34O;gL5=4$LVJFP*nStN>CJt_X29M;G19$+y8UXhrD{DPU@^|3J
zk3NeoYddD^r_!mB(7}JCC`k1!6YjgOAj;t@hFBKg|59@VAr~WWv|$OKSjj|tLpaH`
zVcqJ*N0Y*wBK%P}yoL^31j`eQJOBjU=kfB^UqM~@#Cc``sG;&eNo^)I5jrZ3niu&n
z#_I@yMnB4n9@F(?nYOjn3?ikBAeN<lzBFB?W^is;j}05Lpk?k{1f0QD)I{jDoJD5l
z<I3;m#jl2D_qir&9z%~H8={QJhcRg<eCB>FswE(ONr@;n5vt@0vbSN*Bcp>0W2}xq
z4Y%;!hYm&GTjXjm!KZ~b7ApC$!EDCs2v^*y^O+2ZZK+TvtrDv#`ab5oY)p}t&}$(R
zH4r+u4*+b6@=NI8s=%C_B2d#!h+HIUI(|XIfRzwzJPWquOIX&sK%KygWxvL>Q&U<u
zFQbzW<A#IqWqlBi2cL=diK{qO&?^-!2*wB!xrmvXL)cPSoLIoJ!4&cKt`9L%%T`(+
zFgke&7pe%<Ksa6T2LNjm31YT+-93c<D$Vx&d>A+EgcICL%6rR*3<;o_!)jcs8%MvD
z;%0U~FQeZ|+4LRCqwj^#_>KJlR%wD%jcza4hR7ZnA}8y#Pmmfz$j)8|D7AmGpvqdc
zYBNIK2>d)55+!Rg`mKaB-@bt3PyQLA<*%4<y^rU=Rj&zB&8Ma05N6z(`S^t}hHZqd
z>UQPLWSWkqxSa)VeCcKR=ByA~H-!;&681dwqr`$NidmegJchA4W;SZ)Sr6fd#rpv)
zw1HV3RC&)A{{sJZOSo(!{Jl1a^MWqp^I?qE65i%cfhjN(aTLjHv43|jhH6MDiCGag
z=asQBuN*+KomZ3hyC+X=qUQ*|dHfAzr9Xu!Co2NkBqA89AzZTc8MsEFIZ_5j?88w<
z>gHvf6IfxUdVXqlPUd{t_b<H9ol^eKL(n^mbAnoyN6>F2j5@DD-JTk9fj$y^Zr4Ww
z8GRPQgew46m?5d<t}3f6_nUZk*NeI*`S_<RfIbUzV08kY+sC2SP6;P4VjsI>0@qVC
z0Tm@BnaW=#rRCvzoC%EB$L=<P42(Lj8BFNBg%EJv1W?G{P1)vKAD-7D;F-D8gd8Ja
z4jfmJ?1uqc9|o(nWTHCpBPnuXJyh8b=WWHDSB9UHqfR_nO&EOoZw9V0VBzd7?s(iV
zx<5r>R1YTGgoDLDz^q4?i<B_>r(MSlT;p_J`9x*}ligL_j$s=cTUFwWo6u5n$iUSA
zb@{dymak|jp@PXYAv=2=q{a|Lj-r*Y$jON8k+HS#u4b$ibC*`AnA5;yp5R`>4ZCK-
zU3>%=t7Kev4<Yfns{(yF9b1>DvYb|BZ7D1^Q*+3$4-xq=rk#XWDq0L2<KpYs&@dUy
ze1eT<F<{lo7)5cQrklvgDKc<e04ukpWPKT-EAC?$uQP6DL_Ulu2jR5PX5h9UR&G<T
znt~ahxnIMi-KeZCK7t-WHc|5!0OiPWv126lSVecV5__ytUi26OjebS*8u@NsMrY-G
zCN&ZEJ!*@}ULsO=u(fXWMx5l@Otd$IPponFz}!4;y9w{@RtvmkM7`u3E#@ih0c^?L
zhUYdPK$rDR{HI|C6LxmGtvYN}^V~cp?S#voqfzq9uD|X$+;uJSaMu;Uge!o6X9l;t
z?Aa9?+o*`V6mz;AK?f%x<RV=5{9a+O1iN3%BtED)l0i*`o<$z7_gPpwCunyGq7X}*
z9lQ4kltE2;vq=K^c#}9->V&+63l8;?BldY0ABj$O%0ZBuui{{-Gx_9=h=0X&VTo5v
zogC{k?Ig&)X|xM%V7{UsBSl#5CErjDVN|)~o3AHKxCiiRMGNw?*2k5dQpCGvEiZTi
zhs$1wf6eN+ic7X0oT+>rhs$2T_JVCN7G*1V&8o-ZFS_HuW3haN5SdIY{!@c=EmPkM
jpBgNL|EZ5XzDE2P7QVpSm6tQ400000NkvXXu0mjfxj63J

diff --git a/app/src/main/res/drawable-mdpi/loop_disabled.png b/app/src/main/res/drawable-mdpi/loop_disabled.png
deleted file mode 100644
index e4650ec0ac452be418a8b87f5f7e6935b28ef27a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2623
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

diff --git a/app/src/main/res/drawable-mdpi/loop_disconnected.png b/app/src/main/res/drawable-mdpi/loop_disconnected.png
deleted file mode 100644
index 0bc9949349163b4fff6c846cae96662b6d50c1b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2814
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
Q-~a#s07*qoM6N<$g7D*4>Hq)$

diff --git a/app/src/main/res/drawable-mdpi/loop_lgs.png b/app/src/main/res/drawable-mdpi/loop_lgs.png
deleted file mode 100644
index a49229d4d8da2b68ef74e356ade63576cac667cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2505
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
T#L=pf00000NkvXXu0mjf;l$tc

diff --git a/app/src/main/res/drawable-mdpi/loop_open.png b/app/src/main/res/drawable-mdpi/loop_open.png
deleted file mode 100644
index f82346f7394516969b8ca81677b5f14ff7a83e2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2849
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

diff --git a/app/src/main/res/drawable-mdpi/loop_paused.png b/app/src/main/res/drawable-mdpi/loop_paused.png
deleted file mode 100644
index 7258615f66ac6974a5b4321e27570aedc7e96cef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2237
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
LNkvXXu0mjfVU|zM

diff --git a/app/src/main/res/drawable-mdpi/loop_superbolus.png b/app/src/main/res/drawable-mdpi/loop_superbolus.png
deleted file mode 100644
index 34a61c1bf31da327a91cb25f191a4a42f4173776..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3548
zcmV<24I}c2P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000f6Nkl<ZXo2lo
zd3Y67mjC6ws<$OCk1P;~0RjmS2(lPZku3zUK|usNE{xc&)3);=F6d|5Bcv5vkRID{
zLjma#x7Kd*mMkP>-yaD9#)cNO-4Mr#hzncts&4(}kE#llkVNcm)Ia8YUwuic&b?>3
zXS?SF_<!gfNJNo{`my;qE6B@(Ejt?$011Gt2NW9sDLWfdULI^e3BgE28BF)aj14^t
zV}kUf2x1VmTi<1kbYwhnYxGU~U-UeGDwMDzvSZvkk+Sm-M9MM`bd*orcd9t0>b)(|
zo1R_n`PH<{=<(gQwEvKTbZXS+^TlobweMFaD<{>mIY(hQldK&|RwR+731mr}{*=a(
z<%wj?5VC1B**uf&)iYXmtn;l*NpYX|Lop7V*1D_wsrZ$mdC4I*W{{-`6ag1izpRLW
ztY`sQ)dI4h<<SDNDgv^i`ej88xOKtm(#X~&ZHN9C_ju-T_Yml&c+O734gj|;ioc{i
zym&VoN00@vRQ)=`49OaUGCQA;taW*;--0q3a0zZtB6nU$?*9clT5k!=zR;Th{F5V>
z)!yr0NV=1I<|-`iN7XMYT^I|=nih~%)h{a|Ulv->O%_Cx1<}-kPKtb4n8IoSS>=v+
z?b|;&_UF#9-vVF+0LM9H{>!3_^=zI%5pZb?$f}ib;g?kraFJz+WWxwDJc(?Y*}=N(
zV{Dv#g5envh9~LY$_G&OyQx(rD~(S&{?rTUf0|QE0PtnO*!650O(kFIs`Y>@RKJs~
zI*)9b6**BnqU7a!qwk)R<(}sAxrPB42p~Dh=NdkLvTNq%mC<*dC`<{ldHz>y8OKN{
zaWC|s(8+LI9DFA6yu3a`@OOe80CvBWw1PX&r?O3sSZ!GI%PNa~WXnwTXnx%DlgGql
zp6$lT$?m}iUyXl6dH1n*0mK-uZ2+KDOe`*0>w46JF8$ri-*j2RMcg|_r~zje%?rP*
zusn(F;YGV|nCG2hS!c`6hLoENyP0kC@?gu$gDp1~b|dL^=8sz!`i3PYCVDOFU24sY
z!`zcirO;L7aKKcG?W|A3I7%A;SNqPTe-XuAT5VqVWrdZ=JYM^=5CD&<rM?Jsx99GO
z&|K?uVicR^DkA7pSu>2H<;vstF0m~)@eBogC+HF9sl<EOI6{v$R<kKjGMSeFAUC&b
zMm~diBd%M8FiViEEXV-t<{tC2>{oK<WQw3m6@FP|Q3APZ8jrr^C;%|b<gZr;H$FrG
z@M$eS|D1&}8iTSh9aby$vOT=y9RO|v@4Jrm3_`sSmjGbnosQLP%CIU;6G6Aa+H|Vn
zOOISX$9{vkphv}-NA$)6zT4TDK{eknosg^vzf*A6jL5ZfeUp0Kzyjv?`xnbMDXqCX
zEkXkT?$4EP`O5EjtM+lnW9It<8ywqMGngW9`qUYeDe`5NCH=|P9PZ!f+6o}CH@Y?e
zI8`yVkvrlw&9HqDkQG)X^XqMcHdr;*8yJeP0q8HnSAC-H&OK7FT6)s>JRs6MZ<h!!
z{NSTMNR=X-`+>QqQZnjYmL^aO7^mL#(YSp8x#uE^JvV)Q`(^Sn7-kIMv?Gll?i|UM
zIT0=B(mFG2(5bN{Co*BUa|EDAmOl9J)bhF;<>kuup-liLi#>O?0g#l^F?C9HdJ_QD
zt&?B-+eXLB26`$RE^TLlmpoGdjobV2*jvthM_zZ8M~af`l*Tz#8}D*o*IjE^cZ=s{
zhR1Z;p`P{=cw+n5QtK)80yY46=o<UA07gG|yYz75di$#Y>`Kk-gA;~hso0s@1^~al
zPP(6;JWBwn05Ex^G@IcmRPtqoA$J$;tA1Hw{ZOv`h5PPq^tza_1OR)U^*qbkRH}v@
zs(x8v!w7D^C;Bd+^8#}QSS~gh{OD0CMFX23xJp{{>B~|PfWb=ng#BCZv2PIJOOGi<
zgPOJX^S&ORE?sJ_U$s<T!SDo?<wMEJ%;OAsge7#VtW4s`e6Qb7lH8LbZ2-_-khFsp
zN$j-$d|5C&nRBw-(|}%`*EE}`j$pq(|NfWKy4K%Ify&1mZz_dJ`%V=*Yn#@~uK<|z
z;!5f1rL%1-EZUO+L{+SnU*v&#{N!b+bU>Uml{MoPEnrl&0a;~fJUdFq?=k807D}Tc
zJI4JtOXGDr49S`n@{molI$SOc1^TQ{1^|EvU-KS-j5{v3-P`)K`;8R~Z4YXHd*~#9
zLD$W)-O=uMlqg00tCgzpjZfV!-ES&R?7r>8NZH^W(5q6XsLT111u--#0FA}5RBCb#
z!$_W81hD*Ji|m+ikR@@Q0<a*Ote<rZKvMUG=4qrQ;}U+h;kYCrTiHIW6+q^{&a>U!
zQ9PssfaLQaOQ{~)qBLG|&?#XqfOMCHIcnpS_acq+_ogO0GQNG=`6Nz96|YjB^(l*E
zO^4Q4<fU3Y^9w*P_IekfY}|n}1Zc=P4!yGMo``G!Y)bhB4abX|RbRX=SADYCQL^R+
z>B;tdXXP9BNspL_>u!^N8`&{ncW{+`)1%9zN6Oa9Tg0wKhY!Bw*zENp!D<Bn+)70c
z0@TcC0}$Jn08t&~6Zf5ALXFv{+-{^;aZOW7PsT*ieEr7&e4--j{l!ykE4lA>iiQP;
z0XQ><O0(X6Kw5qGRkr*7{W@vQrWN*Q4sLe5{>}#Zh0Gz+RI4&9<{7KjX1B30hDIfz
zn^1Mm=P;_*o_xS?;z5-xA3#eI)420u&OF~e#cDR@&!11TFA%la?*M?Po_=s_3KlQR
zu`gRZ#eQ??<MNhBO=e5Odi&<uC+sgB+A0+`JuSZhV2G7&ccrBCccwEuQxyTX>BNF1
zaqK9cybnFpRwhUQ@ZP4FmsmTbYZz@B#b@q_xdWCk+DR-9=ZlsbKLapC>|K6zT$+>v
z0P`l=ui&Svn72%N47!8I%ouCGnV+rV=Ue4x07#jca99~IL-Fz}+)Ef9*ICL4zpSz%
zi6{O20tRaDb<ls_;rS)Qqq`=u^8P$gI4sn|VjF-crEFY-+C1fBr8qTgy!Qb}yEwys
zW80fjrKq3vq1d~;O|)F~*X38pHyb!Tg+V(2eEynm6RQVx)<k+PN@Kypo>f*}yMU?D
ziRq3pY@VfRLARxpaA|CrdvbWP-uf_cjh{9EW5xdKKL9ZM$y=p0V(*O~h{pK`m5Q-@
zTAq{g<2<+==;EknfTa@dr|n#DL<>cmAym&r%~N=Fj%x<ccOe-CAgaAOr<J8~otJkJ
zkQG*^@Y7f0*Bf|}1s?#C0rXdkl1usSiU@!U&68+&N_v}z*E1_!z5qZ}ceAm81OV0R
z<L_ntaBE2|SQN{S`h_0@a9M=yeUrj9-h0?M^7JMlSrY-5;I6qRv$MPz0FafHB?CZ4
zGA`i}f8?S}X<Dos7b(?gbxM8qUzP2Hs+ICFt)gYoM}Pc{;}PiLug9jYagtG~{i6r6
z^~xh!&@D{us{vVI?O-0<>|57Od1r#Tx!3DWWb2hjS>Wm1NDIiSR^sEy`b7;m-L&ne
z9eVYDUb#<tz_N{P-i6Z7URWXD{lL}sn*lw8e+Nwo0KTot4zetvGXm<pCYNCA{PwZw
z&NPd#eS#eT4s4EJ&H7>b9oTxMtV-cGWmEpk#LY}`rgzii8PJ=}8u)tOsWAO_tWDD|
zFJ=*E+(W+gr<(VWJ}*&Ljo1Kq)z*LcP%DZ)eXTSv^|izJP1%Kiz-b?Fn5Rb~%IrXx
zvw&V`beh7Kh3UUz!>BIzZw6%{f*!%WSAUt>KYAd(PiMlEbk+6obJ;rejE0u*%L=Pf
zc)V_I`HTx<MqAfe2N>4JY^_+en3m=qe5`WHHrA$fXI}3^HDAD29!$LUthL{h5MOK?
z_**t+^xW7gi6?hm_HFYE@p*}fp5(LL*z5HsmaL0k$=1bfEKBTSHVn#Cx5*LKrSj<Z
z3C|l#zJGJedd%OH&)mY=RDI(v9cEb-LAO2=Xj$;pSKDH@K6FF$(h-9kqXEQ0FMT}#
ze8ZBRqgE_-=N@|9w~;MZ{4eW=Q44u=MOc~7mm{n?kH;Gp1`Yauf1lLi5BR2h>J~PR
zqOwg=tv+EkcNy}Kl>^D}SaRodP1MagqEt*itW-=stk!0?F+5!`JdUgyM24but#|8g
zEBUg*x>O#kUl4$C(ZN4DFR%)6#NU4{TQ8wj5Ti$kZVZTktf=|2UW65T$l_T2DfCbT
z+|<AIyiN;w$mR=pv^euQ=;nJieW&j)#DDx-!XnXn&4;WRN-gBk9lCoL!5nIs6Plif
z96|(SMFibsRWiBf>d#;MO~NvR<T)G9+5zA^uQ%c2H{;iF*X3WcHkB;)Q3PC?>X#Ma
zw~Uv9#&s|#Yg#}S!fy;f{4T+wSh98qxoiH(qoKs-N1mRQo%4ZTXE@79b)_~w(=V^1
ze(ruYU#t%>DhHCKafa!5$s(`*dr3e2TYWm&d=We9=e_@zO>s|58s#0;)86M4dKj}x
zOQyT0`XBZ_cp?z<=Z@0M-AZ-#r)tggHnnDYn^H6DvyQR}dr$g3`6W-ptj?X~nhB#Y
zGa3I;=EX*4>@7xnpcinl0HS-r>9Z~WgMqbtK;LFyHwPd;iGMZd3%ZvQKQ=!<S@=Ig
WMf=QYnrW8+0000<MNUMnLSTaM<nuNF

diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png
deleted file mode 100644
index 8c4ee82d1e1a62a8e139738077607df4c9589bc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3060
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
TNqmz0J*?Z|oUkpH=ac^hQz(O|

diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png
deleted file mode 100644
index 0e59f6ec36caa13b2fbb0b09bcf47b002e488cbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2448
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
UeOQWkv-Oek-5-E&@gN=hFFhAHmjD0&

diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png
deleted file mode 100644
index 1deb6f3ca877f433e466ff8da527e5b19a46ca3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 832
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVR={B0;OXKRQZeW4o&9<&fimtNAN%Wa`721x^|EP9Um(hR(PP`faE}Ux-mpa>
z9yU!KE(<>hEt;@ZvB^!<Z1&Eb*86s!Q@@$C*?7P8Oyla)jGmKJU}%Y;!No5vyBD8N
zjB(H1d_dH|e92GS1l}F;B@cp@-_)I_w`W1h=L2#ZY@U?%HP$}Z_UyvRS%;l+7-s9P
z+06Cknw(Xi<Fcrj)gPzXpRmY_v@dPA?6o<p;k4K0y07w0dl>wurrCzix_lidr+ii+
zkw@ql{fT8ydW*Ub_&wa2EAj2NNBz3eOV79K6)@PCNk$X}Z*O?p^!eDuL*JLrmwvG3
z<bg@L+F$2ST=6m5+q<cR``l0Oy<MB{Nz47eR?;|W`CoyG1$Vzco>s+rPW#+$wrh<u
s-@ljtQoo}5fa}q%s<0qc@qGJ>DQSno?VF0ZzMzEf>FVdQ&MBb@0Pj>XSpWb4

diff --git a/app/src/main/res/drawable-xhdpi/icon_bolus.png b/app/src/main/res/drawable-xhdpi/icon_bolus.png
deleted file mode 100644
index a472289d6b45019f96facb0930cae35386fdef95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2543
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
T>bCma;hbh|VQ<bfy^->7d{L$(

diff --git a/app/src/main/res/drawable-xhdpi/icon_calculator.png b/app/src/main/res/drawable-xhdpi/icon_calculator.png
deleted file mode 100644
index 9352f7b2a7f250967308e9e85dae62171c9398ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1675
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
ZLRbsfJT_N47&ZBauoIG*P4OAJ{{iYz){+1K

diff --git a/app/src/main/res/drawable-xhdpi/icon_calibration.png b/app/src/main/res/drawable-xhdpi/icon_calibration.png
deleted file mode 100644
index 98a24e4c78fc50a9453ac517a4f6b20bdcc64336..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2073
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
H$n^gKooTAR

diff --git a/app/src/main/res/drawable-xhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xhdpi/icon_cancelbasal.png
deleted file mode 100644
index a6eb55c6cbc53531b394732aab2dc28a82f6ced9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1629
zcmb_dX;hMF82tdPT)<XKDf`6CDMP>=6saWFN(;-SMG;9*5e86+8soEttg*2iD@Prt
znR1sfEh|ben>bAet#oqB<g~bxI;Lh84mO?6%>TLP-JbWo=iYOlKW}E}c7LR)wJ87q
z$iM*VPQxBIHy6w^th|@GVE_ONW`{)xBercNF}NHjdK@>F=_KOt4DSHoO%d_vj6|jo
zjAh2NlgXG7g%Sg@<H(qBw{7@sJYOb@9U$g2Y2xi+3~?fZ7>A+wn0kvy1_2IJNC!on
zq+|g}M8<s9B^l0h*EkILnIcRiV>Znhf)U$7L0>MP3A#DCV;KY&Ptb$tL~tW|I=gNF
zo$&;B9G-|HxMJ}H5}ruH6TmOP_?Uv;{I~<8om9UsW`>H4VF`si5)PM^mgbb^;>6|0
z;|N3|5r=oiIXhzw46NW_vXCyqCJXH5B>vH$G6f7in<r#*lfgMndMr0ZNXB4rb0)Yi
zE{1rxulWqc*A6k04Q=5Y@`Hgg5&#%!0;!wAL<PF;J*<_xR;tHFtRp#L85WLP5c@|@
zoHE)FHM)7x9&YI}>grP>U(TXCZmnK_N|pyzWt<FJ7u67az4W^1s)td<NzSNkS*K+~
z{gz`AKkLL-jg+G~H94A}^IZ6AXJ))PdM`n*FkO+8Cs<2cxaeOv+q7#uQpB4uQXN!f
zsXSC>Dyr7UO)}#UO)>p=zNRo=;&SxeH(j1`)AuRG#xozfdNlLJsV^63ztb+%lC(xK
zx8l)Nu99Ym=5WLZbra+7H7@BJo1L02M@+$#(u7f<`OOdNdjZdpmFBG%Y_tfy8KN&m
zVF~Zqk-h?`1Gv(p#~#@u(5me^x>lC)sej%JL=$h2+smrhA;;CDEIKZZl(2BTb))u=
z^UEnFA7Pc6CsNWVig$x{WSI!>e@M1Z^#IVV5kvN{u6#^$o7h9Xz|4Ny^_iqk9=d;=
zRbkdHS#{v)3uD=Q{lh1eHk9^-f!=iK{>H-=k(qSu<`~yqL-74@r>XWyaZELBcIi#)
z_g?Wm>#<xA=z>l|)nQerJFo&u<83!><WCg#p6ZQLmi^&ZmYEn`OVe&r9f(OkJ+T`W
zT-XU}U}*)vLK`P-i_z~F_CJcy+y2s1hGZx&_~kDj*<cHYhNJJ1Rch74vd%)4q$Zhv
z4!^h*mutCxp}eJ)xph?#8z=(QvA$M`1u2s;4)YJeCx3goIa(t#Mm5TU7vEKdtM(S3
zDa?wY51T)i2ANGG11n)R-zNCeOMcJXp~b|M9@B+KSwRwH$xUg={S~R#l~tEH;Zc#0
zB+FOVTsnJfUt_?DYjEN!FP$bqX@ORhU#QguIof3}fw1lD5us%)BVr%+{6N4Z1aY1s
zbgKmv0@Q^(Yq4Z7BAGVsjt;MzJQpi^`%?xTCGm3G^HoiUg5?D4)w0(e8^S=O)-K79
zzyTu2(_(XUg|+Z}<f$x<2^~Jr(AyCr7z}CgzUy@gnPcuXk)HH@#j9n=%V=~*VP9(-
zeOwpmCl5{ant*A~WPB>SgMnJBP4t4o4@0V|+IlkUHleaaPPlp|*CX30NsZ$V=2v$e
z?aUK*XC6Oi^QMYECEk})6P<g(A=`Qs!@EM8HSaq6%7%laGos#xjXqK_i63?!tcTXn
zuC|dTxYaG4O8z@KnrEV+HJ~pZTrYYyhI|c6YO>SKAAUR@52YW@>b`VQpQ?em!%CL2
z>iCBdw=~n!{#y9Gt#^|fiZiCJBuL>NMl6N%VMJh2xjy6gBK}~?5`&xqeq%Mc$Eq<O
zQdj#vGW{b@{GGAlG}9_|mr{0&Lw)3tZTnYu*4sooI(N3xJge5v52F5G<H6MKr!^8|
z`*(JiE2YJ`Ww7ThFF)br$|Ck@E;t0`c(>*0df_3pqS^T20ZYypIZiXScmJ@}kDPJj
znxO%oYO_y8#_xTC+Y@K%rIl()MQPJRmCrD&*_NZ$A9%wWMvzb|y*1ZnpgK4=n))B;
aSI@$0P`5KfT*K!+5+HEPcB*W1Ovc|nfW=Ax

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png
deleted file mode 100644
index c92af22df3208bf294678eca6a835a5313332d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1434
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVRtyX*T%InDAr*7p-ihwH6D-62!9RNY1do>7)mpEDR=K=#b$NWSIooVv)@!lC
z?yMk9!CnEa6larJTuL1~Y&xPf6ff>jZ}HH&BrbQPyF!rjtlqY+w-pw~b7J4ly8VB@
z`}gmav;OBlpYwm_-*f-}{5MWd<4|l7aKcJlzS5&*b$8oF#@|Vd`y3bZ-<4}Q{2{mf
zE#Hwlc5n8lO4$3AwX43~^?&=j%cZAJo;}bW(WM*Fcv0?`HRpTJ|2J+I*3W*M_DGfI
z+lKd@ZU)lUzi&LhpB8pelW*dohR+)%*-LI-PpWw^KmF%T*)6r+^@kgpKh8B_{t_G7
z_@`z0=C{QkrM|u2FyA#uV)N|V$rUS_zkRm46Th2n$;u7ySIye=pepmibhGW}C-+TB
z{js<Ao4QBhnasTYhhBRwKCQSW`CsMbm6w+U!&hoCOCA=T(K_|)E!GOr)4p=2oHTn5
zZ{D}=*k{|GbdlTD8UKs<b8m-TopRNv?es^lFzF+wZ{+jm_Dw#N;cK3}gYSH($+1Nt
zvK)UjTQ^y*j_nZtV?8B#>FUit&%TX~XiZ-&n`HTlgXQ0W)C$|xu`0ffYcoG*JU*P^
z@qA%=mQ=FfE3TH3b30h_)3!bh(panf_(a;?#;X;pj(rqec+SCN;TnT~S*fb~4h5cl
z%XaO-$*T6Swq4AMt($zRSnpr5nr^Z|tpB?0iXb0Xg(U%bQ_kt`T)V7L!Y5Y2-Q)7L
zBirTuCZChuoFyNqxJ+q6<)zm>t&wkEzxft=>1Xn)c{;(X-m%+?zkmE=O_{de)ODMp
z)=hL;nNqnRrIgLc-O5NTb?fa94PUk$Q?NVruS|EI!C9x3+7lQxdxSUNntNkHZok+2
z(%Ly!!yX!5)|g_&l-at`V)fnD>hj|I@k;~jPG+tC*pVsZb+wVlL%UWzeQULWiRbM2
zB>{G4v&=nSD^%BNgt8TB+&iclnafeW{bHF5*VD~wwu$k7%Pv^Ds)+M@tj@`-@1DV-
zyW5t!u3a1XRxRgMWeMwQtqET*EzLR2cITq2{ozYezn(|FO`CJ`?}bxgp$hv`x0`!S
z-+ou>nB|W}JMSLoll!F|73#gi`G=hSgQIp|w#%k_zE+Nxsz353bQM<$yWG3t`O23r
zZVR71?Y;O^9VSg5mY^9NOAG`(5|t(#a#3jQbl?(h6j38A5n6j9kvDJUiuZnJ{=eT{
zk~{m$*0-Hz4=?6fuhp8c)MDA9ecl@r_`e!|5%35N4zu2$8nnIhe)^k`-Tf<<ACJ2#
zxGC<Jm!szM6>~4;ulbUstvAhXyG_>j{cKyf^S|$yk2U`t`hPn<?BlFOE3}n-K}D*k
LtDnm{r-UW|VK#9U

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
deleted file mode 100644
index c448cadbdb3d9907936c9b9514f27ce6e3872ed7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17522
zcmeI4Ux?g99LHl@i@kE7h$udVErpggn?JkRKVf%!*W1=RaO-hBx$BE|HkrK(x0}Qy
zce{5gR13ulRj3w<R3G{z2t^V9ls*We=$n<QNKqdwNL!>TBDE@>lWda7?d`VHUaM4Q
zVQ+so`Tf3=`DA{-%;X^lM|VBc-}hi2!!Z3L!{ssbt9jqM)}p`G_eaLj&pK;(kHawQ
z@AbZSFs~eYfMK@(s*g{)la+@R)odhzW>#Uc)v%B^!xXl)ETGOnm#xAn-6$r0I`u(<
z)wN<`LaqoEYY0y3!wWXty|8OsU6@hxT4GzNuh3GEKm)pfZ8hqKqqK?%Uspl4*UTqa
z-^HCNCI-C@*~!W%J7n6Bm6I~33Syeg=98i<rgP#}RuaS%FQj-e#fg$4<P}k7gHNK=
zhpd9F)s(UF&Y(N=UokQ5x|YK8&1N&%OeIZwiWl?wJTFMRByq@tbLI^fv^c}r&=v`G
z%Ft15-Ewu)U_D(>HD}#oBH?uueS&c{tf(Wy3D_Zud<$5-m=ySKL7E!HShIHBKQ&F|
zVI4N0;W{Wz>>6iHo380hn?1UW4)^RBU6V>B>bvXtHX2>KcHA9v2tk0fYos$iZ$W+x
zI_9jc!X0yHC>y$s-f_nuzB&X_$i1tOtJiwyct?6dfGxd8n0KTd=Fh42r7j?7%8(6#
z3(M$Rk_1WMgcK*_#zk2X(~2Z)5ky503Veqro-V#d#nklLd`v_3H8My*k+NF^G_M1V
zm}jR3N*xWjfJi0o+o9u+$F#>yvtDYa-)K0u*r6eI(}ZqlX4Bam8&lvN6Vg<rX4(zl
zmh=Xgg1lu+6?ohj^NePuGGx|G8;uW^QU$(Sb1cfAt;&euxWG{1NV$X>lDe)bRTX4~
zTt1D;L^{uD>9oLA1pqk+(-|PZYF<|J{+U-Q@$hBRWmBE?GA@wTkhG@ea+$Osa6r~X
zu9`;rK$aygt%_N#noZSUEgMS5!k0-uV(X|{f_luyJA1DSkWEPf&}1%?uco-Hloq+1
zob#-Vq-Eu74Wy#8?;^9Tt6|-7O?y5zWzod->)~$r#M0LAKwbCingwhJdRbdcglQWU
z!l=%9F@E+dK=mqO$pLdvEAUI&@JU5+L6E-u@{s{(>&L=-_tBh&Mv#|bPKhX|#4xAY
zQodJj5yz~#O<=>pDKsOlkrZvgr4hZA)oEZ%L9N7x(87k!kOJ@BZR+|hxM-?r%t70|
zjthq-2S9gfXgj5vZ8q2_$6428fo0Wo6?pT3pEI=Jz8B?lIMA5Jzc^M6+WPfO(b!o=
znAqEF%qvbxvcgA`GOBOw68qm)Qdvu-@->j*GC2r1RYNyIkU`5671T0f6;y?qnhtaE
zMl0!()d{VnrKm)NV1wIYXMw}_%~*Z$tI9Qsr&nL2VjFf6)9CEz7Tz^(UM0PK#=PQ6
zO13&(Stb1+C1rd1E?ugIE9~V<TW=?YR`uofEq<rBF!9z*C_S#Rl10l=w2xF`RWRI5
zkQUL7@Fi&&sB1U6p=h66EWDe#xzasFyO%C9xVMme3~+2UTJSd33fh#QC9=QxD~Sbu
zSzAoaKQ`%YF6y)X<{>Ky=);TN-yk%8xHELm)kEWlJ412gqlWI5q@cHs=2(=s`)}`0
zccUj>u#}PIlw9CDn>!;$^%ks8mUXm|biC~m8d?z4d8BLPo}Q7hBSB<4Rbo%4{7chr
zMbEy_V>do}?iRahc*%0pEj*-~E{z3gCzu6+MR5^8!Y&jSW<g+4Tm+D?3&n+55Lgr!
z0VM1~abXq&7R5yX3A<2Sm<54FaS=emE)*ALL10l_1dy-`#f4cASQHllB<w<QVHN}y
z#YF%KyHH%11%X9z5kSH&6c=VeU{PEIkgyBIg;@|-6c+&`>_Ty276cZ>MF0uAP+XV=
zfkkl<K*BB*7iK|VQCtL&unWb7SrAwh7Xc*fLUCah1Qx|b013NLT$lxcMR5^8!Y&jS
zW<g+4Tm+D?3&n+55Lgr!0VM1~abXq&)>U!!;Wt@81HHbYiQZH3%jP!+(K{|!b$G18
zFbf+QX5W5>xw43UFEGrkz%Up0GK_MRVeU5%KmPGf<a=eLJUHGu`{Orn9r{pU20s66
z-NDBDho3pGAKm}LeUk?+8LRsa3~XP=Jw5RJ%a@-#_4C`@#AAof9sS|ViyN5)JFsTW
zbNiTk?q*kAuYLUTSG(6PzIt}z)Wwsh-}!T~IQLrr@a*gFuK(`zdw*>G^ouPslfU<;
zo;vq+<-*vvZ+x;!%zXLVnU_xdb@Kd?jVtIj!KN<V$uNtHs~Pd5dpE5;{`WBiff?Dc
Lt9)Yn-e>;-<s27=

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png
deleted file mode 100644
index 5e694ba89c49c8dad25ae4e6d70d10208edbdf11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVR={9w^mK6yshIQj&PF}wK$+to^(S`BP*w8j6__l(F>;OB?ju<y5-L45je^bQ
z2Air_x!cs(vJzH>sXV`PJAU2!^sK7t|IfGF|I#C_;yDQ!-7*R-`uz9ff@^kJGnn-n
zTD?BoH3UESwVglro%r7t`!gYP%`7(`klYYl`Oe6IAy4bPZ1%3Tty0^#-k2GbGvCNg
zcoz}-vz=$YwEBVQgL`!MC2d)!?bs&Eq|f?&y}?3-Sj$aThZPcegpSdY$g;6WkbV(5
zBRFZ}!JD=Z5{~>nf57rXT=B+B3ZD<8_V%(wv-cf~sb+YWr59F}Qu_6xOnvCz-_!YO
zSl2Zy<*Hu!l=Fr7xgD(6_Qmr{{EgXY_aS0OA95h6c>X`FzO7z{Z?><s0w^VWy85}S
Ib4q9e05nz<#Q*>R

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
deleted file mode 100644
index b89fd99246dccaad663ec3371a07e56985423ae0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17703
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
deleted file mode 100644
index 5bb1a0b9826d7b1e8d984e4763da643cc52a4dec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17692
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png
deleted file mode 100644
index 64815bc8f0dccbaa3c7f556977bde03ba025e5c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2524
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index 521b5ede826b5dd6bf1cd7f9310035cefb3f1d90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2057
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
XJ0~6=%@S1n^X(u!j$m1C?sfhDVj#oy

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png
deleted file mode 100644
index 0fe89d5f8b482b6af978d9072096b71fda7cc4d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1692
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xhdpi/icon_quickwizard.png
deleted file mode 100644
index b937f1448fc08d2e5beaaa2aaed9417d898e522f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2701
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
A{r~^~

diff --git a/app/src/main/res/drawable-xhdpi/icon_xdrip.png b/app/src/main/res/drawable-xhdpi/icon_xdrip.png
deleted file mode 100644
index ae4c77b1a8c4fa7e4d0cf6d84c8d1de779d7a4f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2374
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

diff --git a/app/src/main/res/drawable-xhdpi/loop_closed.png b/app/src/main/res/drawable-xhdpi/loop_closed.png
deleted file mode 100644
index f7548add59f951a890746792950e538868f24e15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4189
zcmV-j5TfsiP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000mqNkl<Zc%1EB
zdr(`~ng8*y19olWSK@k|#0j*C4JCGnpXlBz0pcYINf=@q18Zz&%eLFZGs)~slWx~d
z?A95#?o8X=X2(e%&Sa8iCy!>DZ0bc4V4UHx-gSc^;1{tS`~riq2?iwHZ~r*=>VW}W
ziI)WW&72vKbkF_H_nq^d@B7X<-vPo1BaAS@2qTOz6oU|<=(8}!2%-oS7Dhp>js_47
zAPPX_C{IL4zlnxg9gV`mC=i7OqZl&78M8-Yw7-Y|5EjUY*tahdjOpH385f7*_|15A
zT^ZgN4xlFE9bC+_pk3dLOZwBesB2=y(1a_7W?V5<qc-h5*fM{KL+i>=mLMQu+0tR&
z7%jbX#=~2s6c$Ed@7hhM$a)z!Og8l8Uq_#ba6?aM%ObRB2`4p#dJUn$qtttR)}$qz
z%_MZ_316EC_AOnwVK|Nx*{|S*#5Al}5$o}Orm|+>sEG3Vul$L%XwV(RKw%@kHWAKc
zGKN|?f|V0t<?XQXcGv_vY=Q%oymQ!M6C9`%*zc^o9Tv_BD@UkR6V7M}y?KQGE$8sL
z?l4|j|I|G+%>Y3}0g|;s6oDg}eDrMn82x4^TD1h5#BiC>RlJBwp2k$Fco8<i0h{0!
zNOK0E*C?W|paSpmMaW6GZwQUk46J9l8}^pA5aRY)bm|DT0>Q!&Y=RwCymQP9_bm`7
zDg`?%9N~mOXwRWpw7m({xjQ8T0GMW@!Oi%?0tYItKxZz&sv=l;2P(&@rw1}JDg_5D
zyaN^$;c^y1eEKu|r&>RSyc%~f=4U3)MR&>1F<=y3jGv6&u2el)xB*mfgQ!!}T-rwK
z>0dv<e*QrK5urH}JXOwbGB?bn(ng%p5RR!>ubXPd%jGjQp;=4lG7tvLglqbCytnxS
zJom_pFs)n(HeZFD0Ney$DS8$IrU6(|36+9<${FriY6KCNa(Yp#{tWw*4q)x#bO3Qv
z$F}hSv*|ajh=ud-{{t7agbEdnYp<{3#Sx3rI&7SX8#+S#{On=cz(OA(sCpRlOOod<
zq3>3pK_FPiVS<&d7TK=1aLin-;R!aL{msl*W=&Z*r{pt?JkMBo2L{Z9Cl+M_h(JQZ
zeJo57dg?}oi}`W1%YteZp^_gQ6Vq*ysc7Q}jcJ5yxr94L!k}5iZF47XnL2RGcoVlx
zUAS%RLf@7<=r<F(4TOtXgi~p5M{cNzYvt|eH4;i5`3C@yf_=kdA0mT2Y{7bsi}~Cb
z^u6F<&XS7Is%4>s-hvi18II!D8_Q7|ufc|8tFd6gLI81CuwWtP&0CCl^A;m<=`v{l
zZVjGYm5V=Xeuys&@1nop0(y<)<>XZg4p@0RZt4j?T>TROqYFTW+eZi@$kvW}Wy}Lq
zF7^BXm|w*^nd(pxI&=ha>p9dJ_T!nvb&8lX5>~E^!S|9jqc-O!=r8zRbQzfA_erW9
zS9MPOe&g!^h8KX`>s9wZfk);&CVd)oYAPB4W>MMiP|N$Tc3gJ2if}E5VBb-VBkBUA
zET1#vJyB3g;pBb$B0&@}Y}vOj(j%Ph-D8O&@Nb(lajW2cbQ$bu$sqif@R6(jp^%00
z%Qc7A&<j1te{ieoyC4}2jEKv{&*8k5g%bSj^~Y2q8q;Vt6*uASZ1a%%qg~7n6yEC#
zZXD*;FQ@M};F_TgBis6{eIIWA09SGelu!6@^HBgxT;EUOXkf&>u1!V1$$?{>-9Kwb
zaG*j(=ruagS$xo=$4_i{m<fZ?UYIx=RPqdfZvgOK(schFjSD$v@PFwdEZiV&8VI+H
zZP>I#Kcvn{1Y=GlQkKt&rP3ByRODY+L9oNBq8KVZiz8W_N6nMjkkPFgS^qDLeF%NV
ze%LssF0H&Br_w2k3JJe|>Nk*u2SiWiXkd)$DLIT&8b2pp!Hyc9VyV=EJxLF^iJt<e
zXJ~}h6LPOky<dxdGxIIn?O+DOtvo`vu?dgI39jcR++39jJEYoxL6Z}I<@|881UsrZ
zilbc?lqAoUY7E@MnMlYJaC!XmxShxRhN11T@^&<4P$U(I*thxsfZ5X16WS(bWzdc)
z9Op=Rh=KL|A<Pd7OJZ2a0{G+lqiD|=UI6lFuyG>pnh2M3>ak=_id4gdIB$$$Z)NAB
zQzymp6;8NT70socHV@_pwPy+0D*8P0BpTC6S_U1tjTYXHGnoX+@5jsE`Da%xWAR~z
zK_m-O6`h1lVOY6}ccMZ?F|^}6wx_tww_t{QK3a@h##^WnNRgVg@(vsq2=;u!$#e@A
z&wgC0XIw@DljLih5#4%ay}ybV@mJ1)-aIGX$ll~tPcTEC=aLs~#DJMaPW^E#Exa9H
z<`6`455D_oxvSnWjs_;do~MtYP7r+#$x5CL+r~6PSLs2ij^JlL;AT|GBfHUS98Ld^
zJ{mq#Gv}=?<3j)sO0@^z<H$W?Pf{}M`A!zlQlNUQDseWIv_icyCa@Pz5nLgN@B9ka
zb%6;$9t{<|1MNA4LGyKNd$`E;4nLhYMo?Yut2m=D<Y3_)xRFcvQ;tEZBe?axH`r*e
z)>NW3ldWk4A^=Zb)N3e$wh%t%JVP0Zowo?6)zKK(+AMj5KD=JRfohK6C_drUpiqE&
zl+MQ;^L3n1E1Q5v)B?P`kTi&6TtB|bA#~=Qg|IY78A0+;`9bnV^qE9O>c_%6(4iyz
zR*-{hq0{?iYvr+p$>=w;1)V^9eyy6&r6=4n5N_%TJqE%}1A+2sGrdUoTlP_WGv;Am
zBr)}4$#@0lvj{dH`jF{<0&Q!P_F#tAwhmeUtCtp_&*+D*<5irfR}*T|tMK&0&*KN*
zejYzcdJZon{u7>gv>dw=_F(s;yKpG^S(L?Z_C*rw5m(KXsMnBB+utVG(W)iX84gI#
zhlb@NLl(e~SG|mz`oJb&o8Z9zXb7$PPsT=!+;bBa&Bxt>4p=$g`q0XW7%)3gw(3a$
zL9=k-2N=B;{v({rWagx&Rih;8Tg8j8a)i5EZsPHIivdI<C1n=W>gapQs1BO^rS72=
zNgs~R{3_lF8%OBdat6RG00=4d<GBXVu0MkY4O1tqeIkwvY%i&jQDEgn^qC07l8On)
z6PAbLzpN=jmqCF(6zphBC!ETCQ>r1fdcVx1*w}~AZRmG}AgsIte@iD^(6yshTZ<~*
zw<Rbq`oFw(7l44hVD`{QngeK4Fag_mJFessj->8oFAXvMFRRNni?kRt5v&|DBU`it
zD!2;Z+t`~_g6leEylBfJd?5T(sy!fHFoLSm-$84pZwJi6IdR)aD2ms3H7Had_tICA
zo=3NV@JVVPF6R(>OwE{o-?sn&+rOp79plgin&FL+7A>JV{cWlCfOx@%WQ+b2oKg^y
zwQ?c`^Bvf*Y&C#MSRER7Faf-u`X<h0J8(6Z@TKkqfcvHIBeC(Dt1y`F@Hrpa1P4xP
z2p97#u4e<rReduvK}XShRlEorN4Rb7lr~L;)&$JJ=&etyi=l0VhKxT0VCxt1=vc5|
zA#R&HU2DXn`T`n4yWxwmlXX$oq(}fYJfSPE1M&{zP!fRK0$Q|+o+W&$Itp1J-dkhh
z(3RJL8s4`68Z?AU`qN`4?xL<~h)FiG0D6oahzmgh$n({Y64TI_`77yD_d<%?mN>+r
z$EaKY7j;czCvGMPKt{%+3#7liLnu=!fJ^$*ehDBHRggD^$wM)fDyZG?h2lA&+jIj9
z7cLk=bm(9tn&r>^nS>iOgv<Jtv5>>`-^Dx&PHGhF4B!X@`2%=zX##*yG($&*+?EZ?
zRx36`8#II~#u}-HfI1_an5xs?MvH=#Fbn5IuaQt1qK?>TklRueuR*UuN32;(IFa$L
zR6{_#V7Bjj!cS*JC}K3oe!$`N<+!FK6d~AgA&c;-<`+^80q{b8>Cc|pr7Sic;=#Dl
z!P;_K|3@^Ylh6IIR^E<IJ>k`LWdH&U#>slm6rX~-rs*G!9trL?%tBwmSw-vOR%yGU
zDV}Xr3}`-_nF})aLT*FZswXjE_Ps5~wIEZ_frLf#0gS05GRbx1SIvke$>AYw%P|~a
zhy8qQ%Ml!?*AP1LtEA`0WDT;H|0UxkMH6wTFUk)EqdfvER>Xp~wZW?3Fp9hu@Ry92
zq*}(%3FYCpJ8?Y*X27<Td%<Y`tzbrn!X4pOPQ-vo#O}oP0LDcPOB=Har~k&Rd%<XT
z6rYgJKaVZ|*$^2hY?dsaaT)zHZEK<oM)RL?47ic2toPdlJI-hcb-Axfb&SItIMX)g
z0$vBuXH!WltSV(&QmmW^d%hEUl9B<8s}(qNwx=^NTDwXQqA|^P987L+ogkv;>0?qI
z<EnaR&H)XX#y7Gzp*K(YK|~AhK)0Uo8fWyXXB;sTjwmtOwx=wKp&jQ@q4W&2;DAjf
zf{IQ`lkbEW9@G7ho-5_fT-s@a)sI9|7T$qQ9pSC)e5tMp>txgQm@1=1PPtPf(X6zC
z9p?zNqe_}|C$Mu(&x6|1nXmxz9m(_Dpvj3tsto`pCH^&?QWY@f?@4+fmP-BX`O<Gs
zX$U<fhrM_+3517wvJUsVj%0B$RD4#_`O2AJ#XC`vO5dQJUr5<r#+F(qpaz6ex*B(K
z4pw){@;T@%K8RkU)9=iV@(D<XxgY<Y=}u2D$q0>vO~c(y@OHL&HWfFaF^wgY^*4*J
zl^?{HTEf|)e{|70MF`H6W$Iy4mZdD8gCpt!*mqRpS`NXYq5w0r52BW*Syc8rPaaGS
zf<0-US{;pN64#;5upi>qbLh|!Y$~>^A)wsVf*sW=dVtC;QjBX-_5Mhhy0n#XajeKG
zEK`>yqVzEh-bmex&vkF2x1a@In^;{|iSYqv@g3HTo^s~Pn3}|`JyN-4>cDMtCkD+T
z?idN}ImFV;aN~71!62$tLzy3R-n@6};(9@D_{60y_AD~9Ez;4V%5k_5g3VEOGzfG*
zmH&4zGhc=)d3Pl3d>!Ytfms>8m@*y-yp;(4m`cQXEk#k;Ye-C-?bXI0hFdRwwPP>t
z8tp-uzJAmqFq-cg?f7cPUXOMKjm{q(o*4=MkjuwVNpN1^a4+K>IHnSDN<%SJ(uhCg
z@=}XJYemlk!F`2^r@FE54p>!$0i%fSlAj|pD5JIkA^0!xv8o82xdbY%z+qvk;!_id
zV7tajHgRhOLZ^-(Zm-2#+CmSCLssSZ!qi^mX64v%+Ey*0-|R%s){k*SlkdUok+bPe
zGfdo7hBkry*21%sELM)y)t1FP>w&^XH0TbZ{E4-r(lkRb@@1aa%r*=bbfM2g==5=!
zr+lI3Ne%l=TNcYw)n_6M7IdM*Y{RG87qKUK<B%1rNX$^idt;>QY!j9(#Wn@k*<RA0
zM!UWl7xOHr&UgnOsrTc@Yqw)t{O0g=w*Fw^E_7xB4qxc(C;Y$CTvjRJE6pbq!{yry
nvdeYC2qTOz!U!XbAjkg$=&n5m0vQ-V00000NkvXXu0mjfelYJv

diff --git a/app/src/main/res/drawable-xhdpi/loop_disabled.png b/app/src/main/res/drawable-xhdpi/loop_disabled.png
deleted file mode 100644
index 0f7db5d681698c7eccca37afb95a8e8f372c6fc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5236
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

diff --git a/app/src/main/res/drawable-xhdpi/loop_disconnected.png b/app/src/main/res/drawable-xhdpi/loop_disconnected.png
deleted file mode 100644
index 7db5047b9faf0af1effa090495bd76ba8cd4bd88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5814
zcmXX~2Q-!MAAjwU6|#k&J>rHCSvM=$Br7{1BYV3Nt`Rb?5wgqPdu3)s65`rY+1tf6
z{!i!p-*dR<@SgX+&+~ldH%doKm7J7`6oMe~M`}uX;M4No4>2M5y^`i51wnK{kCYS*
zeBW<BLl{gvP3=^eb$oGa>j+g*?>WWleBUv}%g$&zTT0JM)nQz{+-qZYCoXPk$~f77
z)c0fEkGPOvL|a&x8Zk97NoRLF6*au$5j)kJ*HhW&`7&a%VlR9eipv|svUXfb&)hJS
zofhXQI0tV+U~3+uGDHWfLA$M(j)2|P-46N?#t}<Gv9!-*cCa^UuOmqk+9ck%;ohWi
zcXv-L(EEfBaY66!p(vX`?u6^NN&+eB|NcQrO4@&ZLDoyfKp~mV>e~P4-yiMlhKQHy
z4MZ=FfBg87{54bZdiC=gB8vxp2fs+d;Z`uFSThfg!?phY{+QU<Sk$R^b#wDs&A9z9
zVh-}c!ouQ{oq6nqcJM(GFG|R`#xhKmXFv36YLzZ2F)1mjE&#Lh_WSqml4vwKi)A3l
zx)EJnUQW);#H3R^k!w<ZyLSE9Uz~yL=fXmqcPr~N;prS1Y3V?w*ogVs7ur*K$}zvA
zvU4D4amd&$=0p}V=OI{HQliyjR)KMrVBR?PH~3`mrAFwxIIFesl=ehj4%G^3&=v=-
z_Nt)2^AB&>DPsgll@PP7F<pu}_lBo*osrPb`T5HP^U6vo&%fW~$&1&~?2%kepS(gM
zNeBoC&@2?l8J9+)($dlds!+0?Fk+72X0zMxhSxaKH6m6W0@)Pdkrq^6W@=v$SRH*A
zzjS>$RhBOHw!c$&FXNtg)ym2WOZ>p<y>yL_1_B9re81{tq|75!`QAYsTwJK(>gwv7
z?dH44$;n9~F;P*wLoOcNN<IWRgLR;}`GQIOfQ_qzgJSCQ1gkWKHgQ=MD|})OoCqtO
z%4r)5i$#Le=Q%Xva@*nHWUH)tB6fdnpXhtH%J$X>QNwYQa<>yk2p14@mJGjJ^gi`=
zbjV#C42v{(cXxBY(uXGWh#&Is%FACP<#Kj|VpZPIDu@4a_gnH7Gq(rF_;J#4+*UNV
zXIY_k=3;O#i5Hy{bTSh<GBTp7Y?E%t@ZV1-iOwOnIj;ySd}ahXU0A$OkI~WI{<JeX
znsgBW=5eZsMF$Dg5x{&#N6&=|+1lEUocKN{nVmH$;3HlAbnM>zK-@5<fD*3up}n2;
zX_?V}x0=m6^}@t;hD09RxjGEJh<P0fh2rGkx=kUWM!Y{EE=#LI4cE!lnfp%60ZzF_
zh?%yWQRPTXX!yLfrRCN3Y`r`Iq^7Bvb#H!x_TdO(w;dxD{6VsR*i-I7-_Ve{le4pO
z>14E4v6yY`Oof-Hr&+y`(9=6~!;^7waitQO+Zhw<WX9!&;!Lqd#>P=$R0R&w;${ru
znpgnBy>NPS->l+mk?-udr^iFdT7S8rxuFZA?RGO^%5UPV08{lQcf7s4I0oF<7{~~>
zUskrC90LASnl`(y*$fU29zyKO5LCd$%R6RTZLK`}`)lU(+Mhqyc|}D<8LLf;Guz%j
z);%9uRci3us1e$9b$0HXo0}7bAUQM>g}&=+9-*oNz4bD|rxkCJXNnm`Z^EdY06ZGe
zm!{>0*r_;H8AH`C?{8MWTJE0FmcKljjgF4icWJ~@@+6V0x!>2L^=bzo@I60rpt&CJ
zw5+g<yY2TYf!o2sA^uQ=SF3)89S7Pw3uH=Bzg0hT)3A`N$MW&x8z;xd$F#JxPTJbq
zodG{R5<|3k>1k=X{<H2@EC29;T{n5OBm5J%`2GC+0_I#W3LYL}hK7cDD*5{duGit)
z^!V2!Vq+IrdW*pQC*IyC3(Kn=^J=&dEb}YU@#V{e=QH;A<kcoT)$+$J5s2%;#Kgq%
zo^urONL)&n74`=7N^I4Cr8g?ayy?|)=<r$#AygYSMuCun6wJ-d(+6$gsNrz;<~9O|
zj%2knOG}0XTKX!vXlB!h#-mj}%a8H~s1C{F+uGV9n{{eP`Y$%8>S%8-&_GK|D{)};
zY?|n{?^5tM)|v}~?8P%Y?%lhWJ5j7{@sD`Op8ZEED*cB&es>*~NHjIT4xs-W26e&6
z;^=l_so!9YQ<ZbZFqx8zfganol(tRm{ikG5msw1o`;$)wqz*9(et!4C{w-Gq9}C`r
z<^~Whdeh{OAcz9_=DWSP?)_)*$j-Vt+OZt@G1=oE`jm4ND+F)3i9e4E8&z2r0`kEl
zeZ7%@^GSnYTE&N$Qp55g>JCZ9RwwWf)i{>3+<6yDJ=$CQ@W)g?0(RR6oPSm=%LF3y
zyVJ>$OCi%`#<el4O*b!@hiiiCO=54y6M1-etU>Hs{2CwO+y@P{na^h;^~pkiQ`%hp
zh$;0W#{JpoYEeDoq>@pj`hG3!9s6+2=ZXqp@yxF%eSQ5xI2+B)3LYGY_SP+Dv2=~@
zJf8oM!|1@`$TNL`)Y~{w5G0yDQZl`%%aas)-!MAw!laxIdwvc_QnJb6Kt2bTy<QQ#
z>V<lP%^rUU&*lr%@Tq_p1j#KTjg5^l2bUVgUx}Lfa26-0rcMHagJ>kaEMacJDUf*N
zggs|xhkuF>FMGLDIB+1})mX{wI0NjOyI*9{y26VWFJSWW@(<_63?jP9usf};)ji95
zG;ml3Rc0Pvr+MYT!oor&W^2a7;Ky-Oe>O3+<SFg^{Q2_)M}$KDIQxJb@2X;#tzx9D
zVYx|t_^Ol@MmU3jXUMiD#7tNf0L;HVJ5%h%s9p#5uRbHLqKwau*^Ya2D6O(`9y!qG
zhd@K+0XK!xRJhqf@q(|;{vaHxjjWBADUBhp4PIVeKhbEcvX<6p@VHH$o(c&RVpw|T
z`?}}NzRR$83NK#@rY0v7-#tif!1e$&*D*3OTKx76=7>-0z!`==G&EFITud}PG-R#*
zoJ*}x?~#uW<~dx=2+5@+dpo{3{`$%w-Zz5XI<nVRH0aguk@QHGJqEdNWArKWQeGQB
zrU8Y2PEH;#>V5K5Rl+Cv{bIV}nS2d;n<JyBCxb1*3fI}$`Sg6V^2T7jL;huGP_}Hq
z3A}awD#c7Veh4SV)WLzjp|R0MRdwLb*LBa8KRJlFJ9qAs-=GsRVv6Gdi-G6z0oP8@
z7+|lw>@)>Tb%NB=gd5nFn8O49<|4DJ(A!^7GAhFtAM`#c#j1!kxvlp1pc`G~+g^-i
zKNRUWUHJ?MdZ`UqFxKESbFi||9$*plJN<=d&v-I1WGR|%CXgbqHH4yCsjR5zFDWUZ
zxxf@F|Ke15)n(e?<kwtUDriW=V!%ghFPcu+ul)8ya}2#m_NJ$F<-sT9-C|B<T@GZ=
z&AA3=v_Qz<BdtD0YA9rNARfgW+iz;urenhtwf(}Fj+J8Ic(U{<f)e5as_27@uvePv
zCwmkwIbCjw8g*k)vAhPN`%7wPdVPJ}2htd}c}N05(pjVWPo9L=xav{me*dm#AdqtN
zD=yen!_r$my9<}%i>^nh3TbfxCtH3CP7=sxm(=hJu<X8#jSa_+7>B~k71@xfsj1So
zLGnR>IFoXat@`CtQ78;?0G`c$XpuwbxP9-%#f8N|P`_<7Hw4itXML=!q-4IH5Z`un
zap|`ih`Y3YK-vC`$}Uh{eMlWFb!GGIMM_GF6b!b<3!N(3+1VBKSx2ccdP%dE7zmIr
z25Gbb5oQl#IPwoN!U376&ZNA_@9?)5G%<D+Be9Hd1ktRi=~S@YJYE>J*}2n>S@48H
zZV4Ke)uFdP6JJ<;sHvd_PaE)In=s+K33XY*JnhAqs%2R;H~#Il+T+IoWR}(k%QPg4
zP;+xLw@Ut9ou^NchNZ_VK$mVW%O|E~WSoDPSicYr#eb&r$-o-m3;RkRYl8^~cto9v
z_ULj#!JV|u66kv!_KwohOG;1(u!obYtKhQI(oMpU02~+oxx}=uzZV5)Nm&H{O9Z(r
z9R3=71<jJrko9j>8=F<`dJ|Sdh%_ActKH!fNR4qC&lRtiKk_k3ILP?PlS!PwX41Kg
z+DA@~j^|!Yvbe9=SXo)waJm-B0#rOBRUo>UH316&sd9Ywv|-+yzyr6KzC6N(Ym&;C
zes@(<Q#4YSc*!Phgc0_PfZcL1k^3R?xcBG=qPU=-;HOi=OVV&_4K{Yv@I!$VQca!-
z1a8;X@}+Y4zw|s#3>D>)FvTs`#awAugCNpF5<*4&Ynp<7KvU!K<KYxO{Jr%yzr#dT
zre4o3d+{5UydXK$&NxkXD=Yqo69~KQPmKe;RpBf)EbWQN6&lV1?wFmL+Q49W9-eEX
z$ne<2WY&fP$q6gddD-jr4_6Hh4dxv&X~}m<Acb6=zb{|DyxyR<2Dc9P$1+dv8-Kr>
z<Q_(a(9|RsppEticlrXY<r5I_$D-dw6XTIUUCTX4#KP<>lea|})ruqo*_WCvhkcBV
z|KDMe&I`SOfB+@RtkJ<H7{J!Y^78VPc)9Q={U;~h4}ABQVlFWG^j*H+$1jHNDmK~k
z=UrfE6~UFKAhK77rvUf&KWAkbxa3I;a?2=s$TG0p;<fobTrQu7Yl@sPZZ&jfW@g>S
zGYd9(fhRvzT_^5_Zg4J@io0Q&%IWk)Dr>a#ALRu%<at2c1en-SYvcke1YX2S6e6?e
zzgeEx-3{+c;8Z1TaG5`!yTmMB`{Z>L53To@CR@$aJbyf0Y0(+9yU>ob2-vP)HEnd6
zCxCQxb=^Qf<0(5!7+%9kQ4hDPZO+_vH?v8GpemsNp+rqTtB8-28;bz@#eLR_`QwoQ
zy!MUg@paGOXHTB=IfEx-?a9(?iN~@tGc&O<5fOwr=<O4<lLW9;dx^}1RjCJ_e|54A
zOWXO<W?!A;_;d}NcGys=;Oi%3WnJO{F6kOae;XPeP5?^q4Wt1$vEkFFHa<R*85%s;
zH<WUxKbxZ7;&k(~K_T1d#y?Ulaf{yG-qy;>1f-}aV$WJ3=3jyZoQ~p}NEQlJJ{cJ-
zk@f93BHdedBw|(tDYaF7suP|Hpnr}1!A_hXZ%XcuHQTg>so*YbapOX?baZq9?dG6Z
zsp%%?P*JlCjw$PAQ*(t`{xhM^egkiQe|${C=@3TM3D50%{rdIh%jpW%*|zL2v=K(k
zG11Ysva+&YU~lF7&vR}L6ilq^lupt``O(wo<qM6*CNF(}=Mww1o6mJ3I;%o5KlXgX
zJ^b_0poAy$YXq%w-!UP5bRJw7CD`QgXLQYap%1S*xmfkbY1N&d)6+;^t@rPGBy}G?
z$g2GiwFnZ)8=fTooe|XV+UuH{ns*cHby0qF(>O{V3Y;b!FtXLg87HG>&*pKU!``u2
zqV0IO^S?Ch?d@!Rz8@br*)Z?`pV^C*T!?I^<0GRk)cf@7;_Pr&#X~`4h=0q~(Gi~c
z)!Xgr;;cLN$z5`#Kr*k*sq$<0ow?@CKoi*=&qJTF@X;(8$uBaCB*u$eI1r1hzh~{Z
zJ=r&LSq`6$YN5?($NIm={*{Hr#jcUzI@O%=-djdi2!uRf+fB||DSoXkCkY!}-EoP#
zl`FA8?382Z3XRLBuGc6xG=DfF|H1FiSPtdZLOT|M<_K;&rttN5##8C7x;MXjK10%)
zt}BcpIt>l;ZesNAx4@n$a+euZuefe|W7$B4(2>}0yiJ&_{`_z4nB0v!&sxN9{ipGa
zn47CuJ4eoaZRnN|KmVD3-ui=p6Cv<Mc1_KxjMD_1oN$KIBF)Uy)_Ip-yU4VvepQv=
z%ITQ&^z^X<TP5*wWiiWC^U7U&7nf|RVnLT~R!<PerI<|e=@i`E4=^n)EfuPXjI6sM
z{{H?j5fSYsJ)shuD7&Gyii!%#(QMh68klLxYQeOHsVOr+nP&AjX1ea=3`tk>8jx;H
zZ^0J$onZ_xNy(?5<*!EXsxjXH;n(B$i1F;=;<aj_-hC@AqdI1zZutPXyD5mECgoH4
zla9Pf`KQNS<n88c(*8#u36&-t?tT}-fsESykBfX3gCuE-O<7dmR|Ay+(q{oho>H{@
zW%u-7>Utfz|2~H`Kb)470L&8}cx@yvI!WY@+iwv-%R~&;tjYM0C5TUzN5{t;J+OUq
z9HgzN@s~CCpsd8i16UXSld#D6J<Q38`3qz3-Vv*^H+&)@1GBTUFVD`-yjTV}lyxP6
z@q;|~$A?n(=$m|GIwKzF9<H624I?g%1NX>3yLKT#z)@+3VA()MEg6bx%FFKv*D6H%
zo@23Ypykd$5Eip5zj1h`!;?fHARzE<^Z05EFgIND{YUNj7{fjiVEu+yCnrtBudNt5
zr#Ji7hEbISX-n=b9H?N-ywBL~<|fvlP_NHF+2f-w?b`14b{`%Q1<Nv<2R+mUPP@Us
zeL?=Ifq^B+L6(-55M~=K>3ODH2VZi~hC-6T(FuZ~1s`)UTfW1&N<e@NFyLjbk%Fxq
zZXD>relHEPuvrs(T5cL4TsL{qvEKU8qd~?FS1X!_xX|8S4`ro$>pUA186nu;A6|{<
z*syoepc5?M-4*i1-)`HiXifEfkUci`{yvR|t<uC%Y)gwY2#9Tv<l}Fvoe(n~fB>ir
zGDJi~myY$)8~mCRo>lerw~qZ~2QZRzb;KuEpFykM86DLE9e!_rfDH+f{V|`y$fy=B
z^e#KQV>!!bA&Os=IxzyIn}e;HTKa=aE&tcA@u4MfH>zcR$3jwETxn~Lm_spEg{Gve
zj3q2nk}@vUj;iP=3oxeQ{Afb^AxP8{RT%4{pn*76qP(cLVeL2KR>6Fx5kiC#x~v8<
z;L`m5G`Z0LN|Y@F&lYPQS<f68p*4Xy815A|e<vrJASor~nDc7PSHlaqvXvD_l&#O(
z#r7T$ast;<o*t;=?RqP=jj01j{Ri6ExRW3UK4=1f@5~@z#<R%_m)%xn9f3{IqHtn3
z^D{D-HjVCcE;ns}{k(dgo_;^sJzJFfbVdEmvsUl+2QV1bidfO>Ws`#G&FYShD@xE!
zzQ9Jv!CRLbO5z|=NmV58xQYCtR#gE5kpnfsK+s=6fB5U&DsNV0`B~tqRKIf1$ZVm}
z?rR2OXM6k7taK8*STM+4pl`EM5Z%7-9!40l3-W7b*kKbeLom#fW0$6uPRG*##tgdC
zVnF-CSZ_iCRUso;gbS30V78AT0f9VVr<oV@3v(Ao$8In=t28k+)y*IG4EYiUOh^y3
zSN`ahii!1a+un$y%Uy&;)2Od#aU<X(u-Nq7wnHsIhcm{Aeaz7jyXM4;<;<|9<Przg
z8=<LzjSUS`qA*wpSW^(B7U3H0L6GES`RWzS$i##RsE(AB)Tx)D;nWSPtKyfuVZVWo
z?jD{6{@wT8n|x~Vm44wp>8OMW@ob_Fm~FIy3CnY6Q7EF9N05`#CJBrY%1TN|`J)dk
zTD{2;7prUo<#i&YY7oQ_!5_R{hzjO;YcnK;w!b@@ve(0&RyH6lBO_wo;z@FNc=*`T
zI#^$dnk()Aa}>76NorN61~bN>Qd223vFML}`a8wyJa~&OINJA>4pvG3KjQs2?REQn
ajTbHZI4R)gK@gZnLywfTlq%qsq5lKk7D>YZ

diff --git a/app/src/main/res/drawable-xhdpi/loop_lgs.png b/app/src/main/res/drawable-xhdpi/loop_lgs.png
deleted file mode 100644
index baa073ac8c0148f2078c130e46c169b2795a8bf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5284
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

diff --git a/app/src/main/res/drawable-xhdpi/loop_open.png b/app/src/main/res/drawable-xhdpi/loop_open.png
deleted file mode 100644
index 55726849d002667f5b7482a75105dbca666b4398..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5372
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
UAXB$Nbu|H1MNNfDIm_Vx1KvwinE(I)

diff --git a/app/src/main/res/drawable-xhdpi/loop_paused.png b/app/src/main/res/drawable-xhdpi/loop_paused.png
deleted file mode 100644
index 399ec449bca8bba0f185aac49230dc47381e2b67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4447
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

diff --git a/app/src/main/res/drawable-xhdpi/loop_superbolus.png b/app/src/main/res/drawable-xhdpi/loop_superbolus.png
deleted file mode 100644
index 8bcf96248b3c69df81c356562edb439481dc58fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8032
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png
deleted file mode 100644
index d223d16d8f02d45fe3a3495dd8f4cc809e94dc32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4456
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
Kh^SL{jQJmBnp4UE

diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png
deleted file mode 100644
index e33b5e0a64587afac8da4aa8bd54706b1412d6b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3649
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
acUg3t%<Gob4=4Zp{NU!cX0;|h$^QW=`mZMd

diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png
deleted file mode 100644
index 9e4aca67e200c217f26fd3fc0bd8b84db1c63132..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 935
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$^%u{R}>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j
zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{
zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P
zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe
z#mXQfAZECv7AF^F7L;V>=P7{9OiaozEwNQn(g#_h548p8J$<<UfE;)TrRD*Hr3mPM
z1<!R>3=B--o-U3d6?5KRTiA6aP~zCb@JN<Oft*{R1{`Lq!#CX6R>7NOFym;3QJ&}#
zy%~ErCZ?`W@ZEHDQG`j)!3PHnisR0o`Cwy^`|P*hkH63V2!o>onfP{psi3pn-e0Ck
zXV&eS{KR$A>COC~rqB1Br*0Yl{P_3zx$}-5JSJQ*<w?ai#eWZ-CvD$6E&p=xw(NIm
zmD8VmeABG+QRU=p74vi*@oT^OHvL$>%lx;3x6KKqU+u=zxU*}W@A?04)_g7^CK`9|
zc=h}zUt9L-Z{G25ThoSP*8ZOg58YcXT&DL_Yl%}t2uC+pVxXdqR*P%vh7|&0qK6g@
zHNirIjB`^}+MCnfcCFsbzhTi~mFwYu-u0{8ch`{>y_PxYc5|BHwUhJDYwc6rIrYiw
zW!~<wt&48)U!QbG!tjJO)W<zsuRkxa{QaQh(!I@$#(I-#Bn{Y+BMij8VYZ)fWuf%m
SzzGi*gZQ4VelF{r5}E*~k5=~p

diff --git a/app/src/main/res/drawable-xxhdpi/icon_bolus.png b/app/src/main/res/drawable-xxhdpi/icon_bolus.png
deleted file mode 100644
index efa063d54d7a41adb7f4be9cc5154e1f75e1b581..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3609
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_calculator.png b/app/src/main/res/drawable-xxhdpi/icon_calculator.png
deleted file mode 100644
index 18ab99e92bc7575cadcb478f8b6db6131be7417e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2316
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_calibration.png b/app/src/main/res/drawable-xxhdpi/icon_calibration.png
deleted file mode 100644
index 3fd492a62318c327bb23bcde8c6dcaa37e69da3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3013
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
V@-xImE*@^*7f^QQRi^lx{{^SJhJ644

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png
deleted file mode 100644
index 2bb5d6df09d1850aad057d6858db63783a368214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2136
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
KxYfFlGX4TtrnZ*=

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png
deleted file mode 100644
index 08acae3012a448f74f285159a3042b684e1aea1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1814
zcmb_ddsNbQ8wY%Kco$Mr)B5>KYn#Ze)PbN!6A4KZ#lUG(1TsPe5eIs*^o`V<<yn`_
zna*aJR!Z18q~#^VOS6mbyx^r}Fmt)7mFawGvGRqzo&EW~|Ll9dx9532=kqzwbH0}o
z@o`i~J1;v31mZ~B9hG2Szp@Otjd><Pb7vtCC|$s0OWCn|h+I)Nn!^)i@X_*Yu{mx=
zgv-Sou8=PUGWeN-95VQ_^9~3Icw~?j6pM`&@8Ta6>@Jk>6AR;*+(IFjzyrg>>_~E=
znIM}l<pA>RteiZeoDBZSOEm8-ZVU+g36ToPV1z{wV8_M-yF?N`5QGj6<l=UG0)!CI
zxFEtO_?;*KkHrOJumlWlXCM|w#1e>D9Pqw@VRisX!aG1rh>CtMX12)SL8(+s#9(AH
z8CtdjEs|tna0CJYgT-U;_&_rvFs~p-%8>`=<ZZQ3{Fft&pU0I5#8QDM2e5E*GDP`O
zG6-TUBAE9o=JYUs<!3hjst`ZNTo#Ere}JYWLLk<qw5SNCy!QD_N@Xe+qInfgnE`!!
z?QIblcoEW>@@U~WfTjcmUh_Ze+I=avRVR$v?}cz~j`lK^!Z&|BdYcOR&L-&8U?V!8
zbt!AIFXVh&X3zBWHw68+J380XZVbIRvP1uS%{$q%2h)Vih|_+w|I^3I$t#avmjx7>
z!pK{y;fEn4*l!M_$U)ed60{-0Q19@Jgs8S&`ldJa<Rd$2u%wK!I_9Tholf4AM^N2f
zTBK?GHK+Q2taEJPO*&5wH9o(2$W9z<v$}IJ%+T)L?mV}em?S71n4E|1g_-;wKg(a*
z?53b9-+o%XD!#C(dQ9t`{ELn9VS(du__ctQZu{cx#oZgSMDEKFT_-f9_)bc-5o`D`
zUGM(vdu^}AmT>($7fwDbjoNe6*H?+ES6<(?L{ExVA9Jb2Cn$<qS~VW&R$|`36z{^u
zj<XZ8Uov6N3?JPc4byPWeZFcMj@pA2-5SxXooF9XfePzo|IS%rL&g#qnVKjFQ+jIp
znAEj2!4q}taLT`e4bxG1Mp|3v4>v%P+rNJW`_=yV&v7ankCFZ^mP^&uG8bK5?1L-B
z3Ric{0c~5O2;?Rf-xZ*gPLa%W>%%?G3E?#kDHMBqgMDPGK6>yn?3xEV^=pLF&3#X9
zeo$>g8q<0uQ4xKxsi<<Hkk_&g`}1Xlv#LqD-h^jge8U)5LBh88ukGix9DAMUt)QxP
z{TCMiZ*6=A#mQcKf2~bp{IYE-uAud;YO^+=FUWSHxxAswdfC%gxdr6@T!uK*Em?vp
z{r=Guk#P1Yd+l&cxsWVAI54$GTcXQlQq>zeDrSxjwMP8lRK+d|^X*^b^0Ht$#u~Dr
z5cTS|>qs02df1^hf~1rbF<N7KK#Dqr4cP*HT2gPi^$=wk=}kVB@d$@1zF1;q@(lmB
zR__z~Sj}b6L-vlXZ-QoSctR7T5(Mq4VepSpIq(wQ4ebbdE@9F`kLPb&CRv0w*Bv?e
zcs{x^VB>S-gx@R!`XI2Va{CcvuXj4-cH>8veY7>Z%MbB*S!nUmUssLv_LBoa&K&_m
z3$97OskXT^RMcI-)-SuVUy!wl2T)3D&5b>*rkV=x33(*5E%Ams#5mre?^M+Nq2J04
zv7+OX>)s@ds|KMMh>1Fw1AC#&TbIFe-y%Fa-Pq%!3rrTG&&#T7H|c7M$LpTa9~B+%
zDl2E=jx{x0!%^%Pr3U|5#*7V0B<^X4=Vn(`&M@A@!zgx(JGHlp+M3;A^z*gG*vQnQ
zltH3x)o1tE3@!28BSt>#i<H`R$3u73<tlxngPU*5h@#o4ymBV_&G*_x&2<0MPb1|6
z&6RUL6FANNe*G0y^^#0AX*G|m5_;-bJ&ZFePQq>C_&F1uCVO~n68?2e#Xt~dB)F`u
ztFL1J7aYP*Zs{@CkxGzVFx^mhqCGUrOckRYy5jOKaU<eXl4EJU`O>Auq=~kBkFac3
z!swZs#7ME-PZ_}Z4+>0+#oQ8x!Z>z!IE}es#eB4^`5|*1Z|mWv{rBRZ>^<();6SH&
ze03U&^5?K)w5qcT&PTR=3CPk$zrQ1JqU(B9P~GxmXQ?(V(&tMf?A`;&We3CO_phwa
zb8Ak^*mt32b6ut19rSw@-p3L!uUfxmHd~bEeD;OxG9jnVFX%7v)1aX>T`vb6CVl_+
dn<w!2eap*N!_}b;iVn+nMx(?<DI?SW`5*L^650R&

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
deleted file mode 100644
index 0c7597c5ea29c8227772cb21995929afc61217a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17667
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
T#J}#orlhZDLwdSv(=&eqC!km)

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png
deleted file mode 100644
index 1b6d970b95901e0b4d2a3dbe7f13e34157d4f0db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 897
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$^%u{R}>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j
zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{
zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P
zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe
z#mXQfAZECv7AF^F7L;V>=P7{9OiaozEwNQn(g#_h548p8J$<<UfE;)TrRD*Hr3mPM
z1<!R>z+nC8>EaktG3V{Ijee68CE6acH#2v3b82_a=HbiZStB4(nq2Tuz{7@z{gBfk
z7IlTm7Y}wSCwz90>Am8}#<n4};@8EBSkLYM?*IPxcJ4QSaCBf0a?MMhJ)ADDcJ{Hm
zrPrst3vaqr^8Y<+y8eE3{KvV|+I?buygkb%<)~NMWwf7F$)8-~`>FN<pK+y8RU_-B
ziBF0reQmT}qxN&glY|F+#)8-0$X#Cl`_v28WrAX&hjz{P|M~aL)f(CJZ}a3PY*--x
z6kFsJ5yH{Ul^Cd~qt)WtI;aFU#@N;Co;>}jr?S$ts!=*l<>stU^E@YYtJuG~eP@yE
zHP1<RKlS{-c<*cWtiLMD?}p}G|EFCOW;fqHTGI4}v6$%F4Qfw6yU#xUH}>x1TZ!}Q
ze@nhLIJx~(&%|@j4Ib;9yj;KIUHT+_{yp3nu>cY{(Daiv?~2sr{XHosL3~eFKbLh*
G2~7avWJGoV

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
deleted file mode 100644
index fa25d872c79366ad9fa3302150e47637c2d975ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17926
zcmeI4e{2)i9l#G-x;CgPv@5N;Zd{GJ4w3WS`FwVKbDWYGmPm6(Lo$q3k(}?Iooj5L
z@ttD_%GMG<+7E`hO>Bi}QzxNSKxw)%DwVeUQnjh8S~_O5vT2O{=(Ge18%q(LR`1=}
zez`afJQljC)3apz>-WCj?|bj_-uL_7yFdKZ6`h~Ewc(xyilT1qXb*S6@9oz6=9}PW
zaMs#Cz^_{}?W+xnntO-!o<;5W{@oPSdQt0+n$gJTB}GrUWmS&>cOjL5+R&_}kdc)E
zVA3&=(9+GW^9K*PXiaT)tr8<#B+~}^wf1#cuyS2zx3X?P38=1?P(!dFK?f;d%5))>
zOdC?6*=75cpllVhF4|Tx2bx_=tp@36WCh)(X8|p`MMmLxFYOPwd6D-v@r|^H;{}!z
zSYBXwkHiHeUZg88SEvC>!K@mWy28sV&B0&Iu71<ZNGzMr=iPb1t!EP~9|#0k&ck{<
z4AfwZp|mL%n6$B|?4;@^3=Ac!WlT*^)0SU3rsvFNm&<Ahy(;5MWl%$DqrwhSWD9bJ
z<=q@x&q!5}O(vI3+Fer>79>Fmq)h|b@pbJo{ko|e{rWUbqUvcIhI0~$ptkGwH<hZ}
zv|%nAga|4~>slJ!Lm9w!0YlGa6|ig&4rNij(HmwLn3x?5S5UpKBU6h{<HxF*76K?}
z)0kN`WixwCm8Uugp-F97Ae$fz-ysj@;TTR}xTbDilz6Y?;g)c`#Bo8kMss4h*ghh<
zs>O#KK1ADxPvQkh6qj&tT~~ZKG;4jp&{1Vm#`5CSt?^@zN6&WadNNcFzZKQBMYpxl
zpIN1)RXuMkc8sZ_?Qo<jQe4lbWHY3t<OE<d=|qs7D0FC|l_|C9Nj(e42SP%Styk=@
zvRA9rkv2>@t$>bj2o|_CO_hL8Xo|}*KjRZPzzC{WW}1KyU_{{c`kFjkEG~$4&m$41
z`4rb-UCCJyS8=UE*Ro&maIz{gzCcW1{2njQG>J`?<nyS0(I1zEK-IOwe2VKYWHp#A
z<)lN$>ixAgQOC`crrI^b)U!j5B?}j>oex)nwUbM$6-mv`YZ*Cf04r*nUDdEfi4f&E
z%f^m=Nmi_k7&7ERpa$7VWfPr3b`>LS>h$3;F8g<wPv1tqAEYaBiDHVAJbX2#%C2m!
z>75vQ+|0{aurvWz#8rZ#>~ONh^q!S|Ih_D%h^<1a7Sx&qS!=gRY9GR+DSCPkWX)@s
zIJh`uxKo3y5sGK^6pdn>Hg#IgWRjX9TkC-xOskcB55;qJpbj7Z#j&a&t6j?yb@UQp
zqCa9|o^epBN>h{1%W;e>syq|(dIL}rJ&af3{c6lF#6jF&omLW*R+h6<?Ef~CdVDJ9
zk-c6<jC%kR=e)q$tpMYZ`Is6H1O!2d&v??DrxTJ%LnuX5!B)1#+5|VTZ#wdeomH-q
zJgxkSl5MpShmYEZKEz$)`eo9O&X{MMN%2mnGd$k>{{&@u`A$BnR!`VdkG9rL3ZCl2
z<t=`>buh8cOfWpIa*~C|QFxD(99viQHi4T&Ys@EwVa2=ppI#`+opYGi^RCbIPEl^9
zj+=?rs^lGj9jDQtb+MM<r34<4?ZaP)53*Cr9Nz4@sCBtW=IqOZ-^0Nd%UhonQ)hLp
z>FO(+I;(3<CoFr?ni=v`TB|8`SXsCK^8IureBuQ{K2fx;k+sFO7Av#@NJhgNyhs|>
z^@tbYz-*)1n!1*&r?qs{R4mJ(;&?h`PffWLKKp`?-B|S8%`t1}N_PE)i6LEo-^e3r
z1fjqY2re8-NQdA;C~yRV3x^WYA-E6<9D(4%p@eh@E`$O{Ah>WSAsvDXp}-LcE*wfo
zhu}gea0G%2hZ52uxDW~)f#AZSgmeflgaSt(xNs;T9fAv?z!3;897;%s;6f;H1cD2P
z64D{K5DFZD;KHGVbO<hl0!JXYa3~=if(xO*5eP0EN=S#`LMU(qf(wTd(jmAI3LJsp
z!l8t82rh&IM<BRxC?Oq!3!%Uf2re8-NQdA;C~yRV3x^WYA-E6<9D(4%p@eh@E`$O{
zxFW8GiGQ*HY54aQdH6pS(avL^hW~LvEA3qoiduI+MLjl5QI|{b`>zz0<0xvhkD{dS
zQPf@fw|ZY)PEoVBc7&I97fzl1^}(-wCvorLGpAo1lkfQWbAP|-#+6U^J+Zv&#`A|;
z!y|X@eR<a0Bd<NY=^4NLly7nC;n(Kf{)uzJd9!~o*s^nRc){wo0%ylAb{`uN&i~@G
zhc3TTI(y0+Ir74RH|Nuhn>LR;7`=I}{P@Vc1xIJg_cd;sbF>u}!18$uVEKKGu)H-|
zM{&ym{#pMA7vCF64E{uVDAjXfBRjj)bK9Ov2RFR+<k;|Lapdd8U5~6kGPbXW-D8{{
zzjNThoyE6DTgOk_erYWjEWZDnZ-`rZcmK2a<o)OW*g3xQ%!Yeg_8nhyVAa1ye%p}O
zfBg96$oQk*?EU4X;+fH(Kk%l0%Rutd?t$ljHf9t`FBJbgy8SEuM|;<FmtG&*`oQ|X
z^}QbLO_Vl%d255C>)2ztX2tPyFMa8$my^%DFQ*#&wzjQ5Ll4d`zSD3nQ9Ao0Zo@mm
z!_ThScK69$qmSfXI`t`fud-zS4=)xME}XOf+dmym=al^;ojr$M9Dd`~Cr1C_{@~re
z%unns?fLFK(cP;SZ5eONnHO$*_rk{buX=uW`l!CS^u=v);pEB39!hm@yKCf)6Qge@
zx9@o6_qnlR@1iX^{k=VZDvZZRo<6yIxOi;N-tqOh=cNmqdyn5x9NzWG<8Y$a?0D`f
lQ+dVVH=h0&T(zar4b;L&%ly21Neup^I+k^Y_qFzI{5SSj>G%Ku

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
deleted file mode 100644
index b7df0c266a22675e7fe71f85649846df7b7e0b95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17932
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png
deleted file mode 100644
index a1102761206f74a1505726d1e8811d31ddd907b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3767
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
NG}1@uz0|oE`G2%h?7;v4

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index 2b831ffd847420fd0b1abb2dc901292156a17bac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3253
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png
deleted file mode 100644
index d0c7a40613f5db6bb4ef31424459ea600cec6d98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2449
zcmb7GX;>3h7EM^f8U#_P$dZNv1ws}eAqfPAfD%9=B`lFevJfMCgg}r@1EL5hEd^Hu
z8IdJKOq8u<ixy=B6^la%9gs*BiV0h%pb^l9PQU)1-tT+wzWeU^&UxqldgnsO{$PD`
zeE<Le4j}o3s`JI|r3+H;p1|X?001y3A&knU1|P&T(^BB{_%sF!o}I!`_tgmRY!027
z#Nt92EOtUF0lM5X0EHyP6QGgkU}P}Imvt<Gl#|Y)<dDOdIY~@hJk;Au-!mJpCP-m%
z>5%M{<kSp&HUatvFJ67#zD7VHe?YiN1gOupAcPtm0`W~tXF<?#j58DEiiNo2;3zZ>
z>*5B3xFAs&1QLfpxj7?Icq9&wL_z)xsFyy(Gd=z&KGg5PpJM8Y06oU#a_|TQkH>@a
zT;XZyYy=92!y%9^2p1P;HNrXLL@Jk_?VOrnvrX|o4nI}~Gd+RBO-M_HY;)2XX_;IC
z6pGjuLHwzrwuku3pSt*KLabEvSkl%0Apvc806-TQ;O7&TU9&jNF5ktn7+PI^`O4A0
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xxhdpi/icon_quickwizard.png
deleted file mode 100644
index 9f2c9c9350a2a4ebede0734182a0a8a4be008c5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3927
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
LWPz!==o0gP?=But

diff --git a/app/src/main/res/drawable-xxhdpi/icon_xdrip.png b/app/src/main/res/drawable-xxhdpi/icon_xdrip.png
deleted file mode 100644
index c375417b1cfbaef0d2fa3e30dcd62962459bf39d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3803
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
S;ghEoFx128zS430_kRE`Z|(d5

diff --git a/app/src/main/res/drawable-xxhdpi/loop_closed.png b/app/src/main/res/drawable-xxhdpi/loop_closed.png
deleted file mode 100644
index 5418ef1e7e58b1c313e3e99a9155b84b2d4a744b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6933
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
TaBq?AE`YqWic~esB<Q~YqjfpR

diff --git a/app/src/main/res/drawable-xxhdpi/loop_disabled.png b/app/src/main/res/drawable-xxhdpi/loop_disabled.png
deleted file mode 100644
index 580dc5a5f54e844e454ab84a326c73ca919a0bf2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8594
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

diff --git a/app/src/main/res/drawable-xxhdpi/loop_disconnected.png b/app/src/main/res/drawable-xxhdpi/loop_disconnected.png
deleted file mode 100644
index 6e991f8ebf1e373dfcaea1ffb4212e202d504bc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8677
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
V@HX7g7u>!9Ns7sdmWdby{tt~y-30&u

diff --git a/app/src/main/res/drawable-xxhdpi/loop_lgs.png b/app/src/main/res/drawable-xxhdpi/loop_lgs.png
deleted file mode 100644
index 86b4910f33ea140b3f5953374f331a0dcb69f112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8145
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
OW2h_ZDAg*w{q#QrDiZww

diff --git a/app/src/main/res/drawable-xxhdpi/loop_open.png b/app/src/main/res/drawable-xxhdpi/loop_open.png
deleted file mode 100644
index 1d35a9c98786b4cf9e52d94c31687d2513369af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8665
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

diff --git a/app/src/main/res/drawable-xxhdpi/loop_paused.png b/app/src/main/res/drawable-xxhdpi/loop_paused.png
deleted file mode 100644
index 6db561b85862a2797cc8becc4ac616197fb2a1e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7414
zcmbuEWmME*x9BHm>FyX1kZuM+7+?^PMpEgJZV-`{Zji=7x`tAu1!h1xm5^=_X=&*@
z-gn)5&RXZ=`S6eRti9Khdp~>sc8s>BG7$ki0RR9XQdNQLV!p}$9y}b(d+X_1GXTKY
zt_qjedxO|F4fNJi%0MkL!Ia*AUsUB{3lFHbASdq>!cW9142b`mk_-#!{HAOX59WnH
zzwtC{vWu?8$M1;{4t_K~YW`~X>PhP^^Q+f33uJwk>fO=tUJzbR2&fZFMS-w*;!ywg
zJPA4NhmY^wYQA-HJ6cf`)mDS_-Mw&KMEdVir{Gg?s%HsVc7^|s9}B>zH!{pl4v%J|
zxfKlgfYi5c&df=D1j!|1=H2jR^g0`FN*>=TqkV#jL{gNxE|CG?lQynpjl%0jr_(QE
zy|#Oc43fKhvj`t?ap8GEGn1B~UDJT(>gwjg_V$h2^Yizy0-LvujcWw8zDKKZG?|CU
zikQICn$g>h`#ZNC#K?!fhpi?xKc0AVy^D6{%*KJ%DCICozt>$3lq@-2Xc>1w=lF(n
zeL<VbveLkCLS6#n!N~wtox5P)hdLL-)yGZG0mJQBl)2c0OO>_erwc!dQV9%e;-B&I
z^Edcx$0n$Y5JBxHB3U*!rPz6RMeW2SGM<nGTyP70A?n8wVulgYeo@rf)7Hne9xf31
zr45JzK_>xmU0K}79gA2i+^x?5D_e$C;P5$+Bxro*O`jk!izYWh)XrHiGiaV;TjP{M
z>}zCnIL>2Fj=)!HLp!-J9r0vrR%V2>cwIT-TD1#+i_0if?rvN**rI4T+)3F395n?j
z07^mJG7}4Jzs-4gdT9jAmmFH-k`Jv4lfK75{m(ZZ@9YdpfYf+H)d5G^Q=ct{J4+0N
zbNJdJ=})=!8^9_ccj=I|F?#w}ayv&H%lZC-3=z|4mh<n<j1UO2JnQ4ZS<NDN_=Z4b
zGNrd7rL-2`tG#PuvJB}MKdF9UASod*e|){HrTVkIOqC<-$3SmIdGnLp&qRX2=K^4X
zawHQ%y1}6WrAjW84V|vng@kM;#Mb>{xj%0zJZim=aNz*2G!YRq@kCoYug9TXGDB(0
zkzlaV{OL2^N3q~80IIs9J#c^QZWmPw_vHdpgnpAVZ9jjp-Jg-6ED3HY14cb%q`I}9
z4zF}a7exEUfrW}18+>j_o_qvpoaAuqVBd5-_9&Dg;YLzEpGxM?^o8s8d`$#vd;cC1
zl+;LH6Ds=xSebqtTeqnU%Q4jNQ_$2`%!R5S@K$sQ3<BJ7Lv%}#!7tc0tsM)QSMur-
znRq|q@de<1Qq<24nQ7WS1QI`R=#CvOaA(G4#kNA(ON7{tjEp!O-W(-a=QZD+M+ZPW
z&kp|(Ivd#*G&V9-hQ>ctq9cC6#cZ|gh!djZs5Z2KVv>`6J+?C?Nxkenp>cF8!x@GX
zlwQRx_l7(=!YGB%xEg$<(|z>w=SzX9X=$_N&+ESqzb>+iZaXscz0ih{m6VhoR&mWl
zM<+6y<^W{=a$4YSX-0Oo^PyZ<7YaZX_Ri`-wG7!=;rOHykiwlEB2`#W!x#;bl<nCC
z-~^z??IOeqG&_7x0T+9(K7LA%5z5K&Sr2V<%yZ)lftt&aDtYm%T)g{(6s7hWDZE(o
z^%%ujkk}FsGVl}@dA|pTbNYdzG*344A6U;$8J-j4!hc5=LeW`FRuiK{t1T!B^qxWf
zCuSpeW^RYyCe#R;;17#DA4fpR1ZeEuz4oJT9=#@j*tGh39al(jcX7-v`YBxR<$R1x
zps-5?LRw$xGdLQUj6<ekaAW*(9%;C{!|8IrYtBXGI!`U`+n2au(=^YVjbLQT&3P>G
z%=~?7QPHBS|3)Iyz`%T?(#Vsylcq+7k|%x07q0<Ef3orT;=tC1N+6RdE`1+&3)zE?
z>s~hsvVoaBnC157i6Y3Luu@D5I`9oxhC~v(AB5u_=S-C&H*51AryF*-nL8Tz`HkWg
znbow(*mb{jd${a%dCV>dDw%qx9;2-<O-tdS@O@U(>We$|$2VOa$<gKc`Pbj)chMpy
zVwvgD<wzul8SSuTZX<L>Pa2VG%xH9XkS$75bNWVPy><HoHOPsVe;;b<QC%oKQgGWi
z!J3h|75{hNZK5OaXbs5%RJzAq0HJ3GsEUxp*jb60=81l3+(ICS*SgOJ?WYSA6ZKo=
zuoXMx!4Jr0{}~n_gORkd+MRA#b6e39)bDV7`STE2-aooK&cZ;Z6iq?V8}TeZ>doHe
z$zqWvBI^l_(KV0z{KJaCe5A11ibTMv&Vtrv(e%Sm373&9VF=00y9YGX%qpramhaBZ
z6sJg&SRtT~GZn}bfXON=$@;<oT^x>3%k0+tr<0Y=1xiyEzR4)iL5w=;{x;1<$#2aL
zy>WGZZVyN`4h$Sb4a%8Mm;R_v>l1xNwdE^J=6kFCO)Hqb-Q;2>xh}yO4wqdXGX!dm
z`aw-71e9p|@BxF%(ARrQF{X2eh79t`ocHLUtL;UK5OEaHwe#|1;-2qbDmmyWDH)U8
z!3>dlL?Lt@ss(Zvq-Wr|VIb=n+=>jBs3Ru}JnA8-1Nz39q|>&18wPS&^AVt#xOR6X
zGk?z=_^zD-c(?1vC6{F`g+ASCaY#^rXCGj+#3h5TlVCXuKVG}{TIpNR&&>~MRvURd
zPdWc%VOC)r-QVbcaifC<v&2wk7Ig4)Iy2FP5DBu#K((%qZ!~9t#Js8~LyeI(qo(;M
zJ8$K_r|fc$(&TLhFrKm$Lo?EF^0BzI9-DC#s$2$iTTDKcfIyV|=Gga`*-a@0TJqLA
z78crkRHr3y=|Bfx8coK=Sh9f&wMa*2l12*|aOwJBx@}*kAnMX}{~}D4!8j(`(MeJh
zJl+;hM<@SVH$r0Qw!ZOv)uFCkKJXoz_I^IychpTuAeoTj0lSYNS3$x8fO>UfU?z_|
zrF0eN#&cN#{`2<wfh!;uxiM**ytu9l5A>UAXkd76;}14teJaoXJ^0S<RKkM3TXwvm
z%&*r<>W_<<WTt@z0=o9H4hd|(v}cF3dfE<=(0S2AeTdwSRWNRfo*{J^Yg`<B)mld}
zXHOnNwU4^<nWWzNM23sFse;>7R3Y|3o?`?1{^0r~371WML&NI<QTtzBVPrq%T37Bv
z@Y|>M;!ofJ-=dbwB{^HWBn02?7h(<<n}-mP#36;66T5*a(?&&waT!xH!|RP7I8x$g
zy&U<?8r@nKb2VuPse}OA<-J+2ljZH4-@gCUhWc2x7D4JQg~&*RlATq9`2NIdjbA<0
zWGq$D7Ql;blOfGS%C{Vmge%05kl=go`}PX$9)Xz)?fmJO?sd51wYxC(()iV8=5B+i
z&h1_LDLW)OI_Uc4);dg+6~~)(PKBx_xh}H$CHwUhl@+GL&(<vzp^q{*6TMXCqP)rm
zvnWPJ?mrm`qAla`AcYTTJk5Zd@=xU>?V0UA&#D3r`XU}k-Tor@Oh)F{o^+$jVMK7Y
zX@V?-1K;dXwf~8f;)C0?cyHe&6$4#1YGe(kjHt5Sou6-(HM%AoNE_nWK)Y*$(j9OK
zcJ!v0ktnrSm03Yo?H9+^+$z)I(X(W{@fOcm&CQ#4r%?~cbgZn3nT&pNlN-<l8)(`$
z=mALbYXmH77ndY!k};z@*+N~=3Tdi+CLf=~ZvGqbK#M>5j6|)-I4O}fpW!6r@<n-7
z!N!kZbbJf#AO8A=>PzpXHioV(f|R*FU9*p(AfxjXD2n;LqrQ^Nn4;St=i5cg#Y}Ql
z_#?KoAErCI1P{m_Mra2s<R2FA!%%;^vP8DK@cao|W&+fKpJ>apxMY+qJ^!sf5-DN_
zpc7G%`RivCV4TgL7f>gZUaVH!#55j$`*&S3-K#@iCv8n)RE=^p4$S>9wlJ;U<F3BW
zdpkkx^vvNq*-qq8<}_j>0JHHu`=Qh38=E(5B_$70x<4uUCrRbur(1H$cN9VmT6o0{
z?4#>afA~#W>wkZ{K12x{?tanvkVFQD^Ybsy<9DBs8sZ@PbFThAs5{7?ERk5TwJrJy
zx(Gcva#S8%3U{JR>Bv0cpyKXo^JCB4*`3Je(pDSV6NNnvfioN3t^?w&(RyN%T>1lV
zL2SwKz_%-=tPd?{B0talHUO0DvjnWn74CZV&-IH0clc9kA7>*v-id!~`EJ%S;)cpi
zh08m#6ea@AI|3#zLT62M7-g}7#`R=_Nl3zBnF5QKRLO&MCwYy{t|`);Z50DP@YL0Y
zC1oc;DXGWwZ~n+we=g{kN-K;dv8B%Wfbz26nM|Rpi<AGVfbqZS>Di(o12Sp3I_LuT
zgOKU#e%HXo&V13(U#Bk?<F*d*wZS7$qT+Wa=w;Jnez1my2g~5w8dcU2che3TNBTdx
z+9Tm1S7pdW>fS81v$y-QDNg=pC6Y_gFKPCmWS3>N$24%}Un^yTY-#gpgM(F!JMSYJ
znrI!dc0O&pnqdvMy&}~9-9wz>_=+<m0Ptla_yo9sz2XY+0t{pS0fh8@pS$Y5Ps><B
zcvSoT#-|2QTWkyWD&%zN9bHpJfysWK3F+aVvfPth68^zlg5T8{k4B$-b}}3;Oy_ko
zYxZ&SK6<XDM02-iH+t>6pCfetb(!gj??}#%FNW2vEf$-DAM9#Oq<)QxJ3+h*t7xCt
z?av9Pz7<!QLtNaPQ0Rt$YTe)9l)Z?MhcerZrd1ca*6{x3kE9P(aa=Dgt&$A&zV!cw
z-`zvIG$rF^mXz5;OW<(N!4Ila(5b9j$JWr2-A-iNnVBV~R*ZqQHab^VlQ5D%aLOeQ
zM?#$2?(f2_AhGUW9ViD<Tc>$D_jHv>$pUZBZs#}aM2s4co(JK`pnD$;?e={YL&Aq3
zhn%3nG=}$~R<$Of5k1k=)=;32&q?D>AJpU%Iax!K;C1fl5LQWOJ^Ju@*)fX<ast!q
z9D(!J=u8W&^UNwl;YoA8C-Vb+e*Xtn)OcEHg`6<VO+~<ctMGO?OsCR>L#{b&e?Buu
z$woa0Q2=MH-f#CWk_7ra>4=N|;2DXGptTkT#A?w{Mh}^Ht-;dwiZwov_kz7%C<x_e
z&jj$*@bix_R@6#UVg{Qc7cG0BZ&5cnlPjk%YRV%-Rb72@mwr+_)}t#^ezXF4Z{=Fq
zm&#3H<`+M$kn<vNyX0>+%$2(!9oa8~x(cb9OCBW_1{p_33z+73!F}V6C09In+*$7a
zL<!4rK^)x#ZxdAPC=jY_y`GOh`U|`&4XR3bibeKg_KV+c$jdM@gV<UJP{-ZdrKGd7
z$k+k}R#R!sUTQIqkNMMl@t?79C|3o8J#N|!v;uD@w?ZZl#PkKPG7@V$26<C`B9mZ!
zNzxy&Mcy4$8C}^G6?U20+t@`Bgx1#vPjFs))4^-m$DjbU8Q$8NhEQfz`03@=fs!Zk
z!D^9a-_d%aoo&0Nam>KOn>H4(s=VN8L@Oe+EH5#qlE$c<mIrHm?uk2VfqD)BPkwHx
zQQ&1oSz!Z-;Jb~!i_-}muTbeQ3Epm_MCHKS!Vn5GY%nib3bIC)yNmLj)z<|W;$-As
z=nL<q{SH@*f^py;{#pHP4tTzLA~oM_e9=G@N0Zd@Tvqg5`L~(HFI+wl_lr$ZY6+fX
zfRgc1+3qPnhf#F&+#EqtH1xv?9!Exe#91n*R39l_lMSN+7A6X6s1Mj;LXU(DXiteZ
z`1u9(m7vUD<Z)_vCIVx3BFuT4(}k1qYA-sH5@_Q-TCn}w3O{o!l?a9Wwa7_5528lZ
zeAoHrfi2!A_zR(K9mXc&t_uk<$ID;$pF8f%aOXG6_e;D1H8jx#*>oG7VkN++3Mk6E
zIkY9Q#wGN=d{Nc_{lwh-ADd#hbISc+>g+z()txlT|NBlgpHzqvueibQ+_@_!BSRd;
z-ZHr3P-eC}(H&!rfa#?6hq#e*a}#2N9PSPD(^Hj>#kw0_M`(ajRP$jrOB9d$G-z^3
zED4@thsMhNR$6{b1je_a|KXkcCLgw8l}}a;TK~Rert8t(5dmt6H`k_n97;VozkjaM
zPO8wO4bjg3-4-ucB^d%cWSD9?z)V~>%{EGL7MFZ$`Ov`xwUng-C;FBOQ+O@?nu81M
z)q(HAE=(qCt_o95e5Zstm_2brzA<0^$bS`qx^qd+ok%m{7Y}GQi@XXaXDa|4**p2a
zK~+6Qj810d^|Kx(BPxO~)#@^yVOHi(^2KQDgU~9{+=`}^%3AV|DQA&m*^U;_zSr#1
z((3q>@^J41lb@on7u>6i1j(VbsE#w$!1hRm=b8Q&y(1#vK^($RjI(!fsWhXy_#Q>h
zCQKFlS8-70pUgbb*_$<ykgshbnmvRL`&=Lg5nhZL<MZ9fgfn7`$aR`7m3@rW;u7I}
z+Wvt!j)q#5Dpu>+SS_92vKH33O(P~_qISon5Ft7Uqqa5<@VpD~I8uXtd4HL77R`_}
zV*TV+iS@mRv=7fc8=9&9mc3Vqcz=H=h-;U~>Dc4MVinDnoDi*|kGgMdHi9-M8OK`^
zblhD9Dbk2f@0~`mlx8V^xK4rPRDBE>X981-MZ7P9#amL#-U!*IRLKUkJd)-z?7zq!
zpt{lkE0Lyb4rkY;qyK7)WDbx>E&pF99^GXF^9@x$th@T8en{@THF7G@`3-Va-<2<H
z6lmnw@QH5hEu550T#S!!+dGm`Ote$)(2^aZW@~Fe?EZoL*)I{{*Q)mRM)tqy+IKsj
z!B0DJ=`LXz*=seycyO~r_ODVjB802pS1{`Pm9Y2#W8XZ}dyZ6R0kKr)$VUUONIsFL
zZ0<LCy$@OVMJnM1ypKHS8r!(j%2PL|xA_Pc9dXN=xOpAX_Wkb>&BjyL@5V#jSv@Bi
z8Hf96J{JS0Q`<_z@O4Wqv6`s#Xuf|T5LLf3{@E)I;a7C!$U#H_%Y-a&xRUs40~sdp
zDJJO2X=$>){V}z5<6hD6F@lW4@TdGauRWYJJG1(f408x*1Y{Zj?jF`QPl&h1f)9m_
zgYz`a;WlO$l%rQ)(a+#NFP4UqfTelVA_T^xjNIkdQ?(-dSD*JtvS>ylSTGS0+PW5R
zwpl^rqSBrDLG49~`QX*H{>00Hwqp@QG%Li>^)9L>UP@7dV#WNEdP~5b(E*&ma=u$7
zEAt={7o%?;)Dpzwu2z|>+Fubw)mw<3DGknWA;goOc=oGd`RO+d9WZTY!_PXe@O}}M
zV{h`7sMO^0?|R!y`w)8;A_EA-;zYJ0f>34XP?yS<FQjefAI`9q{uT=VFSNlHmb}jl
zAl8o``4w1~3shu=R7CLb+I<aK@X}qRPtHMw!N0*Nw#AYPHY}~wJ;(G7MqmE`Ovut>
z7Ra#1`I60A6QCL9n(6U~KE~1MmV-W4LI;aX$Hj%~n3hAatSgJ+pHzXf6D%m48d7(#
zZ0-)$)_aI$F^SEl_z`Z&krWnl6^lGS6l@ONaQ=a+ofoZw!!fy48PLJ37g4aZ{(Zzd
z<J!Sx|J#I(zXUzH3lDHdTRt}zRR(OyqldZx-Q9(89G2$h5^{!d7AB{t#;tGamG#+)
z5QAdmv%qFSNl7=;@rDt3oZ!3<ADRS!3nD{E%MIX)uAVq~>~VdW(+4meW@P(IPl74`
zpp`v&M33vlN|D3>0RV%U>>GEpDrZUVX=OR|@>m$|Ru725jGD`*=PMmI*VI-V&Zpn)
zi(j{r3gt_yt1&wka1`c@u8v@)eZ)u%%{Izd@~G<w@`|Z(VIWe67^{{6cQBbXz!yPz
zxFTkCShcI%8@d;%C2O34bPCq)d<x$<xecIN*+58Bg+*Xln#{9-n*M*D&w{703rAS@
z9pvJrq1ed%=PmO;@7*`kdhx*c+#Kf&_&zXEJ~#ADPDFFPCh+gy6g4seFvfdv(FlvA
zehBO!k|tpu*7$MOsX)1K7T>ARIOQ-1eIq2<gCP_YSqsBPVo+cD>hy-BK`xtHI0{Zr
zPxRl&iI=AdR0RuNK_K0Q&ssLH^%7NC2$8N;3wDN6vUTyqKd=N?q-<3{%7>=SbW(D+
zPO6u&H^hLN4!hxdl=}tUm*Mf5j8N}#*zQpNXaBeF{sVxR`)kiH2~A7QN;-gLJmf^(
zp#C-VvF{kd&%LBCm2O&N*_i{ky*}+9Ku11o-mAcn^-6W0qT6$%!}$6@ytLP^&UB1|
z5{nhvmCZ(DuYQg)RozH!4U#8jdMJn+{mgrcIuLpwe+cK$_kkf8SV$}kijWzopdCH4
z%Z|VbW0AB8(liWMnnB5l?@m^<dFt~AGi6P2YsSAGhgw1s!B+_exkGmS$;x31Lc5~m
z4oaH~k1mp|0L8$5Z0-Lghikn8XukpVZx$ZVa>ts+E#haE?q|rfnqJ8}iJ6nEdQ#(*
zr!(?c6D#R3lJ;4xvDWAgg50@6W~*VAPd=^4Xpety;e!g^Nqp6p`GCzz74l%s=zT^b
z=f=x4#VHxZ3>o^z5xgoNxYZ-i#0R<oQC(RWTwZ`gM$23A{mN1Le~f<c#2r~xnWR#b
z4lQX9G>ZI6s>7v`W?s$xL+Ixw8Tn_>quT|oGKh`DR_bc8U#miCIR>w$bqx4%KqUi|
zUzbyjwmjdIAxDSZ-~D{K{8`PISSn0PyI<w05rzuLkQQBrUkwV-t1BIN^@Mz8ks<l(
zc0|{>@na=P%fab-z!AO3LHNzRSr*53)oPIb0eW%r=XvUsu4`b%n4J(huVC+FY+4KZ
zpb~3Oduqk&o+zb|fNlo3V0d}Cm8)5iwXuzZ@n+Lzyi66`FN3g({d(vQEXxuwP_g@K
znIDzyP?DK{wRf@EQ_i=M!J2aaVc>hwnfMopt|*$N)d?>kH&O=ETq`}B)huyS@Ugbt
z;Bj5a=8qBBfdg7tFQ%A15ez%n{s-E9e?0z`Mul}_zEGfu?Gf)1K-RqP+2=S?!OF)*
z7HE)_g=8dk&6pPuZ9M8xj3QWTO%07%`ThvoU8!e(JKp6DewL@Px=Rph!U96RzEBaX
z&L9xohVdv!OtHZ9VyU#iS?IB?NA-U%H-sY-Bk*#WKD~&EIWZ;{h+l^TL{Z0Yrw=O1
zvud~!rA#B}auwhgdjmd`Q|T^P83v$iz?zSZr@hS%iGK{Z%lxN&&YNgif$FMC-uY%b
zts2D(Gw?$!-<f=h6o648qiWvlc->nrZ9V?B&7+kC{8bL3%9H0_qmJP^R7!D5&p^pU
z`Q@!8wr8X4%Hwv0USh?nh@f8mX^wwZQ(iTU_%UO2F7s!x2t6#3qVFRU&Wm0es1*1n
zB<6{&TXVb?hxJmpF2Ngc>4HXHjOOwNlp=Y&o=O6pOA|zsSy7Js!}S!6Zh6VN&qX~{
z6%|(nL&OgO5q6<p10bLH!077VD$|uEI0rQxh3r0unBr6m;FlSQU<}~2<Y3Qzqogs?
z{cyfXOQoeX6B0muo25Gn2Q*V>M@QFvF)hjqln}5!TxvG98~asNSrIcEbhI{TYIeBx
z&BdjMYJdOXVN+A4p7*1}rUoj*H|=pG=55WMh8h~f=U?o+e(q!Ha8A2F>yPm9@g;pG
z(n^^$#tC2bQ&7+sbYakH*J)3+B<B@A;Ixbv;@v}TadiJQIH%}vx%+?C1pm`QyYn}g
Zsib7&snTmrOg$5zs-y|8QLuRTe*j<hGK~NL

diff --git a/app/src/main/res/drawable-xxhdpi/loop_superbolus.png b/app/src/main/res/drawable-xxhdpi/loop_superbolus.png
deleted file mode 100644
index c5187cf95debc2ef5f7887669586cc29365eaf95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13108
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png
deleted file mode 100644
index f5b57a9bc93eae27923885e93a0aef500f8dd92f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6123
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png
deleted file mode 100644
index 89b44ea2010fa9d07cad61205a6b8b2b06481821..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4813
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
E2jmr|WB>pF

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png
deleted file mode 100644
index 7be2e32dfe1fc0880cb2ea00ccd6658d75d0412c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1089
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fzdlNB%&n3*T*V3KUXg?B|j-u
zuOhbqD9^xPV_#8_n4FzjqL7rDo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6
z<f`ms%M>MhJ1(0FE1&_nsU?XD6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?k|W4Mg$UmO
z1?T*tR0UH#Gu>oEV+#dyOFctVOA8|t9R(u;Lo<B?OMOEVT?0ca14}CdLj@>Mvg1;)
zDN0GR3UYCSS_b6VDrJ<E6j<r&mzS68l^g5j7p3bPT3TA_8yM*u8R-I5=oVMzl_XZ^
z<`pZ0jDVQol3JWxlvz-cnV+WsGBYtLzqG_wNl71Mi9Xa8p!f9Q{sVI0A(Wa243;9G
z{}nvfSurp$ZS-_;45^s&_Qw9cGl3GvKDNK{GWll`wbW^G0cVz;!;S{s3=fel(YcC&
znJQX^@?NbjiXF3N1w|ZvRrdK!+V^r9>)$_Bg3rw^PdjH`oF)X051hoef~+GK%A;>9
zADdT_KFP+jDD#_=`xoPrn^okeOI5r*I3anCN~E;e%%!pZpDMlyasQn9<lh@rzDHl)
zuv%;g{k7&=x_&{x>MzUIubS?;Po>hfdLrxHbLX<FW<PoKBvvbY&HwvrRi3BoZ`@E^
zFYj4odUAH>?vQ<s3j{bsm>Lh|Pk8)3b5j21=^ApXI}NHk4-1|6_+9Db@0;Et(w4^>
zcO*F~3TUt}wK_o5J1GQkuy8dxj99_0t&YX(Rd$*e{PQd-`^MC4>r?c6!uh{*QnC-m
zmPwX2yjQy^VKVz_(dUly_4A$_7wUeKdPVf~)!zEl7m>vi7J>sE7>GSwDb*KZ%6{8c
zH`eypaXUZn|26x2=%mx0*VxadAHS|LKTUsQ|5+7twzK~xJo&xgCeFkIl9*Fb&*0Lb
U7<6&ftqc&~)78&qol`;+0HCp6(EtDd

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_bolus.png b/app/src/main/res/drawable-xxxhdpi/icon_bolus.png
deleted file mode 100644
index b4c4fb8559316d8dda769c657d724cb89e0cbfae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5092
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
Xedy$Rtk(D6hjZp8HpUb~-_-vA7JEYK

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_calculator.png b/app/src/main/res/drawable-xxxhdpi/icon_calculator.png
deleted file mode 100644
index 90c8fab919265357d02d25b483a1b4a619ff78c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2958
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_calibration.png b/app/src/main/res/drawable-xxxhdpi/icon_calibration.png
deleted file mode 100644
index 82eb93205e76b22b8e70f228acfcd6e31b0eb7d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4090
zcmbVPcT^MGw+@6BdKIK-2!tY+DkTX7L{K3SP&%SW?*XKRCWfve7^)~uL;<BGAU$A2
zq=*zjAP`DW_#pvIkPCP(2ru4u*YE%L_F6M@_I%%b`|N$r%-VDBiuEM{UTIzc03cv#
zVQ$O14*ouPxLD_U=Y}!>fDIjB?;PoDbs6CmiqY`!4)yfWh{1%hZ~(x_Bqq$mE667j
z?CIkd5Q2m-y52y*0p3W6lb)59RhXHNe}F|?xQ|_&wY^tdkQdw=Vq(l|6oX(1V0<Dy
zz%iKMkO)K!67r8Of;IkqTN48QhY}ftgqZ#g2zIu*0yYZ`_W|o^=&O5apM`-9;2PR`
zaF~wnA7C9VZGBBGxTdzQx|TLV3y#pz2LEdiV_vXPxVJCD*8JkX!B`#=;vX3qhS1c+
zVzC<7vl^k{ewx~FI9yXpM^i^foyAa(hz*JKh*1xTQ1~tJzZ&K~5nkZ|VUYo$A>iMd
z9-g65kw^$c^LG%<f1|L{)BJCKEa$%!@(E#;C7hK%*s=iu00;(Jnw#3klx!_v@oo+$
z2euhX#ljHz&sW$jN-M;muOFKS;vu$r_9E*S_#K3$%vCGQ5#~?6p7ZXl5eeo$GjdgY
z*!<iRVTC8>z>yZ`&mL`WS{Fv`FGMWuFYc5?EG_x@`sFTk?Hk4J7&E%p<|E30kpHjg
z&4^Uy#Cj?9`z!UqXaVj$Sg@YHczh{C^PsQxV~N|IDz~mmTxMcF`y00Joau%Gwth~4
zeKs)?P}QtUanORMu{nuB)AS)XkkpTfWT&LJ<VbhSj6Z5z0~D@CuzvW)hQk_r|3$-e
zzuQ{KaPx|ps_PaWtjvC}zx^wd81ECXaAos8@p>a8lrzCF5w`j=J~@H6Xku&(kz|-8
z@iooPRTAL3ztcRKRI1Q#`wF2v*hHzGvlYm80k%V}VJ$7lu!||>LhK>RlS0o}sJ(j%
z?&}^~b}g*1^P1pK<7w4UZ@tZ91;Z#S{5xC<udE3trRJG4J@^cBi0maqKDyatJHX+>
z-QGZB@DKd0kQFkp@>Q_!A~3VPkeP})zaZ+Zr6sU&N4$kozX=MIN$Z}?l(zI8drB_^
zuK}nn%!6wD_Fc5O0YFXfuP#HjfqW_S3wl173Rr82$rh}e>^Q%%{CPU*&tKPH-bE8d
z`c|f(rWf7Y97~}kLAqgHptYBk5=lWQ*qDV*Y}Q6D_z`fUAf`vtmIRy=)Zlc~SifHW
zuHm9(ty%Krr%&SNWC+{w+Fx;v`3a+p@p&9dw?lc5XVWr9q7tG8SgNOy;L^#+9hHM9
zH-X}++`4(Om2mfZ-my25?@z&|rxe}u?vLIUCAeHz3vn3*HSyg_=WDF`OMV35ECFll
z-NCZY<b7+-xi03-(Ygoj&+ODGRNSJUf5lLKp!`WKssR*!a%%C~ZnTy@eImqIKvv{s
zJsRhcGsj!#l^mQgmPe7XOz3;T{z#00Y&xNzC$HK8wNT!>xO+EVU=x0>s|aVscW-@z
zV!PnIQV7l?Sf;sUzpZ-x`3ASKn877>Kg4TlV~MD@IxS&MipxVm1E?<iVWG$Qv7(T2
z-gu3NH7H!2@Bl09Jo_}*w^DyycAz!G3(IRc2sJfc+AX-BsS;{!8)%%F<ra&`G3PQ5
zx4?Vow!x}V!@#`ml$t@8MK<@Kg@^ls>_05<XYU?-RQN1HZe29Z4|a9uW`H{{vls3O
zLUuV$W(oXyQ3I3-Z?MZi-m}@#sLdru{`@TFt-}N{z|vAc*)2J9OGikOfw!h|3^zVJ
zIharOi<~)*&*Hh+>@zdV#_aFTCEWbBR(L@gO0;x&c36cL%mAap+OdFNVOeTZ9JA#l
z1UYZ8ZqZIt#;Yw;6(Ky3=yo48VVNlLHY4ZeM<f(JMPfa5)-9{L2%G_wiR1p1nnJYs
zBD=LEM+WR|2f|u7PNp9x)cOkapO9SjRTp*pG3R5`m~My0i{bRTQ~ci=|FrrMG@ZT3
z#^Eefo$+23I;gW^BK?^yVbbt!@-@{d=}Ey;SylPqft+#OwG*4BZcaJ%Bp}bqk0({R
zV6!B<?i3YE?)n*??10-00DA}j{PSG!%_=ts{{3F;s#i_HklzU$nz$j(dPB1I+cyHP
z79{1@q%iN~RX?A;BlL7%u=DD3JeXTJ@$qpi3krq=SWhxkSMNRT7TEXKP2&KSjv90S
zyv>5@^8P$<I33G<1&6L%1nHcj4jc7}e^~eePFJ|qsmJqY85Y1v+Wb_5O)e3SnNOf8
z^|nS?59vJbZr*s)4ODT@zEoKTYC;fh(uj6R*rXP<%qoO3{`>1+oMiN(DM#FB<<&6`
zcnLv$@<h{ff3xh#EBcCwX}ypmy4<;^Cb7Eo0<c^v!!eRO`WSwnBU6SO73=cdj8(X}
zzRIhO94Bok<KI1LuNq7qHfWT5*s|&rTKUfUp5-I?jMhI9oRU);^zIZvH81lzNEGYw
zQ>An-i~)q=xV3RzB<Vd1d<Es*TVaF!pAoOh$rXaTf=`q3+q{ne)QpL=OUaw*7(5(5
zgFC(dGk(-bm_YqtzgGN<qi9vm+@y-__($Npg6a8Cy($j{=Y??1as9im>3sWtvIU&@
z<_bs{K8vG(bfhRqCMBTz=*V}77(<yc#Bn9wjiT6v8#8Uj0G`T&(Wwh=BV4DpcDvJV
z%RVZWBU*XdM)5OGv$nhuIalPe0Z~jba{CwZ@Ob>|26W(yhYFz?D=a{IP+xnKCOfc0
z3H~Nj`t@!ZxQpY|%*^Y(S!n-qfD;42#gq*08wsjn$Zn?mDN(&=qU4**uUr?m1fjLv
zPB@ODe-gT-mh4F8-*lNe$f1^IW$huwIu;V&U&dp2isN^Ae(f8SscXs_$gr!$af`Sk
zqFXZc9&gW(r(xI+@tKdo6)n-HLzvBra{IDTfZ}*=k#F*KPX>QUv~IIGo(V7z?Wm`#
z`X;9qt_JI>j`&>k<J8|4e2Rlp$h{Th`P{MFr(0F&oQj>D+ALB7S3=#}vA^lXD=Guh
zJ(IYoq)Oa?D{L&DvPFdjzZ-WPb?Cqwo4TC$W%O{8D73X^T=h_Mdz1}aiHA~rFx}9Y
zMUY><MR9O1NKEvTXNpJ1AA*_a&0{zpQPdmeK~>7AlkUnm6!VT^08mW(8K*W0f}+bw
z^z$@IL_zFxlhU4>L{Y`pM-zuQFJFLPt1z0Ee#Nt;ZKkuQO!^zSq>rAGI@)*JkXB@Z
zABV-}g_n0O>3c#g{F9o-b#y~EfT-Mqk1MSrYNqFxgcaBycBK(&vn<fR8CDD9${#}k
zGX^JFnp!?p>U}8uxXl5?@V&Ks<#Mmvc`gM-HdgRR<1u<_<D(*>>(kd^-~SWK4fgO{
z^h`?#jCL0)J#Y1PT5v^aYIkV@{qdzzMd%8o7^MLr^@O61mgR7%_a1}K0v}TAX|as=
z#1Pv&=@Emx)V|C3acP2=YR|~qAw`%&XHw@!R6}<W=!bif*Bg80{EkJ}5yqxD?98g>
zd)Bi1fo?h_>N?V%-t9`F@*ZVp9FTzcFk+_uyjaY9psv%a9s3DY*U9p7*3_0+J9mpS
z8!01Y%RCJA95%4qm1e3jz>3#5IsQ7!+$Vd@aA#wlWvx>XYvK!*hbZ|8_J?yMCrQ{I
zRlGQnohcaby}M1S{VhD*zAYJDcqw__^s7$`Qaxj#Q2hq&Fa_k=Ek*5yVb~{EAvDy$
zUh_&0n2&hoL`6T)1e#zqWZqjnGGM>5biMTk(Rg7-#W;0wniO5sS-|Y!ah`qrMmx-*
zcSI$cPjZ-__Rt#Bn0_OzE3`30v9Zalfh4+Owz-bYd4IU!AtZAr$zk$a#{+B>jlb@X
zD}fu`l7PIDxl^eN6WR3b?q#yjAlB@2jZs@tPx+V9X~Ez-IVYX#7dt3_EW;_E_r=>z
zz_?@HzTBGp7SBf?AsXM~C!aM1j6VA-uB()?W%eN|gu&f#D=?lv%p;}TrZ@1KC2$e+
zL$I}?dOuOzp@>hG|8S;a>jlBJ_Tpp|7u%9T0<%&*R+-0neW-G%z1{ir3BbW}TR1bJ
z7x87I(zQO_)<T$I{ndb!qB4|0HvO4(4P!;@jZ+3voy5_5wwA)UA&Tf+$?a5(kr+a?
zIoOPlYjJ@d66N0fG-AoOOH>ugL%Fggv1qCrAj0HKa55-MM)I8rydjPKMs*AXHA$g!
zn}=#`bWX=#L%!2aZz1+vYPMD^&$|80Qr)!Es^2(kX<JZ{eA!*?a9^WCG@gf2XH7%s
zR&0COS_$J$dxVng4V+#0uV-S^4X6g<(fz)XuLF&q)b47lD)Uf$;jV0wdE~NLq)|q<
zs*Mtf7VW?VbYeACnf_ZSd$pG=jto=QoiF%9d$mE*4k3P*yToffT8a>GZ%ro4>Z%B<
zI|#Ay+#$3oA2m%mC7}tRJjsb;{VAgQ1wHfwn|IL<0^{LOi?$4+NTn6g+Q(s+VBFgv
zdWk*AQ%L7#eNDZu9C};gk^IGHwLHQBeV&U&_Z-R+c?iJhs96xY#MhuEmW?WNC?A|N
zJq+!0DyVS2=|6IR^q5OOvgD(q0ITml)jd+wHSf3z+$^j;Xbo}+R@&&NsDJVg27M2w
zI4oo8ZtmzfLi{!KrI@hw8}icdRC+FOa~E++COp(Nsy+F2t#VDG56x)v#Ay6;L1stt
z3WZxF-c7`7cJoaBP6E^wg*TFuB-U3#S_@>M7Kw#yds&o4YcfKFioP$ZXwqd@XYE|e
z<?$kaE|=vV7{2bvFe|palDzUlj51lVfU#`$yu6wZj-6#MFSuhy7<!Dk1j>B`F$6rq
zJn*81{6@&cEde=dbS1}7<{CeB_1~c%a-p?uwU%RO*cCI^Dg(7}`;TEOa)yX8K;cP7
zYm_~)Y)seH<ds!yHpYZb`G-;V&aeEP<aVvzCJK~WPL-V_0n0J6^QxvlBE+U7UVR%r
z$alr6siE+PB!LncV)t;sq{ttvxzc^Vh<}QIpx^j+1IN&$C+*xTxxL$*RA|uEG>oDR
zD7Vod31n{vJCLY@E$v8@7_t;dBmF3%vEvtbIXU`Gsmm95^9zolB|dUA#llWaf+-2K
zBTl7^gpAxUMB(F{ahNx)P%XJy@JYHtuwNa~8TuZJeyHIUrGh+zHcF3Lbb8O*vy}=R
z@vjp#a@HB?Mb#T~%nOjjkrS6yOzG>;&FFx@hYa=10%5CX4{GlIUv2OhpfvOSc}8IC
R#_wNt%L~@#4d>mH{|7SjaH0SJ

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png
deleted file mode 100644
index cd66d14c4f5e51ba766effb658401f4cb5294cc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2861
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
V)vK$i=0CbzM_V_WMyr6-{{j_+=o$b3

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png
deleted file mode 100644
index a57ceb3b8a91bf6855b5e34f8e10d9216209ae48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2234
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
Yt-AkHka?Si`^J}p?Cj}O;}DqqFY1lH>Hq)$

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
deleted file mode 100644
index a6750042e8f217352795bba3d0800ad7c6f81167..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15488
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png
deleted file mode 100644
index d36b0b711c904785a158299520194c25277288ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1038
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fzdlNB%&n3*T*V3KUXg?B|j-u
zuOhbqD9^xPV_#8_n4FzjqL7rDo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6
z<f`ms%M>MhJ1(0FE1&_nsU?XD6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?k|W4Mg$UmO
z1?T*tR0UH#Gu>oEV+#dyOFctVOA8|t9R(u;Lo<B?OMOEVT?0ca14}CdLj@>Mvg1;)
zDN0GR3UYCSS_b6VDrJ<E6j<r&mzS68l^g5j7p3bPT3TA_8yM*u8R-I5=oVMzl_XZ^
z<`pZ0jDVQol3JWxlvz-cnV+WsGBYtLzqG_wNl71Mi9Xa8p!f9Q{sVI0A(Wa243;9G
z{}nvfSurp$)p@!&hE&XXdt+mtPoc!Ihu5PvDh0lH(J@V+H)?6AxL(8V8%~a|wLG>>
z+`-c6vh<=>N0#c1&<ykU?~0C@3!e`@Kj;7KGe1?+{g}W}K?JeE?VOM7pR(@-uU_~T
zYM<QsQt<eXSx*k%k9qLz@y6&6F58x~7cBYh8Ry?`(b%jKKB;Dw+$OE)%gh#+T3<4%
zZ<(5sUUfu^GiC1`?@ziXPrp=L{=x8M-6ZSF&S8!Uub);;`g~dW-vPf#t1l}91p+u&
zxbioe9p9|-zRldm<5NM!VSCjHXE#oNa`i*o>7VDBK6bFSIxG<25MgR`0;_IxP!!N$
zVHyU4x0}=RRd-tMNxT~~TkeB+p32VZuJiJ0mGht6&U&Vk{OMWElqWwQ{M32<QobhL
z{N&`N?K+vC1YcizaC1$2_hsh3$M(=r@nQRv{Nau7m)a_aN%Ohm-zPkLt(*5r_gc3~
z{G>UucQ$B#o4jYH+{F9)Z$8)gJX==nX7mGK(jp8tOo<nnrr5jaWm^YGv8St_%Q~lo
FCICdvRo(yq

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
deleted file mode 100644
index 1aaf00fd6100c2611d210e714337cd6973a4fb6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15631
zcmeI3Yiv_h9Ki49B6ENaMVa`4Yl#A3?Y*~;b-i{SbA@e*#kma`5+1j=r`=_3Z|%LK
zT|s4{L4x?f#E6gh#YK}L2<Q@$DJ+V{h#8VFvfzV64ah@z89)QfbNjqIZ4a36!4Id&
z?d|`0&iS4H|MY&jn_Cw*O|6(&K~dDymS%Swynmxz<#)pG9i2PhgSWdP&C3*untY#j
zl~8ZLTSZZPsnpS_c6y%RMLA>=e6kmq;-LuirYL89JR*qQK&8DPAcgA;=Z5whXvtS+
zSZedIo=79;lA04y(4JV_Att&-htE*&s&K}6m>>jHfsTiQVTF&^8IpN<_*+vm20H1Y
zcGnpiv;pZ(Pb=LhM*(d!*^DB~S!uh&#MwA&EmuvOS<b?+7KXDJIWx~Xc+N(rKL%F?
z{N;@L{Ct~xQF=Hi)fu`}HNrDYEEY4xEG9V`U^s`v!LVk=Y&Jp<qtY8zg}5=S%uXfA
z<Z%N<j7kwzlEbu?SMbU`YMsHL4V3+)*A<Fn2MQ}`c90?y7a|O2VwplgJ~0~;>4^rD
zQ}c-o2!ap@s|t+c3dTjcWK~wW<RU|6%|!=>d*bnA$1XVEP^jS0in?$uM36>WFjDF0
zjR2+%C~{9!1Pj-~rOYn0dR6l0HfKU6%~EvkATAXN(=4g5WGSR}$O+fVH%5V=0yn%|
zX4cFaS&Naa?ci)YXXVZ8e3s)`*2y5Axm`}?@W?*N->b`EOXjHI*;=0E=CiOI(>ZjW
zXbxEMK0y_3DU040$&*}<9PN<hpexlit(lUb8yo4lOQo<+jw$nWYf5|T68S{lFGoXy
z>XJf205Fkoz{%v4I?rrD@r`m&j>7c;m&M5xQtP6UMaH*;6;%j}pvCQi3X>%HctJFK
zZNO|X`n|OlW3AolGuB#cHlsrX4%Tb)iuPJ-a^@b7K0GhATNZn?MoFjk!PE|i*$%86
zFq#F<Y_vP94x^(+WQ}&O$cYZW6<GYfOln<tUg{^K5<KLDpw35|{eK;zK$^Uvnk7Y*
zqrJM4g@v0u#@fNN6SWybP)Z(05h1Dot=Z}fnQqITU)keHi%B*u#I7A=E=5=iAcG0I
z+@!K`=^!b8`)-YKD!(qg_!zM+5Ki}H!JbN`N_rJfqR4(VCPYC)09M3Jnj)2OVnp%G
zVwVsO0H2G=K+7o55GSMkNd%?;<EGtO&yh__*MDj&CpKW_+{kZOr}l@%!)Ax2CnTGU
zb253lT)CwDJGG___9Xr7W)^-JPWw)W>dk2AGJL4sjE3eSmxLwNWloQVsC7}=ziR5-
zZ-)<nz*S?jS!_-QRihEDQXB+3-4Z;Y746u83rq*0mV%MXibm=z>B!V(=^oaS4Vcox
zM?v@$%48oy^LjIT;N8w2xh37stVk|02m%Bz5?pvbh?U?%fZ#=f3(p6!5?lxnyhw22
z`5;z;3ju-`2`)Sz#7b}>K=2~Lh3A7<2`&T(UL?5id=M+ag#f{e1Q(tUVkNi`Ab64B
z!t+6_1Q!AXFA`jMK8TgzLV(~!f(y?Fu@YPe5WGlm;rSp|f(rqH7YQyrAH+&<AwcjV
z!G-68SP3o!2wo((@O%&}!G!?9iv$;*4`L;_5FmJw;KK7ktOOSV1TPX?cs_`g;6i}l
zMS=^@2eA@d2oStTaN+qNR)Pxwf)}y4DsnG&f-roWGX`JV9DJ!%d*zcBo7+4Tm3V}r
zHf*G*zsKSI6h-y06m@zvd|PxIMa__3U-i`@iYndI;%?}OA3Hm?d(HHxsx};EW^#tk
zG3mqpCDR`2p1=I~7c19KetG(_6Y~uH(=Jvt?Ao(?u=S&RTP^#Bf7!$R`Q6@=M}|JB
zkDZ%zW#lM3rDV&BJ!N!dWqEm7S!roW--ZPXXu49nZl+3kPVmZ8QGLVaAH?hDFLZC&
zf8hG*Zw~~nt$gmEcP2UG4_7{Yr9V->(Q#;C`RI(M>Z7NQy?Xi3Ymb$mxwx0#akt-k
z>E!AD#N5gogF~aE4~~4^{?h~H!K%LDS@A8lS@OU=vk#sBH1TNV2fy!1*e_18+l`e?
z)f48TEg)|Z1yr|hsRdS_Q~3kyeycsV)%oR-AK$ugc4+kd`(5=Nv$nVQRbT!rv3>LS
z*FQV<T^dN7dS!5I>bf<*u82)4c~gZ8@@;+onHz6h+crF9zv*gkpncU}+;Q(8OOFp6
zynLf=&gkK?6JsCmTlxJ9H65GUS6$s9R0ZoJlQP?w0ixU4qN)k|pYqC6Y3h+Pc37|D
b<9AR^>*usC2#p-n>bGU#V)xF+SHJi#zE|-u

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
deleted file mode 100644
index 67c74252c2a239a57737733b29f1ac178139a86c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15636
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png
deleted file mode 100644
index 4dab75558b6fa73985283e4e9c4ff6a00a498373..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5055
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
UtM9tmKmTrK#+F7k2JZ3y1L8YUk^lez

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index 95df9af00c45d059905a36bf52bc5655c992ad02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4514
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
AH2?qr

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png
deleted file mode 100644
index ccc3d0e39cabeb86d49ce3d12b473a74e0505602..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3170
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png
deleted file mode 100644
index 314b8a98dedc196a8e7074a92abe9bfc5df958a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5427
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
HOY;8#Ldoj4

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_xdrip.png b/app/src/main/res/drawable-xxxhdpi/icon_xdrip.png
deleted file mode 100644
index 2b4b8323b82a20f21da0be69df08ff61cccc91ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5279
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
Jpky8P{{YG5cUS-b

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_closed.png b/app/src/main/res/drawable-xxxhdpi/loop_closed.png
deleted file mode 100644
index bd78239462b34b9735a7394669f2588ee80829d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9246
zcma)?byQnjxaNZs+(U6F#frNIcXxLv6t_ZgcZVXyUA_VhR;&dQ3ba5;umUZG00mN@
zxa;J*_s+dD|IC`Ta&ofv-s|Mpe)seI-Z#}iPo0>6jsO4v5Nm3v7@_yW|8DrW=x?JH
zFFXK%1)!;-X!5%3Z+W=I{9@nXkf25mdyTl1rp^x&Pky<+u2jvZf~U9lxGH@kf<$a7
z95QL-&L3u$`cIcC+6VrC2RL8mSDbcfR{rvK`Wb0dQtm<@Uo(}+WGHHvf{&Y7q=Lh`
zfkPhK_i-ot{Pr7;qT-GO$f9z`G8;_L`Mu?Q@GxxA>M#s6yzVE-K$1N2|K0&&xCm4X
z1xssLHHC8OXaPb1Q9zBlh3Ls)2VCf_Xa#)74~E&fY;GW?*s^ThxXkdaAg&gy^Q8ug
zEf9vN{8}7E*q~n#lPP7~4sNFPeO6fIx~g;r`jkGG<Pk*s55i|D;@hlalakxIS=sYD
zQk$~J>?_f~mUkD;I9IQ;NM8IQvHXKO@>9HxtSn|2TQk18<#vzza#O>fpTun_wQcs?
z&}2U2ATBt_#U9p7q~wWPt*F1mPZqofJl{B<)T`{UW@9MVb^pd*Ho;;uC71jFi}ahi
zrMC)<PJW+pdOXSbATuShf%lTpQ^Fi~I)zpX_05O@JRMG?o-wK5N{=u_q@;)L%rtTC
zFH(A0DP<Nq%zRb#gRx0EQkFx~_u=a_1C5dn)a4KYlEWPjpc$WW6Bc(urxeK<UDn9U
zFy_Y2XrgfF-0Q}Ol^EaAg4jS?s_4~p%d`<Fg<RAAB1%Mj^IZ^#&Zrn*<r>>X$iJkD
zw_k(R9Y@$5N00sl$70$oxedrp{QGw({Dpw<i#oEbZ>%=czDkcDqsNPu1CJY}E{U!x
zCgRFOwvVmC-@BS5teRfX2ho#MOBFcia+q*ZwqS<xcCqby;NN`XN;J)(R?>FYV6~aL
z$CXo!9$SZb-SK<o!Fz^o1_H;3CXnIFUSV8Wg)Pb<QG_K_)r%BfaWXB~QS1cOQ)FhX
z`~0ruwEEgniCFd7#3<4>d}r)vsD!qVdn;nhU>Q#mJh1rmEExLN|D_TiBGv$Z0F_|t
z2d#NJ&rUvAyg-<I?0i;0jVxza!x1%4FiaalMjJ7aT3Ka9jYNrRB<!+puW}WF=at@7
z2=~hR7-bgz6@B$WEIw^<<Mrq-@ck&YBbAWB5oq1U?x~mN)cc-LZ27xir3!F@?voaW
z8H&NOQ?V~+&k^rJh*2_a_~dC6MgWtNv3MSuO`8M7rM%z2=(z*#ZXBiwlIOBEjH;h_
z!+-smD}u^yZLhFD9FXvVX7V4Ov|wS&&&Pp$RNqp!U|NgzxPGV_=*5042p?F<pFwsi
zE^Yo=I|$$MmrR%c%wJAuo!5sXwI^T7aF`+Yl7?OH$M+y$yp`bXPQ_vhEI?DsyiT3#
z^BI<MbzNa72L<Sk-VB@bC&Bl;r0oY^gg%9m>{yxNk>0n+_p(_Bciv5!E^+V=k4geM
zxfUKc5?(cwX12_{ag^5iKwHaJ&9fg7CM8bLU)7Ld5ymwwffg7>JE5s2`+$sdxPQ3w
zC{8KTK}ZMF(U+i_FCF2_a`wA&%*>W}H8cPx%A1a~0bm1E!l!)57g$SwfXP>L%nTGU
zhbg9IY_y*QKz<!i!P<kA%=y;?>;$G=7B-{hF61411sK;fi-XFKk=Q^uKfJu_N5V*F
z)-`WH-vV=#{|E;eNdx)x7TF3;!h7MY8np=0cT7B^3DymyvzIf1Z?D)S6J7_0HXzdB
zBf|L(<SDAoNj6n%jZ4_D)F7qk2Z^Oht3)x<R<#2;eT-h$9Pp*x`0oU&7ol0Do1!Ks
zBp=xO4WIX4lfd!QP5n0Zh+we8JEGz8_=`^VQJc-}C!E;s00*{DH_8zO?TibW?1b_m
zp=xaak}^0eZ#2@f&(~QFQ$NCxJ_|jJt~HeIHbMMabP<~Ph?}nKheRLmap93d;Z0dz
z9A(4n#OUNU-PNsBooM?$Zt<0x63i5m2&vMe<_Ebo@OA=oJTUsTum8>3be=#RzMjP^
zpTqK1N1At8f4_F_6~+>-bf)St6st;#x}~qcR~AW?*_5yFRtGx>ct3{?3~Lz^OcFtb
zrGu&(s~A72`Sv+Urh_-7Y^LRtpO5L;2-zr@M@i_p*+9($@zu8>gqLP~)f{iRlXM4L
z0yjfIHcRg~873bX?pU7l0)5vnsl(nWR6I{6=1zG3VnDHhql?;0G5YIadk=)lS5}U>
zbnaP84u{i^I_#<9!k8!d7NJ+GzUzIQ2cIcJ)_`+oGPyG6{IZv*9z#oU>c?jIXk)+X
z6%0aWatCHOy{HwrWy_j=@yCeQYRhQw^5Tczixewp=3ln;hy!jw59YA0um8zt;4r@Z
zx;ZS-yQ84zB~X19-!_TH;14c?5dX+{Xf~90wE4TtBj;9>2?$@(_KIL7P=4%s#n@fT
z)v$D;{(i4d8y(}s8LKA|@!Xq3SOARWlizqQ61t*fNwCBAi<587xTy%Y71HszMM&e-
zlQ(eM;&}CIe%{Dx_R(Q%Upx37b*B{F3zd=I`Sd|t@{y4bDxxK`eqXO>+Gt5P(&wXm
z`)P8MKK^;J&^P1B;<ECH9aCx=!zFv7(Xw-RcZW<$!Hr2hn`3sUY$GldO!?hHZPP?;
z+oZ=a{|BE_<fp<YJ;Jap@%o=u<?}fTo{9Bugu4RnFN}Ff<Zfwg8eXBM*Whgt9+7T1
z@7XM{Ir+E9PY&SNej?vXBNr!=hSvWwx1L>xfax;;G^QHck_@G`0@m*l-mh+egM|p=
zUaViP0wW#BRgAwcfDKAd*aTf@WCG8y!=xBVl*LMn8Jo1uhHky68BkLkce~BefEapd
z!lRq}&6(T<TwyY4-N)2F`G@(B<;nU)SmH4*Sy{EA(W<6SDBkE+WRk5@XwYs~0+X}c
z4bOJXEL=Lt4wVcm{kUlVgf3J6mmYj5GwIFbQr?svg0CN3_Lco^yZI3VIYy=6|El5F
z0}I0#*lR&*=8cx2i^mAOqIl<8YEZnFgAP!vpk3%ZrxRyOko)tgfDfN$!bOW5%G!gD
z<w_`}j&B4iyvk^G#L|Q!MF%pB1oa)s_Q;E$Cy!Y+7*x>d%Dn7~h;1{=t!|@euw(RY
zc<=p%Zz#C(kjgd@7jRI$pteN8$O`l|Xn81ffnnS)OIm#-k+EYsTpaW3x_CNL%7`^g
zb>j~%F}8-7v(4B0<~@e~HnYkr*uMW<x$c6SE@X7mrRKNcf?K`jN7Zoq=`!`&3&~0c
zpm6_dBC5gZNUh}OYrZ_L&wfTLuXwnN7x6=a4m+B~PSu@nXfwFvkuxHHE`}a{F`Uq+
zXP+uCYmt%b`)GxO7px_km4;s$G?W;yJ?w@hXkRcj)0^X|{wm<;{$VJc*I30^%MFvy
zes}Iedk+4Db0TwXGzCV+&={N~%RI&z@%C3n`K$r%R3cqDA){pi;dLfrjV}!BOypZM
zQT=VwyqY7`p(w6r)A)I>Ls8k1Xue;c17*J%n5#$AQXz}l=K%bk?IT=gkW|lEf>*k~
z;nstiVW~(<$mBQdR{jPDu(j_prCQUGwRijV>6J}C;2rJ9DX;FhbiN?UKm1l5-y3zE
zmjylv)tg6L$K9UyzR`xDk~RnX9ndr5t!{6QdA5{s#T$9=DTa#n@>IF4O@t?;J^Ujy
zAkrmz$WD?{n>sM^hX{u>7|BJ5%r-JZx{NJ6JR;Om$`$u@>-|lFaG3u@?VmQ+Mv0^6
zlnkoAV2NRhPv7z?1ofj~rlfJ}Lk5n$y>2li>Ysaw2&wQZf-0&~luBlnA8U~x#}KZu
zPqfCv3Tj509#W1Qc5b*25`Z!BF1i`4GoKf7;0tcf<b0sVd-3)CcE-{(*G_1)C?>Vt
zur_JoZNx(p{nLg8lMZq*^w}nL-IbLpE;Bvo!Psqt$`b!d6C(Gh-=RJSry_Y+_I2;c
z@_*wm7<N&AOUN>N*{;3F%&-Sfv=^fSZLKFfL5cJ_F8sQ);7N8H-_A)&n?~A4TkJLq
zz)0asN`cDDt*GZq<4%V2;G+%LdmgP7gnY!IrOlKxD_Ja^%)8;SX;TGA+95`-a+{bF
zDcogmD2TizU|LTsamdWif8Ct10dO8@=SGMGs2}ijLjUL}y<g{=_?_d;vhe~dc<Dqh
zRJK2W6#9>`L@M>I7ibrU|85s%Qw2BbspihK^cEX4CaDKJ0ov29V)~WZM1P*br2`-k
z9jcIL<Q}SGiS{I}dUeNLEgEgn^MBbB7+ejdUA1KUiR~u|9mH&{Xta)BNv|6nD54Hh
ziVf1<wGNfY$anL8T(`4oC_4(6e2<%k*wTx{*K>Y+rObk9>Q#dkZp>XmVB4g7?WUr@
zmFRW<oMxoq!=XTj-}ZBy(yjh$Ycr4PE2IFpIQvv8))qkOCJsTZNR}$Q!<SRt4vJZO
zc&3!Nmqef7baK=1J3sx$bmh94dIbXXVVJK}J}mizTqpJz;XMdzebN|t0Kk67mF!jt
zXCtPzg(iP}_uj*rcDO~wGm(ZkjC0>ZFL&y&Qbphs(p*BF&*D*h%e+P?Q7Jg&Cr8J-
zcRPXjoE;w&<;7Z*xN8)tsI^_0tEE%tPw!n98{rl>CobB^wrs1{A$FpYxyu>9xTpAl
ziI`W@xS7pw6ySElp7KQL1_TX}*4j+NsiMgdbI*@N0Fw)wV;GT*`!}!mwwvOeEF1L)
zNweZ6A-FFwWLuUMw9#`&^34Tn0{2>>bqjDbxEU9)(R8;1`RB>$Qz=Kyn%7nx(>-=s
zX<UR3_rKV}PPtgnuSpp(TFE85&AsN4i{BZfk87ctU~0EaQ}%@#hNkNzavNPd{^-1L
z)(@4vYSZ^KP+~EYJIj_VqP)X7@=G&yu;dOq#cw1!-1zYG4ahH!!eU(XuR|^qU#AV^
zpDkuBz4@2GX^?KzdBA+q`RT!%b9cR3NMxhpTVlOBO8(yrBWddKg#}7kx0Xi@`w!TI
z@g6uuACK;JqFSV6^G!1CY7pKl>3@~*J6>l%mQ>I&k4k$qK|iqvu)-gWNBtd_>5`L^
z>C@QLfBxPtrt$mSE5~#I3J*S!>TSAObgj1o2BZ9|)%IY2h%l*{R91UlnMXDPpxEv0
z7E0RxSTkO#2RV6m(91R0qU{hv442P+e8Prw%WHNV+mS)+_jZPu%$~_y!BCviJ9nV9
z$VIhYoxAY)=Aq>tQmhOkpLzNI?fZ&bXAoo49C;WGmu1Sx_HW<$THcuG3)HD(DI*gh
zvOKS6UUOfSsWc1ieD-H3gZDl~A1qL!O;d16!n96_4q-`dKz2+FSBz8Qq}%5aSJ{@d
zTjS>ti4RsHGLY`qX*MD~4^Sn;m^Ha$+#elE?*QFO@)z|L!^iv1R~(mu(gCEKr7OxP
z9`~`(5k-UL9m%pjX14(F$nlh|<l9eJoSnOVynB!9E)9&W*Vf0Q`+q4>%b8c3*%Vka
za#KY&EcgBq<$AjeQK=*rT~xaD(Z}!dDS0iT54GAMG62>u$ZvX4z;7=jn<gSL_f2oD
zhuM_HB(6##6~5<8Ni*=ZC@4>4y5jdn`PV8Qs_YptzPVE>Lssn<uY|0<M$5?9zfP#&
z7_?)+Gr|u)DF`YY5lS$`O3QmH=D?JYcf1aVcyJ>hhC0sw2#UkJ(s1nWa6xM!fHvA2
zWqM3jX@`ZpB$~U?e9R~$r7>&mB!WFeFQzpf6~p%yX?3OD$ANxgsU28dS5a8~SP{Sn
zwTx<0b(FAZVz0Ri)!vbS$WXeEa%04ygx`0?)Ju8k0n+n8w~6im9DM$%(O)(8$+dxM
z6*&A5f?;uG{_T*B^EbB`33ndslw+hKMn|r6I1!KNK#4YsHsTR~LNjv*<e^EK{%#L=
zORbHL1HHR_n*5@>K)%zH`yU{-;#ZQ!NBZuF0jwdw3ox_$L*>@Z)q%d?@c>rN!e=T6
z3$?8JMnhE$6+Du<-kGxNhLsOF6?p9v)+dj|;dSfQ$?G)e1xT4--Q6+KJ`#NwdqMf*
z(ey>9VGi_3u08mA``WCc@cyPBu}yq$5vKiiKCT*WF<cr(Q<5e2@pODRq7U}Vm-o`;
zM^P7~zi+OH$aLP|90jgvJCd&3a$>`HB>kl0AtLw2cYM~cs8602S|Y-Ie${H~Xh9YC
z2Yk`5tFhu#KkLS!uh6sZHEirMPrz^D37m$JOogAdAtGmlG6FE~PT~bN?!*oN5Hc6M
z=@*oP#l}DfhLoC`=3Xh}AHjk|zn*noG++U+s038&WYY&W)I1${ekA3j!r5X4dzNq8
zmP;6Ylq(^X_rN$lhqs1dWc0-D3#+K>o!x^R2fZ7?2d4pkNOEl&W|v!tqw};0fb|E^
zsAc4)&Z+A~6GWa@8e*&7Yt$0Nv-Us)-aqSl>LwA~Xyg6W6Gy@$h+pyq7;M;AK}YP`
z`d#MI+pB0?IH$vryv+R@i<bruuAeh$<eI2f{d;-aw2P_X=P|lLHQb4i9s|vSZ=hkQ
zivM#X<_8*^2H&=lbx#~ni`Ath58K_b`sCJ{(T4w$#a}*N)qH|=AsT4vg$~S9MC*5$
zG8=u%Ea_ajzeys1drP~7*&coAR^TMVm9+ZoZ^K)%modtEpcd)0`VH{i25<|r|L_Vj
zRLX2$mFC}-PQrkowA$uls5_`)UBj@rBJ^5p7X0?dMzVZ;csmHF@VS00>orw;=g|Os
z-Ki}E!;7-KiITfQO8~iyH~YKt0;J&DBHpNt9*%#9LpKxq7qfZ@W!pEF^CjtS_w|AJ
zeEKeL5dU^mJoT&!AOer;O0c?3CxX)64I=YF92#p&F>1WbP1`89bs0Fw<=m}Ql9JwM
zKA<mQjh?dSY}I1Er8dqQAI2@~|0eM)P$9JxWg2v~j`mFSAUVV~dSVy#6dnn7qTgz)
zo4cN@l~%DorC&KW81q0|JR5Fzb6t!d#HLZ+#KLKqUS_%&VVQr6g)*NjK#r3XK39wE
zVDn0YvKlF;w|vHJd+sH!ACoQy3ffDA_%J@HiBS(rJbjG-=3yQ^VL_oKp8C*vWYEs#
zx{LIBX;~(~ryzRc2e?NagTo&ONkA6MmA=%y27eUi<Ji}}e@a!&JY7v`4rl|A>k$D~
zl<MEtN^O#!3=u!F60`wqFw`&%CHsGK!`IYjA8jytF*DfIRuBK<2f>sCmxT=mW-}my
zUUY-j`DfJ~OU9=D5eW>YfMInyPng(igUI@w>~o2}30IUY1}PVJd;yuPhJX(OEB0qT
z!_I@AI5d$<g|D9cBwE8GJ2?ZDkyix^mgxpLHEN)y9!=VW*gIJ5Q!0DN@YHhnoqJV*
z$q$R1*O4(A%Bk$8A`D@T3VyQmvpVZ7vx_g@G+jI^HNqdrJXOAaCMA(@19H-<r(C7k
zzF7d7Q1Pt|zgG!pi_0u1F=zWJ4D<z4!zPUei#C2<*T2qUJ|U_0FXbuPXqA@uAspV$
zms~$d^wpKywO+owQFZ+adFwzxErxRkrE*O^QnKUJ5mD+@Z8P!c_l=->TVg<ooI=P7
znbp-C#B&d(wo@p-rA>!6RGf~|I~cEf11ji*C>))GR9f+jRq(v5VAmVO0g;Y53_S~7
zNu1+bU%rqwOquUM|JBs-tC?nVbbW(4bgC6h<(s2>kJ%%xBSk0uf)HUxYMU$J%p*s&
zG#gKRH^74e?l`l!I66vip!UH_3B!}|raNjq)s&CIrvm^Omr{&;?q|cXvF@WHNb`|h
z(2`v4XJqzof2vDP0<;Zg7#oXmOEg2T0@_u15G%?FA;mG*ySMW~nYap6Rz<srst{Nk
zj8b!=%^}_Yt&N+-K7lY_i#RyL_>VbeG#jrcIGRglB^5Wuo#&pA_n+68`+$9u8)_4J
z=8IMl1_yr4$CdJvBGP@{s)+0FQzTw|6&vQ9oD2@m?cJ{l&<nPSaGah+SHeS|%>6DA
zWwG|G@ks+uYCwTym7Y4vl5CdDV!8^_j<SSMyyD4v3}&ouR0(AeXjyUiUOeUm<ZC{N
zsl?-=arhria^)l`Yd|w}_$FI9`z7cD#{kv=#uCnl$F;m&HRpErMFus3D*PI$|Ik1f
zq%kMGN;QP9tl~~p^KAlYU%`qKGh<IxDR;ZPGBCjhafAzB6YMt0ivu?>61HNS?(Bx+
zBpgj0NiF`Q@O@1HZ@M*!j-v6>cowY)WH4K;o|`6e3_ibn^X3<`r*JGyLj7&+Fx@MN
zMs}ek|Em?2ShO#UpuwlVYaOyRawfD1j(*YS2hlh*_qAB}kFS$FqhT<8Mv`EO#Toug
z&{O{6&3L?b;;|*mmEhh`qb$>3%Uj2pT%N%p3exY^epD~GNfa#l<q7BjDYYk+lRi1p
zG*JHkk*#_LGXMoyK1)39ys+<U{L+rP4U#;MeZHU831o_wtWE%WbyAp7Phg8YOR5qi
zD4Cgo7yb6X${dDo`a`}2F(5)<{QV2dXE_3@<r;wwo?o$|UL_07u%xBccVrus*KP2!
zNN?fzQ-5I~-r}mL73ZZ&oSH$2m^r4Gh<rk+yrLL2T2`;X3Bew2X!=gj>LJ7$)n>q^
zTT^6r^scn_UkZVC0s!rrw6<)8qt7v>?vZ;Wz7e&Uwqt4w)7WpgXE}QP4Wjje6WPYJ
zRJgoGs{cKy`AWjqABP^7IzC04yQpD!0u+>~(;bZiW7+ldt@D891QC?=YC7twWOkbY
z^$wl=ZP~H|Kl3!ugSKv-4&Q_uW{q#o6oliOl}nFrGI_E}wZG)}r9Jt5;#}RtO%<OG
z&|6g4I@<8I1->BaVOCCW+n0QVwscgXX@b8k9hTXa^5&)3F7=9hT;&8S3aP)IpE~pn
zlVbrkUs~plADT~|w-f4^d1=;FyQcrXc{*EVD@WMWP2-@2jI;HtwsS94^Q<WRNtVk9
zdhuT*^IVC3KTiAHp8@B)y<!%rRX@I2_adg&4lsdHx(z!P`ut8N$or%(D-7lfD$cOT
z$L|uYX&u6}mh|QtppL}3ohK|j;j77iuBgy!b!BRMMgWFp;oL&1_suf$h>1gKEb2%3
zZRPiCv`rs#pDVK9Cmszrf^3)S_wZWNsv;lPt6j2|Qs}yS;Jp+p>`+jY>qn0~ph<_J
z&v=tG+|l^SryH(|bWpqqAyG4SM2Ne)Qw$mYkkkETI!N(7IL$Du>IpF*1fl)BJ(Qz)
zkY(^ehwOOJ6>wZv0vy}|74v#kXrg;3A`cBY?_y@ZhEI%FFFF`Mvip-gYXVJwHX605
zyvUfyVq&dGe8FovrTWQ_qZcMn`TLU2YsnZ)QoAB46#Kt%h$qB`HTJLI5_a6P+=H5D
zo{>L93m0)J4x>PPmW0}DP!4Rz#%U1_9}86wT^%6`4N(G&)jk={0)|zr1_{J8u?Omu
z2r@mnV#^bCkpWPSpw<WjpE-+C;*USmZJ#rL-ip&*Vjrl7QbY|5j}3C<au|*B^w~PY
zXoVb~28#0k{$a?dW3Is;4O)&0{BKZXD0lCqVD%N-YLH5oyBy8pZrF>R9YEzxT5M;a
zhjELKaB^Y*uq&8{t}Y)c<;dUyXu*W$X`qCn;#L<(ue$UpHLH6T6C*+IU;VYc2ZUu*
z4(Dk=&o8%(&=83nztK%%vy}SsODmnWh#(+T;lJn_L_4dh74IV!G!FHFost9vADh{D
zwRC*)dPrQYgN=ylj!_^xyLNQXPa(R{Td9d*UfiVeCp%}b`>nIPYR5{4(E1Hg5-xxP
zk+;RfEZWo=1NU;E#4lu53jfY@#wS)id-&%Yt;+W^2As9iEUkRpNNrtr_zx^?3TqVZ
z&)skW>-b-~llE_{C0-;lANASOsh>Wi{qq??oWWUVrQS405tea|dRHu?KrV{E=wh=f
z)46(KRw9aSN=L)Y-LB6@MG3>Zw{#`{sHD|~7C6rwG851oX#FQ%-6;aDP9ql5kV>sz
z+BO$n0_75A5VjY>yo3jghy%p)5eFqwKq1a$&A`6v8P$P8dErvGiQzB7?LERFEE>l3
zrTwrRDH3v~Z3g!m3<tLRGrXln&v;d$Upj(KY^eW(30u<9>X8#~2Q<ASvy07!4y)E$
zrYWlT(U^S1K!an0MnXzx5#Nw1`~F<FZe8VxL}fAy9hy7cy`qY>oq390wEi!!4c{v;
zj|LIP&}tYF>6|!)v5#UCvvcF>EQ!(TI83-@j8ts6AuW#RZZd9XSlY#{ws^f+K@p)u
z?@3hGVe;6l8R~s)Y`t>nTe~iCy4sR?YAE5Z7%d58ivJUIE^{h>P@kAaE(`?z63L)W
z@LZvu9^vW^%@zG#xa)GbA?^ZxfFwlg2!tgoU-87&;8$2GIuL5VD@5cdU3q+<ckxiN
zhSHoB-7$p|Y9EiyowiHa!U$fnp{40?#!Fza(90BIK8!hzXAX&?<mjZs$K$hzeYA3q
zK0fsS>JnR9#c2P{zm_#|;pI%|<*{cXGO@sK-MswBEDrhx%0c@2m9XP~q(-X6;{ABy
z{e*h3<Z%9?#OwynsJb?teDL&KA#2`Ru9dC@tshNunAwQbt9M|`8f?nIBqMxPZeC37
zW5=19lr+<wBvrq#1Y3V^m=Ut?=-sG;7Fj>vY^izHdXYiTWzt|RDkhOIy6Tt*3a-xl
zBty0>0=3}n&ZD&MN)Ry8lhcsjf-yV%CfhZSPN@ytH7NKZEo;QL<<9eODmIVuQ7r#R
z_xrfy>4eFe&?YvC)Ifq1f7bSWLH!P4vT}ux&6^RJt_XKw+9ScuU%n{kQJ`c%Ffgq@
zvm%=OgGz`BZ<e}iE@<F`%BA<&T{>9HxmgJSz*_#d7Jw6Zm!s_}E5sf$>p@9Zx4Cbm
ziw|oacXCvWCqbug(JknXxnckHrfkk>x!CV|qlq?zyqeX0D?$xv0aryTXb`Pg)jjwC
z20f6myeH(^H4Ag3CP}ev$_vanS!VH51yaA)Vq+j1@TmuxUH8hatdR<>60ZJt!jXLm
z#!?exLNx;{)o9XW58ClnUVENBc@O?h0ZfqNRq5+663H!WRf!K`68ow{ex*0_MY|R0
z6j!O^o-?hFPHq}nHXrYK>MgBzYoHHG;&z<8R3CV~61|ls$N)7z&^(;&L-IZ##&>To
zg*bVShw$|#RnLA$<9g;D7AUmgD+32r)gc_@VJGrfe4xmi0)e2X8SY%)|CtqKGHIvX
z2_S`uE0B+!I4x6t<Rl#AOZDTwWNC5|;?doFzpJjNvQbV9=FZ0BvrPyL&4fHl{PQf2
z1vt32RlyGH`>2MPRlTZ{jY14=s)#=LkQ*lioY60d!FJgn)1Ot-7@T9Th37U(r`jIw
zOYGzE@iD6$^$my+9GhczQpJBK@FpsVjM?lAcSNVsJ%Pbc;sF#b^~7+(D#id(t-BD-
znHVa6(JQ+$S9LofaiaOJ&<Sx>K+Ly><PG<)(m^{tRon%#6At;m5;ZIZxDJQ|{XZ(L
zz0pEV`=-`D+k-5hAz~hoaq=9;4J2nIga26>VB<QZ*t1SnLhXt_x0e!cJK5#Fta`m|
zqJ(Zl_d%f)_c4UG0Y)8yIwzw*pgCu;(VN(bs7$c4$e>opwXH@E3O{&sG{=^s+b1X#
zY#tQ0+eyfONUg=^I8@=sb5GD#{Gm2vl|CL{PS7NcnglQAu*I)iIHK&5HjB0>79BbA
zs&RG#SKQ}Cpq(#)V&F8isgDW?^M1-Z7?Q>pH+R}6W(D&}U0817EQ9-Z&hwtGDX05C
z@fu6UyEfau_49;3Ay?+c0u<}E3&LMhsBiCV_+6Bucx;(fRllM5-PP4Ep6Qz<<H}9$
zLag<hK*{F8lS6Y=moExXUj`F=ly4<Ve4#~2@<@wmYe`{w(DoC3G_PVrNc#@-Ap$XB
z-Ln)tE;>UvbDa9aV`a@2l_nWI6xs-3U)G!S)zO#AV$wvW?h;;uFa8Lctanw@-K!qf
zpbJkv7FficYmP1zi%`RLD*Q5O>;}9U^b}ar;+FSyV`)DsKYeyC^={6K1n#v^CX|x5
zIOmm>#6C)t_cM@vwA9)p&#AX6@c*M~MiT4#akIr+xS6|<7hU%Q&{Wk^X;X5D`(JzX
Bh|K^1

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_disabled.png b/app/src/main/res/drawable-xxxhdpi/loop_disabled.png
deleted file mode 100644
index 824d6b9db16259c6da8eee14fa097b222b8b2d12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11210
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

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_disconnected.png b/app/src/main/res/drawable-xxxhdpi/loop_disconnected.png
deleted file mode 100644
index 9c451cca88115165dd83fd9029aa1103211682db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11432
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
NN^+{QRnjj5{tq^3#eV<*

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_lgs.png b/app/src/main/res/drawable-xxxhdpi/loop_lgs.png
deleted file mode 100644
index 80848ff60a8f2ea419cb086e1fc21996b6fbe1db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10821
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

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_open.png b/app/src/main/res/drawable-xxxhdpi/loop_open.png
deleted file mode 100644
index f010399a5343830c9885da89c537630e998661d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11428
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
MWmRP=q)fj5KXB>)00000

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_paused.png b/app/src/main/res/drawable-xxxhdpi/loop_paused.png
deleted file mode 100644
index 36f9bcb5a596933a353420b9e6210e3d4596b4d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9729
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

diff --git a/app/src/main/res/drawable-xxxhdpi/loop_superbolus.png b/app/src/main/res/drawable-xxxhdpi/loop_superbolus.png
deleted file mode 100644
index 018bf701887f5a148a7ee0239aaca0cdd96773d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18296
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

diff --git a/app/src/main/res/drawable/add.png b/app/src/main/res/drawable/add.png
deleted file mode 100644
index b25da646726b217b89e70ae4b7f3e5ec33f65154..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004NNkl<ZI8UXM
z&npCB7{@>F%&z^R9OUk(lubGK4@l%kqDVM6DMxa3b5|$_7o~`D;mn^PhgBSi-Ig(H
zZSTzN?CiYSnW8j%n7sA$*0=Zhy!CmXR}iss+a2m}e7pH2qRvK!O~A(T7LIRW`xXaB
zJH!U8Ev{4k@Sx+9qvON)fR%++j6wsg%jEpzG(KQ{ZV98{p?8(JI=gHQh!WP6H90$t
zQS{I|%UoaFMEMJ#VsyV>%}mT=`!bZ)kU>>tjY`GEPgi($?=UR`>H=y491Zo93IQW~
zeQJDs3e%_ujiGsobQ~Ndd6aposssWwKnT!_8oVV#z|d~58Xg-7ngT$>!uBkx(jou;
zfF(*Kl>d9Pt$}Qo9s;5qq?1{)gFdfjm29GpdPspUz$e@rfD$2~)g+1miS4$LaXr+1
zCjK*uoJCDbkSePmVX;P8^w_xVI>{IDBP<@EyN3EBEEeEjzcF&`T7=(w?AQ@%mGgN3
O0000<MNUMnLSTYM_`h-h

diff --git a/app/src/main/res/drawable/as.png b/app/src/main/res/drawable/as.png
deleted file mode 100644
index a37e4c34650a11891f07bf834cc9aa0a8a18f5c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1639
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij|qUrKzit
zfu)O~xw)&Qp`oL(le2}3nVGAbk%g0mfjP_!Y<ev%9nFkP9gWP*U5pG3T`et5U5qUa
zEsP9Z4Gm3PT^(V1J@bl767!N%VfJPM?S<+E+KNZ7m2**QVo82cNPd0}ECmE)<d@_Z
zXXF<sI0u_4XoP3xrR0|vYl5N&;#-&0qRg_?6t|-MTm^9WT4iFf-^_xLzae^4$O$uj
zpkwqwi32IIz=VJ)5X6KheIN&(c~bL$Ii?7hHCiLr)-W(IP4{$h45_#^Ws<j#aG*%r
z|CxO2&DJJ#>n>gL>67S11)*dm3Grhu&b>Ib)Y_+mlk-?>UhR=qy`0F5p3aM`+;VO{
z9a7>=D!x<P10A+(5n1BoefwqdGUK;B>8pfH1iz@<pEJAo-Ou-X)A>H^E)BVUWkq=2
zosi7C?lMQzmPK#3^WQP=i>+(zWyL36Uv{hA<0}-It+Hq~=Nu&~`R`wDZGWG4;JO9>
zwpDyb*Icr&HjDDudA;S2dE;f5-@4ORr~aRq%(2GpVfT><0xS|ad<G{YJ})}Ied;$J
z;YahCc#apodTL$1@$-kkBR^P@UYa~Qa%hWq{Jlznx!;o$Un#pdez@@Oy9?_@SDt6A
zr`DQXeOBV+v$SB-XDy#+MISDP_Ux57@Z$kPkE?6O`xg!wnVd6o#9Y&~tK{#s*OzUZ
z`s#jx_I;<{9b#>XF``pL6GB;SQj0dV%uzWQ7vBCj{k-C2!Hp9B2ZSRotXnI)&s^U@
zUf*!>U&hrJJC;mfJG|+FsK~RuKFiM?73%nGlQ!+J#H+fN42w0K8n@bG?+Zi*3J4lS
z@co#uBweFxR)6<RnMIj`+K%>@YUVsT6~+7g^5!or70c}smh6{y{3P_X#c2uy59_Wy
z`q!j4oQ>=~u{`s`M325#QT3cDrdOYDU#~2~<tWA)a_g-|u|+`ee&(Y;3WX0(GqRAD
znmA`Z^YY7gPhb3ejitkOpJ%@G&mbp#jzcrE|LRZlR?XNT<l$)~652Z9!NCa=R&J9k
zRz93yCQ)3z^5&hgM~_seNNm6Ga%sf3`nKnh{9hZNsXl1eIUT!;mxV2(VokU3;<HuV
ztch6<eyn!vIH~gJphAl0rM8z${|??UYj-Y{%Lvllx;3lw-~!Vlz5h+NpG*q$omRB=
f$H8Am${E=hWZx*r#qo<y1r`0Cu6{1-oD!M<RI6*x

diff --git a/app/src/main/res/drawable/clone.png b/app/src/main/res/drawable/clone.png
deleted file mode 100644
index 82fd90cca8f2599fb43927258d53e58681417102..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 643
zcmV-}0(||6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0006?Nkl<ZI8T*R
zVNX(F6n@TqFJ2JD7bHPl%4Thu*|6p8BW!6_b6mgprMdAF@*n6g$bW#}+FBbn$}+9n
zs?SRGA?GA0bqQ*Kqyl%B+b#{G#$23F@6I{TInVQ)y@Z<Z$`LN8rcg_>IVdm&T_+S(
zEn8BxC-La$d~L7s_Q?vTYO;5HQSNZr!sokPT!jgTCuQg$Fd`fu6>zYBm{bd;>5YZJ
zLIoUBcoEJ_Wq@}yDqp$mjyT;e?B!H2#-No6g;E*$6BQ&7n#3j?WpgN={G5|4+AP7M
z6kzd@LEGKpNc0bM^P;LFoysAd%EwBYo-ONw*T!4DqSXpbS7DJPl#U809Otv`9d5q8
zn*&`Oe;&GVy(ipcwc^vqt!(;7ej@qw_M57-uDh@9+wArSPPY?e(qJ}85Ojj2S-@ue
z0OXroi3|;2khixo*odbm;?Y|bjenb~_^fum=JYrKQG;X>A&P{r@eF8q>aEg$wa34@
znux_7`Un37S3Hsx&dkkg?VWC~$~1rgQDDd!60Y5QpSaZ5>0OP*XV)K(%+%S=MT<>w
zdCvKmnV~F{Aqd8G1nhk~01ZvOQ`$S){9lr(iO-LIpQtwaLLc;ctg1O0m{cOIPKUg{
z`8}||^2fZhK(#gM9e){;tgYd6Iy1fhdTj20fu{_(Kf>)TZHZ#3IG<V?nQnN10q~42
z&*((K)Y8qmS2)uHqsaXVmn1Dg#0Ga?1d@%gIQ>kXv1LDFVsPhKpdlHj1B|U*cNE{w
dVj$KCgI|s%*C@&V;gSFV002ovPDHLkV1nCUHEaL?

diff --git a/app/src/main/res/drawable/icon_actions_cancelextbolus.png b/app/src/main/res/drawable/icon_actions_cancelextbolus.png
deleted file mode 100644
index 4ad378e374a0add202bbbca73d029476d8bdcd32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@S5Ftmkc`H+H!3^ALq*s>^v|4pGpV~RQ>1mKtJ)>Epc`?^TyH5!%~ZW9
z@5+)Ud6R9HfotOyfxt&w0s@k^cyzN){p#+z<ziN<gy_yxsTrqz>gSjn=g)h;-R7ft
z<DU2S@Ap=}-}%1gz3ulo#r&#XQ#1k>xpc;|@7=`vcI|CbQ=#JzL}eys-ELZLuy<O)
z`p&m=-|v2#bC&B-+Fefv`Iu(qZl5XcPgs0b2mg!d(fxFo=UQk+{^4gz!cPTvGIAGI
z^WOA~XtM79W6)gr!*Y2oU!CW@^$y10)|my$O|*<?+}RW&cWg1MbYZP;sdlpVzEhe1
z<L2BCp8WsJp{G~XZrLt>8$PGGd?SPO292xrYV-W3NVNNRzvS~f?A!TA&hoE*g6^ym
z-EY&cs-010I$daY@1Stf)A%DNBj%jwJ<i^GC0#)7AWP2Spgo#psl5uN5^l*#d>&7(
zJ(!#&e7$JDx~lyx;q4utFUU`Sw6saZ?SZaL%kskMe?DJqyf>rir$m#wp|g&I#{8oF
zUyn>Qd=&8A*?O5;m&n15N#(y)KdrS)UX~zHC(ylJEAxK%k*VEBDrZi6ak1A!^|IGv
z_dioLKJxF=^+>AUqxI%*$yDEzZ8uDnG`2l3bIeHkWE(0lcedy{Q33X@sWLs!TRL?G
zwPW;W6|N|_9{Sd%)lO+sz2dp2W--0|t(E;}xI&aS$=?$b{1)ePY^y}Wb;B)ut!-Tz
ze<kj%nCv3eEVT2nOT!$!zQcds9Po1a<~2pOvAu-#c<Z5DKEbjY4_?=_NAY)pJ^sFX
zp}%IK=ZvpP4+HzX_)jTc64&q6%{|yV^B?OD=5}s<lMPKwdkbe4T(5t_(Jaz;ZK{i%
zLRqR)m4n>Gbe9X+qG=cB8K>#JJ6y1_*w-@I?UBPq4QuA>s^{0c&XJz{?#$<?#X?Wj
zynnutxua!sGbOR>rpo%miZvlV_q!xC&*a$J9n*YyZjY>FA9s<+=|!<mlA52SZ)8_L
zKebfrR@m_weOKyIKi&6xB6w5h{v54D@78boP8Mg+{d{F}v8>u2&tr3>D>vSnVDtOB
zW!<z}oG)Hone+OxY_G~Dn@Yab#eb^iEH9e2ThLzh{oz!fZ4+JYiKmsjG0wbd!F~V9
z7hSQmTPm9#=S4axcdj{XG?7Q_pw^tV+3uY0Z_e2h-%;C={?=u2H~)FA?UoC#9pI@G
z-k9V1>F<Iao4*L9XKwYW$ugNJR``5|`hT?uUTxNy?WIdS!aI8wM=r6O`=WE#HH*OA
zRWacu_XK+c%rA*9y0m%c^4C%8JOAXgoro$=S?boQv%^<JaU1tF+t3BGHH&uKT(rSp
zLBkuBJ?f_%ABXO^@l|AE?v9`vzmER!OS#aj-Sb|ztKQp{Yk$}sz3HL94*n1PE!+Fs
z_0sjW^R4c`f>TaA7wlQFAm`BH9n$sb>RM4X86tj1R2LmH4Y`wT_Ncr@t!#1Vl%}GI
kYC*t^ECkHaH>Q4&Kc@VAnty8d15jz~>FVdQ&MBb@0D^UiN&o-=

diff --git a/app/src/main/res/drawable/icon_actions_startextbolus.png b/app/src/main/res/drawable/icon_actions_startextbolus.png
deleted file mode 100644
index 338df773c2f8cd0837f81bd8044653656e98036f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1249
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUKu;IPkc`H+H=@_XJBu9u=)Zc^tZ5vgE8DXcdBlgbtXkq?^WlMzs-Tp}
z#8vG4uY^2{T>|861e8oH3OSV~?oe}o#lhP-X<4cFk+rT>_OC8!`8~OESZd?>`~R2x
zpSkyZ_nZ8pP3h<BubugGZeHZ(YZoqo!KeR;PMsGo_1><^EK`*`q&Rg~e4+5X8}mOV
zZ|*-e>++E`*DCL%ZsB-Yd$fYbY@SnDf8hRf8#ZZw#nT3N0>86QTlR@DBC>M*(IskD
zlFhynht7E2&CBt9D!RjVD*K1nxd&&78F5a3$ady?e7X_y{UqZ)zta5))xyl?N11H;
zb{?{}Z7=_zT6fq)rhjum+|j%Mot;r8s!ysOX0=~zXD_+`=6#YV-_fEwP27c|^Hv!*
zs<r4GR{kL({&;oYef6%r22K4Rw?+8XRtV}ZwBPz#f38ccBKOhhKRBL0Sgx0w_UPTI
z-~Bu6|JF|XRl(igmHMOZq|2)v_nVIxNgiU|)&0Wk*ux#-*+G@;=Z?qOG;69(Ua6eI
z=_jD*?r-SL&V9sfzE;fpvomyU;>=20bi}j&wMx~_>0l4uDIfp9jnyz=<%G!w?iI@?
z9<uxQFzVqZ_ak;QTPGJ=Yl;?`eS7%T>9>|}L8;dMN%OctVn+UR&N;V!n>%OXyxALq
zYZmHwwaRqr+HU*1y4~z}*s1%=|83R~Eix$kdZSEx-%bD7E2n;XuVi#?QOJq&k9c0R
z*6whb^DKGe;vhSxj*~z^H<{^)`yJ=}N$!lCK9Bv8#K!PV8ls;XIsQCLy|G3#@cli#
z{d;H4Ti!Xjw)S0%S1V74M|t70yVXi_R(Ab7xWD~X(nFcB=YA_fPU!9F$u5Xk_I5$X
zr1qo#cKSV0-t2PY^Q?k{kykha-yJNu6P{q*;JQOJf7!07Gj#IeH?35DB5b4cZ*e!*
zoBIL_Z6-#<>V2B^=C9-5=qa~9D9$srsy+KKXd>Sl(fAb|yPW=s>^yQk>HL?Mwvn@S
zrd|H5wE9g6Q>01Z`mMstyO$O%_o!Siu)N-US!c)h;)zWBk9-#MAI+JytL8>?cgyvi
z%>La^H~GoTyWLVgyE*u1<VM#gzgJ)JXO-H^Cv|YLQmk#b&eY&b#k+nK-F9W#8dY=f
g-0Tz6AVBO7uX*ySL&~pygo8>ZPgg&ebxsLQ06nZ9yZ`_I

diff --git a/app/src/main/res/drawable/icon_actions_starttempbasal.png b/app/src/main/res/drawable/icon_actions_starttempbasal.png
deleted file mode 100644
index 18fbd8c1119ef94c546a23b9ad17975dc4123225..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 651
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`43D_H=O!$!L6gV`J8#0Ewd?_lHWqTp(g4TB2)J`myki*L;UxB6)qXyMJ)_
z`Pnsu2+Wba!{W%YbP3-{1*f8XrwRQ9b*EKNp4@vsQop04!=p0flAWI0f7kipth3~H
z3K#6D{b}bTw|!duvNLgwk{_N;{L9RC;7IxBYO$Y6S{vE;`f~UslDC{l-c!d=?EX#s
zMas=TisxO#R(6<bCG~biELOU<0*&dL+4Uoao%KL4V>+wlzskPr0ymbk#=1%!V5>N3
z=rZYo@pY!M@bmKzln31ieZu3@xbFEwz37CO6Mr-Qa*$pje3x}S*DOaD7ndh-db@?C
UmMFDa%mt+(Pgg&ebxsLQ0Kz-w1poj5

diff --git a/app/src/main/res/drawable/icon_auto_delta.png b/app/src/main/res/drawable/icon_auto_delta.png
deleted file mode 100644
index ddb0930b0b74d5fbaff5a5a0d69ddd40da580069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy|AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-4oO5oRCwB?(ydCwK@<h>-{^wHkEWP3h{a-?U>3w62o^s;i(%CbW(5Ub!7PeF
z41&>M5Zizcuw`FBn|8-C!k=|n-Sxt7=bX8mIrq+loU{MLK)1svOh@6mZvm`eD+;sy
z3hb9$?^z%UI~c|r4x%vFtAitK;s!Nr|5+dkix^At6YdJ#=*7VqE+NU!Xkk7I3%?3P
zVFq(JsnF*o@3q&5_Ky^WTMQ<7t-_7qy}<D#zjbsFg&{2CxXLH_16Kv^c5C4T%_KKF
z%;md{gKh#FIP5glB){MhlTldx=4%!EbxdI*3JrX=UDU#B!KYEkNxrXDiiYrj^|JqL
mGqF?zE-+fw&sXR*z6JoIoIR4AEfn(r0000<MNUMnLSTYVx1KWq

diff --git a/app/src/main/res/drawable/icon_bolus.png b/app/src/main/res/drawable/icon_bolus.png
deleted file mode 100644
index c083219b450a124d1aaad7c17702afd09f8eac4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1354
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUU7jwEAsLNtZ)A6bq)Ht4IDhSI1<|M95>E<klh(PrxZ{99m)GvRoYaY~
zE{WTh>S(PvG3ml5=i99vTa`Mvv^JesvWa`5n8c=?8E!7Qn`S1JD2f@IzCK)>liqK=
z`T3c1XX-5LC1zBf|Gnq4&2yXU&W>Qv$f>M*?(O{|p1Nc2dqdT&ZFAQiu6rMxcK>?D
z@t!K}5baZvOz{uI?{qV}S*8b_HCZ*utL*^WmjuCcT9Nt3ZdPzfe-yvx;4NEn=ExDA
z>VFR6&mMQVEE8s5B%lB2_me95b%#z>X+(EkoOeR5jN7%}fqmYAP79gxN0M_|<UerA
zohU5xJ@Gr8{c)^~&bvCz*)6|yz1HpT593u@uNeFxI_vF@6xp(ej%N;i{NZ&Z=<dp6
z6E58<(uh0!Z)L4^%j??7HSr43HetSU&a*boS9DhEcG&NmvTnA)=9K?pbCmDAu@kfo
zKE5J9@{@!SqqXaS!$NzsMCLR~Z{+f|(75@TUyQ4{??_aPLE2h(g?>fr4;=3fWKBFd
z??_@r*pg?Cf#vHwQ`Q~XzUbVXhB%$WNgrFX-R?<5HoPue!|^QGRq>6`)+b_tBJ;&w
z{$QQB$o{a*oc`a2`jNBE(zu0Io&2iL#XReSD%%Ica{_L0+LylER_g26{l8+<HkTzY
zon5%zuZa7rxJoxlx<G2)@l>U-Dg)`;A9qcB|E=}V-m=FjHGNAL9q3ybFYW#Ht{PKK
zAIF1}Czng7hfSE>=3mIHcP#dhYWPCkt=mIq1}gjN-s%W1=+c-{yTi2kjEhaz(~8I)
zsof{CrYFbOG@Px_?-ttns(s(#my4dCI_wkpSDiEbx5tjBR&!>*vGg}tA-Xa(`TO=0
zadQ_XpF0&2*uCq><qCH9=`r=1rz^j{2$<frd$(1)&t#9cuX*3|RTUObV}5lt>pS=U
z_s8~IKDp&uBXBvh-9u|}(D|8(%V&h@9a?XhTHdk6ZbIk+!Ncc^0-t{N>7D%{d7gdd
z6%liVRX?2qdE6KK9yzYM@@w@G-j_byCPgxLRe!CCyb+alKH=ndu|29$v(p|f>rb?r
z=gn<avd%9;(dwb;%CEgiE<0kE6fIhHUbwZa@Z`OFUlu-2<XHG(%B1_ZTcmSE*Uwni
zeP(-m*~CQ;)t!?M{qLEs7~cJDp2zv?lK+g7dp!hB2Nm6Rt;z9|w}@-|(mA8C{fN)x
zv<vqRUym`gdgB@!&k>TK+9zat<(5(PGwHaeyIpr1DLqc*SbV+H+k0Pq$8POhIsNOW
ooXr1;Tz;POQEBl42oU<u7-+of%+9y0!Js10)78&qol`;+0AhGdRR910

diff --git a/app/src/main/res/drawable/icon_calculator.png b/app/src/main/res/drawable/icon_calculator.png
deleted file mode 100644
index 056722a440337b9e6dfea55ec42ac88074e4f307..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1092
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpEuJopAsLNtZ}@ji4V5_l@w`uv+k*+ZGHgYHTRBP=@6hHD6=chjS=DN)
z7o*YYA?VV!K>NS`k=A;TM6sl94{@O_nNeG^OT-s-NOKwn9@JdB?26cPo;&aM7#H6w
zJ|E-$tnT55ec$hVwt4>Zquuj8=c`{_Sm@loymQ@^#_0UI8X@^dJ8yC?pS1tu+0J{5
zoiFpgTKBNP<F{)^@jm;@3s_BM?4;K(mN?m|(P;m{f6x0v)e#pBzE8O#Xml|0&FKxN
zQ(aFjuv%%leCBnhXG?y}F*WLNUCKPOsdOcCam$*XT)&CREXO`<NKp{AS$u5rdBIKM
z@o6`nZeX_#Vtb}@XCu$-m`Tr1`L5Nf`k?jhagpPG&nb7j${#cB(|=(+bCQ!9*Qw{+
zzkHTmy%N>c-@=q%`X;)^`G>gu!`*7L>-Jdoo)6v;Wj-OSRp+?4sGWWHcm3HqDakp(
zg^_I&!h&C~m;ASX{*CJ=_RevL68+RXAuQHH_V>Gl#5cEt5;reBxNOzj)0|75B>lII
zljoSfJa_4n>L=ncN47TEP1e+Wl9A)zV)-+7qO+!A?Z5ghS7v9JYb|+nE{s`2F-27G
zVTZ!A*qGzbIk#zl<ciBT?GVa-(hy*fci3o;;NN$L4Dx)Ft$U`6Sj1_4bg?@ywc`IY
zg-49{0(BoLygO#5FhyIqwtRz~dWVox-h+zZ`~8PbZ|bt!W8oUzqiX3m#bd4GoBUU=
zk0;hN9ryiTt35{}>|?|YhOA(x6KM}UKKn0>_#?7Daq@?izoIYy*u3#zZenlE(p_^r
zm$_u+9;wVZV7PFO{K2Tnt|pg-*XwVQa_LkzYTGVd_rJ@ubKC9K$&=<s^Dav1oOF0&
zP~WrC&P#qDPZmF2a*aW5=AO0FmPOyVHF<?{O3aP4@T1rKj-^WlsQaE<VljvH*vGHJ
iGqyXo^U0=7{LjF&KkfTNPlwx}%<t*y=d#Wzp$PysEzNQO

diff --git a/app/src/main/res/drawable/icon_calibration.png b/app/src/main/res/drawable/icon_calibration.png
deleted file mode 100644
index 0929d3690d508035460c27b29f33aeef69e307e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1163
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp-<~dxAsLNtZ}_hWbCo#$v47h2BYO9G+XR!GI3g$LJ=tZ@)U?j=ro1w%
z;vrwBuKL2q^L>~WbKL0=%XK;-#wzyWkn1Gw&X^b1LYg*h=-@K?A{8rctbbSfz4dd;
z=UctIKetYQK4)h7Jj?y%Y3FQ;GcqCI=Y7Maryjmi)}Oj+`(r7-d+XQ_@x>gR__6i-
zoZmZcyf|lPC39@H#Nq2duj?Pa(H>aSn!kv5x!IcnF}p)1JP$P3q>sHaV3vP2!}#-8
z*^9?~TV)RXDg4e|6lwqFDD&fY?Hdhm?dY5!xaZE&KcZ_g1o*|0il=|NJ42Q;ApC>^
zpZF_&&&!MS@?Y+YYhN;P)sl4+Y-fb8nBN|2nyh!oxb;`*jA+p%eG^zKbRTTj{Owj5
zS}84Yp;pU(LEnVGGvq$Z*4yi}c#7NN!>6>`S4?Q%pcVgL^h3O^?gOnfP5-NW-m7F5
zIc@VgTrX(P@@IKc^acGxFWz#PwD`^Yr1y@uY+uw@wV&F0>`8N17j<w{#@#B-e^C5!
z%d<Qi=?~S`4?g=%b#^&1`R2R>-+vfiSa#Us!1E1T{(ni*?+az^<cOT}_GQj_wp%3;
zVjm<ASFJfH`A5-r=j2QBAFGxuK4CI*{@e1Ka)%dBeDLUX=adS$wGZtZPjuWlQKoU5
z|AV(d-Q3I@;)06en`(7#-(Pyy+UbYQMSVfV<C|;wzCV4f{9}{b?f-K+COBVWn$zgN
z#3pOm6y~Wr+P-sr&3|yv;lHAi)4BxjeQ{mhKYXozOu5k{Uwx%FVfmIF%0Hu3FN!>@
z6&5~t>2{uv*Z1n)V+nocto+{X%lECE{P*24?n}#Vbaz)o%`)42<LUgZZl@l<TmMle
zcI9u;r@@-Ok&RD-o>_I}7jnfvc<=Ok=Zz2RH~HP#zwOy(p9LqMFPQy9=l`oseC4H@
z^?_EK|KCwin^o_cc`DfU6#EAk`$qNX6LXwmpYGgqB!ydZuC~^B8CA9D6LvB0gX)5+
yB2CgZwaz*IIH=0FYyJ}bDcV!-m+3-)U>>9K@xtF%k9=$el_8$4elF{r5}E*_vifxZ

diff --git a/app/src/main/res/drawable/icon_cancelbasal.png b/app/src/main/res/drawable/icon_cancelbasal.png
deleted file mode 100644
index c48a20792d27d1bf0c025efc98f0a76304e674b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 941
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8Sx*<okc`H+H_mqZCdwT6cwQoZV}kKQ9i1s>mqbo(-QL-@$Uw|Q^`z6n
z6Z;)}$|g?|656Psq{w}9;>ymJJ*KLaCvQ|rUVmg6Y<{=;o#i{*XGcD-y<BYlyuAMV
zciZQd=ilFPRuSrSQJPrazO9O#tv`e>!My6j2FH0PEqe7z9#!|wn7O0tsARUZqkdk<
z`!~13cR%6O>~u3!_q;Mw=(?Uqj*y?vQolQaH&qkZ^b)hCJusPA$FqRh+;G2}kF+0$
z(BX(q`O;6NDvxJ9sqWoo-g#t7nyc20*2yz^t!I3neT3oH2QlxDR;T;L9A|Mjrdgj$
z*2_~>e%ST)NcBT68~qi>e0<Ib7<a8bq#CDwBIdYUjhnfgXlO#%rVfFyg>f;*v~&(k
zfATrOaOu;<7q6^(HoIVc&qpr*s3>3ICxSN{n}2jE>Krlk(O<CcPKxNu!-k1nxd()7
z4k*PO+~TzAw4>O>UZ?dxI(41O<pkgLD<<CDt5Nd3aPh<wQF8>Vj+w=*u=?g0Q8qux
z^xVmP6<g+*Ow4=e<1h5<=t?QW_ZwvNH^fzhWabz4&h!wr)b^Ra*J7TKd5`GH9g#D-
z>gR4*S>TaTktvkC=ZMjp<9o%fOr32q@vvpFt?;xLg^K?2nx=tEa$F{E5_CP~CZZ_~
z<opp=+TQv-YVED6e;bbVhg!b7#_d)8Ywho*-JEt03y<CSeQ5rc$k5+iD>T6o=JE0e
YtEfuOr7rp8YEUloboFyt=akR{06MmG>Hq)$

diff --git a/app/src/main/res/drawable/icon_cp_basal_end.png b/app/src/main/res/drawable/icon_cp_basal_end.png
deleted file mode 100644
index be8474f0024ea2b29a8b1bfeeeb9ea9838598e1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 867
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2o*_H=O!$!L6gV{f*Iqr~x#=PUOuXid`fkovtvQ>TXU;IU(F0xqmar=MbR
z2{2itq}D68Z=qvgAh)aZMxj6KNA^2x5!%S1#nn|Mw%NU}VEXQxwr9l7Z@+nWW_nuP
z{=4bvY10)rnn37<v$Fb+w<Xy;?1e1%t6SC{61{Wyb!F-40!is#JYU(=KWvXRu-drc
z%F<e^Ip@9J9OKyb*nRr1^cy|PV{iFC5V%*~^=46~_PvM4791+--7~4@&hg?m2I*-#
zRqD9EJ$9Y`ZFTo!jeTDvl5Oo0a{D%@S{`KWS6Mh)<)QYOnK#;)cLXoG@AbrPqFMRH
zBf2&R^);{ZJ^og(<Z0kFjx!$qkFyGG`(95Kow~#)Yinjwa^by05rNw@rkGxu5|km{
z_gJFrQKPF-u-aCs9i6rot=_V=zMk(-$NiCPJK%WI^wNZT&9xTY#j>TBFTE+1+rM<?
zT2q!@=84%UL9^oYAC*l1#eL~jE!+I1TYl?5k^0#&`BLorqf54U{L|51#k13G9j}D>
zRP7~Nq08<^3A(*<lUOO8xFoM-;;xCiH}!i*f8Vs`bcd~0t<;1vu6}W@bEcm}H_yzq
ynt9ZFZ@tX{b(<+=m$JJy<%=HU0S7Zj(-C{AU+$WI@BP|AdBfAy&t;ucLK6TjYF29i

diff --git a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png
deleted file mode 100644
index a9d84303f68bc2af7358914def6e289932977b39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17622
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

diff --git a/app/src/main/res/drawable/icon_cp_basal_start.png b/app/src/main/res/drawable/icon_cp_basal_start.png
deleted file mode 100644
index 34cd31f14b37e577162e1ce7eeb5712dc71374fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 616
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`42&@N{tu$!L6g-J0uAfJn>3ctIT&&WKwPI~d-+xzn^`T0^wJ7O`%fW2!fP
zYs574CMb4@dFr?n<qJ)1J{SJf(EPcNq=2BH;6(qGJD6Vod@EbL>%a}e_e?GaG;1$#
z&wXusr7LfmGjjxEZvPtr2~o*Uy-K=|gp3nrPV8=|yQp|yW0Doq@1F0^jpWx)v&`x2
zidd|4ZAFKvR#Gp5dG@@>$Ddbu8!j0C_A+)iV_0_bD`UhDxi69HoMV>EOJ0~Bp78p_
mn+8S$&v)ieG?YN#ll{BT?jp+;2ClsWN+6!DelF{r5}E+C>DLJW

diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png
deleted file mode 100644
index ece4bd4cc0eb5c7767400a7f8e7fc577b6cdb95b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17558
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
H^L@Vql|()h

diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png
deleted file mode 100644
index 0479c1a3afeef3c6788613cf3731dcb5160a0faa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17558
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
Fe+RtnL@fXS

diff --git a/app/src/main/res/drawable/icon_cp_bolus_carbs.png b/app/src/main/res/drawable/icon_cp_bolus_carbs.png
deleted file mode 100644
index 561703fb06d4996975f91b5cca1fbd7b2a63930c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1257
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUNKY5Xkc`H+H>y|MFP1s}@%YUR&d2+n1gx7FmQ*xz)16L@L#LE-T9fp)
zDxPv$x48A}q^&=aFB?vA&C_k4b=rRN)-5Kc(mT(qC3C!%so%5D{&{)bxw1d|?ic_2
zZTI^6_isPHRPNvR{`B*|e*=SIz?exkRgHH|M)s|LJ4C-fSTA_&ZJ+#x#mToEqRo1<
zvrB%LEaWdwI%#lz`2z81mjl;#>^<X@teaxTcX;!Rz&{B#a>uh|+SLnMD{}gcxZj3d
zy%bx(v2OB)sFpmNuJ0cd^bVhm=&2LjE^>cbWR6bDo9@kqqWd4teDv>bM7ytqfTF(n
zS!>@tA0219x<`9#-}7;C_iMX9fpgX$mzvWO&MSJcv3lb+iR)&I=PG*_XxQnlE8k*s
zKSJjD);skMHb%SO99pcI!nG_}%<owFq!(v>ro7s+Ysb5Zdv<VdPYAtv)LnVYE<;D5
za^*M?|1*b~WHdPUEPvv=UF8Skjs-JzOZbNyE?VVY^+9ppA)h^o26N`=_nC_xkG$dj
z>0wojlG1~kIiW`<XgOJZU{dpZ+46q&y!@%Wd1i8xY;LsuF68-k%yEa%?2ml&LX5mt
zwOli)>`p(y_itH?xAEhR)1Mp=lhJ=9l_P#$_jrt;HK+LF^JP6NA5D}#`s4dYu`nqq
zIrh`i`4?J^m(I^x>ikXY$HjHkn-YNvR_<8)a+mn&0=;|Fw66H5&pUkhQLAavpOlql
z?x)V#Uth4|zi*`CZ%@%%S4!3g2FV{3oS{5BalJ_6*+)ycRr94f|83`()93GXD>%yI
zac`;F-P>_8{u7FR?F?DWt6LmDX<D78-}DcAwk?tUA7tjf?U6cXH=Fy`o}aS&-=zE#
z58C!{_9Qc&g<gGo+D<Rs^6l}gY0oDg)js`UmxO)bt#7Lfxx}Pqr7vBnl+vj3M)rq~
z3$MrG9bEgpH1~#R#WdGxvORxrm+LkE!mbHhE6yY^?~n_B_;^}jaY1v)YQ3L!kr9b^
z6Ib3^RCA?d-<^8b39Gi8NVsj6IKy!2N~I?*HmbVS^6w67Tlkk1Z`wRx>uLG2Ek8eN
zuh|)Vs_mM^#{+Dd8*dj(oN{&QByIcCahEmM{^q%<f2>8To?W(E-_^yq{d9Oj{}$!f
nOL{X`muG!{zhD*|2>xWB8M|?M){dXPpc2Z{)z4*}Q$iB}Oq?h6

diff --git a/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png
deleted file mode 100644
index 19534dfdfb4738e9c1dd4d0aec20d4a82c48a14e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_00SvWL_t(&-tE|1h*f162H<Bj8w+)!
znu4+;Aw(HQ6C|C3qM)b=5~9+ZpzHv4B2WrCS_zd&BvMd@S{Fe<8qpMVx*4g9kSHiE
zva=JJ9hfrh=H0N`?AXoTv-ix!|H5V+{<Zf1zw7(n_xskOprD|jprD|jpr8qQTDfUg
zZ|_(xKLoepZv5Hgx@q_xyJwD$j%iI(I{ct!U<h|&O@r|Ptiz5F*pAy<nW)o5R^TW+
zgN6CQR6L4d%)?{2G7;Oim5KK0Ac-SzZPIEL`tUH`!Tq=bH(@pQgxquZX0i}D5a(e&
ze#6r_e;2l38}^3COO^Z1Of=q`3}WxY`#2%TLpZ-OK8#cGG6w6`@fHri$uQAkUxOp@
zagKM_jc?6%dENQ@5|JgXPCTAO2Cx8&aT>mj(5sjgcN)%de{``FH{<PACm#=u^r1Jx
z-HI0ziRE}4heg2qMK^sB_@THc_pZiM?JT0*i1bGjUttk8R?=yGwl`+GI2!1|b+{}f
z;6j``QAB$10_Maz;k(NCNDAB%JP;l1#JxBXGjTYs!Vh>8PqdmP?WES_d5UMJf^SN?
zR52C%M*}<JNZTvpzb0}Uuq<Tf;8KisD<U^!@$cd_yk3_cv-8BO?aDdnry50fZ}xv|
z(vyvQMCRkR%JDj^P2G4SE>y*IJdXzxg%7j%xpBMWQu&uvNOhdZ!EvE&b;S-I!m+po
ze}v%1=wLQ3j&5o~|0@I+;G=H0@dqX62UDdbjjH+odEDr;27hsM>c?4lB@Xs4bgQzD
z;HRWT4ae7A^E-a|kNdxfZNt|S{bKcO`lh+*Ue~7;SLaG=@oE-7D{cEVI2|jav%lMo
zNIOL4MX*cpX{D1LN~^IeRyvsKUc;W4!6RuD8={*;YA;T;H@Z)7H9n}jd>XEgTg`~j
zS2mlY+uiTx%KnB1Bx<g-suHnY9Y8xoPQjCD*@tjX9PENr^IBy;Blf!}ZT^bM^c7`F
zQfVX>yAzk>OUXbA+Rv#q)6=@&k$UmJ&`ph;gfBy)ieutt{n5vkv@v5^*;t7b6ciK`
f6ciK`6g0&@hTXmQkgT6c00000NkvXXu0mjfe73L;

diff --git a/app/src/main/res/drawable/icon_cp_bolus_correction.png b/app/src/main/res/drawable/icon_cp_bolus_correction.png
deleted file mode 100644
index 582472dc9273600f30c9038e07b0e7fc04b739ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 948
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH86;Bt(kc`H+H_mtaCQ2Omc%G+Ms-<(vi47Z+rkt>MIMoznCc^FADRkH=
zQeazGP+D?^*U3X7%KOVs9qMm2nes;?XT}VX!x1*+yDmSuSA2e_@tmW-*IwTHea?4V
z+xwsQyf420eS(LIP^XL1M30mULGK?O552wl*Y-qpvt%~50>S>QE%UpjBW4%gXUsY9
z`l9e>`R~`>8klNdveI#quUjO&xll&_ir7sx6}`vNy=J*LT5T<EWf-`+Miuh%ZxBCS
zz<#{tOv##qe+&P*xjTs8yRzfEj^d?R>I)VrNxQOrd$?Uf?|G=|uM3T$tncT~j=7c`
z(LY;4%ztMn&(t!-kFuwa?)j-MBKlL+h*9}Q)8UFfMMLofui%SM7reMo)n1xhXMZqj
z%@N%kA<^^=Gaq~ka7o#?Lhbpnx%Kgu&mNlinTki*ed;QCq_^%-&kW({kD~Kk!gjfs
z?lwpaG;@%f=oi}A{OIKO$L%xJWh*+Fr<(nr;^sPyqccuM=>LVk6<v3eKK&1uS{dbC
z$R8e}nx{RH<)#w1t6J5O8~U+oZYPCa9xIgzoLaFgMJT1ar0eS?Cc`;invUB}aK;?c
zwh0O1+_XAu`w188IG;L;qnS(o?3?>VL#<&^_pwV8T~4{(b4~8PAt|=h*8O(ojNqSk
zD|Y?=sa@&n*OltEx#!AGvzVWE;w>MnsW1<iyhq9Q$DGaQEB1BtM(Vb0U^YJ5&5^Wu
e8Z6dKj?16d%QSzz*8d_Xvw6DuxvX<aXaWE=8+vm9

diff --git a/app/src/main/res/drawable/icon_quickwizard.png b/app/src/main/res/drawable/icon_quickwizard.png
deleted file mode 100644
index d65347f235d4048a7f840a7c7ae45ece6d55eb04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1393
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUhn_BuAsLNtZ$$UR7K<GJcs^vSbLicsWum!(<z2h9SBAwlPdTzwLuu)k
z#*T^woo=s$TG-_TRE@5f_)O_q;_MtFeI!-m)!IVo(2H3vTjze<aL)7lpY!+9&spxd
zdH+euxyb+j?^Un;ANTru{QreZVBpDrr|63g_2CZ#<k}yX_#7$7ap0e~uE+m?>5R6&
z8@aDN)ZWvX{vp_z@BEwdTlsU3-Ih6b=<bX;#%0QGkLu1GEIaw*-qiCZItP+x^!Ki{
zFj_LT+kmJ0!>&IH(;m9+Y2TUE>~T}h{IRgioi69KESs38b%mT<EPj2V^OBfTVSjpj
zEt7>m>ZzH&4%ytubI@C9>86}x+&hHa!|jYGS!Nq>TPK>hJyfchcjh+l`lRz|ve|97
z3(Jyz^SD1W`Y2X+B=qDQxs9jxN`!CBb(-#Rw)NznjTNgTkI&*vvA;9*Mp#l;z<ixx
zqx=7l{Ct#K+P&rUCf4#Ur}IT}e%V)crZMgG6{(zBx+7riDIUSBkf(7A<M=su>Yw^w
z{lPJ5_VpFTy=<4%!c0#y1#Z!-UD5ToyuyJcc<Qga-19EB{}#G!$)*>l*vnS5LgRwg
z?3~+gKK)o^lrH9XZ0F34Rnqsln6Kuz^PVbPEd6NT$@l(O@9z+MZ2qt$+~}L%+}CDZ
zt`=s=(rd$RW@VU62t4`zp5rt79_FK5{bz5OKi=uM&R2Xze!zPZxf8#hln2feo_$N^
zPRqBHH-c}Jr@Z!FShm`=A@rE~^*<LnntRzMoqC<}MrX-aiG?nc3zYhFcDS3*J08up
z@8SN9T*0ozmU_n999gQiuDG0jbY6(_UI)Izo<BmL{LI>T>xkER;jAw!{?x7ZlAk9s
z`ySWUOe>!g@2YHO^yrHI_Af2A5q5uKyJTKg>EptSe`NKe-s*fVoD;CjM)lQUZKV^^
zM`lY+G=86YN9j^t*0Fo~S#PiPyj`G_{(A4kSnc}TTKqE=Kh^mhz1R12hAvZVhp|id
zCKrwCv(EgT*7?iA^-GfT$B7<O`C{hS)KAO^;6Hg|nuule`-HD;7TO^*b+5cKWxoBX
zuB7YR)7y)FKQ&;w{)q3*)Sj;$4gLam4~JcRRKDfxoBNZ>H&-?G2>L4h>C1Q7cuur^
z!IxWhd-PvrF1^9ODaeY4y~8$1OD`Z=|45S0@$WnN#ODY^+rElZ;;Km5>-oc5<95N%
zuM;=PgeT-)Y+2+GWvf`m6&jrr9Y585w?#aU*pa9h{d1PBj#n06b?9)~7voW~JmPO!
zq-x)e#~)jMbq7ta|9zhQhrskMli7X2t=Iey$USoT(Y|7H{1L}D$$NU&|8IUieF_Yi
a9J4pAI`N>8T}>KPQhK`jxvX<aXaWHIeQqlN

diff --git a/app/src/main/res/drawable/remove.png b/app/src/main/res/drawable/remove.png
deleted file mode 100644
index 835575cea2ac5e90ae0b489a43af43a8a637274d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00084Nkl<ZI8Tj}
z%WD%s9LK+#W|M5PjT3F9_F*r@db47vP|&tstRQGB6+ywG7OF>!M?HxbQTzi$^rU#u
zQV?H<E_kXBXrX8=)R;EWG-<Mv*Y0fgCA(=uA|Bk+%<k{=nVtF0j{|_~9lH+*q98eA
zwWJQ+Po@{0asA`eg#2E&rmPvY8qWD3ih?vbHAQ}FI%Xa{q^!&uBrY8AO5^+Yk;+;O
zGX;ez2Itmrw|cwfD_5_Pa7!2#Q}H97!i#55DN{7JV0sVf4hBODXAd1Dd~6-I4N$#=
zSF}iP$I}s4aCvf)G)F`*R)CioNG3P&e0G)^jGYz)--Ge~!+pL~7J7lf10Awn#A~@w
z6}Vdn1*D1d=ZP5hfvE*}H4}-AJl@aGV=Nj4pP^vMv<v5q65izUR54K9!uBDGLBDii
zbd-o84>Yw5ukHaVCiJ`lWhDmA)Li&&j@Dp@bp<tv;FHdc94E~J4_z|>)dc&#3Y!&?
zHOhFGl^fs&fis!j+j=n~ijOaij6h=+w0II$W&?^{#>-3=%(5o#t!19n$J_7+p#U$P
z85$%+2t&_M=&@BaaUNKlfhAVNM_H!kR(#u%+8H?T*zhok2w|8d26cG}x~;;``5~YQ
zn#aO|TEv%Zwn5^i5E6XS*s&^XYZjE1uSgZr_>iL*XxW7>K8R*`Q1;mPq?E9@nXXB=
z8{Mt)$s<QecS}2L%>+xvk^B|ITxOH9N~JI0_b&{zwUHh^fF0mKIbdEbV=0}YcjK7|
zceAHcJ~cQ<b_T*Q3VFnr7a^rHRNczi?Gv7p`rA85FYkv9;G3!Ab7Gy|`MFWONWlOv
zorp$>npneJB3Xm$BM$JK6z%LH&N~NYy4`q@1TU)HxV7@Xy3vv7wuSm6YBBx|{O|k^
XZwHDXkz%aC00000NkvXXu0mjf7S&Q1

diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 9ed84e4779..93ec2d96d3 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_insulin_label"
-                android:src="@drawable/icon_bolus" />
+                android:src="@drawable/ic_bolus" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index e13d7fc872..26b8e08487 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/tempbasal_label"
-                android:src="@drawable/icon_cp_basal_start" />
+                android:src="@drawable/ic_cp_basal_start" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 47c406a0fd..418edb5623 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/overview_treatment_label"
-                android:src="@drawable/icon_bolus" />
+                android:src="@drawable/ic_bolus" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index e7074ecb45..e23cf759de 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/boluswizard"
-                android:src="@drawable/icon_calculator" />
+                android:src="@drawable/ic_calculator" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_wizardinfo.xml b/app/src/main/res/layout/dialog_wizardinfo.xml
index 3ce946ab0d..ee6609fd24 100644
--- a/app/src/main/res/layout/dialog_wizardinfo.xml
+++ b/app/src/main/res/layout/dialog_wizardinfo.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/icon_calculator" />
+                android:src="@drawable/ic_calculator" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 85920acfd0..5f56623663 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -497,7 +497,7 @@
                     android:layout_height="fill_parent"
                     android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableTop="@drawable/icon_bolus"
+                    android:drawableTop="@drawable/ic_bolus"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/overview_insulin_label"
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index 5d186ffaf4..443030ba65 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -26,7 +26,7 @@
                 android:adjustViewBounds="false"
                 android:cropToPadding="false"
                 android:scaleType="fitStart"
-                card_view:srcCompat="@drawable/icon_quickwizard" />
+                card_view:srcCompat="@drawable/ic_quickwizard" />
 
             <LinearLayout
                 android:orientation="vertical"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
index d834fcd642..692143d7e2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt
@@ -73,7 +73,7 @@ class TriggerPumpLastConnectionTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.remove), TriggerPumpLastConnection(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon())
     }
 
     @Test fun friendlyNameTest() {

From 3735af87e91d12d0e4dd14f42880390723de2af9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 16 Jun 2020 22:17:02 +0200
Subject: [PATCH 202/400] New Crowdin updates (#2723)

* New translations strings.xml (French)

* New translations exam.xml (French)
---
 app/src/main/res/values-fr-rFR/exam.xml    | 3 +++
 app/src/main/res/values-fr-rFR/strings.xml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-fr-rFR/exam.xml b/app/src/main/res/values-fr-rFR/exam.xml
index 315c87dd71..3111898534 100644
--- a/app/src/main/res/values-fr-rFR/exam.xml
+++ b/app/src/main/res/values-fr-rFR/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Qu\'est-ce qu\'il y a de vrai pour le DAI (Durée Action Insuline)?</string>
+    <string name="dia_label_exam">Rubrique : Durée de l\'Action de l\'Insuline</string>
     <string name="dia_minimumis3h">La valeur minimale est de 3 heures.</string>
     <string name="dia_minimumis5h">La valeur minimale est de 5 heures.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Application Loop sur iPhone.</string>
     <string name="nsclient_spikeiphone">Application Spike sur iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Children/Children.html</string>
+    <string name="isf_label_exam">Rubrique : Sensibilité à l\'Insuline (SI)</string>
     <string name="isf_increasingvalue">Les valeurs de SI plus élevées conduisent à moins d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
     <string name="isf_decreasingvalue">Des valeurs plus faibles de SI entraînent une diminution de l\'administration d\'insuline lorsque l\'AAPS corrige une hyperglycémie.</string>
     <string name="isf_noeffect">Changer les valeurs de SI n\'a aucun effet sur la quantité d\'insuline injectée quand AAPS corrige une hyperglycémie.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">La modification de la SI dans le profil est suffisant pour appliquer le changement.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/fr/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Rubrique : Ratio Glucides/Insuline</string>
     <string name="ic_increasingvalue">Les ratios G/I plus élevés conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_decreasingvalue">Les ratios G/I plus faibles conduisent à moins d\'insuline injectée pour une quantité donnée de glucides.</string>
     <string name="ic_noeffect">Si vous avez 0 GA, changer le ratio G/I conduira à différentes quantités d\'insuline pour corriger une valeur de glycémie donnée.</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 2b042ede0f..ca0d79cbdf 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1230,6 +1230,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="high_mark_comment">Valeur supérieure dans la plage (affichage uniquement)</string>
     <string name="reorder_label">Réordonner</string>
     <string name="age">Âge :</string>
+    <string name="weight_label">Poids :</string>
     <string name="id">ID :</string>
     <string name="submit">Envoyer</string>
     <string name="mostcommonprofile">Profil le plus courant :</string>
@@ -1248,7 +1249,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="randombg_short">Gly</string>
     <string name="tools">Outils</string>
     <string name="show_calculation">Afficher le calcul</string>
-    <string name="automation_event">Evénement d\'automatisation</string>
+    <string name="automation_event">Evénement auto.</string>
     <string name="alreadyset">Déjà configuré</string>
     <string name="clearqueueconfirm">Effacer la file d\'attente ? Toutes les données en file d\'attente seront perdues !</string>
     <string name="ebstopsloop">L\'utilisation du bolus étendu arrètera la boucle fermée pour la durée d\'exécution du bolus étendu. Voulez-vous vraiment le faire ?</string>

From 6b7420d0b744dcd22aa4a4eca803ab51b58e7cf5 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Wed, 17 Jun 2020 15:10:25 +0200
Subject: [PATCH 203/400] Fix data sent to WearOS by properly reacalculating
 them into current app unit

---
 .../general/wear/wearintegration/WatchUpdaterService.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index dd0babf951..ec6bf09265 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -323,7 +323,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMap.putString("avgDelta", deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units));
         }
         dataMap.putLong("sgvLevel", sgvLevel);
-        dataMap.putDouble("sgvDouble", lastBG.value);
+        dataMap.putDouble("sgvDouble", lastBG.valueToUnits(units));
         dataMap.putDouble("high", highLine);
         dataMap.putDouble("low", lowLine);
         return dataMap;

From 7f62450d99690f1b4d3d48b7fc127a0c179203b3 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Wed, 17 Jun 2020 15:53:46 +0200
Subject: [PATCH 204/400] Fix prediction data sent to WearOS by properly
 reacalculating them into current app unit

---
 .../general/wear/wearintegration/WatchUpdaterService.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index ec6bf09265..845e862373 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -536,9 +536,10 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             List<BgReading> predArray = finalLastRun.getConstraintsProcessed().getPredictions();
 
             if (!predArray.isEmpty()) {
+                final String units = profileFunction.getUnits();
                 for (BgReading bg : predArray) {
                     if (bg.value < 40) continue;
-                    predictions.add(predictionMap(bg.date, bg.value, bg.getPredectionColor()));
+                    predictions.add(predictionMap(bg.date, bg.valueToUnits(units), bg.getPredectionColor()));
                 }
             }
         }

From e69862a7c2ac0d33a04ef0176d60ab2cc3d89f1d Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 18 Jun 2020 08:15:38 +1200
Subject: [PATCH 205/400] Remove "

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

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index e4e2f5f352..6a5bcfd214 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -200,7 +200,7 @@
     <string name="smb_shortname">SMB</string>
 
     <!--    CarbsReq-->
-    <string name="carbsreq">"%dg Additional Carbs Required Within %d Minutes</string>
+    <string name="carbsreq">%dg Additional Carbs Required Within %d Minutes</string>
 
     <!--    TDDStatsActivity-->
     <string name="stats">Stats</string>

From c66084d3aba3b500f4ed2db62382a18239549db6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 19 Jun 2020 11:13:30 +0200
Subject: [PATCH 206/400] revert RandomBg safety

---
 .../nightscout/androidaps/plugins/source/RandomBgPlugin.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index 12af6cfe04..30ad89d43a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -31,6 +31,8 @@ class RandomBgPlugin @Inject constructor(
     injector: HasAndroidInjector,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
+    private val virtualPumpPlugin: VirtualPumpPlugin,
+    private val buildHelper: BuildHelper,
     private val sp: SP,
     private val nsUpload: NSUpload
 ) : PluginBase(PluginDescription()
@@ -72,7 +74,7 @@ class RandomBgPlugin @Inject constructor(
     }
 
     override fun specialEnableCondition(): Boolean {
-        return true //isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
+        return isRunningTest() || virtualPumpPlugin.isEnabled(PluginType.PUMP) && buildHelper.isEngineeringMode()
     }
 
     override fun handleNewData(intent: Intent) {

From e2cf0a7955523aec14749af55c77a7cb9fdfa8ae Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 19 Jun 2020 13:33:20 +0200
Subject: [PATCH 207/400] About 30 new svg files

---
 icons/actions_cancelextbolus.svg |  2 --
 icons/actions_refill.svg         | 14 ++++++++++++++
 icons/actions_startextbolus.svg  |  2 --
 icons/actions_temptarget.svg     | 18 ++++++++++++++++++
 icons/add.svg                    |  2 --
 icons/as.svg                     |  2 --
 icons/auto_delta.svg             |  2 --
 icons/bolus.svg                  |  2 --
 icons/calculator.svg             |  2 --
 icons/calibration.svg            |  2 --
 icons/clone.svg                  |  2 --
 icons/cp_aaps_offline.svg        | 23 +++++++++++++++++++++++
 icons/cp_age_batterie.svg        | 13 +++++++++++++
 icons/cp_age_canula.svg          | 14 ++++++++++++++
 icons/cp_age_insulin.svg         | 17 +++++++++++++++++
 icons/cp_age_sensor.svg          | 17 +++++++++++++++++
 icons/cp_announcement.svg        | 31 +++++++++++++++++++++++++++++++
 icons/cp_basal_end.svg           |  2 --
 icons/cp_basal_no_tbr.svg        |  2 --
 icons/cp_basal_tbr_high.svg      |  2 --
 icons/cp_basal_tbr_low.svg       |  2 --
 icons/cp_bgcheck.svg             | 17 +++++++++++++++++
 icons/cp_bgcheck2.svg            | 12 ++++++++++++
 icons/cp_bolus_carbs.svg         |  2 --
 icons/cp_bolus_combo.svg         |  9 +++++++++
 icons/cp_bolus_correction.svg    |  2 --
 icons/cp_bolus_meal.svg          | 19 +++++++++++++++++++
 icons/cp_bolus_snack.svg         | 18 ++++++++++++++++++
 icons/cp_cgm_insert.svg          | 20 ++++++++++++++++++++
 icons/cp_cgm_profile.svg         | 15 +++++++++++++++
 icons/cp_cgm_start.svg           | 24 ++++++++++++++++++++++++
 icons/cp_cgm_target.svg          | 19 +++++++++++++++++++
 icons/cp_exercise.svg            | 23 +++++++++++++++++++++++
 icons/cp_note.svg                | 17 +++++++++++++++++
 icons/cp_pump_battery.svg        | 13 +++++++++++++
 icons/cp_pump_canula.svg         | 14 ++++++++++++++
 icons/cp_pump_cartridge.svg      | 17 +++++++++++++++++
 icons/cp_question.svg            | 12 ++++++++++++
 icons/danar_useropt.svg          | 27 +++++++++++++++++++++++++++
 icons/danarhistory.svg           | 14 ++++++++++++++
 icons/danarprofile.svg           | 15 +++++++++++++++
 icons/danarstat.svg              | 10 ++++++++++
 icons/local_activate.svg         | 15 +++++++++++++++
 icons/local_reset.svg            | 13 +++++++++++++
 icons/local_save.svg             | 12 ++++++++++++
 icons/loop_closed.svg            |  2 --
 icons/loop_disabled.svg          |  2 --
 icons/loop_disconnected.svg      |  2 --
 icons/loop_lgs.svg               |  2 --
 icons/loop_open.svg              |  2 --
 icons/loop_paused.svg            |  2 --
 icons/loop_superbolus.svg        |  2 --
 icons/quickwizard.svg            |  2 --
 icons/remove.svg                 |  2 --
 icons/visibility.svg             | 10 ++++++++++
 icons/x_swap_vert.svg            |  2 --
 icons/xdrip.svg                  |  2 --
 57 files changed, 512 insertions(+), 52 deletions(-)
 create mode 100644 icons/actions_refill.svg
 create mode 100644 icons/actions_temptarget.svg
 create mode 100644 icons/cp_aaps_offline.svg
 create mode 100644 icons/cp_age_batterie.svg
 create mode 100644 icons/cp_age_canula.svg
 create mode 100644 icons/cp_age_insulin.svg
 create mode 100644 icons/cp_age_sensor.svg
 create mode 100644 icons/cp_announcement.svg
 create mode 100644 icons/cp_bgcheck.svg
 create mode 100644 icons/cp_bgcheck2.svg
 create mode 100644 icons/cp_bolus_combo.svg
 create mode 100644 icons/cp_bolus_meal.svg
 create mode 100644 icons/cp_bolus_snack.svg
 create mode 100644 icons/cp_cgm_insert.svg
 create mode 100644 icons/cp_cgm_profile.svg
 create mode 100644 icons/cp_cgm_start.svg
 create mode 100644 icons/cp_cgm_target.svg
 create mode 100644 icons/cp_exercise.svg
 create mode 100644 icons/cp_note.svg
 create mode 100644 icons/cp_pump_battery.svg
 create mode 100644 icons/cp_pump_canula.svg
 create mode 100644 icons/cp_pump_cartridge.svg
 create mode 100644 icons/cp_question.svg
 create mode 100644 icons/danar_useropt.svg
 create mode 100644 icons/danarhistory.svg
 create mode 100644 icons/danarprofile.svg
 create mode 100644 icons/danarstat.svg
 create mode 100644 icons/local_activate.svg
 create mode 100644 icons/local_reset.svg
 create mode 100644 icons/local_save.svg
 create mode 100644 icons/visibility.svg

diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg
index 98c7fa503b..7deda488e6 100644
--- a/icons/actions_cancelextbolus.svg
+++ b/icons/actions_cancelextbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="actions_x5F_cancelextbolus">
diff --git a/icons/actions_refill.svg b/icons/actions_refill.svg
new file mode 100644
index 0000000000..4514fd0788
--- /dev/null
+++ b/icons/actions_refill.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="actions_x5F_refill">
+    <path fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" d="M18.693,9.268
+            c-1.078-2.638-3.669-4.497-6.695-4.497c-3.993,0-7.229,3.237-7.229,7.229"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="18.693" y1="9.268" x2="18.937" y2="4.778"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="18.693" y1="9.268" x2="14.54" y2="7.538"/>
+    <path fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" d="M5.307,14.733
+            c1.078,2.638,3.669,4.497,6.695,4.497c3.993,0,7.229-3.237,7.229-7.229"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="5.307" y1="14.733" x2="5.063" y2="19.223"/>
+    <line fill="none" stroke="#E93057" stroke-width="1.2756" stroke-linecap="round" stroke-miterlimit="10" x1="5.307" y1="14.733" x2="9.46" y2="16.463"/>
+</g>
+</svg>
diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg
index 0c5d79384a..de895cc860 100644
--- a/icons/actions_startextbolus.svg
+++ b/icons/actions_startextbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="actions_x5F_startextbolus">
diff --git a/icons/actions_temptarget.svg b/icons/actions_temptarget.svg
new file mode 100644
index 0000000000..7d2304705d
--- /dev/null
+++ b/icons/actions_temptarget.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="actions_x5F_temptarget">
+	<path fill="#36FF00" d="M18.71,11.606h-0.736c-0.198-3.001-2.579-5.382-5.58-5.58V5.29c0-0.218-0.177-0.394-0.394-0.394
+		s-0.394,0.177-0.394,0.394v0.736c-3.001,0.198-5.382,2.579-5.58,5.58H5.29c-0.218,0-0.394,0.177-0.394,0.394
+		s0.177,0.394,0.394,0.394h0.736c0.198,3.001,2.579,5.382,5.58,5.58v0.736c0,0.217,0.177,0.394,0.394,0.394s0.394-0.177,0.394-0.394
+		v-0.736c3.001-0.198,5.382-2.579,5.58-5.58h0.736c0.217,0,0.394-0.177,0.394-0.394S18.927,11.606,18.71,11.606z M17.143,11.606
+		h-1.944c-0.179-1.478-1.331-2.643-2.804-2.841V6.85C14.939,7.044,16.953,9.06,17.143,11.606z M13.542,12.394h0.938
+		c-0.171,1.079-1.01,1.93-2.085,2.115v-0.967c0-0.217-0.177-0.394-0.394-0.394s-0.394,0.177-0.394,0.394v0.975
+		c-1.111-0.156-1.988-1.017-2.163-2.122h1.016c0.218,0,0.394-0.177,0.394-0.394s-0.177-0.394-0.394-0.394H9.442
+		c0.171-1.111,1.049-1.978,2.164-2.134v0.987c0,0.218,0.177,0.394,0.394,0.394s0.394-0.177,0.394-0.394v-0.98
+		c1.079,0.185,1.92,1.041,2.086,2.126h-0.939c-0.217,0-0.394,0.177-0.394,0.394S13.324,12.394,13.542,12.394z M11.606,6.851v1.906
+		C10.095,8.921,8.903,10.1,8.72,11.606H6.864C7.053,9.062,9.064,7.047,11.606,6.851z M6.866,12.394H8.72
+		c0.183,1.505,1.374,2.684,2.885,2.849v1.884C9.071,16.931,7.065,14.928,6.866,12.394z M12.394,17.128v-1.893
+		c1.473-0.197,2.625-1.362,2.804-2.841h1.942C16.941,14.93,14.932,16.935,12.394,17.128z"/>
+</g>
+</svg>
diff --git a/icons/add.svg b/icons/add.svg
index ee6825ecad..3b73b8367e 100644
--- a/icons/add.svg
+++ b/icons/add.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="add">
diff --git a/icons/as.svg b/icons/as.svg
index 0ea0090571..a13e5cfd02 100644
--- a/icons/as.svg
+++ b/icons/as.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="as">
diff --git a/icons/auto_delta.svg b/icons/auto_delta.svg
index ce90280726..8bbdb89cfb 100644
--- a/icons/auto_delta.svg
+++ b/icons/auto_delta.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="auto_x5F_delta">
diff --git a/icons/bolus.svg b/icons/bolus.svg
index 24108f0e2e..b144a70123 100644
--- a/icons/bolus.svg
+++ b/icons/bolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="bolus">
diff --git a/icons/calculator.svg b/icons/calculator.svg
index 5a8b336a61..dbb8787c48 100644
--- a/icons/calculator.svg
+++ b/icons/calculator.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="calculator">
diff --git a/icons/calibration.svg b/icons/calibration.svg
index 8db9f88fe9..5ddac27412 100644
--- a/icons/calibration.svg
+++ b/icons/calibration.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="calibration">
diff --git a/icons/clone.svg b/icons/clone.svg
index 16226c69c9..50e25e0af5 100644
--- a/icons/clone.svg
+++ b/icons/clone.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="clone">
diff --git a/icons/cp_aaps_offline.svg b/icons/cp_aaps_offline.svg
new file mode 100644
index 0000000000..7e9adf9a22
--- /dev/null
+++ b/icons/cp_aaps_offline.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="Layer_51">
+	<g>
+		<circle fill="#E93057" cx="12" cy="17.813" r="1.5"/>
+		<path fill="#E93057" d="M19.357,6.125c0.195-0.196,0.195-0.512,0-0.708c-0.195-0.195-0.512-0.195-0.707,0l-2.364,2.364
+			C14.916,7.314,13.477,7.062,12,7.062c-2.902,0-5.674,0.925-8.015,2.675c-0.222,0.166-0.267,0.479-0.102,0.7
+			c0.166,0.222,0.479,0.266,0.7,0.102C6.751,8.919,9.315,8.063,12,8.063c1.198,0,2.369,0.177,3.493,0.512l-1.829,1.829
+			c-0.547-0.093-1.1-0.154-1.663-0.154c-2.212,0-4.325,0.705-6.111,2.039c-0.222,0.166-0.267,0.479-0.102,0.701
+			c0.166,0.221,0.478,0.267,0.7,0.101C8.099,11.887,10.005,11.25,12,11.25c0.26,0,0.516,0.022,0.773,0.044l-2.215,2.215
+			c-1.012,0.201-1.989,0.596-2.839,1.231c-0.222,0.165-0.267,0.479-0.102,0.7c0.166,0.22,0.479,0.268,0.7,0.101
+			c0.192-0.143,0.392-0.271,0.597-0.389l-2.618,2.618c-0.195,0.195-0.195,0.512,0,0.707c0.098,0.098,0.226,0.146,0.354,0.146
+			s0.256-0.049,0.354-0.146L19.357,6.125z"/>
+		<path fill="#E93057" d="M20.016,9.737c-0.562-0.42-1.15-0.789-1.757-1.113L17.513,9.37c0.66,0.331,1.299,0.717,1.903,1.169
+			c0.09,0.067,0.195,0.1,0.3,0.1c0.152,0,0.303-0.069,0.4-0.201C20.282,10.216,20.236,9.902,20.016,9.737z"/>
+		<path fill="#E93057" d="M15.867,11.016l-0.776,0.776c0.856,0.307,1.671,0.739,2.421,1.298c0.09,0.067,0.195,0.1,0.3,0.1
+			c0.152,0,0.303-0.069,0.4-0.2c0.166-0.222,0.12-0.535-0.101-0.701C17.409,11.764,16.656,11.341,15.867,11.016z"/>
+		<path fill="#E93057" d="M13.394,13.489l-0.887,0.887c1.13,0.091,2.24,0.467,3.176,1.166c0.09,0.067,0.195,0.1,0.3,0.1
+			c0.152,0,0.303-0.069,0.4-0.2c0.166-0.222,0.12-0.535-0.101-0.7C15.418,14.095,14.424,13.688,13.394,13.489z"/>
+	</g>
+</g>
+</svg>
diff --git a/icons/cp_age_batterie.svg b/icons/cp_age_batterie.svg
new file mode 100644
index 0000000000..7976c9eb9f
--- /dev/null
+++ b/icons/cp_age_batterie.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_battery">
+    <path opacity="0.5" fill="#FFFFFF" d="M20.234,10.422c-0.362,0-0.656,0.294-0.656,0.656v0.297h-0.469V9.031c0-0.87-0.708-1.578-1.578-1.578
+        H4.188c-0.87,0-1.578,0.708-1.578,1.578v5.938c0,0.87,0.708,1.578,1.578,1.578h13.344c0.72,0,1.323-0.488,1.511-1.149
+        c0.01,0.001,0.018,0.006,0.028,0.006c0.332,0,0.602-0.297,0.602-0.664c0-0.351-0.25-0.632-0.563-0.655v-1.46h0.469v0.297
+        c0,0.362,0.294,0.656,0.656,0.656s0.656-0.294,0.656-0.656v-1.844C20.891,10.716,20.597,10.422,20.234,10.422z M18.109,14.969
+        c0,0.318-0.26,0.578-0.578,0.578H4.188c-0.319,0-0.578-0.26-0.578-0.578V9.031c0-0.319,0.259-0.578,0.578-0.578h13.344
+        c0.318,0,0.578,0.259,0.578,0.578V14.969z"/>
+    <polygon opacity="0.5" fill="#FFFFFF" points="9.703,10.273 5.766,13.195 9.219,11.977 11,13.742 15.438,10.258 11.141,11.945 		"/>
+</g>
+</svg>
diff --git a/icons/cp_age_canula.svg b/icons/cp_age_canula.svg
new file mode 100644
index 0000000000..68aed614a5
--- /dev/null
+++ b/icons/cp_age_canula.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_canula">
+	<path opacity="0.5" fill="#FFFFFF" d="M20.951,10.458h-1.99c-0.054-0.733-0.659-1.313-1.406-1.313h-2.354
+		c-0.747,0-1.352,0.58-1.406,1.313h-1.99c-0.388,0-0.696,0.27-0.771,0.622c-1.32-0.021-2.226-0.555-2.936-0.999
+		c-0.7-0.437-1.304-0.814-2.005-0.434c-1.202,0.654-0.843,2.024-0.554,3.126c0.192,0.731,0.39,1.489,0.098,1.836
+		c-0.603,0.718-2.212,0.276-2.781,0.045c-0.143-0.057-0.31,0.011-0.369,0.156c-0.059,0.146,0.011,0.311,0.156,0.369
+		c0.061,0.024,0.971,0.388,1.893,0.388c0.574,0,1.153-0.142,1.534-0.593c0.482-0.571,0.256-1.433,0.017-2.345
+		c-0.323-1.234-0.479-2.074,0.276-2.485c0.392-0.213,0.762-0.003,1.434,0.417c0.755,0.471,1.766,1.123,3.359,1.096
+		C11.301,11.859,11.531,12,11.806,12h4.406v5.771l0.333-0.854V12h4.406c0.443,0,0.802-0.345,0.802-0.771
+		S21.394,10.458,20.951,10.458z"/>
+</g>
+</svg>
diff --git a/icons/cp_age_insulin.svg b/icons/cp_age_insulin.svg
new file mode 100644
index 0000000000..f296ea8bed
--- /dev/null
+++ b/icons/cp_age_insulin.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_insulin">
+	<path opacity="0.5" fill="#FFFFFF" d="M19.455,9.988l-0.947-1.652c-0.144-0.252-0.482-0.329-0.753-0.174
+		c-0.171,0.098-0.266,0.267-0.283,0.44l-1.149-0.585c-0.093-0.042-0.202-0.037-0.292,0.015l-9.796,5.614l-0.156-0.271
+		c-0.187-0.326-0.61-0.434-0.945-0.242c-0.336,0.192-0.456,0.612-0.269,0.938l2.747,4.79c0.187,0.326,0.61,0.434,0.945,0.242
+		c0.336-0.192,0.456-0.612,0.269-0.938L8.67,17.896l9.796-5.614c0.09-0.052,0.15-0.143,0.16-0.244l0.076-1.289
+		c0.158,0.072,0.351,0.076,0.522-0.022C19.496,10.57,19.599,10.239,19.455,9.988z M17.407,12.176l-1.127-1.769
+		c-0.055-0.086-0.172-0.11-0.261-0.054c-0.086,0.055-0.115,0.165-0.066,0.251c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755
+		l-0.752,0.431l-1.127-1.769c-0.055-0.086-0.172-0.111-0.261-0.054c-0.086,0.054-0.115,0.165-0.066,0.251
+		c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755l-0.752,0.431l-1.127-1.769c-0.055-0.086-0.172-0.111-0.261-0.054
+		c-0.087,0.055-0.115,0.165-0.066,0.251c0.001,0.002,0.003,0.005,0.004,0.007l1.118,1.755l-0.655,0.375l-1.552-2.482
+		c-0.053-0.084-0.165-0.111-0.254-0.06L6.82,14.666l-0.277-0.483l9.652-5.532l1.685,0.87l0.236,0.412l-0.101,1.894L17.407,12.176z"
+		/>
+</g>
+</svg>
diff --git a/icons/cp_age_sensor.svg b/icons/cp_age_sensor.svg
new file mode 100644
index 0000000000..2249a405c7
--- /dev/null
+++ b/icons/cp_age_sensor.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_age_x5F_sensor">
+		<path opacity="0.5" fill="#FFFFFF" d="M13.568,13.328c0.673,0,1.219-0.546,1.219-1.219s-0.546-1.219-1.219-1.219
+			c-0.493,0-0.913,0.296-1.105,0.718h-1.603L9.464,8.126c-0.078-0.195-0.246-0.309-0.48-0.314c-0.21,0.006-0.394,0.144-0.459,0.343
+			l-2.16,6.53l-1.131-2.751c-0.077-0.188-0.26-0.31-0.463-0.31h-2c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5h1.665l1.518,3.69
+			c0.078,0.188,0.261,0.31,0.463,0.31c0.006,0,0.012,0,0.018,0c0.209-0.008,0.392-0.145,0.458-0.343L9.045,9.77l1.012,2.525
+			c0.076,0.19,0.26,0.314,0.464,0.314h1.941C12.654,13.031,13.074,13.328,13.568,13.328z"/>
+		<path opacity="0.5" fill="#FFFFFF" d="M13.567,15.055c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c2.176,0,3.945-1.77,3.945-3.945s-1.77-3.946-3.945-3.946c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c1.624,0,2.945,1.321,2.945,2.945S15.191,15.055,13.567,15.055z"/>
+		<path opacity="0.5" fill="#FFFFFF" d="M13.567,5.14c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c3.291,0,5.969,2.677,5.969,5.968s-2.678,5.969-5.969,5.969c-0.276,0-0.5,0.224-0.5,0.5s0.224,0.5,0.5,0.5
+			c3.843,0,6.969-3.126,6.969-6.969S17.41,5.14,13.567,5.14z"/>
+</g>
+</svg>
diff --git a/icons/cp_announcement.svg b/icons/cp_announcement.svg
new file mode 100644
index 0000000000..7cbeeaa2ec
--- /dev/null
+++ b/icons/cp_announcement.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_announcement">
+    <path fill="#CF8BFE" d="M11.206,16.276c0.251,0.308,0.504,0.635,0.459,1.095c-0.02,0.201,0.178,0.295,0.327,0.395
+        c0.265,0.178,0.542,0.34,0.793,0.536c0.408,0.32,0.385,0.624-0.047,0.896c-0.017,0.011-0.037,0.016-0.054,0.026
+        c-1.333,0.78-1.335,0.782-2.448-0.311c-0.215-0.211-0.453-0.389-0.696-0.565c-0.365-0.264-0.719-0.395-1.143-0.101
+        c-0.277,0.192-0.624,0.169-0.934,0.111c-1.354-0.252-2.631-1.535-2.535-3.042c0.019-0.294,0.105-0.547,0.297-0.763
+        c0.331-0.373,0.657-0.751,1.001-1.112c0.736-0.77,1.133-1.67,1.129-2.747C7.352,9.78,7.347,8.864,7.824,8.024
+        C8.29,7.202,8.837,6.939,9.766,7.135c1.042,0.219,1.921,0.766,2.751,1.396c1.204,0.914,2.211,2.014,2.978,3.322
+        c0.396,0.675,0.718,1.372,0.734,2.185c0.011,0.586-0.253,1.005-0.706,1.303c-0.505,0.331-1.057,0.532-1.687,0.526
+        c-0.775-0.007-1.55,0.059-2.314,0.208C11.404,16.097,11.284,16.119,11.206,16.276z M14.578,14.418
+        c0.569,0.014,0.801-0.217,0.737-0.695c-0.053-0.395-0.183-0.77-0.384-1.124c-0.907-1.598-2.196-2.833-3.677-3.881
+        c-0.47-0.333-0.977-0.61-1.569-0.705C9.095,7.917,8.867,8.093,8.882,8.694C8.892,9.151,9.077,9.55,9.303,9.927
+        c0.927,1.55,2.165,2.807,3.667,3.802C13.487,14.072,14.032,14.361,14.578,14.418z M13.257,14.946
+        c-2.056-1.171-3.673-2.769-4.904-4.794c-0.061,0.218-0.053,0.408-0.063,0.597c-0.032,0.619-0.081,1.262-0.399,1.789
+        c-0.344,0.571-0.24,1.045,0.049,1.556c0.411,0.726,0.998,1.233,1.805,1.473c0.216,0.064,0.444,0.108,0.642-0.002
+        C11.274,15.069,12.238,14.986,13.257,14.946z"/>
+    <path fill="#CF8BFE" d="M16.92,11.417c-0.248,0-0.368,0.005-0.487-0.001c-0.156-0.008-0.262-0.092-0.297-0.245
+        c-0.037-0.161,0.051-0.281,0.186-0.335c0.294-0.118,0.596-0.219,0.898-0.317c0.245-0.079,0.496-0.141,0.743-0.212
+        c0.48-0.137,0.537-0.086,0.689,0.353c0.159,0.461-0.153,0.519-0.447,0.573C17.737,11.318,17.264,11.369,16.92,11.417z"/>
+    <path fill="#CF8BFE" d="M11.785,6.597c0.078-0.501,0.158-1.052,0.25-1.6c0.063-0.378,0.362-0.329,0.61-0.283
+        c0.282,0.052,0.473,0.195,0.346,0.547c-0.182,0.506-0.335,1.022-0.505,1.531c-0.072,0.216-0.175,0.437-0.45,0.385
+        C11.746,7.123,11.777,6.868,11.785,6.597z"/>
+    <path fill="#CF8BFE" d="M14.693,8.893c-0.307-0.002-0.468-0.26-0.292-0.486c0.388-0.501,0.798-0.987,1.226-1.453
+        c0.207-0.225,0.452-0.092,0.631,0.079c0.161,0.154,0.301,0.364,0.087,0.569c-0.472,0.453-0.968,0.879-1.508,1.251
+        C14.792,8.884,14.725,8.885,14.693,8.893z"/>
+    <path fill="#CF8BFE" d="M12.97,11.989c0,0.14,0.021,0.283-0.004,0.419c-0.061,0.328-0.321,0.463-0.563,0.249
+        c-0.644-0.568-1.271-1.159-1.812-1.829c-0.18-0.223-0.127-0.384,0.163-0.488C11.871,9.941,12.986,10.76,12.97,11.989z"/>
+</g>
+</svg>
diff --git a/icons/cp_basal_end.svg b/icons/cp_basal_end.svg
index f510137ad0..3fe2865820 100644
--- a/icons/cp_basal_end.svg
+++ b/icons/cp_basal_end.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_end">
diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg
index 198afcf383..4c08c1afa6 100644
--- a/icons/cp_basal_no_tbr.svg
+++ b/icons/cp_basal_no_tbr.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_no_x5F_tbr">
diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg
index eaa4f986ff..276b614826 100644
--- a/icons/cp_basal_tbr_high.svg
+++ b/icons/cp_basal_tbr_high.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_high">
diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg
index d591a1941f..c5cd270693 100644
--- a/icons/cp_basal_tbr_low.svg
+++ b/icons/cp_basal_tbr_low.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_basal_x5F_tbr_x5F_low">
diff --git a/icons/cp_bgcheck.svg b/icons/cp_bgcheck.svg
new file mode 100644
index 0000000000..f0215a16d0
--- /dev/null
+++ b/icons/cp_bgcheck.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bgcheck">
+    <path fill="#E9375C" d="M6.384,15.052c-0.018-0.323,0.025-0.625,0.418-0.671c0.36-0.042,0.49,0.218,0.531,0.516
+        c0.155,1.131,0.771,1.799,1.92,1.948c0.336,0.043,0.592,0.192,0.528,0.573c-0.059,0.351-0.373,0.388-0.654,0.387
+        C7.775,17.801,6.4,16.415,6.384,15.052z"/>
+    <path fill="#E83258" d="M18.817,9.875c-0.377-1.485-1.932-3.719-2.256-3.719c-0.325,0-1.884,2.238-2.26,3.721
+        c-0.251,0.991,0.067,1.842,0.943,2.421c0.855,0.565,1.778,0.556,2.632-0.008C18.755,11.712,19.071,10.874,18.817,9.875z
+         M17.437,11.623c-0.297,0.196-0.595,0.295-0.886,0.295c-0.286,0-0.577-0.097-0.866-0.287c-0.586-0.387-0.779-0.882-0.608-1.558
+        c0.236-0.933,0.997-2.169,1.484-2.813c0.486,0.644,1.244,1.878,1.481,2.812C18.213,10.745,18.021,11.237,17.437,11.623z"/>
+    <path fill="#E83258" d="M13.737,13.869c-0.726-2.859-3.893-7.275-4.343-7.275c-0.45,0-3.627,4.425-4.349,7.278
+        c-0.483,1.908,0.128,3.546,1.816,4.66c1.646,1.087,3.422,1.07,5.067-0.015C13.617,17.403,14.225,15.791,13.737,13.869z
+         M11.487,17.85c-0.694,0.457-1.405,0.689-2.112,0.689c-0.698,0-1.396-0.227-2.074-0.675c-1.389-0.916-1.887-2.193-1.481-3.796
+        c0.563-2.22,3.332-6.141,3.574-6.141s3.003,3.917,3.568,6.138C13.368,15.663,12.871,16.937,11.487,17.85z"/>
+</g>
+</svg>
diff --git a/icons/cp_bgcheck2.svg b/icons/cp_bgcheck2.svg
new file mode 100644
index 0000000000..e44b4a49a9
--- /dev/null
+++ b/icons/cp_bgcheck2.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bgcheck2">
+		<path fill="#E83258" d="M9.576,6.295c1.872,3.062,4.551,5.654,4.114,9.509c-0.269,2.368-2.657,3.819-5.025,3.361
+			c-2.253-0.436-3.809-2.675-3.331-4.967C5.954,11.218,7.718,8.829,9.576,6.295z M7.238,12.157c-0.223,0.67-0.514,1.326-0.652,2.013
+			c-0.215,1.068-0.069,2.095,0.803,2.87c0.312,0.277,0.714,0.372,1.091,0.08c0.254-0.197,0.283-0.484,0.101-0.727
+			C7.646,15.142,7.188,13.762,7.238,12.157z"/>
+		<path fill="#E83258" d="M16.521,5.632c0.995,1.348,1.923,2.631,2.308,4.206c0.26,1.06-0.064,1.948-0.962,2.562
+			c-0.874,0.598-1.818,0.607-2.693,0.008c-0.897-0.614-1.222-1.517-0.965-2.568C14.593,8.267,15.516,6.979,16.521,5.632z"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg
index b62b07c538..9e797f244f 100644
--- a/icons/cp_bolus_carbs.svg
+++ b/icons/cp_bolus_carbs.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_bolus_x5F_carbs">
diff --git a/icons/cp_bolus_combo.svg b/icons/cp_bolus_combo.svg
new file mode 100644
index 0000000000..5e4b9ea0ce
--- /dev/null
+++ b/icons/cp_bolus_combo.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_combo">
+	<polygon fill="#67DFE8" points="20.104,17.021 20.104,5.958 14.25,5.958 14.25,9.729 9.479,9.729 9.479,17.021 1.609,17.021
+		1.609,18.021 10.479,18.021 10.479,10.729 14.25,10.729 14.25,18.021 15.25,18.021 15.25,6.959 19.104,6.959 19.104,18.021
+		21.708,18.021 21.708,17.021 	"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_correction.svg b/icons/cp_bolus_correction.svg
index 1ccec87132..f19840b68f 100644
--- a/icons/cp_bolus_correction.svg
+++ b/icons/cp_bolus_correction.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="cp_x5F_bolus_x5F_correction">
diff --git a/icons/cp_bolus_meal.svg b/icons/cp_bolus_meal.svg
new file mode 100644
index 0000000000..e9d041c1c0
--- /dev/null
+++ b/icons/cp_bolus_meal.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_meal">
+    <path fill="#FEAF05" d="M20.528,15.994h-0.547c-0.244-3.433-2.748-6.265-6.013-7.017c-0.095-0.871-0.825-1.553-1.721-1.553
+        c-0.895,0-1.627,0.683-1.721,1.553c-3.264,0.752-5.768,3.584-6.013,7.017H3.966c-0.235,0-0.425,0.19-0.425,0.425
+        s0.19,0.425,0.425,0.425h16.562c0.234,0,0.425-0.19,0.425-0.425S20.763,15.994,20.528,15.994z M12.248,8.076
+        c0.489,0,0.888,0.33,1.024,0.776c-0.336-0.045-0.677-0.077-1.024-0.077c-0.348,0-0.688,0.032-1.025,0.077
+        C11.359,8.407,11.758,8.076,12.248,8.076z M12.248,9.625c3.603,0,6.599,2.82,6.883,6.369H5.365
+        C5.649,12.445,8.645,9.625,12.248,9.625z"/>
+    <path fill="#FEAF05" d="M14.495,10.781c-0.625-0.288-1.503-0.485-2.409-0.541c-0.234-0.014-0.436,0.164-0.45,0.399
+        c-0.014,0.234,0.164,0.436,0.399,0.45c0.792,0.048,1.579,0.222,2.104,0.464c0.049,0.023,0.101,0.035,0.152,0.038
+        c0.17,0.01,0.337-0.083,0.412-0.246C14.801,11.133,14.708,10.88,14.495,10.781z"/>
+    <path fill="#FEAF05" d="M6.657,15.362c-0.031,0.001-0.065-0.003-0.101-0.012c-0.2-0.05-0.323-0.254-0.273-0.454
+        c0.457-1.834,1.769-3.395,3.51-4.178c0.045-0.02,0.094-0.031,0.144-0.033c0.152-0.004,0.29,0.083,0.352,0.221
+        c0.041,0.092,0.045,0.194,0.009,0.287c-0.036,0.094-0.106,0.168-0.197,0.208c-1.534,0.69-2.689,2.063-3.09,3.674
+        C6.971,15.241,6.825,15.358,6.657,15.362z"/>
+</g>
+</svg>
diff --git a/icons/cp_bolus_snack.svg b/icons/cp_bolus_snack.svg
new file mode 100644
index 0000000000..61abed4a14
--- /dev/null
+++ b/icons/cp_bolus_snack.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_bolus_x5F_snack">
+	<path display="inline" fill="#6EE870" d="M17.44,12.691c0.014,1.998-0.63,3.425-1.684,4.674c-0.756,0.896-1.908,1.144-3.027,0.72
+		c-0.27-0.103-0.531-0.139-0.812-0.054c-1.598,0.482-2.731,0.144-3.638-1.256c-1.076-1.661-1.531-3.49-0.981-5.454
+		c0.555-1.984,2.385-2.847,4.309-2.074c0.339,0.136,0.662,0.212,1.037,0.098C15.682,8.411,17.449,9.77,17.44,12.691z M7.763,12.765
+		c-0.006,1.123,0.402,2.593,0.959,3.451c0.831,1.281,1.572,1.552,2.999,1.081c0.395-0.13,0.796-0.165,1.16,0.026
+		c1.13,0.59,1.993,0.123,2.64-0.754c1.042-1.413,1.47-3.04,1.154-4.781c-0.33-1.819-1.703-2.542-3.398-1.858
+		c-0.705,0.284-1.379,0.274-2.075-0.025c-0.302-0.13-0.639-0.24-0.963-0.25C8.675,9.61,7.774,10.759,7.763,12.765z"/>
+	<path display="inline" fill="#6EE870" d="M11.034,8.824C9.913,8.797,8.47,7.663,8.178,6.641c-0.096-0.336,0.125-0.317,0.31-0.346
+		c1.093-0.175,2.761,0.947,3.053,2.037C11.689,8.884,11.28,8.779,11.034,8.824z M9.202,7.065c0.365,0.575,0.753,0.928,1.424,0.999
+		C10.312,7.475,9.882,7.186,9.202,7.065z"/>
+	<path display="inline" fill="#6EE870" d="M12.186,6.575c0.592-0.057,0.772,0.169,0.702,0.626c-0.08,0.527-0.166,1.054-0.23,1.583
+		c-0.029,0.236-0.132,0.363-0.368,0.378c-0.256,0.016-0.417-0.091-0.451-0.358c-0.077-0.607-0.184-1.212-0.225-1.821
+		C11.582,6.479,12.031,6.635,12.186,6.575z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_insert.svg b/icons/cp_cgm_insert.svg
new file mode 100644
index 0000000000..975cce05b5
--- /dev/null
+++ b/icons/cp_cgm_insert.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_insert">
+	<path display="inline" fill="#67DFE8" d="M22.44,7.685l-1.772-1.804L7.299,6.383C5.777,6.404,4.707,7.29,4.373,8.099
+		c-1.247,0.944-2.605,2.549-2.668,3.198c-0.035,0.357,0.038,0.638,0.216,0.834c0.104,0.115,0.292,0.251,0.599,0.251h18.345
+		c0.719,0,1.282-0.721,1.282-1.642c0-0.065-0.011-0.137-0.028-0.213c0.221-0.181,0.402-0.429,0.53-0.737
+		C22.965,9.026,22.875,8.119,22.44,7.685z M5.398,8.111C5.56,7.917,6.176,7.283,7.322,7.267l12.99-0.488l1.501,1.528
+		c0.139,0.139,0.217,0.666,0.019,1.144c-0.146,0.352-0.375,0.531-0.682,0.531h-2.753l-2.385-0.57H13.83
+		c-0.459,0-0.699-0.151-0.713-0.449l-0.021-0.421l-7.942,0C5.177,8.45,5.246,8.294,5.398,8.111z M20.865,11.498l-18.284,0
+		c-0.002-0.025-0.002-0.059,0.002-0.103c0.061-0.277,0.881-1.363,1.879-2.229C4.61,9.327,4.83,9.423,5.1,9.427h7.216
+		c0.201,0.546,0.748,0.87,1.514,0.87h2.078l2.385,0.57h2.857c0.036,0,0.07-0.002,0.105-0.004
+		C21.219,11.258,21.016,11.498,20.865,11.498z"/>
+	<path display="inline" fill="#67DFE8" d="M15.313,15.801c-0.167-0.195-0.463-0.218-0.659-0.052l-2.228,1.903v-4.09
+		c0-0.259-0.209-0.468-0.468-0.468s-0.468,0.209-0.468,0.468v4.09l-2.229-1.904c-0.196-0.167-0.492-0.145-0.659,0.052
+		c-0.168,0.196-0.145,0.491,0.052,0.659l3,2.563c0.023,0.02,0.05,0.03,0.076,0.044c0.018,0.01,0.033,0.023,0.052,0.03
+		c0.057,0.023,0.116,0.038,0.176,0.038s0.12-0.015,0.176-0.038c0.019-0.008,0.034-0.02,0.052-0.03
+		c0.025-0.015,0.053-0.025,0.076-0.044l3-2.563C15.458,16.292,15.481,15.997,15.313,15.801z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_profile.svg b/icons/cp_cgm_profile.svg
new file mode 100644
index 0000000000..ac80ef0916
--- /dev/null
+++ b/icons/cp_cgm_profile.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_profile">
+	<path display="inline" fill="#FFFFFF" d="M19.744,9.7c-0.135-0.417-0.494-0.72-0.928-0.783l-3.997-0.581L13.03,4.714
+		c-0.387-0.786-1.675-0.786-2.061,0L9.181,8.336L5.183,8.918C4.751,8.98,4.39,9.284,4.255,9.7c-0.135,0.416-0.023,0.873,0.291,1.178
+		l2.894,2.819L6.757,17.68c-0.074,0.432,0.103,0.868,0.457,1.125c0.2,0.146,0.437,0.22,0.676,0.22c0.183,0,0.367-0.044,0.535-0.133
+		L12,17.013l3.576,1.879c0.39,0.203,0.855,0.173,1.212-0.087c0.353-0.257,0.531-0.694,0.456-1.125l-0.683-3.983l2.893-2.819
+		C19.766,10.573,19.881,10.116,19.744,9.7z M18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087-0.021,0.174-0.092,0.225
+		c-0.04,0.03-0.087,0.044-0.135,0.044c-0.036,0-0.073-0.008-0.108-0.027l-3.907-2.053l-3.907,2.053
+		c-0.075,0.044-0.17,0.036-0.242-0.017c-0.07-0.051-0.106-0.138-0.091-0.225l0.746-4.35l-3.162-3.081
+		c-0.063-0.061-0.085-0.153-0.058-0.236c0.027-0.083,0.099-0.143,0.185-0.156l4.369-0.634l1.954-3.959
+		c0.078-0.158,0.334-0.158,0.412,0l1.953,3.959l4.369,0.634c0.087,0.013,0.158,0.073,0.185,0.156S18.753,10.2,18.689,10.261z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_start.svg b/icons/cp_cgm_start.svg
new file mode 100644
index 0000000000..81211f451f
--- /dev/null
+++ b/icons/cp_cgm_start.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_start">
+	<path display="inline" fill="#36FF00" d="M9.955,11.969c-0.154,0-0.306-0.071-0.404-0.205c-0.164-0.223-0.115-0.536,0.107-0.699
+		c1.828-1.34,4.354-1.34,6.184-0.001c0.223,0.164,0.271,0.477,0.107,0.699c-0.162,0.224-0.475,0.271-0.699,0.108
+		c-1.482-1.086-3.518-1.086-5,0C10.161,11.938,10.057,11.969,9.955,11.969z"/>
+	<path display="inline" fill="#36FF00" d="M16.804,10.249c-0.103,0-0.207-0.032-0.296-0.097c-2.205-1.616-5.311-1.616-7.516,0
+		c-0.225,0.163-0.536,0.115-0.7-0.108C8.129,9.821,8.177,9.508,8.4,9.344c2.551-1.868,6.149-1.868,8.7,0
+		c0.223,0.164,0.271,0.477,0.107,0.7C17.109,10.178,16.957,10.249,16.804,10.249z"/>
+	<path display="inline" fill="#36FF00" d="M18.155,8.4c-0.103,0-0.206-0.032-0.296-0.097c-2.998-2.196-7.221-2.196-10.219,0
+		C7.417,8.466,7.105,8.418,6.941,8.195C6.778,7.973,6.826,7.66,7.049,7.496c1.671-1.224,3.643-1.872,5.701-1.872
+		c2.058,0,4.029,0.647,5.701,1.872c0.223,0.164,0.271,0.477,0.107,0.699C18.461,8.329,18.309,8.4,18.155,8.4z"/>
+	<path display="inline" fill="#36FF00" d="M22.44,14.727l-1.772-1.804l-13.37,0.502c-1.522,0.021-2.591,0.907-2.926,1.717
+		c-1.247,0.944-2.605,2.549-2.668,3.198c-0.035,0.357,0.038,0.638,0.216,0.834c0.104,0.115,0.292,0.251,0.599,0.251h18.345
+		c0.719,0,1.282-0.721,1.282-1.642c0-0.065-0.011-0.137-0.028-0.213c0.221-0.181,0.402-0.429,0.53-0.737
+		C22.965,16.067,22.875,15.161,22.44,14.727z M5.398,15.153c0.162-0.194,0.778-0.829,1.923-0.844l12.99-0.488l1.501,1.528
+		c0.139,0.139,0.217,0.666,0.019,1.144c-0.146,0.352-0.375,0.531-0.682,0.531h-2.753l-2.385-0.57H13.83
+		c-0.459,0-0.699-0.151-0.713-0.449l-0.021-0.421l-7.942,0C5.177,15.492,5.246,15.336,5.398,15.153z M20.865,18.539l-18.284,0
+		c-0.002-0.025-0.002-0.059,0.002-0.103c0.061-0.277,0.881-1.363,1.879-2.229C4.61,16.369,4.83,16.465,5.1,16.469h7.216
+		c0.201,0.546,0.748,0.87,1.514,0.87h2.078l2.385,0.57h2.857c0.036,0,0.07-0.002,0.105-0.004
+		C21.219,18.3,21.016,18.539,20.865,18.539z"/>
+</g>
+</svg>
diff --git a/icons/cp_cgm_target.svg b/icons/cp_cgm_target.svg
new file mode 100644
index 0000000000..6be0fbc378
--- /dev/null
+++ b/icons/cp_cgm_target.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_cgm_x5F_target">
+	<path fill="#36FF00" d="M18.031,11.646H17.37c-0.178-2.697-2.318-4.837-5.015-5.015V5.969c0-0.196-0.159-0.354-0.354-0.354
+		s-0.354,0.159-0.354,0.354V6.63C8.948,6.808,6.808,8.948,6.63,11.646H5.969c-0.196,0-0.354,0.159-0.354,0.354
+		s0.159,0.354,0.354,0.354H6.63c0.178,2.697,2.318,4.837,5.015,5.015v0.662c0,0.195,0.159,0.354,0.354,0.354
+		s0.354-0.159,0.354-0.354V17.37c2.697-0.178,4.837-2.318,5.015-5.015h0.662c0.195,0,0.354-0.159,0.354-0.354
+		S18.227,11.646,18.031,11.646z M16.622,11.646h-1.748c-0.161-1.329-1.197-2.376-2.52-2.553V7.371
+		C14.642,7.545,16.452,9.357,16.622,11.646z M13.386,12.354h0.843c-0.154,0.97-0.908,1.735-1.874,1.901v-0.869
+		c0-0.195-0.159-0.354-0.354-0.354s-0.354,0.159-0.354,0.354v0.876c-0.999-0.14-1.787-0.914-1.944-1.908h0.913
+		c0.196,0,0.354-0.159,0.354-0.354s-0.159-0.354-0.354-0.354H9.701c0.153-0.998,0.943-1.778,1.945-1.918v0.888
+		c0,0.196,0.159,0.354,0.354,0.354s0.354-0.159,0.354-0.354v-0.88c0.97,0.166,1.725,0.936,1.875,1.911h-0.844
+		c-0.195,0-0.354,0.159-0.354,0.354S13.19,12.354,13.386,12.354z M11.646,7.372v1.713c-1.358,0.148-2.429,1.208-2.593,2.561H7.383
+		C7.554,9.359,9.361,7.548,11.646,7.372z M7.385,12.354h1.667c0.164,1.353,1.235,2.413,2.593,2.561v1.693
+		C9.367,16.432,7.565,14.632,7.385,12.354z M12.354,16.609v-1.701c1.324-0.177,2.359-1.224,2.52-2.553h1.746
+		C16.441,14.633,14.635,16.435,12.354,16.609z"/>
+</g>
+</svg>
diff --git a/icons/cp_exercise.svg b/icons/cp_exercise.svg
new file mode 100644
index 0000000000..7552611fcc
--- /dev/null
+++ b/icons/cp_exercise.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_exercise">
+    <path fill="#67DFE8" d="M19.75,12.706c1.526,0,2.769-1.242,2.769-2.769s-1.242-2.769-2.769-2.769s-2.769,1.242-2.769,2.769
+        S18.224,12.706,19.75,12.706z M19.75,8.019c1.058,0,1.919,0.86,1.919,1.918s-0.861,1.918-1.919,1.918s-1.919-0.86-1.919-1.918
+        S18.692,8.019,19.75,8.019z"/>
+    <path fill="#67DFE8" d="M23.841,15.936c-0.039-0.052-0.956-1.265-2.311-1.265c-1.007,0-1.661,0.626-2.239,1.18
+        c-0.512,0.489-0.954,0.913-1.572,0.913h-0.001c-0.504,0-0.916-0.294-1.326-0.655l2.136-1.613l-5.841-7.737l-5.636,4.256
+        c-0.332,0.294-0.804,1.059-0.211,1.845c0.274,0.363,0.594,0.472,0.814,0.499c0.524,0.064,0.946-0.265,0.981-0.292l3.539-2.671
+        l0.867,1.148l-5.085,3.838c-0.476-0.427-1.015-0.776-1.674-0.776c0,0-0.001,0-0.001,0c-1.011,0-1.87,0.779-2.627,1.467
+        c-0.452,0.41-0.965,0.876-1.248,0.876c-0.549,0-1.259-0.787-1.465-1.063c-0.14-0.188-0.405-0.227-0.595-0.087
+        c-0.188,0.14-0.228,0.405-0.088,0.594c0.106,0.145,1.074,1.406,2.147,1.406c0.611,0,1.171-0.508,1.819-1.096
+        c0.644-0.584,1.374-1.247,2.056-1.247h0c0.601,0,1.127,0.548,1.684,1.128c0.619,0.645,1.259,1.311,2.128,1.311
+        c0.83,0,1.531-0.574,2.209-1.131c0.634-0.52,1.289-1.057,1.979-1.057c0.411,0.001,0.798,0.356,1.244,0.768
+        c0.581,0.534,1.238,1.14,2.193,1.14h0.001c0.96,0,1.598-0.61,2.16-1.148c0.529-0.507,0.986-0.944,1.651-0.944
+        c0.923,0,1.621,0.914,1.628,0.924c0.142,0.188,0.407,0.224,0.595,0.085C23.94,16.389,23.98,16.124,23.841,15.936z M11.763,16.105
+        c-0.588,0.482-1.144,0.938-1.669,0.938c-0.507-0.001-0.997-0.511-1.515-1.05c-0.003-0.003-0.006-0.006-0.009-0.009l5.663-4.275
+        L12.34,9.204l-4.229,3.193c-0.028,0.023-0.207,0.146-0.354,0.117c-0.031-0.004-0.124-0.015-0.238-0.166
+        c-0.25-0.332,0.013-0.619,0.071-0.675l4.932-3.722l4.815,6.38l-1.591,1.201c-0.426-0.366-0.885-0.674-1.466-0.674
+        C13.286,14.856,12.477,15.52,11.763,16.105z"/>
+</g>
+</svg>
diff --git a/icons/cp_note.svg b/icons/cp_note.svg
new file mode 100644
index 0000000000..52c783a3c6
--- /dev/null
+++ b/icons/cp_note.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_note">
+	<path display="inline" fill="#FEAF05" d="M13.909,5.715l-7.634,7.634c-0.061,0.061-0.102,0.139-0.118,0.224l-0.911,4.941
+		c-0.025,0.138,0.019,0.279,0.118,0.378c0.099,0.099,0.24,0.143,0.378,0.118l4.941-0.911c0.085-0.016,0.163-0.057,0.224-0.118
+		l7.634-7.634c0.445-0.445,0.444-1.17-0.003-1.617l-3.012-3.012C15.079,5.271,14.354,5.27,13.909,5.715z M9.891,16.927
+		c0.097,0.097,0.132,0.24,0.091,0.371c-0.018,0.058-0.05,0.109-0.091,0.15c-0.053,0.053-0.121,0.089-0.197,0.102l-2.462,0.435
+		c-0.244-0.008-0.486-0.103-0.673-0.29c-0.187-0.187-0.282-0.429-0.29-0.673l0.435-2.463c0.024-0.135,0.121-0.246,0.252-0.287
+		c0.131-0.041,0.274-0.006,0.371,0.091L9.891,16.927z M17.903,9.269c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746
+		c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265c-0.141-0.141-0.141-0.369,0-0.509l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0
+		L17.903,9.269z M16.588,7.933c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265
+		c-0.141-0.141-0.141-0.369,0-0.509l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0L16.588,7.933z M15.273,6.596
+		c0.141,0.141,0.141,0.369,0,0.509l-6.746,6.746c-0.141,0.141-0.369,0.141-0.509,0l-0.265-0.265c-0.141-0.141-0.141-0.369,0-0.509
+		l6.746-6.746c0.141-0.141,0.369-0.141,0.509,0L15.273,6.596z"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_battery.svg b/icons/cp_pump_battery.svg
new file mode 100644
index 0000000000..6c3c3f605c
--- /dev/null
+++ b/icons/cp_pump_battery.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_battery">
+    <path fill="#36FF00" d="M20.234,10.422c-0.362,0-0.656,0.294-0.656,0.656v0.297h-0.469V9.031c0-0.87-0.708-1.578-1.578-1.578
+        H4.188c-0.87,0-1.578,0.708-1.578,1.578v5.938c0,0.87,0.708,1.578,1.578,1.578h13.344c0.72,0,1.323-0.488,1.511-1.149
+        c0.01,0.001,0.018,0.006,0.028,0.006c0.332,0,0.602-0.297,0.602-0.664c0-0.351-0.25-0.632-0.563-0.655v-1.46h0.469v0.297
+        c0,0.362,0.294,0.656,0.656,0.656s0.656-0.294,0.656-0.656v-1.844C20.891,10.716,20.597,10.422,20.234,10.422z M18.109,14.969
+        c0,0.318-0.26,0.578-0.578,0.578H4.188c-0.319,0-0.578-0.26-0.578-0.578V9.031c0-0.319,0.259-0.578,0.578-0.578h13.344
+        c0.318,0,0.578,0.259,0.578,0.578V14.969z"/>
+    <polygon fill="#36FF00" points="9.703,10.273 5.766,13.195 9.219,11.977 11,13.742 15.438,10.258 11.141,11.945 		"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_canula.svg b/icons/cp_pump_canula.svg
new file mode 100644
index 0000000000..ac0c9f8304
--- /dev/null
+++ b/icons/cp_pump_canula.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_canula">
+	<path fill="#67DFE8" d="M23.706,7.373c-0.149-0.541-0.728-0.854-1.294-0.699L19.87,7.373c-0.325-0.913-1.301-1.438-2.255-1.175
+		l-3.008,0.826c-0.954,0.262-1.525,1.212-1.338,2.163l-2.542,0.698c-0.499,0.137-0.799,0.593-0.767,1.07
+		c-1.696,0.439-3.037,0.067-4.101-0.248c-1.047-0.309-1.951-0.578-2.713,0.152c-1.307,1.253-0.369,2.87,0.384,4.17
+		c0.501,0.863,1.019,1.757,0.766,2.3c-0.519,1.124-2.729,1.128-3.537,1.033c-0.203-0.022-0.392,0.122-0.417,0.328
+		c-0.024,0.206,0.123,0.391,0.329,0.414c0.086,0.01,1.376,0.152,2.554-0.172c0.734-0.202,1.424-0.585,1.753-1.292
+		c0.416-0.896-0.173-1.912-0.797-2.987c-0.844-1.456-1.336-2.47-0.515-3.257c0.426-0.409,0.972-0.272,1.977,0.026
+		c1.128,0.334,2.648,0.808,4.674,0.215c0.255,0.206,0.598,0.304,0.949,0.207l5.63-1.547l2.016,7.338l0.127-1.203l-1.718-6.252
+		l5.63-1.547C23.517,8.479,23.855,7.914,23.706,7.373z"/>
+</g>
+</svg>
diff --git a/icons/cp_pump_cartridge.svg b/icons/cp_pump_cartridge.svg
new file mode 100644
index 0000000000..4871ca4a33
--- /dev/null
+++ b/icons/cp_pump_cartridge.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_pump_x5F_cartridge">
+		<path fill="#FEAF05" d="M21.266,9.094c-0.356,0.204-0.798,0.102-0.987-0.227l-1.241-2.164c-0.189-0.33-0.054-0.762,0.302-0.967
+			l0,0c0.356-0.204,0.798-0.102,0.987,0.227l1.241,2.164C21.758,8.457,21.622,8.89,21.266,9.094L21.266,9.094z"/>
+		<path fill="#FEAF05" d="M7.644,18.842L7.44,18.488l12.834-7.356c0.118-0.068,0.196-0.187,0.21-0.32l0.188-3.195l-0.355-0.619
+			l-2.852-1.452c-0.122-0.055-0.264-0.048-0.382,0.02L4.249,12.921l-0.204-0.354C3.8,12.14,3.246,11.998,2.807,12.25
+			c-0.44,0.252-0.597,0.802-0.353,1.229l3.599,6.276c0.245,0.427,0.799,0.569,1.238,0.317C7.73,19.819,7.888,19.269,7.644,18.842z
+			 M18.885,10.994l-1.476-2.318c-0.072-0.113-0.225-0.145-0.342-0.07c-0.113,0.071-0.151,0.216-0.086,0.329
+			c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299l-0.986,0.565L15.988,9.49c-0.072-0.113-0.225-0.145-0.342-0.07
+			c-0.113,0.071-0.151,0.216-0.086,0.329c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299l-0.986,0.565l-1.477-2.318
+			c-0.072-0.113-0.225-0.145-0.342-0.07c-0.113,0.071-0.151,0.216-0.086,0.329c0.002,0.003,0.004,0.007,0.006,0.01l1.465,2.299
+			l-0.858,0.492l-2.033-3.252C12.65,10,12.503,9.965,12.386,10.032l-7.372,4.225l-0.363-0.633l12.645-7.247l2.537,1.309
+			l-0.152,2.852L18.885,10.994z"/>
+</g>
+</svg>
diff --git a/icons/cp_question.svg b/icons/cp_question.svg
new file mode 100644
index 0000000000..512bc763bc
--- /dev/null
+++ b/icons/cp_question.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_question">
+	<circle fill="#FEAF05" cx="12.042" cy="18.479" r="0.979"/>
+	<path fill="#FEAF05" d="M12,16.126c-0.392,0-0.708-0.317-0.708-0.709c0-2.548,1.188-3.437,2.142-4.151
+		c0.8-0.599,1.378-1.032,1.378-2.432c0-1.931-1.854-2.531-2.53-2.531c-1.456,0-2.631,0.873-3.225,2.393
+		C8.914,9.06,8.501,9.241,8.138,9.098C7.773,8.955,7.594,8.544,7.736,8.18c0.806-2.063,2.505-3.294,4.545-3.294
+		c1.592,0,3.948,1.255,3.948,3.948c0,2.11-1.079,2.917-1.946,3.566c-0.88,0.659-1.574,1.178-1.574,3.017
+		C12.709,15.809,12.392,16.126,12,16.126z"/>
+</g>
+</svg>
diff --git a/icons/danar_useropt.svg b/icons/danar_useropt.svg
new file mode 100644
index 0000000000..e8d8e76097
--- /dev/null
+++ b/icons/danar_useropt.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danar_x5F_useropt">
+    <path fill="#6AE86D" d="M13.351,12.926c-0.137-0.003-0.283,0.012-0.337-0.17c-0.046-0.155,0.002-0.266,0.122-0.366
+        c0.628-0.523,0.741-1.232,0.711-2.042c0-0.148,0.013-0.348-0.002-0.546c-0.071-0.91-0.785-1.606-1.718-1.686
+        c-0.845-0.073-1.71,0.485-1.862,1.344c-0.184,1.039-0.278,2.111,0.636,2.933c0.115,0.104,0.172,0.206,0.12,0.363
+        c-0.059,0.177-0.201,0.171-0.34,0.169c-0.347-0.005-0.668,0.083-0.97,0.249c-0.973,0.535-1.043,1.404-0.165,2.061
+        c1.299,0.974,3.949,0.841,5.144-0.257c0.471-0.433,0.508-0.927,0.084-1.408C14.4,13.146,13.918,12.937,13.351,12.926z
+         M13.572,14.889c-1.202,0.486-2.407,0.499-3.555-0.158c-0.579-0.331-0.548-0.663,0.046-0.976c0.248-0.131,0.517-0.214,0.801-0.195
+        c0.348,0.024,0.636-0.047,0.765-0.414c0.14-0.399,0.306-0.823-0.105-1.149c-0.661-0.524-0.705-1.225-0.666-1.98
+        c0.039-0.729,0.51-1.259,1.159-1.248c0.662,0.011,1.13,0.529,1.146,1.269c0.003,0.119,0,0.239,0,0.456
+        c0.097,0.503-0.086,0.988-0.564,1.377c-0.395,0.321-0.385,0.738-0.235,1.187c0.15,0.448,0.477,0.542,0.89,0.506
+        c0.039-0.003,0.08,0.004,0.118,0.014c0.389,0.093,0.879,0.167,0.948,0.599C14.392,14.615,13.901,14.756,13.572,14.889z"/>
+    <path fill="#6AE86D" d="M19.107,10.662H17.78c-0.15-0.648-0.406-1.253-0.749-1.801l0.941-0.941c0.239-0.239,0.239-0.626,0-0.864
+        l-1.027-1.027c-0.239-0.239-0.626-0.239-0.864,0l-0.941,0.941c-0.548-0.343-1.154-0.599-1.801-0.749V4.893
+        c0-0.338-0.274-0.611-0.611-0.611h-1.453c-0.338,0-0.611,0.274-0.611,0.611V6.22c-0.648,0.15-1.253,0.406-1.801,0.749L7.92,6.028
+        c-0.239-0.239-0.626-0.239-0.864,0L6.028,7.056c-0.239,0.239-0.239,0.626,0,0.864l0.941,0.941
+        C6.626,9.409,6.37,10.015,6.22,10.662H4.893c-0.338,0-0.611,0.274-0.611,0.611v1.453c0,0.338,0.274,0.611,0.611,0.611H6.22
+        c0.15,0.648,0.406,1.253,0.749,1.801L6.028,16.08c-0.239,0.239-0.239,0.626,0,0.864l1.027,1.027c0.239,0.239,0.626,0.239,0.864,0
+        l0.941-0.941c0.548,0.343,1.154,0.599,1.801,0.749v1.328c0,0.338,0.274,0.611,0.611,0.611h1.453c0.338,0,0.611-0.274,0.611-0.611
+        V17.78c0.648-0.15,1.254-0.406,1.801-0.749l0.941,0.941c0.239,0.239,0.626,0.239,0.864,0l1.027-1.027
+        c0.239-0.239,0.239-0.626,0-0.864l-0.941-0.941c0.343-0.548,0.599-1.154,0.749-1.801h1.328c0.338,0,0.611-0.274,0.611-0.611
+        v-1.453C19.719,10.936,19.445,10.662,19.107,10.662z M12,16.938c-2.723,0-4.938-2.215-4.938-4.938S9.277,7.063,12,7.063
+        S16.938,9.277,16.938,12S14.723,16.938,12,16.938z"/>
+</g>
+</svg>
diff --git a/icons/danarhistory.svg b/icons/danarhistory.svg
new file mode 100644
index 0000000000..e7e972b989
--- /dev/null
+++ b/icons/danarhistory.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarhistory">
+		<path fill="#67DFE8" d="M12.069,3.578c-4.48,0-8.144,3.518-8.398,7.936L2.71,10.552c-0.268-0.267-0.699-0.267-0.966,0
+			c-0.267,0.267-0.267,0.699,0,0.966l2.103,2.102c0.133,0.133,0.308,0.2,0.483,0.2c0.175,0,0.35-0.067,0.483-0.2l2.102-2.102
+			c0.267-0.267,0.267-0.699,0-0.966c-0.267-0.267-0.699-0.267-0.966,0L5.04,11.461c0.277-3.64,3.32-6.518,7.03-6.518
+			c3.891,0,7.057,3.166,7.057,7.057c0,3.891-3.166,7.057-7.057,7.057c-1.921,0-3.719-0.762-5.062-2.148
+			c-0.263-0.27-0.695-0.276-0.966-0.015c-0.271,0.262-0.278,0.695-0.015,0.966c1.603,1.652,3.749,2.562,6.043,2.562
+			c4.644,0,8.423-3.779,8.423-8.423S16.714,3.578,12.069,3.578z"/>
+		<path fill="#67DFE8" d="M12.069,12.683h3.814c0.377,0,0.683-0.306,0.683-0.683s-0.305-0.683-0.683-0.683h-3.131V6.915
+			c0-0.377-0.306-0.683-0.683-0.683s-0.683,0.306-0.683,0.683V12C11.387,12.377,11.692,12.683,12.069,12.683z"/>
+</g>
+</svg>
diff --git a/icons/danarprofile.svg b/icons/danarprofile.svg
new file mode 100644
index 0000000000..0a71fe319e
--- /dev/null
+++ b/icons/danarprofile.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarprofile">
+	<path fill="#FFFFFF" d="M21.089,9.375c-0.158-0.489-0.58-0.845-1.089-0.918l-4.691-0.682l-2.099-4.251
+		c-0.454-0.922-1.965-0.922-2.419,0L8.691,7.774L4,8.457C3.492,8.53,3.069,8.886,2.911,9.375c-0.159,0.488-0.027,1.024,0.341,1.382
+		l3.396,3.308L5.847,18.74c-0.087,0.508,0.121,1.019,0.536,1.32c0.235,0.171,0.513,0.258,0.793,0.258
+		c0.215,0,0.43-0.052,0.627-0.156L12,17.957l4.197,2.205c0.457,0.238,1.004,0.203,1.422-0.102c0.415-0.301,0.623-0.814,0.535-1.32
+		l-0.801-4.674l3.395-3.308C21.115,10.399,21.248,9.863,21.089,9.375z M19.85,10.033l-3.709,3.616l0.876,5.105
+		c0.017,0.102-0.024,0.205-0.108,0.264c-0.046,0.035-0.102,0.052-0.158,0.052c-0.043,0-0.086-0.009-0.126-0.032l-4.585-2.41
+		l-4.586,2.41c-0.088,0.052-0.199,0.043-0.284-0.02c-0.083-0.059-0.125-0.162-0.107-0.264l0.876-5.105l-3.711-3.616
+		C4.154,9.962,4.128,9.854,4.16,9.756s0.116-0.168,0.218-0.183l5.128-0.745l2.293-4.646c0.091-0.186,0.392-0.186,0.483,0
+		l2.292,4.646l5.128,0.745c0.102,0.015,0.186,0.086,0.218,0.183S19.925,9.962,19.85,10.033z"/>
+</g>
+</svg>
diff --git a/icons/danarstat.svg b/icons/danarstat.svg
new file mode 100644
index 0000000000..fa6a91e9ec
--- /dev/null
+++ b/icons/danarstat.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="danarstats">
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="5.719" y1="19.125" x2="5.719" y2="11.828"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="9.792" y1="19.125" x2="9.792" y2="8.01"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="13.865" y1="19.125" x2="13.865" y2="9.51"/>
+			<line fill="none" stroke="#FEAF05" stroke-width="2.2677" stroke-linecap="round" stroke-miterlimit="10" x1="17.938" y1="19.125" x2="17.938" y2="4.594"/>
+</g>
+</svg>
diff --git a/icons/local_activate.svg b/icons/local_activate.svg
new file mode 100644
index 0000000000..26b70b1406
--- /dev/null
+++ b/icons/local_activate.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_activate">
+	<g>
+		<path fill="#67DFE8" d="M12.069,20.423c-4.644,0-8.422-3.779-8.422-8.423s3.778-8.422,8.422-8.422S20.492,7.355,20.492,12
+			S16.713,20.423,12.069,20.423z M12.069,4.943c-3.891,0-7.057,3.166-7.057,7.057c0,3.891,3.166,7.057,7.057,7.057
+			c3.891,0,7.057-3.166,7.057-7.057C19.126,8.109,15.961,4.943,12.069,4.943z"/>
+		<path fill="#67DFE8" d="M9.945,16.362c-0.113,0-0.227-0.028-0.33-0.085c-0.217-0.12-0.353-0.349-0.353-0.598V8.32
+			c0-0.249,0.135-0.478,0.353-0.598c0.218-0.12,0.485-0.112,0.694,0.021l5.827,3.679c0.198,0.125,0.318,0.343,0.318,0.577
+			s-0.12,0.452-0.318,0.577l-5.827,3.679C10.198,16.326,10.072,16.362,9.945,16.362z M10.627,9.559v4.881L14.493,12L10.627,9.559z"
+			/>
+	</g>
+</g>
+</svg>
diff --git a/icons/local_reset.svg b/icons/local_reset.svg
new file mode 100644
index 0000000000..7fa5e1e983
--- /dev/null
+++ b/icons/local_reset.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_reset">
+	<path fill="#E93057" d="M13.787,4.15c-4.338,0-7.867,3.529-7.867,7.867v5.193l-2.486-2.485c-0.25-0.248-0.653-0.248-0.902,0
+		c-0.249,0.249-0.249,0.653,0,0.902l3.575,3.574c0.008,0.008,0.019,0.011,0.028,0.018c0.054,0.048,0.112,0.091,0.18,0.119
+		c0.078,0.032,0.161,0.049,0.244,0.049s0.166-0.017,0.244-0.049c0.068-0.028,0.126-0.071,0.18-0.119
+		c0.008-0.008,0.019-0.01,0.028-0.018l3.575-3.574c0.249-0.249,0.249-0.653,0-0.902c-0.249-0.248-0.653-0.248-0.902,0l-2.486,2.485
+		v-5.193c0-3.635,2.957-6.592,6.591-6.592c3.635,0,6.592,2.957,6.592,6.592c0,1.761-0.686,3.415-1.931,4.66
+		c-0.249,0.249-0.249,0.653,0,0.902c0.25,0.248,0.652,0.248,0.902,0c1.485-1.486,2.304-3.461,2.304-5.563
+		C21.654,7.68,18.125,4.15,13.787,4.15z"/>
+</g>
+</svg>
diff --git a/icons/local_save.svg b/icons/local_save.svg
new file mode 100644
index 0000000000..b587d78d2a
--- /dev/null
+++ b/icons/local_save.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="local_x5F_save">
+		<path fill="#67E86A" d="M16.763,17.562c0,0.424-0.341,0.769-0.761,0.769H6.883c-0.42,0-0.762-0.345-0.762-0.769V8.397
+			c0-0.424,0.342-0.769,0.762-0.769h7.342l0.959-1.417H6.883c-1.202,0-2.179,0.98-2.179,2.186v9.165
+			c0,1.205,0.977,2.187,2.179,2.187h9.119c1.201,0,2.179-0.981,2.179-2.187V9.266l-1.418,2.096V17.562z"/>
+		<path fill="#67E86A" d="M18.824,4.573c-0.326-0.221-0.766-0.135-0.984,0.19l-5.944,8.787l-2.518-2.53
+			c-0.277-0.277-0.726-0.279-1.002-0.002c-0.277,0.276-0.278,0.725-0.002,1.002l3.125,3.141c0.134,0.134,0.315,0.209,0.502,0.209
+			c0.022,0,0.044-0.001,0.066-0.004c0.211-0.02,0.402-0.133,0.521-0.308l6.427-9.501C19.233,5.232,19.148,4.792,18.824,4.573z"/>
+</g>
+</svg>
diff --git a/icons/loop_closed.svg b/icons/loop_closed.svg
index 2621c3348b..7db354f7b2 100644
--- a/icons/loop_closed.svg
+++ b/icons/loop_closed.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_closed">
diff --git a/icons/loop_disabled.svg b/icons/loop_disabled.svg
index d5b8858159..16bd184bc9 100644
--- a/icons/loop_disabled.svg
+++ b/icons/loop_disabled.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_disabled">
diff --git a/icons/loop_disconnected.svg b/icons/loop_disconnected.svg
index 27f651704e..cfa6c01d3b 100644
--- a/icons/loop_disconnected.svg
+++ b/icons/loop_disconnected.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_disconnected">
diff --git a/icons/loop_lgs.svg b/icons/loop_lgs.svg
index 6e0754a490..70becf7df9 100644
--- a/icons/loop_lgs.svg
+++ b/icons/loop_lgs.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_lgs">
diff --git a/icons/loop_open.svg b/icons/loop_open.svg
index 73aeaff092..37439be7fe 100644
--- a/icons/loop_open.svg
+++ b/icons/loop_open.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_open">
diff --git a/icons/loop_paused.svg b/icons/loop_paused.svg
index 8056c4e66b..9e299b0045 100644
--- a/icons/loop_paused.svg
+++ b/icons/loop_paused.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_paused">
diff --git a/icons/loop_superbolus.svg b/icons/loop_superbolus.svg
index 99baf408a4..2a538bd1ff 100644
--- a/icons/loop_superbolus.svg
+++ b/icons/loop_superbolus.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="loop_x5F_superbolus">
diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg
index bdfab6bdd9..29f32b5279 100644
--- a/icons/quickwizard.svg
+++ b/icons/quickwizard.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="quickwizard">
diff --git a/icons/remove.svg b/icons/remove.svg
index cf47d09ad1..22df13d50a 100644
--- a/icons/remove.svg
+++ b/icons/remove.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="remove">
diff --git a/icons/visibility.svg b/icons/visibility.svg
new file mode 100644
index 0000000000..06375f5914
--- /dev/null
+++ b/icons/visibility.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="visibility">
+    <path fill="#FFFFFF" d="M12,4.531c-4.971,0-9.209,3.1-10.912,7.469C2.791,16.368,7.029,19.469,12,19.469s9.209-3.1,10.912-7.469
+        C21.209,7.632,16.971,4.531,12,4.531z M12,17.063c-2.796,0-5.063-2.267-5.063-5.063S9.204,6.938,12,6.938S17.063,9.204,17.063,12
+        S14.796,17.063,12,17.063z"/>
+    <circle fill="#FFFFFF" cx="12" cy="12" r="2.938"/>
+</g>
+</svg>
diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg
index 6af56d0df4..f7c1aaa09e 100644
--- a/icons/x_swap_vert.svg
+++ b/icons/x_swap_vert.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="x_x5F_swap_x5F_vert">
diff --git a/icons/xdrip.svg b/icons/xdrip.svg
index 6d9cdefd0d..8f141d3c04 100644
--- a/icons/xdrip.svg
+++ b/icons/xdrip.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
 	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
 <g id="xdrip">

From da7fae4cdbc7f0c55eeaa6462d5eee060efb9cb8 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 19 Jun 2020 13:36:18 +0200
Subject: [PATCH 208/400] Add new xml files for vector icons

---
 .../res/drawable/ic_actions_profileswitch.xml |  9 ++++
 .../res/drawable/ic_actions_temptarget.xml    |  9 ++++
 .../main/res/drawable/ic_cp_aaps_offline.xml  | 21 ++++++++++
 .../main/res/drawable/ic_cp_age_battery.xml   | 16 +++++++
 .../main/res/drawable/ic_cp_age_canula.xml    | 11 +++++
 .../main/res/drawable/ic_cp_age_insulin.xml   | 11 +++++
 .../main/res/drawable/ic_cp_age_sensor.xml    | 21 ++++++++++
 .../main/res/drawable/ic_cp_announcement.xml  | 21 ++++++++++
 app/src/main/res/drawable/ic_cp_bgcheck.xml   | 15 +++++++
 app/src/main/res/drawable/ic_cp_bgcheck2.xml  | 12 ++++++
 .../main/res/drawable/ic_cp_bolus_combo.xml   |  9 ++++
 .../main/res/drawable/ic_cp_bolus_meal.xml    | 15 +++++++
 .../main/res/drawable/ic_cp_bolus_snack.xml   | 15 +++++++
 .../main/res/drawable/ic_cp_cgm_insert.xml    | 12 ++++++
 .../main/res/drawable/ic_cp_cgm_profile.xml   |  9 ++++
 app/src/main/res/drawable/ic_cp_cgm_start.xml | 18 ++++++++
 .../main/res/drawable/ic_cp_cgm_target.xml    |  9 ++++
 app/src/main/res/drawable/ic_cp_exercise.xml  | 12 ++++++
 app/src/main/res/drawable/ic_cp_note.xml      |  9 ++++
 .../main/res/drawable/ic_cp_pump_battery.xml  | 12 ++++++
 .../main/res/drawable/ic_cp_pump_canula.xml   |  9 ++++
 .../res/drawable/ic_cp_pump_cartridge.xml     | 12 ++++++
 app/src/main/res/drawable/ic_cp_question.xml  | 12 ++++++
 app/src/main/res/drawable/ic_cp_stats.xml     | 30 +++++++++++++
 .../main/res/drawable/ic_local_activate.xml   | 12 ++++++
 app/src/main/res/drawable/ic_local_reset.xml  |  9 ++++
 app/src/main/res/drawable/ic_reminder2.xml    |  9 ++++
 app/src/main/res/drawable/ic_visibility.xml   | 12 ++++++
 .../res/drawable/ic_actions_profileswitch.xml |  9 ++++
 .../main/res/drawable/ic_actions_refill.xml   | 42 +++++++++++++++++++
 .../main/res/drawable/ic_danar_useropt.xml    | 12 ++++++
 .../src/main/res/drawable/ic_danarhistory.xml | 12 ++++++
 .../src/main/res/drawable/ic_danarprofile.xml |  9 ++++
 core/src/main/res/drawable/ic_danarstats.xml  | 30 +++++++++++++
 .../src/main/res/drawable/ic_home_profile.xml |  9 ++++
 core/src/main/res/drawable/ic_local_save.xml  | 12 ++++++
 36 files changed, 506 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_actions_profileswitch.xml
 create mode 100644 app/src/main/res/drawable/ic_actions_temptarget.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_aaps_offline.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_age_battery.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_age_canula.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_age_insulin.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_age_sensor.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_announcement.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bgcheck.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bgcheck2.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_combo.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_meal.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_bolus_snack.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_cgm_insert.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_cgm_profile.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_cgm_start.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_cgm_target.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_exercise.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_note.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_pump_battery.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_pump_canula.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_pump_cartridge.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_question.xml
 create mode 100644 app/src/main/res/drawable/ic_cp_stats.xml
 create mode 100644 app/src/main/res/drawable/ic_local_activate.xml
 create mode 100644 app/src/main/res/drawable/ic_local_reset.xml
 create mode 100644 app/src/main/res/drawable/ic_reminder2.xml
 create mode 100644 app/src/main/res/drawable/ic_visibility.xml
 create mode 100644 core/src/main/res/drawable/ic_actions_profileswitch.xml
 create mode 100644 core/src/main/res/drawable/ic_actions_refill.xml
 create mode 100644 core/src/main/res/drawable/ic_danar_useropt.xml
 create mode 100644 core/src/main/res/drawable/ic_danarhistory.xml
 create mode 100644 core/src/main/res/drawable/ic_danarprofile.xml
 create mode 100644 core/src/main/res/drawable/ic_danarstats.xml
 create mode 100644 core/src/main/res/drawable/ic_home_profile.xml
 create mode 100644 core/src/main/res/drawable/ic_local_save.xml

diff --git a/app/src/main/res/drawable/ic_actions_profileswitch.xml b/app/src/main/res/drawable/ic_actions_profileswitch.xml
new file mode 100644
index 0000000000..31c93c3483
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_profileswitch.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.744,9.7c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581L13.03,4.714c-0.387,-0.786 -1.675,-0.786 -2.061,0L9.181,8.336L5.183,8.918C4.751,8.98 4.39,9.284 4.255,9.7c-0.135,0.416 -0.023,0.873 0.291,1.178l2.894,2.819L6.757,17.68c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133L12,17.013l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C19.766,10.573 19.881,10.116 19.744,9.7zM18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35l-3.162,-3.081c-0.063,-0.061 -0.085,-0.153 -0.058,-0.236c0.027,-0.083 0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959l4.369,0.634c0.087,0.013 0.158,0.073 0.185,0.156S18.753,10.2 18.689,10.261z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_actions_temptarget.xml b/app/src/main/res/drawable/ic_actions_temptarget.xml
new file mode 100644
index 0000000000..5dbd5d8b0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_actions_temptarget.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.71,11.606h-0.736c-0.198,-3.001 -2.579,-5.382 -5.58,-5.58V5.29c0,-0.218 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.736c-3.001,0.198 -5.382,2.579 -5.58,5.58H5.29c-0.218,0 -0.394,0.177 -0.394,0.394s0.177,0.394 0.394,0.394h0.736c0.198,3.001 2.579,5.382 5.58,5.58v0.736c0,0.217 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.736c3.001,-0.198 5.382,-2.579 5.58,-5.58h0.736c0.217,0 0.394,-0.177 0.394,-0.394S18.927,11.606 18.71,11.606zM17.143,11.606h-1.944c-0.179,-1.478 -1.331,-2.643 -2.804,-2.841V6.85C14.939,7.044 16.953,9.06 17.143,11.606zM13.542,12.394h0.938c-0.171,1.079 -1.01,1.93 -2.085,2.115v-0.967c0,-0.217 -0.177,-0.394 -0.394,-0.394s-0.394,0.177 -0.394,0.394v0.975c-1.111,-0.156 -1.988,-1.017 -2.163,-2.122h1.016c0.218,0 0.394,-0.177 0.394,-0.394s-0.177,-0.394 -0.394,-0.394H9.442c0.171,-1.111 1.049,-1.978 2.164,-2.134v0.987c0,0.218 0.177,0.394 0.394,0.394s0.394,-0.177 0.394,-0.394v-0.98c1.079,0.185 1.92,1.041 2.086,2.126h-0.939c-0.217,0 -0.394,0.177 -0.394,0.394S13.324,12.394 13.542,12.394zM11.606,6.851v1.906C10.095,8.921 8.903,10.1 8.72,11.606H6.864C7.053,9.062 9.064,7.047 11.606,6.851zM6.866,12.394H8.72c0.183,1.505 1.374,2.684 2.885,2.849v1.884C9.071,16.931 7.065,14.928 6.866,12.394zM12.394,17.128v-1.893c1.473,-0.197 2.625,-1.362 2.804,-2.841h1.942C16.941,14.93 14.932,16.935 12.394,17.128z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_aaps_offline.xml b/app/src/main/res/drawable/ic_cp_aaps_offline.xml
new file mode 100644
index 0000000000..0b267a6d88
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_aaps_offline.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,17.813m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M19.357,6.125c0.195,-0.196 0.195,-0.512 0,-0.708c-0.195,-0.195 -0.512,-0.195 -0.707,0l-2.364,2.364C14.916,7.314 13.477,7.062 12,7.062c-2.902,0 -5.674,0.925 -8.015,2.675c-0.222,0.166 -0.267,0.479 -0.102,0.7c0.166,0.222 0.479,0.266 0.7,0.102C6.751,8.919 9.315,8.063 12,8.063c1.198,0 2.369,0.177 3.493,0.512l-1.829,1.829c-0.547,-0.093 -1.1,-0.154 -1.663,-0.154c-2.212,0 -4.325,0.705 -6.111,2.039c-0.222,0.166 -0.267,0.479 -0.102,0.701c0.166,0.221 0.478,0.267 0.7,0.101C8.099,11.887 10.005,11.25 12,11.25c0.26,0 0.516,0.022 0.773,0.044l-2.215,2.215c-1.012,0.201 -1.989,0.596 -2.839,1.231c-0.222,0.165 -0.267,0.479 -0.102,0.7c0.166,0.22 0.479,0.268 0.7,0.101c0.192,-0.143 0.392,-0.271 0.597,-0.389l-2.618,2.618c-0.195,0.195 -0.195,0.512 0,0.707c0.098,0.098 0.226,0.146 0.354,0.146s0.256,-0.049 0.354,-0.146L19.357,6.125z"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M20.016,9.737c-0.562,-0.42 -1.15,-0.789 -1.757,-1.113L17.513,9.37c0.66,0.331 1.299,0.717 1.903,1.169c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.201C20.282,10.216 20.236,9.902 20.016,9.737z"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M15.867,11.016l-0.776,0.776c0.856,0.307 1.671,0.739 2.421,1.298c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.701C17.409,11.764 16.656,11.341 15.867,11.016z"
+      android:fillColor="#E93057"/>
+  <path
+      android:pathData="M13.394,13.489l-0.887,0.887c1.13,0.091 2.24,0.467 3.176,1.166c0.09,0.067 0.195,0.1 0.3,0.1c0.152,0 0.303,-0.069 0.4,-0.2c0.166,-0.222 0.12,-0.535 -0.101,-0.7C15.418,14.095 14.424,13.688 13.394,13.489z"
+      android:fillColor="#E93057"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_battery.xml b/app/src/main/res/drawable/ic_cp_age_battery.xml
new file mode 100644
index 0000000000..cc36e585a0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_age_battery.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.234,10.422c-0.362,0 -0.656,0.294 -0.656,0.656v0.297h-0.469V9.031c0,-0.87 -0.708,-1.578 -1.578,-1.578H4.188c-0.87,0 -1.578,0.708 -1.578,1.578v5.938c0,0.87 0.708,1.578 1.578,1.578h13.344c0.72,0 1.323,-0.488 1.511,-1.149c0.01,0.001 0.018,0.006 0.028,0.006c0.332,0 0.602,-0.297 0.602,-0.664c0,-0.351 -0.25,-0.632 -0.563,-0.655v-1.46h0.469v0.297c0,0.362 0.294,0.656 0.656,0.656s0.656,-0.294 0.656,-0.656v-1.844C20.891,10.716 20.597,10.422 20.234,10.422zM18.109,14.969c0,0.318 -0.26,0.578 -0.578,0.578H4.188c-0.319,0 -0.578,-0.26 -0.578,-0.578V9.031c0,-0.319 0.259,-0.578 0.578,-0.578h13.344c0.318,0 0.578,0.259 0.578,0.578V14.969z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M9.703,10.273l-3.937,2.922l3.453,-1.218l1.781,1.765l4.438,-3.484l-4.297,1.687z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_canula.xml b/app/src/main/res/drawable/ic_cp_age_canula.xml
new file mode 100644
index 0000000000..f2578fa72b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_age_canula.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.951,10.458h-1.99c-0.054,-0.733 -0.659,-1.313 -1.406,-1.313h-2.354c-0.747,0 -1.352,0.58 -1.406,1.313h-1.99c-0.388,0 -0.696,0.27 -0.771,0.622c-1.32,-0.021 -2.226,-0.555 -2.936,-0.999c-0.7,-0.437 -1.304,-0.814 -2.005,-0.434c-1.202,0.654 -0.843,2.024 -0.554,3.126c0.192,0.731 0.39,1.489 0.098,1.836c-0.603,0.718 -2.212,0.276 -2.781,0.045c-0.143,-0.057 -0.31,0.011 -0.369,0.156c-0.059,0.146 0.011,0.311 0.156,0.369c0.061,0.024 0.971,0.388 1.893,0.388c0.574,0 1.153,-0.142 1.534,-0.593c0.482,-0.571 0.256,-1.433 0.017,-2.345c-0.323,-1.234 -0.479,-2.074 0.276,-2.485c0.392,-0.213 0.762,-0.003 1.434,0.417c0.755,0.471 1.766,1.123 3.359,1.096C11.301,11.859 11.531,12 11.806,12h4.406v5.771l0.333,-0.854V12h4.406c0.443,0 0.802,-0.345 0.802,-0.771S21.394,10.458 20.951,10.458z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_insulin.xml b/app/src/main/res/drawable/ic_cp_age_insulin.xml
new file mode 100644
index 0000000000..701e31cee3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_age_insulin.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.455,9.988l-0.947,-1.652c-0.144,-0.252 -0.482,-0.329 -0.753,-0.174c-0.171,0.098 -0.266,0.267 -0.283,0.44l-1.149,-0.585c-0.093,-0.042 -0.202,-0.037 -0.292,0.015l-9.796,5.614l-0.156,-0.271c-0.187,-0.326 -0.61,-0.434 -0.945,-0.242c-0.336,0.192 -0.456,0.612 -0.269,0.938l2.747,4.79c0.187,0.326 0.61,0.434 0.945,0.242c0.336,-0.192 0.456,-0.612 0.269,-0.938L8.67,17.896l9.796,-5.614c0.09,-0.052 0.15,-0.143 0.16,-0.244l0.076,-1.289c0.158,0.072 0.351,0.076 0.522,-0.022C19.496,10.57 19.599,10.239 19.455,9.988zM17.407,12.176l-1.127,-1.769c-0.055,-0.086 -0.172,-0.11 -0.261,-0.054c-0.086,0.055 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.752,0.431l-1.127,-1.769c-0.055,-0.086 -0.172,-0.111 -0.261,-0.054c-0.086,0.054 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.752,0.431l-1.127,-1.769c-0.055,-0.086 -0.172,-0.111 -0.261,-0.054c-0.087,0.055 -0.115,0.165 -0.066,0.251c0.001,0.002 0.003,0.005 0.004,0.007l1.118,1.755l-0.655,0.375l-1.552,-2.482c-0.053,-0.084 -0.165,-0.111 -0.254,-0.06L6.82,14.666l-0.277,-0.483l9.652,-5.532l1.685,0.87l0.236,0.412l-0.101,1.894L17.407,12.176z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_age_sensor.xml b/app/src/main/res/drawable/ic_cp_age_sensor.xml
new file mode 100644
index 0000000000..08134cc20b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_age_sensor.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.568,13.328c0.673,0 1.219,-0.546 1.219,-1.219s-0.546,-1.219 -1.219,-1.219c-0.493,0 -0.913,0.296 -1.105,0.718h-1.603L9.464,8.126c-0.078,-0.195 -0.246,-0.309 -0.48,-0.314c-0.21,0.006 -0.394,0.144 -0.459,0.343l-2.16,6.53l-1.131,-2.751c-0.077,-0.188 -0.26,-0.31 -0.463,-0.31h-2c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5h1.665l1.518,3.69c0.078,0.188 0.261,0.31 0.463,0.31c0.006,0 0.012,0 0.018,0c0.209,-0.008 0.392,-0.145 0.458,-0.343L9.045,9.77l1.012,2.525c0.076,0.19 0.26,0.314 0.464,0.314h1.941C12.654,13.031 13.074,13.328 13.568,13.328z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13.567,15.055c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c2.176,0 3.945,-1.77 3.945,-3.945s-1.77,-3.946 -3.945,-3.946c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c1.624,0 2.945,1.321 2.945,2.945S15.191,15.055 13.567,15.055z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13.567,5.14c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c3.291,0 5.969,2.677 5.969,5.968s-2.678,5.969 -5.969,5.969c-0.276,0 -0.5,0.224 -0.5,0.5s0.224,0.5 0.5,0.5c3.843,0 6.969,-3.126 6.969,-6.969S17.41,5.14 13.567,5.14z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_announcement.xml b/app/src/main/res/drawable/ic_cp_announcement.xml
new file mode 100644
index 0000000000..3799ad551c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_announcement.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.206,16.276c0.251,0.308 0.504,0.635 0.459,1.095c-0.02,0.201 0.178,0.295 0.327,0.395c0.265,0.178 0.542,0.34 0.793,0.536c0.408,0.32 0.385,0.624 -0.047,0.896c-0.017,0.011 -0.037,0.016 -0.054,0.026c-1.333,0.78 -1.335,0.782 -2.448,-0.311c-0.215,-0.211 -0.453,-0.389 -0.696,-0.565c-0.365,-0.264 -0.719,-0.395 -1.143,-0.101c-0.277,0.192 -0.624,0.169 -0.934,0.111c-1.354,-0.252 -2.631,-1.535 -2.535,-3.042c0.019,-0.294 0.105,-0.547 0.297,-0.763c0.331,-0.373 0.657,-0.751 1.001,-1.112c0.736,-0.77 1.133,-1.67 1.129,-2.747C7.352,9.78 7.347,8.864 7.824,8.024C8.29,7.202 8.837,6.939 9.766,7.135c1.042,0.219 1.921,0.766 2.751,1.396c1.204,0.914 2.211,2.014 2.978,3.322c0.396,0.675 0.718,1.372 0.734,2.185c0.011,0.586 -0.253,1.005 -0.706,1.303c-0.505,0.331 -1.057,0.532 -1.687,0.526c-0.775,-0.007 -1.55,0.059 -2.314,0.208C11.404,16.097 11.284,16.119 11.206,16.276zM14.578,14.418c0.569,0.014 0.801,-0.217 0.737,-0.695c-0.053,-0.395 -0.183,-0.77 -0.384,-1.124c-0.907,-1.598 -2.196,-2.833 -3.677,-3.881c-0.47,-0.333 -0.977,-0.61 -1.569,-0.705C9.095,7.917 8.867,8.093 8.882,8.694C8.892,9.151 9.077,9.55 9.303,9.927c0.927,1.55 2.165,2.807 3.667,3.802C13.487,14.072 14.032,14.361 14.578,14.418zM13.257,14.946c-2.056,-1.171 -3.673,-2.769 -4.904,-4.794c-0.061,0.218 -0.053,0.408 -0.063,0.597c-0.032,0.619 -0.081,1.262 -0.399,1.789c-0.344,0.571 -0.24,1.045 0.049,1.556c0.411,0.726 0.998,1.233 1.805,1.473c0.216,0.064 0.444,0.108 0.642,-0.002C11.274,15.069 12.238,14.986 13.257,14.946z"
+      android:fillColor="#CF8BFE"/>
+  <path
+      android:pathData="M16.92,11.417c-0.248,0 -0.368,0.005 -0.487,-0.001c-0.156,-0.008 -0.262,-0.092 -0.297,-0.245c-0.037,-0.161 0.051,-0.281 0.186,-0.335c0.294,-0.118 0.596,-0.219 0.898,-0.317c0.245,-0.079 0.496,-0.141 0.743,-0.212c0.48,-0.137 0.537,-0.086 0.689,0.353c0.159,0.461 -0.153,0.519 -0.447,0.573C17.737,11.318 17.264,11.369 16.92,11.417z"
+      android:fillColor="#CF8BFE"/>
+  <path
+      android:pathData="M11.785,6.597c0.078,-0.501 0.158,-1.052 0.25,-1.6c0.063,-0.378 0.362,-0.329 0.61,-0.283c0.282,0.052 0.473,0.195 0.346,0.547c-0.182,0.506 -0.335,1.022 -0.505,1.531c-0.072,0.216 -0.175,0.437 -0.45,0.385C11.746,7.123 11.777,6.868 11.785,6.597z"
+      android:fillColor="#CF8BFE"/>
+  <path
+      android:pathData="M14.693,8.893c-0.307,-0.002 -0.468,-0.26 -0.292,-0.486c0.388,-0.501 0.798,-0.987 1.226,-1.453c0.207,-0.225 0.452,-0.092 0.631,0.079c0.161,0.154 0.301,0.364 0.087,0.569c-0.472,0.453 -0.968,0.879 -1.508,1.251C14.792,8.884 14.725,8.885 14.693,8.893z"
+      android:fillColor="#CF8BFE"/>
+  <path
+      android:pathData="M12.97,11.989c0,0.14 0.021,0.283 -0.004,0.419c-0.061,0.328 -0.321,0.463 -0.563,0.249c-0.644,-0.568 -1.271,-1.159 -1.812,-1.829c-0.18,-0.223 -0.127,-0.384 0.163,-0.488C11.871,9.941 12.986,10.76 12.97,11.989z"
+      android:fillColor="#CF8BFE"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bgcheck.xml b/app/src/main/res/drawable/ic_cp_bgcheck.xml
new file mode 100644
index 0000000000..ecde2d118b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bgcheck.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.384,15.052c-0.018,-0.323 0.025,-0.625 0.418,-0.671c0.36,-0.042 0.49,0.218 0.531,0.516c0.155,1.131 0.771,1.799 1.92,1.948c0.336,0.043 0.592,0.192 0.528,0.573c-0.059,0.351 -0.373,0.388 -0.654,0.387C7.775,17.801 6.4,16.415 6.384,15.052z"
+      android:fillColor="#E9375C"/>
+  <path
+      android:pathData="M18.817,9.875c-0.377,-1.485 -1.932,-3.719 -2.256,-3.719c-0.325,0 -1.884,2.238 -2.26,3.721c-0.251,0.991 0.067,1.842 0.943,2.421c0.855,0.565 1.778,0.556 2.632,-0.008C18.755,11.712 19.071,10.874 18.817,9.875zM17.437,11.623c-0.297,0.196 -0.595,0.295 -0.886,0.295c-0.286,0 -0.577,-0.097 -0.866,-0.287c-0.586,-0.387 -0.779,-0.882 -0.608,-1.558c0.236,-0.933 0.997,-2.169 1.484,-2.813c0.486,0.644 1.244,1.878 1.481,2.812C18.213,10.745 18.021,11.237 17.437,11.623z"
+      android:fillColor="#E83258"/>
+  <path
+      android:pathData="M13.737,13.869c-0.726,-2.859 -3.893,-7.275 -4.343,-7.275c-0.45,0 -3.627,4.425 -4.349,7.278c-0.483,1.908 0.128,3.546 1.816,4.66c1.646,1.087 3.422,1.07 5.067,-0.015C13.617,17.403 14.225,15.791 13.737,13.869zM11.487,17.85c-0.694,0.457 -1.405,0.689 -2.112,0.689c-0.698,0 -1.396,-0.227 -2.074,-0.675c-1.389,-0.916 -1.887,-2.193 -1.481,-3.796c0.563,-2.22 3.332,-6.141 3.574,-6.141s3.003,3.917 3.568,6.138C13.368,15.663 12.871,16.937 11.487,17.85z"
+      android:fillColor="#E83258"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bgcheck2.xml b/app/src/main/res/drawable/ic_cp_bgcheck2.xml
new file mode 100644
index 0000000000..effce450c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bgcheck2.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.576,6.295c1.872,3.062 4.551,5.654 4.114,9.509c-0.269,2.368 -2.657,3.819 -5.025,3.361c-2.253,-0.436 -3.809,-2.675 -3.331,-4.967C5.954,11.218 7.718,8.829 9.576,6.295zM7.238,12.157c-0.223,0.67 -0.514,1.326 -0.652,2.013c-0.215,1.068 -0.069,2.095 0.803,2.87c0.312,0.277 0.714,0.372 1.091,0.08c0.254,-0.197 0.283,-0.484 0.101,-0.727C7.646,15.142 7.188,13.762 7.238,12.157z"
+      android:fillColor="#E83258"/>
+  <path
+      android:pathData="M16.521,5.632c0.995,1.348 1.923,2.631 2.308,4.206c0.26,1.06 -0.064,1.948 -0.962,2.562c-0.874,0.598 -1.818,0.607 -2.693,0.008c-0.897,-0.614 -1.222,-1.517 -0.965,-2.568C14.593,8.267 15.516,6.979 16.521,5.632z"
+      android:fillColor="#E83258"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_combo.xml b/app/src/main/res/drawable/ic_cp_bolus_combo.xml
new file mode 100644
index 0000000000..bc26e74837
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_combo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.104,17.021l0,-11.063l-5.854,0l0,3.771l-4.771,0l0,7.292l-7.87,0l0,1l8.87,0l0,-7.292l3.771,0l0,7.292l1,0l0,-11.062l3.854,0l0,11.062l2.604,0l0,-1z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_meal.xml b/app/src/main/res/drawable/ic_cp_bolus_meal.xml
new file mode 100644
index 0000000000..7612513c07
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_meal.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.528,15.994h-0.547c-0.244,-3.433 -2.748,-6.265 -6.013,-7.017c-0.095,-0.871 -0.825,-1.553 -1.721,-1.553c-0.895,0 -1.627,0.683 -1.721,1.553c-3.264,0.752 -5.768,3.584 -6.013,7.017H3.966c-0.235,0 -0.425,0.19 -0.425,0.425s0.19,0.425 0.425,0.425h16.562c0.234,0 0.425,-0.19 0.425,-0.425S20.763,15.994 20.528,15.994zM12.248,8.076c0.489,0 0.888,0.33 1.024,0.776c-0.336,-0.045 -0.677,-0.077 -1.024,-0.077c-0.348,0 -0.688,0.032 -1.025,0.077C11.359,8.407 11.758,8.076 12.248,8.076zM12.248,9.625c3.603,0 6.599,2.82 6.883,6.369H5.365C5.649,12.445 8.645,9.625 12.248,9.625z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M14.495,10.781c-0.625,-0.288 -1.503,-0.485 -2.409,-0.541c-0.234,-0.014 -0.436,0.164 -0.45,0.399c-0.014,0.234 0.164,0.436 0.399,0.45c0.792,0.048 1.579,0.222 2.104,0.464c0.049,0.023 0.101,0.035 0.152,0.038c0.17,0.01 0.337,-0.083 0.412,-0.246C14.801,11.133 14.708,10.88 14.495,10.781z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M6.657,15.362c-0.031,0.001 -0.065,-0.003 -0.101,-0.012c-0.2,-0.05 -0.323,-0.254 -0.273,-0.454c0.457,-1.834 1.769,-3.395 3.51,-4.178c0.045,-0.02 0.094,-0.031 0.144,-0.033c0.152,-0.004 0.29,0.083 0.352,0.221c0.041,0.092 0.045,0.194 0.009,0.287c-0.036,0.094 -0.106,0.168 -0.197,0.208c-1.534,0.69 -2.689,2.063 -3.09,3.674C6.971,15.241 6.825,15.358 6.657,15.362z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_bolus_snack.xml b/app/src/main/res/drawable/ic_cp_bolus_snack.xml
new file mode 100644
index 0000000000..7d77c384dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_bolus_snack.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.44,12.691c0.014,1.998 -0.63,3.425 -1.684,4.674c-0.756,0.896 -1.908,1.144 -3.027,0.72c-0.27,-0.103 -0.531,-0.139 -0.812,-0.054c-1.598,0.482 -2.731,0.144 -3.638,-1.256c-1.076,-1.661 -1.531,-3.49 -0.981,-5.454c0.555,-1.984 2.385,-2.847 4.309,-2.074c0.339,0.136 0.662,0.212 1.037,0.098C15.682,8.411 17.449,9.77 17.44,12.691zM7.763,12.765c-0.006,1.123 0.402,2.593 0.959,3.451c0.831,1.281 1.572,1.552 2.999,1.081c0.395,-0.13 0.796,-0.165 1.16,0.026c1.13,0.59 1.993,0.123 2.64,-0.754c1.042,-1.413 1.47,-3.04 1.154,-4.781c-0.33,-1.819 -1.703,-2.542 -3.398,-1.858c-0.705,0.284 -1.379,0.274 -2.075,-0.025c-0.302,-0.13 -0.639,-0.24 -0.963,-0.25C8.675,9.61 7.774,10.759 7.763,12.765z"
+      android:fillColor="#6EE870"/>
+  <path
+      android:pathData="M11.034,8.824C9.913,8.797 8.47,7.663 8.178,6.641c-0.096,-0.336 0.125,-0.317 0.31,-0.346c1.093,-0.175 2.761,0.947 3.053,2.037C11.689,8.884 11.28,8.779 11.034,8.824zM9.202,7.065c0.365,0.575 0.753,0.928 1.424,0.999C10.312,7.475 9.882,7.186 9.202,7.065z"
+      android:fillColor="#6EE870"/>
+  <path
+      android:pathData="M12.186,6.575c0.592,-0.057 0.772,0.169 0.702,0.626c-0.08,0.527 -0.166,1.054 -0.23,1.583c-0.029,0.236 -0.132,0.363 -0.368,0.378c-0.256,0.016 -0.417,-0.091 -0.451,-0.358c-0.077,-0.607 -0.184,-1.212 -0.225,-1.821C11.582,6.479 12.031,6.635 12.186,6.575z"
+      android:fillColor="#6EE870"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_cgm_insert.xml b/app/src/main/res/drawable/ic_cp_cgm_insert.xml
new file mode 100644
index 0000000000..30107ac8fe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_cgm_insert.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.44,7.685l-1.772,-1.804L7.299,6.383C5.777,6.404 4.707,7.29 4.373,8.099c-1.247,0.944 -2.605,2.549 -2.668,3.198c-0.035,0.357 0.038,0.638 0.216,0.834c0.104,0.115 0.292,0.251 0.599,0.251h18.345c0.719,0 1.282,-0.721 1.282,-1.642c0,-0.065 -0.011,-0.137 -0.028,-0.213c0.221,-0.181 0.402,-0.429 0.53,-0.737C22.965,9.026 22.875,8.119 22.44,7.685zM5.398,8.111C5.56,7.917 6.176,7.283 7.322,7.267l12.99,-0.488l1.501,1.528c0.139,0.139 0.217,0.666 0.019,1.144c-0.146,0.352 -0.375,0.531 -0.682,0.531h-2.753l-2.385,-0.57H13.83c-0.459,0 -0.699,-0.151 -0.713,-0.449l-0.021,-0.421l-7.942,0C5.177,8.45 5.246,8.294 5.398,8.111zM20.865,11.498l-18.284,0c-0.002,-0.025 -0.002,-0.059 0.002,-0.103c0.061,-0.277 0.881,-1.363 1.879,-2.229C4.61,9.327 4.83,9.423 5.1,9.427h7.216c0.201,0.546 0.748,0.87 1.514,0.87h2.078l2.385,0.57h2.857c0.036,0 0.07,-0.002 0.105,-0.004C21.219,11.258 21.016,11.498 20.865,11.498z"
+      android:fillColor="#67DFE8"/>
+  <path
+      android:pathData="M15.313,15.801c-0.167,-0.195 -0.463,-0.218 -0.659,-0.052l-2.228,1.903v-4.09c0,-0.259 -0.209,-0.468 -0.468,-0.468s-0.468,0.209 -0.468,0.468v4.09l-2.229,-1.904c-0.196,-0.167 -0.492,-0.145 -0.659,0.052c-0.168,0.196 -0.145,0.491 0.052,0.659l3,2.563c0.023,0.02 0.05,0.03 0.076,0.044c0.018,0.01 0.033,0.023 0.052,0.03c0.057,0.023 0.116,0.038 0.176,0.038s0.12,-0.015 0.176,-0.038c0.019,-0.008 0.034,-0.02 0.052,-0.03c0.025,-0.015 0.053,-0.025 0.076,-0.044l3,-2.563C15.458,16.292 15.481,15.997 15.313,15.801z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_cgm_profile.xml b/app/src/main/res/drawable/ic_cp_cgm_profile.xml
new file mode 100644
index 0000000000..31c93c3483
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_cgm_profile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.744,9.7c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581L13.03,4.714c-0.387,-0.786 -1.675,-0.786 -2.061,0L9.181,8.336L5.183,8.918C4.751,8.98 4.39,9.284 4.255,9.7c-0.135,0.416 -0.023,0.873 0.291,1.178l2.894,2.819L6.757,17.68c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133L12,17.013l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C19.766,10.573 19.881,10.116 19.744,9.7zM18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35l-3.162,-3.081c-0.063,-0.061 -0.085,-0.153 -0.058,-0.236c0.027,-0.083 0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959l4.369,0.634c0.087,0.013 0.158,0.073 0.185,0.156S18.753,10.2 18.689,10.261z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_cgm_start.xml b/app/src/main/res/drawable/ic_cp_cgm_start.xml
new file mode 100644
index 0000000000..df714c4fca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_cgm_start.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.955,11.969c-0.154,0 -0.306,-0.071 -0.404,-0.205c-0.164,-0.223 -0.115,-0.536 0.107,-0.699c1.828,-1.34 4.354,-1.34 6.184,-0.001c0.223,0.164 0.271,0.477 0.107,0.699c-0.162,0.224 -0.475,0.271 -0.699,0.108c-1.482,-1.086 -3.518,-1.086 -5,0C10.161,11.938 10.057,11.969 9.955,11.969z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M16.804,10.249c-0.103,0 -0.207,-0.032 -0.296,-0.097c-2.205,-1.616 -5.311,-1.616 -7.516,0c-0.225,0.163 -0.536,0.115 -0.7,-0.108C8.129,9.821 8.177,9.508 8.4,9.344c2.551,-1.868 6.149,-1.868 8.7,0c0.223,0.164 0.271,0.477 0.107,0.7C17.109,10.178 16.957,10.249 16.804,10.249z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M18.155,8.4c-0.103,0 -0.206,-0.032 -0.296,-0.097c-2.998,-2.196 -7.221,-2.196 -10.219,0C7.417,8.466 7.105,8.418 6.941,8.195C6.778,7.973 6.826,7.66 7.049,7.496c1.671,-1.224 3.643,-1.872 5.701,-1.872c2.058,0 4.029,0.647 5.701,1.872c0.223,0.164 0.271,0.477 0.107,0.699C18.461,8.329 18.309,8.4 18.155,8.4z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M22.44,14.727l-1.772,-1.804l-13.37,0.502c-1.522,0.021 -2.591,0.907 -2.926,1.717c-1.247,0.944 -2.605,2.549 -2.668,3.198c-0.035,0.357 0.038,0.638 0.216,0.834c0.104,0.115 0.292,0.251 0.599,0.251h18.345c0.719,0 1.282,-0.721 1.282,-1.642c0,-0.065 -0.011,-0.137 -0.028,-0.213c0.221,-0.181 0.402,-0.429 0.53,-0.737C22.965,16.067 22.875,15.161 22.44,14.727zM5.398,15.153c0.162,-0.194 0.778,-0.829 1.923,-0.844l12.99,-0.488l1.501,1.528c0.139,0.139 0.217,0.666 0.019,1.144c-0.146,0.352 -0.375,0.531 -0.682,0.531h-2.753l-2.385,-0.57H13.83c-0.459,0 -0.699,-0.151 -0.713,-0.449l-0.021,-0.421l-7.942,0C5.177,15.492 5.246,15.336 5.398,15.153zM20.865,18.539l-18.284,0c-0.002,-0.025 -0.002,-0.059 0.002,-0.103c0.061,-0.277 0.881,-1.363 1.879,-2.229C4.61,16.369 4.83,16.465 5.1,16.469h7.216c0.201,0.546 0.748,0.87 1.514,0.87h2.078l2.385,0.57h2.857c0.036,0 0.07,-0.002 0.105,-0.004C21.219,18.3 21.016,18.539 20.865,18.539z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_cgm_target.xml b/app/src/main/res/drawable/ic_cp_cgm_target.xml
new file mode 100644
index 0000000000..e708ea5bdd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_cgm_target.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.031,11.646H17.37c-0.178,-2.697 -2.318,-4.837 -5.015,-5.015V5.969c0,-0.196 -0.159,-0.354 -0.354,-0.354s-0.354,0.159 -0.354,0.354V6.63C8.948,6.808 6.808,8.948 6.63,11.646H5.969c-0.196,0 -0.354,0.159 -0.354,0.354s0.159,0.354 0.354,0.354H6.63c0.178,2.697 2.318,4.837 5.015,5.015v0.662c0,0.195 0.159,0.354 0.354,0.354s0.354,-0.159 0.354,-0.354V17.37c2.697,-0.178 4.837,-2.318 5.015,-5.015h0.662c0.195,0 0.354,-0.159 0.354,-0.354S18.227,11.646 18.031,11.646zM16.622,11.646h-1.748c-0.161,-1.329 -1.197,-2.376 -2.52,-2.553V7.371C14.642,7.545 16.452,9.357 16.622,11.646zM13.386,12.354h0.843c-0.154,0.97 -0.908,1.735 -1.874,1.901v-0.869c0,-0.195 -0.159,-0.354 -0.354,-0.354s-0.354,0.159 -0.354,0.354v0.876c-0.999,-0.14 -1.787,-0.914 -1.944,-1.908h0.913c0.196,0 0.354,-0.159 0.354,-0.354s-0.159,-0.354 -0.354,-0.354H9.701c0.153,-0.998 0.943,-1.778 1.945,-1.918v0.888c0,0.196 0.159,0.354 0.354,0.354s0.354,-0.159 0.354,-0.354v-0.88c0.97,0.166 1.725,0.936 1.875,1.911h-0.844c-0.195,0 -0.354,0.159 -0.354,0.354S13.19,12.354 13.386,12.354zM11.646,7.372v1.713c-1.358,0.148 -2.429,1.208 -2.593,2.561H7.383C7.554,9.359 9.361,7.548 11.646,7.372zM7.385,12.354h1.667c0.164,1.353 1.235,2.413 2.593,2.561v1.693C9.367,16.432 7.565,14.632 7.385,12.354zM12.354,16.609v-1.701c1.324,-0.177 2.359,-1.224 2.52,-2.553h1.746C16.441,14.633 14.635,16.435 12.354,16.609z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_exercise.xml b/app/src/main/res/drawable/ic_cp_exercise.xml
new file mode 100644
index 0000000000..de04c4ecce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_exercise.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.75,12.706c1.526,0 2.769,-1.242 2.769,-2.769s-1.242,-2.769 -2.769,-2.769s-2.769,1.242 -2.769,2.769S18.224,12.706 19.75,12.706zM19.75,8.019c1.058,0 1.919,0.86 1.919,1.918s-0.861,1.918 -1.919,1.918s-1.919,-0.86 -1.919,-1.918S18.692,8.019 19.75,8.019z"
+      android:fillColor="#67DFE8"/>
+  <path
+      android:pathData="M23.841,15.936c-0.039,-0.052 -0.956,-1.265 -2.311,-1.265c-1.007,0 -1.661,0.626 -2.239,1.18c-0.512,0.489 -0.954,0.913 -1.572,0.913h-0.001c-0.504,0 -0.916,-0.294 -1.326,-0.655l2.136,-1.613l-5.841,-7.737l-5.636,4.256c-0.332,0.294 -0.804,1.059 -0.211,1.845c0.274,0.363 0.594,0.472 0.814,0.499c0.524,0.064 0.946,-0.265 0.981,-0.292l3.539,-2.671l0.867,1.148l-5.085,3.838c-0.476,-0.427 -1.015,-0.776 -1.674,-0.776c0,0 -0.001,0 -0.001,0c-1.011,0 -1.87,0.779 -2.627,1.467c-0.452,0.41 -0.965,0.876 -1.248,0.876c-0.549,0 -1.259,-0.787 -1.465,-1.063c-0.14,-0.188 -0.405,-0.227 -0.595,-0.087c-0.188,0.14 -0.228,0.405 -0.088,0.594c0.106,0.145 1.074,1.406 2.147,1.406c0.611,0 1.171,-0.508 1.819,-1.096c0.644,-0.584 1.374,-1.247 2.056,-1.247h0c0.601,0 1.127,0.548 1.684,1.128c0.619,0.645 1.259,1.311 2.128,1.311c0.83,0 1.531,-0.574 2.209,-1.131c0.634,-0.52 1.289,-1.057 1.979,-1.057c0.411,0.001 0.798,0.356 1.244,0.768c0.581,0.534 1.238,1.14 2.193,1.14h0.001c0.96,0 1.598,-0.61 2.16,-1.148c0.529,-0.507 0.986,-0.944 1.651,-0.944c0.923,0 1.621,0.914 1.628,0.924c0.142,0.188 0.407,0.224 0.595,0.085C23.94,16.389 23.98,16.124 23.841,15.936zM11.763,16.105c-0.588,0.482 -1.144,0.938 -1.669,0.938c-0.507,-0.001 -0.997,-0.511 -1.515,-1.05c-0.003,-0.003 -0.006,-0.006 -0.009,-0.009l5.663,-4.275L12.34,9.204l-4.229,3.193c-0.028,0.023 -0.207,0.146 -0.354,0.117c-0.031,-0.004 -0.124,-0.015 -0.238,-0.166c-0.25,-0.332 0.013,-0.619 0.071,-0.675l4.932,-3.722l4.815,6.38l-1.591,1.201c-0.426,-0.366 -0.885,-0.674 -1.466,-0.674C13.286,14.856 12.477,15.52 11.763,16.105z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_note.xml b/app/src/main/res/drawable/ic_cp_note.xml
new file mode 100644
index 0000000000..8308aabedf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_note.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.909,5.715l-7.634,7.634c-0.061,0.061 -0.102,0.139 -0.118,0.224l-0.911,4.941c-0.025,0.138 0.019,0.279 0.118,0.378c0.099,0.099 0.24,0.143 0.378,0.118l4.941,-0.911c0.085,-0.016 0.163,-0.057 0.224,-0.118l7.634,-7.634c0.445,-0.445 0.444,-1.17 -0.003,-1.617l-3.012,-3.012C15.079,5.271 14.354,5.27 13.909,5.715zM9.891,16.927c0.097,0.097 0.132,0.24 0.091,0.371c-0.018,0.058 -0.05,0.109 -0.091,0.15c-0.053,0.053 -0.121,0.089 -0.197,0.102l-2.462,0.435c-0.244,-0.008 -0.486,-0.103 -0.673,-0.29c-0.187,-0.187 -0.282,-0.429 -0.29,-0.673l0.435,-2.463c0.024,-0.135 0.121,-0.246 0.252,-0.287c0.131,-0.041 0.274,-0.006 0.371,0.091L9.891,16.927zM17.903,9.269c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L17.903,9.269zM16.588,7.933c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L16.588,7.933zM15.273,6.596c0.141,0.141 0.141,0.369 0,0.509l-6.746,6.746c-0.141,0.141 -0.369,0.141 -0.509,0l-0.265,-0.265c-0.141,-0.141 -0.141,-0.369 0,-0.509l6.746,-6.746c0.141,-0.141 0.369,-0.141 0.509,0L15.273,6.596z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_pump_battery.xml b/app/src/main/res/drawable/ic_cp_pump_battery.xml
new file mode 100644
index 0000000000..e83067fded
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_pump_battery.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.234,10.422c-0.362,0 -0.656,0.294 -0.656,0.656v0.297h-0.469V9.031c0,-0.87 -0.708,-1.578 -1.578,-1.578H4.188c-0.87,0 -1.578,0.708 -1.578,1.578v5.938c0,0.87 0.708,1.578 1.578,1.578h13.344c0.72,0 1.323,-0.488 1.511,-1.149c0.01,0.001 0.018,0.006 0.028,0.006c0.332,0 0.602,-0.297 0.602,-0.664c0,-0.351 -0.25,-0.632 -0.563,-0.655v-1.46h0.469v0.297c0,0.362 0.294,0.656 0.656,0.656s0.656,-0.294 0.656,-0.656v-1.844C20.891,10.716 20.597,10.422 20.234,10.422zM18.109,14.969c0,0.318 -0.26,0.578 -0.578,0.578H4.188c-0.319,0 -0.578,-0.26 -0.578,-0.578V9.031c0,-0.319 0.259,-0.578 0.578,-0.578h13.344c0.318,0 0.578,0.259 0.578,0.578V14.969z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M9.703,10.273l-3.937,2.922l3.453,-1.218l1.781,1.765l4.438,-3.484l-4.297,1.687z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_pump_canula.xml b/app/src/main/res/drawable/ic_cp_pump_canula.xml
new file mode 100644
index 0000000000..b43de7ceaa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_pump_canula.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_pump_cartridge.xml b/app/src/main/res/drawable/ic_cp_pump_cartridge.xml
new file mode 100644
index 0000000000..7ebcbccce6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_pump_cartridge.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.266,9.094c-0.356,0.204 -0.798,0.102 -0.987,-0.227l-1.241,-2.164c-0.189,-0.33 -0.054,-0.762 0.302,-0.967l0,0c0.356,-0.204 0.798,-0.102 0.987,0.227l1.241,2.164C21.758,8.457 21.622,8.89 21.266,9.094L21.266,9.094z"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M7.644,18.842L7.44,18.488l12.834,-7.356c0.118,-0.068 0.196,-0.187 0.21,-0.32l0.188,-3.195l-0.355,-0.619l-2.852,-1.452c-0.122,-0.055 -0.264,-0.048 -0.382,0.02L4.249,12.921l-0.204,-0.354C3.8,12.14 3.246,11.998 2.807,12.25c-0.44,0.252 -0.597,0.802 -0.353,1.229l3.599,6.276c0.245,0.427 0.799,0.569 1.238,0.317C7.73,19.819 7.888,19.269 7.644,18.842zM18.885,10.994l-1.476,-2.318c-0.072,-0.113 -0.225,-0.145 -0.342,-0.07c-0.113,0.071 -0.151,0.216 -0.086,0.329c0.002,0.003 0.004,0.007 0.006,0.01l1.465,2.299l-0.986,0.565L15.988,9.49c-0.072,-0.113 -0.225,-0.145 -0.342,-0.07c-0.113,0.071 -0.151,0.216 -0.086,0.329c0.002,0.003 0.004,0.007 0.006,0.01l1.465,2.299l-0.986,0.565l-1.477,-2.318c-0.072,-0.113 -0.225,-0.145 -0.342,-0.07c-0.113,0.071 -0.151,0.216 -0.086,0.329c0.002,0.003 0.004,0.007 0.006,0.01l1.465,2.299l-0.858,0.492l-2.033,-3.252C12.65,10 12.503,9.965 12.386,10.032l-7.372,4.225l-0.363,-0.633l12.645,-7.247l2.537,1.309l-0.152,2.852L18.885,10.994z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_question.xml b/app/src/main/res/drawable/ic_cp_question.xml
new file mode 100644
index 0000000000..fc6d14c656
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_question.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.042,18.479m-0.979,0a0.979,0.979 0,1 1,1.958 0a0.979,0.979 0,1 1,-1.958 0"
+      android:fillColor="#FEAF05"/>
+  <path
+      android:pathData="M12,16.126c-0.392,0 -0.708,-0.317 -0.708,-0.709c0,-2.548 1.188,-3.437 2.142,-4.151c0.8,-0.599 1.378,-1.032 1.378,-2.432c0,-1.931 -1.854,-2.531 -2.53,-2.531c-1.456,0 -2.631,0.873 -3.225,2.393C8.914,9.06 8.501,9.241 8.138,9.098C7.773,8.955 7.594,8.544 7.736,8.18c0.806,-2.063 2.505,-3.294 4.545,-3.294c1.592,0 3.948,1.255 3.948,3.948c0,2.11 -1.079,2.917 -1.946,3.566c-0.88,0.659 -1.574,1.178 -1.574,3.017C12.709,15.809 12.392,16.126 12,16.126z"
+      android:fillColor="#FEAF05"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cp_stats.xml b/app/src/main/res/drawable/ic_cp_stats.xml
new file mode 100644
index 0000000000..81b3952eb4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cp_stats.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.719,19.125L5.719,11.828"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9.792,19.125L9.792,8.01"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13.865,19.125L13.865,9.51"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.938,19.125L17.938,4.594"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_local_activate.xml b/app/src/main/res/drawable/ic_local_activate.xml
new file mode 100644
index 0000000000..905ade57d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_local_activate.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.069,20.423c-4.644,0 -8.422,-3.779 -8.422,-8.423s3.778,-8.422 8.422,-8.422S20.492,7.355 20.492,12S16.713,20.423 12.069,20.423zM12.069,4.943c-3.891,0 -7.057,3.166 -7.057,7.057c0,3.891 3.166,7.057 7.057,7.057c3.891,0 7.057,-3.166 7.057,-7.057C19.126,8.109 15.961,4.943 12.069,4.943z"
+      android:fillColor="#67DFE8"/>
+  <path
+      android:pathData="M9.945,16.362c-0.113,0 -0.227,-0.028 -0.33,-0.085c-0.217,-0.12 -0.353,-0.349 -0.353,-0.598V8.32c0,-0.249 0.135,-0.478 0.353,-0.598c0.218,-0.12 0.485,-0.112 0.694,0.021l5.827,3.679c0.198,0.125 0.318,0.343 0.318,0.577s-0.12,0.452 -0.318,0.577l-5.827,3.679C10.198,16.326 10.072,16.362 9.945,16.362zM10.627,9.559v4.881L14.493,12L10.627,9.559z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_local_reset.xml b/app/src/main/res/drawable/ic_local_reset.xml
new file mode 100644
index 0000000000..07faa6ee4d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_local_reset.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.787,4.15c-4.338,0 -7.867,3.529 -7.867,7.867v5.193l-2.486,-2.485c-0.25,-0.248 -0.653,-0.248 -0.902,0c-0.249,0.249 -0.249,0.653 0,0.902l3.575,3.574c0.008,0.008 0.019,0.011 0.028,0.018c0.054,0.048 0.112,0.091 0.18,0.119c0.078,0.032 0.161,0.049 0.244,0.049s0.166,-0.017 0.244,-0.049c0.068,-0.028 0.126,-0.071 0.18,-0.119c0.008,-0.008 0.019,-0.01 0.028,-0.018l3.575,-3.574c0.249,-0.249 0.249,-0.653 0,-0.902c-0.249,-0.248 -0.653,-0.248 -0.902,0l-2.486,2.485v-5.193c0,-3.635 2.957,-6.592 6.591,-6.592c3.635,0 6.592,2.957 6.592,6.592c0,1.761 -0.686,3.415 -1.931,4.66c-0.249,0.249 -0.249,0.653 0,0.902c0.25,0.248 0.652,0.248 0.902,0c1.485,-1.486 2.304,-3.461 2.304,-5.563C21.654,7.68 18.125,4.15 13.787,4.15z"
+      android:fillColor="#E93057"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reminder2.xml b/app/src/main/res/drawable/ic_reminder2.xml
new file mode 100644
index 0000000000..35c3148df5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reminder2.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_visibility.xml b/app/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 0000000000..de67f3ee84
--- /dev/null
+++ b/app/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4.531c-4.971,0 -9.209,3.1 -10.912,7.469C2.791,16.368 7.029,19.469 12,19.469s9.209,-3.1 10.912,-7.469C21.209,7.632 16.971,4.531 12,4.531zM12,17.063c-2.796,0 -5.063,-2.267 -5.063,-5.063S9.204,6.938 12,6.938S17.063,9.204 17.063,12S14.796,17.063 12,17.063z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12,12m-2.938,0a2.938,2.938 0,1 1,5.876 0a2.938,2.938 0,1 1,-5.876 0"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_actions_profileswitch.xml b/core/src/main/res/drawable/ic_actions_profileswitch.xml
new file mode 100644
index 0000000000..31c93c3483
--- /dev/null
+++ b/core/src/main/res/drawable/ic_actions_profileswitch.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.744,9.7c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581L13.03,4.714c-0.387,-0.786 -1.675,-0.786 -2.061,0L9.181,8.336L5.183,8.918C4.751,8.98 4.39,9.284 4.255,9.7c-0.135,0.416 -0.023,0.873 0.291,1.178l2.894,2.819L6.757,17.68c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133L12,17.013l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C19.766,10.573 19.881,10.116 19.744,9.7zM18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35l-3.162,-3.081c-0.063,-0.061 -0.085,-0.153 -0.058,-0.236c0.027,-0.083 0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959l4.369,0.634c0.087,0.013 0.158,0.073 0.185,0.156S18.753,10.2 18.689,10.261z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_actions_refill.xml b/core/src/main/res/drawable/ic_actions_refill.xml
new file mode 100644
index 0000000000..09e8cd2953
--- /dev/null
+++ b/core/src/main/res/drawable/ic_actions_refill.xml
@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.693,9.268c-1.078,-2.638 -3.669,-4.497 -6.695,-4.497c-3.993,0 -7.229,3.237 -7.229,7.229"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18.693,9.268L18.937,4.778"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18.693,9.268L14.54,7.538"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5.307,14.733c1.078,2.638 3.669,4.497 6.695,4.497c3.993,0 7.229,-3.237 7.229,-7.229"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5.307,14.733L5.063,19.223"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5.307,14.733L9.46,16.463"
+      android:strokeWidth="1.2756"
+      android:fillColor="#00000000"
+      android:strokeColor="#E93057"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_danar_useropt.xml b/core/src/main/res/drawable/ic_danar_useropt.xml
new file mode 100644
index 0000000000..04edfa4d71
--- /dev/null
+++ b/core/src/main/res/drawable/ic_danar_useropt.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.351,12.926c-0.137,-0.003 -0.283,0.012 -0.337,-0.17c-0.046,-0.155 0.002,-0.266 0.122,-0.366c0.628,-0.523 0.741,-1.232 0.711,-2.042c0,-0.148 0.013,-0.348 -0.002,-0.546c-0.071,-0.91 -0.785,-1.606 -1.718,-1.686c-0.845,-0.073 -1.71,0.485 -1.862,1.344c-0.184,1.039 -0.278,2.111 0.636,2.933c0.115,0.104 0.172,0.206 0.12,0.363c-0.059,0.177 -0.201,0.171 -0.34,0.169c-0.347,-0.005 -0.668,0.083 -0.97,0.249c-0.973,0.535 -1.043,1.404 -0.165,2.061c1.299,0.974 3.949,0.841 5.144,-0.257c0.471,-0.433 0.508,-0.927 0.084,-1.408C14.4,13.146 13.918,12.937 13.351,12.926zM13.572,14.889c-1.202,0.486 -2.407,0.499 -3.555,-0.158c-0.579,-0.331 -0.548,-0.663 0.046,-0.976c0.248,-0.131 0.517,-0.214 0.801,-0.195c0.348,0.024 0.636,-0.047 0.765,-0.414c0.14,-0.399 0.306,-0.823 -0.105,-1.149c-0.661,-0.524 -0.705,-1.225 -0.666,-1.98c0.039,-0.729 0.51,-1.259 1.159,-1.248c0.662,0.011 1.13,0.529 1.146,1.269c0.003,0.119 0,0.239 0,0.456c0.097,0.503 -0.086,0.988 -0.564,1.377c-0.395,0.321 -0.385,0.738 -0.235,1.187c0.15,0.448 0.477,0.542 0.89,0.506c0.039,-0.003 0.08,0.004 0.118,0.014c0.389,0.093 0.879,0.167 0.948,0.599C14.392,14.615 13.901,14.756 13.572,14.889z"
+      android:fillColor="#6AE86D"/>
+  <path
+      android:pathData="M19.107,10.662H17.78c-0.15,-0.648 -0.406,-1.253 -0.749,-1.801l0.941,-0.941c0.239,-0.239 0.239,-0.626 0,-0.864l-1.027,-1.027c-0.239,-0.239 -0.626,-0.239 -0.864,0l-0.941,0.941c-0.548,-0.343 -1.154,-0.599 -1.801,-0.749V4.893c0,-0.338 -0.274,-0.611 -0.611,-0.611h-1.453c-0.338,0 -0.611,0.274 -0.611,0.611V6.22c-0.648,0.15 -1.253,0.406 -1.801,0.749L7.92,6.028c-0.239,-0.239 -0.626,-0.239 -0.864,0L6.028,7.056c-0.239,0.239 -0.239,0.626 0,0.864l0.941,0.941C6.626,9.409 6.37,10.015 6.22,10.662H4.893c-0.338,0 -0.611,0.274 -0.611,0.611v1.453c0,0.338 0.274,0.611 0.611,0.611H6.22c0.15,0.648 0.406,1.253 0.749,1.801L6.028,16.08c-0.239,0.239 -0.239,0.626 0,0.864l1.027,1.027c0.239,0.239 0.626,0.239 0.864,0l0.941,-0.941c0.548,0.343 1.154,0.599 1.801,0.749v1.328c0,0.338 0.274,0.611 0.611,0.611h1.453c0.338,0 0.611,-0.274 0.611,-0.611V17.78c0.648,-0.15 1.254,-0.406 1.801,-0.749l0.941,0.941c0.239,0.239 0.626,0.239 0.864,0l1.027,-1.027c0.239,-0.239 0.239,-0.626 0,-0.864l-0.941,-0.941c0.343,-0.548 0.599,-1.154 0.749,-1.801h1.328c0.338,0 0.611,-0.274 0.611,-0.611v-1.453C19.719,10.936 19.445,10.662 19.107,10.662zM12,16.938c-2.723,0 -4.938,-2.215 -4.938,-4.938S9.277,7.063 12,7.063S16.938,9.277 16.938,12S14.723,16.938 12,16.938z"
+      android:fillColor="#6AE86D"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_danarhistory.xml b/core/src/main/res/drawable/ic_danarhistory.xml
new file mode 100644
index 0000000000..d4ef6ac5f0
--- /dev/null
+++ b/core/src/main/res/drawable/ic_danarhistory.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.069,3.578c-4.48,0 -8.144,3.518 -8.398,7.936L2.71,10.552c-0.268,-0.267 -0.699,-0.267 -0.966,0c-0.267,0.267 -0.267,0.699 0,0.966l2.103,2.102c0.133,0.133 0.308,0.2 0.483,0.2c0.175,0 0.35,-0.067 0.483,-0.2l2.102,-2.102c0.267,-0.267 0.267,-0.699 0,-0.966c-0.267,-0.267 -0.699,-0.267 -0.966,0L5.04,11.461c0.277,-3.64 3.32,-6.518 7.03,-6.518c3.891,0 7.057,3.166 7.057,7.057c0,3.891 -3.166,7.057 -7.057,7.057c-1.921,0 -3.719,-0.762 -5.062,-2.148c-0.263,-0.27 -0.695,-0.276 -0.966,-0.015c-0.271,0.262 -0.278,0.695 -0.015,0.966c1.603,1.652 3.749,2.562 6.043,2.562c4.644,0 8.423,-3.779 8.423,-8.423S16.714,3.578 12.069,3.578z"
+      android:fillColor="#67DFE8"/>
+  <path
+      android:pathData="M12.069,12.683h3.814c0.377,0 0.683,-0.306 0.683,-0.683s-0.305,-0.683 -0.683,-0.683h-3.131V6.915c0,-0.377 -0.306,-0.683 -0.683,-0.683s-0.683,0.306 -0.683,0.683V12C11.387,12.377 11.692,12.683 12.069,12.683z"
+      android:fillColor="#67DFE8"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_danarprofile.xml b/core/src/main/res/drawable/ic_danarprofile.xml
new file mode 100644
index 0000000000..d24a8eb1a5
--- /dev/null
+++ b/core/src/main/res/drawable/ic_danarprofile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.089,9.375c-0.158,-0.489 -0.58,-0.845 -1.089,-0.918l-4.691,-0.682l-2.099,-4.251c-0.454,-0.922 -1.965,-0.922 -2.419,0L8.691,7.774L4,8.457C3.492,8.53 3.069,8.886 2.911,9.375c-0.159,0.488 -0.027,1.024 0.341,1.382l3.396,3.308L5.847,18.74c-0.087,0.508 0.121,1.019 0.536,1.32c0.235,0.171 0.513,0.258 0.793,0.258c0.215,0 0.43,-0.052 0.627,-0.156L12,17.957l4.197,2.205c0.457,0.238 1.004,0.203 1.422,-0.102c0.415,-0.301 0.623,-0.814 0.535,-1.32l-0.801,-4.674l3.395,-3.308C21.115,10.399 21.248,9.863 21.089,9.375zM19.85,10.033l-3.709,3.616l0.876,5.105c0.017,0.102 -0.024,0.205 -0.108,0.264c-0.046,0.035 -0.102,0.052 -0.158,0.052c-0.043,0 -0.086,-0.009 -0.126,-0.032l-4.585,-2.41l-4.586,2.41c-0.088,0.052 -0.199,0.043 -0.284,-0.02c-0.083,-0.059 -0.125,-0.162 -0.107,-0.264l0.876,-5.105l-3.711,-3.616C4.154,9.962 4.128,9.854 4.16,9.756s0.116,-0.168 0.218,-0.183l5.128,-0.745l2.293,-4.646c0.091,-0.186 0.392,-0.186 0.483,0l2.292,4.646l5.128,0.745c0.102,0.015 0.186,0.086 0.218,0.183S19.925,9.962 19.85,10.033z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_danarstats.xml b/core/src/main/res/drawable/ic_danarstats.xml
new file mode 100644
index 0000000000..81b3952eb4
--- /dev/null
+++ b/core/src/main/res/drawable/ic_danarstats.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.719,19.125L5.719,11.828"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9.792,19.125L9.792,8.01"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13.865,19.125L13.865,9.51"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17.938,19.125L17.938,4.594"
+      android:strokeWidth="2.2677"
+      android:fillColor="#00000000"
+      android:strokeColor="#FEAF05"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_home_profile.xml b/core/src/main/res/drawable/ic_home_profile.xml
new file mode 100644
index 0000000000..31c93c3483
--- /dev/null
+++ b/core/src/main/res/drawable/ic_home_profile.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.744,9.7c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581L13.03,4.714c-0.387,-0.786 -1.675,-0.786 -2.061,0L9.181,8.336L5.183,8.918C4.751,8.98 4.39,9.284 4.255,9.7c-0.135,0.416 -0.023,0.873 0.291,1.178l2.894,2.819L6.757,17.68c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133L12,17.013l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C19.766,10.573 19.881,10.116 19.744,9.7zM18.689,10.261l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35l-3.162,-3.081c-0.063,-0.061 -0.085,-0.153 -0.058,-0.236c0.027,-0.083 0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959l4.369,0.634c0.087,0.013 0.158,0.073 0.185,0.156S18.753,10.2 18.689,10.261z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_local_save.xml b/core/src/main/res/drawable/ic_local_save.xml
new file mode 100644
index 0000000000..7b946244f3
--- /dev/null
+++ b/core/src/main/res/drawable/ic_local_save.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.763,17.562c0,0.424 -0.341,0.769 -0.761,0.769H6.883c-0.42,0 -0.762,-0.345 -0.762,-0.769V8.397c0,-0.424 0.342,-0.769 0.762,-0.769h7.342l0.959,-1.417H6.883c-1.202,0 -2.179,0.98 -2.179,2.186v9.165c0,1.205 0.977,2.187 2.179,2.187h9.119c1.201,0 2.179,-0.981 2.179,-2.187V9.266l-1.418,2.096V17.562z"
+      android:fillColor="#67E86A"/>
+  <path
+      android:pathData="M18.824,4.573c-0.326,-0.221 -0.766,-0.135 -0.984,0.19l-5.944,8.787l-2.518,-2.53c-0.277,-0.277 -0.726,-0.279 -1.002,-0.002c-0.277,0.276 -0.278,0.725 -0.002,1.002l3.125,3.141c0.134,0.134 0.315,0.209 0.502,0.209c0.022,0 0.044,-0.001 0.066,-0.004c0.211,-0.02 0.402,-0.133 0.521,-0.308l6.427,-9.501C19.233,5.232 19.148,4.792 18.824,4.573z"
+      android:fillColor="#67E86A"/>
+</vector>

From d55c9d9ff6905c979cce4661add8283d50d1a73d Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 19 Jun 2020 13:59:39 +0200
Subject: [PATCH 209/400] Update Layout and code with new icons

---
 .../androidaps/dialogs/CareDialog.kt          | 14 ++++-----
 .../automation/actions/ActionProfileSwitch.kt |  2 +-
 .../actions/ActionProfileSwitchPercent.kt     |  2 +-
 .../actions/ActionStartTempTarget.kt          |  2 +-
 .../general/automation/triggers/TriggerBg.kt  |  2 +-
 .../triggers/TriggerProfilePercent.kt         |  2 +-
 app/src/main/res/layout/actions_fragment.xml  | 24 +++++++--------
 .../main/res/layout/careportal_fragment.xml   | 30 +++++++++----------
 .../res/layout/careportal_stats_fragment.xml  |  8 ++---
 .../main/res/layout/combopump_fragment.xml    |  2 +-
 app/src/main/res/layout/dialog_care.xml       |  2 +-
 app/src/main/res/layout/dialog_fill.xml       |  2 +-
 .../main/res/layout/dialog_profileswitch.xml  |  2 +-
 app/src/main/res/layout/dialog_temptarget.xml |  2 +-
 .../main/res/layout/localprofile_fragment.xml |  6 ++--
 .../main/res/layout/medtronic_fragment.xml    |  6 ++--
 app/src/main/res/layout/omnipod_fragment.xml  |  8 ++---
 .../layout/omnipod_initpod_init_action.xml    |  2 +-
 app/src/main/res/layout/omnipod_pod_mgmt.xml  |  8 ++---
 .../layout/overview_statuslights_layout.xml   | 12 ++++----
 .../actions/ActionProfileSwitchPercentTest.kt |  2 +-
 .../actions/ActionProfileSwitchTest.kt        |  2 +-
 .../actions/ActionStartTempTargetTest.kt      |  2 +-
 .../automation/triggers/TriggerBgTest.kt      |  2 +-
 .../triggers/TriggerProfilePercentTest.kt     |  2 +-
 .../general/actions/defs/CustomAction.kt      |  4 +--
 .../main/res/layout/dialog_profileviewer.xml  |  2 +-
 dana/src/main/res/layout/danar_fragment.xml   |  8 ++---
 .../main/res/layout/danar_historyactivity.xml |  4 +--
 .../layout/danar_user_options_activity.xml    |  4 +--
 30 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
index ed2b96d1e7..d52e3d26e6 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
@@ -83,13 +83,13 @@ class CareDialog : DialogFragmentWithDate() {
         }
 
         actions_care_icon.setImageResource(when (options) {
-            EventType.BGCHECK        -> R.drawable.icon_cp_bgcheck
-            EventType.SENSOR_INSERT  -> R.drawable.icon_cp_cgm_insert
-            EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery
-            EventType.NOTE           -> R.drawable.icon_cp_note
-            EventType.EXERCISE       -> R.drawable.icon_cp_exercise
-            EventType.QUESTION       -> R.drawable.icon_cp_question
-            EventType.ANNOUNCEMENT   -> R.drawable.icon_cp_announcement
+            EventType.BGCHECK        -> R.drawable.ic_cp_bgcheck
+            EventType.SENSOR_INSERT  -> R.drawable.ic_cp_cgm_insert
+            EventType.BATTERY_CHANGE -> R.drawable.ic_cp_pump_battery
+            EventType.NOTE           -> R.drawable.ic_cp_note
+            EventType.EXERCISE       -> R.drawable.ic_cp_exercise
+            EventType.QUESTION       -> R.drawable.ic_cp_question
+            EventType.ANNOUNCEMENT   -> R.drawable.ic_cp_announcement
         })
         actions_care_title.text = resourceHelper.gs(when (options) {
             EventType.BGCHECK        -> R.string.careportal_bgcheck
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
index a46796b59d..9d4bc5f81d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
@@ -27,7 +27,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
 
     override fun friendlyName(): Int = R.string.profilename
     override fun shortDescription(): String = resourceHelper.gs(R.string.changengetoprofilename, inputProfileName.value)
-    @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch
+    @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch
 
     override fun doAction(callback: Callback) {
         val activeProfileName = profileFunction.getProfileName()
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
index f45e8d19e9..b0cb5f555f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
@@ -30,7 +30,7 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector
         if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt())
         else resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value)
 
-    @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch
+    @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch
 
     init {
         precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
index d0cb6b09e7..812a572df9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
@@ -37,7 +37,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
 
     override fun friendlyName(): Int = R.string.starttemptarget
     override fun shortDescription(): String = resourceHelper.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, resourceHelper)
-    @DrawableRes override fun icon(): Int = R.drawable.icon_cp_cgm_target
+    @DrawableRes override fun icon(): Int = R.drawable.ic_cp_cgm_target
 
     override fun doAction(callback: Callback) {
         activePlugin.activeTreatments.addToHistoryTempTarget(tt())
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
index 75b30edb3b..558bc9ac4f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
@@ -91,7 +91,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
             resourceHelper.gs(if (bg.units == Constants.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, resourceHelper.gs(comparator.value.stringRes), bg.value, bg.units)
     }
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_cp_bgcheck)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bgcheck)
 
     override fun duplicate(): Trigger = TriggerBg(injector, this)
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
index 1dea3cd15f..9a13ebedeb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
@@ -77,7 +77,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
     override fun friendlyDescription(): String =
         resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt())
 
-    override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_actions_profileswitch)
+    override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_actions_profileswitch)
 
     override fun duplicate(): Trigger = TriggerProfilePercent(injector, this)
 
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 9b126fb8d1..ebb517dcb7 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -30,7 +30,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_profileswitch"
+                android:drawableTop="@drawable/ic_actions_profileswitch"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_profileswitch"
@@ -45,7 +45,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_actions_temptarget"
+                android:drawableTop="@drawable/ic_actions_temptarget"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_temporarytarget"
@@ -144,7 +144,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_bgcheck"
+                android:drawableTop="@drawable/ic_cp_bgcheck"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_bgcheck"
@@ -159,7 +159,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_cp_pump_canula"
+                android:drawableTop="@drawable/ic_cp_pump_canula"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/primefill"
@@ -174,7 +174,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_cgm_insert"
+                android:drawableTop="@drawable/ic_cp_cgm_insert"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_cgmsensorinsert"
@@ -188,7 +188,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_pump_battery"
+                android:drawableTop="@drawable/ic_cp_pump_battery"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_pumpbatterychange"
@@ -202,7 +202,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_note"
+                android:drawableTop="@drawable/ic_cp_note"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_note"
@@ -216,7 +216,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_exercise"
+                android:drawableTop="@drawable/ic_cp_exercise"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_exercise"
@@ -230,7 +230,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_announcement"
+                android:drawableTop="@drawable/ic_cp_announcement"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_announcement"
@@ -244,7 +244,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:drawableTop="@drawable/icon_cp_question"
+                android:drawableTop="@drawable/ic_cp_question"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/careportal_question"
@@ -273,7 +273,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_danarhistory"
+                android:drawableTop="@drawable/ic_danarhistory"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/nav_historybrowser"
@@ -287,7 +287,7 @@
                 style="@style/ButtonSmallFontStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:drawableTop="@drawable/icon_danarstats"
+                android:drawableTop="@drawable/ic_cp_stats"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/tdd"
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 44d5f957f0..6d6da91bc3 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -50,7 +50,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0px"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bgcheck"
+                        android:drawableTop="@drawable/ic_cp_bgcheck"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_bgcheck"
@@ -65,7 +65,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_exercise"
+                        android:drawableTop="@drawable/ic_cp_exercise"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_exercise"
@@ -79,7 +79,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_cgm_target"
+                        android:drawableTop="@drawable/ic_cp_cgm_target"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_temporarytarget"
@@ -110,7 +110,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_snack"
+                        android:drawableTop="@drawable/ic_cp_bolus_snack"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_snackbolus"
@@ -124,7 +124,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_bolus_meal"
+                        android:drawableTop="@drawable/ic_cp_bolus_meal"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_mealbolus"
@@ -224,7 +224,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_cgm_start"
+                        android:drawableTop="@drawable/ic_cp_cgm_start"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_cgmsensorstart"
@@ -239,7 +239,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_cgm_insert"
+                        android:drawableTop="@drawable/ic_cp_cgm_insert"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_cgmsensorinsert"
@@ -254,7 +254,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_aaps_offline"
+                        android:drawableTop="@drawable/ic_cp_aaps_offline"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_openapsoffline"
@@ -269,7 +269,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_announcement"
+                        android:drawableTop="@drawable/ic_cp_announcement"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_announcement"
@@ -283,7 +283,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_question"
+                        android:drawableTop="@drawable/ic_cp_question"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_question"
@@ -297,7 +297,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_note"
+                        android:drawableTop="@drawable/ic_cp_note"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_note"
@@ -326,7 +326,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_pump_canula"
+                        android:drawableTop="@drawable/ic_cp_pump_canula"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_pumpsitechange"
@@ -340,7 +340,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_pump_cartridge"
+                        android:drawableTop="@drawable/ic_cp_pump_cartridge"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_insulincartridgechange"
@@ -354,7 +354,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_cgm_profile"
+                        android:drawableTop="@drawable/ic_cp_cgm_profile"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_profileswitch"
@@ -369,7 +369,7 @@
                         style="@style/ButtonSmallFontStyle"
                         android:layout_width="0dp"
                         android:layout_height="fill_parent"
-                        android:drawableTop="@drawable/icon_cp_pump_battery"
+                        android:drawableTop="@drawable/ic_cp_pump_battery"
                         android:paddingLeft="0dp"
                         android:paddingRight="0dp"
                         android:text="@string/careportal_pumpbatterychange"
diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml
index 2532a6f198..bcd7f38f21 100644
--- a/app/src/main/res/layout/careportal_stats_fragment.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment.xml
@@ -21,7 +21,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-				android:drawableLeft="@drawable/icon_cp_age_sensor"
+				android:drawableLeft="@drawable/ic_cp_age_sensor"
                 android:paddingRight="5dp"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_sensorage_label"
@@ -68,7 +68,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:drawableLeft="@drawable/icon_cp_age_insulin"
+                android:drawableLeft="@drawable/ic_cp_age_insulin"
                 android:paddingRight="5dp"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_insulinage_label"
@@ -115,7 +115,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:drawableLeft="@drawable/icon_cp_age_canula"
+                android:drawableLeft="@drawable/ic_cp_age_canula"
                 android:paddingRight="5dp"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_canulaage_label"
@@ -162,7 +162,7 @@
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:drawableLeft="@drawable/icon_cp_age_battery"
+                android:drawableLeft="@drawable/ic_cp_age_battery"
                 android:paddingRight="5dp"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_pbage_label"
diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml
index c4a65feb36..1a60481875 100644
--- a/app/src/main/res/layout/combopump_fragment.xml
+++ b/app/src/main/res/layout/combopump_fragment.xml
@@ -494,7 +494,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="0.5"
                 android:layout_marginRight="-4dp"
-                android:drawableTop="@drawable/icon_actions_refill"
+                android:drawableTop="@drawable/ic_actions_refill"
                 android:paddingLeft="0dp"
                 android:paddingRight="0dp"
                 android:text="@string/combo_refresh" />
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 500b118afa..c4c5ad59ca 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_profileswitch"
-                android:src="@drawable/icon_actions_profileswitch" />
+                android:src="@drawable/ic_actions_profileswitch" />
 
             <TextView
                 android:id="@+id/actions_care_title"
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 3e0bed7478..48f60b7a1c 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/primefill"
-                android:src="@drawable/icon_cp_pump_canula" />
+                android:src="@drawable/ic_cp_pump_canula" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index e726097369..ab8efe79cd 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_profileswitch"
-                android:src="@drawable/icon_actions_profileswitch" />
+                android:src="@drawable/ic_actions_profileswitch" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index d03413a237..9eb1ef968c 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/careportal_temporarytarget"
-                android:src="@drawable/icon_actions_temptarget" />
+                android:src="@drawable/ic_actions_temptarget" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 306d7bdcb4..008af1e032 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -260,7 +260,7 @@
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
             android:text="@string/activate_profile"
-            android:drawableStart="@drawable/icon_local_activate" />
+            android:drawableStart="@drawable/ic_local_activate" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -279,7 +279,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="3dp"
                 android:layout_weight="1"
-                android:drawableStart="@drawable/icon_local_reset"
+                android:drawableStart="@drawable/ic_local_reset"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
                 android:text="@string/reset" />
@@ -295,7 +295,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="3dp"
                 android:layout_weight="1"
-                android:drawableStart="@drawable/icon_local_save"
+                android:drawableStart="@drawable/ic_local_save"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
                 android:text="@string/save" />
diff --git a/app/src/main/res/layout/medtronic_fragment.xml b/app/src/main/res/layout/medtronic_fragment.xml
index af16dd26cb..b6c52f76cb 100644
--- a/app/src/main/res/layout/medtronic_fragment.xml
+++ b/app/src/main/res/layout/medtronic_fragment.xml
@@ -496,7 +496,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_actions_refill"
+                    android:drawableTop="@drawable/ic_actions_refill"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/combo_refresh" />
@@ -508,7 +508,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarhistory"
+                    android:drawableTop="@drawable/ic_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/pumphistory" />
@@ -519,7 +519,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarstats"
+                    android:drawableTop="@drawable/ic_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="RL Stats" />
diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml
index f6d13171ce..912d975168 100644
--- a/app/src/main/res/layout/omnipod_fragment.xml
+++ b/app/src/main/res/layout/omnipod_fragment.xml
@@ -573,7 +573,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_actions_refill"
+                    android:drawableTop="@drawable/ic_actions_refill"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/combo_refresh" />
@@ -585,7 +585,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarhistory"
+                    android:drawableTop="@drawable/ic_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_pod_mgmt" />
@@ -596,7 +596,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_cp_aaps_offline"
+                    android:drawableTop="@drawable/ic_cp_aaps_offline"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_ack_short" />
@@ -607,7 +607,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarstats"
+                    android:drawableTop="@drawable/ic_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_rl_stats" />
diff --git a/app/src/main/res/layout/omnipod_initpod_init_action.xml b/app/src/main/res/layout/omnipod_initpod_init_action.xml
index 7fb6863405..012b87f71b 100644
--- a/app/src/main/res/layout/omnipod_initpod_init_action.xml
+++ b/app/src/main/res/layout/omnipod_initpod_init_action.xml
@@ -58,7 +58,7 @@
             android:layout_marginRight="15dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
-            android:drawableTop="@drawable/icon_actions_refill"
+            android:drawableTop="@drawable/ic_actions_refill"
             android:visibility="gone" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/omnipod_pod_mgmt.xml b/app/src/main/res/layout/omnipod_pod_mgmt.xml
index 13862757eb..778757e314 100644
--- a/app/src/main/res/layout/omnipod_pod_mgmt.xml
+++ b/app/src/main/res/layout/omnipod_pod_mgmt.xml
@@ -40,7 +40,7 @@
                 android:layout_marginTop="3dp"
                 android:textAllCaps="false"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_cp_pump_canula"
+                android:drawableTop="@drawable/ic_cp_pump_canula"
                 android:text="@string/omnipod_cmd_init_pod" />
 
             <TextView
@@ -61,7 +61,7 @@
                 android:layout_marginTop="3dp"
                 android:textAllCaps="false"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_actions_temptarget"
+                android:drawableTop="@drawable/ic_actions_temptarget"
                 android:text="@string/omnipod_cmd_deactivate_pod" />
 
             <TextView
@@ -82,7 +82,7 @@
                 android:layout_marginBottom="3dp"
                 android:textAllCaps="false"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_cp_pump_canula"
+                android:drawableTop="@drawable/ic_cp_pump_canula"
                 android:text="@string/omnipod_cmd_reset_pod" />
 
             <TextView
@@ -104,7 +104,7 @@
                 android:layout_marginBottom="3dp"
                 android:textAllCaps="false"
                 android:layout_weight="0.5"
-                android:drawableTop="@drawable/icon_danarhistory"
+                android:drawableTop="@drawable/ic_danarhistory"
                 android:text="@string/omnipod_cmd_pod_history" />
 
 
diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml
index 13b9fd1815..2d318f900d 100644
--- a/app/src/main/res/layout/overview_statuslights_layout.xml
+++ b/app/src/main/res/layout/overview_statuslights_layout.xml
@@ -18,7 +18,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/icon_cp_age_canula" />
+        android:src="@drawable/ic_cp_age_canula" />
 
     <TextView
         android:id="@+id/careportal_canulaage"
@@ -35,9 +35,9 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:scaleType="centerInside"
-        android:scaleX="2"
-        android:scaleY="2"
-        android:src="@drawable/icon_cp_age_insulin" />
+        android:scaleX="1.8"
+        android:scaleY="1.8"
+        android:src="@drawable/ic_cp_age_insulin" />
 
     <TextView
         android:id="@+id/careportal_insulinage"
@@ -63,7 +63,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/icon_cp_age_sensor" />
+        android:src="@drawable/ic_cp_age_sensor" />
 
     <TextView
         android:id="@+id/careportal_sensorage"
@@ -82,7 +82,7 @@
         android:scaleType="centerInside"
         android:scaleX="2"
         android:scaleY="2"
-        android:src="@drawable/icon_cp_age_battery" />
+        android:src="@drawable/ic_cp_age_battery" />
 
     <TextView
         android:id="@+id/careportal_pbage"
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
index 1cc417276e..dd324e3373 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
@@ -38,7 +38,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon())
+        Assert.assertEquals(R.drawable.ic_actions_profileswitch, sut.icon())
     }
 
     @Test fun doActionTest() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
index f51e667682..569ab4d0da 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
@@ -116,6 +116,6 @@ class ActionProfileSwitchTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon())
+        Assert.assertEquals(R.drawable.ic_actions_profileswitch, sut.icon())
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
index fe4abf1d7c..f35e797a0b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
@@ -42,7 +42,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(R.drawable.icon_cp_cgm_target, sut.icon())
+        Assert.assertEquals(R.drawable.ic_cp_cgm_target, sut.icon())
     }
 
     @Test fun doActionTest() {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
index b628f6035a..4d8e2b5442 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
@@ -90,7 +90,7 @@ class TriggerBgTest : TriggerTestBase() {
 
     @Test
     fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_cp_bgcheck), TriggerBg(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
     }
 
     private fun generateOneCurrentRecordBgData(): List<BgReading> {
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
index 9a03087c4e..eccbf1a3e2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
@@ -69,7 +69,7 @@ class TriggerProfilePercentTest : TriggerTestBase() {
     }
 
     @Test fun iconTest() {
-        Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), TriggerProfilePercent(injector).icon())
+        Assert.assertEquals(Optional.of(R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon())
     }
 
     @Test fun friendlyNameTest() {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
index b276bae9b1..be5e30496a 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
@@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.general.actions.defs
 
 import info.nightscout.androidaps.core.R
 
-class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.icon_actions_profileswitch, var isEnabled: Boolean = true) {
+class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.ic_actions_profileswitch, var isEnabled: Boolean = true) {
 
     constructor(nameResourceId: Int, actionType: CustomActionType?, enabled: Boolean) :
-            this(nameResourceId, actionType, R.drawable.icon_actions_profileswitch, enabled)
+            this(nameResourceId, actionType, R.drawable.ic_actions_profileswitch, enabled)
 
 }
\ No newline at end of file
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index 9434d828f0..feec6a1163 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -24,7 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/carbs"
-                android:src="@drawable/icon_home_profile" />
+                android:src="@drawable/ic_home_profile" />
 
             <TextView
                 android:id="@+id/profileview_activeprofile"
diff --git a/dana/src/main/res/layout/danar_fragment.xml b/dana/src/main/res/layout/danar_fragment.xml
index 2720862609..3eff537255 100644
--- a/dana/src/main/res/layout/danar_fragment.xml
+++ b/dana/src/main/res/layout/danar_fragment.xml
@@ -704,7 +704,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarprofile"
+                    android:drawableTop="@drawable/ic_danarprofile"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/viewprofile" />
@@ -716,7 +716,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarhistory"
+                    android:drawableTop="@drawable/ic_danarhistory"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/pumphistory" />
@@ -727,7 +727,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danarstats"
+                    android:drawableTop="@drawable/ic_danarstats"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/stats" />
@@ -738,7 +738,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:drawableTop="@drawable/icon_danar_useropt"
+                    android:drawableTop="@drawable/ic_danar_useropt"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/danar_useroptions" />
diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml
index 5f723d56ed..3d1771dde4 100644
--- a/dana/src/main/res/layout/danar_historyactivity.xml
+++ b/dana/src/main/res/layout/danar_historyactivity.xml
@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/pumphistory"
-            android:src="@drawable/icon_danarhistory" />
+            android:src="@drawable/ic_danarhistory" />
 
         <TextView
             android:layout_width="match_parent"
@@ -87,7 +87,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:drawableStart="@drawable/icon_actions_refill"
+        android:drawableStart="@drawable/ic_actions_refill"
         android:text="@string/reload" />
 
 </RelativeLayout>
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index d9078576e7..9996fa93d0 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/danar_pump_settings"
-                android:src="@drawable/icon_danar_useropt" />
+                android:src="@drawable/ic_danar_useropt" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -320,7 +320,7 @@
             style="@style/Widget.AppCompat.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/icon_local_save"
+            android:drawableStart="@drawable/ic_local_save"
             android:text="@string/danar_saveuseroptions" />
 
     </LinearLayout>

From 9b3b5f42ecd93bc994ac9689a063a1f6e1f820e3 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 19 Jun 2020 14:01:40 +0200
Subject: [PATCH 210/400] safe delete old png files

---
 app/src/main/res/drawable-hdpi/ic_visibility.png | Bin 953 -> 0 bytes
 .../drawable-hdpi/icon_actions_profileswitch.png | Bin 1585 -> 0 bytes
 .../drawable-hdpi/icon_actions_temptarget.png    | Bin 2118 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_aaps_offline.png   | Bin 2011 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_age_battery.png    | Bin 1183 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_age_canula.png     | Bin 1060 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_age_insulin.png    | Bin 1530 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_age_sensor.png     | Bin 1931 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_announcement.png   | Bin 1939 -> 0 bytes
 .../main/res/drawable-hdpi/icon_cp_bgcheck.png   | Bin 1903 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_bolus_combo.png    | Bin 771 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_bolus_meal.png     | Bin 1470 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_bolus_snack.png    | Bin 1500 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_cgm_insert.png     | Bin 1609 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_cgm_profile.png    | Bin 1529 -> 0 bytes
 .../main/res/drawable-hdpi/icon_cp_cgm_start.png | Bin 1939 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_cgm_target.png     | Bin 1965 -> 0 bytes
 .../main/res/drawable-hdpi/icon_cp_exercise.png  | Bin 2324 -> 0 bytes
 app/src/main/res/drawable-hdpi/icon_cp_note.png  | Bin 2020 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_pump_battery.png   | Bin 1233 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_pump_canula.png    | Bin 1500 -> 0 bytes
 .../res/drawable-hdpi/icon_cp_pump_cartridge.png | Bin 1798 -> 0 bytes
 .../main/res/drawable-hdpi/icon_cp_question.png  | Bin 1220 -> 0 bytes
 .../res/drawable-hdpi/icon_local_activate.png    | Bin 1357 -> 0 bytes
 .../drawable-hdpi/icon_local_activatehdpi.png    | Bin 1357 -> 0 bytes
 .../main/res/drawable-hdpi/icon_local_reset.png  | Bin 963 -> 0 bytes
 .../res/drawable-hdpi/icon_local_resethdpi.png   | Bin 963 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_visibility.png | Bin 413 -> 0 bytes
 .../drawable-mdpi/icon_actions_profileswitch.png | Bin 1143 -> 0 bytes
 .../drawable-mdpi/icon_actions_temptarget.png    | Bin 1364 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_aaps_offline.png   | Bin 1361 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_age_battery.png    | Bin 911 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_age_canula.png     | Bin 806 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_age_insulin.png    | Bin 1073 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_age_sensor.png     | Bin 1352 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_announcement.png   | Bin 1286 -> 0 bytes
 .../main/res/drawable-mdpi/icon_cp_bgcheck.png   | Bin 1233 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_bolus_combo.png    | Bin 687 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_bolus_meal.png     | Bin 1046 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_bolus_snack.png    | Bin 1007 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_cgm_insert.png     | Bin 1156 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_cgm_profile.png    | Bin 1075 -> 0 bytes
 .../main/res/drawable-mdpi/icon_cp_cgm_start.png | Bin 1321 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_cgm_target.png     | Bin 1295 -> 0 bytes
 .../main/res/drawable-mdpi/icon_cp_exercise.png  | Bin 1464 -> 0 bytes
 app/src/main/res/drawable-mdpi/icon_cp_note.png  | Bin 1307 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_pump_battery.png   | Bin 932 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_pump_canula.png    | Bin 1090 -> 0 bytes
 .../res/drawable-mdpi/icon_cp_pump_cartridge.png | Bin 1305 -> 0 bytes
 .../main/res/drawable-mdpi/icon_cp_question.png  | Bin 913 -> 0 bytes
 .../res/drawable-mdpi/icon_local_activate.png    | Bin 881 -> 0 bytes
 .../drawable-mdpi/icon_local_activatemdpi.png    | Bin 881 -> 0 bytes
 .../main/res/drawable-mdpi/icon_local_reset.png  | Bin 692 -> 0 bytes
 .../res/drawable-mdpi/icon_local_resetmdpi.png   | Bin 692 -> 0 bytes
 .../res/drawable-mdpi/icon_local_savemdpi.png    | Bin 619 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_visibility.png    | Bin 847 -> 0 bytes
 .../icon_actions_profileswitch.png               | Bin 2150 -> 0 bytes
 .../drawable-xhdpi/icon_actions_temptarget.png   | Bin 2836 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_aaps_offline.png  | Bin 2622 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_age_battery.png   | Bin 1462 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_age_canula.png    | Bin 1283 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_age_insulin.png   | Bin 2014 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_age_sensor.png    | Bin 2480 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_announcement.png  | Bin 2543 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_cp_bgcheck.png  | Bin 2464 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_bolus_combo.png   | Bin 859 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_bolus_meal.png    | Bin 1963 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_bolus_snack.png   | Bin 1986 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_cgm_insert.png    | Bin 2044 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_cgm_profile.png   | Bin 2059 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_cgm_start.png     | Bin 2556 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_cgm_target.png    | Bin 2653 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_cp_exercise.png | Bin 3154 -> 0 bytes
 app/src/main/res/drawable-xhdpi/icon_cp_note.png | Bin 2802 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_pump_battery.png  | Bin 1509 -> 0 bytes
 .../res/drawable-xhdpi/icon_cp_pump_canula.png   | Bin 1962 -> 0 bytes
 .../drawable-xhdpi/icon_cp_pump_cartridge.png    | Bin 2401 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_cp_question.png | Bin 1513 -> 0 bytes
 .../res/drawable-xhdpi/icon_local_activate.png   | Bin 1700 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_local_reset.png | Bin 1241 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_visibility.png   | Bin 2094 -> 0 bytes
 .../icon_actions_profileswitch.png               | Bin 3312 -> 0 bytes
 .../drawable-xxhdpi/icon_actions_temptarget.png  | Bin 4232 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_aaps_offline.png | Bin 3886 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_age_battery.png  | Bin 1991 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_age_canula.png   | Bin 1788 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_age_insulin.png  | Bin 2867 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_age_sensor.png   | Bin 3604 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_announcement.png | Bin 3754 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_cp_bgcheck.png | Bin 3637 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_bolus_combo.png  | Bin 940 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_bolus_meal.png   | Bin 2746 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_bolus_snack.png  | Bin 2975 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_cgm_insert.png   | Bin 2946 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_cgm_profile.png  | Bin 3179 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_cgm_start.png    | Bin 3738 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_cgm_target.png   | Bin 3820 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_exercise.png     | Bin 4734 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_cp_note.png    | Bin 4109 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_pump_battery.png | Bin 2098 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_pump_canula.png  | Bin 2829 -> 0 bytes
 .../drawable-xxhdpi/icon_cp_pump_cartridge.png   | Bin 3466 -> 0 bytes
 .../res/drawable-xxhdpi/icon_cp_question.png     | Bin 2097 -> 0 bytes
 .../res/drawable-xxhdpi/icon_local_activate.png  | Bin 2678 -> 0 bytes
 .../res/drawable-xxhdpi/icon_local_reset.png     | Bin 1884 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_visibility.png  | Bin 2090 -> 0 bytes
 .../icon_actions_profileswitch.png               | Bin 4514 -> 0 bytes
 .../drawable-xxxhdpi/icon_actions_temptarget.png | Bin 5622 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_aaps_offline.png    | Bin 5173 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_age_battery.png | Bin 2612 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_age_canula.png  | Bin 2285 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_age_insulin.png | Bin 3972 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_age_sensor.png  | Bin 4801 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_announcement.png    | Bin 4990 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_bgcheck.png     | Bin 4845 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_bolus_combo.png | Bin 1132 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_bolus_meal.png  | Bin 3634 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_bolus_snack.png | Bin 3854 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_cgm_insert.png  | Bin 3772 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_cgm_profile.png | Bin 4222 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_cgm_start.png   | Bin 4949 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_cgm_target.png  | Bin 5083 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_exercise.png    | Bin 6431 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_cp_note.png   | Bin 5399 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_pump_battery.png    | Bin 2659 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_pump_canula.png | Bin 3705 -> 0 bytes
 .../drawable-xxxhdpi/icon_cp_pump_cartridge.png  | Bin 4483 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_cp_question.png    | Bin 2737 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_local_activate.png | Bin 3549 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_local_reset.png    | Bin 2510 -> 0 bytes
 .../res/drawable/icon_actions_temptarget.png     | Bin 1364 -> 0 bytes
 .../main/res/drawable/icon_cp_aaps_offline.png   | Bin 1361 -> 0 bytes
 .../main/res/drawable/icon_cp_age_battery.png    | Bin 911 -> 0 bytes
 app/src/main/res/drawable/icon_cp_age_canula.png | Bin 806 -> 0 bytes
 .../main/res/drawable/icon_cp_age_insulin.png    | Bin 1073 -> 0 bytes
 app/src/main/res/drawable/icon_cp_age_sensor.png | Bin 1352 -> 0 bytes
 .../main/res/drawable/icon_cp_announcement.png   | Bin 1286 -> 0 bytes
 app/src/main/res/drawable/icon_cp_bgcheck.png    | Bin 1233 -> 0 bytes
 .../main/res/drawable/icon_cp_bolus_combo.png    | Bin 687 -> 0 bytes
 app/src/main/res/drawable/icon_cp_bolus_meal.png | Bin 1046 -> 0 bytes
 .../main/res/drawable/icon_cp_bolus_snack.png    | Bin 1007 -> 0 bytes
 app/src/main/res/drawable/icon_cp_cgm_insert.png | Bin 1156 -> 0 bytes
 .../main/res/drawable/icon_cp_cgm_profile.png    | Bin 1075 -> 0 bytes
 app/src/main/res/drawable/icon_cp_cgm_start.png  | Bin 1321 -> 0 bytes
 app/src/main/res/drawable/icon_cp_cgm_target.png | Bin 1295 -> 0 bytes
 app/src/main/res/drawable/icon_cp_exercise.png   | Bin 1464 -> 0 bytes
 app/src/main/res/drawable/icon_cp_note.png       | Bin 1307 -> 0 bytes
 .../main/res/drawable/icon_cp_pump_battery.png   | Bin 932 -> 0 bytes
 .../main/res/drawable/icon_cp_pump_canula.png    | Bin 1090 -> 0 bytes
 .../main/res/drawable/icon_cp_pump_cartridge.png | Bin 1305 -> 0 bytes
 app/src/main/res/drawable/icon_cp_question.png   | Bin 913 -> 0 bytes
 .../main/res/drawable/icon_local_activate.png    | Bin 3549 -> 0 bytes
 app/src/main/res/drawable/icon_local_reset.png   | Bin 1884 -> 0 bytes
 .../res/drawable-hdpi/icon_actions_refill.png    | Bin 1672 -> 0 bytes
 .../res/drawable-hdpi/icon_danar_useropt.png     | Bin 1416 -> 0 bytes
 .../main/res/drawable-hdpi/icon_danarhistory.png | Bin 2090 -> 0 bytes
 .../main/res/drawable-hdpi/icon_danarprofile.png | Bin 1935 -> 0 bytes
 .../main/res/drawable-hdpi/icon_danarstats.png   | Bin 1059 -> 0 bytes
 .../main/res/drawable-hdpi/icon_home_profile.png | Bin 1797 -> 0 bytes
 .../main/res/drawable-hdpi/icon_local_save.png   | Bin 912 -> 0 bytes
 .../main/res/drawable-mdpi/icon_danarhistory.png | Bin 1310 -> 0 bytes
 .../main/res/drawable-mdpi/icon_danarprofile.png | Bin 1189 -> 0 bytes
 .../main/res/drawable-mdpi/icon_danarstats.png   | Bin 754 -> 0 bytes
 .../main/res/drawable-mdpi/icon_local_save.png   | Bin 619 -> 0 bytes
 .../res/drawable-xhdpi/icon_actions_refill.png   | Bin 2189 -> 0 bytes
 .../res/drawable-xhdpi/icon_danar_useropt.png    | Bin 1913 -> 0 bytes
 .../res/drawable-xhdpi/icon_danarhistory.png     | Bin 2822 -> 0 bytes
 .../res/drawable-xhdpi/icon_danarprofile.png     | Bin 2421 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_danarstats.png  | Bin 1272 -> 0 bytes
 .../res/drawable-xhdpi/icon_home_profile.png     | Bin 2646 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_local_save.png  | Bin 1154 -> 0 bytes
 .../res/drawable-xxhdpi/icon_actions_refill.png  | Bin 3231 -> 0 bytes
 .../res/drawable-xxhdpi/icon_danar_useropt.png   | Bin 2817 -> 0 bytes
 .../res/drawable-xxhdpi/icon_danarhistory.png    | Bin 4122 -> 0 bytes
 .../res/drawable-xxhdpi/icon_danarprofile.png    | Bin 3783 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_danarstats.png | Bin 1768 -> 0 bytes
 .../res/drawable-xxhdpi/icon_home_profile.png    | Bin 4091 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_local_save.png | Bin 1694 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_actions_refill.png | Bin 4290 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_danar_useropt.png  | Bin 3827 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_danarhistory.png   | Bin 5168 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_danarprofile.png   | Bin 4908 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_danarstats.png     | Bin 2155 -> 0 bytes
 .../res/drawable-xxxhdpi/icon_home_profile.png   | Bin 5576 -> 0 bytes
 .../res/drawable/icon_actions_profileswitch.png  | Bin 1143 -> 0 bytes
 .../main/res/drawable/icon_actions_refill.png    | Bin 1161 -> 0 bytes
 .../src/main/res/drawable/icon_danar_useropt.png | Bin 974 -> 0 bytes
 core/src/main/res/drawable/icon_home_profile.png | Bin 1026 -> 0 bytes
 core/src/main/res/drawable/icon_local_save.png   | Bin 2249 -> 0 bytes
 189 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_visibility.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_local_reset.png
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_local_resethdpi.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_visibility.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_local_reset.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_local_savemdpi.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_visibility.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_local_reset.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_visibility.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_local_reset.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_visibility.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_local_reset.png
 delete mode 100644 app/src/main/res/drawable/icon_actions_temptarget.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_aaps_offline.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_age_battery.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_age_canula.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_age_insulin.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_age_sensor.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_announcement.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bgcheck.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_combo.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_meal.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_bolus_snack.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_cgm_insert.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_cgm_profile.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_cgm_start.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_cgm_target.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_exercise.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_note.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_pump_battery.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_pump_canula.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_pump_cartridge.png
 delete mode 100644 app/src/main/res/drawable/icon_cp_question.png
 delete mode 100644 app/src/main/res/drawable/icon_local_activate.png
 delete mode 100644 app/src/main/res/drawable/icon_local_reset.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_danarhistory.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_danarprofile.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_danarstats.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable-hdpi/icon_local_save.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_danarhistory.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_danarprofile.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_danarstats.png
 delete mode 100644 core/src/main/res/drawable-mdpi/icon_local_save.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_danarhistory.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_danarprofile.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_danarstats.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/icon_local_save.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_danarhistory.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_danarprofile.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_danarstats.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/icon_local_save.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_danarstats.png
 delete mode 100644 core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable/icon_actions_profileswitch.png
 delete mode 100644 core/src/main/res/drawable/icon_actions_refill.png
 delete mode 100644 core/src/main/res/drawable/icon_danar_useropt.png
 delete mode 100644 core/src/main/res/drawable/icon_home_profile.png
 delete mode 100644 core/src/main/res/drawable/icon_local_save.png

diff --git a/app/src/main/res/drawable-hdpi/ic_visibility.png b/app/src/main/res/drawable-hdpi/ic_visibility.png
deleted file mode 100644
index a014628e30b96b396a207ea86b52c54e81c2b28e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 953
zcmV;q14jIbP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000AkNkl<ZSV!%b
zS;*#N7{-5>eP6?gL`upo2_f0a0b^*4$r93#LP<@A14|MPXc9TGWEsnFVmUAeI1nLA
zvgbgN2^q$ivE|bBx&L~<_kExD{~a)WQ{R2^9{lg;ey-=buX}mLEHlkAJj?;=%g7u<
z{|iI5w*<BU^1B(ZX<hUe@CWc4uwK%yeE^2P&p2habMZmIvB06g{=lBVF2L3mH~@YC
zz6L%6-T__%-j@`hy*492w)X~Z08R$>C}#T3x|sT|K;0<m(>_EKgWBE!xD>dhQq+o<
z%VU$`tp{!f?w7Q>6{s1&_94Jcz-ho1V*>mRyajv!tO5dRHz4PZEEb24{RzARER~eA
zBQ_S0?daqoU>{(Up;Ni|3t$QGI<UGEZ;5?p;Ber!(%kSJ5&oCJC6WSenvDRmeFX3f
zu-BLe1k5MEd6M3pqzBvk0n35I8mWx7&H-MP)TMlS&TXe^9s`bR1o;?PAnC(^v7PEV
z2{@qqQ&}%bT3g>!iBAIuHXipLuu#(H-S=q>*?t6AG|*QD<D_iQmGo>~wj=Ohflr!Z
zKUGCtDCx)YI|X>Ip{b;Ag`|ZefNY;tscL27ZQu+^-`L&?cpRADa9#<VDQTVUfL#Hc
zI3dN0Bt7wOncChRcmarhS{C*eN5Ho8>gZ$FhV#$BWs;WL-n`mIilAkY!l{zJno3!*
zld9UjaU!C-ThcY<e>reZBeii!DsGpwwEV9I?wZi2(xa}GbZ-Y}0q_8@-3$R;0W9kQ
zbcdwt3eZ(~&;&pkIZGrh>j2HJl+`OzT@h-_-UQ}JT4j6N($MJ*=a);=Yi#cXJOxB|
zExTA!Bs0>7(lb(R!`(T)85Q#-y;u+EE;<Sbz}UJPCueu_%J%W;O%uxgc}ep+q{DqE
zjqy<+LB@@h4c-_7;%MN>+I5C0PPJuZTqG$&wQ08Z1s(>DX*}+G;Cx`Eq*UdUwT9~n
zrKjvZ<A!TS#Fapr<=Srfs-Bbd9b8qFMQ-?xJnCEE0!eA0(`@5dKRU>^v)?QRt{+%a
z$E9f|3tD>3oxpwBp9UxVV8FgLbjr8%aBIz@4AqQ-zOw<Dg)9U2jcR-!P10RcLt`mu
zFZmgs`3Dl)FiZYOsr}O!!&LWID1U>(SQtsa`UO~%-&Sf`O!d*;$MApteGX6`rE?5z
bbPW9sBP~=k&$Y&)00000NkvXXu0mjfyXMBt

diff --git a/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-hdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 4b36a0cc23c04f959aa1d8f667d98b4382fd7ad3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1585
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
IaSlKHAJ(z5%m4rY

diff --git a/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-hdpi/icon_actions_temptarget.png
deleted file mode 100644
index f839a6894b38d9327b8838649ccf4001fcb4c1ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2118
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
LyFEB?`ttt(TIk*S

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-hdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 0fe1cd628b6ee26bda855569c1c6ae5a9453872e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2011
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
Y+wgtYF1qRNvl}zn3s1l`V574C3#xsVQvd(}

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-hdpi/icon_cp_age_battery.png
deleted file mode 100644
index abc626901a7d6ceece40505528ae5af05cda7b82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1183
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;eoq(2kcv5PZ=LRraTPiK(LY@%{ZYn|o&}s;Ni7^sJ^_J&0fFX=x)&@`
znlbnEAM-pB$8ayEz&k6Y3m<lObm;Xc?K61B__6WFfs|WEcP8G-KL7OItMnP4Te(Z~
zudlTF`#Lyu`71NeNh%m9r=%*D_t)Ql8;*-70>fSH`2C37;EmU#<0qX}wkVK%ceMA0
zm6P@51^vQ51m=f*pR3usX7vXiJ-wGD$7-6)*C<B>r{rqA$YJc?ZP40Odm}n2!iZ=6
zaj(#Kk9BKSKAmHrJniEK3BiKd9UJ_nbZjkN@Q3-Hen#@GKRxD!3wG__v}EF>#2u*%
z{)BrjH-6OLSak7JtkShM)uXQt?CIF*>nIhRoGH_1V(1lQrI&ZiIcZ_V^2Kk3zID9+
z80dK4yF%!C*OITHe|E(^jdZ)F^ez0l(mTQ3jb?8SC|hV;n*P0D+ktl59eyrf`R?2c
zsSKOARk%Ou^mUH*?~h&QNF{BSH1Cvonf0eF+~rr$tHYvO)1%u$Wl9oeeJN0XXI}F&
zPUP?-)<2Q9(Fb*vUfb=@{=wJ&@i)glo7-0tW+mx%pV*oBAX5H$R$b2VWQ(roqkV}5
zpZ+uChnEGXMkT!!a*7SQJO9Y@t6Npfo<?VXEx&r}hkH(g{p=OXd3~bRu-<9kUBD*K
z-RO7y)!sEfMIQ6;b&6)k$cWqD+qR8uvdHTqn~wM+G9`N!zT?bp(!Fl?o6CL8*~G_>
zD)02N-;(n2TI2iZ%a;w`*mKoe6WCi4YWHXttzUF_m)M_>-T6ItJUh2)?W+m*d#Gxo
zsP-{A`AeomeD{~fvsS%7_On3F=!ezvk8@7C2G327`ls=ElldBB-i3T!xqjKtLf2$&
zkS#AUym2Dw;zxlEE^7`7AD?>2EbZWi#ZTVvHVH5~SZ^E<ckuF$LpA$1?6^|jerJ2q
z*1sFQm6yKfoqy=vx^2aWR$1JX(7LkYzVxANtF{kw3dGjGmI!<<`E);@ZQ;HxxBqX~
s_<YQAqKdre?e(RZU28B?<P)by@wIV{;kWkGYz37op00i_>zopr011}@YybcN

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-hdpi/icon_cp_age_canula.png
deleted file mode 100644
index ecccc394265f0a31f54fa3f57b00a407df6eb02b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1060
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpDV{ElAr*7p-aMHd>?p(j!M`i$^({G<Ztg`L+&dcNbU3;eh`ZWwG}Sje
z_^-k-Z*Rvv7XGe|CIzh>GOHe~+i^v7jhWoD*079ElhPJt{;7TN(c@mqy$`AP&ZNjG
zwg@<Jpb?whm(Fy$nzi-v+l)~8whQ+coYAj2^gT^`ZHUxy!{s--q73-Cm$dbjFZh>h
z5pZYm8J2eso5Y+}tEZojYC0SdUh}W@_>RW*6BljGAI(s^ZF^MX+!WDY(YCAkk8kAh
z|HyZG>4R$zCC@!Bo&Ejh+OG=|blW~|nmhYBSN3F)E3tFte)?PVW@^<D&X~ige^vya
zuUV6SVcpW)ErsfFS9X5mI)7U0#8(NqgJpA$P0n1Gf51`an8dmV+w7fRANS-jyS(ho
zDvR)yA$g`+Q&y+z>YdAf6;t2fexq4X=1^UxPj%z^ApJk$juWlUiv5|oAuG6I@A1`T
zZx@+7cz+;l<?-ATSK7*ar-+^qy>|YQO@qE_>hXe=7SlXzvmCgJSymfuT`Br_M_iaj
zc*NEQF%ACgRU03z*s0%Yp3jzhL*4dOf7GAY&{<3OPZd2QdhPckn-zPX9&Gt#95yrd
z(hSR6$NoycIvwJ#yWpYE*V3giiMHD3RvTZvKDDUzYoJth*o>Q8)nO+@#WL5toL<IU
z6?ASx*5(He$E<dH0a>emY}@X%D|EAW`{EheYZKi*UVAdln|1b5`vdQN^^~jpHYf5X
zEj_tk?eV1rc6wh|v|iHsSM!doY;xLRD^=b**&E$%^+ksK`6vDE!Ky7+FK&*CJXn9=
z?4uw0Ph}od$F*E-isN3r`2CwI%{8lDZr`%`<<brF9u=$S8${pt@K5)cwK09oo4tvs
ciNxx$d1G=p3*RI8B2eb`boFyt=akR{0Aw)45C8xG

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-hdpi/icon_cp_age_insulin.png
deleted file mode 100644
index ab4d3458814886695cbea1710b54e4148429c331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1530
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIZEKe85kcv5PZ{5xhbrm`O(VtQ9wuA7RMS@!cxfK;UW=UO<P}~?7-;?p>
zpo?&=!9?}{qNZxc*yr!D`I!*9&P_|oMMThfgNEqEMJJX@Yza91G4btWIX{2Pw>!mV
z<X?JYTm0?JyuY`z*G3xeRuSrSQJUz1M(N2!t;(Ep`e~MFUsgoRQH$360;SdYr|W*p
z){B^BWUhR(Q9os)*n`9pu`6?r%Dp)dwI#hY|MB!cuG1$)tc~ckHeh!CArt<n?2O*U
zXB_tqXiRU5Fm7?kE?{+Q@rX}(zUkMyH|y7~_?z~n@MCxB<bs{6H+_=J5eW<JI$fYH
zr?W!(V75i!#x7HN{shl3xg%9PKAZkV>1b=bKWsg<%XIaku&?Q6?~dM0>iPd5_>BnT
z?iqhBi|^lS_q=Os#Ew_{r}AX&>b%+%-D-MP^iWN!u7sWcZuJl9+oru(KVh*&?8^ts
zCP#383@B@1{^4;ZWod@6*!08Y6<XF}$2MBt{K!$3xc$;JOU-4?5yeM&%4ctAd3>W`
zZ|beR8fk~uU+n*zBvi5e!K^(I?HkwLYCN}MTeH>-&7@0KYeY6*72BiN^6E&eYp$5c
zobQ|yqc?w2PrCL-YloWtwVyE+mrPD?+SMX@Mm+C}tr@3ymOKA6uIZK<X$Qj+ecwNJ
z-?$}GQ|QXQHE+Wno?`zn->}gCYSM*XvDMBtXLKVg1CA_>cg-uYe|Pd6=jnQp{LUX+
ze4qH)a~oEDY!b*5i03MQC#b(Ln&V!4_d#>7HI_U4cU<-PxXiqB!EE8ME6QtD&1iLM
z$ZvhEEB<bGD94t|GZs{Ozd3hn-ofKP){5~5zF)G%)#ini;0gDQu{JLZ)(K9#7P)MG
za7E}7_wElVVRAzHNwReZzU~Oy(@-<5zUa<^Su+lv7m_UVV|jM*&GS|zz1ZnfzjrJA
znf|f+;mHloJ7jI<-hFSI*n6JiA!qjMqYFE&vZh7oR`8jpg);we;Mi#M`u~iA*1E^y
zhl3yL+!IOK@;FuS#cr2l|F_TZ{k+ar@vP8lXP#Xm%RkO6*d6#VtN+0(t-MN)Bg>Xn
z`0Pm7m_2=IWYXD#+Q-t?+x-5pu;TVxB|Y6hX}_envU~b#zTF71%DCoK6_IjrwfB|z
zV(+${sxVxgI4@$~8u7vniC44^>{lt%;<jA;WnHQ%4|n<L-DR#O)%LH`Y@&VRpXRAD
zeRrEUC(L#8_sw-em1j2<iH99<6r9fX`oi}qD^l6^JNi7HetpG$#feYf2dar?h-^Lg
zAl$P2{%#?+BU0<n-)Qfcbt%XE%w}2bp47|1sq0UCQvW4zG33=ovptOG{Wrcp?6jmY
z>zHxmvhGwt#>(k8vbEfI@(W(>s>;2XBN87JrT*jZ8i9<>Qg4&YnyT_Ht~u~n^%eV(
zbq8GJm0tNR&5Jm1`{S<Cf3383HLg(JuOiy&VwcmqUS&^hH=R>ef7enkZRei-a-yEk
zSUng2yS~s_XA8eXekSkoOEadT=W(IVBO*WK_4g~cblzuX2Nl_#u6{1-oD!M<(0QEg

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-hdpi/icon_cp_age_sensor.png
deleted file mode 100644
index 30d5d02de019105a8e9ec4678d99f84feaa9d1ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1931
zcmYjSc{Cf?8rNq~QPs#;N)egI;}H=ANi7GlmE?&au~m~uNG(x9BGhykWlCv_cB)F%
zR<-XfLTM~R%S?wT6$!@DD(aO6UA&mrH|O1R?)~m}zwi8h=lA>LyFYnhT@?Wu04XUc
zMRzx}w<LNT?xV7j(;CZpBPDgjgYH9Q5;2}A3M0yd6v`k|P1sQ}lDd?XjXgVtM2Vm>
z!DMO}J=zws+0_dH(?e|`1O&zu6XQe;r@L`tsdx_7hr)@VAVVScb^seTN&*l?Ws<<`
zsL1Fz6x$Z^CoW2IKYWHkz<;(dBWxiKhlF4v#tZDkh^2xNCYDeN+}s*$g*1U9kk)1v
z#$Yp3xFyUK34>ceP2nh0B+3*H{<<J`0I*GLC=KO}cKJ#s$!sCvOlAxU24k^UCM<Ik
zMr;@ijzl71re-iRGpM8k8kZQ&B(b5<ao-(6{1*dFjibcUW0-VCH24scL}tV@Z6OfY
zAqng&i$osmFMX2aFNdhn5?f*=`oZq?C@CqKkM3v(A9m6D%x12Zuh!7kRMa$NHNpQu
z-Gig`s>JHcvT$!;87|HKzEb`@xW>hM<Jn3(<D$~>iJ!wQaEsCi<@;`}%7L{iUS|p>
ze2rSql?qI#U8DP=q@g5Q!t%x}m(>s~?#_EYR)h>2n;lQ?T}d8i9l!0VpZ80s+5f_`
z<<b_v^n!wd3pTFys7EIWB;fm9mY9*adWXf&7xe~NMut&De#zaH$?^wJLbeQwg{yMY
z$8N?;=>(OH0kEPe$8P>Hvi}{2TKR6Zt|sZz@QS_Zm3Md>!SeC}gFFfUVQL=pGUN5g
z&aExYPt8fQ!+s}>D$-8Qrmq=IVMR&orlu`bkP%f?N4Y*AMngC_-6<RBZ~RDE2Q=@}
zM^6T=)D*}8BVJuovNT}u<ap<}IOC&JN!Er*h>d{{q-Y!LXd#b)j$|Dd({+62z^N}}
zNP1xb?OmFio?}W2Ut0SsH1fyvKVueLK0S8sy0{x!@m9tr$7x?d90#O5OBml={jeua
z$PJ<uMOz0Vd)ug8HRnev(T)35k}XIvitvuYUF}KBJwK0&&-SP_sw?J;7kr^J+JnHN
zR*uUn{n@u!Z=BN=cHLup<T_ecSt^SfEgxz^gaX*$b%&RRLGQ6!%7C#2%|gMyTOgTw
z_dhno(Z?>owkUom<g4Jv06%PkR0)lsk{54pDCrF~^sULQvrm!Ne@!aOui6%nr<=7^
z2iV(L<&jErlU@=>^`Y$1ds;b8wOme%NLia#{l`A1)@Vuh6lP2*bGkie=*Hr0htnDv
z#Mj2V-=6K)xzT))f1G48q;j$Tz?1R0Lz=;OAohvvmTMrE36(XWd}@C)pm_DmLD^YL
z5nu@pr7HDYYM8ItRj#k8W;yK1_&m)|{a){L0y<P!cvUsRg($OiZK!kTy>;=#tB~Il
z03~X=u5c<>wFCt5bC;eKys4wPf72>Mu(IDjKZAZ}weXZ<-#Ox*9P)@zu&p?52n)>>
zRc>r$Hx}iu_g6gh%xs*OLyTXKRs7=rd&*hZ0pglwJ8;dmP}+`M*%e&Q#J9_rDm?VK
zv*_4O0F1u2()X<n%!J9ajK2v7=&I%|R-)QkFFak0AY8aJd1OQL#}nwt9rV(E^DwPG
zW3R9|r&-Su`r;n}6V(-0skR0^#Xf=<<&q8Ue=R;A>8~_ldneW!SQ`vBq11XcO1yeU
ztb_3F9(zkuJFe5IYnO9eW@uW)5e6k7RkY_+I&q+*CpBd{y)vofTS%qC5*7F(UjU2W
zi+f{UrnQv(`LW%2+Z7VtB4e93V?=9I<JBSxCTcp*1!@EPXTd3}Mf*CBFo`Zv8mI)r
zgJrzp&iRv;%-uY<VHI&_T~bk}h;DNlt)n1F(VmKw?@-Xq+-e%b{Nx$c=l{GuV6>48
zT@?SamjYkvi0{M2aNT^>Y-sW7IIm#LF`hx{3)gKk`8;;VTp*1yP&g2_9klj0?eGVu
zp|g)gL?^C`%XL4ywBA){#KxI=Ti8wYvgH8aL4|5}whld^PMTxBmS}?vuPPhq)8T`R
z+W0u4uWLEJUgc)e-O15>J>YLv{-cNy(37Y9Ch0IAvX&Zy`Ov#(&fm0xu7>F|@4sL8
z!IJq7$Q5>864tFaxajdm$!|F!-j=Y+eG)xD_U<6VxxG}Fa`|+A96?FlR2{0mRMq$$
z`IMnus5Ty}+i=T?%(bc$3mOY|A{S`g_DK8EqAS{&xGV8ko+ASU(OM7TBGd}-Ls5_A
z#j96KSGJs-x}V^_7u-H^d)#~h`lW%LLDW}q4CZz4uzkvbiIm~;VQxj=igPl-=>(@b
zrAO#yqQ+-d#mZ8S2yqnL8p%AXEjamOmveUBWbH~(CRaA#V29F@i74x?V%{2#oT#`P
z(%*m<O|!E8xECqgH22RNmm-=B$lNs9XZSX%d8Ti$O1W{?x>N2I3+&?DZ@9*jJk;Oq
xe)i0&?azXAan2lVdpT?I|MONdeWyD=$^9A)??fqu*Bt(#?#@_rz2mvm{{XQ8e%$~7

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_announcement.png b/app/src/main/res/drawable-hdpi/icon_cp_announcement.png
deleted file mode 100644
index 23c9a9847d544b796887d6073a8d803e8254ca83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1939
zcmY+Fc~lbE9>>+p1(QU@rKuN^l^dHYpy))dV=m<qYHEOpgor!1plO;Zn)MuM+_lB>
zWg59<jY}%o;HXoXWiBYTIcSqQDlfN(^Llg6yXV~dyT5yX=kq<^-yiqpdV9L41NH&r
z<mA-dTpdrzqWjKNQIf4_&*b0b<mBCHzJz#!#|bQ%$$%5Xm?R3E&4`xW%gNa}u%n4&
zIwc-LqEKm3IOrdbyPyzS7!G>c$^+>UeVh_Ob4`w=_#}J!l9TCVOc>O`9$?4D$^Z;X
zJQ2cXL`KD7**NH5T&!%rbBusO{wj&5<DkcO1R(?uZ^&_GECpf(w}z2X7HEhK29C1A
zpv^7KAm&JvH3Er2pe$iX6c&lWB2kcU18NU|*u{p0V^29ce-o2sIA}zCd^8q;V6j+m
zmIa&{OGThC7z_ewjxaZe$tqxRNm21cHY_Uc&<^6i3`a^FIhGb3Ph&<wc9=vGGa()a
zg(7xD5Z_c}_7H#jlO=z5h!Q1hORUU4#H|4<C#ST_&GDEoyL{m-CqLLpzkhK!Gm_YH
z(s3Y9rS!bDk%ut=3Obpz*C`}liF^HgHRv4Z%2~XkTQ?+6su=<;a5Ft;sjg$?ns-*?
z-m@Shy+h1Lna;@b3Jl|B$-&{V@}``}Yn6}J%2Sx))S|(Xc4~Oy5Mp`BZh23xBlN1P
zq2~XByu}OpuC);B02c@0{*2IRgYrz#pKqsono_oWgH|T+7V||oR<Etn*i~q+$>_M+
zTqv+!_wYr(`Zmh2?cyhh?Wr(=AUSSzV-8|_GF(rPjQbEiXXvk-I8@1+nE|{PU9h;H
zK*kB#PA|8syA#p+>$8VXOz(ZDKddX9ENr^piZ4saQ=fiC`nZu=u*uQi)Rb5~+^rV$
zb5LRNLxuDnuGBf(y8k`?$>$DM6K?aTi-)A0qxdI!o&xL{u8nU*+@9A1x911ZHMc|j
zs}GVmiU&>JT_auA(|5nGR1^^E*|SR;QMT&b=Q?3CkiIu(wk|MbGBfScN;dwhYU+1o
zUl3<<E(o9;7ys~-4cGjqe4Pc3LjPHd&P!h0x^c7z*XlA0ywvz2`E{VF;`%=~dcFD<
z-rVv{tk77ENWC{Slz5%S*D3j2U--*rr+Hb7DzIDBB+>yG=z@ilu-fTi`T}itsm|S3
zq|G{D!l<}H8eCHlv^e$kk(F(!4!v2xJSv<lDPb!d?Dl%Fac06ObVM2N0Fz3ZJ{ont
z6>p9J+dX*c^8K@=W)2raRgX8D1W_5I_?IMb!PJ1jSb?~2fAKArhB9Yc;INpFR8Is;
z-cYkPo%E_5w6<nXL~;c^H>EDCZJ~vtj1PijhQX$t{ZU1T^RH-Y@x3Ku+avRhwgRKl
zJ{qB-Bb|$c2{{hF=&9`?VP$?2=>q2d<w9Cu{Q<xnRlrMk<B33~Sp@E4)v3wXxuDi!
z4Jn(ir70O}&wg;|p?v>Laki+ckI|#NP*N)>U3%U6Y%qiS?jT14-dmM@R^q;*`;7Hu
zMT)E(S_*|XI~dn*tM%QPaM5d9&N5z-VC`$&_^nqP!Fx%^c~geY-9-UuC1_GRY@I`{
ztLOmCxh#&E;gqlGOx^3t?lG0#AgrIe<;Dl{s#GQdlh;o3pLqpHPEQy0*b&TX=e6U0
zNJ!833-}tb|C9^$?r%2<?rL*j*pvvmX9PwXZ1<NY(ZARe>7X7S#>bx0)o}4j2)I;J
zqQSQXy_Br#3pc-?zv6QnczQN<;*jEc!)VlCmPW2haYq*~gjKD||3FMK*scJ+Z`8~f
z86;(;I@LR9p(p?J8G(v^Y-AoCY;BtKZX=L;o+gp6t?*_E?MU}8Df7>3hkQsTy~-;@
zlTqW*J4nF5);J0*Y1DcA@j^ga2J*zU()Oytu;CbDz4Z^lq=HM&W7u3)|G%~jBv}RV
z!90=Y{Eu|OKEgk6Op}}RWqIm#I3Eu7xedM{_19(KidquN(H@6^8qB`XEKo{j^wUDK
zk+M(X^k4I^eOLgMWfW&PBzZ9D_Y=bUl5t9;4d_Ua!9+#fmME+LQDhhWca?0|UBYJ)
z->1^FUh1FEeJD<yH{AFcg~I6$dVfUCSlW0VASJ{dj?f2ceRyIL6K<7PsA^G@x@R)?
zyR7wPwr)bW#{m-K)0wb+%L0Y1W~BX^Hzy`dCtWLC5c}%-Xv@hQ!dg<2Vl7~tdxK|u
z#3}3FNBCE~RF2t*F&qG^<pz-NU)E_l$WtZy;9k^CSKlGqY}BAD=8J=~lYTRKhSDA}
z7>yHaR|6AmIOl-i1pQm42~>6~IqD<yLXD>=T7L-Dr0!R|?9p}J)^fyn^k%fvYOzbv
zz=VM~2hl>Kdd+-aRp*tH>_-!uk9YI{LJjvzf*tLm)ziv~$AaFtsf9<7gJNnHR6sY4
zT+)>AMK;@?c`h-+iEI|P=y_oqZ59Gj4}4pDLZtU@_k_B5s`ouZ7^&Iz^<w5Rk$<K3
zwaEsv%}%HCVT8ua*P808w&L*^=hZV%1#R8jZu<YdyM5d8+q=}FK*At66TkD9x;c3|
JHsH@@{s#gDaVP))

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-hdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 56569a264a229e22719c389e86a86a53b5284e14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1903
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
QZvT^bACkAkE9&BZ0lbS{xc~qF

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 98c076905c2038cad30f9deee89d0b7593147ff7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 771
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2n|d%8G=RLpsM%i4=MkiqTY;u{=`5|*;DNLxE@*t~u7<x^fcId>X%Fm9h<
z+wq7grtt=6Q*ZyNb73J@lr-H=toR>l%sGeODZ$A6dy!gyqR<2t&q*Nk^0-@7?w!4r
zFTPs^=_YI~cw<>``*q{DLuaNlALmlf3F5Y34dXf<&n$f))v91i!6CJ^!E#&)f;Y4z
zEqd0kdBr%7@Ay5Y$yaLr)TB!!huXIN-v2*sQ(}#@*|7-5WY!*0gRlb;jcWd~X^lIZ
z3P0EHoiIPk=$fd()dznzs@-pM7Ug1l%=1scg6rFTwr~H^HRGjQBEBDR-SGcbz3vn1
zI%zhD32>uuFjnkdbLUz4|3)v9!UNlW)>Qsty|M6fcktR>5woBCuhlZWxV)0#-mdS)
zccZTwwQl_O^1SwIQ47A~b1wW`_;p>vKIR0@3btd~x92x(ZhAf$8Zs--v9DB@w`%W+
Q&H$xdPgg&ebxsLQ0NC0eZvX%Q

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 97dd4e2ed839bad49d0ef8863fdaed02f4406c3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1470
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@Jx>?Mkcv5PZ&t1d4HY^5@%-gEr@A(IxG0}eGMvSJY0;&Q6GpW+T#{y(
zII%3e=rGyE#4#W+(ClW*-$b(;3Cv5EP7!rn5-7zh(jQ>ZeZ(Wae$C%K*B9>kKCgK1
z^jr7qzuEnsYdhzDZ1vi$-<2nyOfj12qlQNP^uH9C-~MiAY5B_bxdn=T$KL(m@=pjf
zR)72A&AOL+WoPZ|u##+?zA--ZcA?WA_d?5m83%WnU0gkNa=4+u=hlGviCo7XNUb?&
za_8QrtE#tBrTvb_&S)>r$#Y~+;w(G(@5iz?C$sOiy-kSxTadYGf5W~T?h!ZTUL5k;
zcuhNc!#>|Fmo~8_GwB_AxYe&e{X@fsZ9y5~r(YddS;1}p$Z;$8)ywrpV#${44xCe6
z|509jeK*sz(j^-@7H`XVf9UoP3GENMb;qk7E-yQ3AfvMA@kWV&tMyYqlz&f*RpwrO
zb<?)?2<F1}58k%Z{z%U|mQ&NwTiRzXC;qr))i=={J`uUGTTYwFG%i(gf2Ha&t8?L_
z!_#g=tymeMtMrI#Pt)vH*ROubHr>L7Cii^)wmt4Ose7MR<70euR!6_fi+1tgziJQD
z-yPfS)RJ|q>&@Q&j*iDc^N;@E3ty>n*}IVI+_CeIs`CVx__TgE&)UkX-kt1~|FC-5
z<GPKlc_Nw)_rJWeb!w1f>(sDx`LU|mRp3SN*K=QY<aS%KKekLP{LpG)R{HmLQgr1V
z$@NNCW_{VialGU0=KQLB<$2pn)AmKl<gb#{u=`^pqx9#_v=UD3*{XgF${QJuKc3EX
ze{<(1-PZv%4YEg>jz1FK=$qEfGUbD=@rTO2pRYTx%L%%xJd!AFJ8^N_-G!`t`|O`_
zEHqmX%u%{-!-_g3)fs9<YtuMfJBm2tyv{$)*>_fYna{>`hZ$Ga>E1h-VWYY2iPl4Z
zIqkx8`;(hL%#L6FJo@O)O#-Q%rZVBnfBjav^j57VD1Ob+mr7N+`gKQtI_>zURH*9`
znRHia+s*k&+$G&dc|Gg*AJ{gxXmg~NA8)}j3s(~#$s}H3KACxkj2^yN9=7$YcH%s@
znVLGYIkb3#+aiKpxGwct2jA{7`DQgyc<ZFl3X7}i3G3b1wVc;<u8ir>->9y(blc4z
z3tKF^K27*x`1{csH+D^}YxlImb&7*5JyosehZg+V6rq`Cy5i4{(%_IahFYC(SFg0u
zoO*w?&IZ{E-KmRn>W&5*yB>YDbM`M!nWB|Xj6ZYt#hP&k-;8e#+_)k_IrwL0=<U4~
z{xQe43ZGu}%H71sL2x76gAF0^(O3WNIB{jVxWsPBHS1UPXQec_<;k{n)z{2ZTUX1u
z{GQ^bXJt#K@A&#+VX(`q>qocx`KrGJs(7X)5O{0CMcKJ`yR$1dPR!lm;Q8G-*I|0c
jEzCR$%D89#&)m;2J@vxuE0?pkgNj{GS3j3^P6<r_r?`nP

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 710bf6e0dad3e872012c4c0936c7498e24f34f22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
zcmYjR4K&kh7@u1{qTG}e>6*W*<gzb@Et_QdHkpl;&uwOAY_m<<9g;*$3HQn&6rvAG
z6Svf*eCOmNL_R|17BS>pP8XFs)#>z}^SsaVyw7ufzw>*}dEV4xc&BaZdg>q$Xq$^O
zj-c>v8>XhBxNY#_84yUxjY%X6$R6%!8YdD$3E@!b5K$yoQ3ru+?L=G(jYSuLsdNUD
zjR6)OJqEzc5Degp^niJA9q3_9XEBfNEyfdRVipY*0@z{IZAEAWKqOs20gECd*nG4I
z1AM_nE8>l3C;<M_B4A+v`wc=c+2a`4fy1MNkq|3$8r;GLY>k4zktiF4r5P9jgIhsi
zC@9?090o_jP-qw&{Otf(b+9cjBos}+IesHkWEdb!AmE~*P@zx=5n4bvJO&hwLZP5A
z1QdZVS9F;3e`gCQB6Bw1XanLa29D0B@t9lzlfwpYU{a`@XaNQQpc^F6Z!8LV(C_*b
z$@dA-*^0676#Bs~chDfvW_K5yJyDcDH|&?vPttB%ym&wSZgVg9VQ**EwUkzbAv~*C
zW0`Q=OY6vfaxie#M-XGO)#&D3Gm~ky$|cVp<=?JlAbQjv25-wl78M0lGzjFBxygLg
zi;ghHdg)-0O$C35Q5koNvHmiCp~fodNYOD9ZS^1B(q*Mubm17h<ntRfcSnu-2G@x0
zH+ywzAQ9p#iI>MF$1QZzW&_ugcQ1kmkkyz?IkY`v4J^{uyLMYEo_3d$FBdK}Cp_44
zg_2%q5v$8?Gk+ID`cxE0$R-Co(0%k?wQCm;*|bTdlt>sMMUSuTI%KLxyFxV9sd(Z*
z^}!@C;F>`bdQmRDm`xOqq{-PoOk04^KI(Zbi?E-{UVC;lqQWX!>&%wP+3Z^_!>KIz
z&n38wAVcZ^NUPlHWzBk(Y;oDOpQ?4Hvq2PfeI!V@-Oj*oX84rv+;cG_XpCtkJ7xC7
z@Lk<WOv}uT7_7e2{<RV^Pe3=I?<1ulcUW-uIa<dKB;-idrY5c~jg87wxCDnab80BI
zqIl4!l<X^ulIESeJ$U*P*Y-pdOI)31+!Q5Fmf#Iv!{B?b%fuaR1+pF8jwCosC$OPG
zq{7hX!S58dI>5b!hwW4jTw9E6ETPiJ&(QjWZ7Ik5OV=QNe&zHcN!<ip##>R|J<)`1
z?Ms%*&Q&(4QkjdM)v2WQ2|#76A)e2%(bh;(>sx|oOB>g1Fssi@{mrbV?oXg%rENxY
zs<qH2rp-?rs*9r?t64J`7CObt@~gPn-qkHv{Y5Khmb53U$sR9F*HMbajCD<4Zw)ou
z?UufX(*H+$b}1w$jZ9QtFplv_@8V0MU8_j*3s}zkQ6f*$pC=zUkJVej4r$f>HSETd
zWYeF-J<shE;-%q!7c0tVRFaJkSvpOjT2>DZW$MORB20%OQRwc2KDWd9R7Zmg`T6oz
z{emfNR&*63bg9SLuPSJ2+V(!V0Epp|9qo`RRD!r3k(1~zkbFe@XY_bp*aEcG)OB&Z
z+v}|TFUfc1e%juCl*(G>YpT|^hyx;`A=)ct{?#eBv}_BWxv-@JlX02o+`^vjerjqj
z<nvWCVx~`EhCCv3B;3jYcS3hQTly*}iTn)rmVbjik=O1oy|ji4ak=M}L=GtaSmUsH
zwbnzvw&PXyYT<l5VRXfrC`u`A#C(pEhDdC(ES+EIeE5~~*q3;`KHmMKNqc>g_bk@n
ztecb=;cGP!@CrPC64@#<_F6?B{&VmxUH=37)*a{Z16c{4lD^Zd#oL2|moo{=?yeV=
zWv@p}MziGsvguy;T<BxHHCeFp+|wTK{{m7h@oN3XI@#6|*MA9KXZJwTjV|ak{%xq)
z-1$7lLwZwQo@i*7Ld&`b({d{P;4_;G7X@~dr510O+BcV(-mCm^g}*NJU}q3vu0v>X
SdS~6nr|fbRkGpdu_{{&vLYfW$

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 699be547928804e3853dda2280f4c24b6f70fe1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1609
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

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index 8887e60f27739d65ac159e067bc59e8faf52b78b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1529
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIZOivfbkcv5PXL)zXxJn%Vzc(+;JZDn#$40hE8mkXpU2#z&+2lvV3r_*x
z02bGSG9fjxCLQXWawd<MYgn567iDzp<ZP1Qe5Cs7sA*Qy$EiB&c318!^fdYPIly#g
z{;hX6XWpGPPjXq^g%aQLui^23f4_eDYQ0yNi_%076`@W9<)_Y>$ik7h?8weZdDBe1
zFNsgu=3ymvs9+My%Xe28oN~7_y03g<oDjzGTh~!x;WOsPDVz6+9(l#JAXGzc`jywG
zvsHDceOdj#cKVV^-w&ELjPHKMeE#v4ZP(wASJigKWtOF|DmFyuO9zI{er$U{|KAV6
z2WR}mU-Rg*#Lbv@<!5#81pSg-5$7ch-<`Io7us-rzC63%`;d)(i~q36FjW=5vQ1%$
zy}mNZHrJ(Mhu7Yh2R5uPmzZ%kGifeUPbFj9UWKc#?9*CmR|y}P#T?UI{kS&IYX7pf
z?B5N6@%1th+;^CCRQ`YD)e2MI$D8gYHR1QM*XFk^CoM~l`L}pU>m<JG7p^o<ns>g)
z@sgaUwd&hXxBWct|K7CZ+AlL3$r~JheBaiv>a0*U5`Mt>$-aBj56+02UK6jXX3k!c
zY8mPly6^VV-T${Pd9QXeW&RS?RXw-rJkvdAO?$d%iKyqK8k>{fR9b~!TY0Lw*G>4+
zcdGw@o+rE0mSE<)lb)^8xtHX*{q)!3>`5xu#h$p^9bi^_6Mp4mgy_bpaVpBeZ_`(-
zIlMyi{wfDS=>~4q*axS7&w6>Hu;Ap*`@SW6U;XcyEg2}zsC;a>>Dg<Zmp*QPc=f>i
zV>@{r!Y8*xvAi+fm&3N{-;eI&7CYyBS|RhG^g&Bg>n;(Cgqj;I=To+@Xr`}c`Dbu$
zU+jW}>CEiDx8Dc)shCBpxwl;oUoxj|JHx?gjO{+Nr7!1hW3fCJKTYUOZ9-IY%dW0d
z8FkvPpKW0YwJPM?aKGfyQ8td!vRBLYOj8Z9?ofS@bn0eP@(z<CkB!%)7n%j6p134*
z<$|L1q5X;*B5v=!dvQ+(mugtx=eF8qG2U9s<oJHphW%34aP2frIAzUr``@+q)v9Ot
zb9Of^I%0MIeY?tA{+w!q#dF&NS|aWiMFxBRTE_To?b*gVQH&Z+YwA4Je|<{W+BNye
zt(@wOIqa`G*SwQ@Ejwk)_35|&8Ln|(V>u~q(&;t-R5N!k37utOAJ(;wbye(>X9fo?
zGA7Hj|K&b&Vx_TkMcbdw4*ka0tG9eyv$8tQn%}GZhu@z$h3ojuqmzTR7^)lm8|#CP
z+aF97yHxhhtTb%f=7^=DM)EV0Z4dlCkgsXz*5F>y?dUb%Oa4>+wg5>-@3TAIZ%3}V
z#5F@PfwMq8@8GOdo(iEEGn11oryAdQu;?A{o#Vf(ivP?j6FaS^=~XPU{n@K4oH<jr
zNjDzU`gW{9yZBbv8p#9KdR9~j&j?@aQTCeY-GQ?v(R~c7SH)U~c15w@*L|tx>HT!s
zS+mo=hx}UQc7FZTt-|a5%i+?yEb%QzqS{e&x5pBNf6V<R%@Ipqu9XCp*q*L_F6*2U
FngGD8o(cc}

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_start.png
deleted file mode 100644
index e917402c48f2417e1ab89e1a069a5574234bdf7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1939
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

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-hdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 2cf826dad14c43e421002b9ba6a41f47d58ec117..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1965
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

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_exercise.png b/app/src/main/res/drawable-hdpi/icon_cp_exercise.png
deleted file mode 100644
index e9aee1ac8aaf392653981ad0cc3c3d29b4782535..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2324
zcmZ`*dpHwp8(%4*(7Y8DT0=>*ITf2xPO;X!PC4{CWHTmgV`FocmXJfpAtk+)Q${v9
zl$Ee7spdFmnj*y<N-Yr|@7MMI^?kqVx}WE{pZmUkzw3AZbtl=`TFc7plK}t#vM3u%
zhxHr15mJ)tr;%;MX8>Rm+TY2Q>WVpoz>$KW-aaHO9!d`)uh#(p<Ow?28yA45g0Of$
zf1(L^uAvbO^7k<TyBx#lV8|ADg1=2f2;MQm)(IC8fP?#hPngOe>4<fLAUxF@L=Ori
zQV?_#@ISnW_4md%3=I0Gg&JT2Hro&cxnk@<7Nih7=os|4HcnUH2xJI{>K=m|=@~#k
zdOEttVLEV_u7S3WE<y*6(9s3`2G~>vgbeZVML1ZV`YpDenScpYDj5NT(P%U%O&>}M
z@q_8Y;c%Fa9!yV9d%Z)O5>BLg)3u2dwGE2@a#-RixDbCb)t^KJZE$*HNug8|Fc`KW
z0{gA9ZV&dazxCwb3E_$BV+mRJ4?<NU0Dx@_l%<&y{g!AjJjL_uUfu$qnpKd$+1c&B
z<y{A#G9{orgMA%aW@dE<EThTZk_d7IZU$>rIAGNG0RO1zPe$8aw^F-Vx~uB0y#&;(
zNhZF+jumG&pFZ}OL-QS_jo$E1X!;P7)fSmc;hTuz{P0?Rga3z>wGKxWWg1@s2TyyJ
z!V|b&>Q(C}$rq2?uS8bKd*}seDH+B~>^(Ai@x*&oX7e}t5@m|CdGt!*xb%w0A)%Rj
zLZ4jiJ;ltbL*v*eG)Xv<I$gD(^K)30_U>qZHRm3dqMSN3zho*N{9+Ci<kSNXU;nzi
z;6Lo})+-4n%i_CS|43`qub25cFFA9$d;YJCrnY+XoLFm5spg34*Q=@%E2q!!qBvX8
z?cZ9+E1>0DaU|S!w^z%;^HCCY<G$|d@kndN((x$j9b4Wx*OKwWSZX2n3R!CP?Cir9
z)(;%qi?R38l=vw)@o=zRxV7=^)+JZhw|p+zI27UBJZNL!n?Yzg?Y8f#PtG)R_YhkS
zrf{>?KX-M^D@GBw1Zt(Iu3nVIm(}7Sj2e@egY7ag43GAjWEHL>2KKS;-Eat}Kxsx*
zG$7TG{a)jea`(BYI^_fXWu0HOneg%Guw59qwWQdt;*GJ@{<J+Xqayb;^%(aw`KBW(
zqpVZ`Z3NC>jd;Y=P4~Q8QV<xiWXD>3kf2lIDAs--IFxH>Wt^DHap&}O)9bh>^567Y
z;+zU(`qf;PTIT@yM*M+s9GgnKhNoFnyqUafRf6s(rzkCl8UYG5MXFrk#7}idcNZtQ
z(I4|1YN6y;^I>kf=lr9~HAjg&i0-gr@~K`*d7m)1-+HDGip|>7rl;Zgc|IhHBKmp!
zNB-#d08Dtvp#DhzP7;jQN4sE<-<+RXh|A|9DDyz=&@1w%_p!4H{J^K8z7qAknWkK;
zAHClK0_Nb={D$1@G5PZ)W+~qSJ7?Eku}SR&>45FhfW9mcIRWw_S(fV<4NONpr`L|g
zs}ItBMK>M_DjTiM<-k*hy|@2@EKNjAJeAPqb(2rQpDD$D>LEX3gjR9Q#kfPW6(f<^
z^oH>9im(=W#A0;@0SN5C*F?&rek@!!io@%n=IbF%Yl(u<1T+ig>AX6bJhGBPn8n;(
zQrWBR{j`2%)eM`LtOe<}4}7!VN@CDnI<!*h`z3W@1?8%d95_zn+|r0h&t8nmjAAlW
zkG79xXW9bI4rsPlsom3HYCRuz^bM$eJ+oWka$(%P#XUX+v^L%>sJc<V@>56Hrb;Mp
zS;!oGI+4lX^X8V3;(Eg3na*b3ljt78p0%8*Ld0-Mk%uTxQ+gJ~p4pQ)iR_*5aI7-t
z;C2%qwQno2nH87jB_4hfy`^G&jL~GEddNCS#i;()n3m+CP)<~r5l5w=?x*(*9ofOv
zQa*Uj$R0UZ3BLAB<SfhP$D|Zj3EH|Es5^tiikM;L#+<y8EbVD7|2~(!6P95aUA(Fq
z)}IoZRBW9ya12~p<j}Y8!5uBr@(DL_Gp}$OFr89VbqHPQI&r1smBVMB#ceJ6?3MDB
z;AaF;qK<QOK9t2*E>jbg$GYmcJHI!asJH&|2I#FGByf_}sZ$_To5#{H<3&a6O~K_e
zlgz+wq7f5zJj5C9RffLfmIr1DFGvJFO=VPlzt%qq__cktv1O~mqKR7Bi_1kLSht9g
zVeuB={3eHh2pO7iIn%{CyEmvP&SfIq@HFT9`J1LZ)M9L&`uu*u?8s5i@J*|3u~Uz^
zZtsggw21Jf5p1c;`(p~>e`*Dhn$;9eA=CaSVt1svWu71o30Gx~NRv|d-ul2%tGo81
z@#;@Mp5)jWFH{9yg9Ir0iPA9l&vd0OWNIGJLeFyb;v#-U<wNTFuKIx+o-e;7zCC$n
z=l(FxnW>O6#IT0{8zhUS&qX;gGi0V|h{ecjgz&TO?iXP;{j3Km;b~4553tV#uM$pq
zRL?3lRG(bSv@TEuzDC-2|5_-Q3o_j4@{9&=6abFRHmjqqPA1Rucc%}~)NpAZa<c;Z
zzIQa_c=_c>g=KO*{gQUxCU%E8cD}v0(1$L@jO2`tR(;v$H>F&-Xk$;j4JjW$Y)@uv
zBK2yOihSM`jG^wPQi?c{u6xm5W*LaS(TJh!d+Oqub_mNa`%c=fp#fXF4?}4gc9R3{
z)lg=8&8vfc?K1*#$MK_mwnqxybUv_=;|_L(J%;?fb?^$r@de=kcwkL95iJp1BE|et
z%xn9gV&A%Yq2gp{G_VI*kvc?#oINU8t3Q7rr{Zg{UIXprj@Oznj*D-Mrtx9R{%=7K
ztuhA#!TPam%Z2nr#Rj5OG)Y@E@Q!TC*)Q^77un!p{-Le{j?k2Sd%B@9{pH$zce}JJ
zEv?v6c@cR{(ta&6p;Jr;wxS%m%IHo8ACN66AD>8<W6?=L0-Lyj;G2ZR*VpB5LI)#C
yj8e;M>i)FA>z84fFAAx!g&j5;%!L1qPGM|;K@F<NMoVL3nL%0ET2`8$kN*$ipj;UM

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_note.png b/app/src/main/res/drawable-hdpi/icon_cp_note.png
deleted file mode 100644
index b6b752e1507e40e135866e45183f71f64f18134b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2020
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
WxzWVPkeAYx&p9YCl-NM{q2T`sx|BZv

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_battery.png
deleted file mode 100644
index b4a4f2923a20ce34d0cd48461d286cfa73cb189f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1233
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;M^6{Wkcv5PZ$+<2EtX;baDHZ57iaPwo;G2l%1cw&Ri`h`+;c+m%#@6b
zqRg02EgG6ZHa^c1XQjD#iJTRAsy9(^(gd3X7o!=;Zj<)xFnw0><L%wZ=Qrl=y>@H*
zR{zhxuVk*@d;b6b`0V=g^?&uN<%7I5mrg+;rkaH<yKt60KU;oY<L?5^FrF8)e!X?y
z)6rf~u&=3q?vCPnZDOGoFInu4eiiczDA39~o^G*wdfTbCtvtJ<`?;@j+4QTHN=L+O
zx}&za`m)%bmi@2hRe1CrEZwp3YmMl&&I?-F(${vjKDOPl{M<>YPkMSnj)L!(hDD_2
zAAZbzoc-0D6^@sG?E3KM#xCAa$p`%vl3}dA?V(w7&9!FnWE<Z*d}-EK|6{rqo7;c&
zcd@=+W+Zy*T-)C*GX4p*uYXS75yf-lZcid_o~ZZC><#;$mA*OhbnWBPA42ly!xL}V
zzINI;DK5U^t=65}OYd>+5RQMS`=@E^D|XkMyIo<WI-v$@Hi$iD+~_9#{=;wfqw(eI
zK7SBd_Q7NIJKja<e`7yKnLUc06T0=0LEhm)n`Z83nwvTNAJ^3MXCJNDvMV4>-mK$q
zrhZ@c-w?AG8_YUBuH3ugulW0pwU_QjL~88j$?wuVb*J^Q^dk2^RtK`*W(6eb9yPnu
za=1c%_XnA}ys4F<`Lk=I=b0>@n`zVY+x0@P)R7rmrRHyudw(c1DdB#innu!{83NnG
z)%QQ<`uH=_zPU<r`h(r8M1SAhe5}Cm+`%Ori)Ys=ZLm!{?>E0&^7CxFxcJ+3hKv8T
zUFKf@|MJ=-`|4|3DlSJ)<zDrc{o_i9>dm{o&oni2tjg$~*<g1h`>vMBMvb>AUSCdm
z+Sn~AekUe;w&+jDGN;SchZixo3187nQ=4i(m8a_>S9XNjQNIPB=6&+u;qEj0effUS
zskYJ;S%;OMt>9Z<I`{80E$M3^4=bE_y10+-`2T%T|B<|flQwOBsGU)Nd6!W2$Ht5A
z3%!r%+`eb$+x?zz|BA~IH#fu`=T36<t(jJmI#<{%r+t=VU~a?xj`Y{_RwTA>lr8^q
z$z!VPOL?UYYj^nMRJqrh*`_?Jm;Gi|ql=b&_x|QTqTI^1V|(@iP)X$J>gTe~DWM4f
D948-A

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_canula.png
deleted file mode 100644
index e75d9ed81df18865567664173b747a8ff92c4fad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1500
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@A5Ry@kcv5PZ$)>6hRPiO*gyTG&&KY^wp4Lm<y~4TBC#5mWjJ3dF5xbz
z+*rfGRkiYjoYJHZiXDgMwXBE}Srj1Ue)^D!)8aiXt^!#p;wO7JwP(M1xZk`uEhv5d
z=I!ZehkqSPTVH%G?*G<v`Tws+{r`G@wu{n44;7(KWQxmJNnhvRyW<PrxL=*qbaMyS
z;|<Jre=HYG*4CTH;}(8p=feZ3Gny-Rus&x0^H2BP;dIuVxm|HGnSVB&OPbqy+dzE#
z<3o<?=IiarHY?-*k;{{J;?0@ESDjXbe_SH4t}H3Gp?xERvEizdzl1mNa2M_rNbCD>
z<T6`~HCul&f84UTq`Ups4Yw_s`}0Qo=h+$C!;<cHOr7<8N%F;oI|2$k<0K*-AHPjl
znbnfj>RY*xFRAy4uk)2}X*wtEuOv$JT@v7*ms0hiF~W5B$I{3Br2^Sfd`Xu)H{9($
zzfsS6n}k5LsgcalSsK$m+dRumGtxU0r|4sT?eX<RqV3HQvOD79&lr1eEzaaOTjbqg
zY@ncfCZOAtdo{0It@&wwr7JHEE&s8bYw_8x(rq`Ad<17-bxsnx({(>Oqkd^t%dO?-
zi^U#A*~B*9trHQ=)`>gx=<$`8N6q#q+dQ4kWOn><SJPYmCG7H?jk~_eN4Xd9FYEfb
z(x|J$lxg*an;-7#E8R5=thk{OGhJ3cVfhc`=ntab9-Gh6-1A9l<9_W^`yZvP5uf}y
z?YMlDbV~yFhbZA(9xuU-&t3^<iOv(q^Y=MteB{X;&26f(hmxbd&YJW7tL{tbf&~eC
zot0j_Ghs=(J9qB)?wWwdvbIWlGSsI%E-7?>FLKD&vhl8L(v5kI?1dqJPL>|hj*i>9
z>DT#=GY8{U-+Woz5pj9*=gt`W=K}Xm@mcUse-!huu>Ip^iCOH@uWZ9M?01dq7BAc^
zuwSUF<Lbn@(Vi#Yo$o8#?CkUIbErnx#0UER=ls{Mx@dN>)q0glgv*+@H!GL@f4;Td
zINLR@E-I9*yW?wOnVfRi-d!8w&TO3eb!SJ!{Ei)5Vxd<Hq+bZuzL$A(XpxBEYVrKE
zr@OCYzl&;)o_hZF;vetoT00iGKfb6Xl_&h3d!g3JEn=eC=J(E?@-FZb?cLrOtJJb0
zMZ;{ed6d?k?52*s*N3E>6|R--nK)HG@ZqGINiT(VPq_3q*G&1R&OedBzn@d3^M$34
z{M#^7=eS{J*qXf+s@nQOlI;)u=KY=(e=R_J=eyJ-XB#H|sc#)-N2r@!U7F##hB?Vo
ztthrM!B^BRs<vy={>LHhi5@L>yH81FhOYVZb<W~c>kDpS(@igQMNIzS5OyzW8*}cH
zx0~2z31;iO6LmJYFR!P6yU}dZ@->aed|vWQG`H88ccVx6=j!ewmuF~yt+#$>xhH%Z
zbLpbMHN7)p7MwG)S$e1>H#S4$b@E3Q_4>Wb+3O#uZ@l``N#)AEoOE_!lne~a&e?z1
Y8Jmw>+ViGR98@TKy85}Sb4q9e00{_<TL1t6

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-hdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index f780c23e378d877e4d8c2a41f03c2bd2a144726f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1798
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
T1oza5-S5l6)&*N(9Tfj3ZB|4y

diff --git a/app/src/main/res/drawable-hdpi/icon_cp_question.png b/app/src/main/res/drawable-hdpi/icon_cp_question.png
deleted file mode 100644
index 65102f2abf80a771ea8dc89dbc4c45a75a63bf7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1220
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;6Hgb%kcv5PZ^f^8k}PrH<9VH~$=AGQi!Rg+TBPzSV$y^ayw!_!-%OLv
z;@*DyUe1miVy+r@7Q|=-N=tK^Pcaj(R^$s?8GC!)mbdf%L<$~1YQ6mPxp~Hq|CFWO
zyKh~!FZ}&yv(Nkd??0=3{?}cA#Ssbp_qKZcF5%zY|8J7G$`hH_9f(?UkW=P({|}+~
z1o>yvvzKhny!mQk(XSiTFV08VwB<(FJ}5SS^e^wH^`55bDl=UpLw6n4oBdIDo3zfW
z6usk@e{fyzS6tsX<zH&)hc#ciPyG~?_c;7k;ol+4i1zG4Z}YeWTf3ufHAeTQh->P;
zmfX9@&*M|s!|9Cot-YnX{2%<uyDM_<Sm=+;Co}b&PbOBF%bkDZyo1r2N6dB7FRgV`
z)PAy_JNi!WnZ<;lP3MjjN7}UC-nc)}+P#pyFQxSR!$k`>MJp~%$vvzZ`9~woZ{ym>
z6-M3R5AOx%tQK6FVmoDO`iEl^-tO(L-&9d`;#-&tXXJCw?z60M*U}SjHXNRD_R&}8
zZQGT+PW<wX3O;DK$81sA=gRCXmt4LjM=m|&kLi8=q1ohlPg9M&>A$^wMX%S`fBe~T
zdyj(l`EP%(aAaohHr5f3j+t}lx~kROkjUBoUHA1bzEn9CwYFTnfI)uxiwdDs+x6uf
zc1z38nwqKkUh~U2`H25x)yi|XZT@5*lDu^9)5JCJs%;ir*wlD(!d5@4uA39C);8b%
zP<+xQOTO*$rN#ukto0>Zig%P4nV!C-HMcG9M(^{bCu<g8e9I&i_}ZW*V%L<28<);J
zbbOPkt6X|&)-i4|SJ^{zFR8k&zM{6eS-ddHeBM+&ZN4qj0^M?pubthY*1dg&i^$iL
zyG*s;PZpbdHDLCd)0;lIuT8z!ek*0}+^OAnSj`riMgIKz@Zz;iFPwA#w^@JOT{3t7
z_NOt^fNCZ8UQY`Rylt>%)`Y7K5Ogc0bjkN6p+S?^R4-xPn|$f)SKqhGHcyF4iS069
zs+@Akx!?AZ^4+WzuGiGO<;&MhJhySxLb1qt^ELUcQ7L;>&xTrVu2|n1^DC%(jq;`7
s<9{#h`(XU??8}(ho~+2}_UcFdiJNL3ZTc<#6IA$ky85}Sb4q9e0J4)FrT_o{

diff --git a/app/src/main/res/drawable-hdpi/icon_local_activate.png b/app/src/main/res/drawable-hdpi/icon_local_activate.png
deleted file mode 100644
index 4ef567ffb65bb11825ac52978c03cb378a338646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1357
zcmV-T1+w~yP)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00009a7bBm000o1
z000o10d$F+O8@`_|4BqaRCt{2TuXA=KoISuvbT3yMmd4W34jv>pTKyho$(1mPGG##
z&TxX@6BwN!_yid*wKFGhsw<Cz8jr+$dIU+$t4gI1L~6b1f6wH@+uIu@*x_U1$sUO;
z2PCo_kjQdCBFh1ZEC(dA9FWLzKqAWli7W>svK;W~l!Pf%J<zX}dA2%^H1Bb=Lb_1(
zh=`b+9uf5q{Cq=1Ya(LeR>vZ+Q?d$GGcgk)VxrChZpGv+iD+8pnGzJS6`ha;^O{;{
zkPj+efHKe4vEL&qS%s?4iD*VdSJ57_!#y<ZHP!>7kp*p9T9{k4^+ou+<`*thof8rN
zIfq{xSZL-85shQ{v?yd1s%F1**YXo4XwGE1XaY2q{oVKgao1&@&E2Fv3~{mwRnJ?@
zu7arque^mHT$Fh>4t>r(M9FF)Y6J6Fial)i%n`KIWbUGbiILS}de7`{Vme;<H(rPf
z!`EUaDN^phBuqptViQGwvwVdBurPf6V5$s!5Ug2ny2@Y%;y%Mt9+NBJDA@~LGzra`
z8i;yErhW`e@ceyzhMYkN(kzrOzqHF6tYT{!QmA@~9O@MrxLDcJqU~QpGW}4^ni;N*
zEr{aP|Aw&7fB!C29lY{ez}!qOz$C9VyvafY(sP{3GCepqT>D<AdM)LQAxEWM?n7=b
zglLvY6GF9vL;q8u>KRNa6rwVQkTudiSAsR!4cCZBIK2URbnWuKrx#f;72SD;Bz}*E
zYaGFTav%uQGF`4SUsLzhEYrh6N*Q*%UkxFj5C9Z{f)7k`9hIyqG~wfrUgjC6BDY9C
z_Q6_wSEzdB>YyQ)Zi=0f)zdzU^^eLto8kWY3lgHQPnx02=hd<GB}?~LqAgv{)5<*K
z)xR`o8F{1`B8%xvR)c_13T5O<c|(C5lxFxid8r|5v|$1J92De36vR4iEP{)Od?IAU
zZo$wlXX-U*Ss!(3)4vswPpY3Kk!{;x($a}-tVgBflN#UmBqO2@_?I~nRUJ&!=z#V#
zYMl$5HLJ_fIco$vaCYPkMDeUJw~*<bX8F8_lx7X2HS542!gW5VYnCY;IS5~}DlM@S
zX{*q#^)o}6W5SOz&s>vIT|Teq=<DF$WyBIr6!qV_fv5_dPA8%um!7eES%DN;6w>-&
zGvT@q6C&O0*ko=wqxWnHo8;<_EcgoD?n5RycMbL0Bl`Iv?O<K5jc<?&$+PsVxi8fc
z#zI_{c{U0eWI!H$5xo0ur`A@cy>vig)Nhi<TT8vk!it*)0=~YB(}7``XA_C?1ag=L
zD&CqJTJD&-mvf8AsG9<(12)N}6_9?I%q?i}8$=eO)4g_?quHvBFs$wnUC}Qdc~c|s
zT+=4H`_QeF5*hpy;d#FtxqxqIjF8Zx7^Tz9u$$)P=;Qk>5OtmmUo9}2kKV#Luzz(Z
zVd7H#EEeS2@YNMe(t8SQ1KfYrK-9IAFBChDf(>I$?cd;mX%leYb;Cxsh2-ASw5QYo
zv34u7kPj_CiM?C-Hn2o8;*|EmuQ4U!F_;1|+dkC5av%J*Yx?i(gWm!#JjDbiHljz~
zuFmfC5Y}Uz-4XGFhtTz@uzW9xl{ghP>*9dZ7RNkqIN0+=JxkxV#(6{W!v{7vssH6D
zon-xwkPehPAd%&OM3w^*Sq?~KIUtecfJBx95?KyNWH}&_<$y$%Er{q3J~1+q+rF88
P00000NkvXXu0mjf^*DY-

diff --git a/app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png b/app/src/main/res/drawable-hdpi/icon_local_activatehdpi.png
deleted file mode 100644
index 4ef567ffb65bb11825ac52978c03cb378a338646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1357
zcmV-T1+w~yP)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00009a7bBm000o1
z000o10d$F+O8@`_|4BqaRCt{2TuXA=KoISuvbT3yMmd4W34jv>pTKyho$(1mPGG##
z&TxX@6BwN!_yid*wKFGhsw<Cz8jr+$dIU+$t4gI1L~6b1f6wH@+uIu@*x_U1$sUO;
z2PCo_kjQdCBFh1ZEC(dA9FWLzKqAWli7W>svK;W~l!Pf%J<zX}dA2%^H1Bb=Lb_1(
zh=`b+9uf5q{Cq=1Ya(LeR>vZ+Q?d$GGcgk)VxrChZpGv+iD+8pnGzJS6`ha;^O{;{
zkPj+efHKe4vEL&qS%s?4iD*VdSJ57_!#y<ZHP!>7kp*p9T9{k4^+ou+<`*thof8rN
zIfq{xSZL-85shQ{v?yd1s%F1**YXo4XwGE1XaY2q{oVKgao1&@&E2Fv3~{mwRnJ?@
zu7arque^mHT$Fh>4t>r(M9FF)Y6J6Fial)i%n`KIWbUGbiILS}de7`{Vme;<H(rPf
z!`EUaDN^phBuqptViQGwvwVdBurPf6V5$s!5Ug2ny2@Y%;y%Mt9+NBJDA@~LGzra`
z8i;yErhW`e@ceyzhMYkN(kzrOzqHF6tYT{!QmA@~9O@MrxLDcJqU~QpGW}4^ni;N*
zEr{aP|Aw&7fB!C29lY{ez}!qOz$C9VyvafY(sP{3GCepqT>D<AdM)LQAxEWM?n7=b
zglLvY6GF9vL;q8u>KRNa6rwVQkTudiSAsR!4cCZBIK2URbnWuKrx#f;72SD;Bz}*E
zYaGFTav%uQGF`4SUsLzhEYrh6N*Q*%UkxFj5C9Z{f)7k`9hIyqG~wfrUgjC6BDY9C
z_Q6_wSEzdB>YyQ)Zi=0f)zdzU^^eLto8kWY3lgHQPnx02=hd<GB}?~LqAgv{)5<*K
z)xR`o8F{1`B8%xvR)c_13T5O<c|(C5lxFxid8r|5v|$1J92De36vR4iEP{)Od?IAU
zZo$wlXX-U*Ss!(3)4vswPpY3Kk!{;x($a}-tVgBflN#UmBqO2@_?I~nRUJ&!=z#V#
zYMl$5HLJ_fIco$vaCYPkMDeUJw~*<bX8F8_lx7X2HS542!gW5VYnCY;IS5~}DlM@S
zX{*q#^)o}6W5SOz&s>vIT|Teq=<DF$WyBIr6!qV_fv5_dPA8%um!7eES%DN;6w>-&
zGvT@q6C&O0*ko=wqxWnHo8;<_EcgoD?n5RycMbL0Bl`Iv?O<K5jc<?&$+PsVxi8fc
z#zI_{c{U0eWI!H$5xo0ur`A@cy>vig)Nhi<TT8vk!it*)0=~YB(}7``XA_C?1ag=L
zD&CqJTJD&-mvf8AsG9<(12)N}6_9?I%q?i}8$=eO)4g_?quHvBFs$wnUC}Qdc~c|s
zT+=4H`_QeF5*hpy;d#FtxqxqIjF8Zx7^Tz9u$$)P=;Qk>5OtmmUo9}2kKV#Luzz(Z
zVd7H#EEeS2@YNMe(t8SQ1KfYrK-9IAFBChDf(>I$?cd;mX%leYb;Cxsh2-ASw5QYo
zv34u7kPj_CiM?C-Hn2o8;*|EmuQ4U!F_;1|+dkC5av%J*Yx?i(gWm!#JjDbiHljz~
zuFmfC5Y}Uz-4XGFhtTz@uzW9xl{ghP>*9dZ7RNkqIN0+=JxkxV#(6{W!v{7vssH6D
zon-xwkPehPAd%&OM3w^*Sq?~KIUtecfJBx95?KyNWH}&_<$y$%Er{q3J~1+q+rF88
P00000NkvXXu0mjf^*DY-

diff --git a/app/src/main/res/drawable-hdpi/icon_local_reset.png b/app/src/main/res/drawable-hdpi/icon_local_reset.png
deleted file mode 100644
index 7d38cf0b5026b936e9435c4d54078c0793274382..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 963
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp&H|6fVg?3**&xhV(m4mHg1OYw
z#WAFU@$GEivReiM4a;lqs%z&zWIL#?VXpCJkG7>_b@L(K9gZ)~?Y<;^fKw(fU|ZZ(
z^#%TKEzZy6id24my#LI1Ic^uFDd&whnH1fN)e{$ZQ=vcajbJ2?ix~67qYf#C0=SvY
z{K;}LbH$Arb}WAz87ddllOA$(zm>ii!-6=kOU~!}%^3;~T(?_&Dt_Vd=`mq*#e*3l
z7BAV&7(16CVRq=#bB{m7P4oc@f7f`~{e0c|RrduhO*(O?<aVUXB(JUMzQ4~rD(`35
z@M-3}i>X&DH=4Rkp0xS+b;Z@E?zh#2{5oe?YcKgL_|P}IV{*P?%jODwjr?5Lthv*e
z)9B0HbJe@{iT2xFGFrCgxpw&uUcWOrp0nQ1NUEy8QezVlAre^{_r@eV*7dT|ky$Ix
zaf_zjH<8zEUy@P~8P2vY?{l&I#grfSL>X)*K4aS-UViz7>Web=@CO%N5AF}$*Y(W(
zQcZj2E0-606=fr4S2?<FU9f>Svu?%bN2|T-4_^A<CB-w#n62ljgIaCr#btN8#f&yx
zd-C_Z$f60NTv>rHPxP%**krIuZOKi|FSQM;f9Sr<I{MZsBt`ec@ArnQm~3-AOMDA%
zr}mad?g(0bo4+b_ar0;4y$_d6ZT-DfFa3I{FT)BQt1xB7l(Q#(hfMxe|G?F{{FeF-
z*G)=pDXN-`(hCCTg@~zsJ>s`;)0$wz9cu*7hU=bt%&F)dE+;8`E?U>pT;}E+)3P<s
zuWZ-o-n#A8C$ZFvTQ<)-tg=a>-2K{Sz6hm%zgeA6>F%hnS?QD#>UrAI@xawztFt(s
z^ECWUIN{y7;~e+$%R(Zh3hK6jDVe8?+|TJpFIW6GF?QaDywtOzfrbkor^e>In^RgO
znkL}-o2O}+!p#EnpVu~RkTWS4yrz8WXIP&1bCW%%?J{`pxkk)i;h}Du{Yk;|v5~*k
z+;<WzI*bq4Gp(13v@T7yTGo47_Qp?*oC7Jc#*0dhCoEs1mDzZS>$&SnMO9xH(bfxl
z<$s4PPrbl3PgAE=<G>61M<>4&dDNag-MPipYnjkfQT^(}^Eh^M20kcOu64a}wxdaa
zzpW%lD9=-*rK)S$UH5yFG$d}<NA$?9JZOw3r6aP!G+l-d>=R1U{%`DM+z-r^44$rj
JF6*2UngBe%s?Pub

diff --git a/app/src/main/res/drawable-hdpi/icon_local_resethdpi.png b/app/src/main/res/drawable-hdpi/icon_local_resethdpi.png
deleted file mode 100644
index 7d38cf0b5026b936e9435c4d54078c0793274382..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 963
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp&H|6fVg?3**&xhV(m4mHg1OYw
z#WAFU@$GEivReiM4a;lqs%z&zWIL#?VXpCJkG7>_b@L(K9gZ)~?Y<;^fKw(fU|ZZ(
z^#%TKEzZy6id24my#LI1Ic^uFDd&whnH1fN)e{$ZQ=vcajbJ2?ix~67qYf#C0=SvY
z{K;}LbH$Arb}WAz87ddllOA$(zm>ii!-6=kOU~!}%^3;~T(?_&Dt_Vd=`mq*#e*3l
z7BAV&7(16CVRq=#bB{m7P4oc@f7f`~{e0c|RrduhO*(O?<aVUXB(JUMzQ4~rD(`35
z@M-3}i>X&DH=4Rkp0xS+b;Z@E?zh#2{5oe?YcKgL_|P}IV{*P?%jODwjr?5Lthv*e
z)9B0HbJe@{iT2xFGFrCgxpw&uUcWOrp0nQ1NUEy8QezVlAre^{_r@eV*7dT|ky$Ix
zaf_zjH<8zEUy@P~8P2vY?{l&I#grfSL>X)*K4aS-UViz7>Web=@CO%N5AF}$*Y(W(
zQcZj2E0-606=fr4S2?<FU9f>Svu?%bN2|T-4_^A<CB-w#n62ljgIaCr#btN8#f&yx
zd-C_Z$f60NTv>rHPxP%**krIuZOKi|FSQM;f9Sr<I{MZsBt`ec@ArnQm~3-AOMDA%
zr}mad?g(0bo4+b_ar0;4y$_d6ZT-DfFa3I{FT)BQt1xB7l(Q#(hfMxe|G?F{{FeF-
z*G)=pDXN-`(hCCTg@~zsJ>s`;)0$wz9cu*7hU=bt%&F)dE+;8`E?U>pT;}E+)3P<s
zuWZ-o-n#A8C$ZFvTQ<)-tg=a>-2K{Sz6hm%zgeA6>F%hnS?QD#>UrAI@xawztFt(s
z^ECWUIN{y7;~e+$%R(Zh3hK6jDVe8?+|TJpFIW6GF?QaDywtOzfrbkor^e>In^RgO
znkL}-o2O}+!p#EnpVu~RkTWS4yrz8WXIP&1bCW%%?J{`pxkk)i;h}Du{Yk;|v5~*k
z+;<WzI*bq4Gp(13v@T7yTGo47_Qp?*oC7Jc#*0dhCoEs1mDzZS>$&SnMO9xH(bfxl
z<$s4PPrbl3PgAE=<G>61M<>4&dDNag-MPipYnjkfQT^(}^Eh^M20kcOu64a}wxdaa
zzpW%lD9=-*rK)S$UH5yFG$d}<NA$?9JZOw3r6aP!G+l-d>=R1U{%`DM+z-r^44$rj
JF6*2UngBe%s?Pub

diff --git a/app/src/main/res/drawable-mdpi/ic_visibility.png b/app/src/main/res/drawable-mdpi/ic_visibility.png
deleted file mode 100644
index d5a9dc9ca4226dbae86a19e095a11d8f721b15a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004GNkl<ZNK56F
zy)Hyi6otR#ClnG2@ersOG~PgH2ud#?CKC!zpddoLfD)l0-azBG!b6C{BnskZ$&oX1
z=ejd7#nsH|?%8MWwfEY4uPbss$~itw0ARZl7y<f$-bm>qa1UHcdZ|ZqO^R#}04u;W
z&{ZSIGjIf~OS;Q?^9vwmyap@+ttqF^_}!Aa{{VJ?)pSKw0Ji&pQ=pItVBi4Q1a9K}
z5KsbUp=waBfC)(t75^Uq+ugt!FqjHnlC+gozU^WJP9}N_j7us9pCrIx<U1K_U(&qo
z_P{f+5RJQ`Ka$>T?*VhE1db%l`~cXV1dcPZ9FufmJ5;cgvTsW&+8zbYGkm8coqShd
zJ8(Cg(a;V_@3x<SKw<KfCH2^D173l2<F6$Z{tX~siXu(<H8}$0JEjpNzeTHzN3K$l
zoWUq|%RpF|dSVxPxAAAOOD{}ra$Qg38?iOPFS8Lkvfh3HN3FIQwV10$00000NkvXX
Hu0mjfC=0Bf

diff --git a/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-mdpi/icon_actions_profileswitch.png
deleted file mode 100644
index eeae6ccfdb4e1e7479920aecb225f88eac9807d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1143
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp=bkQ(AsLNtXIN*1IEu9W@0I#wV7S1krh9#cQkdIDfh_@VbdEUbut*E$
zG;s-v)+`aw-P+Ns#L*-s7Pv9+;Ew}Ny<LiIol7{hyi8Vf8up)0IydR`v%EWdtKZLR
z{e8G#x@B?Nx$^XHXU<GbI@%?w9kwRIE9J5Thn3&TC5;Mwoi1sLVyrK1xO1moQC=B;
zsn&C|vYfs#<IO3N4)O*}HAh}nO{?|cnh-4ZCvpKx1%D6IYHrRYLO<BPFkcPZe*VBZ
zF(Hq|thEP&!+E|iI3Kv=#GuJ)$5`Lss=1AgIY*CW0<+i~Rr%W`54a6D&dgn-z}=9$
zgU6KV%970TGY<JoUk~&cI5g#S7(e~i9_4vjb?t_rcbT_zGV5pMX{qj=wB<(d_sC1u
zo^!))sn||1ne(!3#?*$b4*HM3GFR}$Fn?nT{%2Ty^+4tWvkRTx3@fWRrnLA!ba;15
zA-v#aiLrtH;s57cQfKKNeS09WT9cuA5!1^JU*kocJ_t{JGOyT3YeKQv0p$fsN*%lh
z%BvG!FJjVUj^bS=I^FMZOGLf^LwkqC->@4!4Zoe+SRc1qOj^?~<g#P)m1KUO%07Xw
zavh7~qOT|%%1!al`B1&%j4;chW6Xs%SLg9hP&s4FomB2HLF}{r!}RkZJMRhnR++o~
z{%NLf6Tf7iQk`J1ZkP9)pNb3W!@cYqMc6#n+TLgTlJEageZnCo$*ETaFW7SiP4^bq
z+2k{IOHk1ECGnZJ&P?AD_-^uq`A#z@u6Z&!G%WI1=Ese?EP9Xoq#o#n@b1uFzdg3~
z=Ix@BQ9GO7Y*08?@oH5;`ldSm1G4-9;v2X%KK&?RX8s}b|1;|(o26!t-o0X%+`aw}
z%dCRs42-1*bdP;ux{<VPdYJjUkh%I3OusE-Z(J{SMxa1&#^dcF4Za70`2+fG@BcZ!
zbn2X`aS0MT7_ThLe6Guxpnf4wV14c}rskHfg1bF}HZHk;^Gmwc<lkm*R(rgAvk{i!
beqM~P{&4Jl+@&~1P<i3$>gTe~DWM4f5p>N&

diff --git a/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-mdpi/icon_actions_temptarget.png
deleted file mode 100644
index 39170bab37f0625cc3372a69bcf8c53208ca5645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1364
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUBc3jfAsLNtZ`7`to-D!sp<g0cIB8?0ZRJg!D`)n&x~DI?CBVJ)P|}S6
z3z5%aOP9%(n7Kcj|17s>;hvmDb37uv<M^|^^^5s_sXIw8{CK?d|Ff6o()*uR_RX}t
z|Muozo9lneV$av!zyEqyo>s_;fQ3%2T%!MqZ>+q?7oNLo*G0YRhk-rE&-a$pr2PN+
ze@E{8wvbcp&4qe=FVA|Gy<A%OJ4vPO@g9|G*7Hf0_l|5cQrD?={gtd&wSi-8hF59(
z<1n3L;XAl@Pd6=`*=F*%*yniInF9eaGhQ8kq;lq<{>p#Ga{`V%NtHC>Tc4PJN8{f=
zpPC-imA>X-kIZD+tP2&UCHe%io-%miV$=8DkcYp+KCVCB_`Q9inA?(V{tsU$d5M^&
znA=RecmAMz=~w20;HvpOwy$5^7mQvfFL(G{rKo1s2@#pb>Lc4$Cd%8WY`d)LS;oB2
zZFa&|se6ZNE%>HC3tiHoSX;om@8Dm_pA37{d1mxxPp;9r6+B<H%p`4{LdP|wQ%{a&
zT7=|uuJM0yz+sM##H+h1_0BS11SKZD%DU0C+)(29lfY#iif32G%$Ue4wD3epiR#U$
zjY8R%zkA*3)n+|?^+S<X^e2trBNGx={!vk$-SSpx+p5IX7V?qTs@yCNe>UE9%Od?*
zpjy9TFspU1&;7d*>VJ;%2!300TuUbU`gT{180EIUE9J8H{5M^U=shhRsO7)rYOCMF
zFTWBs>jbXcYKe8V*(x~u)vtB_Z~G5v98B^KzN;`t@y{u)np+(~l{_zf&O7)V5l#9n
zu<?q{LA$SR0>`#;t&&w;)Zn^uou|Yvn|0YCE0xkyO0{MiZ~B>3ns@R9pMcxf^Cy-)
zv=(%@R#2s7{TbwX)s=fRly5g#AF*8Z_v+tE#S=W9<cXg#JKooMP36x#$?b|FC*5})
zS=A#Py-NM0wTsYIy*ZDLspJcLUQ5t9u;)yKb8CI2Z2YspWf>ht!51>3=hn<hn4kM^
z$&Jk|lag7LbI-rHpcj@sZ;nRR3GbJZ`cC~iVvj{)=I>MQD)@VJSJ~#HmeCqPjWHU^
zJ^OurG_tdDUyaXL<Mp(?-thb0CW&huFD%SY8Ki73=#zF4+0Ao2{Z;nDN;8ifLBEe_
zABB%~)To)C+EsHyA?R9rVPixq|B=?i`&OP!*|_)Iv58F!=ZU=emJ3X2dt7hoeER%Q
zX`7U;OgwLJ&`;?&0rqOw$jRT2m0tMt<xOL7p`qFX%ZWn!b^rLTe6hA#_lMwmE_)-#
z7PY&3O>gcmy!@l}gS2h^^$nnW1j<kk>)Y%ZUI`xkB&6O9EG8KkJYD@<);T3K0RTA9
BO>h7J

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-mdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index dc506538838555fade6e8bee85485e3693d4c92e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUgPtyqAsLNtZ)A6bq{<xscs?&}wrJ#9&*`O?-!!FWx_GM0eA(Tlp=6|`
zq~W!R+jXxI(@KsvOm`Pl1-hhaIEwFbT((zJd8^Jvqt&9DbGDkiO;fwo{a>=IY}Q=M
z;&V5fEaD|*RG#~6^ZdW{|J%iFlOW(ff9_eeFMcyV=HCePR)2S-ID$_({7n9igcA>L
zUoleNz@fg#S!s#n+vdzbHol`tii_C4FN?K^kh{qqYr(;;mVA5id8;=oHm5E5aKxgf
zdGp8IThd~xPa@{Dds^_iXU?gA{n7B=@!L1n?C;Qw5^%IrJX|Qc?&uGz>-ER_Z%q3m
zr}k*S@Zw45U3bXWbLrQub@dN9p|nJJ`(rkl2|aHGHvZ+CmXtcRA*!uY#zJ&D$6;-y
zWeLqE?%rK1akXng*_k7EEi5FXyVN%@>|b{0d3lY>ykEX2Z$$ZsDjj>sYtz}j!FX+9
z<_j^yKRX0IDlY4;sfel)6y@{&W-S-bwLZsV-Cfn9H+DMS&rDQ%CzK`rh`iC2UBD)`
zZ2Ru}wS3}<5rT%I_d{d%^N4dNK5m`CJ^QYLZ^qkWLT_3lf6a@rReKOKr|<ER$!|T@
zy%o8dW&d!ZX=lg#*Ka->-8&qt)W7b)>dICD{|tq1$G`6IoAR(xqHE*H@1{y~%pPSt
ze5q^tdHbUv#j;Xk=FcVH$|kO{t#IhL(e`tP;N-%V6Dx(kOueGN%4Lqup1pjVUB9kM
z<G<(o%uFR)Ub44x5u?!4GQGG@=hxM$#0k#br}U`($t{kDbBzo6^~4jmEDCMjRPjWh
zaKdaAt4~*z%;$y2A4!sFKL1tRQKaXj(#-4Kmv*~6iSSMl+{C`WWARbXim<=WuBr-^
zt?Bp}C3tm@n${JjiQb2!O|`r;as_Ks6?PRe<_RnAh*HVXS4*13v30BI>ut$xE3)=)
z%?g=#{6}X+tjsStQKc|W|1Xb31igw~<8(yaCq+exIT|`yeOQnY^E~|RPOplj;7_}G
zi$AE9J(Rh4cfO#ijkqhvOx;5(s@8X@n}zo39#?kC3I9|(T|-R%#80olmI<zpRs<$4
z71+4*;H<biN_|%Goklh${erH0BEG)JPMP1ClBcq0R_dZBd<W$#drrKbcyZB@vd6)H
zUAH{sySUZ-QDW`$by@!=1+)CLF>*869k@u?Up&7>G_8v(^kLc?-MAB6>Z{$4arpD7
zFs)m&dELDT#S~E^|B!k9E*4k26#D*V9^+D6Jz@KijY(2<QVHj{HIH*CX7`=(G<<IO
rasM@)H{Ife*~flQodN}a+W+w0dUCqAQ_pres3i1s^>bP0l+XkK{?R{w

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-mdpi/icon_cp_age_battery.png
deleted file mode 100644
index 6c7fc5613931143c3d6dfa0ff4ffca876523f5ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 911
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2qx_jGX#$!L6g{rqa5M496sub)wv6<v4ckds+mjJepUvu;A%>sm!NP5s0F
zPpH0OlF+8Wx;GIVuBV(LJz`T7O`l#W*m>+xrP^h~@^dq*)7*m3@AjMf+-Cms>V5M+
z+dTj2s5H?-MX1w7Y2pk6t;(jd-FJ81?U20UJ~QBn`K*f8qdBQdKjq(Y?R|47a*fvP
zhYco$lJUFbzZnIoY?ShIdmCM&Ge2H0bm4dNhZ=cLO*N91DDo^9TgP?RjxX*p(>5`|
zaPADNzdJH&)E>A$`&+A-l%gatb)uDDLT+E4=`!vY3G&Z$jI;Za#BQ}+p3!x^bc^vU
zwzQ3s+dtZ>r^U`F;BbDI7-rz394d3rvHtj19=^wpYvv!TJNU*s=J5JCJAy5)hrXNn
zc|%Xm0m;O+%!kZn$96dz&XkSlSG{v|bJNCbr}JM^CEUs$TRi*7k>8TS|6s-i>&=0?
z8)jFSJN!|tnU=h)XCl`&Zs%u0b!o5Ux&I%F(b<2T_uv_YnxmpIJx}L3Z|s@4?ZemK
zA5~sS?a;5eJM{x^dD5Kcds!aeu(s8`S;xEW#LwkwiH<StpDPzBxmjf&*ipXk?)%g0
zoNJGsz9=HL(8^CT=UAks>6_l~pLa~ZzTib=O4yAeky{6NCr&Gn`+4Q>hBF7dHr#kC
r_|5%s0;7HkU+5RJNze!ZQvbW{<6I)%OLDAe2IV79S3j3^P6<r_SubzL

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-mdpi/icon_cp_age_canula.png
deleted file mode 100644
index 303ad946cda795b66f7d28d456eca90107624a7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2or^K@|x$!L6g&DUErP=et>`kw})-vX|Sqqp$f64@dUqq3#&@-bKL-|~OE
ze+er6P}XXicF|~s1CP^1At%kFIfeP%#jT#l3e$Wfp428tyqoj=Oy&KZ&(BCYaVWM3
z011{8ec3O*R;B)3_sDA7#;XZ;*k>G_+O(~9&+*xd`Xa;Td<tk*dG~;`&Wknoq3FJl
zH};Lk`|3NyKMKtL5n{Sht@Vs&=l;X2KFN&oABC!S-Y~plZFH_>(##3Q&3^C7#piDf
z6p1O%ialh!=fL_qUkhJqmVaPeePe3ZyC3ysn{}$=t^|CSmwY#$zc1#0qwAexwKkKw
z<knRFKlVy&(|!B?2mX$~um3B2G0S9Y8+X#@cV5ApeYWc?%Tr|kq3gSJF4srvifF|=
zq4n9%KJ_=U)tVJNHff&Ms@A&3QoS|DyLf--DK5!_XPahdW*X;A-E_2$`}3u^&#||}
z^}Oe+d8f~hvQ^LRV7^o}<H(9HzhVR5_J$r0)(Pj#`L*`y(W?I$Th+SvPQ4X$V*BNL
l3v^rOe5n+I1e!(tKc*R%ot3WN5)}j`Z%<c0mvv4FO#n>XJ%RuL

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-mdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 5cd8598faa8740927f76ebee31ab4d67e7622241..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1073
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpg`O^sAsLNtuiswnpDA<v<MmCc6Pz_YCmLVw2*?Rao-=96vY4HVp0(8{
z{G0f&?MWN=P9@K6#m$*B99^6`H;P)$Pv5+~`~9Quo4;@S{_E}i{9N&Q->*j5p0ApB
zzPy(I{CCBP9x6heE=m($w61w^q_3}UlS$8k>OJS~8`s>^Io;(cbE6>gsASvI8Okm3
zhk4f=tG}`I)Pj3I#N;xajO&hZ%Lp}zCwpDp!)y_MMfq>;iI6pi3S^F3ZVB)0Ke}F`
z+5E<&)SIi7xW7+VT-?HV`J;Z{swXb##~yG0^Rr}Hs;;Y<hP69er$AIoSkB?Ue#L4W
z{(q+Kw_h(+9ayq>6VFKlY3)znYj?ak{X|y()6+hWU#kyw9Q^r1z9OXLFyq&kZ>Mck
zGP(9BNN)wN{nN+EE=Q}Bc+M8M9DU*67E-+|T<Yb-g*#{LT-1{%T3=(U*7;;_ue{5S
zx1w=TE%t`|n+<{`ZibzH)@zW$Aof6f&yl=BKAodAqU-qu6}Q-n+q#CV?cLFo9?{Nz
zBY1U3)aq*qJ;!VV&D6V@b6ETy<xjmMaqF(p4aI*ys@@!N(h-(>5j5$vmAhHD#Qu5t
z-<0(pNw_8To|rf<<7k<V;6f9w|4*_@G*6~VTxz-R+H=@Buy<Z!s@|#>RpzcYb4Asw
zpHGSrjBr~2m2r7XhSL|5iEEm(BHB65|5Y-Vx@2@kD$4i96z-SYxfa^1uKahk)7X4{
zRtN9an%Tv?x)m{}-BY)H-0u2!er&-%=ZWmwe{Bd){8iN_bBt%|k@tPuEfl?qs`)=l
zIoaOL-)!N$%jYQT#j={Uhjo4G?+BdlydC>>XQ4Rz*8soMi{>rc7(3;{s|`0FOG`NZ
zz5Bj)&dK@lk7DP({yNj`j(~B`;b7C4maZTZcW{aUC7k!|{Y(Oji&y?mTLH@Hp00i_
I>zopr0Jv7e)Bpeg

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-mdpi/icon_cp_age_sensor.png
deleted file mode 100644
index d312b6c57297851575871c70ded755015ad87e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1352
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJU9iA?ZAsLNtZ`{s~brm`O(f{4r-q72#9<2S=wB_Qmdybi`-4&GrN4S-K
zX#9Hi|50;((}JdsMI8@#0|f-Pg!CSqp%EBdC1`RnY7uX4Qcc8WTWf3E>iNpY15)c1
zea_9Cxi{_Xtgq3V`As3<zx=LQr8+<_-wHFIcR)-hfzSN|Z{MOT3E|<Fmp0w&)7e=1
zYx3EHU&>X#C5y=?#<V)0jX2#Q5E$9dD{+XgXUY2xj=gR1-NLJtHeKtR(_43^saE2E
z=AIt;PtE_h`%-uwDdrrO+@tZ_XR7jD*_ab^D@1BlldDY5pRU}~(D|jOy)be0G3%*s
zo<9uRXsE1|*<JG3bK{Q6GY^CpMo4-qxt}{8cBlRMRt1K+T_@Jv*}P6y@_Tg_`$qQu
zhmI4~CA}*|mv5Ba9UbYgTxpW|HfHe$+YimK|LC*HvgLIlv)kn#&s&5q-RUoMIPp2<
zDwCDq#JV>=|Ic$VYIdJe>U->KqrGU0Xu0SyS)XM6!$(8AU$iKPcgD^;+WvC)>nR#Z
zeaRKBPY#^DG3T{)>-!=zua_;#H#g2YGG#|yj?nHo=@BaL_pY>0c8dw#wQ;*ay4u$1
zVY-WS+|9bG1LsA~(K&OzEZghF|L`52D<b?~MYsPpUGh`PX6?j3!b#5CMBkiUS~i*M
zluTvJiG+ETHmc{=rBuu<cvtZ&Psegobn($h{VDH0A8P9UCKhBJu*q+VwUOQv{p8IP
z&aO6nb;Kh}-E_;p6&_bk7Z?9t+xPCIlfB~3%1w*+uV^xIzo%WZkGH(zuAKPEJ=$M=
zMUU+Z{c)$6{m8^7=Nad|#!tLuseN<CEqkwPo!?%a5Z@82@^OPjQ1i(X54(1HJI%c(
zKJoPZylPil#YuMORagF9nN|4K!brdGf}G$~ojdotlCE>@pYwEgbwS{(*&1I`or1Oo
z=7xWBJ~VN!RA)qF>1>0J-L9$ehoq&Z&aHTPOX*Wu)zvplZ>@?X?7O|JC-l_ZKlW#?
zl6>2dyziYS_N@yvHsV|I&3m<Lg6LbTO+Dw26e^Ux^64(FK5A+o-;(}8uTH0DZ=lET
z%#U1mE*-v|>a!wz{?)9|V@me~kG^f`$h*ksv~6?muLE8)^G?|prZ{?h4y(EQ>`t@j
z-`gKMZY=Svx%H~~{M7Kfb%n9__51Fb#7)v}d4B7>qpKMQ>mBuwo`7T9*M@BHx^`<~
zVBzGmb$n9SEJW2^__j_iuirea?@L#<*S{W}?j`cV*XM0pG$DO$aY{&xow$pty;9r)
it(B)H&VqsZ{{0L=Tt_yCtLt6?6@Z?uelF{r5}E*`k5owj

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_announcement.png b/app/src/main/res/drawable-mdpi/icon_cp_announcement.png
deleted file mode 100644
index 6e1338ac2477afb55718e21257fd209a8cf6388e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUGEW!Bkc`H+H==uDgJq6?>_5HZtE;t%luNhS+8t_-gj^m81#Qnb+O1KV
zZR_DROQTTU^>UQ}|1HPWiY*$=Qm#w*TY|201l49VP4qmfs(A5Y-{Xh-(>Fc;Qeu?-
zzV=sA{p87|=i;*8e*Hi9|G)p&>vOXp;LSv%AE#4$7roALwD*&L-6AZmHZ$$KOLNzS
z&XW=u&y{vNpV+ddcI({kH++i07Y@uS(+gTUfzv{=-8A-o+twc|kIwP?@}Ol?cerZG
zHiHu7x+7_KRC#Jyr*E6FnLqAO>W*D&7(+Q`HeJ0Te}18~?2AKccUF{^#q<?_;CZK$
z?IP-wci5sv`QOb-3$E*_fA3bvJ}xd^cfd5FW#^COYXn0%EbX)T&)v-zSZ%=k{y|br
z&&tUERdZTZMc4FawaCoeDqNTsd|!V?r+b0Pz2hZ+y7;vts%L1mlq6{X6D_=0bKdbz
z<4+5Y_nd)KgTg%AujL)_n$yL4v-bXx_dn#!J0f;+PW~Xqm$U2o#~sr1A6^b|{^qy6
zmPL3|nRMQ9*NC3dM~1UBdFp~#zIe%Wv47a&ar=YbxzqdjAKeadK2??Cb}jE<zEbep
z?&~e=^G@`}&e+PoNPP1qex0LFE!fyO-m3(Low%@nhhp~ihjxO@dzJR;o&Uvm{ubLh
z@k7%S?I+%>`Y^X?<&K^Sg)<%NAH2QuRnJEC(bDjoGVi0$EL`m03C@1`N63sP*zLq&
z3l{AU;qR)PCAM>=KVTMAPB%aMUM%(O9*}g%iL*OYfA0(L{^$5`?NOyZJ3-UXd2f}f
zeZ`+o4H6MFlJ0+A7q9wiO`6oAf;p|S6@e0UF?nY$%r9_Zw04`I^~A&`e~Gx-!-av*
zzC4K7)4=^f)K2{Cb(x2I&vur*ad~BTN%hqGG%*f-9V4UHK4Q<mto*?k-+iSj=$m5G
zzvnL2WlEtZGL{})o8%m$SoUS-B7-}k(gpiHZZ7o{-E{Irqa|<uv%2-ir4LE}UBo2e
zFkc{Aa-~z8*!iCkk_VC(Ey&Scd2pXpyh_jh0F{nyleJQ;^#o_8ubDG*hnr&88|B(X
ze|Ch+%z2RiaP3yzWBP*CCw_?4P7N$cmls(2!{y_z<-*sw^3NWe@B4VYi2L15$J=6q
zj&g4FuSn@gcXc|^o!N2tdLP%dY|q{IOzKqPEOJEqZ)+}^vJwh@+JBS}-m~iSrM35C
PLB*G+tDnm{r-UW|sBR|`

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-mdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 0cb14c2f574f22b0fba26b9b3bd876fcd2a4b3b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1233
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;M^6{Wkc`H+H{v@&Lq(2%?EimiL;ZzjF<TWc;Tahn&XECAmaz#6UU7C4
ziku<95$5L><`(%m!F7pX%KrtMsx+JyOR*Rpk=VFmN|21pBq2jC7qy`3i1Y_#*2cx(
zc9ySb|66Oh;eBNJ`umoz@7tvq&Gb>5eDcqGiK#`O*Bif=(6rY(QuycM4vUYozia<L
z_`=M(WNCp`tLBYv{X)09y|*<}^tL5ypIen-%(ecJ&6#7urRMq5Cw$&0n0%pexz??_
z&C(wf?2a6s5qZ3^jI)wa{Bhx%14Si#$;FJjjz-r=p8jARH*v=9E$%0r?)1vp^i~%N
zt$%z*@r|6I;#QgEg)IFKweC!L<+9pItwX&+=DR50+k;U)hn<^m%<W$KLt-!Q>-7uy
zV^{WV(R$(;({$D1!iIl5bw{*(bT{r6PEU@#{42gfF#Pc*5%(y;ONx`e>`waZ_RIB5
z|M6c!x1|d`p12#&?t1-4BpoQ*yRpK-=44vchjkjKx10Pe<Es-|c;n2)NB@s4w+IeD
z@pXsfd(HY)%xeyC+UUFRU+8{$>i1dGqkH$N?&tN2Rm}dd{6ynI3mvc5OCzpq_&4dr
zBk8}vXIv(l?{-OE>m#dpJ<;!>OML6^>s|jgtV-N}Sn1BQN9+@mrH`yIlG^?-q${|z
zWsS(jyD^1qk7sCH40g5P+u+-BUG0p3@hz`2hYp4;4_ba-^G3V=lF+FqZ}gvcWnO#4
z!*73g>yJ&7tVC*^{@BD!$%yU@QRH?Jy%m(azWhkQ%q#M%CTXQ?%4qm|L-SNt=svx5
zp0c~ORyz4TG&kfad$f+_cJk5Em`C%bdWe4NUh(yB(zIDE+FG~x=E&6h-PtU((rMe{
zqQVJPt0SV9-x4g1EBvcfc;0IX*H4cge(#os_l0X;9O6Fub5T#>j`%4L=5Do-Z3|Jf
zeZ=x(g~np;4bdgP&L%z3wr(!zG)(RN<hU{QRmr!dN>l6v{dWb+tg;iXygY~b^bz+~
z|Bq#{?(NBMK5YNfoqts4OXG}y@W;G`yRw%spMMlKF}l0w!tDj~1RlLSe{govuD4<v
z>pk`?&0M50M`Y&}Rjs=nf#Dn%CDJ=p_Q$r|;4!=>f28;k^O1dGwP#=n`S>5+8HeX-
THcL1E1eHXdu6{1-oD!M<DWViI

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index ce4d8fb9d39cd1bb9238c4c67b51af26126704ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2q7d%8G=WHi3LZkxsAC~@p#eUi$p9~W6?E8KJ1u*o+weR;wL0q*<>&KzNJ
z2TpNkJm$>N5n>8k8Fb@!;2RbniLxnodk=s5lQ6UNdFs8&h_X-tK|#TZOYZ#L`{CEm
zuky9t2V^oVUTt#_uK2&xV5MCoxBR19H>XCiD5f1K_lV_}U}C=Bw4G~`>0{{)d@Elw
z&h!@B)4xkOUZW#FNLZz_y_Vz3#yz*rUwM=_%VmPzLAS&ECU6y+`@Z_Rn<38W+3y1u
z=h{|Qx``Yy=XxZ~`mwj^hnr(f^6#}%nLi0$+w)@mOHsMTO_ui=tD`6Co?s8?yixOd
zhW)IM4_4e}mMv!RIe)HxBda9i`93y1?c;yW^hmqM&VG<5a`t&@i*08I5G*;uX(cMt
UvoY?tCMcbGy85}Sb4q9e0NdjHVgLXD

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 54b51e126e18c1e52eb8102bd30c327f69f79f7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1046
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpHcuDFkc`H+*S$MJ!Uc|fyl;_I)8p|-p;2+)MTZNmlM+ipLSlZ*IjX`^
zqN=BoqN=r`gR@J4QJk|$BO@%Y=B(1isr({=M_L4$n<PYiudGnm6(}J8c2Qr7+2cF6
zFZ;5bm!EaJHt%lnzFncEuS{n8s7*eZVl?y2Zztz`wyEpleD56#SaTqKN7MWdJ8qqn
zveLG__d5LT64oCa;u|=1Bf7gKV*8K2dU+zt<}izn*LCX~Vf{ycT~9pcrgOl2NBesN
z4*!cS`WtwDf7}$-eQlFl)CR887v~&{dk}AP{D6s_!rk57cW*Shw;s8+)9qKX?LVQ?
z0_oQVqRoavk6RY|{)n;o!*BMO?b?gvvM*OB_7}!H`Kx-yRlDp_xnSqo9eweae`LII
zlD<_adAl&kB3iVzFooxwx}mgzdhP!H#dqJVd$8(8*Yw8<>o_kyHwbnqv8p?KB<o0s
z^f^I`-iI#^tW|jw{PEfK^38Xr+kH?J>)uj5>6q3Jx%vg%>ITf_r#V(FyCLl=wPkT|
z&dTF1g6j|6Q&}fvRS>bKCo*aC5C5Fr?%LF-6z`}H9RhaJ)gkX${^%^S^!>8%(3IX2
z3V(Ee9TxfcO|0veMR3}~?HBmdUDx(ped`f?x?_#N-UrbWk9&Vue9Mw?{f59RmrpI?
zpW1suvPUTTh2ojx>J<?&>4|z=wUh7jT+vcGo7DYANON1jlM>rG3VjBX4fb^uO1ei)
z{+n6I@P}dll+f^|;Fng5L4x;MehB?L5^fRj=;x*w|Lfb7j=4%bGPo$e&u@Rdz_}2Y
z<kjrGkIqZz9A)0P^2>~4u3feBGAjO?$D5Ue@qI7Z?BUYaefZ&oS)N+wjSJtL2POk(
cYAEl!&bzq9CFlNA6;O8eboFyt=akR{0IMIf*#H0l

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index b2ba41c27d3de3407300dafb9342c2cfacde1f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpcuyC{kc`H+H@rJM0%eYW?7wc1VyM*9y6B0d>yjyZR9zO`%(PL`lz!tg
zEm=L)L^<W4)5Zx?Y!*%VBsKF`^e2r;?sD3OI_KuHITxMZShTNn_x9iWpV$A}|L*_4
z_y1*#X8Nd2KAB?lze~@s`TE`)7wUGhZ{5-Ee51F&HJ458F-z3{Cz}fcoL5HdnkIF1
zrdr8y@iore$HceoU2%MxOYz@HAx^V4GCOZzQ7@D_T(G&~S>mFdb)H&^8+hFdICEDV
z@w=n{Mwj#XD;F=t+#4NFB|`7aZry(L>*JQ<(nZxy@pldQi$8GvE@WF@xW;1rA(b!3
zjTKqXKgxddWaYgR88L!P^E$ZB950kPs&MC+-5J+-#}Arw^xp(7sZc)Ln&9`taB70p
zG|t92k$nrZ@83NBAi=QC=-zZ*rPc{<F~_s!20w8s{L>faSY!NZ!_FLmjVn#paipyN
zRQZqZ_C_|_(`-W8DS~+~euPhXIwN4+@+qYP+9@{c+<qx+F)lY)xTZNm@v75G--F&f
zI@T6p9<3*ieYU<85L#BSX2Np`ftQQt9#lG&zh=U2t6g^_v<#X0Pg!+{7J2?~`0e^@
zrskA;+NrWfxGdYxJ6Q`IcCrzz>si_%`YA4hCtJDZi(~JFlxcZ#!6v=DGjw$_Pj84@
zQL{U#$wTqUk_$)8e*We%3(D|+^+8RoBP91v)E6O_(Ell`4@G?W_wt{KqOLyoY|+3a
zQ4zMHL91(*KVg{1aZt~Vzve*VokJmO1b%IiO1!MpHAVXf`=Lcy!eL1(6qd!UaO2*v
oWkam~yzE2ETMSd+vCep(L9?w`Y2`JMC!l=l>FVdQ&MBb@0F#xM@c;k-

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 67c0fb1ba2c90b65acd7d81009aed78247e7ab3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1156
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpFP<)rAsLNtZ}@jybCo&%aeCP5ciUe6Vqe3z$)j|FN|TYd=c@@9mwMOx
zDV7Sn5lMQq*1O(8xx>NyvqDpc#zdEi7ZtU%v{vwlXxi#r3yXNRYxT7>*?pUTy!rI|
zt=;)|HjfhT8Jzhu@8`d?ee%zK|2}udd0~Kt2v_T&(BnO;<gd?{IbrE8ZgsJD=So|4
z+Zj{m<$Ju%i<y6`c=FvGo`<Y8)>awu?;jaXj<I%qKJB617q#|hrc>szJ+EG7Q75|k
zBg4McuW~|96umiciZiFJfUo`$OIxsI_rWW2hvIikxYfL4Mo!!1_vt~ka{bBHc1QO9
zD712VcR)SqrTrmmi$42HOBO$!FLo?vn%%}-`j2ZBpM7_04r|$?=aeQ}_Wa{|)wqK-
zIfqtPtlGF)Qt@sD@9GbmBYquMt4xn*Ii(?9Amu*0Xy?4M6+-;|?`Qa&s1clA-Zf#T
z<nQGVPej!i^nU+;So4nUzGNlExfT8$77e^7C(fQVV?*$g3xT^n<Vd~O_;r-Mj&uJ5
z2|K^9E-}qZoz6(832kE5F7VKKzW>JMmJTbvWbSuDFL!q_*7Pa=IQ#U-Ma`h!&Jij`
zHzZz}9Z}z)&s)*o@iXR(&$*JN&!t^gtP!lf+~j#r{=lbw_m29eu6=Hx^r_rW(8c2K
ztq(O!^E+FNn71$6#2|a}*`6DJ?;rSnY-!x9);oINT1qc}x0cQh{#zEBK6gU!4%a2S
zS9jXph`bu8{>1UlHM8<%$0TcFuScpcv7aha((yh?<#NT;Gda&6bgsX0q||R&RZo7a
zYSyJ1zja5tVg$P;a9JJc-55EoV|9*L5!cP8`9Zdl(v#nI?^HXl`DB5`$$c%cJJuaq
z#+;uxd&m4YXH6^p6zw~hp9$LNu3Pe1>X&$z@CRc(dADry9bqT`Zv5UY{3fx`>PN^O
zZ?Q+*clygGpFKH8c)M~o?<2uIn(t&c9}TQs$+6OXvTxX}sderf<j!}$etBPMiCHIi
vRN1Y)oAZxOf3$yf{w<quNV;=c==+D?aN0Cy%SVDDpu)q`)z4*}Q$iB}iY@fB

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e0f0a15cc8da56d5b56c4a36547dddc312e57d0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1075
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp#hxyXAsLNtXPoyI4HP+U|5#hgoNeu-I*(bbULQ{Qa;u6j4ZP%(@zDOl
zeSvFQEB7xj%bd-0&~;Djr0!{=A|ZQtc)IEYTyr-Cv0u#Zw(MV)xxo7KvrPVX?0Sc7
zpU*2k|NUIS`_u!EKUUbt^*`UQd_qb=^Yn+@1FjDwJ}}H+aJv3L;Y7?l>q(ooc>X=v
ztMidp)mbriQkbgk<SpKpf?t=L&7PoH&As@V{MLUd#+*0xHK&A3y^^#|>~;IId@jZ7
zxnGY9eKXt~pUtNDcG5IeT@NkQ8r9AE-nU|xOweV`&}Ni%5Wm1Xhj|-wc*E8sH%uRB
z6$sDRxQ$^C)4gRq`7+y9Jy#7?*}Em*&QtYi?veXms;X*RYD7=Rp9%_}$NbUgq9Xf;
z-V9Umr1M%I?kHXrTrmBGZW%NC+O0F|l{lKb*OfjM{3LgS>kFg&reoF{*eiI}usLqH
zZn{GCxJ!Iz*ji=xHQch({(Cona`%wh^#14WC3VN&-q`vz`d+}LfW@r}FW2~fbH3!@
zsKlldpYc<Am9pK(4&PtFmp)p#@<h!GxHNNC?cx@Nms^%hwK{smWsQfG==a<u0xG<>
zz4o2ceA0WAU%ggZm&J2)SH@Y5MOPoaTlRDFg!JFOj~PBlMx2t^&Qi1K$1V-06MWiF
zT+jWeTyXi*lVu!=?VWmkm8~JV{{n1XMHH7DpLbOxo}owJZ;6EBU$2nphIu0Mja_3N
zXS1GBf1}>9?u~o$HuVFn33_R(kA4*k=(g6}?fuqk-{oJmlb)T~rk8o^Tzls0(|>Bs
z_MOcsH>>`=H@CINdse5Ywf4$6648CRS6`de-TAfMEZQUT(xST00T(m>uD|>zP$$jM
zwPe|@u3wjL@XcYl$M~Ibx)xJ{zzz00%y$1w7fh^|vX$#U4oWuX{xI2zuDCO?<uEv}
Nd%F6$taD0e0sv4+w}Jow

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_start.png
deleted file mode 100644
index 14a44bc852297701c44d9818d85851adb4edaa51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1321
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUnVv3=AsLNtuSa)W4HY^5vA_4Shv{RVR38Z!)})fzK3%6~I0<rAb$0RW
zlJHpS5*Q-pv@gW%qIZepE7wbUWg8a+XrJ;HEK$@{nW$m3yCFHs&$6%g+lFt6eusDd
zJ8yaA@PF>vo6rAyfBM(o@3*qo+XMXv2LG+qLaHiGukYS;?sj+GobKR@&1Eu2^ndWh
zCm4UbX8h6N{bkkL>S<fIu(&@~yVEiAk?Pxn=OvEhl`P~BU-pmvqvE{dQh(-_eoW)A
z6xyE5*(aP|X?XAO_S9or9_pMqT(icncKV~KI&Lx(Qv(Fk9~axSeV<(Tx5BMb(4b2<
zqOZ7M=8c`xH~Q^Ji#6G$oUgW6@8EIOdEYq-_gZl6J|g)uYDZ`z?<3ZjcJ+^`Qsxn>
z6??gM%Gf_Tzi6ABj)&XX0ILN&iNbM0d8U(Y#UF9sVfuCDOt;wV*@l9`h5Y-(*O_%#
z7aA^m7%@lZ&I>`GgWNazR(C(U)5vZR)3128D=Idkn|q_sX_pS!^KywV*lc<}x30Jv
z(JEb_(aqTV&ZF_&7i)b<<2aZ08xyw`zMY@Mmv^}G#hEOJ%`I;P^uFW;M%#yVWSHo@
zn<$ub^s$BRSL>eiLaVy-Sq{efN0`);7{VW@@6la!CEtQkJYk`Qz5heI(s}JcTbxc5
zoe?^=?!$Y7=mp&6kL!GnhW6^+;!-SM5~SJwi<$pX>BLngKH4o;CbQICUE><9xJ2l!
zg<H%l*+<*ndwuoWXf3P6<>&Ra^wFm^9?DLA$6X&ydhNqjy1c6JrRFOCQyb3hRoYmy
zHE6kxliFj>82x)6D%v*cPd&tHVX`jQqvg@wmH+DmtN53sJFm2JjM<_ceEU`!XXf!L
zL8t2-F`3m98-JU8@C|IU{K2yRVNgxjs^Gm&VqAjW9|M?=T|MkK(J)7BVQtw;zpY%E
zhZpbA{ySg$)2jVh61(Gfoaa~Cf9g=!p4RNsr7J>D6f2q5ySvQVCv{9@QIKKqWtrVB
zMLVMJ{9CGbHb_SA`vNgV@0O0xN7Xf3j=6Tv>@nY<F*V7}<<pM9Ij#9eDzz{48Xw($
zep(TCh_F%kj>GIbBFzL{TxRvYv~aGuExhx3$;5<ntBj6otke9yVb+9HrJJ+!-)OHB
z+_p5RE7(P0X4)B5{?6$eBIaD~eX6!jEv4<oE7nqp+Zyaangu~x%v0Gyg*OGuyour~
y*S@J@^mJ2*@Fn#>KlZ1Dq_C$dhxx%k_D}ZupyRH;g-(fqN;pqfKbLh*2~7Z!1|&ZK

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-mdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 86ce00442ccc8d91855e740db8ae07744d6e3d30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1295
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUdQTU}kc`H+H!?fILM7Ng+@BJW`D<aQcgHq;Q~6tmoi=essWh4KdNr9W
zzvIPqNK8>VN{8!I!m^j%k{4%l&)5=S<t8nf80Z_;;@c?Yq?(bn^UFg^{bHG4pYBz+
z|0?+Zq3C_(Im`Ez|DN02-g#w3;9|F4DbuV!?=M_?)pAbPIC^f8<hvuHYkgixeU9<&
zmbr52#Wh17@y9VelCN4<9n<hRdR3x-qUS!&`w6`B{NGPqcuF|)Fwd7{!*d6?YPxD)
z9Md~<^m>Kp<5f|6w3OPDBzJw#R^twy)usA_c{``DHLv~ytC~jc)d35*lyWN~X9Rs#
zi93An%6{(Kn?Fh$$jWA($(j=!)~VHTr#E{8$L5XJud@&Tv|u{UH|x8c-XTAef(l91
zQ$mvMtUn|^8~-dgbFh4d+LSvQbN)=pxx;qmNN18W*J7QCJDpDM=9zKHBT=uPBR&5?
z{+Yu!Bl<gU)|-6bOnbOtQP&j3OKs90Ct6HYlXKq9vG;qzT#mi57W~>9Mch-1#g>12
z>N-`^`ALXO`_q|kJnm?f{a>vT-K>7;_q;3nrMIVi4(k%$yJUq?YDdYE^m?_~ihfy<
zYQN>qr@gh`7$zV&FXi?|*6C@RrUj^Mp5MY>SdwLa>9fAfq<iHZHAT}5R;$Gw{Ayvb
z^)tuyBVjh3t!p(xTRip~^v^b6wXF!h@xx}0j?%^RO+J0?AEt3!e!IhY#%&H89kZme
zU;C#8w48`rb11**1UsAGQvSV4Tx<O|U9@og;S>MstkAxzb6<X3VX$*L*Nc!-?)yZR
z8EQ^md-!+7v4*w&f;0Db&URgSY3@n2jtzUaf!zM)!0jEU8W(O6Ud|o#*ih_vcW|VJ
z&qnu@Z)(dr4;8rvrk+wevfNc@xBlc>?N3MRCML^?sGjma)Gl}Y?ad!$cN)w;BnP^l
z5_&1R+v0em<pcJ>t7RS4$L$=G)+p>%@0D&85B|@bDzb7>#+xH)5BCVOfBni8e?!Ah
ze|?jCx37ip_wGsi3|1*@3cYi>{E@7nn>%k*a>1n8E$3aCVpPto6<M|G)wfQMEiB)=
zKHNGm`%zsH&pMIa_K`o1noaDlS{1P1l=W}@LtEB~{xgWxxOL?9%b(Wsgw!|gTy=Ey
zzaJaoL$-OlI$AoW{N#3t+%Gl%=l4rXMA{x{dkN1z!rqp+NGr~uC7V}sqFPwz>;zEq
fhvtL-y8jqse0IH--h6i&s2uZj^>bP0l+XkK{0u4c

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_exercise.png b/app/src/main/res/drawable-mdpi/icon_cp_exercise.png
deleted file mode 100644
index 1c92c0ebb54905553278ab32a3b392757b9775c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1464
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@4Nn)xkc`H+*K5~IPnKZ+aDL^pkUj~`o-2D=d=y<2^@Gp6_VQRPt`aS|
zv2yMWqf7D`OBZePc&dAOcIU*2)AyV?E#JB<U{S<u(M+qKk9W<lJoo<3IZMB}pW7?<
z-QIjZ|NP%O*K2Fn|K7LmeQEFlhejq=E)k7@1qc4Kir$<*F}p5H@Au+D*=>*fbbgC}
z<~uGir|a4e8UIIbFYzxgwPe_m!Il5|KwO1j|3YQI157eE5A0$55j5dH>*|Z)EDr*A
zK6rjH#-;C2`wkxd#{ys6ylvXeO3zsH6@TF4JNomaTl$^$*_VU4&pJK{a$Ll$cS!a|
zUw@%=RmX{GhxbOz&&fHp_dhrP14+jfVG6S*d3g66uc_&s7ty2T<6`b})ag#c!PJ~N
z?U6tB_L-(7$j=G0x)9>>?Xc3F){`%qw?68qZQ0nAV9j&%`;2MFjJJ3`w!gCZT=~oG
z&MzH;1zsx7dE30&W$LeBmA70qT8ruh(vpqWxhy>~ecQ=%@|kZss;<47RadVgdm~n<
zc|**UYm*K5*M8`*IKTZt)|sOmF&%{!^5xx6>TJ^UIomoP2X}R)<Ok2XpW<Sro-Y1a
zWQ|btJ`+J3=Q%HV^dCmwnY?fIjAwlZCVV+t@uoNYqN@4!-V^KV7AfT9dnws&WX}^l
zdDB~Fv8+X4$V#5yT)dh3Wf{t4kD?~(2N#-zJt_*6*e5tKzNyqH{GIsDQ10E%PndIr
zcN@iWT)X^2zeUH{ZPjE2dwuh7t53}L+N1C(b>fNEk3W3h9D9?J9us@+4d2AlMfbuV
zC&cKiy4H8c{QBcq!JBbPr<O+O^+lTpeoSb-&|PQY-SHs(tL5b^anF<rUE8G@y_%2S
z^dDWq_QprR(lq4Fn>EL*F3Fs_7wNKd|BH!IN(b$KZgON<ko|Z5^<(RVGUv_<`Xc&s
zgYT2W)x8@cHMcCuopoEoWZDS_#iHoTi{d+W-FMm|>-}+$#r36&t~!}C@^{5$TYU3L
z-rKsOOyuPMoV+;eJALLKL!&-(2HKnwTDe+T_16l?MNYcjeQ`=tDwbIYO)gN*3)+27
zUTxApQNg##u9C5{JNCEgKKf^9ZoYo^h2@+{%crRsIlHWsn^8N%|6AzE2L^>{#vvV6
z_6+H(SFYlAEpby*PoKu=^!>?!^A>J*^gHab_g(1ibqX<m{%o$^mgQ37923u6h$~?U
zJ~DUtvA&*TrkM+3tHNh`@Q6L#y2bQHXW*l6*P`F1y-V5CXnJzv)twtdErOqfu-ml!
zb$zf-z$v1)*xN(E%2eWby8b8YO%5yG^=x^-C3sfW!kr_*G9_izht3S!YwE|{AAWsu
zW13O1dFLkU*e5p%0yS2(JmU%4U$^G`zbU&n%WIS^3pO%xS1EU1A>f|VqcLCmsOfi2
z)Bdd37n&>^wATLKWMmtvxyia3mQ_J{_FwT2>7VaD?Y#P+<QJ&G^>p=fS?83{1OQF|
Be}Di0

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_note.png b/app/src/main/res/drawable-mdpi/icon_cp_note.png
deleted file mode 100644
index 7c8663a4fe54351e0991f0a52338bd929026ab63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUZci7-kc`H+H-2`Dr^>K@xc<&d{H9QA*(}GzWsZR&8-re7)D?Af5ue-P
z*%sz@(OzJRt6*S)o70SdOOBCmXGw8or@D$<Y@D`9O?KMM@U6M_d(sP|jpn}pzT5lA
zp2UhYxwL0L_sswPeAYszRxVMkkQE>PI|k33T`fL+*WddETI&u9>D<2T>l^;%-DmFE
zueYx>S$8Dsj3fKIj3eIdvrb%%=;)o%m}k><^XtBfh`st6joBY{_8nZ36w_-uquahU
z#8*Pgb)C3S_C-CFSq8G!8=3n%yi5}{I_@;2f0#PqMuV75@9F|MzvE^$eVJQzjBdE(
z9jmF)Q!(qZ)<5ucM$^<EeD>X5{*R7r;^tMG7;VTuKS{|f(OySLRPCXyOy9XjGiToD
zS#GfIOj5Jxo69Nb_J@A{U}S&bI;XApqokV$SDx;(YhADRwyfO5`Mc$yf|0EM1Lm7Q
z=NAaX9g{Hp;Vsj+)FR-{yVs9u+EO-5O%=;EnJ6i=A$A8xw1Ld}hY^Y!`P?}>rzPbz
zPpD;`TqqwlHFC#9L!)4iHHTWA7K!FR%DDNp)G4F#qtEUM782{ZJAZ$4xOr51=?NX1
z9??g)Zx=}1)9SHtU-hG~B0B4MiYLR`MG><#0%x)G20roAOq;vI#iK`{`S+jw(#N}n
z_KOwIE?B`*J^M?X>BI$fO6A_wAKCPdmdR+cnRg$&|A-|pd-IaJ?^WOG9hKZ9$$vH3
z!`3D3vE!bu(???69?pGKvq)r@p;OLekpuFs8&fZxJ1^w=+G(weTDQ;=w?As@Haj)d
zcp2J<d92xPE&5&4jBoqnjZ(Qkq_cRxSzhwfIpn+P@Ny6COVc+V>waC+*u62-C`{e&
zNN&(U>87X-6Yqku)8CJVWx7`#3Ed`=%x<^Qy1RE8i$Rpu|2?~O{<AMWm9%EbmGX<x
z5~lH8w{3SgO!;x)oz6A!H;W6p*(NVAbG_BIaka$n6I&kKd-P(0&Ng9n&W#f<@#?QQ
ze9v}~nCm&cW9#aQZ8u%!?tb0hdZdE$&BRZ!Mj9$BVkg>v_}B1L?x&DU+isNw>K;$`
z@twb(_v~I^*u>-`2i_+AaQNbJers?{_70U6M^(p4*IV5m1@<UpR@Bew+}!msrE_}h
zr}tTf$~<?aPYKPu@V+Li@XPV{pVCuU=LJ7HydrLj>ZZB_U-dYDJ-sxmr1LhfB~Vp&
r{E^aYBFFpOq(fnuBH-cv*8L1IeHVCUemZvuRHk{l`njxgN@xNA*JdlK

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_battery.png
deleted file mode 100644
index f4dab169a8771dccfbc3ae1a0b1460c9c6542080..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH85l<J#kc`H+*Zn(s10{}s<bQX9*VQ@AByxk`Bv#YN1t+}(y{2WEEt;|@
z<?;EvX;QAjlZ>QzH*OZvR_shmeC&V7q_rn<LEEuMduGkP^L^g$^mWV5m4Dt-TK9a;
z^YVM2?Vj&Z5$beNn&<(fGLQ8X@&0z_`&aqqfZv&1Hz&!%I~w2Dn}69l_jh``Q!C^4
z$5vfm)54gSZ(x0&bfnU)YsZ|U&ntR5e-(8vV!gdVX73Hr%bMp;SZzt-nfoI!z3J+O
z*4;OxZYQSs-Cm>9m$i=b$Bd(u8)ZNB_-HRXbRum{|D0;(XD%7xi>13iv1N;}&Jp|e
zO?S)Gi(4P92;jBvyuIyvA!qt2PN~!s$#)N1KIE1@P)nPhVO7Zbexum$4{Awo<R<4Q
zIa&rTEmmo}yQ8D^(5r16X=aaX<Q_HzupTdDNnb7TKcZ*FJo6wCA=v}YiLKL9K87!Q
z={7$h$wg!J)fpYju9<K0ig=oyas2tDZFL7vgicod!}yIOygw_laeC3Z;4674675B|
z*jbGK?r1oCXxpmR>k>!!?r5s7x_Tm`B~8Hp<EmqpUN@sX4X&~$Df{dZD9oJ8r~cbZ
zXPwF^W20$DmquLf=vlQuyZe4Yw9CX3zunqCxa`Q|dFZ|OrfblFKW}!5A5XTPn(Xw$
zcu$+}p~mYvbzE29rR21Gg}!bs;LH)<7GW%LJh~?LQVlGQTps=ZAf2WY)>RRjs|3ni
Mp00i_>zopr0H|GjJOBUy

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_canula.png
deleted file mode 100644
index ee512c5fef5d4814b63244e967463f28aae26810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1090
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpO`a}}AsLNtuX|^RhRYoP*uUOswM%AZFZbG{gJE9sP11@Ab{j&Qt*^&k
ziQ2ScsdVAPWv!Q-uCo?CT(w)_2Zx$e$RZbUyUq@gKyT-btzujo1G{e>txsBKIP;9p
zyS<tf`wZ^Pw0v&=`S;zQ^NatryC_ZcP!a0<FKg`PS9Wio^<1m0nXQ&P;+K5hm%26~
zjhR(6RV^%;-|w+pTY-ePTF1<O)~)7g=6>;d-5WUN6J_J%m-|~!du%(=GJAt!cVw&k
z4;l81eG?^rFz$BY@;&A?=g{vA$;)Qk@w3&G=Ra6I$uQS4SHFLbNp(-o+Q*yOKHfax
zx_Q6H#FAMZiE|wJ{Sp>z+j!CKS>jrW8`2-jPX1tAeCYQRpOd{tn|R~9W<FagR9L@A
zdhgBrhevabl({#^zVF!iH~h=vD8DmFC1Mq3Hb){A|HSXnR%^NRWN%Ju#Db{fnY&vT
zKiV9BNWP*cb>@UU&+iGWyrg?6Rb#h3|MjCRUv@0`xBSW857ir+wmq)6R^EEzd;i5o
z{Z0G&ZLBBAOZl$cUvMd7-G8HlzuP_-+Z{PN$*!n(%R=uzpOqi!r5`Up^dxFy#NLTp
z|EmSP*Shw&JVwB+yMSl*)te`TCvF%1XwH{<yh27#+fCwTfBq@9XSyBbM-=kauDi;9
z%er~MM!8lg_ud+fRa$qGWTq*dKjFXV#P2Pu7In#lrz?vW%2|K#at#c9A-c47rB%VE
zbN7=LMl79uR3PtBvytOuNlPWJt#^;TIU(gEzHJJp#;2cU-M+r=qOPJZ1B>Q}7#8_m
zakgHivFe2B`S%>fnpO*bZ4@c?=9<MdH`Pkqbd%8kj<dd-Eh3f`&zmTgBeL{Z*q;?n
zp;oM)wsD;gjL!c0VC|bdtm`{jKQ?LzeZS@$yLg3Zk*i48;UqnIk*Rs>HI52*LQ;;t
a#(&0(YBg_)^~7d^vc9LQpUXO@geCyI>AyAr

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-mdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index 70a90c596f527fb62bd63ca439547cae933df4a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1305
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUPEQxdkc`H+*E2gpQ)P~SJnuU<=itU!3s@H!W#?=*TGXqdl(E1(a>`Zi
zXpN|hg>4zlrvevmP||+w8z$iCWG?9R+Vz)G(25mX3_`k=oj78aa>y*L>SO(~>e;*3
ze|c2%u;88L`Qmw>|KEMSU)Bf;{*^z`;_Z2=%~yJ;t+IlnJ%M*xf^eGwyZ?i|_3|^U
z!#16Gq9+m6Yy5%d+>!H#eylF!wL7Yrc~9oc<K<r5Z?6U#YZq(89b%i)rf$eA{y=3<
z*W>PI-#cShdTeif)6Bk6^!nr2#2*TEzQy|vY_;H8FKSyYdv5KP0`u0GM*WQfhb26Y
zU*r0`|9J0>Y3qtB99d`YR(uk&=CJgPHfuxaZ1pp*4^|4l``cG@@oT5WhCAL?nkhDX
zc0zg^d5kxT)K8yTFL2MNxa+0w^Zbnx_S32()my$isB5)|&@X$ijmvFM-{FnS-5>t6
ze0=$`rl({5rY+GYmMTSvKW0C3v^9yHt?Sv>#H?R`=bniAAj2p2(d1mo!=(DK>cZVE
zb95dl%;%9j!uj%^P|h)~zz+`uZRXYKABf!H!Lcut<F@?ou3sBhPh(um^-_4<hm9Op
zp3Z1pUf6uX;yXwA>(C$1+g%>c?iHNKFfFNTg>LpnA^ArhdoF1zPM+L&`-uGyJ3s$p
z^6E@AkwQ^tLKnSwd*tw;sYMa3Z+Ao=Idt)mDF5NuB=%?_BhkrfcXmt6=bV1C_w?k#
z-L2Vcg*CU!SZ-_%{;=rA%Ac7z9#>}QTG;oV7tuYFq3!hSvG~MHJwd(AYO?MfYU}0S
zt1z2&C#*lJvvKy~9g_VI?e^%FRn?T|2P$5jwm9nh@2MHW5BN74PySFOv@v*#5Vz~u
zjF$T@`lil1u9`fI`u=F`EI0ETfAhixHf?{=%C;e}WcAOIytcnC<<$)w-yCgLyLGK~
zGrcbL<v!OP?M-L6Y8F%q9(}EQe52BAQ{ARlPG+4ZR(^gg4{SnXHu+uCPT47|yRP+C
zWOn0=klRNM^n@edO*UH>9ejc#FaL10o5-e^eaG%BTd`bWou9jLkJgccN^dfY=FYkj
zee=D5=4L^&M>4rR%~@BppGXH*zD|tz5}3|y7`t#{+-uF6xYU~d7oERcyY$vZ$u1F8
ztbeGswD$ZAgFW*7uM%WJ7GHc<-h4@ahwh=Nw`MMrUN+P0A7f2y$=%Cp(NT*e6_s}c
k)m(ZfbYDOc2A2L|u4mu%a%-cB1gJ#wboFyt=akR{0B$`g!~g&Q

diff --git a/app/src/main/res/drawable-mdpi/icon_cp_question.png b/app/src/main/res/drawable-mdpi/icon_cp_question.png
deleted file mode 100644
index 5d430d91640854e6249ff03e6ee73687f4d13f42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 913
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8Mo$;Vkc`H+*Zn(s10{}sJU?|~fY)XPpOf=Vj_Rmrn;ywZ@#-?+=H|Ys
znflZ}C&e@KjMrJG$@Uu)m4n365_MF}atxNZ1f4R7=`PMXvm-0*UhzBKbLF4sM8B`B
zJOAGH`JK;uM7Ua=76$w%UlHmXu>YQctMs-6<!KB1{43giOUw;9vaaf?(V4Y#5{*n{
z4j7jFc{+3cj@H8!6TK{!PW-u}ZQhUHym^neZcy^x$g6#^d#&L;Z^e11Jb1%dh2slZ
zm?iQ*-0_P!kaVy@{a(0kg5On^iFP^1`5)@e|Gu2_(5X8DVQD;XEv77L5OK@05IoMj
z!?@SdztFO;TKLL@BPWX12;Td)Q}T>--$r9cUe9wUH2NM%&pV%R@43WnA&>$Kzw=4=
z7D?Evtx&v~IG=ZRvW(}%HKA_1HYoS$FY~y;rTlh>O3v%Vhk7f0HutU(t6HnK=aAgO
z)RjKQy<Z+EUVCJ?%QsVQ^#vVe_CjIqLe|+IjFvhW_q=hdzhc$7_s66tl~QT@sg;Lv
z;}1*DIi)(K+I81Pmm6-!i@BbfZBjbME>(W`<cZuAonzZ)mTsCqQE|`V#b>N;_ST5o
zm2bX$YMG(t(Gw;&+c!tdk5qpx`SNgr%zN>FUG`6ePVZEbu9Mb3u&O62vX^J(4)=K+
vviW93d20pN2;cg)Tg^ul93>im^#3p&*%a(_WKrZMP)_o6^>bP0l+XkKMX6`d

diff --git a/app/src/main/res/drawable-mdpi/icon_local_activate.png b/app/src/main/res/drawable-mdpi/icon_local_activate.png
deleted file mode 100644
index b39c72b40776a28bcec7cfb5604bcac60b4b5da2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmV-%1CIQOP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uz0BS}O-RA_<iT1#@;KoEUNWuNS{WNrXCft?eWoWNu^yO0wYpCHOk
zyWkt(69i6Raf4y0T{r=$j$3ipL_*!NsK`XGN>$W=H2wPDBVHX22b>FDpAD0NOph^;
z=_>{@eZ`wo$mK)f08IFj2y|sGS)XFx&WffF1qnU_Fa<DD+;R_KnYm=ui2z-YVJj>F
zT(o?|4#2z%QqLmeL$LsGQ}NXvKn@^wr_%MREVm)6W-j^JR-RU5d??<rHLfZIN}IGS
zT#~N0;ww_ZW#*FHEL0mZOoTK(7Ry_96;oi>D5W)_HmNy{h}^L@%^8YZDsu@Xj89Ag
zY^gO9HNj*VABs7EuaZdSl9_eWnrBbg;-%YdGM8Lho}so3XRU=;sw6@}`B0dIz@wFN
zj-e74tUNU=Znh9w`<+fJh!Eii06%;va@Mwm5G9Upa!-r9smSmHuf@{5CWSijnd0if
zhaxrlKPgSd&s2M()-uxkTVsLyOf^UAdaR^WEU8^hOGauZJ@Pw=t;kR#cD<F-N^*}e
zyKf`3WMr$NO~EU!_V;3q>PhgSIGO?3IvcU1vT7rlD2R8NOM>RXEL7k+@-eC--+d_7
z4H}n9>&!CJE!0FLIL2I*sV+E{7B#oY4nUO^tsOwCo(WIYo`U%Ur*^QFZfXe0Y^lnI
z|6<b2Ii4g`Zqx+pq-iRGF?=Yd+*ry^c~g^qr8QJzft5@v4b}{Bln`b|YL---%Do%i
zEb4|w)^3*jt2`n?owjQzzA_!F5|7q08zD^TDovn<GmplF9b4mQtzw0lYnwI!NDXS+
zi>rvpEfG}CJ#vq&wzg@>NK1@4khP$;=6&Xpg=W5It4K21_DM&Eg}9R&)WnVymIC}s
z=8}nV1eT-5z9Nm+!aC2$#_=zWvCy|noJgp(il@{~UG|?nEvGgA=h%!#&8LyOUHech
z+Z;Yfa2G9!>@7oCiL*Ltdd?wW8jaF;afg7BP}bvF$CbT5$FmY09h_6v(sUI^(d8=*
z$HmU_N@LXpi4rIIQ^SjY+0+LNFKGLUflOa9km)PVhYWyU{6KY-rJ5bI00000NkvXX
Hu0mjfCsK~e

diff --git a/app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png b/app/src/main/res/drawable-mdpi/icon_local_activatemdpi.png
deleted file mode 100644
index b39c72b40776a28bcec7cfb5604bcac60b4b5da2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmV-%1CIQOP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uz0BS}O-RA_<iT1#@;KoEUNWuNS{WNrXCft?eWoWNu^yO0wYpCHOk
zyWkt(69i6Raf4y0T{r=$j$3ipL_*!NsK`XGN>$W=H2wPDBVHX22b>FDpAD0NOph^;
z=_>{@eZ`wo$mK)f08IFj2y|sGS)XFx&WffF1qnU_Fa<DD+;R_KnYm=ui2z-YVJj>F
zT(o?|4#2z%QqLmeL$LsGQ}NXvKn@^wr_%MREVm)6W-j^JR-RU5d??<rHLfZIN}IGS
zT#~N0;ww_ZW#*FHEL0mZOoTK(7Ry_96;oi>D5W)_HmNy{h}^L@%^8YZDsu@Xj89Ag
zY^gO9HNj*VABs7EuaZdSl9_eWnrBbg;-%YdGM8Lho}so3XRU=;sw6@}`B0dIz@wFN
zj-e74tUNU=Znh9w`<+fJh!Eii06%;va@Mwm5G9Upa!-r9smSmHuf@{5CWSijnd0if
zhaxrlKPgSd&s2M()-uxkTVsLyOf^UAdaR^WEU8^hOGauZJ@Pw=t;kR#cD<F-N^*}e
zyKf`3WMr$NO~EU!_V;3q>PhgSIGO?3IvcU1vT7rlD2R8NOM>RXEL7k+@-eC--+d_7
z4H}n9>&!CJE!0FLIL2I*sV+E{7B#oY4nUO^tsOwCo(WIYo`U%Ur*^QFZfXe0Y^lnI
z|6<b2Ii4g`Zqx+pq-iRGF?=Yd+*ry^c~g^qr8QJzft5@v4b}{Bln`b|YL---%Do%i
zEb4|w)^3*jt2`n?owjQzzA_!F5|7q08zD^TDovn<GmplF9b4mQtzw0lYnwI!NDXS+
zi>rvpEfG}CJ#vq&wzg@>NK1@4khP$;=6&Xpg=W5It4K21_DM&Eg}9R&)WnVymIC}s
z=8}nV1eT-5z9Nm+!aC2$#_=zWvCy|noJgp(il@{~UG|?nEvGgA=h%!#&8LyOUHech
z+Z;Yfa2G9!>@7oCiL*Ltdd?wW8jaF;afg7BP}bvF$CbT5$FmY09h_6v(sUI^(d8=*
z$HmU_N@LXpi4rIIQ^SjY+0+LNFKGLUflOa9km)PVhYWyU{6KY-rJ5bI00000NkvXX
Hu0mjfCsK~e

diff --git a/app/src/main/res/drawable-mdpi/icon_local_reset.png b/app/src/main/res/drawable-mdpi/icon_local_reset.png
deleted file mode 100644
index ad2e0eaf6d9f16886f3d30f1a9d6656874d6a1f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uy~W=TXrRA_<in9XhDFc5{`2D!&4UXu=DRgk2D^-;Gt6~rBE(t)>w
z<i^{&gUA&y?jX79<W%6r0K>&Vphb$Ju#CY62(Ts2NFQf7{P}S>9B?W+I~kG!ld%d+
zt|~COs=(x`lY%*)(s^6eR{$0OZUM{y%mG{g*a6rB_yEuV*eIj-W8XK)+N`Z=`uHaR
zHv`OG$wnDXfKf^c(^fV0{-y`QMugg3A8GTOp$11P8BAN%b55BHar+a%n(iy3-;dZV
z`I2@7y%-v$Brpz;F90iL^h=;UMQR1$m$*$nZe5*lOrv2OAY1O$!D+(2C`~W<){cRK
ze2ps2VvJajS7mhY%e&$z5YUbv(YOkVE)vW$lp3-ZS0nv_J7URcM*7Ls(W__}o<n4g
zN2Qia9HA%iXgw(m_ny`BnEAmaW%QcIAL*LMQ?F9N1n2cYNxw^<X%q~nm>nzI)KRhG
z(r(Aj!q+}FGFRev6X_#V*8ioieJqU3->G5#O`5){77H_rw3}3AbC#>V1B@J>y;ZY!
zr^zLlu8+|2D+cL%q7{Ml_vQNrUu0;adZP~unStA?e&P0SogR%+Th$A(i1k)YAB^o;
za@cUB`atd-wqqn0uHIFKcR$nl$Q_4WZlvxwf)eB*bYs@@UW&>e{`;wnKH8C1-U6VE
zUh-iBcz@A!=9%>bAhS*+g0>bx)yx6(C?3m$iP0dex!k!bqc<T&!KJwa<WedS(w>+9
z+mHpO)!;J#$3RD7kZ28_G#wGj0t91DXE;JlE+Cldc=ms(EHraffyq?`CRY`hTvcGQ
a6o9{!hU6)1qygao0000<MNUMnLSTZt`#wql

diff --git a/app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png b/app/src/main/res/drawable-mdpi/icon_local_resetmdpi.png
deleted file mode 100644
index ad2e0eaf6d9f16886f3d30f1a9d6656874d6a1f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 692
zcmV;l0!#ggP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uy~W=TXrRA_<in9XhDFc5{`2D!&4UXu=DRgk2D^-;Gt6~rBE(t)>w
z<i^{&gUA&y?jX79<W%6r0K>&Vphb$Ju#CY62(Ts2NFQf7{P}S>9B?W+I~kG!ld%d+
zt|~COs=(x`lY%*)(s^6eR{$0OZUM{y%mG{g*a6rB_yEuV*eIj-W8XK)+N`Z=`uHaR
zHv`OG$wnDXfKf^c(^fV0{-y`QMugg3A8GTOp$11P8BAN%b55BHar+a%n(iy3-;dZV
z`I2@7y%-v$Brpz;F90iL^h=;UMQR1$m$*$nZe5*lOrv2OAY1O$!D+(2C`~W<){cRK
ze2ps2VvJajS7mhY%e&$z5YUbv(YOkVE)vW$lp3-ZS0nv_J7URcM*7Ls(W__}o<n4g
zN2Qia9HA%iXgw(m_ny`BnEAmaW%QcIAL*LMQ?F9N1n2cYNxw^<X%q~nm>nzI)KRhG
z(r(Aj!q+}FGFRev6X_#V*8ioieJqU3->G5#O`5){77H_rw3}3AbC#>V1B@J>y;ZY!
zr^zLlu8+|2D+cL%q7{Ml_vQNrUu0;adZP~unStA?e&P0SogR%+Th$A(i1k)YAB^o;
za@cUB`atd-wqqn0uHIFKcR$nl$Q_4WZlvxwf)eB*bYs@@UW&>e{`;wnKH8C1-U6VE
zUh-iBcz@A!=9%>bAhS*+g0>bx)yx6(C?3m$iP0dex!k!bqc<T&!KJwa<WedS(w>+9
z+mHpO)!;J#$3RD7kZ28_G#wGj0t91DXE;JlE+Cldc=ms(EHraffyq?`CRY`hTvcGQ
a6o9{!hU6)1qygao0000<MNUMnLSTZt`#wql

diff --git a/app/src/main/res/drawable-mdpi/icon_local_savemdpi.png b/app/src/main/res/drawable-mdpi/icon_local_savemdpi.png
deleted file mode 100644
index 843beed5233a0122fd5e7484da1a876eb3e4632a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uy~9Z5t%RA_<in!!;5F%*V>9q)MCqjUgPAXcDOAjiz)09GJWAeWuV
z5j%hmumk7-kGVkwI6ISICMIk)o4A>s{cc18`;njbvcap<>4dg$-5QflCSf|6ROw_=
zrByOF30%V;2&W4G6978^BbMa{mwCyp4B>PtL<$A~rml07k|CV-0nD`Fz3Y6hm=R7#
zKJyG5Se9><;U$2c@_5IxeChgPm1GE~GqLPFho`&n0$_{Zcs*!y##LU-Sw{I%hGNaK
zd<A>F=Gv--ks+Mk8brRU<k^7wshi@Z%a!7~GDGe08_V)V4Usb;;wAB_W&uTpA>t)z
zx-<ugm!vTnQ5gr?uvfe!jmU_2y=%kgcoo%6RJckswK94m)Z<nBy|PS@ji%^9V{s9)
zOB=(ocv-5O6SY@HY;7jui##!W>gsb#;|1Wu_gX^4OfREPgj1W4OT4_PEh8fJsSUsC
zLXOqTD_)Wy1%PGw_>xdryh0JInw1ExwDDTa(MHhHY!d=-r;XKWjy8h#8H<og@OVk0
zG|dY_Uoqk(iM9hU2pwa^OA>WEBZMA>RG(#eotwE*qMw_wEZ+dw#C{)i$Fm9JB_j?v
zf?~LTaXOM!@m-mv&&`t!vE5O32}hq^<os(h;dF24<gu9h^rI>(^ZZXD#mT?d>5sFF
zSoZs(i~GEhBkL+ZVd!-K)Q~EjOsaG;snW@$N_%7g`~cdCzk%b?snh@f002ovPDHLk
FV1fk79&G>s

diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility.png b/app/src/main/res/drawable-xhdpi/ic_visibility.png
deleted file mode 100644
index 1e16fb934fc2c99227d2bacedcc62a3948e5dc28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 847
zcmV-V1F-ywP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009PNkl<ZXhZFo
zONfqP6vu!6+$AL=Y|yNvNF-%J7Bd^lYBX+ThLp<!3!5nmWn+PbONklflCV)`!$Mgo
ziDXJv!UiEFF&R2K)ALQw%zWSXKHt1E##`T6y^C|sbN=W49#L>o!R@CGV7wz(k3c;F
zIXzHMp_~rPEj}s{FtbI#dSDf>1Xu_(0MmknKY`D{Ti_+|1b86nO<n{e24H4$fHq(o
zuoP;ZDF*Za*MKfbpGE?vW&mb3ALszuBM*<{?O4Vm)CnAy^u88l$pFl30&o~O3e2eG
zks5fv1IK`qlK!N~B>^zAM&LTIIz?&3(-*!c)hPEE*edCDmRu$PGiwHJ0JE}`0pEZt
zz#ZV3q%SUGX0w46z$Rb^Ff&2dSD;nWy=uHw0hpN=Xcv&>K`%(>J5n;b(xU;)iO>MD
z9Ow~jljMb7mMSVRvn|1!p8M74H?UXI#RRVou$b9y;5;xfL(XeqyClzoVN@1?nXLmn
zbdxibyXW`RYJ5p&0C6Fq1^)t?Bt0Bz&oBUHHV=3X%uVoUr=(pmpP4!6eIeI<s5$xY
z^4d5j$&HC4aVfOqtmi%g%O!n?8Os5<3v9^J77Dg8&UrI)(A~hw3i3}~w<I^FpF&M|
zw@E4NZb=&}0x+`{;AVpH&T>}LfyfZ|{G%$ymslOdnm7_>b_Up=_->1&+a=zC2$-37
znpc4L{1j@IbUy-c5IB`02pp1hI+AS)HJ2jp(ON92f5yZBd^PZVOr?e)>EoXDUY|lf
zBL>neq>(RssnjmX+x8#;FTzrmqNGpKpblkbzRyfe5e9lCl{VFW5i|4R&YCwR^*xf7
zjW&Q@V9Iy`D0~VPyNE*`7NL!9mUL@a8;x38aR*t5La|qg0AelRL#lYoT$D<!z*V4l
z>vRO7xIZ)zh~oZIMj(p&Qy+mS?pY<?Zwh<Z8oH!~)8bD5;m&zl^iFsApPd%VZJT9|
zy9>f`cY5Ie5stg>{+r`&;@UjsY*~k;F*hLZ19bp-J(yR%9)Y|b%qw4yKwb~#l`nh*
Z{sK;sc0e^r-If3V002ovPDHLkV1fe;bmjm6

diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 57864f6ed535daca260f08c36d2cffcd1b7620e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2150
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xhdpi/icon_actions_temptarget.png
deleted file mode 100644
index c484837e53aa10396205a30927dd9f07a6446b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2836
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 4239e40ba7ee13a53f448c2d2d4332c26ffaba6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2622
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_battery.png
deleted file mode 100644
index 3d75b9dc7a16b1a9cf017661bc71401ba122889c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1462
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVRtyX*YMw5RAr*7p-agqM;wr)L;r<1KQ%MrrHS`WT20Ah|N!dy$cXnQsFn=WE
zcdT2^=I4D0{Ug#z1?ER)%y@B7w@^_+wd*$<qiV;3LnYNK%r1W^@!$V4+-HB@zIdaV
zl~b$Yv+iAA|0?uqwiAb9ivUjIkb$(e^n!~STg2yfU$x-xK6PyU0=9og{C|jjU8LUE
z`*q(P?%#RWe7p<9ubrImLa~q|KOufy!_IdTmR86-pWbWU@~VP!cXg;vQM=BG3ko+L
zo$+CNDRr;CyNKoV#niP~|F*1p%>HMpV%^m%1(MUYPQBarHnsV=$BEM1<LVoIrM|db
zwU9eFRX26@?5F>yan4zMI_v$aGU>M|6ZC#X=caNS2AUQ0wdmwo+f7q^X7J)m{k&MS
zjCGE-DMFkpXLxuVb#c;Cdw%I;jl^N!OMjkyK2sR}NP{n}tCCM`c71)jva6revKF0*
zX-BR<V5vL4UNu?o7+a>^*S?yQJ6QTXKMMs_Z-4kaPMyztx@o8S(v%5d6XmB~yYQ=U
z<&-<i3vJ6Dt)7&dQ@Z(O%7k0h(G!JN*R|^$NV}8u%;`muP0w?KP=#wdwg}ZO{=(UI
z{==*<oaa{7=3QHx)25}K;uN)IPt7zd?Lzaoxl7Nr1__zXn76|>QQS`J{+ZyMX=**%
zzjy<#wyZg9+jX`k|3F>Mji9i@QksI{TdvwS$^O__qMbhLO>AmesP~B-TTX5*?0bH<
zli5N?HDmI*$EUvs8TC!ec$^u!v}MhNT`Rb6o$~i!ekb?RDgNriJ5t-cn$x$(F8Ka&
znPtvSJ||HjBQ@KpcM^Bm2LFhfm0gor<ypOc%bVKLc8kZdr%cY*x_V_i<+W1uF5JIm
zdcgE=%f5SfTHIUsZ^{<VF9Pdy1^x@nn|^G@&kx-Hjvc+UC-WTJ%n6|t4D}C6YZgY_
zw^Qw9j^0o<t*ZLtqLRjEr}Z+Im#jWlUg+QK;o+P0hGkx8f#<@rB5?<rF9}DkX1jN6
z_u2jI59c?f8uKVAmcGn8A()>2`TMW5n}t8q@BaPava34#>|?8Y+C`5PgeH9s{{3Iu
zqIBi`dwQjf&EI(E8UA(I;eW6&=R$K8U+Es5S}A|N9lC4zOzNMdM2Lx3XRdHFy5{9=
zS}Q%ZCFH1Xg;VF&H69*y++Tm5@K$+J^78lE|1zAJ?{{a*X7|p!DcA9<&Ro~siEq2?
z`ir%(nN!xh52}l3G=I4J<j2w$-yPf6R@mEJy|1(9Rn{fB({9V-_TOJ(dC@U;-jA*t
zSw(jzv4@(O-d}yTIrp0<K70LJQGJQ)9;M&67H4huS+Dx^Pv65OTbOpQseU{0@&R_P
zyqdG&)2~)lOnVu-_o>_W&et=xeE+!7a*uSFiXy(u>Gbt4``2ANJ~^>DyZ{xqp00i_
I>zopr0CaPHE&u=k

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 8629a7998d15dd8eab46c57fbfe77840c2672fcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1283
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVRtyZx#hxyXAr*7p-uBIw4V7U3aNjqpd+W-rVH>2ne%$Kfj`a{c*s8QB+VSqr
zi+j24+vFV<Uh#k66d)if-qa)=E3(C@cI8^bthG|6ftOYE&heH{TDH^py0y9a+5ha!
z>Srv|mwlgUS$xhoSP2hEI$b&|BrY;C^R<mzrqK3;`erljAEKM@7A4R1+dIGNy29N2
z<nIqOW9$=tNA79;>}<Wb)UCArPIvnhZQ*AhWc?m$Gsl(k${yV;^>4QMhK}oomzM<I
zwN4RXtQ0zKe$&32|Km@Ex!1RF>nGly@XNYi*jK9O^n}t7eF^aon$rq6%C()3pRHg^
z|FF#{jQ@6Sn>f#mV~l^yj@VuNC;Le$@96sq-p^BOg?I4xYcMv|e`K@^%$Imw^85bX
z<@aJwO|bNN|6sXY>9eVV2|8_SYAbd|*NMx=FTAHB7sj-?>iEA4xu1RK|C=AY?pk4)
zRDOxo+@n@g)uU`C9-jJX`|K;xLGu*XKZ;rU_HzXz|ASq;w`{ZiG&@RelV20P^KANw
zkfkx{YxXuw-Vy(E<MJu;HM=(bPfwM2@!-aVb6aZLe}`+{;yIDB^iTO&V1W6|<dY9x
zw?_GHZTpvbrnk=q-R;U{Tk`9`&9!v_4<-ps3AX6CJ#}@C{kNpZ{G)qi=d6p~c(y?&
z<W#i@x5w3^@3!4zkqe$@Sk3-scW&{I6Ej#+)&<!u@TqOjlzd;hJ+U$>QhKgT()`{n
zmZw+geaOrCXc0cujQLY~`QkOl7Ppx(J4HSS47(iYe4BBl-j`oX&7FQTT1H#?y_+O;
zi|<5_k#y4UHImyxZZk$+nVoz0!l#YvxN_NB;!f3`=jhw|wpU4EwSL<_$%7lW?Onz=
z^MI^Z-O9eqy$e@ew0<#nRpzTF7V}<A)7O&Mm~*)QhpQ*op{=LH<@(G2#~l#=|JtX#
zV;SSl6-y?mPu=}w!B+ivv8g)wrDr$xn6LFUJ0@zvdt!P8YkApr<!k5Wt&0q=XM6wn
zwWEK*a!HljyBB<4*EH$ZKF^ac)}34OFX)n*^wP7*!iPQfpV!v@wE3@=Tm9l0-`tov
zPt5RiIOfAtwA1_V>MiPwJMYX~Yg56r=~`FW{zLDz86#g;>(*Sncf{|He(vm<hvaih
jV!prr-hl<&*!YimHOtietkn<PL1mYxtDnm{r-UW|#W*FM

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 2e88ec9ad4e0cfbbe7e8c51faec8ddebb765c2df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2014
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index a3577da118eeff9a8d4a3756ae6010d3e2b4d98a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2480
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
A1poj5

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xhdpi/icon_cp_announcement.png
deleted file mode 100644
index 472b51d77508193bd4315c4f3427acbc9ca5add2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2543
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
QaI~j6*t*y>pAF3X4<*iVaR2}S

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 030099f9106f7881592f1f254dab6fb131604597..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2464
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 908f33ccd8aab2e150a8a331101810e7c644d963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 859
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVR={9A?djqeQZeW4osC|z6D8a~246nv*zPw~;l&l-mujt#SYJE}eer;`q@X}^
z%WRGytB?ZCy)Ar~v{y{F*xkY5_bTb2Q#*@@r=8F~^ON>xe>MvEetI(T@OM5%78TD)
zNa$Dp-WO%ZpZ&aQ@Lgh=+6UGddM57~Z!r3;lKWEnvDE)?oLEH0oHNY!4dt!R^_XrS
zD7@<!{Iy(C+j~ks;|I1I8ipB{)=gOcuJP_H<82MC-`=h}UT?2vc|!g{@ma~&Hf)+n
zm-^OJuyH0&Fu))t|GVbNY{3vGI?Fsf<J^HI?3qln7sn;du-SBINxb5DS*Giz^Y$~X
z5xbSDa7_1vTtU?1pYk01k0y#9Q%K|yB9mD5YI1k>f!~R`myW*ah~F=-ePB6X{eG5j
z)v`gNPn0*@c^=ekX8ej(YftX~k|LHnUyPQ#I^kt=PN-aK)hn)_Zm)OS1l?guH%<S;
zRCnpu{`%|pIQCusB{X~g+xyb8a>a~yL@RVr!gtb=L;o1R-&DN!?f?9DpgiH}>gTe~
HDWM4fL?J>`

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index 52ef734adfe8d6311d30a2856cb2677d53c95920..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1963
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 8d2e9690fcc63dc80887041ead60c7bae4156f77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1986
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
Zge-5|ab&B4DO+p3?gz=l+5^XUe*zX0ou2>z

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index af93321e3aee5fd2c50bec73cd78c54654da54f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2044
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e4c50f26676e3bffeca42e6f2336b5b373ca47cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2059
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index ce23d1cf54d7171ea5fa92dc296281e140067ec7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2556
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
V1@zt?-jh!o{HB#rh2gKE{{cFayk7tS

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index fbd58804905d314392195260290d9d37168e8672..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2653
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
Nbh2}|t+WYB{U814sPq5;

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xhdpi/icon_cp_exercise.png
deleted file mode 100644
index 90cc102c07e8c179fe2fe3a74d9ef293afc7721c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3154
zcmai%c{mi>8^_0tb+TQitTDzm3A0#d8e<H`AdG#<HjHI1#-6cMLnK?-A~6z4-O_??
zBv~p=D#PTabTLIJVk+6=r~A9l@892fo^#&wp7TDR@AG~CIwz0fY$pX)1_J;9DSNVw
z+is-&n&P6nYutx(9sq!lBi+L%$;at1HZ(TIkV=aU2{UBI#O>Y#060r#95pm5ED0JC
z7C~oNz?M3@VNg2F0_JVvgmj9t4vVCd(-Okm)0{m*)1pE#G?*nGjALSV0Wo1oR46kh
znvsZQTEPC{Vt4nyju9~EKP5>~7BH({f>0kP3e-9_Aq;9_Xlf9OGBSsnVGL0w7<06-
zJ`{~anIe!F1j^U|iNYc=SR@Mi?||XKP+S5n9P4I7`d4f>vw%e=CB<P8h?JBR!xSUK
z*n|iK3WLEQkZ1%NZLnKmkeJFyqB0E_iJHF<|7F;OC59%@<C5sH4CpT=H6%7U$pQvL
z{1QR@tFmhk@jrjN$^SYO#@KC3!mfX){Y@+Y0PeH5vGQQne5pw<_x9ZT)Y1r4C@K5c
zI`=k>>>)=XOY{ltvEe~DSu7rna=HG10Rf$Hsg?XOY^+ag8Tyi-??{C=5}#@5JBUAX
zC0_d~M7E~90Q~&gHJZN2-dr26niN#~vblcxOPKD&rH;fE%;rKD_hHtPkUKv5`wISF
z_*^m@csTtowsL9M2h4Kg8}k7IoZwsh+^V(n#r>K0GDkC;2?1kb1_lR2>pb@b8G1{K
zs0lmEjO+-vgV($(Ha7tj>5Q=sX*bXf(S5)pJUp)3^;SjtK<1AT1<@X+F;c|$^Fj4?
zwKvlKj_pVQ7T^s)09Jvzm%m)r=BY8oeT3W2(9MA7D|5ET0M}XXGXEs~q+YIn4dT8J
zDq8PJ;?wKQU!C!*C!~S8K|0FGJ3<VhjYB`uizdT`6in*7aluN+!K<5xkRo%E%OZGb
z$@l@y%pjGRT);eQmB#aRl;<e&Wg=z$w@+=)sbqEoEJ-R`$7fe@e6gMbQVWU7$hYuY
zfI&b7Xh*uu0*DjIkX)0a%#W;Ee?C}J0V@XbP5G!TqZsWtX+aZVGp6Spsbh~o+|7bM
zC+wm4QC+CAVQ<yrt{xLoDjJFVbfp4Xe6z<dSh}`qJ1AImti9pJ)u%(zN7u#U>;@h-
zK`#M3gu;66KvoeTHPeCCQbyz=5F_@caJl9A!JgEf6m)yHD)S}$gh<u(s&BqiX@(cX
z>8PUoJ(-O7qUu({6(E;yhVTZ0hVXLJA#Hm2=#ekB)fvsMs{piQDI6$@9nGzYFw2hN
zc!(CI(EX=o;KlMob>lJ+Y;wGwo_hP<H4JiJ%pXlk-IfI-Y)89k;|nuUiWXlp&g*HF
zp9)!wzf*RpLt+}zrZ-S{-#gFCHGrkdQW30Fo*~C7D1TW5s+kQ$fC}U%8e8MLbU!_j
zXFh6QguKn4(Jpq4>_&PHa*M~r-CaQ}r=GduNm1ac;>XY)1s0n$?#T(s|KK!rKaqC*
z#aytzdSTQXRpC;x40)#9OC}|bVVclCA<;1l4%Vc6C_j;J`ofk}jh?n{U$E9&y6w6e
z0D($QsrM%%K4=2%m(6Yl<wc#3%1k0&4_2#vI8lU~Tpuw*?I}67W6?IMY6G&APJI;g
z2vM#**y?X86l6AF3)kY|r^luFwuSG66lh!C>z{HWR9Qs*l4&>SPs;f%xdz65H(M3r
z*u_Gk+$;9CqrtK*Kb*pW-N`rKL30HjQ>&dNvi=(YN6m@hwi}Gok!6qlAH+{&NoJE1
zw2Q4GhXM+w#M8dI0Ah36)N|^aPO`u0%_<$S9(xVj=^a1aS)Xa*-RrS6t6e6zZdSP|
z7&JWv2rAk*2~!lwn1FL#?rSIj=>_32c1`|8BfZT%!-RJke4SvagsY!f^Fx6Y`BzUZ
zU8A2jBI24{Czf!JBs2B<Z}}03os;lMi44OlL1k{Vz|PPIN>AQ~Jj)^U!&KC1($d8D
z^U(2PD8pvSw`k?0h*mCQjAF@XGooy3ZYu?yR^^__JZh9#Su+ph=faoOKe|AKCV|K4
zxF{LFyLr?~{~E;$;a}voE=g7Pk_~>u4XCgrB4>163%&TrrVI!>H2YdXqjRUdbB99y
zhrm;2Ofd?C@6D8_*MG;W48NGn@d$}+`jTFRU%_yn&yg_-KvabN(EOlv>rs4dRfp_L
z-r>P(jwQ(Zhdz#TY>w;A)Y8eG?DyqQHKJlNhp&L0O6>$*f%pU;Zb9mb>1^sDG;=jY
zJ?+8UNPjNT$XG^-qh~DJJp4lS>>0<h?2=jBJRL`E-*==28Mm=6c|5lnxE5JAt}<6M
zl~BqZNU6^=VL|#>f794)#5-)G(6MMcqp0-5DwWRUmxaj#cC6~*b^9Um=}@pkMO>;>
zbIm=?u@kaNnz{`?7m;p`Dy}pQr}OwGU)|)n>Dc|ew^m-zpeceVR~dlIpS|PV@Duui
zOb$_UvtyWl{22-AJ|EZXRl;{S&h}r|@Z>;#qFbV0Lt7J(E$@te>;G%*k*-QHOBp6v
z`H8&LS=g_BfRW%AQt$s;zExFbuQpuEO(o3^yHO|Wc&I5u_}Z0zaqMs2VIQ#-=PD+8
zmcC}k%d$Ny%l1<NTYGnWnL^;%6q(rC0KZZ~{|Byls#1=T+V5Epz4)s`E=1xpFJ6F_
zffZDQbLU7=W&AhcI77j#&cZ#_o#SZLkH<|8ybOSjvmDC%s&a3zt67c`mb%Y$as?5E
zEY*=WS~>l^nzH82ORaLF`D3}jbQiUzZO36f)Z45|)~J^8T|ydk+!7LY7E&kJ2&a9<
ztH)0^!VkQZs)`lD+xF3qRB)^hQq{J<`sUR<eMB`A;n=+%`vl(#%GMe2nuges)Gjzc
zo9Zp+T2A8)t^Sx5Ny_May%uBottBA&KJZC(2)Euk^5mIh1aOe}$BeAQ1*Yhe#-k#O
z^xPUNqqFy<bHetOE*z5~bOeP8#1x%Yu*d$+42i+Fe93L^?FDc7s{a)U9c!qPhwu=^
zq2_ySU9G|wlIOA!QtM>asAlY;{01^Sk+N`2SV=lUY$6>vAwh!#3~jpfDZUbxu6vdu
z!#qwl6>(#QI4nxMMJ<aV2xlrBb<0oVss*jll&oH6x%;_Oa!KOGoU7NZQFo5PJzi<X
zxflpw7vMAZRI5&HiPa07xP)U;a<sh(hUuVL_np||vTGlBr5_&g@3q_{r6mAA#j|z2
z6_@J5EPv}p{yoXC4v+E?+!oED@W7$wW7YmtRiah@ss@Ov2o|nAyMm~EP5$eApHKEf
z1ADoCajo`RQh-T<zKbwEPx53`$%Vx%uVF{hCYry===Im=WLG{-<&<VuqAq>~j0p(U
zD<ZTN%xK;m?d9RJx7jC7MfBxxV2OWCOShfqQcQGF8VHsMe~i#+ZT(Iq-?k-<Pr-Mh
zg8I60BA04T>U^(l)P54s+f8Jc-c)$+GJAIFD2}>d*Q)a>c7DR<X-oKK;AJCIlE(NF
zI8+|{{It9%*|YG{c9Y04`)$c)NY&&Oq!-i?X|Gr}@}>h``e2W5IV%Xd`aVbFTa7}k
z)3VMvnT&UIP)io6;cPhXwpcSf1<)yb(KQmSto^J5^u6Z$jl=Giqp;S$+xVn9StsQC
z-Y~Qr=}-d$<ELbYUKnkZYvewhUlO+Xaga@dT6xsDx7UF&d)TNGj}DC1_2xMN3*H-)
z1DEf+KU7)jIZ)`ulz7eHEyosrc9?JXtmp23!Q~Iy9E>q>a8_K{N|ExDnCX9@+Sqty
zF9}Zd@=_^RGDi&^ZTf!e(Dtpslse6!=*Q<a>NH0eIS%QNPwNpS)?S6C14?VF?A&46
z@0?W?!>*Fg=4MYUQZ&>Xhx<5>7rI27i?2q1!Is}el`T6TQSG9H9N8iK)cAaYNGVW#
z0d`ZXA`K}wZ}>hwak*oE%+@(nj9bYyb)M9x{*pP#4ijut;Mv1>uWWQ{x7mU$PR=cv
z>kVJ>;LVK7V(X;RwEQr(aO?0r2_XmVQvxrN-OW!q_1bf+RP#+YmCN~mUJw}b_7xnI
j{lBk6{e91O40b^KcW_q?2=6Za`U=?FI@{bN250>T^3;z-

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_note.png b/app/src/main/res/drawable-xhdpi/icon_cp_note.png
deleted file mode 100644
index cf821a9d1f61689a63b23c96d6ac3923c643be82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2802
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
I&e}iaFUpP)Pyhe`

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index 15af2af396501f2eca187450973e0f7332693e49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1509
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVRtyX*p`I>|Ar*7p-iqxANtIxDaJ=3q@Su|Z8VxO-Q>TQqSerR^8D9E#+2q&e
zBfB<eXuVpsLFx6PO-mM?FnYbngQF?$)Cv{v6$Y&ws+)W?E-X4R|E}J>*jaPu#+Ij@
zdp9TYKKrvrHR<Q9@1L=LZhc=~bLo^IFPy~6xxFi%pY<-+UmaQ_q<8eAM6ko$Q>&Qw
zCn@h+`Tdb;a5(>q+QqMVV;-{DH2-|%^TyzV<-0@E7BTndeAu=5gQ=Lsr%8<BolDMW
zTNNmC&TQZ>@HtqTY5sVF+;UOLEfdwUTPxy1Zg<|Fy~=l|?}3$7|2mI9HjIhA(rz+o
zf@|pU`bR}IcS>?k<?qUn^;@SgyS?*9_!0Iiw^Mw@{!j8cZ)G%z@%G1n(3=)#G+r^k
z@;z}xD)n~P3J>X(Uu)GxMfY5c3tQU9l(c2C<KKO*Dk`EH!a+teCrrwm-V)Og*evqf
zLdMi%<Lj_*Ej<Sx|KRZ#mndh^J18}$v!1KxH%r}N#hTWcUs*EJiV8Q(Z7Q8{wY0{3
z-%)MfBXgQ&ZwTSZSbwNb?NMlS&u^{1^M`jQDOfJJ7a93}!qFtP(y-8<S!ePT?&a+1
zi>=_AUp7^ACQsFMala#18rd{%%NhylKl){NuK#HDBFP^=4K}JJD!vmrEA*%P_Q#;h
zrf)M>?ci4XURZZvfALJABE@?m+;M*`#iR|`>#tkb2dg}^GE}_rR{f$&Zr-kCd-ukK
zEHE;OTzuru1-Ev8x9!CrSN*@9bnJ0jjpnt?ysO5N@}1vm3?>Dx2)nO%d4rhvb&Kno
zxBg_-##HxaY;#NQy!F|0ZbYZM%lhSCqGnF`xkz_@Q0P9^{Kv8%o7an;_1D$@)ww^s
zgwM<*{OrQ3T`fJwweAE4ZVOdOw5?lF^<PQmO111V`}+@1Np1AXUm<M7od1yLV{)l_
zVz&Kt8KLC%zmF^nEnXMQzQzCN;HNo1gzq%$Jj)`rs-;I@x5>1JwRcwRla+2i()_DI
z;>y(`hVLD$n-_jt7~yH-F0GQXWX7@^J(rI*Zxfum$hw;0^y+hO4{c5AS~|7tn#OPL
z-Rx2c8oTz&F1r1*_1NT#YlD3ju34q=o8@_Stx<>L+htvk|1R41n_X(b)w}oHN*=`(
zF7G+|_tC<5w%<ploGCGExZ7q6jNIcbCDjYAioS4W-<SX8kx|c;_U5NMTp4#;-2Ta@
zIr;Rixa5yc#*Lr&G_TD`V@`4MT6VAH%B!<iZrPa6`TD)~yP5Q!do6D+R{yPBc<^>Z
zfSdO(jr*<7XY<CrcmBIzhT4qyKr?rqbJrgAr)h^Ixp((o<z98F{*Bh{b$yHp@lr2S
zZ9BEUym@r?+Ks611sj5L_G!2%^MCbCTJ7Dnb=vhVo*NnZuN`ex*#wKN{m>R+p<SZ7
z>0(RCqr^G7X0zW46nh_zWUmu^ZC-p-$SF|z4W4YQ`SrOyJJ+V$s;xK9fl6mjS3j3^
HP6<r_D)XQD

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 84ae19c4a3ef8dceb8122b10a82c48e002e0c670..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1962
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
C#ezBj

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index d40a8540e64c17d52217895de1e7e576c095ba9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2401
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
VAkuQf2b(`57e|~!t^Lp3{{iHuWN`oh

diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_question.png b/app/src/main/res/drawable-xhdpi/icon_cp_question.png
deleted file mode 100644
index 43df04ef8158c728795f606301b33f354948a1be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1513
zcmZWpc~H`M6vu4PFs;o>OS4~?O<J4+3M-07rX^-*i7p-pC}`k?LZ&r1DQl&$dDUi{
zCSGagnJ1Z&T8>?6PI+IGd4jW<ZK=E1HvO^tX1?$H-uL_F^O?_^@Asv6xF6Sr?1g|p
zAYE4%CyIJ!ZY*uE+DA-edVxS1CplhJK9%f7V1#qwbY^%E3ohhFsP91_8#`eHoe{?3
z13|114vz>`Hnl(j4wDG=#*&fb2uBv1;}RFe@{Du$V#I|p@Jy(kEyPAhPy=vTd^#ZH
zp5sLmghc2!T!K2@I7UE$ZzcRNBGi6^5TKGh0LSns7J!B0U<{O{HDHB@qp)~uH0CIP
zMxt;CBp!jnz>p{c5>G&)fbRyig#b2D%wPh=$@x2(IwL~ae0~H0fe;7;aDgQ}JSqf%
z!sGD>BpQK6!_*b9=<_^2T?pevn{Gh-i{ZqIW<+r!_?&Pauz^Vr3XkCvp-{vI3F148
zS{~wuK6Ub=LoA-UEm3OyfNMDc1lsK5>SXUF%vl)nDc%)htfi6!gDql84*v=<JDpg@
zw&xts_0_&2t?{A^<QAFuelS<%J<ZO|6$AN1wggw11cjyG^n1`-Hd_wrbdjD9DgwrF
zA#edc`u*y3&gk^Q>I>F-%Y_!fdh~m{=;ZAV+6ONG$ANFWS^$FsLYtB});m2bj4siY
zLL7!Z9@r$W;Zo|14D(GR@Vm#{x*w05*{$e5YR{&MYd^~iO$K{1h*Qj=G?w)_W5s;C
zkr1TZw&IANKcL?<{8&5fiQ?_$xm3i~o{U(t5yjpds;gk1G#b!R?c#YY^u?86GW}@d
zxFhLvDCQQE?Dgua;7Sc;kmW;$1hb|$M$JjCj<nS?f7b!>S3sM6BbD4|ONLcDPqEh=
z7dsjC27}HGe@#{x3tV~wUh{I2U{6r8Zko+K>@}{nmX%?GVTFDv@)t-oyGyjxxGp*G
z;VyD(3w49{*(q$|hdLf!YK^Hcosu`y-%I6sTNIIa9p*^`dNfhMk-d|=W(uXH;O;^l
zESm(bsPgz~aJ7I_bfRwG+fN?T6Q8ei?#ZTY@=4Bz)E3E3d7k;Ir`#E;k8IIor24=`
zM-e5%qpeFL@RH{<W5WC_M<Bf*rX&v+$k6H>qET+WZe4PQiAkR(B@Wyeap!8D3|FgQ
zq@B<c&8KIf{5#Li#E;MDNqlUIJs(+kG|{r$ZL_o9%uyb?G&FTAi8B=@J-Vz?Ijfht
z@C7UFJsCRMH*zfHqV81H^#O6M;Pl=7ns~>#&iRGUH9GQ|51ph%^Ah4=zmS>6i#p5{
zetSgmD1W^<r0<Kl6fZ26T`cO??=7FnCIwHD@7Ha;-)g#CXW4vFn`zr0=I1{OCDVP3
zf7Y8_Ch;=Q#!BFQbrU;QeJ&g~eaf1Vg?bifE@RD<+>95FRo0e>*>>X8!FZX?HG{}M
z+!VPhn;Nw5jP*GrJisKt+D2onu)F0L7OW%PSLyrCd;vBWs$?6-nMrjr#g!U5m8GB3
zI!X)*%NVM%ex$!NG1SfQV~0u9oqkE}%ahZFEN^gi|3@M-nU7F;1Oz65lkNZ1^qKv;
zMFH^I?1ni-3FK{4iEVS+WEVt6r8A;#i)R19Ot?kgM-mwFpt>GDl2)ii$ruhAr(%iH
z3AvYDY{6BCI?U`@dATwPiywZ&vv{@qAnJ_jpjOY8#YeGLJ4R7u?t}EHyWX2-_Wa}$
z43%~}0XI`fXnhg0@R>nzq3fx@8%fHgs@axa|E5AP+OtuE_eDBjL4ysW2dLznszWET
z*+mAky((k(;-)+cEJ}L5tL3_LBO~%ys@$tQMdY@BeC=io=CwI_D^sSqlIGj^L3#*W
z<sY~C+)ZLnzJ^h0iuzsHF0RvxmA{z;S<<MfulgkNTQc!&zazKB^KF)KW537!|5I=8
aTGKjcSk&INPX*tY(5}baoyr{o6aN8#4xB~+

diff --git a/app/src/main/res/drawable-xhdpi/icon_local_activate.png b/app/src/main/res/drawable-xhdpi/icon_local_activate.png
deleted file mode 100644
index 75e9af38ed98e928829a6f2a5dd78896bb8bfdb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1700
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
V0$TRMx;JkJMD;yJZaQ)@??0b02G{@q

diff --git a/app/src/main/res/drawable-xhdpi/icon_local_reset.png b/app/src/main/res/drawable-xhdpi/icon_local_reset.png
deleted file mode 100644
index 2813cb448d86b4f8186c955c0bf3ce3727e41214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1241
zcmeAS@N?(olHy`uVBq!ia0vp^sX&~<!3HGfEBwm>Qk(@Ik;M!QVyYm_=ozH)fq{Xg
z+tbA{q=ND7+|z;5jsk7B_3j__3_rn;%c92o`1ZX9jx{_!Y;7D9@~pZz1O(SiVT}3y
zq?h6P4c+N`&b)E9?XQpd8=5QHy5z3w{9V=a9v!}YTUs-sCPcnsg@{84mx30nz*MFV
zFGiQ842yyo0yP^53!hm2|0(~<?oTZpX*F{`7+P1H;+Ajg{aG2cHcn=_x7RiAo>z<Z
zs3;Z32wZ$AxI80bg5@=hNt-4Ii9eMTyt}EV^Z8|a;fqO8YsKcBx9-YWB6DI#SHaHk
z;<X_~50)0JogsYjJIi$QqIJu!W(j{@bRp=~B9qoC+f8vZtTyI~ezQ%lIpel$Uv=M{
z`O0y{CL2J~7e6K+2$mN6zB_?m_u3pj{T*htk{^VGO{ZVZ+A3RA$2kG0D28W+?7gl}
zj$L!Uy96A5nWMWmO*|mz$Jw2)1veSz$934)JDu}A;l?m)$~ulri}m+ickoZXb!KnP
zyNW0SLxZ5ImNyo;Ea#uEt$wvS+qI**N#gga?oF%zf6U-2%28zNJGEYBshOEfXq=~<
zW@+Fou?v$QKYY3+D%O49((;1KHIG*q@6Oyh>+75(5l`h-?$z4*&KwKv1vfu^wz;>s
zuOxqoU;OsIzK4C$4h9=$NFV=urgquJlpqV$n$0#>3e<JI-dFP6xwUKio|HrK2Kq~S
zM8YqBlPaCpyz}Y3+S%Iw7Ib<lwRZ1b%l|=U*LIy&<r|@|_bj;+GEwMDKNoMmnoX2m
z@zcfIT&5q=)r+2=GINo>(t)pxyQa*ua9y$^&+28){fHg!ZZ2|_d8-i=m+Y@ndFY#?
z)zoDhM1pdP#SgMeIv?m2iuU%Ia%hp)%M7Du5~|fX-`~CZ%db?n<i-+{nW8_;wyEt|
zv0o^<OZWOSofetz^=G8E>{swOX<7O<I`Mtmx1G&3A{;>vj_v3>kiA9Or|9XteK9G*
znx`1R>2Jb~pk346X!N*s$?q}y8rmf=uS=j*?Dh%~%WI0FCs&k<Rm)W>d}b+`zo=Bp
zsmN*KlxtPXb31;1y;gMX7*BiyZ^A9B&P5BAGnf3?ynB_N*ZS^xy05#{Wef!hSmsB+
zb5%K7?pwK{`_k!E#~Q0cf*#NMC7RkJ&>E+s#;$nh)uyYHmzF3l3^{e_<8StRkL_kL
zMk@up>da1_Xi?j}<O5UA^chEQh&D5~#3<;bKW!D<c4h15jSMbx_E{bAsrY|P!Eh%>
zqFA5C$4&EYc>7N5I_b&r{vFq@C)ZvtTi9p5{o%Ko)XJRa8DT;TCagQ_d~e&W%G}zo
zE<L^+PnB8<Yvs@EJ<qrHyIP_DM|rMA0^-*5tAjPJG%N}5@pJkXU-sZ@Tyw9Gye3=h
ziCtUgWXL7S=>2&2KydG89i=A^q<=K^M!4VHWb5GLr>SibsJ62zXeL*tVD7Vvif*kD
z9age;gcdu=sQi=?n746HuwvPl{W;8wR!0(-#jzC#yh^`VUznc|*}CigU0_+o;OXk;
Jvd$@?2>{2kD+>Ss

diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility.png b/app/src/main/res/drawable-xxhdpi/ic_visibility.png
deleted file mode 100644
index dbc192368f897f52b0c1c502ba56492247021f47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2094
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
Yf97D4XDi<zE&u=k07*qoM6N<$f_dHX$p8QV

diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xxhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index 29e28afe02b011ceeb3a8da71a864346d41dd25f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3312
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xxhdpi/icon_actions_temptarget.png
deleted file mode 100644
index 4fa88421ae8aa11df12ddcd8d23f08ed38986bf6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4232
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
b6&bNPh*t<ont{*X4+Jx;73QU(Yr_8lhhxZD

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xxhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 1b4603bafcfe89a1ffcb33392c6a4f39550b7e6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3886
zcmbVPc{~&T{~vS9ZO&xoY&LVp*u;!cj<JNM$Ti75_c@_Vu5v}Km?Tm3p_F1KwR}qM
zqA-$t$XU*YpT57(<NN>b_kO(I$Lo4NAJ5l+?`&sBTM;1zApig%Vu!PKIk-#yYyrN5
z)0`_}8UWxr5kzn&yE~jj`i6z*`1pmL_t%LF2|vgmR9M7?`}hX?lfmcx1A{_Qkma@x
z2sp?O1vzcxpz9Eh@h1i05+eOw6C4S?3BkUmeh>?^ka-;P03gJl>;sMqxfmLSj6*^G
zgNr<P{|O@?;Qy46gHaI6KZIa+2WK!QEYcrrq+<;C)iW>wA2Zd_Gcq;NH-v%pb@hx9
zx~2#{L%6OUQr8rzs|WsfLC`{A^GLq{q>Hu9zhnm<3PK{2!;uI?Y;3GftbtBgWFSJ%
z)YKHAtB=svhaXhHqvAu!K5_8SDAhj@|BGSmALSbv6iyBb3kCnd^f@0EO-4Z=h(9EV
ze_0OXA^xlH!1?cl{6i1M5_zB>Z1)g(Fm9TiwIw0$=HjjR<|2QkHx`@es$VW~--ki8
zqOW5`j6iUhgYao0?vQ>I+{kEvn3sUdm%mnS3yU}*RXSwdefO18#2YxwT3sZU0k<wn
z^jLbiyLxMN+J82F;zs<(sZG;B(J#+FyjV7fZT|`DSmf%`J@kLKtJK<@9lqs|MAFbx
z-FDUpBl~z58}BXDIJTZX@#u?8f+q5E3Rcx_gLet=d?pnwF30<WxB1m*;f_gIfOQWS
z<5qJ{9fO7=Hl1hIiP!+20-s5CC`<aD14y~Sb@^J02dcQ^RBPIk@&vU%Uj>GCzI00w
zZ8f7UHTyDqbS?v3DUNx@2teZ3QIHKqP`lzVFY)pj!iTEN-`Cs|hPb5MHcVt%WuDg3
zxNW#k`2K^JIO#q*9mj@#$y)Sag|6GdP*93IF2_}j%%8x$z%`EKv<s5>&_Fbw+pE5N
z*VFzE&zaZrw(yQWv>WmGq0ob4x^kp<7JPt;Z?~6)FS^gJms7+jnT+#nB{rNL?VYl>
zKkVM_#HI5ZUU#|RE-C`w`CO$Q&Cp@=GGZ7X3(}a?!jiKA>M0$E<3MGXVlFrVqbMVQ
zk7%W`nV_G5a9ssES4+51uoT;j5lb1TAT&QK0Tj}vw%;^ue=p&7;uZrMq<y5mSc0*+
zKeQ~{mTa2Td}Rz#8?zv(pD2txKVR1YCDYu^_xl`WHkz%|?1mIJ`52Y^4{NPmzg)-7
zu_V(7u;sJYbc&fQc<FuG*R^~nkHoIN!XVZf4T-nh$S4Mia;FIWusO8qCpaZFyf`Ne
zYQv(mJS5zdo5#_7bD*`B(?H?Ayd^L8F30z%zIuH?$in&#X?zIy2|U^1K-t?){mtct
zSqh|B04*T1TXm6kZH-U39f2un=yw<5h2sR{co+L-x%T<oGQ$`1epv>0s4#Td3tG<y
zL7D8YHf)@W4ixvOF^gL&4O5$>GLiLUON`42@Ih74l?dy#IO6s7**fJ`ngj_tS<F`b
zyiT&ck$|_{$uI(xU9qXP=V>`SO0J>9If+xzaA`Mi>EEzl=r%}H*D>=)ZF~*dpAUyT
zuf(Q8aXF0%fIy%Hozr3`EZKj%F9u~~V<ooE__l>L;@$NkR_zEW$baX)H@ojpRGoQ>
z|1cj%ropbq2fem7DZn{4lY({7Wal&TQHwhKDS2lIXCU}>jOreZg-;e8OH#ACmi4NW
zC2ms8uDZar$DO3OYpGf2fFDmgM<|_^9rk8NsMT@b>KE8l@N`kLl4Q<jaLyrADLj>e
zTPVpvxn{Z8-OfS#Kz4xNrN{`0Nb|Odug+?9?dmC${5Lde%*L#3zA$&7LRJ;8#)9m-
zNqib~fsE?~&%h66`uG?BX5YHf9;bt(7ox8iBunczTovszHk_6okzi#Rnjin{#@6r_
zFBg4mJRYsa|AjAUa&XCfM)g;d!VRdS<|pI@-y&85D&;|n)+?3z!#gp&$*xWSGw{Ni
znZ$;+PUIX0)i=0wnB(}}D9Fk+KviM*Qfq7;AV3upQhm_yR{<{R#qF@Cik_*%++NP}
z!+W%tz-h7kqusV7!la-)CHW8^t+S)|0o5b}R1IZ0u+}4_Mu|nTbgt|RVNPx5rp0E2
znSX2DS>^G*aWCZ9ucv60jNdZqL1rTmKYaVKsg$%Y@LbZuge?4O)Es86WIq*1jp8@G
zUwWrt2Fs%C8rz>I0hYKn!oNHck;|`XY9wL#hUHn+dd$HTh`nmCXp`7+bLMkdk&bSf
zg~Ap%3r()pEJq6EhdBFL$*FEZW}c5S`)fps6`n&feuKWk{d!D64owTiq^BxWV1;rF
z|FrlB&o5iF+WyZsq{;-|Rfoj!LTmzpeTMZz;uNg(L%>j0`u4-TxjkOb{^=B%u|iR;
zfmtbO9cg5Qzyo=CBmOG<6lnTw{6gN7O?rP3!J*aOy_ws>a_MGkoXn>q4!OT$w#IoN
zYYnfTy-qOOzj6&}sIQcB=#tN?@Jy_5`A!&)J)vBA>z_ic<wg;Z)D4+ok?Ut)T*d--
z=(ljI>%@U(@Fe>^EvBn~M~fOAsOVXHPPVh<BV>U&pG8D{6}0e^_ahUtV$!wyn<sd;
z&D!YU%F1x9^sjDCZFp8^yHNKzuanjbw@p}ejghr^ougX$jS3T(tZq|A1?h5g!N$1P
zQDe*g`(1}a+$v9&o0%ue<<`^?_w<gu><BKX_>P&Zz$to2kL)p)3*O(CoUPOv40Ogn
z<^>Vy$5sTEn*S<hxD#ZDy5$V9F&x;4t?O?e#v}YiH>m4NYN5K%x~&Fvw<pO<ky=}p
zg`T;vo1a`*ON>UHhWzY7(Smck&Y3sxm&@d1=%2bMiREAqiIE7c9`Ysqvww-h31NUe
zkc-8R3SK0#*@H5##TkxjpfTRIVp}wF8JFgEuWELVowmd!LU&60v<x!YRSDTKZKFI)
zsZ*)a?%yR(NkMZKr9dpDW`oGKFOH3K8A$2M6=>awLeBwMy#%W%!I`mvsJb;Q+PwUb
zc|OWpV<~!kjk6nA6u)?{fZi^VYhwxR`(^7oz0IS%dS1POi4^JXl8wTU{f>C{Ennf}
z`?O{ALGU8v=IuisEe|~QVaMtH##&J3CVIXw_#$5;9<-U8VJH-=+)P_**e`dk|EOEE
z0m__glE}UgWn1B|WjMQ9uw*KmJJ3dFhM+f&2S0Mjo3+N#8(;I0qQvYq%5dZ}E0#Fe
zu2M(|1pl7O-ZSVgoi*nyM<mX8JBb8Imjusv<Z;sY@01JU^>`e*cMpe@RQ0@a!hXsJ
zX%XWSIrx^Q!0FZl#G2B$6j9HzbBe3GPpzsVlbuiWN&h0gN<O;cB(0Qi^lnES;`LDJ
z@oK#LpmVsV&+l<+73{L>i<{@m4q>Vy@19D|um)}NKjZ$UaHMC<$JSMHF8{ira>gh>
zoHnUOn?CYcW%73L<#nzVl(cJ!S~7mxuCqn@RjAvw=tb~5EBQOMqY9a;wEX(1yK&07
zg#8s_7|e73y~cBDVoqPLX-l<-JHB5~aK_tjf6R~(EJL?{*M5HsQWOn@9yJ7xRxhc4
z(<y88D9sqYl9cBws8Pc$Tqy2kd>1*E6DK{F#q_aJt@wP46}v6ha(&wEnxW1_SAcBu
zV3Lx5Ly>A-ES|f;iI5qIxjRRdv{trkf7eyJiim~_2b;0O=A^ISi}ugT-f1b-Hmb|p
zV3I6HWrlwxh%ByLc)S(`7kVJulO9j$Y3L7A#Xq}dF&~7Oau>|iB5r#Sww~0~8u{d6
z+MdvBIWOPaR;^)6X8TxC(%~xQvrxNW?IB|8A@$55o)-NNv9^MDeCuBHE|4mZsAX5m
zZ~qK<xJpEor*BrGrXd3BT61A)o~bXzSEBFVm9eR>WaYax)Xr93Nxz`)>siRlNivia
zvE;Ro;Z52F&m@|+Q_<Dw^}^bhtpbQmE|z6EF{zfk;zjYb*8MVbgj}$XuBr6rRFR`1
z)52CGnMOC~u}1vaQ2VF-_RW=Y)W?;V1h(YZvJx9dT^{SyUwAr?pc|bcg2Frt3&|(g
zk{lnF<@rGuyMs<ec|GkZEaAIKwqKu9;X)wKN*3KK;Mi#oSvM(ty`nRmjd-=X{mcpa
zS{z?@S#eL%hI(5~NxiTznX`C&=J}1QlVY2OLdkYNhO$Iq7_+g}q*d6>GtP6-8gG9%
zf2I`AiLYJ{f7C{^Hr6<o+uIt1;TyQm`u0<F>KjJGszG3Zha8!Cf?$BBjs)fz+x^9Z
zweX{PmI*n%M%3B%<B9|D!_pqgO^#Sz1ETqrwO=Kt!*`F=3cQ_|n|snr3NcpXUFj}9
zS!ntgR&P-7^J6y<NBCA!aaQaG(D7beL<_0_n=E4=&Uz7sxcC?eqUD|=Y*uo*BC#zJ
z_Jm!LJ!*0rWOAa=e}X>ywyLogo5>=6$+b%V`~9_0z|x!4`G3l13fg8@^p{T!`Z>7E
z0y@^3p8>G}Zr2i0RXQCt7jR19>UGLt1#lk+X6npX2&=;_yH?@84)LzGP^lg(t8u=d
zYb4ghZ)#@1K59F!X6OAoQXS&S8L4V7_h=R*nR?G_>gu-==#tT6>PMNmtG~T#qO%Mu
z6z9_{*tcm9F(6Vpff<DlA)cndt)4s9*!{c`t)7DS%H^J}1D(=LSK<@T$i@6gJZOAf
z*>#mjr07?4v7n(UFQm7sF%d47o|)gwB9ir?50wMz65RQ5{z#|_Yyb-TI20pjA1Kzg
zXDN5@#ltF2-CH9&&&=o(+21w$&%Rf`SmTl`xNK(U1n{Y<KII;(lIlHGP^~dTMjJ2_
zd-)&MO|NS^-xe9rh80M)%2I28V9hgM_a0Z#D-PFx(!O)kP*|8CJhhypCu43ebnnCq
z!s}qq0<L581~dcgSY|O#4kfHgVn8<1KvBKztU|<XecN*QvfaSdn(iEDySIf}k(HE<
rO9uDoCOhSidIROMeEvV?@qOR=-VJH-+KNMezPWZ-N9%`H-s%4Xlgj!e

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_battery.png
deleted file mode 100644
index d32a7791e139089ee0ff8bdd5b92326b3f7aee29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1991
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 715682129b554c1c57b1354abadb5d4be3073792..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1788
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$^%u{R}>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j
zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{
zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P
zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe
z#mXQfAZECv7AF^F7L;V>=P7{9OiaozEwNQn(g#_h548p8J$<<UfE;)TrRD*Hr3mPM
z1<!R>3=FI}o-U3d6?5L+jqDc*m1zICoINdqhq<XqqJTTQM<vVUBKPzoFId&|!s9X)
z8P+j877u*y^M|2orJ>tmw?b~I4n?7Gho(h-DZxh=)2jAVR2$t*H7*GcEuZ_Yvd&Ze
zicjfP#(%Z1)&?(M<v2;jlN6L0w{?;9jF~ev7t3-x^6ucg!Lo+UjXQ5W-yh~bY&Fbt
zba(9CmbJA;&@kffM#dYwF_#y=jc2iA{wC0<eb#_2n{|V11iudRvc}6t)W2|i%#>xh
z-KgGhwD!jJ{sYo37rYF84o30VaNJ?+iAkDkCAhBkK>3tEnz|RQ9$0qCf7`W@zhd>8
zUS97FZjH+uUhk?n@A)A40mFn_g+DVFt$Vdx@<HgLbbX!t4SH9VL!JuWYJX)j{oTEA
z=6=TW%+l3Y*4eCE^nYQ~3!S|63Hx<_72bJ&h4(<;vZq#o6W*zwtH^Tc*v7P7U~Bm1
zuLm|C2tV-qK<hoT@0-j*cDz4jpP<S5`rVmN>@FM9&N8SsoR?nTd*JVuZ(ODc>Ki00
zCa*Yr%E0UU|FG3wx60+TJA~)u`3419PW0;C%2Od2aV5fzb&pfJ>(AZ;hg}xlxnz=H
zFL<HY@|KAkOF4UiYu|VNMOFnOKLjk;n&bE6v(C$jy661osg)_y9p*cy|5s1*T-1Ks
z`%2ba3D$Xx>)tNnJ)9y{A^RioLihKa{NgRAzh7_k@7TOB-gtjBmkq-n2AeBs@o(Rx
zJZ$57bYkOdrk@^5kDa=vT>tFOIhGGn1>yzrg%-27vfQ{@;mgq8@$Mi010I8`5$oA<
zPVfAmXyi9XAk}__tfy+kO{rxkO4nNzzOZ(Xk;+eAS2la=wvV^2e%b7)6ynYGruxQ{
zb-KZvVc+cQcD3ZrW4*^_$NEl%X<Ny>ug`zqbuume8G6ebXv*gO6V2>TzvlTMS7@|B
za>q=GMG<kAzO{$W)etTM*%J8G@X>{kWttCeA6v~9<9o&|f_Y8KyQ(<ZAJZlFp8K|h
z`(zzg%nN^z%1^0N<kzGbyD-`tp0{dma6f5&!QurU!+Wut4q69)X>Ydi<CzrpvigB)
zQc~Q0_lw&Fr?=Fx)xCOLr!VAeyI=fnfYw2)xsh?M-;*Qv8hD;L_h$Q4mko7_es*kr
zTFgss-plk=T^o=Y#2L2j+RLjVabG=w>fN*Frfy)1(K^_4t*LO%j9&{Grv`24OP#iU
z{Sr|vSFeMo=CPI;zmM(o)QmWuxz{YU-}FEb*EJEtJmYNLb0!iInylPW&7q4odscb{
zWF0)!mmVAGsT~plWcq!G?htQicLFlc6-i|8o;GQE)P_x)Ev)yhcI))ijksx@d@ke?
zmuOhnhHH$`8ezh{mwugTlq|ZZxaieXL-}m(!p)hzGp<$l%$QTwvg6<NlP!Oq9(a7j
zW=Ujw!+!6K`C0*P8@3shyMN^{OtQ1ivU9cZOK+-pcS!TuJekccGcIhOSYZ)ayfBX4
zPHSQADi6tnRvdS{ejk37q-1f|?(Y-XD0Xktgi{>X5+9^4x_;B;OIYRh>UkVjud8nH
z7S+l=_dD}J_p$7r88bI5{1|oq>H8J7o@aFbPm;6!8~*od_iRl)fuq%*@2YxtwlC{7
z|F>tw#(R;AzMZ<abTQ-g^}9>dIx`KA|K4IBs<V|bh?lc@={$poS144bbz~{?C!>g$
zv()xAWGP6lDUnsYFD|cgFk$KIgsZ$7hZ2@%&Z-D|b-*Yh)5<4*{=r+tD{H3rMd>b@
nlYUox+V|ZhM3ihnO#he-E<96;d%m(4RB3s-`njxgN@xNAO<(~0

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 79a21cea45b98f1ee10bdf10f9a5795e01abbc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2867
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xxhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index bb269c3af9855aae75c42af2b26db54ab87a7166..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3604
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
VF>o<6mihZLXKUqP*<gXX`#+{@qCWrt

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xxhdpi/icon_cp_announcement.png
deleted file mode 100644
index e287fa15d4fd8972675f178e37f9f3a2ec6bb9c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3754
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
SCn)UC7ZYP<V_J{)xcVO`PTD&F

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index 4e68c25d70fe7784c798a24452fd487dbc47b0fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3637
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index c91b51500199cc50507ab54abe18af243707ac60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 940
zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm4M^HB7CvHNVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$^%u{R}>^BXQ!4ZB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3j
zDm&RSMakZd%cjB#Xh3diNuokUZcbjYRfVk**jy_h8zii+qySb@l5MNx2(nNi!Z$#{
zIlm}X!Bo#oH`&nGLc!cp&(PG;!pKBN!N|bSOy9s#-_S(Yz|hLT(#pV40Sc7txD;%P
zQqrt~T->0R0eQAc86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZx<D1W#g%y_i50qe
z#mXQfAZECv7AF^F7L;V>=P7{9OiaozEwNQn(g#_h548p8J$<<UfE;)TrRD*Hr3mPM
z1<!R>3=B*%o-U3d6?5L+)$I-`WH|cpG4~CZ?hJvON*WSt)^Ul=KAI-J?I-7%yzP=b
zO%K8abkrs%I?mSj><;VJkALtgF5UKfU-5kQZD-H?Jpc6gT;AP2OyDR%BXTx5|F%td
zes{U%xs4*XJ=dMv@>lC*_x{R5i`QP(?w5`IIdjb;$4Re^bNBldRj%52IG9)W&QX>5
zlVfIn<e5IH#<Qrp%dmV+W{#?*>1WA470a1V{)i;MiwN0~eD-<jr1q!1yFK%!nX_?b
z+sRM1(ayi4vHxHGPmLu`5g{DiT#12-I$ABRts7Pdh>0FrghkN%xAXpD&obk`zwL}a
z-g`4m>{{6*>tgvN&Ki**u->DW>W)i&GCBG9)3LoO+fPYnyGES+t#baf^yEL$zpXw7
zdf+h}tBvFc8mg`N?YU3==T1g@f3|z~KMGz?nEWQ~|LZThC$~2D^l-jDbmI8m^?qk+
z8%#@dPTp+Zb3l##a8HZt(HZYA-SqynwRVE!-kAx>FQnf2Zuni6P~Ic&Y4_*xX0)h+
caX+x{XV~r@*>}@CQ4=KQ>FVdQ&MBb@03EVg%K!iX

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index e13a420bade111dc6652d821df727ece1ae11ca1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2746
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 6a9fb420884867efc2a52a10678aa24221e5839b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2975
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index f1a791b702871250342b40de79c1e548da7fa173..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2946
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
E-yn%(@&Et;

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index d40cba3c46e00383cbbf5de23924eba47771a39b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3179
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
K&A!f-eDQzV)ykOw

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index 47d5de66a1e966ee9bb53a1e97f143fd5621e6ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3738
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xxhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 13fc303aa2085b8098eb59e2634f0dd6ab7a4a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3820
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
Xciw{=ycYTWpQSU>H`lAyb&dT$&zbsU

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xxhdpi/icon_cp_exercise.png
deleted file mode 100644
index 4fb54d370347787698b1b54cd6555b49671a06db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4734
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
ZfA<nnpLN8+82_Y=bhV5$>ogqV{tpz&ijV*R

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_note.png b/app/src/main/res/drawable-xxhdpi/icon_cp_note.png
deleted file mode 100644
index c1881112b70839058236539cdd6d1cf648c85606..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4109
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
H+)4UBdWVfL

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index 1a6d44bba039431f7b096887dd459580fb570def..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2098
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 6021f928ed95cee82509257f9fa852669b3e8f07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2829
zcma)8dpy(o8=vdg4x&SmvRr=Tve`tLdv2*L3C$(O3^TKfxeaASH#wc7sDnbX!p4_e
zqb!9a6tQJ)@vFICqR^bvkMldP^Y?jPug~TAeBRId{dzxtJy$(2t_lzh2nYmHa69Vc
zxpn4jFFDz*-CBY+0Rl-JCwgHSSoafXJcSGo4yA+;;0a{v*8dj5E`b`1ClMI15JEUH
z+D3b^sYM$`47JfdWA1M1PIV+i5RWqHgwsrn7oJJNTZU@e*+Q%n&|3s#0wWlfK#q!z
zK_}Q~|HX^mx^F)tv|)ci7$h5QhiyR^*4+c<NTCy8=5PxWJksni?2siKX>NHKb<h}w
zGDTV-Of3<}gC?d(w5cW96bbt~v~3|UYkFuH+SAG9Z?Ub+MmvJRprR3o`1p8uycwKA
z4@V#^EiDnIC<F>+vV|~-NsML$CzwRX=xkH`pTmg|gQpXz3?d~Ow#^wFLWyPAXlo<3
zMG$|hY}rHn<8LeZr$dD3t+vp&{KMQT&>)a}ikp*zS3>^$NXm89GwL17i(jgteSUox
zIAkvH_7K<Pk#kwC!C3=<P4pwbS5f)H(LFLZ_s+WC509%}#l(ZTA!S$1-{pFdkzM}v
zSbwjYkbVp7qg8hkh_P4U&ptT5-M!!6P~#Uyk{0vL!W-7s+@g11N(#pa!h7?RdSZGc
zl>coI3452H>j$l$d__Ns{|w4tZP+WBs_&ML11U-6rB3dL)P?yR0_{999H0?r0mwnw
zdb~G=i~h37vI*)~8IHsysKJ;4ghQW^R>L{e>`nliK4bM3fHy(wa#S6kJk?_??|rv%
ztQu*oT>i)L+(nslN&yOUU9`KHaYIhjqHLH{M=F;$!qYOeE961K(Nq&RF5}rlae(wN
zcvVtIA$h?>_r@scmEtOtrOI1N754Mb;8ep^miA?74XW}QE-XBi!^&?yXis9}3I5k*
zf}gTRC5C0^z|V4R<){3M^zZU6rz+v?hWRqaU2x8~You&9feuQM-S}XlNZ!%DH`jNh
z$-zA5<RQ>l>l4}6I7KS-ZKh1$K!d_6d^~I%?t$BQE0HX<9x!zwbiGtG8|3;k*4buK
z*vUT-?xFgTyv&m9;*wGkX>ccd(MvGIIKEwCOg~6!ol$RQ>w#-rIX7PYHeGHmd>eR|
zPz2o}IL(WnY%u_a6T_z@rE65hZD_RukNAsLBSlaT;3D=~PYMrF`s)5xvDwd0K=<zQ
zBH5Sk^9xuv2SzzOy2yF_%iDD7oUbvF3R*XzJ{nar1co<^s3}uN{#&D!)ZA9vcf33B
zC~Ke@lNFWT#uL6!dwAf-3wr5<A92qwD2ysLGtnsLOJ9cGq`SO-K08Xk^tW?h&1Kq7
z86UD40Gnx(oEZk%h_3^UugKoF3xZFuA)M3ht?goFRfkYD|D5B&j?|8$ktO;><CypI
zGC2zQ6`=2c=CWIGMn9m;;af%P+Z-z^M%{{2;^d_!rIr>!`wB;N&HF%reiY4xB;xr&
zHZQcZy|bTl1@9|7jkE!_1f_K!vZD%9=V<>*S1d26DXEqnFdamw@sHgOIbew!J8`_%
z73co^KRbr6bURo*d@WWC-mvP$r5w27(&3DiZf-108kp6~autFGebt4|Dp<a1Kn1(u
zCk~DGkX7knbEhv*DM0<HkBjIV?nfhu^_5qy*mc|I(%APG0#mmDqj}Eq=y}PL_|lfg
zRh?X`<XxspXIKO2ne?$=SI}kvCBi7R*xrt62Pldi8tAPbYiD9r_B3RQZ~iI3S$=n;
zzZOSa<Y_2v%FeFQh^VFKQ|4)z!CaYrMc*j#CcAKxi3L=TXH08XPaU%CpLvshfAB=b
zlLTJ<ifT7v7wfBDBzWMlfWkMzN}V%YlI1w~Q3_7&0<4)V6MB^b6c82jZRg%urrCr&
zlnj^Hh3{_@;dff3FlC^H5}csv#LN8AYoF}zrgzI*OPzO5AO0fibEuPYYKS(DnIkQ?
zlqbho*VXk)j;FjUf7m0&ywIpB+Ec9$xcUVc*<dm?^}uUGX(`B=Ru}NTB}U~|`Cvzt
ztIrUP6Q;g<^07Xv#kDd)`%{VTjh5=q7V|KoKAA1>E7pP<193iGvV(osW8#r<9^NZI
zE!9rNDt{|T*tx-1eT9;?z7lJ5qI~(81E%}b_sf&?gCRB+Y5flCLr>V&85d5x{C?k1
z==PW<tOIo!PRWd>f3iR85_30C40LpUpNa)R%X&k`B9efES!CVga9f8$@8vRqOO`m+
za!}!v20Z6le&<x-P^P%>T4fStRr2so(yu|9*~NSOF*H=&+cpP|i-zvB)R5w)(d5uY
ztQE4Hi*@-!mo?zpDQT3W5A^gLKEo|q7z!Rg`L29qRVv=8BZW7UN+>n#ZEn4)E;_=n
zuFLCiyOgAc8&N8`sSi}6#hCiloBi)h0VMifDxoe1bC36$Id`{UCD*gy&-b(-!1MjD
z`f}gQn0liJ-j8)2=oZ@dDK}kLVV@Ln&(?+KH=#u4geWi|K?XinB}#N<9iZUI-G}Q9
zMCK*7v!^>sk~BXna9mM6CJ)oRW1xnyRz_QZ=U>=;J#BHw9WD2G=wF`aYSmsUf!sa>
z{6dY)))Ytd%)S=509D6<0(|L{y#Wk`;R4!%S}Qzf41P>}n4yd%RaG_ClnQ!IPn=-}
zwU*q982l}RhdvT{s{fY%-T?ndt1I&hG8S=Gb~s<m$FkeW?(L0<f@7@{{Py=WqM9I9
z6?-yk<m-~NEC2S)u@60T%Zm8$_QpVC<jKv%T;1~6eR{r;odg{DWn{&%a?Mf4>bA4C
zdv84uJ}2NZag8(CYMx&<=hT4xvCYjhO_2Yh+diGaV&X~$ZcUX_p&Bq>#bo&pZg<k@
zd$Bsa+h#qzZR~4TwJJkquO2}anHy-iCGG**;D+4RFoO)O>FCSj^Tt6R?$w(yU6vTt
zBr_WR?9AbW`iqr3CS?6o`-Tvh_L~@0j8awsyoqo*tXk#9bi64u<2pP_S$SD!#8+cg
zSk%iK%9x)BB<d}>+*l)r=XrKGG$kbWKH5+$=4;G9X!u$>)E$=fvMX>-UO8=%$IJ|!
ze^ZmKF4Ao&#!^|_f?AlD!?in7>yA-og*E%K2uf|-SbR%ci?$>Q@!@x+-0n%&Cw8;7
z9_a>=gI^rgMW59ei*YNOovroRJI_K+d*KM&G26$5N%h4I!lH$}r_LG~0^h>&%L76@
zhp+ZWG|xF>Z`_wOA~~{fy+14fnLT%+H!KEg)kT2@Q={_{awL8oV-HF3!`}P;kcN0G
zapJ2yu_DJ;P@$SVjdEoLB|VF8>dGw&+#SRkkWYpPHRiLfpKr-a7M_14xUk^&k-k=`
z7^U<nuWEnZN?9{Szs~Va4G<<ddm^f;QXMOvJ`y$b&O5a7L4F;09i%rZ<uZH}Ja}Tf
zL%<_6`+haG=-E{%vXx1CV~)3~TgkZ*J6;mn$BISNWmq-LH(OsX>E*Dco63(P`&ggQ
zZ4;oJdz<c2Yha?zG;hf1neJxrIE9B7V7-|Yc{RT?a4A0tYh(5g+Ji~{?z$f=)^_{s
vR0ugvYq>&BdkS5L7V|q*{@qAJbpHV!9DLwOD%04pJ;k~?W1K3E;4b_R-AflX

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xxhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index c7a8897a529eed901bccd96e7fe380dcc451c914..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3466
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
VkQZ5UbEjV@L){xXWm=B+{s*p~TDkxL

diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_question.png b/app/src/main/res/drawable-xxhdpi/icon_cp_question.png
deleted file mode 100644
index 09455d09fda5539972882f83017cde6e013960b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2097
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
V%c~^rT3Y?-1O4~WRDP_?{{fx(gfIXA

diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_activate.png b/app/src/main/res/drawable-xxhdpi/icon_local_activate.png
deleted file mode 100644
index 600e6ee61c33f54be6ebc656cfe97ab182d9695d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2678
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

diff --git a/app/src/main/res/drawable-xxhdpi/icon_local_reset.png b/app/src/main/res/drawable-xxhdpi/icon_local_reset.png
deleted file mode 100644
index dc9d659dd714b05dd4f0fb92712dc8f1701d0814..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1884
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
AVE_OC

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_visibility.png b/app/src/main/res/drawable-xxxhdpi/ic_visibility.png
deleted file mode 100644
index 882eacdee514db06b1775d5388c0e5921e518094..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2090
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_profileswitch.png
deleted file mode 100644
index d5631ef3ae8d011310f9a6d9efcd3c919cafc46a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4514
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_temptarget.png
deleted file mode 100644
index 955a19f3bc9639014853ab3869ffafd5340d5f66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5622
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
P8?M#WG}5S1dm8aC!|HIp

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_aaps_offline.png
deleted file mode 100644
index 3da8775fb41c6a66395e3adaa7de12cd3ba4434b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5173
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_battery.png
deleted file mode 100644
index dd21ad490ca6fa3a670fbcf26eb682b449c7aa77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2612
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_canula.png
deleted file mode 100644
index 6a3585b72f53bb3893e373ee11770e15fe33f193..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2285
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
A)&Kwi

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_insulin.png
deleted file mode 100644
index 3b50b616fc64a1e7e7cd82a090a837444e38a0d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3972
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_age_sensor.png
deleted file mode 100644
index 2dd35e6e9e27fc6897eb6346fe5857a339d7c61f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4801
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%0A_9%8KR<`z
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_announcement.png
deleted file mode 100644
index 256631f49b600a8dd9977991d31a1c1b3b06db97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4990
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
KsL8<N`u_ok<`Sy_

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bgcheck.png
deleted file mode 100644
index fa72b549a9e126250d6d829906669d16cfcb388e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4845
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_combo.png
deleted file mode 100644
index 1418ea49947f70cf4b0db37b4fa336646eaab512..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1132
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fzdlNB%&n3*T*V3KUXg?B|j-u
zuOhbqD9^xPV_#8_n4FzjqL7rDo|$K>^nUk#C56lsTcvPQUjyF)=hTc$kE){7;3~h6
z<f`ms%M>MhJ1(0FE1&_nsU?XD6}dTi#a0!zN?>!XfNYSkzLEl1NlCV?k|W4Mg$UmO
z1?T*tR0UH#Gu>oEV+#dyOFctVOA8|t9R(u;Lo<B?OMOEVT?0ca14}CdLj@>Mvg1;)
zDN0GR3UYCSS_b6VDrJ<E6j<r&mzS68l^g5j7p3bPT3TA_8yM*u8R-I5=oVMzl_XZ^
z<`pZ0jDVQol3JWxlvz-cnV+WsGBYtLzqG_wNl71Mi9Xa8p!f9Q{sVI0A(Wa243;9G
z{}nvfSurp$-SKpB45^s&_Ksn8XgR~Nhu3EXiMVR;mFjHq7Lzq9E74`WxUgyU(WUbb
z?7i<$DB61F+@+=R3l@sRh`7tPYzsN!cu=vhJHP0J<-g*|&l|lJ?#%h@^sc}9oNOKw
zIBp0N-4+|~tN;7-=jkNth<jC&f)~5LdFVSyo!#=l-u(SDGf!>X8rgp=vDEP7wHJcF
zzr;>TU+iA<<>(7Wojlu<$6g2u=cw$Q;{55>7rvq`v0k5^14VM*{n<0|$-xtfClyyt
zIXXwu_5s7WKDh}TELx2Y59OZx_@#UDeY5$W8BeYsl-6pLiLY0$w5d4!z4`op_304-
z94uUo4vGRAEKIEq3j{bsm>QiFh!Fg+)t<fB^5ofz%3Yrqv#+sglsPk1<+@vcf~DR@
zxG_6C<ImYIW>>MC`(*V+<*=C!(>{NF!RYx;Wv6M?5v}4*R+6kF-f^U>T;p5uZl_B4
z<T)`Jr?sNwZ69#_Ry_H;v;MRDB=zFH8A2z{d%inY`APYm(<Jf5?rS!@w(i%IQ~jBF
zPB2(+qu-gzN68OPUu5oEcyoQ;on}aI9-ZQFPjB0!7nSp$oP8nq^8e=l_P4wIf0sXd
zym#Kuiph3Icg;`HzE}F~@qU%{Zv7rb)+Z0g*8SHz89%@Bbe`GfzZ>7gm|yo#x8ft5
erhqCA{HtZ?eXH@kVb7&(kOogzKbLh*2~7abh>IZr

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_meal.png
deleted file mode 100644
index aa7bdf7fe3a817fe30f1ca15a4b9ebf61fe32437..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3634
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_snack.png
deleted file mode 100644
index 1f9ab1697d75aef48a0dbed50876d591a1b4efbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3854
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_insert.png
deleted file mode 100644
index 2d7e6b4542c736768456d9cba943eb52a7ca154f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3772
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_profile.png
deleted file mode 100644
index e8b4668b86873b41a3f3e637f43b7c764b41077e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4222
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
T+>JFn{x+~Ow=-)r@wxFoI)cop

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_start.png
deleted file mode 100644
index e8d0e6773e4fd6818265ec0e602422d7ece714a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4949
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
HeHi;Mzd#&{

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_cgm_target.png
deleted file mode 100644
index 2bdaf7d73d0a83c5b3cdc45ae0694eb65037bad0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5083
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
GBmNH}nWxGC

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_exercise.png
deleted file mode 100644
index c16560e8de0dbcb0646c87320330444797092380..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6431
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_note.png
deleted file mode 100644
index dd1e04b41930b3ab0c3aea6edd738e9ba0e640bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5399
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

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_battery.png
deleted file mode 100644
index f1d306de1261062fcbf64bd07b94175a2ffc72a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2659
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
YGO~2vf(|VjbGtTlwm(9wwhKP@7x3qt@c;k-

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_canula.png
deleted file mode 100644
index 465111a6baca0eb042099b14e19e6bcb618ca1c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3705
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
Z5BTh~VMZOvsN(m;h&kb6*L)nC{%=+@jV=HH

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_pump_cartridge.png
deleted file mode 100644
index afffd9048264b5efe58d33cb41fe769120e6eba0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4483
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
SSNi+kiS227t49{NtN#N}uMM04

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_question.png
deleted file mode 100644
index b2e19c157587d6b49a24522532ef024552cb16c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2737
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
N^w~r5uJJr}`rjyg&Po6P

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_activate.png b/app/src/main/res/drawable-xxxhdpi/icon_local_activate.png
deleted file mode 100644
index 2de9ce9d4d48eb380064e9c4f150b2f093ce6d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3549
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
ViP7<Zwv&I22{5rn)fiok`yZgPjTHa@

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_local_reset.png b/app/src/main/res/drawable-xxxhdpi/icon_local_reset.png
deleted file mode 100644
index ec5447914932b1946a725f0f4087ebc3414b3180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2510
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

diff --git a/app/src/main/res/drawable/icon_actions_temptarget.png b/app/src/main/res/drawable/icon_actions_temptarget.png
deleted file mode 100644
index 39170bab37f0625cc3372a69bcf8c53208ca5645..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1364
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUBc3jfAsLNtZ`7`to-D!sp<g0cIB8?0ZRJg!D`)n&x~DI?CBVJ)P|}S6
z3z5%aOP9%(n7Kcj|17s>;hvmDb37uv<M^|^^^5s_sXIw8{CK?d|Ff6o()*uR_RX}t
z|Muozo9lneV$av!zyEqyo>s_;fQ3%2T%!MqZ>+q?7oNLo*G0YRhk-rE&-a$pr2PN+
ze@E{8wvbcp&4qe=FVA|Gy<A%OJ4vPO@g9|G*7Hf0_l|5cQrD?={gtd&wSi-8hF59(
z<1n3L;XAl@Pd6=`*=F*%*yniInF9eaGhQ8kq;lq<{>p#Ga{`V%NtHC>Tc4PJN8{f=
zpPC-imA>X-kIZD+tP2&UCHe%io-%miV$=8DkcYp+KCVCB_`Q9inA?(V{tsU$d5M^&
znA=RecmAMz=~w20;HvpOwy$5^7mQvfFL(G{rKo1s2@#pb>Lc4$Cd%8WY`d)LS;oB2
zZFa&|se6ZNE%>HC3tiHoSX;om@8Dm_pA37{d1mxxPp;9r6+B<H%p`4{LdP|wQ%{a&
zT7=|uuJM0yz+sM##H+h1_0BS11SKZD%DU0C+)(29lfY#iif32G%$Ue4wD3epiR#U$
zjY8R%zkA*3)n+|?^+S<X^e2trBNGx={!vk$-SSpx+p5IX7V?qTs@yCNe>UE9%Od?*
zpjy9TFspU1&;7d*>VJ;%2!300TuUbU`gT{180EIUE9J8H{5M^U=shhRsO7)rYOCMF
zFTWBs>jbXcYKe8V*(x~u)vtB_Z~G5v98B^KzN;`t@y{u)np+(~l{_zf&O7)V5l#9n
zu<?q{LA$SR0>`#;t&&w;)Zn^uou|Yvn|0YCE0xkyO0{MiZ~B>3ns@R9pMcxf^Cy-)
zv=(%@R#2s7{TbwX)s=fRly5g#AF*8Z_v+tE#S=W9<cXg#JKooMP36x#$?b|FC*5})
zS=A#Py-NM0wTsYIy*ZDLspJcLUQ5t9u;)yKb8CI2Z2YspWf>ht!51>3=hn<hn4kM^
z$&Jk|lag7LbI-rHpcj@sZ;nRR3GbJZ`cC~iVvj{)=I>MQD)@VJSJ~#HmeCqPjWHU^
zJ^OurG_tdDUyaXL<Mp(?-thb0CW&huFD%SY8Ki73=#zF4+0Ao2{Z;nDN;8ifLBEe_
zABB%~)To)C+EsHyA?R9rVPixq|B=?i`&OP!*|_)Iv58F!=ZU=emJ3X2dt7hoeER%Q
zX`7U;OgwLJ&`;?&0rqOw$jRT2m0tMt<xOL7p`qFX%ZWn!b^rLTe6hA#_lMwmE_)-#
z7PY&3O>gcmy!@l}gS2h^^$nnW1j<kk>)Y%ZUI`xkB&6O9EG8KkJYD@<);T3K0RTA9
BO>h7J

diff --git a/app/src/main/res/drawable/icon_cp_aaps_offline.png b/app/src/main/res/drawable/icon_cp_aaps_offline.png
deleted file mode 100644
index dc506538838555fade6e8bee85485e3693d4c92e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUgPtyqAsLNtZ)A6bq{<xscs?&}wrJ#9&*`O?-!!FWx_GM0eA(Tlp=6|`
zq~W!R+jXxI(@KsvOm`Pl1-hhaIEwFbT((zJd8^Jvqt&9DbGDkiO;fwo{a>=IY}Q=M
z;&V5fEaD|*RG#~6^ZdW{|J%iFlOW(ff9_eeFMcyV=HCePR)2S-ID$_({7n9igcA>L
zUoleNz@fg#S!s#n+vdzbHol`tii_C4FN?K^kh{qqYr(;;mVA5id8;=oHm5E5aKxgf
zdGp8IThd~xPa@{Dds^_iXU?gA{n7B=@!L1n?C;Qw5^%IrJX|Qc?&uGz>-ER_Z%q3m
zr}k*S@Zw45U3bXWbLrQub@dN9p|nJJ`(rkl2|aHGHvZ+CmXtcRA*!uY#zJ&D$6;-y
zWeLqE?%rK1akXng*_k7EEi5FXyVN%@>|b{0d3lY>ykEX2Z$$ZsDjj>sYtz}j!FX+9
z<_j^yKRX0IDlY4;sfel)6y@{&W-S-bwLZsV-Cfn9H+DMS&rDQ%CzK`rh`iC2UBD)`
zZ2Ru}wS3}<5rT%I_d{d%^N4dNK5m`CJ^QYLZ^qkWLT_3lf6a@rReKOKr|<ER$!|T@
zy%o8dW&d!ZX=lg#*Ka->-8&qt)W7b)>dICD{|tq1$G`6IoAR(xqHE*H@1{y~%pPSt
ze5q^tdHbUv#j;Xk=FcVH$|kO{t#IhL(e`tP;N-%V6Dx(kOueGN%4Lqup1pjVUB9kM
z<G<(o%uFR)Ub44x5u?!4GQGG@=hxM$#0k#br}U`($t{kDbBzo6^~4jmEDCMjRPjWh
zaKdaAt4~*z%;$y2A4!sFKL1tRQKaXj(#-4Kmv*~6iSSMl+{C`WWARbXim<=WuBr-^
zt?Bp}C3tm@n${JjiQb2!O|`r;as_Ks6?PRe<_RnAh*HVXS4*13v30BI>ut$xE3)=)
z%?g=#{6}X+tjsStQKc|W|1Xb31igw~<8(yaCq+exIT|`yeOQnY^E~|RPOplj;7_}G
zi$AE9J(Rh4cfO#ijkqhvOx;5(s@8X@n}zo39#?kC3I9|(T|-R%#80olmI<zpRs<$4
z71+4*;H<biN_|%Goklh${erH0BEG)JPMP1ClBcq0R_dZBd<W$#drrKbcyZB@vd6)H
zUAH{sySUZ-QDW`$by@!=1+)CLF>*869k@u?Up&7>G_8v(^kLc?-MAB6>Z{$4arpD7
zFs)m&dELDT#S~E^|B!k9E*4k26#D*V9^+D6Jz@KijY(2<QVHj{HIH*CX7`=(G<<IO
rasM@)H{Ife*~flQodN}a+W+w0dUCqAQ_pres3i1s^>bP0l+XkK{?R{w

diff --git a/app/src/main/res/drawable/icon_cp_age_battery.png b/app/src/main/res/drawable/icon_cp_age_battery.png
deleted file mode 100644
index 6c7fc5613931143c3d6dfa0ff4ffca876523f5ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 911
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2qx_jGX#$!L6g{rqa5M496sub)wv6<v4ckds+mjJepUvu;A%>sm!NP5s0F
zPpH0OlF+8Wx;GIVuBV(LJz`T7O`l#W*m>+xrP^h~@^dq*)7*m3@AjMf+-Cms>V5M+
z+dTj2s5H?-MX1w7Y2pk6t;(jd-FJ81?U20UJ~QBn`K*f8qdBQdKjq(Y?R|47a*fvP
zhYco$lJUFbzZnIoY?ShIdmCM&Ge2H0bm4dNhZ=cLO*N91DDo^9TgP?RjxX*p(>5`|
zaPADNzdJH&)E>A$`&+A-l%gatb)uDDLT+E4=`!vY3G&Z$jI;Za#BQ}+p3!x^bc^vU
zwzQ3s+dtZ>r^U`F;BbDI7-rz394d3rvHtj19=^wpYvv!TJNU*s=J5JCJAy5)hrXNn
zc|%Xm0m;O+%!kZn$96dz&XkSlSG{v|bJNCbr}JM^CEUs$TRi*7k>8TS|6s-i>&=0?
z8)jFSJN!|tnU=h)XCl`&Zs%u0b!o5Ux&I%F(b<2T_uv_YnxmpIJx}L3Z|s@4?ZemK
zA5~sS?a;5eJM{x^dD5Kcds!aeu(s8`S;xEW#LwkwiH<StpDPzBxmjf&*ipXk?)%g0
zoNJGsz9=HL(8^CT=UAks>6_l~pLa~ZzTib=O4yAeky{6NCr&Gn`+4Q>hBF7dHr#kC
r_|5%s0;7HkU+5RJNze!ZQvbW{<6I)%OLDAe2IV79S3j3^P6<r_SubzL

diff --git a/app/src/main/res/drawable/icon_cp_age_canula.png b/app/src/main/res/drawable/icon_cp_age_canula.png
deleted file mode 100644
index 303ad946cda795b66f7d28d456eca90107624a7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2or^K@|x$!L6g&DUErP=et>`kw})-vX|Sqqp$f64@dUqq3#&@-bKL-|~OE
ze+er6P}XXicF|~s1CP^1At%kFIfeP%#jT#l3e$Wfp428tyqoj=Oy&KZ&(BCYaVWM3
z011{8ec3O*R;B)3_sDA7#;XZ;*k>G_+O(~9&+*xd`Xa;Td<tk*dG~;`&Wknoq3FJl
zH};Lk`|3NyKMKtL5n{Sht@Vs&=l;X2KFN&oABC!S-Y~plZFH_>(##3Q&3^C7#piDf
z6p1O%ialh!=fL_qUkhJqmVaPeePe3ZyC3ysn{}$=t^|CSmwY#$zc1#0qwAexwKkKw
z<knRFKlVy&(|!B?2mX$~um3B2G0S9Y8+X#@cV5ApeYWc?%Tr|kq3gSJF4srvifF|=
zq4n9%KJ_=U)tVJNHff&Ms@A&3QoS|DyLf--DK5!_XPahdW*X;A-E_2$`}3u^&#||}
z^}Oe+d8f~hvQ^LRV7^o}<H(9HzhVR5_J$r0)(Pj#`L*`y(W?I$Th+SvPQ4X$V*BNL
l3v^rOe5n+I1e!(tKc*R%ot3WN5)}j`Z%<c0mvv4FO#n>XJ%RuL

diff --git a/app/src/main/res/drawable/icon_cp_age_insulin.png b/app/src/main/res/drawable/icon_cp_age_insulin.png
deleted file mode 100644
index 5cd8598faa8740927f76ebee31ab4d67e7622241..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1073
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpg`O^sAsLNtuiswnpDA<v<MmCc6Pz_YCmLVw2*?Rao-=96vY4HVp0(8{
z{G0f&?MWN=P9@K6#m$*B99^6`H;P)$Pv5+~`~9Quo4;@S{_E}i{9N&Q->*j5p0ApB
zzPy(I{CCBP9x6heE=m($w61w^q_3}UlS$8k>OJS~8`s>^Io;(cbE6>gsASvI8Okm3
zhk4f=tG}`I)Pj3I#N;xajO&hZ%Lp}zCwpDp!)y_MMfq>;iI6pi3S^F3ZVB)0Ke}F`
z+5E<&)SIi7xW7+VT-?HV`J;Z{swXb##~yG0^Rr}Hs;;Y<hP69er$AIoSkB?Ue#L4W
z{(q+Kw_h(+9ayq>6VFKlY3)znYj?ak{X|y()6+hWU#kyw9Q^r1z9OXLFyq&kZ>Mck
zGP(9BNN)wN{nN+EE=Q}Bc+M8M9DU*67E-+|T<Yb-g*#{LT-1{%T3=(U*7;;_ue{5S
zx1w=TE%t`|n+<{`ZibzH)@zW$Aof6f&yl=BKAodAqU-qu6}Q-n+q#CV?cLFo9?{Nz
zBY1U3)aq*qJ;!VV&D6V@b6ETy<xjmMaqF(p4aI*ys@@!N(h-(>5j5$vmAhHD#Qu5t
z-<0(pNw_8To|rf<<7k<V;6f9w|4*_@G*6~VTxz-R+H=@Buy<Z!s@|#>RpzcYb4Asw
zpHGSrjBr~2m2r7XhSL|5iEEm(BHB65|5Y-Vx@2@kD$4i96z-SYxfa^1uKahk)7X4{
zRtN9an%Tv?x)m{}-BY)H-0u2!er&-%=ZWmwe{Bd){8iN_bBt%|k@tPuEfl?qs`)=l
zIoaOL-)!N$%jYQT#j={Uhjo4G?+BdlydC>>XQ4Rz*8soMi{>rc7(3;{s|`0FOG`NZ
zz5Bj)&dK@lk7DP({yNj`j(~B`;b7C4maZTZcW{aUC7k!|{Y(Oji&y?mTLH@Hp00i_
I>zopr0Jv7e)Bpeg

diff --git a/app/src/main/res/drawable/icon_cp_age_sensor.png b/app/src/main/res/drawable/icon_cp_age_sensor.png
deleted file mode 100644
index d312b6c57297851575871c70ded755015ad87e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1352
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJU9iA?ZAsLNtZ`{s~brm`O(f{4r-q72#9<2S=wB_Qmdybi`-4&GrN4S-K
zX#9Hi|50;((}JdsMI8@#0|f-Pg!CSqp%EBdC1`RnY7uX4Qcc8WTWf3E>iNpY15)c1
zea_9Cxi{_Xtgq3V`As3<zx=LQr8+<_-wHFIcR)-hfzSN|Z{MOT3E|<Fmp0w&)7e=1
zYx3EHU&>X#C5y=?#<V)0jX2#Q5E$9dD{+XgXUY2xj=gR1-NLJtHeKtR(_43^saE2E
z=AIt;PtE_h`%-uwDdrrO+@tZ_XR7jD*_ab^D@1BlldDY5pRU}~(D|jOy)be0G3%*s
zo<9uRXsE1|*<JG3bK{Q6GY^CpMo4-qxt}{8cBlRMRt1K+T_@Jv*}P6y@_Tg_`$qQu
zhmI4~CA}*|mv5Ba9UbYgTxpW|HfHe$+YimK|LC*HvgLIlv)kn#&s&5q-RUoMIPp2<
zDwCDq#JV>=|Ic$VYIdJe>U->KqrGU0Xu0SyS)XM6!$(8AU$iKPcgD^;+WvC)>nR#Z
zeaRKBPY#^DG3T{)>-!=zua_;#H#g2YGG#|yj?nHo=@BaL_pY>0c8dw#wQ;*ay4u$1
zVY-WS+|9bG1LsA~(K&OzEZghF|L`52D<b?~MYsPpUGh`PX6?j3!b#5CMBkiUS~i*M
zluTvJiG+ETHmc{=rBuu<cvtZ&Psegobn($h{VDH0A8P9UCKhBJu*q+VwUOQv{p8IP
z&aO6nb;Kh}-E_;p6&_bk7Z?9t+xPCIlfB~3%1w*+uV^xIzo%WZkGH(zuAKPEJ=$M=
zMUU+Z{c)$6{m8^7=Nad|#!tLuseN<CEqkwPo!?%a5Z@82@^OPjQ1i(X54(1HJI%c(
zKJoPZylPil#YuMORagF9nN|4K!brdGf}G$~ojdotlCE>@pYwEgbwS{(*&1I`or1Oo
z=7xWBJ~VN!RA)qF>1>0J-L9$ehoq&Z&aHTPOX*Wu)zvplZ>@?X?7O|JC-l_ZKlW#?
zl6>2dyziYS_N@yvHsV|I&3m<Lg6LbTO+Dw26e^Ux^64(FK5A+o-;(}8uTH0DZ=lET
z%#U1mE*-v|>a!wz{?)9|V@me~kG^f`$h*ksv~6?muLE8)^G?|prZ{?h4y(EQ>`t@j
z-`gKMZY=Svx%H~~{M7Kfb%n9__51Fb#7)v}d4B7>qpKMQ>mBuwo`7T9*M@BHx^`<~
zVBzGmb$n9SEJW2^__j_iuirea?@L#<*S{W}?j`cV*XM0pG$DO$aY{&xow$pty;9r)
it(B)H&VqsZ{{0L=Tt_yCtLt6?6@Z?uelF{r5}E*`k5owj

diff --git a/app/src/main/res/drawable/icon_cp_announcement.png b/app/src/main/res/drawable/icon_cp_announcement.png
deleted file mode 100644
index 6e1338ac2477afb55718e21257fd209a8cf6388e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUGEW!Bkc`H+H==uDgJq6?>_5HZtE;t%luNhS+8t_-gj^m81#Qnb+O1KV
zZR_DROQTTU^>UQ}|1HPWiY*$=Qm#w*TY|201l49VP4qmfs(A5Y-{Xh-(>Fc;Qeu?-
zzV=sA{p87|=i;*8e*Hi9|G)p&>vOXp;LSv%AE#4$7roALwD*&L-6AZmHZ$$KOLNzS
z&XW=u&y{vNpV+ddcI({kH++i07Y@uS(+gTUfzv{=-8A-o+twc|kIwP?@}Ol?cerZG
zHiHu7x+7_KRC#Jyr*E6FnLqAO>W*D&7(+Q`HeJ0Te}18~?2AKccUF{^#q<?_;CZK$
z?IP-wci5sv`QOb-3$E*_fA3bvJ}xd^cfd5FW#^COYXn0%EbX)T&)v-zSZ%=k{y|br
z&&tUERdZTZMc4FawaCoeDqNTsd|!V?r+b0Pz2hZ+y7;vts%L1mlq6{X6D_=0bKdbz
z<4+5Y_nd)KgTg%AujL)_n$yL4v-bXx_dn#!J0f;+PW~Xqm$U2o#~sr1A6^b|{^qy6
zmPL3|nRMQ9*NC3dM~1UBdFp~#zIe%Wv47a&ar=YbxzqdjAKeadK2??Cb}jE<zEbep
z?&~e=^G@`}&e+PoNPP1qex0LFE!fyO-m3(Low%@nhhp~ihjxO@dzJR;o&Uvm{ubLh
z@k7%S?I+%>`Y^X?<&K^Sg)<%NAH2QuRnJEC(bDjoGVi0$EL`m03C@1`N63sP*zLq&
z3l{AU;qR)PCAM>=KVTMAPB%aMUM%(O9*}g%iL*OYfA0(L{^$5`?NOyZJ3-UXd2f}f
zeZ`+o4H6MFlJ0+A7q9wiO`6oAf;p|S6@e0UF?nY$%r9_Zw04`I^~A&`e~Gx-!-av*
zzC4K7)4=^f)K2{Cb(x2I&vur*ad~BTN%hqGG%*f-9V4UHK4Q<mto*?k-+iSj=$m5G
zzvnL2WlEtZGL{})o8%m$SoUS-B7-}k(gpiHZZ7o{-E{Irqa|<uv%2-ir4LE}UBo2e
zFkc{Aa-~z8*!iCkk_VC(Ey&Scd2pXpyh_jh0F{nyleJQ;^#o_8ubDG*hnr&88|B(X
ze|Ch+%z2RiaP3yzWBP*CCw_?4P7N$cmls(2!{y_z<-*sw^3NWe@B4VYi2L15$J=6q
zj&g4FuSn@gcXc|^o!N2tdLP%dY|q{IOzKqPEOJEqZ)+}^vJwh@+JBS}-m~iSrM35C
PLB*G+tDnm{r-UW|sBR|`

diff --git a/app/src/main/res/drawable/icon_cp_bgcheck.png b/app/src/main/res/drawable/icon_cp_bgcheck.png
deleted file mode 100644
index 0cb14c2f574f22b0fba26b9b3bd876fcd2a4b3b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1233
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;M^6{Wkc`H+H{v@&Lq(2%?EimiL;ZzjF<TWc;Tahn&XECAmaz#6UU7C4
ziku<95$5L><`(%m!F7pX%KrtMsx+JyOR*Rpk=VFmN|21pBq2jC7qy`3i1Y_#*2cx(
zc9ySb|66Oh;eBNJ`umoz@7tvq&Gb>5eDcqGiK#`O*Bif=(6rY(QuycM4vUYozia<L
z_`=M(WNCp`tLBYv{X)09y|*<}^tL5ypIen-%(ecJ&6#7urRMq5Cw$&0n0%pexz??_
z&C(wf?2a6s5qZ3^jI)wa{Bhx%14Si#$;FJjjz-r=p8jARH*v=9E$%0r?)1vp^i~%N
zt$%z*@r|6I;#QgEg)IFKweC!L<+9pItwX&+=DR50+k;U)hn<^m%<W$KLt-!Q>-7uy
zV^{WV(R$(;({$D1!iIl5bw{*(bT{r6PEU@#{42gfF#Pc*5%(y;ONx`e>`waZ_RIB5
z|M6c!x1|d`p12#&?t1-4BpoQ*yRpK-=44vchjkjKx10Pe<Es-|c;n2)NB@s4w+IeD
z@pXsfd(HY)%xeyC+UUFRU+8{$>i1dGqkH$N?&tN2Rm}dd{6ynI3mvc5OCzpq_&4dr
zBk8}vXIv(l?{-OE>m#dpJ<;!>OML6^>s|jgtV-N}Sn1BQN9+@mrH`yIlG^?-q${|z
zWsS(jyD^1qk7sCH40g5P+u+-BUG0p3@hz`2hYp4;4_ba-^G3V=lF+FqZ}gvcWnO#4
z!*73g>yJ&7tVC*^{@BD!$%yU@QRH?Jy%m(azWhkQ%q#M%CTXQ?%4qm|L-SNt=svx5
zp0c~ORyz4TG&kfad$f+_cJk5Em`C%bdWe4NUh(yB(zIDE+FG~x=E&6h-PtU((rMe{
zqQVJPt0SV9-x4g1EBvcfc;0IX*H4cge(#os_l0X;9O6Fub5T#>j`%4L=5Do-Z3|Jf
zeZ=x(g~np;4bdgP&L%z3wr(!zG)(RN<hU{QRmr!dN>l6v{dWb+tg;iXygY~b^bz+~
z|Bq#{?(NBMK5YNfoqts4OXG}y@W;G`yRw%spMMlKF}l0w!tDj~1RlLSe{govuD4<v
z>pk`?&0M50M`Y&}Rjs=nf#Dn%CDJ=p_Q$r|;4!=>f28;k^O1dGwP#=n`S>5+8HeX-
THcL1E1eHXdu6{1-oD!M<DWViI

diff --git a/app/src/main/res/drawable/icon_cp_bolus_combo.png b/app/src/main/res/drawable/icon_cp_bolus_combo.png
deleted file mode 100644
index ce4d8fb9d39cd1bb9238c4c67b51af26126704ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2q7d%8G=WHi3LZkxsAC~@p#eUi$p9~W6?E8KJ1u*o+weR;wL0q*<>&KzNJ
z2TpNkJm$>N5n>8k8Fb@!;2RbniLxnodk=s5lQ6UNdFs8&h_X-tK|#TZOYZ#L`{CEm
zuky9t2V^oVUTt#_uK2&xV5MCoxBR19H>XCiD5f1K_lV_}U}C=Bw4G~`>0{{)d@Elw
z&h!@B)4xkOUZW#FNLZz_y_Vz3#yz*rUwM=_%VmPzLAS&ECU6y+`@Z_Rn<38W+3y1u
z=h{|Qx``Yy=XxZ~`mwj^hnr(f^6#}%nLi0$+w)@mOHsMTO_ui=tD`6Co?s8?yixOd
zhW)IM4_4e}mMv!RIe)HxBda9i`93y1?c;yW^hmqM&VG<5a`t&@i*08I5G*;uX(cMt
UvoY?tCMcbGy85}Sb4q9e0NdjHVgLXD

diff --git a/app/src/main/res/drawable/icon_cp_bolus_meal.png b/app/src/main/res/drawable/icon_cp_bolus_meal.png
deleted file mode 100644
index 54b51e126e18c1e52eb8102bd30c327f69f79f7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1046
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpHcuDFkc`H+*S$MJ!Uc|fyl;_I)8p|-p;2+)MTZNmlM+ipLSlZ*IjX`^
zqN=BoqN=r`gR@J4QJk|$BO@%Y=B(1isr({=M_L4$n<PYiudGnm6(}J8c2Qr7+2cF6
zFZ;5bm!EaJHt%lnzFncEuS{n8s7*eZVl?y2Zztz`wyEpleD56#SaTqKN7MWdJ8qqn
zveLG__d5LT64oCa;u|=1Bf7gKV*8K2dU+zt<}izn*LCX~Vf{ycT~9pcrgOl2NBesN
z4*!cS`WtwDf7}$-eQlFl)CR887v~&{dk}AP{D6s_!rk57cW*Shw;s8+)9qKX?LVQ?
z0_oQVqRoavk6RY|{)n;o!*BMO?b?gvvM*OB_7}!H`Kx-yRlDp_xnSqo9eweae`LII
zlD<_adAl&kB3iVzFooxwx}mgzdhP!H#dqJVd$8(8*Yw8<>o_kyHwbnqv8p?KB<o0s
z^f^I`-iI#^tW|jw{PEfK^38Xr+kH?J>)uj5>6q3Jx%vg%>ITf_r#V(FyCLl=wPkT|
z&dTF1g6j|6Q&}fvRS>bKCo*aC5C5Fr?%LF-6z`}H9RhaJ)gkX${^%^S^!>8%(3IX2
z3V(Ee9TxfcO|0veMR3}~?HBmdUDx(ped`f?x?_#N-UrbWk9&Vue9Mw?{f59RmrpI?
zpW1suvPUTTh2ojx>J<?&>4|z=wUh7jT+vcGo7DYANON1jlM>rG3VjBX4fb^uO1ei)
z{+n6I@P}dll+f^|;Fng5L4x;MehB?L5^fRj=;x*w|Lfb7j=4%bGPo$e&u@Rdz_}2Y
z<kjrGkIqZz9A)0P^2>~4u3feBGAjO?$D5Ue@qI7Z?BUYaefZ&oS)N+wjSJtL2POk(
cYAEl!&bzq9CFlNA6;O8eboFyt=akR{0IMIf*#H0l

diff --git a/app/src/main/res/drawable/icon_cp_bolus_snack.png b/app/src/main/res/drawable/icon_cp_bolus_snack.png
deleted file mode 100644
index b2ba41c27d3de3407300dafb9342c2cfacde1f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpcuyC{kc`H+H@rJM0%eYW?7wc1VyM*9y6B0d>yjyZR9zO`%(PL`lz!tg
zEm=L)L^<W4)5Zx?Y!*%VBsKF`^e2r;?sD3OI_KuHITxMZShTNn_x9iWpV$A}|L*_4
z_y1*#X8Nd2KAB?lze~@s`TE`)7wUGhZ{5-Ee51F&HJ458F-z3{Cz}fcoL5HdnkIF1
zrdr8y@iore$HceoU2%MxOYz@HAx^V4GCOZzQ7@D_T(G&~S>mFdb)H&^8+hFdICEDV
z@w=n{Mwj#XD;F=t+#4NFB|`7aZry(L>*JQ<(nZxy@pldQi$8GvE@WF@xW;1rA(b!3
zjTKqXKgxddWaYgR88L!P^E$ZB950kPs&MC+-5J+-#}Arw^xp(7sZc)Ln&9`taB70p
zG|t92k$nrZ@83NBAi=QC=-zZ*rPc{<F~_s!20w8s{L>faSY!NZ!_FLmjVn#paipyN
zRQZqZ_C_|_(`-W8DS~+~euPhXIwN4+@+qYP+9@{c+<qx+F)lY)xTZNm@v75G--F&f
zI@T6p9<3*ieYU<85L#BSX2Np`ftQQt9#lG&zh=U2t6g^_v<#X0Pg!+{7J2?~`0e^@
zrskA;+NrWfxGdYxJ6Q`IcCrzz>si_%`YA4hCtJDZi(~JFlxcZ#!6v=DGjw$_Pj84@
zQL{U#$wTqUk_$)8e*We%3(D|+^+8RoBP91v)E6O_(Ell`4@G?W_wt{KqOLyoY|+3a
zQ4zMHL91(*KVg{1aZt~Vzve*VokJmO1b%IiO1!MpHAVXf`=Lcy!eL1(6qd!UaO2*v
oWkam~yzE2ETMSd+vCep(L9?w`Y2`JMC!l=l>FVdQ&MBb@0F#xM@c;k-

diff --git a/app/src/main/res/drawable/icon_cp_cgm_insert.png b/app/src/main/res/drawable/icon_cp_cgm_insert.png
deleted file mode 100644
index 67c0fb1ba2c90b65acd7d81009aed78247e7ab3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1156
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpFP<)rAsLNtZ}@jybCo&%aeCP5ciUe6Vqe3z$)j|FN|TYd=c@@9mwMOx
zDV7Sn5lMQq*1O(8xx>NyvqDpc#zdEi7ZtU%v{vwlXxi#r3yXNRYxT7>*?pUTy!rI|
zt=;)|HjfhT8Jzhu@8`d?ee%zK|2}udd0~Kt2v_T&(BnO;<gd?{IbrE8ZgsJD=So|4
z+Zj{m<$Ju%i<y6`c=FvGo`<Y8)>awu?;jaXj<I%qKJB617q#|hrc>szJ+EG7Q75|k
zBg4McuW~|96umiciZiFJfUo`$OIxsI_rWW2hvIikxYfL4Mo!!1_vt~ka{bBHc1QO9
zD712VcR)SqrTrmmi$42HOBO$!FLo?vn%%}-`j2ZBpM7_04r|$?=aeQ}_Wa{|)wqK-
zIfqtPtlGF)Qt@sD@9GbmBYquMt4xn*Ii(?9Amu*0Xy?4M6+-;|?`Qa&s1clA-Zf#T
z<nQGVPej!i^nU+;So4nUzGNlExfT8$77e^7C(fQVV?*$g3xT^n<Vd~O_;r-Mj&uJ5
z2|K^9E-}qZoz6(832kE5F7VKKzW>JMmJTbvWbSuDFL!q_*7Pa=IQ#U-Ma`h!&Jij`
zHzZz}9Z}z)&s)*o@iXR(&$*JN&!t^gtP!lf+~j#r{=lbw_m29eu6=Hx^r_rW(8c2K
ztq(O!^E+FNn71$6#2|a}*`6DJ?;rSnY-!x9);oINT1qc}x0cQh{#zEBK6gU!4%a2S
zS9jXph`bu8{>1UlHM8<%$0TcFuScpcv7aha((yh?<#NT;Gda&6bgsX0q||R&RZo7a
zYSyJ1zja5tVg$P;a9JJc-55EoV|9*L5!cP8`9Zdl(v#nI?^HXl`DB5`$$c%cJJuaq
z#+;uxd&m4YXH6^p6zw~hp9$LNu3Pe1>X&$z@CRc(dADry9bqT`Zv5UY{3fx`>PN^O
zZ?Q+*clygGpFKH8c)M~o?<2uIn(t&c9}TQs$+6OXvTxX}sderf<j!}$etBPMiCHIi
vRN1Y)oAZxOf3$yf{w<quNV;=c==+D?aN0Cy%SVDDpu)q`)z4*}Q$iB}iY@fB

diff --git a/app/src/main/res/drawable/icon_cp_cgm_profile.png b/app/src/main/res/drawable/icon_cp_cgm_profile.png
deleted file mode 100644
index e0f0a15cc8da56d5b56c4a36547dddc312e57d0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1075
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp#hxyXAsLNtXPoyI4HP+U|5#hgoNeu-I*(bbULQ{Qa;u6j4ZP%(@zDOl
zeSvFQEB7xj%bd-0&~;Djr0!{=A|ZQtc)IEYTyr-Cv0u#Zw(MV)xxo7KvrPVX?0Sc7
zpU*2k|NUIS`_u!EKUUbt^*`UQd_qb=^Yn+@1FjDwJ}}H+aJv3L;Y7?l>q(ooc>X=v
ztMidp)mbriQkbgk<SpKpf?t=L&7PoH&As@V{MLUd#+*0xHK&A3y^^#|>~;IId@jZ7
zxnGY9eKXt~pUtNDcG5IeT@NkQ8r9AE-nU|xOweV`&}Ni%5Wm1Xhj|-wc*E8sH%uRB
z6$sDRxQ$^C)4gRq`7+y9Jy#7?*}Em*&QtYi?veXms;X*RYD7=Rp9%_}$NbUgq9Xf;
z-V9Umr1M%I?kHXrTrmBGZW%NC+O0F|l{lKb*OfjM{3LgS>kFg&reoF{*eiI}usLqH
zZn{GCxJ!Iz*ji=xHQch({(Cona`%wh^#14WC3VN&-q`vz`d+}LfW@r}FW2~fbH3!@
zsKlldpYc<Am9pK(4&PtFmp)p#@<h!GxHNNC?cx@Nms^%hwK{smWsQfG==a<u0xG<>
zz4o2ceA0WAU%ggZm&J2)SH@Y5MOPoaTlRDFg!JFOj~PBlMx2t^&Qi1K$1V-06MWiF
zT+jWeTyXi*lVu!=?VWmkm8~JV{{n1XMHH7DpLbOxo}owJZ;6EBU$2nphIu0Mja_3N
zXS1GBf1}>9?u~o$HuVFn33_R(kA4*k=(g6}?fuqk-{oJmlb)T~rk8o^Tzls0(|>Bs
z_MOcsH>>`=H@CINdse5Ywf4$6648CRS6`de-TAfMEZQUT(xST00T(m>uD|>zP$$jM
zwPe|@u3wjL@XcYl$M~Ibx)xJ{zzz00%y$1w7fh^|vX$#U4oWuX{xI2zuDCO?<uEv}
Nd%F6$taD0e0sv4+w}Jow

diff --git a/app/src/main/res/drawable/icon_cp_cgm_start.png b/app/src/main/res/drawable/icon_cp_cgm_start.png
deleted file mode 100644
index 14a44bc852297701c44d9818d85851adb4edaa51..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1321
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUnVv3=AsLNtuSa)W4HY^5vA_4Shv{RVR38Z!)})fzK3%6~I0<rAb$0RW
zlJHpS5*Q-pv@gW%qIZepE7wbUWg8a+XrJ;HEK$@{nW$m3yCFHs&$6%g+lFt6eusDd
zJ8yaA@PF>vo6rAyfBM(o@3*qo+XMXv2LG+qLaHiGukYS;?sj+GobKR@&1Eu2^ndWh
zCm4UbX8h6N{bkkL>S<fIu(&@~yVEiAk?Pxn=OvEhl`P~BU-pmvqvE{dQh(-_eoW)A
z6xyE5*(aP|X?XAO_S9or9_pMqT(icncKV~KI&Lx(Qv(Fk9~axSeV<(Tx5BMb(4b2<
zqOZ7M=8c`xH~Q^Ji#6G$oUgW6@8EIOdEYq-_gZl6J|g)uYDZ`z?<3ZjcJ+^`Qsxn>
z6??gM%Gf_Tzi6ABj)&XX0ILN&iNbM0d8U(Y#UF9sVfuCDOt;wV*@l9`h5Y-(*O_%#
z7aA^m7%@lZ&I>`GgWNazR(C(U)5vZR)3128D=Idkn|q_sX_pS!^KywV*lc<}x30Jv
z(JEb_(aqTV&ZF_&7i)b<<2aZ08xyw`zMY@Mmv^}G#hEOJ%`I;P^uFW;M%#yVWSHo@
zn<$ub^s$BRSL>eiLaVy-Sq{efN0`);7{VW@@6la!CEtQkJYk`Qz5heI(s}JcTbxc5
zoe?^=?!$Y7=mp&6kL!GnhW6^+;!-SM5~SJwi<$pX>BLngKH4o;CbQICUE><9xJ2l!
zg<H%l*+<*ndwuoWXf3P6<>&Ra^wFm^9?DLA$6X&ydhNqjy1c6JrRFOCQyb3hRoYmy
zHE6kxliFj>82x)6D%v*cPd&tHVX`jQqvg@wmH+DmtN53sJFm2JjM<_ceEU`!XXf!L
zL8t2-F`3m98-JU8@C|IU{K2yRVNgxjs^Gm&VqAjW9|M?=T|MkK(J)7BVQtw;zpY%E
zhZpbA{ySg$)2jVh61(Gfoaa~Cf9g=!p4RNsr7J>D6f2q5ySvQVCv{9@QIKKqWtrVB
zMLVMJ{9CGbHb_SA`vNgV@0O0xN7Xf3j=6Tv>@nY<F*V7}<<pM9Ij#9eDzz{48Xw($
zep(TCh_F%kj>GIbBFzL{TxRvYv~aGuExhx3$;5<ntBj6otke9yVb+9HrJJ+!-)OHB
z+_p5RE7(P0X4)B5{?6$eBIaD~eX6!jEv4<oE7nqp+Zyaangu~x%v0Gyg*OGuyour~
y*S@J@^mJ2*@Fn#>KlZ1Dq_C$dhxx%k_D}ZupyRH;g-(fqN;pqfKbLh*2~7Z!1|&ZK

diff --git a/app/src/main/res/drawable/icon_cp_cgm_target.png b/app/src/main/res/drawable/icon_cp_cgm_target.png
deleted file mode 100644
index 86ce00442ccc8d91855e740db8ae07744d6e3d30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1295
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUdQTU}kc`H+H!?fILM7Ng+@BJW`D<aQcgHq;Q~6tmoi=essWh4KdNr9W
zzvIPqNK8>VN{8!I!m^j%k{4%l&)5=S<t8nf80Z_;;@c?Yq?(bn^UFg^{bHG4pYBz+
z|0?+Zq3C_(Im`Ez|DN02-g#w3;9|F4DbuV!?=M_?)pAbPIC^f8<hvuHYkgixeU9<&
zmbr52#Wh17@y9VelCN4<9n<hRdR3x-qUS!&`w6`B{NGPqcuF|)Fwd7{!*d6?YPxD)
z9Md~<^m>Kp<5f|6w3OPDBzJw#R^twy)usA_c{``DHLv~ytC~jc)d35*lyWN~X9Rs#
zi93An%6{(Kn?Fh$$jWA($(j=!)~VHTr#E{8$L5XJud@&Tv|u{UH|x8c-XTAef(l91
zQ$mvMtUn|^8~-dgbFh4d+LSvQbN)=pxx;qmNN18W*J7QCJDpDM=9zKHBT=uPBR&5?
z{+Yu!Bl<gU)|-6bOnbOtQP&j3OKs90Ct6HYlXKq9vG;qzT#mi57W~>9Mch-1#g>12
z>N-`^`ALXO`_q|kJnm?f{a>vT-K>7;_q;3nrMIVi4(k%$yJUq?YDdYE^m?_~ihfy<
zYQN>qr@gh`7$zV&FXi?|*6C@RrUj^Mp5MY>SdwLa>9fAfq<iHZHAT}5R;$Gw{Ayvb
z^)tuyBVjh3t!p(xTRip~^v^b6wXF!h@xx}0j?%^RO+J0?AEt3!e!IhY#%&H89kZme
zU;C#8w48`rb11**1UsAGQvSV4Tx<O|U9@og;S>MstkAxzb6<X3VX$*L*Nc!-?)yZR
z8EQ^md-!+7v4*w&f;0Db&URgSY3@n2jtzUaf!zM)!0jEU8W(O6Ud|o#*ih_vcW|VJ
z&qnu@Z)(dr4;8rvrk+wevfNc@xBlc>?N3MRCML^?sGjma)Gl}Y?ad!$cN)w;BnP^l
z5_&1R+v0em<pcJ>t7RS4$L$=G)+p>%@0D&85B|@bDzb7>#+xH)5BCVOfBni8e?!Ah
ze|?jCx37ip_wGsi3|1*@3cYi>{E@7nn>%k*a>1n8E$3aCVpPto6<M|G)wfQMEiB)=
zKHNGm`%zsH&pMIa_K`o1noaDlS{1P1l=W}@LtEB~{xgWxxOL?9%b(Wsgw!|gTy=Ey
zzaJaoL$-OlI$AoW{N#3t+%Gl%=l4rXMA{x{dkN1z!rqp+NGr~uC7V}sqFPwz>;zEq
fhvtL-y8jqse0IH--h6i&s2uZj^>bP0l+XkK{0u4c

diff --git a/app/src/main/res/drawable/icon_cp_exercise.png b/app/src/main/res/drawable/icon_cp_exercise.png
deleted file mode 100644
index 1c92c0ebb54905553278ab32a3b392757b9775c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1464
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UG@4Nn)xkc`H+*K5~IPnKZ+aDL^pkUj~`o-2D=d=y<2^@Gp6_VQRPt`aS|
zv2yMWqf7D`OBZePc&dAOcIU*2)AyV?E#JB<U{S<u(M+qKk9W<lJoo<3IZMB}pW7?<
z-QIjZ|NP%O*K2Fn|K7LmeQEFlhejq=E)k7@1qc4Kir$<*F}p5H@Au+D*=>*fbbgC}
z<~uGir|a4e8UIIbFYzxgwPe_m!Il5|KwO1j|3YQI157eE5A0$55j5dH>*|Z)EDr*A
zK6rjH#-;C2`wkxd#{ys6ylvXeO3zsH6@TF4JNomaTl$^$*_VU4&pJK{a$Ll$cS!a|
zUw@%=RmX{GhxbOz&&fHp_dhrP14+jfVG6S*d3g66uc_&s7ty2T<6`b})ag#c!PJ~N
z?U6tB_L-(7$j=G0x)9>>?Xc3F){`%qw?68qZQ0nAV9j&%`;2MFjJJ3`w!gCZT=~oG
z&MzH;1zsx7dE30&W$LeBmA70qT8ruh(vpqWxhy>~ecQ=%@|kZss;<47RadVgdm~n<
zc|**UYm*K5*M8`*IKTZt)|sOmF&%{!^5xx6>TJ^UIomoP2X}R)<Ok2XpW<Sro-Y1a
zWQ|btJ`+J3=Q%HV^dCmwnY?fIjAwlZCVV+t@uoNYqN@4!-V^KV7AfT9dnws&WX}^l
zdDB~Fv8+X4$V#5yT)dh3Wf{t4kD?~(2N#-zJt_*6*e5tKzNyqH{GIsDQ10E%PndIr
zcN@iWT)X^2zeUH{ZPjE2dwuh7t53}L+N1C(b>fNEk3W3h9D9?J9us@+4d2AlMfbuV
zC&cKiy4H8c{QBcq!JBbPr<O+O^+lTpeoSb-&|PQY-SHs(tL5b^anF<rUE8G@y_%2S
z^dDWq_QprR(lq4Fn>EL*F3Fs_7wNKd|BH!IN(b$KZgON<ko|Z5^<(RVGUv_<`Xc&s
zgYT2W)x8@cHMcCuopoEoWZDS_#iHoTi{d+W-FMm|>-}+$#r36&t~!}C@^{5$TYU3L
z-rKsOOyuPMoV+;eJALLKL!&-(2HKnwTDe+T_16l?MNYcjeQ`=tDwbIYO)gN*3)+27
zUTxApQNg##u9C5{JNCEgKKf^9ZoYo^h2@+{%crRsIlHWsn^8N%|6AzE2L^>{#vvV6
z_6+H(SFYlAEpby*PoKu=^!>?!^A>J*^gHab_g(1ibqX<m{%o$^mgQ37923u6h$~?U
zJ~DUtvA&*TrkM+3tHNh`@Q6L#y2bQHXW*l6*P`F1y-V5CXnJzv)twtdErOqfu-ml!
zb$zf-z$v1)*xN(E%2eWby8b8YO%5yG^=x^-C3sfW!kr_*G9_izht3S!YwE|{AAWsu
zW13O1dFLkU*e5p%0yS2(JmU%4U$^G`zbU&n%WIS^3pO%xS1EU1A>f|VqcLCmsOfi2
z)Bdd37n&>^wATLKWMmtvxyia3mQ_J{_FwT2>7VaD?Y#P+<QJ&G^>p=fS?83{1OQF|
Be}Di0

diff --git a/app/src/main/res/drawable/icon_cp_note.png b/app/src/main/res/drawable/icon_cp_note.png
deleted file mode 100644
index 7c8663a4fe54351e0991f0a52338bd929026ab63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1307
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUZci7-kc`H+H-2`Dr^>K@xc<&d{H9QA*(}GzWsZR&8-re7)D?Af5ue-P
z*%sz@(OzJRt6*S)o70SdOOBCmXGw8or@D$<Y@D`9O?KMM@U6M_d(sP|jpn}pzT5lA
zp2UhYxwL0L_sswPeAYszRxVMkkQE>PI|k33T`fL+*WddETI&u9>D<2T>l^;%-DmFE
zueYx>S$8Dsj3fKIj3eIdvrb%%=;)o%m}k><^XtBfh`st6joBY{_8nZ36w_-uquahU
z#8*Pgb)C3S_C-CFSq8G!8=3n%yi5}{I_@;2f0#PqMuV75@9F|MzvE^$eVJQzjBdE(
z9jmF)Q!(qZ)<5ucM$^<EeD>X5{*R7r;^tMG7;VTuKS{|f(OySLRPCXyOy9XjGiToD
zS#GfIOj5Jxo69Nb_J@A{U}S&bI;XApqokV$SDx;(YhADRwyfO5`Mc$yf|0EM1Lm7Q
z=NAaX9g{Hp;Vsj+)FR-{yVs9u+EO-5O%=;EnJ6i=A$A8xw1Ld}hY^Y!`P?}>rzPbz
zPpD;`TqqwlHFC#9L!)4iHHTWA7K!FR%DDNp)G4F#qtEUM782{ZJAZ$4xOr51=?NX1
z9??g)Zx=}1)9SHtU-hG~B0B4MiYLR`MG><#0%x)G20roAOq;vI#iK`{`S+jw(#N}n
z_KOwIE?B`*J^M?X>BI$fO6A_wAKCPdmdR+cnRg$&|A-|pd-IaJ?^WOG9hKZ9$$vH3
z!`3D3vE!bu(???69?pGKvq)r@p;OLekpuFs8&fZxJ1^w=+G(weTDQ;=w?As@Haj)d
zcp2J<d92xPE&5&4jBoqnjZ(Qkq_cRxSzhwfIpn+P@Ny6COVc+V>waC+*u62-C`{e&
zNN&(U>87X-6Yqku)8CJVWx7`#3Ed`=%x<^Qy1RE8i$Rpu|2?~O{<AMWm9%EbmGX<x
z5~lH8w{3SgO!;x)oz6A!H;W6p*(NVAbG_BIaka$n6I&kKd-P(0&Ng9n&W#f<@#?QQ
ze9v}~nCm&cW9#aQZ8u%!?tb0hdZdE$&BRZ!Mj9$BVkg>v_}B1L?x&DU+isNw>K;$`
z@twb(_v~I^*u>-`2i_+AaQNbJers?{_70U6M^(p4*IV5m1@<UpR@Bew+}!msrE_}h
zr}tTf$~<?aPYKPu@V+Li@XPV{pVCuU=LJ7HydrLj>ZZB_U-dYDJ-sxmr1LhfB~Vp&
r{E^aYBFFpOq(fnuBH-cv*8L1IeHVCUemZvuRHk{l`njxgN@xNA*JdlK

diff --git a/app/src/main/res/drawable/icon_cp_pump_battery.png b/app/src/main/res/drawable/icon_cp_pump_battery.png
deleted file mode 100644
index f4dab169a8771dccfbc3ae1a0b1460c9c6542080..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 932
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH85l<J#kc`H+*Zn(s10{}s<bQX9*VQ@AByxk`Bv#YN1t+}(y{2WEEt;|@
z<?;EvX;QAjlZ>QzH*OZvR_shmeC&V7q_rn<LEEuMduGkP^L^g$^mWV5m4Dt-TK9a;
z^YVM2?Vj&Z5$beNn&<(fGLQ8X@&0z_`&aqqfZv&1Hz&!%I~w2Dn}69l_jh``Q!C^4
z$5vfm)54gSZ(x0&bfnU)YsZ|U&ntR5e-(8vV!gdVX73Hr%bMp;SZzt-nfoI!z3J+O
z*4;OxZYQSs-Cm>9m$i=b$Bd(u8)ZNB_-HRXbRum{|D0;(XD%7xi>13iv1N;}&Jp|e
zO?S)Gi(4P92;jBvyuIyvA!qt2PN~!s$#)N1KIE1@P)nPhVO7Zbexum$4{Awo<R<4Q
zIa&rTEmmo}yQ8D^(5r16X=aaX<Q_HzupTdDNnb7TKcZ*FJo6wCA=v}YiLKL9K87!Q
z={7$h$wg!J)fpYju9<K0ig=oyas2tDZFL7vgicod!}yIOygw_laeC3Z;4674675B|
z*jbGK?r1oCXxpmR>k>!!?r5s7x_Tm`B~8Hp<EmqpUN@sX4X&~$Df{dZD9oJ8r~cbZ
zXPwF^W20$DmquLf=vlQuyZe4Yw9CX3zunqCxa`Q|dFZ|OrfblFKW}!5A5XTPn(Xw$
zcu$+}p~mYvbzE29rR21Gg}!bs;LH)<7GW%LJh~?LQVlGQTps=ZAf2WY)>RRjs|3ni
Mp00i_>zopr0H|GjJOBUy

diff --git a/app/src/main/res/drawable/icon_cp_pump_canula.png b/app/src/main/res/drawable/icon_cp_pump_canula.png
deleted file mode 100644
index ee512c5fef5d4814b63244e967463f28aae26810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1090
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpO`a}}AsLNtuX|^RhRYoP*uUOswM%AZFZbG{gJE9sP11@Ab{j&Qt*^&k
ziQ2ScsdVAPWv!Q-uCo?CT(w)_2Zx$e$RZbUyUq@gKyT-btzujo1G{e>txsBKIP;9p
zyS<tf`wZ^Pw0v&=`S;zQ^NatryC_ZcP!a0<FKg`PS9Wio^<1m0nXQ&P;+K5hm%26~
zjhR(6RV^%;-|w+pTY-ePTF1<O)~)7g=6>;d-5WUN6J_J%m-|~!du%(=GJAt!cVw&k
z4;l81eG?^rFz$BY@;&A?=g{vA$;)Qk@w3&G=Ra6I$uQS4SHFLbNp(-o+Q*yOKHfax
zx_Q6H#FAMZiE|wJ{Sp>z+j!CKS>jrW8`2-jPX1tAeCYQRpOd{tn|R~9W<FagR9L@A
zdhgBrhevabl({#^zVF!iH~h=vD8DmFC1Mq3Hb){A|HSXnR%^NRWN%Ju#Db{fnY&vT
zKiV9BNWP*cb>@UU&+iGWyrg?6Rb#h3|MjCRUv@0`xBSW857ir+wmq)6R^EEzd;i5o
z{Z0G&ZLBBAOZl$cUvMd7-G8HlzuP_-+Z{PN$*!n(%R=uzpOqi!r5`Up^dxFy#NLTp
z|EmSP*Shw&JVwB+yMSl*)te`TCvF%1XwH{<yh27#+fCwTfBq@9XSyBbM-=kauDi;9
z%er~MM!8lg_ud+fRa$qGWTq*dKjFXV#P2Pu7In#lrz?vW%2|K#at#c9A-c47rB%VE
zbN7=LMl79uR3PtBvytOuNlPWJt#^;TIU(gEzHJJp#;2cU-M+r=qOPJZ1B>Q}7#8_m
zakgHivFe2B`S%>fnpO*bZ4@c?=9<MdH`Pkqbd%8kj<dd-Eh3f`&zmTgBeL{Z*q;?n
zp;oM)wsD;gjL!c0VC|bdtm`{jKQ?LzeZS@$yLg3Zk*i48;UqnIk*Rs>HI52*LQ;;t
a#(&0(YBg_)^~7d^vc9LQpUXO@geCyI>AyAr

diff --git a/app/src/main/res/drawable/icon_cp_pump_cartridge.png b/app/src/main/res/drawable/icon_cp_pump_cartridge.png
deleted file mode 100644
index 70a90c596f527fb62bd63ca439547cae933df4a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1305
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUPEQxdkc`H+*E2gpQ)P~SJnuU<=itU!3s@H!W#?=*TGXqdl(E1(a>`Zi
zXpN|hg>4zlrvevmP||+w8z$iCWG?9R+Vz)G(25mX3_`k=oj78aa>y*L>SO(~>e;*3
ze|c2%u;88L`Qmw>|KEMSU)Bf;{*^z`;_Z2=%~yJ;t+IlnJ%M*xf^eGwyZ?i|_3|^U
z!#16Gq9+m6Yy5%d+>!H#eylF!wL7Yrc~9oc<K<r5Z?6U#YZq(89b%i)rf$eA{y=3<
z*W>PI-#cShdTeif)6Bk6^!nr2#2*TEzQy|vY_;H8FKSyYdv5KP0`u0GM*WQfhb26Y
zU*r0`|9J0>Y3qtB99d`YR(uk&=CJgPHfuxaZ1pp*4^|4l``cG@@oT5WhCAL?nkhDX
zc0zg^d5kxT)K8yTFL2MNxa+0w^Zbnx_S32()my$isB5)|&@X$ijmvFM-{FnS-5>t6
ze0=$`rl({5rY+GYmMTSvKW0C3v^9yHt?Sv>#H?R`=bniAAj2p2(d1mo!=(DK>cZVE
zb95dl%;%9j!uj%^P|h)~zz+`uZRXYKABf!H!Lcut<F@?ou3sBhPh(um^-_4<hm9Op
zp3Z1pUf6uX;yXwA>(C$1+g%>c?iHNKFfFNTg>LpnA^ArhdoF1zPM+L&`-uGyJ3s$p
z^6E@AkwQ^tLKnSwd*tw;sYMa3Z+Ao=Idt)mDF5NuB=%?_BhkrfcXmt6=bV1C_w?k#
z-L2Vcg*CU!SZ-_%{;=rA%Ac7z9#>}QTG;oV7tuYFq3!hSvG~MHJwd(AYO?MfYU}0S
zt1z2&C#*lJvvKy~9g_VI?e^%FRn?T|2P$5jwm9nh@2MHW5BN74PySFOv@v*#5Vz~u
zjF$T@`lil1u9`fI`u=F`EI0ETfAhixHf?{=%C;e}WcAOIytcnC<<$)w-yCgLyLGK~
zGrcbL<v!OP?M-L6Y8F%q9(}EQe52BAQ{ARlPG+4ZR(^gg4{SnXHu+uCPT47|yRP+C
zWOn0=klRNM^n@edO*UH>9ejc#FaL10o5-e^eaG%BTd`bWou9jLkJgccN^dfY=FYkj
zee=D5=4L^&M>4rR%~@BppGXH*zD|tz5}3|y7`t#{+-uF6xYU~d7oERcyY$vZ$u1F8
ztbeGswD$ZAgFW*7uM%WJ7GHc<-h4@ahwh=Nw`MMrUN+P0A7f2y$=%Cp(NT*e6_s}c
k)m(ZfbYDOc2A2L|u4mu%a%-cB1gJ#wboFyt=akR{0B$`g!~g&Q

diff --git a/app/src/main/res/drawable/icon_cp_question.png b/app/src/main/res/drawable/icon_cp_question.png
deleted file mode 100644
index 5d430d91640854e6249ff03e6ee73687f4d13f42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 913
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8Mo$;Vkc`H+*Zn(s10{}sJU?|~fY)XPpOf=Vj_Rmrn;ywZ@#-?+=H|Ys
znflZ}C&e@KjMrJG$@Uu)m4n365_MF}atxNZ1f4R7=`PMXvm-0*UhzBKbLF4sM8B`B
zJOAGH`JK;uM7Ua=76$w%UlHmXu>YQctMs-6<!KB1{43giOUw;9vaaf?(V4Y#5{*n{
z4j7jFc{+3cj@H8!6TK{!PW-u}ZQhUHym^neZcy^x$g6#^d#&L;Z^e11Jb1%dh2slZ
zm?iQ*-0_P!kaVy@{a(0kg5On^iFP^1`5)@e|Gu2_(5X8DVQD;XEv77L5OK@05IoMj
z!?@SdztFO;TKLL@BPWX12;Td)Q}T>--$r9cUe9wUH2NM%&pV%R@43WnA&>$Kzw=4=
z7D?Evtx&v~IG=ZRvW(}%HKA_1HYoS$FY~y;rTlh>O3v%Vhk7f0HutU(t6HnK=aAgO
z)RjKQy<Z+EUVCJ?%QsVQ^#vVe_CjIqLe|+IjFvhW_q=hdzhc$7_s66tl~QT@sg;Lv
z;}1*DIi)(K+I81Pmm6-!i@BbfZBjbME>(W`<cZuAonzZ)mTsCqQE|`V#b>N;_ST5o
zm2bX$YMG(t(Gw;&+c!tdk5qpx`SNgr%zN>FUG`6ePVZEbu9Mb3u&O62vX^J(4)=K+
vviW93d20pN2;cg)Tg^ul93>im^#3p&*%a(_WKrZMP)_o6^>bP0l+XkKMX6`d

diff --git a/app/src/main/res/drawable/icon_local_activate.png b/app/src/main/res/drawable/icon_local_activate.png
deleted file mode 100644
index 2de9ce9d4d48eb380064e9c4f150b2f093ce6d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3549
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
ViP7<Zwv&I22{5rn)fiok`yZgPjTHa@

diff --git a/app/src/main/res/drawable/icon_local_reset.png b/app/src/main/res/drawable/icon_local_reset.png
deleted file mode 100644
index dc9d659dd714b05dd4f0fb92712dc8f1701d0814..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1884
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
AVE_OC

diff --git a/core/src/main/res/drawable-hdpi/icon_actions_refill.png b/core/src/main/res/drawable-hdpi/icon_actions_refill.png
deleted file mode 100644
index ace25d1558822150adf95eb6c9e0723aa4af2a9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1672
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

diff --git a/core/src/main/res/drawable-hdpi/icon_danar_useropt.png b/core/src/main/res/drawable-hdpi/icon_danar_useropt.png
deleted file mode 100644
index ee3ab7725e231bfb214b659a927524ee7dcfc60e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1416
zcmaJ>YcvxI0QPE^HX36h!<H~+-SqIDyP3x>F&akRuiQNIh%9c&bJG<enzs!rc9F`>
zBf7?A3N?uqDUXeWkl~(OopXP8&iDB7edqi6WfL83We=(z6cZDZCD`Fz_TBzFr2+eD
z?3lE;Z!*z#9<gF#VET88$7Pr9Hx8H*@K{o!_;M*W@~yFA#sqe2&C$M2=kRpp6YLm-
z^iF03(S>~p;XMFXdKW-=v8l~be$(Ba7mYAj04N18e2TE<Q80%Ti38NK^XsQqEHD^_
z?bV$fJw(dC^6_7Es2t57;{C_QIEG-b1RQWIt<9)(ibvQyg?;SUrqayN#AR6;EMSzq
zk+slIMf?%%0z{{e`%rK3|C4?NEit2oK&ek=F(RhpJ+H7ka41v##C=Za#Qw^kmn%yA
zuf5^!E=FX6y-+kF)u@NcE~p;Ji%6LX^wFH`LlhwD{jeOpCoc1LX8U>I@D(|iR_k2X
z&r1x?v_!JNd}+!``qlPRf0&D)tVN0}1V!Fe!Eeux)?v23h72-V)AiXAkuEx8a=y%4
zPEC9rr@YjYg=9<gK;II>R2m*MbbI`a;RB62N(hb?FUTg?O7Y9)I;fPDbt{$L%`;$w
z^w3<3<jGi{Zq8|2s|g|K_{H|f;3lY$%{67cE?S!XXD3|vV)>7ZgMS0<Xr3F=Od$Uv
zi?e0QQsr*i!+V{UqgTzt8bFxwZ;w0`$yU0^#c@*>hDSK&y#~2dvrw&n^S02G<#yN^
zdH)tJ`$X?EptJi9S24kEx0F1R-OhR=rB5+iNsN<gR_fuJ1d^f2RW-JC%8X?XuhjT@
z3YmK<)V9K+|B!r6Wq|+UTDqDky<df#*y@V@<d7);sy;rLpAaoS*|PCMMY1KGxR#Dt
zr`5pdv~?8O`J;fiG+1YYfAU3AScl<j_;c8z3qe`Ijg%CVFyc57diu!7odmBNGPl_O
zUP~+DfSY$}RoSHL)eXZ+z9hdWScERd!>qm5GK9$+Z{bNB+s0gxP;iSc4Qs@fbTs6&
z)hY~DSi7@%CbQv3@|#*dI@m=r0ms*?47x14?@G;66M`f#RF257mOM2^K;p_s$bmdV
zk_Kr8O%DyS@VCphsSqp{7tJ_b(=<sd%VV5Fk84obq`C51!Jwp9%rd;xsf=s%t@9+l
z0n{_0T^!#E-&J)`8ZH9u>GST-i|pjpY3u?tovyvmo9-QcDGFMpjM{J+(BT4?vuF=R
zg|6)oZjZ$UQP6CEo?Ai`8G3${L2~;U*Xb+xRp<%PAJ=(V%-5?*;&OGL>K3*69Qanq
zQp0yG1=F!ova3yqyI}N8jN)ARE^uj8wq&oY*Se8^)WJ0eo^wLg#l9_e)@JKbKsnGW
z)-9<g7srW;C>*nwK|@X3j%BJptZdh!sqQIyPxz7I5G(MvgJCGby{>1l4v~?YtWV!f
z-&rC})!f@W0z`pa&M=visQByk8F$I+!J{9-qd3Gq^1J3`3*+;@bPxIFo<vVULs*o}
zhR;$;sJO-VlMHw`*FVb&NpM8|MCRK#*-+A4q#&qPGBSWlJKAugOfi39LrL99x-jf)
z^VQ!o7jYSLdMh(9gu$B3Lr6azX_Rrb4?PRr9s!tz#wojsV}Rc07Gjn=<+SIE%RA0G
z&q5;s=cR>7K24o+fkCURM{3p+frZ<dH8&3#xUtXWE*yBPkn-GuS<8cGQkd$m6Y<0-
zP)+stdWPZTUi`>oxlveh(br_y#IyWV^A!af;A%8sTB&@Gv;F~-2yjLL9&5QxODv9g
zP4*dN7yibC4RU#5839A1s|i|tsPBaz!Z!`PC$2KBbv)vETgv{miV>_G@ob!5>VGk*
Bm!|*#

diff --git a/core/src/main/res/drawable-hdpi/icon_danarhistory.png b/core/src/main/res/drawable-hdpi/icon_danarhistory.png
deleted file mode 100644
index 2de295946a9e29bf41176486402c14398994d45d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2090
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

diff --git a/core/src/main/res/drawable-hdpi/icon_danarprofile.png b/core/src/main/res/drawable-hdpi/icon_danarprofile.png
deleted file mode 100644
index 31148c5647f6dc0f8d2fa9ebeca02b6682e641bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1935
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

diff --git a/core/src/main/res/drawable-hdpi/icon_danarstats.png b/core/src/main/res/drawable-hdpi/icon_danarstats.png
deleted file mode 100644
index 9caa112e0e7cb58374efd62f5f92e926b7acafc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1059
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$MZLFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp$(}BbAr*7p-uCb44U{?d@%>Y&pT?VKr6_JP^7MV|AGz^R(vp*Io7A;6
z1-(<%BQ>OSa!#&U)^SwlM&Kfs-XkqJD|Sv4itRR@JpJD1d*8p$vwl9Wvf9qH`?vM`
z>T@q&?tOk{?e~Tb5b)47U3KrqycIRsI^GR}3*;-<&M=wqZELn#vpDgA>Iab-Om<A_
zPS$IaBUU$fCcM~xD>Xr9$z!XwQih1<nbuO53S|%93b^o$d*c+Vwyg;w(;5#M1w^oM
zopwl+{Gznx?Sb4o^*6pZ{<WRqta|pu<F{;b47J7c&6$5UBp;}FvUA4Kx=nf?%~!1H
z-Z5Xrvs>~SSHkM$YvpeU73xhr!lV7Z^Hh{rsu-i#={$?J=+|+K<&C*}XSlp!-PbjF
z$JV@i0tQ@f80C)6@p$EbjiEqs`97KLnl4kTB9wRZDxT-FTHhQC<gDhtCH12@Mqp+8
zRFT$HfnCyOjm`)B7PS68``xA_XeAeCwrT<Yjj1c=GWIcFcUGIaYQp-5ng4jX5;O}~
zBjhjSZ*n>$_4Uf{hP{k`)wEUCn6l<J16kg?7b1C8Lx;IFb-@N66#rutY-#zrdcoUr
zhyAI?Up%u|3goU^kgK-b%=-KD&x*^xZF}%*{ekV1lF$DRxo|DeBjUQvSIIjMPuQ5-
zd~JWyZr^L&IqUhV<#wDk-?p&swUZONCi_6=gK_ZeW3qjJ-tBxYQ^0*fE@U24pGZ%!
zM8%w+ci8fnp4(pEUcfGRFD1*qA^3pHK?~W^#|}Rg-c5Zg_MxTd^$E8G;dj{|7d@G9
z_(0SH(+~TOeD%F^yODXv=1cJkZya`lQ;CjRJ;N-YAjg+R_c=g$+tbz0Wt~$(69C8u
Bvm^ij

diff --git a/core/src/main/res/drawable-hdpi/icon_home_profile.png b/core/src/main/res/drawable-hdpi/icon_home_profile.png
deleted file mode 100644
index b288171332ab79caaea02dcdbf34514614b51d0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1797
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
TZ|JVt{=Ep!M0~YVX!8F6toR?2

diff --git a/core/src/main/res/drawable-hdpi/icon_local_save.png b/core/src/main/res/drawable-hdpi/icon_local_save.png
deleted file mode 100644
index e5c1d5cedc61cbdb3069090d90f1611cbb5da670..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmeAS@N?(olHy`uVBq!ia0vp^-XP4u1|%)~s$Kyp&H|6fVg?3**&xhV(m4mHg4xN_
z#WAFU@$H=Rxwj2O+T*+L-Jac-tKMPWVZOpVqe^&z^Jd3KypNh0Wao0e;+^FaP~D{F
zes>mU3`YeE&&(x1<mP*vtdLJom?$vw*BSYv_2+g!{>b4a@&0PCg;saNDWwIQI9BK|
zVPV$H@b#QIC3h=BgXq7n+caN^zuT%;b!}nJYE_0e3=fp$s+b#C!*3itCXjvQy>MWI
z{r!UVl_ztrh5c$0*Ib>mx|(4}(VTmQ>#GYl8Pt{cU4Ff6#rHee-8Q_ZxBY7IpYv|(
zo2|mhpRQht*!`$HqwAO5GM$T?PHl@yWDMpsTJw7m+oR)oH+TbM*+sr;Zxi6z6}9Qb
z)TO`w_CF4KeItt1FjvgY|4*lI$J%K-PJQBH;1|l55<Watz3M!}hbH~ZZ-3pYH0pc<
z|4-I%?pdQhE&1;99X*mk0g@HJa%U~7n^dL$a^2xvufPudx{GhGXkOZM#O|m-(9!b>
zTHd<~?1GM+H+U{rv+0Lqnx=N?AD+#VU3=xfvAfQgs<Wr?`kF@Vx;K$+cEzhB=k}cM
zD^CA-ct@P~-pWmuKQ^u1rFfiaw>bZmGS=lC^;UkjA3g8Z?p84c28Zsw7pC_P2rt!@
zlxW}e$bA3Ipg%49zw^ZlwiZ5mUKO=TGFFVQDqeSaQw#5r{JBbXZ6UmSR-3;SH50JE
ze&)IE{uy;aCtu|~cwq5d_*w7#$2)S(Tv}8%ZSai@YI&%$M!)V&E4$vwUy&k-XMXhh
zUGmFZv7wQ5!V8dK^@qko`z+6;cFtEkU7+qTqc`WHaf-CGQA=v~e8txevlMi)|M1*Q
zmt|^6?Vq106l@}w*sgixyur+$Yy2eiPX2fB?BBsQ)3&bd<Xg?$uBzFE(GB8v*ZMf5
z3I;^7gorT)My5vhnoW0EV6Xp8tu*oFtf^c5TY^vh-C4eIox9KVgWIN*hHn!+Quns`
z)Je94+kEyLUBkZ33+lNOzp|;PBiG%SyNqWe!)(q|mQQosi+L`_muTJ2vOgv@mm%GH
zR&r<FgN+Wss}rSVW^^lk6Sc}Y95&6pJgY33ci-3jGJ+T6Y#67y!rg+&T*z>sez%KJ
V0^^&Ve}P$y!PC{xWt~$(69DLjngjp<

diff --git a/core/src/main/res/drawable-mdpi/icon_danarhistory.png b/core/src/main/res/drawable-mdpi/icon_danarhistory.png
deleted file mode 100644
index 60e61d125af963305a252b47036dd0c9efe86356..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1310
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UJUK2I0Nkc`H+H!?fILM7Ng#2a5Ui<0WP<aYXsNQk`B<RGO*YE5E`S4`+I
z$~dUvrTI&OlXY#tHU+ntTO^$)i}kPu2i9h6{w3le>A9sd$S>@2lKed5J^7D!&#Atz
z*|wv8$DF70p5J+1Z}Hsb|L=f>POV&`S|LCFC-j#wue<#xcV^}D2R3us?0gQ_-RN7t
zL2!Mtt=lc%Z$AV#->xe-Zxpxffa?xsb(2baWn1-!Qh$2X3&i)md~#UWbqRm}!=A#w
z@sE^qj?SOadblv@R~i4b2U&M!J-ZQltg%yJ6N7)US5|$yXhiq<SvS5ssBv6if77n%
z@<xvRBBhH~uQ+HC(<Xk^V~vCUyDM{8HZGla*m6d@@5=v0ds=F{tS)g*{29@k_vXma
z9T(rVm*>Z5ZVOS~qkZnouPg74pIUToimDN-f1-ZRqaYp=$=w#cwabpyC?_el1^wpQ
z_;yp^v=c=#GhdlMoGO-F9b8#3+tPibKy=V=JDC};10<C;7v!$u@1C8uXalczaIIC|
zIa3|y6vJ=6UvGQe*nT)l(BNU!#@gG9cqV!W{gk_>pRm2YaU=iIBDQnq3{NOtQq7aI
z;5ojuYIX5Nj@+jKvTPr!SIwWAJi$4|BV$Rc#nN^Enb#beJ!9tkWU)G*&xcQ1vRO|2
zD^aKxw)$=Cj%eTDxt-5H*PJ=#Hm7TG5!-Wtom}g?GNSieC9B*!kZ{Z<_-OAI<*n|m
zLUPw4;%n!g%9Jcl7nBqWN^x-cShdFceO+#%{kH473-X)4pLRJT(Z4@vX6d$~{I$~y
zo9oxz*{meBUASUx-nLk!GLu6$biW7pHM?GU@3k=My`a}uF~zgD6M64lwD785FLv_y
z;~OD$^B%_pO8!@nJ0{Qi)@-@D_+6(dLA&=xE%I^D@mj?5>*~5M*Nb?p{>uN{zCmYd
z^hU+w2}VMZ3Xg;oJ?c*z&dPD&JGgk|KHl%orOLcgR{hX^lWT6k%-#`UI_-C)){;Om
zE7eUd8dv*|#wSId5u26gm$m-jWLLEpQ%*!HP5Z*JcB@yeYjL5T-H|(2?kN<-wO-Ji
zxZPFlN&A(!7X1$m0<+Iv(B<Ialr0Z<RnI8SB^$;eJk`iHL`D2r|LglL{w`vL?Ex2S
zov!+=mo{&@?P`^2&iFHana}o)C%0IY3=3;s*<0D3-4Hyd^{JZYsVNaB9T#>y=L{-l
voj5Z|I$wN=y{P9K$B)9H&`hx+pnX51!lD(K8=tC)fQmIwS3j3^P6<r_?;Ix%

diff --git a/core/src/main/res/drawable-mdpi/icon_danarprofile.png b/core/src/main/res/drawable-mdpi/icon_danarprofile.png
deleted file mode 100644
index 485eb6dc61821165fbfae36054a0ab4557ff88b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1189
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH;QBN1gkc`H+GrT)Q!bRHlm$^OC*fl9-A@@{IvA)T^28_bWN`13-2;Jc{
zs+K>}Fk7KeRdI%|m}0j;l87pci>sikKu^ZCKu1|o$C_iVHNGOU_Tr^l!I`_a?pl53
z#=<&_n0G6KpZ}@9`|RFjajlRQ0Sld4x&F&v`NXpF?UQ$GVa)HD>KSe~sIOI9d9^6;
z4Et8u+i&-O%(kxda+PM8#`;tGRn*tCGwfErCr&EtQ+xJ0xo*$o79Gw@;a52yz7Aa9
zUSGJJ!&0#2`n8|--2e0EDx@fEma;89ziIWR7p3AwHXZBoKh-$f*oSSKu;}>-lLg`x
z(lgk3n9Lg@58UT{q|P+GVS9soqws;&4Xb%MpV_!a30~q}!}QDOiTc%6JGL;U>i7wH
ztRJ{fHqJa+>*hL_t&GVzmAg{j!t0ak|3c>QhJ_k+auy78PEY(Kn^4)a*U)eMV`Cnj
zRadk2KYuub`_;c6x%uJYD~e_AMxEZonN|PfzUbF)Q`D4NWV(;cpW?G`rfz?g`{yE=
z>BjFIdTuxF)UEHl_QCPW$!ogoS>b6r{|DLExN3i#Sf&2zO~CF`Vw1XlYIfZT7N4S%
zw6Mzl(|>`lURNjTh6V5MPvXznm|xYX8``e?zC3XGQs#}JiYsU2FMi>CJLBx@H^E;6
zpZr$SeiX{>`F6ENU99Z=WgUfT|06@Tn{@ruZ&?t>CuDp}#7Ozx{wq3a`dwe5?yBUv
znj6eKw)g631I``XHeE8x=LOH)T=c}&U236t1@jJ%Y9$6ahUtxR32BUatu1FdKl%tV
zsqiW})K64#ZCTRlFRD19vi?lV675SqCypObd=S<1dG?W|+Lyu`yzNYG2A(_CXT1BI
zeYkB-vP{VR)!py=)6<V7{eBxXe}+uT-G{G@cTTC6I`S{XK79E~>8rON)@Kz(POoeD
z`0DWnLreEO_Lcfq=3kwtQ04wNXl{(Sz3bgI_j-2-md@U#`E2_!FORC1(~=_oM$NsY
zVz+hWt1$QK)grIEI5ew%8aRBK{#EQ`>Y=T7rcUnec6{KQAYZUV@t~3ZMr~;7lx<3%
XEWOa+h~(F;pwh+D)z4*}Q$iB}7ck~t

diff --git a/core/src/main/res/drawable-mdpi/icon_danarstats.png b/core/src/main/res/drawable-mdpi/icon_danarstats.png
deleted file mode 100644
index a0fcd27008422b13f341c2a65e2e556427b16afa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD`2oDdAc};WHi3LvDZt*QKapmdn8L~uM6*;12=LUFXT+*<rQ)5`Ns8!bI(N6
z026~-+y)}TiH?puEbkAxm|QyGlE`x`b#|KD%582^&-YxkoU>~Ex$9T!MH~fK90h9R
zs)E?e`6jh3H)t`fIVzS{Ehg>B6mNAQMD$<6L)CwsGea8ht$7>r++A_rv4m9)u{~3M
zd+ZB-mGtCp%S5x9<AQvKGb4Y87VY24XYf&|KS^tIU3AgA6BGWcWxVs#w)$jvDs#!2
z&~wiVo1=A7W41p{nw!F|EO9I^?_<A-QCx?6QFr;**X69&cO1&OSGH<$))M~T5{J#-
zq`qIFw9@UDY5ms!hSN4qFTZ&8yoWBQa;b99m0p7&^FtnYIh1uPYLx4}E_hk%PtAM6
zH@)>wzGB^hN=19Uv$ncN(wE-yRNQx<HYt9pU*NM1t14UTr)Pb>krNz!Y}d1ghs#!e
m<Cd1lFx2O0Qs8J>_gJz+R&C2x>uaW<r0VJF=d#Wzp$Pyas2Ljo

diff --git a/core/src/main/res/drawable-mdpi/icon_local_save.png b/core/src/main/res/drawable-mdpi/icon_local_save.png
deleted file mode 100644
index 843beed5233a0122fd5e7484da1a876eb3e4632a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uy~9Z5t%RA_<in!!;5F%*V>9q)MCqjUgPAXcDOAjiz)09GJWAeWuV
z5j%hmumk7-kGVkwI6ISICMIk)o4A>s{cc18`;njbvcap<>4dg$-5QflCSf|6ROw_=
zrByOF30%V;2&W4G6978^BbMa{mwCyp4B>PtL<$A~rml07k|CV-0nD`Fz3Y6hm=R7#
zKJyG5Se9><;U$2c@_5IxeChgPm1GE~GqLPFho`&n0$_{Zcs*!y##LU-Sw{I%hGNaK
zd<A>F=Gv--ks+Mk8brRU<k^7wshi@Z%a!7~GDGe08_V)V4Usb;;wAB_W&uTpA>t)z
zx-<ugm!vTnQ5gr?uvfe!jmU_2y=%kgcoo%6RJckswK94m)Z<nBy|PS@ji%^9V{s9)
zOB=(ocv-5O6SY@HY;7jui##!W>gsb#;|1Wu_gX^4OfREPgj1W4OT4_PEh8fJsSUsC
zLXOqTD_)Wy1%PGw_>xdryh0JInw1ExwDDTa(MHhHY!d=-r;XKWjy8h#8H<og@OVk0
zG|dY_Uoqk(iM9hU2pwa^OA>WEBZMA>RG(#eotwE*qMw_wEZ+dw#C{)i$Fm9JB_j?v
zf?~LTaXOM!@m-mv&&`t!vE5O32}hq^<os(h;dF24<gu9h^rI>(^ZZXD#mT?d>5sFF
zSoZs(i~GEhBkL+ZVd!-K)Q~EjOsaG;snW@$N_%7g`~cdCzk%b?snh@f002ovPDHLk
FV1fk79&G>s

diff --git a/core/src/main/res/drawable-xhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xhdpi/icon_actions_refill.png
deleted file mode 100644
index ace20f3bfe4d7d750f0a88ae515409b242fef556..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2189
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
P@E2ibWMx>5^0@go{|)~g

diff --git a/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xhdpi/icon_danar_useropt.png
deleted file mode 100644
index 126122a570dee1544cad4eca2ed0894308ec5fea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1913
zcmb7_Sv(tv8pTy8MLJ@qs8}Xq`DrYj*hRAlwWYPBs7Y#@s@kiyb%bdXCC0ulEv2Hg
zme3-piIhmR*0IwoXw_U(J5f{D-1~eV=HZ<4a30Rn_x&kuE*PMMiiD7m5D@Et#GPc|
zi2}q=pLnIlx0@$%Cc*(9EhMC%^S4f6aoQU~LSp(@B;xAbvUNY_+p}=FAhFiCuF=tA
z+3{#nCxjeLvakePXImpoAY_JgmEV$VMiR*aLQWzz7cRVoaDGnB0z9bI&Z(`a5Kgum
zwj25GZC2u!gsiN!hm(_D**%hPbZid5*(_;_+yjT23rNjhz%o#&YzG1vDRD^~r=<CR
zs-uOKK3D3PKA7$C7W!3_x1Z*mPI}*D<w6~6mgd*>)_0%^Y-LQLDi&CYAdani;nB!b
z<uQ*+<1MTEQ*M?j2rsN)^<HxR2g1V|=6_cjvHXEZJ?CMiz3Uc>{hGXvu(*+BxLTFp
z=yKR_lOp$GoADJpa^j*Gm`#`FyNGW}75l`kzl8Q@ezL8$o(%bLdR+(bT6;oV;2Xuo
z`@+m!Ff-5BL~Y_Bn51dW3rfN={Sr<2l4CjmEO87<rFJUX?`ZuH2>sGPRP49Q%TO}L
zS&6&DP3;~~M31IZmjv2uH;co3F)%AddK%#qvnH858BG`+2i_c<FUKT^%)Gg2p`=p`
zbu%3T-KL}Kp8H}NYHQJ;;Dt(OJru1tsy_bS5+L#C_oV}sWE+~h85-rd`Yb-D+RD=y
zM01fKD|60xL}m6}$)hfq{ob^};B4JXU4JdH5&h)z9g2c>vm^|nt6DcgRzjP{o~nD3
z@}a(*kh^sCeMPv7kp{bkvo#~Mk81;2d4iTMi>n^c`fQIp0tAd+hA$ZmMz+y89;0V$
z(hiDPb(*|Tom)UyKpI(L%pl=WZtS&oI_D4Bvi5ZRX*VDLwrB-Z!I0{o4Eli*1b5>}
zrorZ*J%@Ee%`dK{UED{emBhkjAC{M$Iolc`61BSrT()~MD3=>VfjJF=8ql4*U9UbV
zrTkb0xzTHuS1qq-NL>#6y;U_-ZoK|$b6~-s75edQbivs*M+j>`1fisw(W}MXu{MK#
z46(jjaJ(A2PLG<@cn3-UA^5gYmA95sKur&#RIQh;9xB>OTly;-N3`+I5svOOKI?zQ
z+P3qM6}3K?(`Ld;yfY}d>=`sCJaB9K{?=4CXUjQ545K3o&3dEenzbbiWKA$>R@1x7
za0awxu8goi4r7+p7!Jp;ILiOXx>Hdo=)Mmn=JInRfiS<r)!6#Pk@D>;J==)@^oNXA
z`9}GrU#9$htFOABckhxX>+e(<v7fgQiCx~{`na9mWw^D8@~<DxIg=`tcwbCnsB*};
zPUs;4$~RGb(KqfvEv(}CfOonle4ipNMDHj^ox22be`1D{9uh%N4>ft1nT*dr>1Q1#
z^(+3#SAmzwsx_x#Dup|%M9v4Ltr;-J_GaGb<r>IRj1>Q!v@<_R{N6ZKx-{=KhQ8S2
z0RjiwHawfR2q|ZdXl{nD?GHr8v$oZ(^D1AkGjsS^H<>RVY|clr;l)Or1w)!LFKF>t
zLh2)T??_$z(9GP$E4Kcw>vlXDzhaLkns($-l4&?p#Efl5ub9@xT+v%l5q`f!AP7<3
z&5!-9eNO@Z?J-}zI;FE<N;}Z^;tC8GYk$XEy1~r)LST463p&p@tdbzZ!)etHUN0<D
zR0~++k^AIn1tGgGctyO;D{V=Aiam-OHopzpFVe3GXeqfSQ@YjW-<;s&W#cZB#Gm_=
zm)}@2WXTA|-Kyn2?XAux9X8>nsR-h?`PW?A(+=2_Mt_xuU)zuJ5ox{+Q!FD9#G$SM
z?z5zq<X_hdv}+p;GpjR+-7T&sk5ZsppXRGI@yrae8bJ5odbIhem4<=l8}gW;0pD?Y
z8gK1#O=UHLt`m>rt|2<81d5dBP%-{u*UWN<@MlciEBU)VH^d&50pE^#27mM}y^NOX
zZ<MyYYE!X7vwJUYTWj93SksQmGY_rqrk~YjN6eeX2*dItvF|Wb?Pk-$E8|JQ{!47P
zoGqD`<zXods{4v=i)jAnE8&wvJZDIFI-_P_x#;z;70-UvDXKT~bLevwqjS%q{0lQ;
z%)62`5eKVZ3FRty)pRrf>$n{_`>Sj^K=puG!$%5A2uMx2fWY8t{hT~JA7*hOrnHU9
z3?gxfl8RQ3otyUIug6RMB)A5f3R;tca<dvs6xS%N`XvDqZifOkD@6Yh!I*4XaT-Q%
zz@HVv!bi`SxE7%<+;?K@2SZD|y9#bpHJUmp!}7Z#9#=d#<udzIT=*GSO&Yn~F=K-S
z$e4p1&5g&ZD$vvcTx_`>KH|%{M(36!z}k>*`yLQGn`0=}(?-A6UC3<b{*9DXJtz|t
z8=T&SdWhYm3+6hu7zhY9#lah1rnf->P51~d$Lt-uf^MIuE|?a-3zI1Seube~Z}g8?
g^gm1i?aB8~O*P6GC0QWdPFO00MY$lG?0+Qv2ioX@p8x;=

diff --git a/core/src/main/res/drawable-xhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xhdpi/icon_danarhistory.png
deleted file mode 100644
index 8dba1c6a8e780b2dd364aa1e85fbb095d0b2b5b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2822
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
B<?R3f

diff --git a/core/src/main/res/drawable-xhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xhdpi/icon_danarprofile.png
deleted file mode 100644
index 227b49a89cd062f769b91f9da680bed24243139c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2421
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
RvAFeHBHFv+D{X_${Ra&8R5t(s

diff --git a/core/src/main/res/drawable-xhdpi/icon_danarstats.png b/core/src/main/res/drawable-xhdpi/icon_danarstats.png
deleted file mode 100644
index 3d525ea4e6d94fc31a181c5705452d64c615025c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1272
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$}jSVD!!mi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}<Os4*A;LF6
z!8yMuRl!uxOgGuk*h0bFQqR!T(!$6@N5ROz&`jUJQs2--*TB%qz|zXVPyq^*?6?$c
zic-?7f?V97mH~OTN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWf
zdBw^gBOqqDq!uR^WfqiV=I1GZ%uGzmFD<cEQql)mq7StN=skV7|9~8L2&Lu$gQW=Q
ze+AEVRtyZx8J;eVAr*7p-u2Gm4U{?l@xAWX9bR6ioH(SNnz$4d#TIExFSYh{S+u6J
z!~KYxiRQ;BQ$ay%?O7WXdat`VcU)gpt>wY7^x_4R>yLV#EIWH<&Z(Wo|NZLbKb<?-
zGX2xrl3P39#s~<)z{Hd5MUvE~&QsXEaTVVU{t|}O4fhWiKM*RAUvMRi(`x3C*-T#;
z!W()WBxi8vuvaxMUZ@^2Aw|9M+KgP)1>85pikw(G!}(>rB!ijyTIPf}K3aREw%Tj6
z=948{Liv5qcO08AS*yd4E2*bRVzI(84FuEYY&9e2tcKDZ(lzTF{eSAION*VKP<fy<
zrXlWu-Ur4VtU4zOV`pwCYn#&8e&Ckj`s<9j2eJ~3Kd3$~O+9u?vS`jn!&SP>=Tf#z
zi;3XA^w2Pk-(c-E?vve16*f1t$~``HV3O2&Rr6_0K2NI57N@N~F>`BomF^k#YYdAI
zL_dh$ciJ=UB@gFX&K-<3EOHF}jpq-9CY1HP_6oUTyhQK?^R)iTy>j2xZO<MEdl0_u
zv{yJ#crwt&T!y~XEz>wPlO|LptUtb^c5B>;{~AdXmhO;Wcv<I@%=DE?Y%@>vA9=QJ
zp(~HkN==Y=ebzRaJh*p#0w<Sjiunh&ADlI;_ZXKqyli}~xn_c+-s8MblkmOUBrJM&
zmj?1#geSIgZ4$Pav7wfmwLV#MN`T{}q(8+BGbA(i9pVyA*?W8jTY~F?pIq7@0{3s<
ze3lm)vG~4oPoO}u$Po!vLpMiiF=qrg?yK(mJ#j;>#D~8nYnP<Q{j}p>Ep%2=J#+2V
zn*O`qD-`@~kMS`5<-Gl$VZF__&vFtTH|zv@JwF@GGWN5tE3ECi8@)o|x##~^`#5@*
z^t}8u<8_W(vRlFb$T>@ztiL5Vu~xQJAIXlHa(hR5#L}IeziSRyTyMzh|6Ago{5YoL
znb&2`JDoSf82ujf+0K|C{<YYFyMX`u+f0dyzUroE>31{R?f96j3;09i4%vQP%b(Hz
z?P>Acl`hG*8`Uq`wJoaM_UQk~ti=cP?mW(pf6$jHP~M~aV{WGs477d`_i`@cKEi7X
PF0nja{an^LB{Ts56%_jh

diff --git a/core/src/main/res/drawable-xhdpi/icon_home_profile.png b/core/src/main/res/drawable-xhdpi/icon_home_profile.png
deleted file mode 100644
index 95c0ca450284418edb423416c68504119c8850a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2646
zcmZvedpHyNAIImikxO$=DP|POHdZd%jNC1mZ0^c+i!qzaVlFY#p(d9pMWn-0rwcnu
z=@3iEt*FT*xzs_&p^P~$#rko6=Q+>wd!FCtdA^s=_w#vP@8|vb>wDn@-dRy@j~oC1
zP{g@75VlUz_L2o{?J=LOcme<tt`tvShOgUkbQnDv9zvprlHttgn5{YhU}eLM2?>iL
zGa#Yla0(3zU1)59LMS9G)W^)t#4X0296@nOjw2J3@t$GHQDG<&)W%xQiizF=M3WgI
z5N0%$7LR6Pp?`DHTlei}1Qhaj3nK~(wcQqk_`02d*wf?45Hq+rEX?$<CBy;+H#I|9
zB99nDkS3<)2on^-^a#wv6m5b+o0vlW38=Lk#43(-8clF;`bTUl!$Kn%j2JWmk(ihW
zPdp5#$Au$IQ79C`1c^W*VOt%r_#_%5gbAa?>un?c%Wxpahs9B17!*1Uvds($rJrG7
zp-{xO2;v`=EqjQ6{cR=xPKZp~8cW=ke+aGy4FJe?;2dl{nPp$fPvxHSQh%8qj#fBs
ze8)?gN(niAvmX&z+3#>DV!&4sY-c37!}^Y)gh1Ab0+sBL2_0|<Q}WoOte+{Z;!)YL
zOI61>lK35K((mrZCI|==OnFHQcrN#8`FKg=N^^Kc3N1dZ3vY9};_TqakB2KGI#CN5
zrT-^nk#r~A!7mZnKt3R5XN)EjI6UUTuGa1G_erGhNZ<xb@Ibzby-`b|vwR|dm4)5^
z{+;>QjBYq!RU!!VZST5s23=xRDr~lQ>EmJnO@(AGG#37x6O}G=61?%`1X~hSE?olL
zD7G{`ur4L^2yRkhLxr+$iJAKxV+_7ruua=6m89a1Sui`3__Bkf`X1$AC1yRVE)#Xi
ziUe!Vu?>9fBX4wQhu3PsQ@-ob^bE2#@F!NfhHo`n@Z5foa9?w3dhAq8$$1a5?Tl1K
z{LDTXZNP!Db^5J!R^9KOeg(B3wKgO+_KK<v%GUdOdusQ3ZT_SH!0-x_4t214SXVP#
zS<!3NSx%z41gH0!$1T$Bzdknr@!d^L`Dj2ss&=j_Gmzj2eyTQn@dqqOc0O{gg`E+y
zF@6SR{u+mWlH578*k@<c+7-$&vz;p&T9sTyi;C^uS&@`^yC>Lj3R><PRb74Xw$j?e
z`=)cHTr<AlwW?;Fz)yFzxPb*H6<E*s`Q_8Sm3D!I{a`;3wJltrHC#3z-o4bM`rVuf
zDpuvk^<s+Nz_jD6c`5;8qGkvf`A{>MsAt0{9x9qhC)3<t8osbcQa!B(3P5|r+UQuO
zev3FLuW5llI6R>in_p=4tn7AI`hrxYQPsTJUn1V=@VZJF(Glq~ugSB``R)ol%8HJX
z^$UzvRBN%t`iN;MyMBkI60?FBF=Ri!^Mk~PoJ%@{cv(^2If<brMG+^S<I6xILIsv!
z$saeq+2?0B6b@WN;({(O|JFU-d@zA2usHTu#N&>V|5{GRShX=-bcB`~nZyGryx3#M
zZ?;mYG%D?9jrtkfqz2VV*AFqL+r2AHt)XP?PNAOfL$v=jM{62?LLje~*m&JF;Vce)
zU>4nO=0z0zm6Sw|FH$+;w>kXs*WR>mJ0}Hvd0=spy3o-4pr6Kf)^p<?|KtdlqWaRM
zwqfa1iH6M3c7SjGnLc{Y0udx)%~|cXx0<3Df2%djdWO=w_W4q<U?#nNrm{QKT1dM;
zI&PU(>U?z5l8Nl8bFc4KgLcA=J5gD&_Y()GZJ12Oy1U(eWmb*-hJ&e80y67ropBV(
zTV8oevw3!2hGi3?-dwblVovVQhGi*AEVK`b0v3~t$uODQx<mu|r0SHk@H#85vC!jw
z(ms&4Wi9G!m)ep?1?@|S(JEk~dU)l@MG`+zSliPmDYBCu(JWYnQvti*zfO>U$OG~)
zQZ=#ff^s14GE+c#rxb<sWtS)Y*=~@u146XV=K0itaESn(Z?)15DQjGPif7=rj37xJ
za1#x~)9<M(F1(_vjm&ea&xXG~$v!*9z8Jiq7B1DN3h$7P!H7+KbQDFlQF@=_2VG06
zLT9+$`1rW*VGSvDWuBRk+3STJ(Huq^=@!H26oe8#B^sab^*&}>u&j<#Rd#ANq}Y<C
zFPFnPM^qMbRXJZv{R1Pnib=RIWza(LBi^g-W99IoM;4z(I`qfh-|t0A+rGWTane(m
zKu}^y<Xd>x{rhs5)gFFlkHDT7+ZHe$aI2KTJfC;pt4~5GL2VEBUU~Q85&7ytS&sFc
zhMU=+C5`UoF3;tJTN=-ndXulhWI5h0XwAi=hsvjK<9(cm#iiUs*y$8Q^yTF~zKkqb
zv++SNCUi%Am`#i#uqLuvZvQFS4efx=MWIeGzEe@9{~U1g*+@ycg)oFVdX9|;1%Sgc
zdS1NVptpaD!E`-cYu5ygyR$R{2~I5w5;YyIHdw}yKli39jp@!m<&?d+l8kAMT9bN!
z!D`Jbw$4@IKF~b48dHSSp633HDtL8&WJ{O+=CFUV3PHYZpo9+A_&S2y`7x+^#oEWj
zOId%`yAB}!+Up}vP#JgW5Cj&~*`WhIo;CfAQ1CE=U6%CB%`vhmQ$eYj{>Jf`ZSmyw
z9hP~~z<ZJy-q9BCWdNI~S+E2l*9OoH#K*_l`QLdKD==Soih<C1-t*=Od~hX`8iZdg
zT)(2EzkF_-9j*FZW#+u#SKu04LrVj?b~^R3!FnE-T2~V@Ba(Z|jvn9Lv9r7cr?6B}
z`(k`8K-iMHZ<BXhjZ|_t=$_mk&sTQQ+Fy6<k$n`VG-_H8Y`8Gk_hIoyF`Iw>#=3;O
zRs8LPRnBh}IgcHU_q=NJ#@!Pw5k~?`fOm0C^gdgBc}*v;++QmrC|D*}y$d>TVL+9(
ze*O#gId(1lj{GXeGxOx9-l1VDlJD>=$k+sRriiD;1g!<6P0Y@hUTAf%b=jYj_$$R#
z{P`shK2;l$*6ea@{K~{CFxX3+KA!RCQ%9|$yQ6dJ$?A^}t#msiWC^v6uO(v>3i7gB
zS6jF$ZH?>%mN1YQStHjuS6-7?bhqo9Yh~PZ(~J9_Ka#|pzuoIrJ?Gjq)Ro0pSb|U2
z{E_!d{_h-Z4&!J1m&an4*pCl%=igoyr1{^%%Vl!SE*O2v;yRNGXAh742*u4UZ5(W<
zYTrC$(7BsquI4LYppP}8nDpoA;%tZ~FN+z}f&r}v=a;~e`?)@&scW&g{Ck^U<mLBc
z3$G6Clu;8CJe`zC0Xq|%tkxR1xAkF>zmLCq%W3*>?UhsQol7t^FJ<Ww?PuB3DVQy?
z-e{EvSBWS<;`+J`dK>Oby&2TTfyp}DRFu$fQg68IE$K;$q<l}R_Gm%H#_$42Bc#Rh
zw7U7UAVOe1p9m34U+<u^@BYw!kv8AfA870^j(B5{b5lp_R(^=b)${K?|M-P#_P?=T
ZXmfbaq%aTwV{d;4agKP08oS`k{{U4LyT<?k

diff --git a/core/src/main/res/drawable-xhdpi/icon_local_save.png b/core/src/main/res/drawable-xhdpi/icon_local_save.png
deleted file mode 100644
index 0cf81430cc21e8ef2d92fca605c7b4ef16cd2f99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^sX&~<!3HGfEBwm>Qk(@Ik;M!QVyYm_=ozH)fq{X=
z#M8wwq+-t7IR|rZI|#U{JH9LQvpKfzz{>-EtYPfeCNl7cX?esrK4E5*Tg&w*L|`TJ
zZsyk~X2&)*v8D+g6xiwg_RXh!i}xA9Dofq#iqhL_w%>m1aq!XJUk99*GAs&W2-Iv?
zA>t6irJ%(sFqNspi_rzU@RP$=>KhcN<Ze}2G<$FV9aGo66YllR)0{UYxAebT$HQeg
ztK~1<4$_pHl548G=yjj!e(!w$r4|~uU$u0+3(gB(y2H@P?wih6t-X#@FEJm#HZ^(U
z&M#$K->+uwTbq77a#Lp4ub`^iC-XW_Z!@yi|HsNynbGxYW3s5-M%B7$0dI_#=By4@
zGTPo_d|X_ndHJ#x`%B(zzj;5tulCn9k*`L_>fEh^Pi-@5UNwK?HT?qz7vK4umo4ng
zadc8q!jtY}x=A^aM;>>tm#udR*YeKDkzDv_@sHZ1J3{W(Yg;)w*Dk-|<YBe%$Dz7+
z5pPc3`Rb8Z&hWb7#-bY=Qz!0QCey=uEahYB`F<m*dCf=my`G?P>El)PR5mRZwQV{p
zPwCuVw&Hr{HdB!qH#RMq^l46pb@PLbB0f2hYS9z!tTy{H(PW!W@H(NxN2jGu3bNRy
zC)2IkuY3B*5{2W_QoGW*a)1g|RZX_}#IDa-y>H_Tj>!{+q@t^v&rG(c{?V^FS99UU
zRJ;F?74!L+E-RjNU-UE3=jH#SGFN>AyLqfwlTI%;Q)6op5!+N3oVZW#cGh9j&C?r7
zy^n?&1w6{W7x>BC{rjx?8OfZzYum5<Wz`5uv;A*vU-rmHV_VF8ady|P*S8AK@?N`F
zaqJqK<~ALTpqezL_O8OCeXALhEW@HjTBa;pah89_r-&=wJofV*%$inq_wL-PH~u0C
z$25Hd&#NB!&~f`~h0~RNYXcUr^*bfSqz8QgvLCp8QB2ywX<)L=jeXOZq8^DnrjpWB
zr{mLDw|y&Zneit1G*j#Z8Kq;3BRJ%v#eQggWH78v5saRu<Mq8UX;Y`Jx7lY+#w4+w
zN2aN+_FSiY<WF8#)s$bM95>I}@Ci(g&57JJhwqz+G5<^%>B%|IU&tnf#XLDPX^pgc
z#F@9V?eBlQzghKnp4hx4zg%46J74G=TRku6bNrt7zyz@3{C*y{`)5(p`INj#<_{x-
zJa;~LwnOK^%BOmZ?2FWOm#%l2cT`2V+^y{GYcp3{->MHc%0*(Q=BBb$cpup%a@t_;
z;qG~TGgN-dKE4{%FPCe#vuIk<A)RBUs=sdqv#$;@p7AK?hpf)RUcQVy%WQ5ex>H;D
zvPL-hu5v<r=hU1-I=6HU_pkr1ckP$(M%l-*sTbqL_J03xE_K!NY}Ok^$DbDUXr|US
nn=3@6;mVQNGpb{A$3Lb`36<>)F|KLALWRN8)z4*}Q$iB}G&v0a

diff --git a/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxhdpi/icon_actions_refill.png
deleted file mode 100644
index 45cc5d3e1a8c3ec7ad1549d476dfea0b9c141051..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3231
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
J-E8Td{6D@syF>s0

diff --git a/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xxhdpi/icon_danar_useropt.png
deleted file mode 100644
index b2a8eb931326cfe24ea618e52b70dd69c2db2638..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2817
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
H=oa%|7a3TG

diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxhdpi/icon_danarhistory.png
deleted file mode 100644
index dcd00419a30b28582fc59c5437c4d0b220b32b0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4122
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
I-83-gUq?u6cK`qY

diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxhdpi/icon_danarprofile.png
deleted file mode 100644
index 7da3c045fea865ed26efc4d99e59e402db3948d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3783
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

diff --git a/core/src/main/res/drawable-xxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxhdpi/icon_danarstats.png
deleted file mode 100644
index 254623e213985b6df6bb2a467eb59dbd6d944345..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1768
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
IwnrTM8(tp=xc~qF

diff --git a/core/src/main/res/drawable-xxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxhdpi/icon_home_profile.png
deleted file mode 100644
index 00c4de023a561d78ff44253d4df6698aeca641c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4091
zcmZ`+c{mi_*B{0@$Tr9ln(P^4U&c(5eQicVV@ak-41=*{M#aoXA*HfsiLqwiDNEBt
zC`n)0$x<jw)=*The((4B{q?^0dG0;;+<TtS=bZD;IVT?FXe9uW0s#O30UK*`r$d?c
zck^%^o(Q(!IRJpoj)1|2VIAz@_@Dp{+~uH4-Wucp(&7K1g$bF2!~1)O$zSsJAp{~J
zYpu^A@`TGs$ay^nO$U;hw=cmuGQ|5_q$36&>5n(M3^6$cLXhEy00G`%IC*jaF)$QP
zMne9B3qQR7eTG5g|6>y7kA#^1C6vcHpybVhLcHbmH1wf(EgeI710xMBJtISHU3GbF
zO)Y(xrV&g_7pkcR*EE7_YRUh*Ag4g`h>*)y;7;b2|B@YQNQiG(7zqx8MMOksMCfP)
zh4{d<jEsz6n%XdJZRnu|G?Wq;h9g4*Lr?sL_+Jcj?@)XQffPmv3Y7ngiMtdO9)^TK
zV1G$q|FRs02m5b)hsu95<Q;gJmXO2v<!!3q0KgG{8*@_(IeRsSa$m;zShq>NtNyMj
zm85XgTK_Z;8w;K1!KOIrBu|e6#oDIIK-A*s)D(Ii6~vPup6A6Tu2w>)^MHCJMMSLY
zczI`ejw>kK^jHbp?~ZsiMZ6Nxy4XHa-MV<AtoR`@GHUH@e{=NIua9fg)AB+*9PG6J
zTjYIH=|XBIK+?B*fG=N1cdUhr=c=a8*%ZIuKy1ENn8A9<d0BaJ98<<|v;q4#ayh<n
z6-Q>^i+N?sWA0MVQA4R4ywk>_EmAFFzKzC}MBx!UCocXha0GzoU+v@U=aSXTMO((7
ztl;Y2>VZ2j?=q1YcR*h1B$IW!&uq(Skvmu*)r9@Fab2_t2~jit;0Elb9qt{G<3PZ$
zXT$Ih;0WiqOj5GctkbB@$c!fj@R+^I7MI<JPLf^b3CpxietG|PA9B_Sn-k?r@R~^J
z&H>tU3>PD+!dXQ%@Qcbf&}@mo{&meNgQZ@)faS7%7DXyr%k7`Nfx$f&9$A00e%9mC
z(-UWWB4tdRm%8u*oSs1a9YoUZ{SmiWimaX}V)$ovOf;H}NdLA4I*TM%%rX(58|#?+
zU)Uh&vj#8l;p@<qxFz11Y4H_)vrsi%i(PEi@gTjPfqw1J-ckeYkDj2;r>sKt8j|5J
z@bO!k5@NpYSBykPhs0L|*!mm2l<UD`_<(zDLjW^lyMg3M?)hjzQ&0bv{3*dVS0$v!
zZBl1yXIc-FHlrLC2MUv{udPK0Q9hh;!X)X5_?ljeQEH26dtIhsB6qVb|0{jj4=l6S
zl%MmVG$QFcvd@B(#3`Ks@=_!faqj<m-~*Mh*v1yn##B~DZ#Gk}JWB!`qwdHyYs&Zp
zP_hm9R}0S|uT}6JI?43jmT_qVwM?=MZ_xOlqrG5@Ei9hunz3ltafE2KwsG#)K>MWi
z%Z*{S3E-B%s$q#Ia=2^MhV@H$gT6VOlB8D@Pp4EuC>5(z$qc?_z0b%~36$%in-3?B
z-kV4e@pk85H7t@vra^<kRW~d+pCw+nf}6CQf$&|`Hbo<bIlQD6lwZqW%8wHsT|cqu
zR%}xpz;tAm-@2NO4w7BIv~oSo?n&j&nUm{4zE8WRj}>=6zsKw4_fW5-6xQ&Ow0Te2
z8MM*cEUw*M3*zv!-1Sj1XF_{`?@V_+s`KrtA~th>4+-*?jQfM(^#P&mr1bo|qBIk1
zhTZw`0TFAyaa+Hyn{J=H`pQ0=Vq;1*vTJ=W^n3s+;-t#roy(ic22f3UFUXb~@dITy
zA{g$3(3%RKa+7D0vR1cAuky1z1}lZKWPk@<4=X>RY9Cb8@LX_OOuGo3kA9cOb$0O_
z7EgOufZ3VqjT&M~P>}<fK`~Ba3sq?=PZ?rl*;MJ4V^iJV69jP%XU^(cJ*X~ud!qKD
z%Bt@Qg{kYy{mtTR7i=fY>k&%|aB#Hf{-O;E@P~8fs#i0nsl5a^p+VrTGRsE{v0|M>
zhkZZWMkM$vo0&7&RQ6wS?z8=YOx+f8x3}_)h<SsT;wv=H3oAt=fM)b3;}hyuCuGJW
zdd)GyaKeM>Kj+H3r8p7Jzjcz@Kr6BPnB9D)j&BSisg3P=wxemB2GT`zU3v3lSy#{7
z60`}<$n7=RAhy;+69mms(D>kfr>4W~ccAUbw!60G{f@zXnM~#PkxsH>SyCbL$(|r9
z2CU1{&3PQbdtJP%Zr@8`=~8Wa$%X?qR=jCCBwQ7dd=T%aSe8lx{5I!YSE_-*_bUVI
z3z>i!f18i@JMrIv;_O*U*(tEJyam9>!*=2)C^d+^gz=9h#Y<T88Ah!uq0SnjE;n>5
zxrSZOE>e~(L{41UZ6uiQUcb!<D7t_GMY|XkV$_f_i%f-mGWUp~WLBG1x22!APGiwQ
zJ>nFlkzFwTqL^jg+n-t$&neT1ly;tT#WlY@S{37Kl!o-vJJrw3%89)Xi<+;)x}FhF
zzj)T=$MachQcjnP@N^t_p~-y`nCt=aDG<cjDn^xt9=%<^mk(#O?loQUI=MoGwtK3j
zT6P<0#@D1>a_Qbu1BYb!b>abE;(Cyhdrh>Q`64F*cI~!eD|n|eSX*p?k+FXIXNBqW
zea>4~FBvlwma%f%QPxQweA!ogPoRuTfF=eF!q=qL<7*a%H6QeEn=aeN!d4!c_H$Qt
zBRm764!z;mh5kV3=W!f>E!4RFnGIRNbg_|DztL=Nezz77{d#W=_+0+6DT$JQv+ctV
z@qphty)(6O3}2yyBQ@yQ78aCwUIoSdPvQV~i{u`|B1;b7o@QHwbtryFu1Fm{`wGF?
z0yK{Ohn>OOg&G5ksU$03U92m_>EKb@MXN_vqb+`roq>D6TFE%NW(l@wUpRrDv!+J8
zA{!VfBX_GabzWe!LWh6#)0ntesltx~g`iT!g?5v5-I~ycv`d>ZB4Z-lO?UcuK7@{U
zMSa77cRRQyOQQ7(9GoQXDqb|5n!dp`KOc`~PNRoY0zO*g_im|~kaB(xvCGi2d}B6L
zD*LR~7TUDLi!z@I4QYeb^s1YI<+wVLeF(@YR5<4;ROI|yN<cW1L!m4{X4I3zUg-th
z_q=`j-bIcbtHvy1z1X@T?<ML|91@lGJ?#h)c6$2Bd&fI>-T3NXi)P|qxSZGLl(n$o
zVbhXarMJYTHt$>*SDQnle}viXz;(c69wc<w*eZ`4CGkcZmT#|g^1NKu5Ke7m-ba1B
zLKBe6`7;qXL7C-f*c+Rst(MS$=w_XhqZ-ByV5k`4%9w_4`JCenmb<CGKiJo<t7~|q
z;LF#bOoxIhTZ<j5eP=6$92EcX@ppSEzzNsOa@+H*LPJRAqP37(Zmd+H1GCb1uE{md
z<@cT3Mje@{=D>O8&Z-KJJo=lrxD-zXumf-~PFt-+i@jikat4}*pIBFvQQ9s>-)p_8
zuN81xp*cUHkKl68CV4}JjkVJotqA&E{*~`7y}L{(Kjp+kCE_P)W$#C5?Vn#Baj#KE
zYg`Ym0%<{j^U9LV5-xc|i;S*d0rNKoO^ompGsF~CZ}T*Si%%5Sb+K#tJ!S)&mhTOP
zt}*<~48Fc%*wT|W$DVUKvOEWmOUyUisDG|#yo{=SI_+8~A$>7?Y|XsUD8PfY>DKsE
znYcaY8vDrTV2obbxu?GOM}GW|4pe)2E_l+Q`0bnY0`gO=;%$$a*5uAl875<6_Ev8|
zF#^-k`UyT;w}NoAAC5Paq|Du3HAp2r(Y)JBuThffFiA>1h<vG=*|{CzXD@tn9>N?j
zfZkfGzJ~j5I-#uuu3Z@Bf4RGMb8&6Bx#p3Uphu{1<C65?JKdw+mDgT2*AQD)<SUlQ
z?J^4&utAK{Ax16FmgcOyIxyi&rCNsgGd`AfUJpzA7cu-~1ubLRiwhT?beFr}(S~XT
zulOrL){?BWosr(BbJ*glXJXF9s%kn~N$y)$jkZ-QE(lDUNMrr+5J_)6BTw4de==G6
zl$KyQ+QL&k+wa`5h3e*K1FCja4-0{Gn+Z=jmj|!Eh^@PE!pAJ9w`|`yqmoQ}AIoOk
ztIPB6vKZ>Z?mYwF>ulToh>;fk+6l%;&2WDBrR!KyAFPr~R4bzeww4rp?X5RjT6hHS
zxS3j1nH_^dO`4UC+g93J3TK^7`4bp38Myk{8T&>H)?6>QshyPflc#C4nK)v3p_-Dh
z8^q7DrS@hX@M8FPf>$VMell@wBQHyrNYIAlL9x9^k>T9Zw1a4C1BneU4DKfzW=>1h
z6stw(Z1W9xcyT9?d81T*GXK`6M<g=k$nHa;z&i}qnBlyK**IRYs<}2SwV2+nQ%2pD
zAr;P&n^f|>6D6pv@rw@ju|smJ(#3~G^l20%8!#EG2A4C_cOOYbd9$9VP@0tmbKfYN
z$*~gZPkj)rE+}DD5tE)JJD3sXJIv^F0|1$%xt$=hk8LOI(5DM{hgRTS-LPrhH_gkE
zlZk$!eE>%VIr@?<u*^pb=xn+o<#>6i(dnJ|?uKH9QmG55GT;s<v5g+NRTLGoM76{a
zg2dOQ;m;g1id%|4I=}7qJZ#mbpL|I?l{lwAK;-C1bj;X)|BcF9oH-P~aa?^+eLA1{
zUSH`U@KMdVD8zSSuv|I|!oBF7>Pis&VupPed2}%4YpG6W{AZo5pI;le?OVABv11u9
z<H8sAGa?NcW1hcVfo}aR90oVo19Swx>ouHl@xSlV@^Y{xI5SrEk22$k^lHxU>SItp
z$I}KQt}yQ0$V}_?#o8uwA19M6OQ@zq3mDq)3R*QCXHFK*T~@^4^wzc1cSif4bw^6K
zycirE%1Dx3i#Y8=et1uy(ia`djS-Hdt@cWikhxOL`<vLj1Ql3;&T9!injCwxSGBg6
zsGEN)K#zU5iyhP76E;Oc)(sS@9=XP-nQ4%KPjhH+2eK|a>Fr<=O53f+-PQb2+e=$b
z0zSW-u(Pf+msj+_U+!9z8ox3O%Otrz4}+?WPxEKTbSWjb58R3>8Ma8}n3gSP*)ZQS
zE$^*7zXK;sQJ?Rq0BM7?EmXC?M1>h6WamRpx*g6(sh~tFD`#xlET_Awd$au(TMV@x
z^+|0I+|u7h6DQ@Q&E7j%F=~!ZdFB5}B_S|@Q3}<@6TlV{mS|nWBFf07l!(Q93p5z2
zb5J2?f!;1xNw`&{wKmFb52*l43TDS^JTSXv)TFaTTSoQRG<q@BwZT)LAG0Mou6N9<
z7_P%-oVmBkY-M4wLr3GZQ+BOXF$GkI0oIaV*qSa7$$_BGO-z)#y*?%IMfHcZS40D*
zM)jCpRa&0tqESjSS?=et!i4X3xc`5yYu_-De%cV6-)O7;cV@S-a5S$v<3;};`(J4!

diff --git a/core/src/main/res/drawable-xxhdpi/icon_local_save.png b/core/src/main/res/drawable-xxhdpi/icon_local_save.png
deleted file mode 100644
index 20448e4bf98468272a5b298fae35794acb74ce3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1694
zcmb`IYd8}M7{`}Z$z@D(nQ7Xrw%EG3&7}+5ilNrJn3+s2k!o#dLP9auo`Vn~%4G6P
zL>UR0Ii}laN{MjhR!BP>gwFbSzMK!|IUoM-|9Rg3`{jK<{N7~p;X|5g5H$b*py}dF
zpeQ|8sT|ey%G%Qg=~vpui_V^*0Kit8Us_{9y%PxltS7q=9FIrbo+^BK9${mUD0G~j
zb??A!b~Yv$SJLB}o~#+w4riQSSFNQImij5~aXi&H!k!8ndt7m#)dZ&hTtsm`d+Ix4
zabN6()jY%fqxQ=`7KSe344kx=MfXW$GFIgp8*FehwWXL2TrY?3Lg~jj3RN{EM8<!P
zM$YW}upHbl|H?qYNL!ST2NtF8e(=(N1tZg}IY}6`^#0+WCfv)?kMesFZQ<EmR_`i4
zEmn3f9yCW_`i@oDm(ugP!>0NT6x=r15v27!yl_wH#0Rt2dJ}f--V}j@r=eerEJl9Q
z%)(*#+pQV&bS681Z~!|0lo!drPrnS-;c^N(?OeLrSpv7;aLXSRXYbf#g=ZGs_3g^u
z5XXA2Rg670P&_#STVzh{xA1$B9q$Usnkndv99mG+q~KHSgoN^EXdjJH328(;a(Q7M
z)O>E+m-CZjyn}+WkSgB9Pw!TFF>7hWN1NL@@aV?T*;mM(O;y=Raz%$$a$CS8uGVx0
zlR~|UY)Y!{$33QPZEE`zSW^@tl$K&Vdg@Xoq6#<&)A@&5bgb>Q8*QcPYX=blU3KP9
zZE&LCAd`oj_Z>rRC=XjWT27H&zjhfYE|D&oXK4^Ez3mm}=6^W%N$&rgxhm^MK=PCe
zR$@RHzE~I?Y1tTappKjuqiw+TvB{cKi}2LXAYtF}Z&&3v^rA?q_|*C2FQuERz#G%s
zOdBKVQge^NvrVXa5DF<SAwHs8C50mkb$x2agF|v2jO#}Xp&6A&u0Uz^)Lq~`b8}L~
zlQUqho+LY#62--%JRm7I@apmuH%(Sh2_4Kwf-pDDuqQ+%32frsGF&ZLpejnjFB(@A
z(^;`%-<~?xzK?u0$+~U3KpX)J6*98=_R?S?+c&vZ>NK?vC`mw?f(mVD&hBsdHBqaM
z8NBDn9f61BkSEoRiW-=OGPI@vv9e^+QMNJ0*KoT38M9&Dw)cWR+Wm8*QHL!kv@gfQ
z&0Mnfs_ikI;+^~z9ex)m9p6hxf89N_;+LZ5mbflD<kW&_$SDd+BV~5g^~!WNqjk8?
z5R>igB|KB*1>IqCYF2eJnA`W2veQM-H1=-r2AX;ucYM$uO39>eHL^PhPGc?XLw0Va
zCHZNzzF|e=;%6>8?`C&y>F8)-YUybhbK@Iag7s7KSNq(0U2R2sfXrWGgv@ItSYEx5
zh@OPGK0JQ_imf}zGc15_7x=06hE45Ybl30n@^rUqKkY#@S(lYO8}<4QUl54Sznj}{
z0&Mi}WKUR$6Lp)5)J>>C&~5vraO)H1dQjJgEl0mk4!@ziB)tU#y>^3E%FpI065>B?
zNXzsv<mOEFzVSib(vpcwcoI!W2JnG32qT+bU88<797?Mgpsm-bT*B2JZ)So`sIwdP
z)Ki-1f%MibAt>gwnq23g_E!vJ(OpUwAh5cXO9MmN5-St(F7c2(S-|<Go5qSzk%X%p
zYMuXTT$IQzbOip09yW`t9u?}frLU1M!AhSGGHV_MZNGD>J|rc)2>vBBJ^fsHx%_K~
zl+pF?h!HrDIsJv|`EoX9#oLmyAmUjkG-Mm*%kxR{XCGKg+k0@yg1vh9)N#GIS{haz
z%z@0<WYYx!Mn}2e^09GqMDCLA4x7(qH1^1&f#s7V{k^|SFA?8u%C1OI_Z%LfF;DR5
zFc24?>C+!JCEO%VvcJ+dD-@4qe=kfefQTKZLfy9Io@=Kp!t=pCmds$+PhNB&RF$|I
zP<3S@oFeph&5`_-pg|3q={JRqWwtgOJ!YJWmiTfxH3P%i6Y<PYhe9)W6yGI-=xb|*
z__I6yrT-BVuj-%OoR~n{6XwTz*v5!^J?e`uLhT|s{saCki|7ug?K|Y~fR?%c4aWbV
dyFuFSpMWwi)U7!%ZbtcV04~JC1c4JH{%^k}4aooi

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png b/core/src/main/res/drawable-xxxhdpi/icon_actions_refill.png
deleted file mode 100644
index be3a5db708f478fc797cbf7e5183b2151894a342..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4290
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

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png b/core/src/main/res/drawable-xxxhdpi/icon_danar_useropt.png
deleted file mode 100644
index 52f952ced405961ccf8ec9610e807acf44551348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3827
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

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png b/core/src/main/res/drawable-xxxhdpi/icon_danarhistory.png
deleted file mode 100644
index 1f370715142910cacd06af6e78a58b148d2dc4c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5168
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
a3pGmVf~qeRp~Sz1J`0me#?^*iiT?v^`i&9*

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png b/core/src/main/res/drawable-xxxhdpi/icon_danarprofile.png
deleted file mode 100644
index ae1d615a33d710a580b36175948284132a55b216..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4908
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
Y|EeGKais3!pCXrq>3NeXBagWM0q>pa&Hw-a

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png b/core/src/main/res/drawable-xxxhdpi/icon_danarstats.png
deleted file mode 100644
index d147295d629691a6e08e2b026465e15f74bdeb1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2155
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

diff --git a/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png b/core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
deleted file mode 100644
index 80234a0f7530f55ccb3b40151f574dfe6f726f36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5576
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

diff --git a/core/src/main/res/drawable/icon_actions_profileswitch.png b/core/src/main/res/drawable/icon_actions_profileswitch.png
deleted file mode 100644
index eeae6ccfdb4e1e7479920aecb225f88eac9807d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1143
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIp=bkQ(AsLNtXIN*1IEu9W@0I#wV7S1krh9#cQkdIDfh_@VbdEUbut*E$
zG;s-v)+`aw-P+Ns#L*-s7Pv9+;Ew}Ny<LiIol7{hyi8Vf8up)0IydR`v%EWdtKZLR
z{e8G#x@B?Nx$^XHXU<GbI@%?w9kwRIE9J5Thn3&TC5;Mwoi1sLVyrK1xO1moQC=B;
zsn&C|vYfs#<IO3N4)O*}HAh}nO{?|cnh-4ZCvpKx1%D6IYHrRYLO<BPFkcPZe*VBZ
zF(Hq|thEP&!+E|iI3Kv=#GuJ)$5`Lss=1AgIY*CW0<+i~Rr%W`54a6D&dgn-z}=9$
zgU6KV%970TGY<JoUk~&cI5g#S7(e~i9_4vjb?t_rcbT_zGV5pMX{qj=wB<(d_sC1u
zo^!))sn||1ne(!3#?*$b4*HM3GFR}$Fn?nT{%2Ty^+4tWvkRTx3@fWRrnLA!ba;15
zA-v#aiLrtH;s57cQfKKNeS09WT9cuA5!1^JU*kocJ_t{JGOyT3YeKQv0p$fsN*%lh
z%BvG!FJjVUj^bS=I^FMZOGLf^LwkqC->@4!4Zoe+SRc1qOj^?~<g#P)m1KUO%07Xw
zavh7~qOT|%%1!al`B1&%j4;chW6Xs%SLg9hP&s4FomB2HLF}{r!}RkZJMRhnR++o~
z{%NLf6Tf7iQk`J1ZkP9)pNb3W!@cYqMc6#n+TLgTlJEageZnCo$*ETaFW7SiP4^bq
z+2k{IOHk1ECGnZJ&P?AD_-^uq`A#z@u6Z&!G%WI1=Ese?EP9Xoq#o#n@b1uFzdg3~
z=Ix@BQ9GO7Y*08?@oH5;`ldSm1G4-9;v2X%KK&?RX8s}b|1;|(o26!t-o0X%+`aw}
z%dCRs42-1*bdP;ux{<VPdYJjUkh%I3OusE-Z(J{SMxa1&#^dcF4Za70`2+fG@BcZ!
zbn2X`aS0MT7_ThLe6Guxpnf4wV14c}rskHfg1bF}HZHk;^Gmwc<lkm*R(rgAvk{i!
beqM~P{&4Jl+@&~1P<i3$>gTe~DWM4f5p>N&

diff --git a/core/src/main/res/drawable/icon_actions_refill.png b/core/src/main/res/drawable/icon_actions_refill.png
deleted file mode 100644
index 737cca8b004081172db6dae3f0021d3c2e9cc89f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1161
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIppPnv`AsLNtZ}@hEhe{m(c)lm~l~+~Z=}S3*J-arPco|RNaLE!4+|0pg
zo@&Ojc8zORkfSd5EDaYSULUS4tx7^JVZu+ir#)1<!gEC2i0NUzsfF%5<8uaQEQ-(l
zx8GtJzhh4E`<>@^o_{~Dc;08Hr9mr0w5EEcF3Qk0wA#NS+h%=fg5*2j@8N|a@sIyR
z95e2JcjnW}wl&+2r)ll_sPruM`Cj>p&ABhU&%ZlTwx?ac$o`I(qV`9_XG?yw?K_<L
zr*o#$ogkfqVtblQoo*bCXx#s|-^py*YTn};C94ZkTgvl~8Q*AVwdi<Wpf~k?@FR!n
z&Wi^3jxC!~FWmiM=0w*6sx=zN&bja4wEmEwHNV+&r=N-TlgvGBb$c4F^M3oeamSn-
zGtT4peb1{Wm#tGi%Q3U>d+<M9L%U<%;`;=d|MB$kYVVI*ATcrRn8$XB1IItOEqm)_
zGilvc<tgWd6RYk_;mSPjt-1f;kKLCU?%vRUHgjnOgE^n({5h`!R!(?2qjmF-O$YWh
z&V8x$Z2r*-j_nUG-{JCZUE}f6&M?{B+qvao^HR|%eBV?xZ9{%N3=7tJGHuGgds^;7
z*#%tRpGr;R`Y9&9WuNP=g6$H2BByXwhPK?>-1=>?q4LuDCsNyzIxlH0OR76H|CFg-
zZ<K6>jQwKqdeLjfQ{0d4dd*aK)>KdQQnCTd_s1;)SGt)kA_Jc9n)1%CG%ZkTiJ{7U
zwWt-&E_3TjPI0r$UDW#fqhqJ@Ql~cazj_zfTNi5UrCl-QjXuhMQ*qnjn^U+X@0HFI
z;6C_u=2ss<=?$z&$zO{W+8+(fPEfMZ`S-|VBS($d;=bKSDyn$?tK9Z({U^fxQ+Mg+
zBRg)W9mzQ!C&=Muy>Mr2&ayhe?(=N(4u!YwTd*g4uHQ?ZKic2!?5$v5eW{f1KKI4i
zB&Jx6ZHJhZ`jbujM1B?a1}TakJ(ix){p~@qjecMAy91LK-}tXmHhq3a-c=LfQitn(
wzmGN^y7Og?KgW-Q3Eh2O?-*lY>F?1G{)IVxH;U(Wvw}(xPgg&ebxsLQ08v@%WB>pF

diff --git a/core/src/main/res/drawable/icon_danar_useropt.png b/core/src/main/res/drawable/icon_danar_useropt.png
deleted file mode 100644
index 1fadcd446be0340737c1c7997a79fae7789e4589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 974
zcmV;<12O!GP)<h;3K|Lk000e1NJLTq001)p001%w1^@s6@%`hE00009a7bBm000XT
z000XT0n*)m`~Uz0fJsC_RA_<iT1{@+Koowhx-UB~>zn|30>}yC8`SJ9d6D!4r6<5y
zSn@991R*D=dxGE_z|y;L0;;Ee6FnwlGal^LLjEK#m>I_J^ZVY<7(N^h2f7q|yci|}
znI2;x(^m{+`if6o+ZC1ZgosA?xXHZqwX1t|S~R0F4vFYN3>8E)>xxikGJ{7RwBa!k
zt-88rmoYPHIDR&qV<swNHtG%^Uo$UFv?YFnz1WKZK5|^GU2JlS84$@K8-+(ATHs>C
zKG$rqgWM93&b9UP%u5@~(UlB8xf_e6dw$a5^VBd;6~w=0Ub-=iSHe|hb-Lf<sjp1N
zL}eVnbKg#QuW@X(U1y$&D6C7p+243rM`fIV^tftmQ@F}(Vxx0-VF818@YX_Gvx1i-
z9y2cuo7&}+njs%)_;&*lHs%RL3Jm{1yve;ncvRupg$TKlK{iu2{B20fgn9PHRpzCW
z%u9V_yc>8-U#pUVa~*Omnlkmidy0_Z6tdciDJ8LqT#p!2HESA`v2~4-a3v$XvNg=B
zr<=>cinR)B;T_#`R<O=yhNh8VKr3MHL}i?#el4RiUSePC=G4kF(6~;7w1Q}Yp1Bq$
z)|>Vl>mIIxt;{AB<3=)>m*$YnR0TWYK*dFsN2`psszqmY%_m&1GE{=>mmq1}H*HgF
zVN1q%^QeqxHQ(9717FZg&Y=Ig2C{0uqGJ3AR%FnE%neiTQYgnoRL1PF7gY8gJh6sc
zUU;6{8F;LAKa~J%?6l5isPHQ~?wSMnq|tBPqFAazs^;(D;Sr3xMJ!4~RZ9M;w>_<r
z(V)n1HTOmR;5aF`;_F{Pe7$uF`Y{5jUln4fl<%4VWPy{d3>)kl+La@~@R`~Ja#Nn*
zLhO_voIHa9w}MpIJ0WBkAiX|CWn6&t7MBlM1xN~eA+ZEw>VY_+^&^0IHxLQ~CEkwA
z;-R#11aKvj8;-z?dzOo;KOiRKXCvl(kTUJVxJL1{M%yP%mR*3Xwnkz&G6-G`an&80
z8^e`MovvA0OEimxw$?XDZ(l*GaqOIP1kkH8AH1%$Q{xyiQkNpK$NDRo)dc1)EsyiN
z=DL@F;v~8>eDz%&`mZkmZGgV*mtiT_5v%s3DY|^uT&4NWe$wcS3^cDdr-kXAL0jnj
wPYoCIW7EIJ@B?jMF_7si1~Prc<&YtwKfx`30dj}THUIzs07*qoM6N<$f^F!>M*si-

diff --git a/core/src/main/res/drawable/icon_home_profile.png b/core/src/main/res/drawable/icon_home_profile.png
deleted file mode 100644
index f689df10c6be8d709ccdbf9a221a424d39f094a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1026
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UIpB2O2`kc`H+GyJ_p6Ge{A-|3<1@=#0jKg+hYOY$eAOwoH4yn~0!{44J&
zS8nmGZ-jRkP2l1-*E{01m`Tvtz|k?LGqb)<_nD9EvWwR5_uj4My(cd-<M+PjbAH<x
zzdvLB-D{$UicqJE(nJr@Nf($F<YdiWVm+zt&1YlJewA8%RUOW0Vr&6s$9~TKxalkJ
z@+A`<G6_o_{@*>3Wk&I#`%x)pBF`-}FETD?ZPT$a=i5Dz%iulB`5ikY&F$jfu4)N7
zAG}&=Wq8p1qn4iHs=T|tIC|>e{a9@N-RaVvC92)2p4yY@yv|l;sUEORXl|aVWpOz;
zG|Q}Ew?lL65;wQi9gII%zKBS?+_*EVr|s3M)XdsxCD(XsFV26uQ6<yyWzntM%a00r
zhO5K|?2_4R@wjN(WR;iPSH)O1yghfPxoLA;woOUxcIm7`Jw8vS9jx_w!_DrJWNRaQ
z*5DHBnkV~y7`|L=e#PZzmaVo!xN#513s$jWrg>~}Gmm81bYI*3&~DEJzXV0~6qN%f
zJl1`aEzp{szf6!(_P`opW66Y+OIOcEt)Er?&1>$yZ7ROI&)YL)?Y))xI@I{9)Wl1F
z6&^b~+;uOn*%v36`_(MqSKZW)cIM?FmsG9mlryiN)!p%US1-%t=;w2HN^iS=>~`br
z1G{ENZ{JvU`sMkn|Mp#sF5Jv-p?JSx@&Vn1-oKHX=Lm;QHoV}ae0}Z&+k~wSKl)tf
zg|0ri<C>T9@y4^Y=l+Bz@L1#;rX{=PM6I7DDOezSqi9i?XT0?;?xNj|>eD7~WaW8Q
z?EEwQe|D+IE}fS%mRz57ZPgab+@IEy;#MZ`Xa3MX0!sy%b&PWJQ=g?)M6iIeuBWS?
J%Q~loCIAqCoaO)k

diff --git a/core/src/main/res/drawable/icon_local_save.png b/core/src/main/res/drawable/icon_local_save.png
deleted file mode 100644
index f2ecc45ac029723637b70dfd5093978a97a8c84a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2249
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
At^fc4


From 7f32881e10956d83bd33da69d6a636038de2609d Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 20 Jun 2020 14:54:54 +0200
Subject: [PATCH 211/400] Fix "always yellow" in watch

---
 .../general/wear/wearintegration/WatchUpdaterService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 845e862373..0adfcb1656 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -303,9 +303,9 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
         double highLine = defaultValueHelper.determineHighLine();
 
         long sgvLevel = 0L;
-        if (lastBG.value > highLine) {
+        if (lastBG.valueToUnits(units) > highLine) {
             sgvLevel = 1;
-        } else if (lastBG.value < lowLine) {
+        } else if (lastBG.valueToUnits(units) < lowLine) {
             sgvLevel = -1;
         }
 

From 1e24cfbb240fc330939fdc6e64b7369d3f65ce5d Mon Sep 17 00:00:00 2001
From: xJoe <jochen.gaiser@mail.de>
Date: Sat, 20 Jun 2020 20:33:13 +0200
Subject: [PATCH 212/400] Typo

Deleted full stop as it is item in preferences
---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4c79cb63b..6432db7141 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -400,7 +400,7 @@
     <string name="primefill">Prime/Fill</string>
     <string name="fillwarning">Please make sure the amount matches the specification of your infusion set!</string>
     <string name="othersettings_title">Other</string>
-    <string name="fillbolus_title">Fill/Prime standard insulin amounts.</string>
+    <string name="fillbolus_title">Fill/Prime standard insulin amounts</string>
     <string name="button1">Button 1</string>
     <string name="button2">Button 2</string>
     <string name="button3">Button 3</string>

From eaee46a55bf42b36824182455414c81e73eb0e77 Mon Sep 17 00:00:00 2001
From: xJoe <jochen.gaiser@mail.de>
Date: Sun, 21 Jun 2020 13:45:22 +0200
Subject: [PATCH 213/400] U/h instead of U/hr

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6432db7141..b3eb9b8b2c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -248,7 +248,7 @@
     <string name="filenotfound">File not found</string>
     <string name="nav_export">Export settings</string>
     <string name="nav_import">Import settings</string>
-    <string name="openapsma_maxbasal_title">Max U/hr a Temp Basal can be set to</string>
+    <string name="openapsma_maxbasal_title">Max U/h a Temp Basal can be set to</string>
     <string name="openapsma_maxbasal_summary">This value is called max basal in OpenAPS context</string>
     <string name="openapsma_maxiob_title">Maximum basal IOB OpenAPS can deliver [U]</string>
     <string name="openapsma_maxiob_summary">This value is called Max IOB in OpenAPS context\nThis is maximal insulin in [U] APS can deliver at once.</string>

From e972fa026468c9b734b6be58e0094225cb197644 Mon Sep 17 00:00:00 2001
From: xJoe <jochen.gaiser@mail.de>
Date: Sun, 21 Jun 2020 14:02:47 +0200
Subject: [PATCH 214/400] Typo

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3eb9b8b2c..200b364d48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -495,7 +495,7 @@
     <string name="key_openapsama_autosens_min" translatable="false">autosens_min</string>
     <string name="openapsama_autosens_min_summary">Default value: 0.7\nThe other side of the autosens safety limits, putting a cap on how low autosens can adjust basals, and how high it can adjust ISF and BG targets.</string>
     <string name="key_openapsama_autosens_adjusttargets" translatable="false">autosens_adjust_targets</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens adjust targets too</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens adjust targets, too</string>
     <string name="openapsama_autosens_adjusttargets_summary">Default value: true\nThis is used to allow autosens to adjust BG targets, in addition to ISF and basals.</string>
     <string name="key_openapsama_bolussnooze_dia_divisor" translatable="false">bolussnooze_dia_divisor</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Default value: 2\nBolus snooze is enacted after you do a meal bolus, so the loop won’t counteract with low temps when you’ve just eaten. The example here and default is 2; so a 3 hour DIA means that bolus snooze will be gradually phased out over 1.5 hours (3DIA/2).</string>

From 500de5fa2deba4ad48a74bd6f579ebb431f5209e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 22 Jun 2020 21:01:32 +0200
Subject: [PATCH 215/400] fix status lights

---
 .../plugins/general/nsclient/data/NSSettingsStatus.kt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
index d0441cccfa..06c853185a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSSettingsStatus.kt
@@ -139,7 +139,7 @@ class NSSettingsStatus @Inject constructor(
         val targetlow = getSettingsThreshold("bgTargetBottom")
         if (targetHigh != null) defaultValueHelper.bgTargetHigh = targetHigh
         if (targetlow != null) defaultValueHelper.bgTargetLow = targetlow
-        copyStatusLightsNsSettings(null)
+        if (config.NSCLIENT) copyStatusLightsNsSettings(null)
     }
 
     fun getName(): String? =

From 6a1394b7b9e37daa00fa8ad68615c72b9521f88c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 22 Jun 2020 22:19:27 +0200
Subject: [PATCH 216/400] activate correct profile

---
 .../androidaps/dialogs/ProfileSwitchDialog.kt      | 14 +++++++++++---
 .../plugins/profile/local/LocalProfileFragment.kt  |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
index 72daeb1ad1..5ea091fa28 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
@@ -28,6 +28,8 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var activePlugin: ActivePluginProvider
 
+    var profileIndex: Int? = null
+
     override fun onSaveInstanceState(savedInstanceState: Bundle) {
         super.onSaveInstanceState(savedInstanceState)
         savedInstanceState.putDouble("overview_profileswitch_duration", overview_profileswitch_duration.value)
@@ -38,6 +40,9 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         onCreateViewGeneral()
+        arguments?.let { bundle ->
+            profileIndex = bundle.getInt("profileIndex", 0)
+        }
         return inflater.inflate(R.layout.dialog_profileswitch, container, false)
     }
 
@@ -59,9 +64,12 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
             overview_profileswitch_profile.adapter = adapter
             // set selected to actual profile
-            for (p in profileList.indices)
-                if (profileList[p] == profileFunction.getProfileName(false))
-                    overview_profileswitch_profile.setSelection(p)
+            if (profileIndex != null)
+                overview_profileswitch_profile.setSelection(profileIndex as Int)
+            else
+                for (p in profileList.indices)
+                    if (profileList[p] == profileFunction.getProfileName(false))
+                        overview_profileswitch_profile.setSelection(p)
         } ?: return
 
         treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now())?.let { ps ->
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 057fe53ee0..d5a78456fd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -181,7 +181,9 @@ class LocalProfileFragment : DaggerFragment() {
 
         localprofile_profileswitch.setOnClickListener {
             // TODO: select in dialog localProfilePlugin.currentProfileIndex
-            ProfileSwitchDialog().show(childFragmentManager, "NewNSTreatmentDialog")
+            ProfileSwitchDialog()
+                .also { it.arguments = Bundle().also { bundle -> bundle.putInt("profileIndex", localProfilePlugin.currentProfileIndex) }}
+                .show(childFragmentManager, "NewNSTreatmentDialog")
         }
 
         localprofile_reset.setOnClickListener {

From 6783c78d32a9fb15c50a0d3439847a2ad0bffafb Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 22 Jun 2020 22:20:11 +0200
Subject: [PATCH 217/400] remove TODO

---
 .../androidaps/plugins/profile/local/LocalProfileFragment.kt     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index d5a78456fd..db134ed413 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -180,7 +180,6 @@ class LocalProfileFragment : DaggerFragment() {
         localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
 
         localprofile_profileswitch.setOnClickListener {
-            // TODO: select in dialog localProfilePlugin.currentProfileIndex
             ProfileSwitchDialog()
                 .also { it.arguments = Bundle().also { bundle -> bundle.putInt("profileIndex", localProfilePlugin.currentProfileIndex) }}
                 .show(childFragmentManager, "NewNSTreatmentDialog")

From 3305a5979ddf7678a6d1f82f53f5a75b88c08725 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 22 Jun 2020 22:55:50 +0200
Subject: [PATCH 218/400] fix displaying profile switches

---
 .../androidaps/db/DatabaseHelperProvider.java       |  4 ++++
 .../fragments/TreatmentsProfileSwitchFragment.kt    |  2 +-
 .../androidaps/dialogs/ProfileViewerDialog.kt       | 13 ++++++++++++-
 .../interfaces/DatabaseHelperInterface.kt           |  7 ++-----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
index d174f170f5..2b8b79db2c 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -69,4 +69,8 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
     @Override public long roundDateToSec(long date) {
         return MainApp.getDbHelper().roundDateToSec(date);
     }
+
+    @NotNull @Override public List<ProfileSwitch> getProfileSwitchData(long from, boolean ascending) {
+        return MainApp.getDbHelper().getProfileSwitchData(from, ascending);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index 886c0ec34e..9f76f7f79c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -156,7 +156,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                     R.id.profileswitch_date, R.id.profileswitch_name -> {
                         val args = Bundle()
                         args.putLong("time", (v.tag as ProfileSwitch).date)
-                        args.putInt("mode", ProfileViewerDialog.Mode.RUNNING_PROFILE.ordinal)
+                        args.putInt("mode", ProfileViewerDialog.Mode.DB_PROFILE.ordinal)
                         val pvd = ProfileViewerDialog()
                         pvd.arguments = args
                         pvd.show(childFragmentManager, "ProfileViewDialog")
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index df60da2067..56e48bd894 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.close.*
@@ -24,12 +25,14 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
 
     private var time: Long = 0
 
     enum class Mode(val i: Int) {
         RUNNING_PROFILE(1),
-        CUSTOM_PROFILE(2)
+        CUSTOM_PROFILE(2),
+        DB_PROFILE(3)
     }
 
     private var mode: Mode = Mode.RUNNING_PROFILE
@@ -79,6 +82,14 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 date = ""
                 profileview_datelayout.visibility = View.GONE
             }
+
+            Mode.DB_PROFILE      -> {
+                val profileList = databaseHelper.getProfileSwitchData(time, true)
+                profile = if (profileList.isNotEmpty()) profileList[0].profileObject else null
+                profileName = if (profileList.isNotEmpty()) profileList[0].customizedName else null
+                date = if (profileList.isNotEmpty()) dateUtil.dateAndTimeString(profileList[0].date) else null
+                profileview_datelayout.visibility = View.VISIBLE
+            }
         }
         profileview_noprofile.visibility = View.VISIBLE
 
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index fbaab3d3db..66cf3e3d2f 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -1,11 +1,7 @@
 package info.nightscout.androidaps.interfaces
 
 import com.j256.ormlite.dao.CloseableIterator
-import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.DanaRHistoryRecord
-import info.nightscout.androidaps.db.DbRequest
-import info.nightscout.androidaps.db.TDD
+import info.nightscout.androidaps.db.*
 
 interface DatabaseHelperInterface {
 
@@ -21,4 +17,5 @@ interface DatabaseHelperInterface {
     fun deleteDbRequestbyMongoId(action: String, _id: String)
     fun getDbRequestInterator(): CloseableIterator<DbRequest>
     fun roundDateToSec(date: Long): Long
+    fun getProfileSwitchData(from: Long, ascending: Boolean): List<ProfileSwitch>
 }
\ No newline at end of file

From be6c184061f9cac8ec3f62b5b11cce8f2db9a62c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 22 Jun 2020 23:31:13 +0200
Subject: [PATCH 219/400] try to catch startup error

---
 .../persistentNotification/DummyService.kt    | 13 +++++++++++--
 .../androidaps/services/LocationService.kt    | 19 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
index 8a4524d9e2..82bc322824 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.general.persistentNotification
 
+import android.app.Notification
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
@@ -32,7 +33,11 @@ class DummyService : DaggerService() {
         super.onCreate()
         // TODO: I guess this was moved here in order to adhere to the 5 seconds rule to call "startForeground" after a Service was called as Foreground service?
         // As onCreate() is not called every time a service is started, copied to onStartCommand().
-        startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        try {
+            startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        } catch (e: Exception) {
+            startForeground(4711, Notification())
+        }
         disposable.add(rxBus
             .toObservable(EventAppExit::class.java)
             .observeOn(Schedulers.io())
@@ -52,7 +57,11 @@ class DummyService : DaggerService() {
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
-        startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        try {
+            startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        } catch (e: Exception) {
+            startForeground(4711, Notification())
+        }
         return Service.START_STICKY
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
index 35374b47d7..4af050da21 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.services
 
 import android.Manifest
+import android.app.Notification
 import android.app.Service
 import android.content.Context
 import android.content.Intent
@@ -73,17 +74,27 @@ class LocationService : DaggerService() {
 
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
-        startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        try {
+            startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        } catch (e: Exception) {
+            startForeground(4711, Notification())
+        }
         return Service.START_STICKY
     }
 
     override fun onCreate() {
         super.onCreate()
-        startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        try {
+            startForeground(notificationHolder.notificationID, notificationHolder.notification)
+        } catch (e: Exception) {
+            startForeground(4711, Notification())
+        }
 
         // Get last location once until we get regular update
-        LocationServices.getFusedLocationProviderClient(this).lastLocation.addOnSuccessListener {
-            lastLocationDataContainer.lastLocation = it
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            LocationServices.getFusedLocationProviderClient(this).lastLocation.addOnSuccessListener {
+                lastLocationDataContainer.lastLocation = it
+            }
         }
 
         initializeLocationManager()

From 40c9907515671601e67f093d0186a3e9832bbe62 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 23 Jun 2020 00:26:55 +0200
Subject: [PATCH 220/400] fix RS timezone handling

---
 dana/build.gradle                             |  2 ++
 .../nightscout/androidaps/dana/DanaPump.kt    | 11 +++++++++-
 .../danars/services/DanaRSService.kt          | 20 ++++++++++---------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/dana/build.gradle b/dana/build.gradle
index 09205a9337..08a34677fa 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -55,6 +55,8 @@ dependencies {
 
     implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
 
+    implementation 'net.danlew:android.joda:2.10.6'
+
     // Graphview cannot be upgraded
     implementation "com.jjoe64:graphview:4.0.1"
 
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index e06f924215..175daea266 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -9,10 +9,13 @@ import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.text.DecimalFormat
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -60,7 +63,13 @@ class DanaPump @Inject constructor(
     }
 
     fun setPumpTime(value: Long, zoneOffset: Int) {
-        pumpTime = value + T.hours(zoneOffset.toLong()).msecs()
+        // Store time according to timezone in phone
+        val tz = DateTimeZone.getDefault()
+        val instant = DateTime.now().millis
+        val offsetInMilliseconds = tz.getOffset(instant).toLong()
+        val offset = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds)
+        pumpTime = value + T.hours(offset).msecs()
+        // but save zone in pump
         this.zoneOffset = zoneOffset
     }
 
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index 469eb2188d..abe5f6333d 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -11,6 +11,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
 import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.comm.*
@@ -153,12 +154,17 @@ class DanaRSService : DaggerService() {
                 // initial handshake was not successful
                 // de-initialize pump
                 danaPump.reset()
-                rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
+                rxBus.send(EventDanaRNewStatus())
                 rxBus.send(EventInitializationChanged())
                 return
             }
             aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
-            if (abs(timeDiff) > 3) {
+            // phone timezone
+            val tz = DateTimeZone.getDefault()
+            val instant = DateTime.now().millis
+            val offsetInMilliseconds = tz.getOffset(instant).toLong()
+            val offset = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds).toInt()
+            if (abs(timeDiff) > 3 || danaPump.usingUTC && offset != danaPump.zoneOffset) {
                 if (abs(timeDiff) > 60 * 60 * 1.5) {
                     aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
                     //If time-diff is very large, warn user until we can synchronize history readings properly
@@ -171,16 +177,12 @@ class DanaRSService : DaggerService() {
 
                     //de-initialize pump
                     danaPump.reset()
-                    rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
+                    rxBus.send(EventDanaRNewStatus())
                     rxBus.send(EventInitializationChanged())
                     return
                 } else {
                     if (danaPump.usingUTC) {
-                        val tz = DateTimeZone.getDefault()
-                        val instant = DateTime.now().millis
-                        val offsetInMilliseconds = tz.getOffset(instant).toLong()
-                        val hours = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds).toInt()
-                        sendMessage(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector, DateUtil.now(), hours))
+                        sendMessage(DanaRS_Packet_Option_Set_Pump_UTC_And_TimeZone(injector, DateUtil.now(), offset))
                     } else if (danaPump.protocol >= 6) { // can set seconds
                         sendMessage(DanaRS_Packet_Option_Set_Pump_Time(injector, DateUtil.now()))
                     } else {
@@ -195,7 +197,7 @@ class DanaRSService : DaggerService() {
                 }
             }
             loadEvents()
-            rxBus.send(info.nightscout.androidaps.dana.events.EventDanaRNewStatus())
+            rxBus.send(EventDanaRNewStatus())
             rxBus.send(EventInitializationChanged())
             //NSUpload.uploadDeviceStatus();
             if (danaPump.dailyTotalUnits > danaPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {

From a4df8d422b8649dac73673b079978e548f915f35 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 23 Jun 2020 10:32:20 +0200
Subject: [PATCH 221/400] New Crowdin updates (#2727)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations exam.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations exam.xml (Russian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations exam.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations exam.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations protection.xml (Bulgarian)

* New translations exam.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (Dutch)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations objectives.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations exam.xml (Portuguese)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)
---
 app/src/main/res/values-af-rZA/strings.xml    |   3 -
 app/src/main/res/values-bg-rBG/exam.xml       |  26 +++-
 app/src/main/res/values-bg-rBG/protection.xml |   1 +
 app/src/main/res/values-bg-rBG/strings.xml    |  14 ++-
 app/src/main/res/values-cs-rCZ/exam.xml       |   3 +
 app/src/main/res/values-cs-rCZ/objectives.xml |   2 +-
 app/src/main/res/values-cs-rCZ/strings.xml    |  11 +-
 app/src/main/res/values-de-rDE/strings.xml    |  19 ++-
 app/src/main/res/values-el-rGR/strings.xml    |   3 -
 app/src/main/res/values-es-rES/strings.xml    |   3 -
 app/src/main/res/values-fr-rFR/strings.xml    |   3 -
 app/src/main/res/values-it-rIT/strings.xml    |   6 +-
 app/src/main/res/values-ko-rKR/strings.xml    |   3 -
 app/src/main/res/values-lt-rLT/strings.xml    |   3 -
 app/src/main/res/values-nl-rNL/strings.xml    |   3 -
 app/src/main/res/values-pl-rPL/strings.xml    |   3 -
 app/src/main/res/values-pt-rBR/strings.xml    |  21 ++--
 app/src/main/res/values-pt-rPT/exam.xml       |   3 +
 app/src/main/res/values-pt-rPT/strings.xml    |  10 +-
 app/src/main/res/values-ro-rRO/strings.xml    |   3 -
 app/src/main/res/values-ru-rRU/exam.xml       |   3 +
 app/src/main/res/values-ru-rRU/strings.xml    |   4 +-
 app/src/main/res/values-sk-rSK/exam.xml       |   3 +
 app/src/main/res/values-sk-rSK/strings.xml    |  19 ++-
 app/src/main/res/values-sv-rSE/exam.xml       |   3 +
 app/src/main/res/values-sv-rSE/strings.xml    |   4 +-
 app/src/main/res/values-tr-rTR/strings.xml    |   3 -
 app/src/main/res/values-zh-rCN/strings.xml    |   3 -
 core/src/main/res/values-bg-rBG/strings.xml   | 112 ++++++++++++++++++
 core/src/main/res/values-cs-rCZ/strings.xml   |   1 +
 core/src/main/res/values-de-rDE/strings.xml   |   4 +-
 core/src/main/res/values-fr-rFR/strings.xml   |   1 -
 core/src/main/res/values-it-rIT/strings.xml   |   2 +-
 core/src/main/res/values-pt-rPT/strings.xml   |   1 +
 core/src/main/res/values-ru-rRU/strings.xml   |   1 -
 core/src/main/res/values-sk-rSK/strings.xml   |   1 +
 core/src/main/res/values-sv-rSE/strings.xml   |   2 +-
 dana/src/main/res/values-bg-rBG/strings.xml   | 103 +++++++++++++++-
 dana/src/main/res/values-nl-rNL/strings.xml   |   2 +-
 dana/src/main/res/values-pt-rBR/strings.xml   |   3 +
 wear/src/main/res/values-bg-rBG/strings.xml   |  25 ++++
 41 files changed, 354 insertions(+), 89 deletions(-)

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index d5efacdd54..905b4239d3 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -156,7 +156,6 @@
     <string name="filenotfound">Lêer nie gevind nie</string>
     <string name="nav_export">Voer instellings uit na</string>
     <string name="nav_import">Voer instellings in</string>
-    <string name="openapsma_maxbasal_title">Maks U/hr vir \'n Tydelike Basale kan gestel word na</string>
     <string name="openapsma_maxbasal_summary">Die waarde word \"maks basal\" genoem in OpenAPS konteks</string>
     <string name="openapsma_maxiob_title">Maksimum basale IAB wat OpenAPS mag lewer [U]</string>
     <string name="openapsma_maxiob_summary">Hierdie waarde word Maks IAB genoem in OpenAPS konteks\nDit is die maksimum insulien in [U] wat APS op een slag kan lewer.</string>
@@ -223,7 +222,6 @@
     <string name="primefill">Prima/vul</string>
     <string name="fillwarning">Maak asseblief seker dat die hoeveelheid ooreenstem met die spesifikasies van jou infusie stel!</string>
     <string name="othersettings_title">Ander</string>
-    <string name="fillbolus_title">Vul/prima standaard insulien hoeveelhede.</string>
     <string name="button1">Knoppie 1</string>
     <string name="button2">Knoppie 2</string>
     <string name="button3">Knoppie 3</string>
@@ -278,7 +276,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Verstek waarde: 4 dit is die helfte van die sleutel OpenAPS veiligheid limiete, en die ander helfte van \"3 x maks daaglikse; 4 x huidige\"van die veiligheid limiet. Dit beteken jou basale, ongeag max basale stel op jou pomp, kan enige hoër wees as hierdie nommer tye die huidige vlak van jou basale. Dit is om te verhoed dat mense in gevaarlike gebied deur instelling buitensporig hoë max basals voor om te verstaan hoe die algoritme werk. Weer, die verstek is 4 x; die meeste mense sal nooit moet dit aanpas en is eerder meer geneig om te moet aanpas ander instellings as hulle voel hulle \"loop in\" hierdie veiligheid limiet.</string>
     <string name="openapsama_autosens_max_summary">Verstek waarde: 1.2\nThis is \'n vermenigvuldiger plafon vir autosens (en gou autotune) stel \'n 20%% max limiet op hoe hoog die autosens verhouding kan wees, wat op sy beurt bepaal hoe hoog autosens basale kan aanpas, hoe laag dit ISF kan aanpas, en hoe laag dit die BG teiken kan stel.</string>
     <string name="openapsama_autosens_min_summary">Verstek waarde: 0.7\nDie ander kant van die autosens veiligheidsperke, sit \'n limiet op hoe laag autosens basals kan aanpas, en hoe hoog dit ISF en BG teikens kan verstel.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens Verstel doelwitte ook</string>
     <string name="openapsama_autosens_adjusttargets_summary">Verstek waarde: waar\nDit word gebruik om autosens toe te laat om BG teikens aan te pas, benewens ISF en basale.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Verstek waarde: 2\nBolus sluimer is verorden nadat jy \'n maaltyd bolus gedoen het, so die lus sal nie werk met lae tydelike wanneer jy nou net geëet het nie. Die voorbeeld hier se verstek is 2; so \'n 3 uur DIA beteken dat bolus sluimer sal geleidelik uitgefaseer sal word oor 1.5 uur (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Verstek waarde: 3.0 (AMA) of 8.0 (SMB). Dit is \'n instelling vir verstek karb absorpsie impak per 5 minute. Die verstek is \'n verwagte 3mg/dl / 5min. Dit beïnvloed hoe vinnig KOB opgeneem word, en hoeveel karb absorpsie word aanvaar sodat in die berekening van toekomstige BG, voorspel wanneer BG val meer as verwagte, of nie soveel styg as verwag.</string>
diff --git a/app/src/main/res/values-bg-rBG/exam.xml b/app/src/main/res/values-bg-rBG/exam.xml
index 3ea04e700d..cd1e715314 100644
--- a/app/src/main/res/values-bg-rBG/exam.xml
+++ b/app/src/main/res/values-bg-rBG/exam.xml
@@ -1,2 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+</resources>
diff --git a/app/src/main/res/values-bg-rBG/protection.xml b/app/src/main/res/values-bg-rBG/protection.xml
index 868fec0b53..71b706e2fc 100644
--- a/app/src/main/res/values-bg-rBG/protection.xml
+++ b/app/src/main/res/values-bg-rBG/protection.xml
@@ -9,6 +9,7 @@
     <string name="settings_password">Парола за настройки</string>
     <string name="application_password">Парола за приложението</string>
     <string name="bolus_password">Парола за болус</string>
+    <string name="unlock_settings">Отключи настройките</string>
     <string name="biometric">Биометрични данни</string>
     <string name="custom_password">Допълнителна парола</string>
     <string name="noprotection">Няма защита</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index f3c9582648..bbb1549b02 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -131,6 +131,7 @@
     <string name="disableloop">Изключи Loop</string>
     <string name="enableloop">Включи Loop</string>
     <string name="openloop_newsuggestion">Има ново предложение</string>
+    <string name="carbssuggestion">Предложение</string>
     <string name="unsupportednsversion">Несъвместима версия на Nightscout</string>
     <string name="loopdisabled">LOOP Е СПРЯН ОТ ОГРАНИЧЕНИЯТА</string>
     <string name="treatments_wizard_basaliob_label">Базален IOB</string>
@@ -163,7 +164,6 @@
     <string name="filenotfound">Файлът не е намерен</string>
     <string name="nav_export">Експорт настройки</string>
     <string name="nav_import">Импорт настройки</string>
-    <string name="openapsma_maxbasal_title">Максимално позволен временен базал Е/ч</string>
     <string name="openapsma_maxbasal_summary">Макс. лимит на временен базал [Е/ч] </string>
     <string name="openapsma_maxiob_title">Максимален IOB</string>
     <string name="openapsma_maxiob_summary">Този параметър се нарича максимален IOB в OpenAPS и подразбиране е 0. След няколко дни или седмици можете да го увеличите.</string>
@@ -299,7 +299,6 @@
     <string name="primefill">Пълнене на сет</string>
     <string name="fillwarning">Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB!</string>
     <string name="othersettings_title">Други</string>
-    <string name="fillbolus_title">Fill/Prime количества инсулин по подразбиране.</string>
     <string name="button1">Бутон 1</string>
     <string name="button2">Бутон 2</string>
     <string name="button3">Бутон 3</string>
@@ -358,7 +357,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от \"3x от най-високия дневен; 4x от текущия\". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри.</string>
     <string name="openapsama_autosens_max_summary">По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune), за да позволи 20%% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали инсулиновата чувствителност, и колко ниско може да свали целевата КЗ.</string>
     <string name="openapsama_autosens_min_summary">По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ.</string>
-    <string name="openapsama_autosens_adjusttargets">Да променя ли autosens и целевата КЗ</string>
     <string name="openapsama_autosens_adjusttargets_summary">По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал).</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така Loop няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Стойност по подразбиране: 3.0 (АМА) или 8.0 (SMB). Това е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл за 5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното.</string>
@@ -560,6 +558,7 @@
     <string name="enable_missed_bg_readings_alert">Аларма при липса на данни за КЗ</string>
     <string name="enable_pump_unreachable_alert">Аларма при недостъпна помпа</string>
     <string name="pump_unreachable_threshold">Лимит за недостъпна помпа [мин]</string>
+    <string name="enable_carbs_req_alert">Аларма ако трябват въглехидрати</string>
     <string name="urgent_alarm">Спешна аларма</string>
     <string name="info">ИНФО</string>
     <string name="eversense">Eversense приложение(модифицирано)</string>
@@ -572,6 +571,8 @@
     <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
     <string name="uamsmbmaxminutes">Максимум минути за отчитане на необявени хранения UAM</string>
     <string name="uamsmbmaxminutes_summary">Максимални минути за ограничаване на базала при SMB за UAM</string>
+    <string name="carbsReqThreshold">Минимум въглехидрати, необходими за аларма</string>
+    <string name="carbsReqThreshold_summary">Грама въглехидрати минимум, за да се покаже аларма. Нужни въглехидрати под това число няма да доведат до уведомяване.</string>
     <string name="dexcomg5_xdripupload_title">Изпращай данни за КЗ към xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">В xDrip+ изберете 640g/Eversense за източник на данни</string>
     <string name="nsclientbg">КЗ от NS</string>
@@ -651,11 +652,17 @@
     <string name="insulin_increment_button_message">Количество инсулин за добавяне при натискане на бутона</string>
     <string name="error_starting_cgm">Не може да се стартира CGM приложението. Уверете се, че е инсталирано.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Игнориране за 5 мин</string>
+    <string name="ignore15m">Игнориране за 15 мин</string>
+    <string name="ignore30m">Игнориране за 30 мин</string>
+    <string name="required">нужн</string>
     <string name="nav_historybrowser">История</string>
     <string name="wear_notifysmb_title">Уведомяване при SMB</string>
     <string name="wear_notifysmb_summary">Покажи SMB на часовника като стандартен болус.</string>
     <string name="ns_create_announcements_from_errors_title">Създаване на известие при грешки</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Създаване на съобщения при предупреждения за нужни въглехидрати</string>
     <string name="ns_create_announcements_from_errors_summary">Създаване на Nightscout известие при грешки и локални аларми (също видими в Careportal - Treatments)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Създаване на Nightscout  съобщения при аларма за нужни въглехидрати</string>
     <string name="wear_predictions_summary">Показвай прогнозините КЗ на часовника.</string>
     <string name="wear_predictions_title">Прогнозни КЗ</string>
     <string name="data_choices">Избор на данни</string>
@@ -1219,6 +1226,7 @@
     <string name="high_mark_comment">Високата граница на диапазона (графика)</string>
     <string name="reorder_label">Подреди</string>
     <string name="age">Възраст:</string>
+    <string name="weight_label">Тегло:</string>
     <string name="id">Номер:</string>
     <string name="submit">Изпрати</string>
     <string name="mostcommonprofile">Най-често използван профил:</string>
diff --git a/app/src/main/res/values-cs-rCZ/exam.xml b/app/src/main/res/values-cs-rCZ/exam.xml
index 67b1930191..1691517759 100644
--- a/app/src/main/res/values-cs-rCZ/exam.xml
+++ b/app/src/main/res/values-cs-rCZ/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co je pravda o DIA?</string>
+    <string name="dia_label_exam">Téma: Doba trvání účinku inzulínu</string>
     <string name="dia_minimumis3h">Minimální hodnota je 3 hodiny.</string>
     <string name="dia_minimumis5h">Minimální hodnota je 5 hodin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Aplikace Loop na iPhone.</string>
     <string name="nsclient_spikeiphone">Aplikace Spike na iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
+    <string name="isf_label_exam">Téma: Citlivost na inzulín</string>
     <string name="isf_increasingvalue">Vyšší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
     <string name="isf_decreasingvalue">Nižší hodnoty ISF vedou k menší dávce inzulínu při korigování vysoké glykémie.</string>
     <string name="isf_noeffect">Změna hodnoty ISF nemá vliv na dávku inzulínu při korigování vysoké glykémie.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Změna hodnoty citlivosti ve vašem profilu postačuje k tomu, aby se tato změna použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Téma: Inzulino-sacharidový poměr</string>
     <string name="ic_increasingvalue">Vyšší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
     <string name="ic_decreasingvalue">Nižší hodnoty IC vedou k menší dávce inzulínu pro stejné množství sacharidů.</string>
     <string name="ic_noeffect">Pokud máte 0 COB změna inzulino-sacharidového poměru povede k jinému množství inzulínu vydanému pro korekci glykémie.</string>
diff --git a/app/src/main/res/values-cs-rCZ/objectives.xml b/app/src/main/res/values-cs-rCZ/objectives.xml
index bbebc9fc02..54608d561a 100644
--- a/app/src/main/res/values-cs-rCZ/objectives.xml
+++ b/app/src/main/res/values-cs-rCZ/objectives.xml
@@ -22,7 +22,7 @@
     <string name="objectives_smb_objective">Povolit další funkce pro běžné používání jako SMB</string>
     <string name="objectives_auto_objective">Povolení automatizace</string>
     <string name="objectives_smb_gate">Přečíst si dokumentaci a zvýšit maximální IOB, aby mohlo SMB fungovat. Pro začátek se dá použít velikost běžného bolusu + 3x maximální denní bazál</string>
-    <string name="objectives_auto_gate">Přečtěte si na wiki, jak automatizace funguje. Nejdříve nastavte pouze jednoduchá pravidla. Namísto provádění akcí nechte AAPS zobrazovat pouze oznámení. Pokud jste si jistí, že je automatizace je spuštěna v pravý čas, můžete oznámení nahradit prováděním akce. (https://androidaps.readdocs.io/en/latest/CROWDIN/cs/Usage/Automation.html)</string>
+    <string name="objectives_auto_gate">Přečtěte si na wiki, jak automatizace funguje. Nejdříve nastavte pouze jednoduchá pravidla. Namísto provádění akcí nechte AAPS zobrazovat pouze oznámení. Pokud jste si jistí, že je automatizace spouštěna v pravý čas, můžete oznámení nahradit prováděním akce. (https://androidaps.readdocs.io/en/latest/CROWDIN/cs/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glykémie dostupná v NS</string>
     <string name="objectives_pumpstatusavailableinns">Stav pumpy dostupný v NS</string>
     <string name="objectives_manualenacts">Ručně spuštěno</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index c7ccc964d1..4d57748e25 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -164,7 +164,7 @@
     <string name="filenotfound">Soubor nenalezen</string>
     <string name="nav_export">Exportovat nastavení</string>
     <string name="nav_import">Importovat nastavení</string>
-    <string name="openapsma_maxbasal_title">Maximální povolený bazál [U/h]</string>
+    <string name="openapsma_maxbasal_title">Max. U/h, které lze nastavit pro dočas. bazál</string>
     <string name="openapsma_maxbasal_summary">Tato hodnota je v kontextu OpenAPS nazývána max basal</string>
     <string name="openapsma_maxiob_title">Maximální bazální IOB [U]</string>
     <string name="openapsma_maxiob_summary">Tato hodnota je v kontextu OpenAPS nazývána max IOB</string>
@@ -300,7 +300,7 @@
     <string name="primefill">Plnění/doplňování</string>
     <string name="fillwarning">Prosím ujistěte se, že hodnota odpovídá specifikaci Vašeho setu!</string>
     <string name="othersettings_title">Jiné</string>
-    <string name="fillbolus_title">Hodnoty plnění/doplňování.</string>
+    <string name="fillbolus_title">Standardní množství inzulinu pro Plnění/Doplňování</string>
     <string name="button1">Tlačítko 1</string>
     <string name="button2">Tlačítko 2</string>
     <string name="button3">Tlačítko 3</string>
@@ -359,7 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Výchozí hodnota: 4 Toto je druhá klíčová hodnota. Říká, že maximální hodnota dočasného bazálu nikdy nebude větší, než čtyřnásobek aktuálního bazálu. Je to proto, aby se lidé nedostali do nebezpečných hodnot dříve, než pochopí jak OpenAPS pracuje. Znovu, výchozí hodnota je 4 a většina lidí ji nikdy nebude muset změnit. Pokud nestačí, obvykle je problém někde jinde.</string>
     <string name="openapsama_autosens_max_summary">Výchozí hodnota: 1.2\nToto je bezpečnostní nastavení pro detekci sensitivity (a brzy autotune). Říká, že autosense může zvýšit bazály, snížit ISF a snížit cílovou hodnotu glykémie o 20 %.</string>
     <string name="openapsama_autosens_min_summary">Výchozí hodnota: 0.7\nToto je bezpečnostní nastavení pro detekci sensitivity. Říká, že autosense může snížit bazály, zvýšit ISF a zvýšit cílovou hodnotu glykémie na 70 %.</string>
-    <string name="openapsama_autosens_adjusttargets">Úprava cílové glykémie pomocí Autosens</string>
+    <string name="openapsama_autosens_adjusttargets">Autosense také upravuje cílovou glykémii</string>
     <string name="openapsama_autosens_adjusttargets_summary">Výchozí hodnota: zapnuto\nToto nastavení říká, že autosens může měnit také cílové hodnoty glykémií.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Výchozí hodnota: 2\nToto nastavení říká, po jakou část z hodnoty DIA smyčka po bolusu čeká a nereaguje na změny glykémií (zde 3DIA/2 = 1,5h).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Výchozí hodnota: 3.0 (AMA) nebo 8.0 (SMB) mg/dl/5min. Tato hodnota definuje minimální část strávených sacharidů za každých 5 min. Tato hodnota ovlivňuje výpočet COB.</string>
@@ -814,9 +814,9 @@
     <string name="low_temptarget_lowers_sensitivity_title">Nízký dočasný cíl sníží senzitivitu</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Nižší senzitivita pro dočasné cíle < 5.5]]></string>
     <string name="resistance_lowers_target_title">Rezistence snižuje cíl</string>
-    <string name="resistance_lowers_target_summary">Je-li zjištěna rezistence, snížit cílovou hladinu glukózy</string>
+    <string name="resistance_lowers_target_summary">Je-li zjištěna rezistence, sníží nastavenou cílovou glykémii</string>
     <string name="sensitivity_raises_target_title">Citlivost zvyšuje cíl</string>
-    <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší cílovou hladinu glukózy</string>
+    <string name="sensitivity_raises_target_summary">Je-li zjištěna vyšší citlivost, zvýší nastavenou cílovou glykémii</string>
     <string name="combo_invalid_setup">Chybné nastavení pumpy. Projděte si dokumentaci a přesvědčete se, že menu Quick Info se jmenuje QUICK INFO, za použití 360 configuration software.</string>
     <string name="custom">Volitelný</string>
     <string name="careportal_removestartedevents">Vyčistit události \"AndroidAPS restartován\"</string>
@@ -1229,6 +1229,7 @@
     <string name="high_mark_comment">Horní hodnota oblasti v rozsahu (pouze zobrazování)</string>
     <string name="reorder_label">Změna pořadí</string>
     <string name="age">Věk:</string>
+    <string name="weight_label">Hmotnost:</string>
     <string name="id">ID:</string>
     <string name="submit">Odeslat</string>
     <string name="mostcommonprofile">Nejběžnější profil:</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ff8135d71b..ae9d944a41 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -156,7 +156,7 @@
     <string name="overview_tempbasal_button">TBR</string>
     <string name="overview_extendedbolus_button">Verzögerter Bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout-Version:</string>
-    <string name="missing_carbs">Fehlend %1$dg</string>
+    <string name="missing_carbs">Fehlend %1$d g</string>
     <string name="exported">Einstellungen exportiert</string>
     <string name="export_to">Einstellungen exportieren nach</string>
     <string name="import_from">Importiere Einstellungen von</string>
@@ -164,7 +164,6 @@
     <string name="filenotfound">Datei nicht gefunden</string>
     <string name="nav_export">Einstellungen exportieren</string>
     <string name="nav_import">Einstellungen importieren</string>
-    <string name="openapsma_maxbasal_title">Max. IE/h, die als TBR gesetzt werden können</string>
     <string name="openapsma_maxbasal_summary">Dieser Wert wird \"max basal\" in OpenAPS genannt.</string>
     <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
     <string name="openapsma_maxiob_summary">Maximale Menge von Nicht-Bolus-IOB, die OpenAPS abgeben kann.</string>
@@ -271,8 +270,8 @@
     <string name="smscommunicator_loopdisablereplywithcode">Um den Loop zu deaktivieren, antworte mit dem Code %1$s</string>
     <string name="smscommunicator_tempbasalset">TBR mit %1$.2f IE/h für %2$d min wurde erfolgreich gestartet.</string>
     <string name="smscommunicator_extendedset">Der erweiterte Bolus %1$.2f IE/h für %2$d Minuten wurde erfolgreich gestartet</string>
-    <string name="smscommunicator_carbsset">%1$dg Kohlenhydrate erfolgreich erfasst.</string>
-    <string name="smscommunicator_carbsfailed">Eingabe von %1$dg Kohlenhydraten ist fehlgeschlagen.</string>
+    <string name="smscommunicator_carbsset">%1$d g Kohlenhydrate erfolgreich erfasst.</string>
+    <string name="smscommunicator_carbsfailed">Eingabe von %1$d g Kohlenhydraten ist fehlgeschlagen.</string>
     <string name="smscommunicator_tempbasalset_percent">Die temporäre Basalrate wurde erfolgreich für %2$d Minuten auf %1$d%% gesetzt.</string>
     <string name="smscommunicator_tempbasalfailed">Das Starten der TBR ist fehlgeschlagen.</string>
     <string name="smscommunicator_extendedfailed">Die Abgabe des erweiterten Bolus ist fehlgeschlagen.</string>
@@ -300,7 +299,6 @@
     <string name="primefill">Katheterwechsel</string>
     <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
     <string name="othersettings_title">Andere</string>
-    <string name="fillbolus_title">Füll-/Vorfüll-Standardmengen</string>
     <string name="button1">Schaltfläche 1</string>
     <string name="button2">Schaltfläche 2</string>
     <string name="button3">Schaltfläche 3</string>
@@ -359,7 +357,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt das Basal-IOB auf die (im Standardfall) vierfache Menge der aktuellen Basalrate. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
     <string name="openapsama_autosens_max_summary">Standardwert: 1.2\nDies ist eine Sicherheitsgrenze für Autosens (und bald auch Autotune), die besagt, wie stark Autosens Basalraten erhöhen darf und wie niedrig der ISF (Insulin-Sensitivitäts-Faktor) und der BZ-Zielwert eingestellt werden können. 1.2 ist dabei der Multiplikationsfaktor und erlaubt eine Anpassung um 20%%.</string>
     <string name="openapsama_autosens_min_summary">Standardwert: 0.7\nDies ist die andere Sicherheitsgrenze für autosens. Sie beschränkt, wie weit Basalraten abgesenkt und wie sehr ISF und BZ-Zielwerte erhöht werden können.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens passt Zielwerte ebenfalls an</string>
     <string name="openapsama_autosens_adjusttargets_summary">Vorgabe: erlaubt.\nErlaubt Autosens den Ziel-BZ-Bereich in Verbindung mit ISF und Basal anzupassen.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standarwert: 2\nBolus snooze (\"Bolus-Schlummer\") bremst den Loop nach einem Mahleiten-Bolus, damit dieser nicht mit niedrigen TBR reagiert, wenn Du gerade gegessen hast. Beispiel: Der Standardwert 2 bewirkt, dass bei einem 3 Stunden DIA der Bolus snooze während 1.5 Stunden nach dem Bolus linear ausläuft (3 h Dia / 2 = 1.5 h Bolus snooze).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standardwert: 3.0 (AMA) or 8.0 (SMB)\nDies ist eine Einstellung für die Standard-Kohlenhydrat-Absorptionswirkung pro 5 Minuten. Der Standardwert ist 3 mg/dl/5min (AMA) bzw. 8 mg/dl/5min (SMB). Dies wirkt sich darauf aus, wie schnell der COB-Wert fällt und wieviel KH-Absorption bei der Berechnung des vorhergesagten BZ angenommen wird, wenn der BZ stärker als erwartet fällt oder nicht so stark wie erwartet steigt.</string>
@@ -655,10 +652,10 @@
     <string name="insulin_increment_button_message">Menge an Insulin, die hinzugefügt werden soll, wenn die Schaltfläche gedrückt wird</string>
     <string name="error_starting_cgm">CGM-Anwendung konnte nicht geöffnet werden. Stelle sicher, dass diese installiert ist.</string>
     <string name="overview_cgm">CGM</string>
-    <string name="ignore5m">Ignoriere für 5 Min.</string>
-    <string name="ignore15m">Ignoriere für 15 Min.</string>
-    <string name="ignore30m">Ignoriere für 30 Min.</string>
-    <string name="required">Anfrage</string>
+    <string name="ignore5m">5 Min. ignorieren</string>
+    <string name="ignore15m">15 Min. ignorieren</string>
+    <string name="ignore30m">30 Min. ignorieren</string>
+    <string name="required">angef.</string>
     <string name="nav_historybrowser">Historie</string>
     <string name="wear_notifysmb_title">Bei SMB benachrichtigen</string>
     <string name="wear_notifysmb_summary">Zeige SMB auf der Uhr wie einen normalen Bolus an.</string>
@@ -1207,7 +1204,7 @@ Unerwartetes Verhalten.</string>
     <string name="selected_profile">Ausgewählt:</string>
     <string name="unitsnosemicolon">Einheiten</string>
     <string name="doyouwantswitchprofile">Willst Du das Profil wechseln und die Änderungen am aktuellen Profil verwerfen?</string>
-    <string name="format_carbs">%1$dg</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="common_on">Ein</string>
     <string name="common_off">Aus</string>
     <string name="objectives_button_unfinish">Ziel erneut öffnen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 27bbf06e8f..2e2ae28735 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -159,7 +159,6 @@
     <string name="filenotfound">Μη εύρεση φακέλου</string>
     <string name="nav_export">Εξαγωγή ρυθμίσεων</string>
     <string name="nav_import">Εισαγωγή ρυθμίσεων</string>
-    <string name="openapsma_maxbasal_title">Μέγιστο U/hr Προσωρινού Ρυθμού μπορεί να είναι</string>
     <string name="openapsma_maxbasal_summary">Αυτή η τιμή ονομάζεται μέγιστο βασικού ρυθμού στο περιεχόμενο του OpenAPS</string>
     <string name="openapsma_maxiob_title">Μέγιστο βασικής IOB που το OpenAPS μπορεί να δώσει [U]</string>
     <string name="openapsma_maxiob_summary">Αυτή η τιμή ονομάζεται μέγιστο IOB στο OpenAPS \nΑυτή είναι η μέγιστη ινσουλίνη [U] που το APS μπορεί να δώσει με την μία.</string>
@@ -226,7 +225,6 @@
     <string name="primefill">Πλήρωση/Γέμισμα</string>
     <string name="fillwarning">Παρακαλώ ελέγξτε ότι η ποσότητα ταιριάζει με τις προδιαγραφές του σετ έγχυσης!</string>
     <string name="othersettings_title">Άλλο</string>
-    <string name="fillbolus_title">Πλήρωση/Γέμισμα στανταρ ποσότητες ινσουλίνης.</string>
     <string name="button1">Πλήκτρο 1</string>
     <string name="button2">Πλήκτρο 2</string>
     <string name="button3">Πλήκτρο 3</string>
@@ -281,7 +279,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Προεπιλεγμένη τιμή: 4 Αυτό είναι το μισό του θέματος ασφαλείας του OpenAPS, και το άλλο μισό του «3 x μέγιστο ημέρας: 4 x τρέχων» των θεμάτων ασφαλείας. Αυτό σημαίνει ότι ο βασικός ρυθμός, ανεξάρτητα από την μέγιστη τιμή βασικού ρυθμού στην αντλία σας, δεν μπορεί να είναι υψηλότερος από το πολλαπλάσιο αυτού του αριθμού. Αυτό γίνεται για να αποτρέψει τους ανθρώπους από το να μπουν σε επικίνδυνες καταστάσεις θέτωντας υψηλό βασικό πριν κατανοήσουν πλήρως πώς λειτουργεί ο αλγόριθμος. Και πάλι, η προεπιλεγμένη τιμή είναι 4x: οι περισσότεροι άνθρωποι ποτέ δεν θα χρειαστεί να το προσαρμόσουν και αντίθετα είναι πιο πιθανό να χρειαστεί να προσαρμόσουν άλλες ρυθμίσεις αν αισθάνονται ότι κινούνται με ασφάλεια.</string>
     <string name="openapsama_autosens_max_summary">Προεπιλεγμένη τιμή: 1.2\nΑυτός είναι ένας πολλαπλασιαστής για το autosens (και σύντομα autotune) για να ορίσετε ένα 20%% ανώτατο όριο στο πόσο ψηλά μπορεί να είναι ο λόγος autosens, που με τη σειρά του καθορίζει πόσο ψηλά το autosens μπορεί να ρυθμίσει τον βασικό ρυθμό, πόσο χαμηλά μπορεί να ρυθμίσει την ISF, και πόσο χαμηλά μπορεί να ορίσει το στόχο της BG.</string>
     <string name="openapsama_autosens_min_summary">Προεπιλεγμένη τιμή: 0.7\n H άλλη πλευρά από τα όρια ασφαλείας του autosens, θέτοντας ένα ανώτατο όριο στο πόσο χαμηλά to autosens μπορεί να προσαρμόσει τον βασικό ρυθμό και πόσο ψηλά μπορεί να ρυθμίσει τη ISF και τον στόχο του BG.</string>
-    <string name="openapsama_autosens_adjusttargets">Το autosens ρυθμίζει στόχους</string>
     <string name="openapsama_autosens_adjusttargets_summary">Προεπιλεγμένη τιμή: true\nΑυτό χρησιμοποιείται για να επιτρέψει στο autosens να προσαρμόσει τον στόχο BG, επιπρόσθετα από το ISF και βασικό ρυθμό.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Προεπιλεγμένη τιμή: 2\nΗ αναβολή Bolus ενεργοποιείται αφού κάνετε ένα γευματικό bolus, έτσι το κύκλωμα δεν θα εξουδετερώσει με χαμηλό προσωρινό μόλις έχετε φάει. Το παράδειγμα εδώ και η προεπιλογή είναι 2: έτσι μια τρίωρη DIA σημαίνει ότι το bolus αναβολής θα είναι σταδιακά πάνω από 1,5 ώρα (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Προεπιλεγμένη τιμή: 3.0 (AMA) ή 8.0 (SMB). Αυτό είναι μια ρύθμιση για την επίπτωση της προεπιλεγμένης απορρόφησης υδατανθράκων ανά 5 λεπτά. Η προεπιλογή είναι μια αναμενόμενη 3mg/dl/5min. Αυτό επηρεάζει το πόσο γρήγορα το COB ελλατώνεται, και πόση απορρόφηση υδατανθράκων θα υποθέτει για τον υπολογισμό της μελλοντικής πρόβλεψης BG, όταν το BG πέφτει περισσότερο από το αναμενόμενο ή δεν αυξάνεται όσο το αναμενόμενο.</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b77a72edf8..ea3257f4a8 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -161,7 +161,6 @@
     <string name="filenotfound">Archivo no encontrado</string>
     <string name="nav_export">Exportar ajustes</string>
     <string name="nav_import">Importar ajustes</string>
-    <string name="openapsma_maxbasal_title">Max U/h para el perfil base</string>
     <string name="openapsma_maxbasal_summary">Este valor es llamado max basal en OpenAPS</string>
     <string name="openapsma_maxiob_title">Max IOB basal que OpenAPs puede emitir [U]</string>
     <string name="openapsma_maxiob_summary">Este valor es llamado Max Iob en el OpenAPS\nEsta es la máxima insulina en [U] que APS puede entregar a la vez.</string>
@@ -273,7 +272,6 @@
     <string name="primefill">Rellenar/Llenar</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
     <string name="othersettings_title">Otros</string>
-    <string name="fillbolus_title">Llenar/Rellenar cantidad de insulina estándar.</string>
     <string name="button1">Botón 1</string>
     <string name="button2">Botón 2</string>
     <string name="button3">Botón 3</string>
@@ -332,7 +330,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de la protección de seguridad de \"3x max diaria, 4x actual\". Esto significa, que tu basal, independientemente de tu máxima basal ajustada en la bomba, no puede ser mas alta que este número de veces el actual nivel de basal. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la basal sin entender como trabaja el algoritmo. El ajuste por defecto es 4x; la mayoría de las personas nunca tendrá que cambiar estos ajustes, sino que debe modificar otros ajustes en la terapia si se encuentran cerca de este límite de seguridad.</string>
     <string name="openapsama_autosens_max_summary">Valor por defecto: 1.2\nEste es un límite multiplicador para autosens (y pronto autotune) para establecer un límite máximo de 20%% en cuanto puede ser la ratio de autosens, lo que determina a su vez cuán alto puede ajustar las basales autosens, cuán bajo puede ajustar ISF, y cuán bajo puede establecer el objetivo BG.</string>
     <string name="openapsama_autosens_min_summary">Ajuste por defecto: 0.7\nEl otro lado de los límites de seguridad de autosens, limitando a cuanto puede autosens bajar la basal y a cuanto puede subir ISF y objetivo de glucosa en sangre (BG).</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens también ajusta los objetivos</string>
     <string name="openapsama_autosens_adjusttargets_summary">Ajuste por defecto: true\nEsto se usa para permitir a autosens el ajuste de objetivos BG además de ISF y bases.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Ajuste por defecto: 2 \nEl retardo del bolo se realiza después de suministrar un bolo de comida, por lo que el lazo no se contrarrestará con bajas temporales cuando acaba de comer. Con el valor predeterminado de 2 y siendo DIA de 3 horas, el retardo del del bolo se realizará gradualmente durante 1,5 horas (3 DIA / 2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valor por defecto: 3.0 (AMA) o 8.0 (SMB). Este es un escenario de impacto de absorción de carbohidratos por defecto por 5 minutos. El valor predeterminado es un esperado 3mg/dl / 5min. Esto afecta la rapidez con la que los COB decaen, y cuánta absorción de carbohidratos se supone en el cálculo de futuras BG, cuando BG está cayendo más que esperado, o no aumento tanto como esperaba.</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ca0d79cbdf..62d287bc55 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -164,7 +164,6 @@
     <string name="filenotfound">Fichier introuvable</string>
     <string name="nav_export">Exporter les paramètres</string>
     <string name="nav_import">Importer les paramètres</string>
-    <string name="openapsma_maxbasal_title">Max U/h pour le débit de Basal Temp</string>
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
     <string name="openapsma_maxiob_title">IA Basal max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
@@ -301,7 +300,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="primefill">Amorcer/Remplir</string>
     <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
     <string name="othersettings_title">Autres</string>
-    <string name="fillbolus_title">Valeurs prédéfinies pour remplir&amp;amorcer</string>
     <string name="button1">Bouton 1</string>
     <string name="button2">Bouton 2</string>
     <string name="button3">Bouton 3</string>
@@ -360,7 +358,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
     <string name="openapsama_autosens_max_summary">Valeur par défaut: 1.2\nCeci est la limite du multiplicateur utilisé par Autosens (et bientôt Autotune) pour définir +20%% en limite maximale du ratio Autosens. En consequence, ceci dit va définir la valeur maximale du Basal pour Autosens, la valeur minimale de la Sensibilité à l\'Insuline (SI, ISF), et la valeur minimale de la cible glycémique.</string>
     <string name="openapsama_autosens_min_summary">Valeur par défaut: 0,7\nL\'autre volet des limites de sécurité de l\'autosens, c\'est de définir une limite basse sur l\'ajustement des débits de basal et une limite haute sur l\'ajustement de la SI et des cibles GLY effectués par l\'autosens.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens ajuste aussi les cibles</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true\nCeci est utilisé pour autoriser Autosens à ajuster les cibles de glycémie en plus de SI et les basals.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valeur par défaut : 2\nBolus snooze est activé apres votre bolus de repas, la boucle ne réagira pas avec des valeurs basses temporaire quand vous venez juste de manger. L’exemple ici et la valeur par défaut est 2 ; donc avec une Durée d\'Action (DIA) de 3 heures signifie que snooze bolus sera graduellement éliminé après 1,5 heures (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valeur par défaut : 3.0 (AMA) ou 8.0 (SMB). Il s’agit d’un paramètre décrivant l’absorption des glucides par 5 minutes. La valeur par défaut est de 3mg/dl/5min. Cela influe sur la vitesse calculée de disparition des Glucides Actifs (GA), et comment sera estimée la consommation des glucides pour calculer les valeurs futures de glycémies, lorsque la glycémie chute plus que prévu ou n\'augmente pas autant que calculé.</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 45d3d91f63..944905858e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -158,8 +158,8 @@
     <string name="configbuilder_nightscoutversion_label">Versione Nightscout:</string>
     <string name="missing_carbs">Mancanti %1$dg</string>
     <string name="exported">Preferenze esportate</string>
-    <string name="export_to">Esporta impostazioni su</string>
-    <string name="import_from">Importa impostazioni da</string>
+    <string name="export_to">Esportare impostazioni su</string>
+    <string name="import_from">Importare impostazioni da</string>
     <string name="setting_imported">Impostazioni importate</string>
     <string name="filenotfound">File non trovato</string>
     <string name="nav_export">Esporta impostazioni</string>
@@ -300,7 +300,7 @@
     <string name="primefill">Carica/Riempi</string>
     <string name="fillwarning">Assicurati che la quantità corrisponda alla specifica del tuo set di infusione!</string>
     <string name="othersettings_title">Altro</string>
-    <string name="fillbolus_title">Quantità standard di insulina per Carica/Riempi.</string>
+    <string name="fillbolus_title">Carica/Riempi: quantità standard di insulina</string>
     <string name="button1">Tasto 1</string>
     <string name="button2">Tasto 2</string>
     <string name="button3">Tasto 3</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 0d5475a46a..1bf6173947 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -161,7 +161,6 @@
     <string name="filenotfound">파일을 찾을 수 없습니다</string>
     <string name="nav_export">설정 저장하기</string>
     <string name="nav_import">설정 불러오기</string>
-    <string name="openapsma_maxbasal_title">임시Basal 최대량 [U/hr]</string>
     <string name="openapsma_maxbasal_summary">이 값은 OpenAPS에서 Max Basal(최대 Basal)로 설정되는 값입니다</string>
     <string name="openapsma_maxiob_title">OpenAPS가 주입할수 있는 최대 Basal IOB [U]</string>
     <string name="openapsma_maxiob_summary">이 값은 OpenAPS에서 Max IOB라고 부르는 값입니다\n기본값은 0으로 설정되어 있습니다. 몇일 혹은 몇주 정도 사용 후 적절한 값으로 변경할 수 있습니다.</string>
@@ -243,7 +242,6 @@
     <string name="primefill">교체/채움</string>
     <string name="fillwarning">양이 인퓨전세트의 사양과 일치하는지 확인하세요!</string>
     <string name="othersettings_title">기타</string>
-    <string name="fillbolus_title">교체/채움 기본 인슐린양</string>
     <string name="button1">버튼1</string>
     <string name="button2">버튼2</string>
     <string name="button3">버튼3</string>
@@ -302,7 +300,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">기본값: 4\n이 값은 \"3x max daily; 4x current\"의 나머지 절반에 해당하는 또 다른 중요한 OpenAPS 안전장치입니다. 이것은, 펌프에 설정된 최대 Basal과는 관계없이, Basal이 설정된 현재시간의 Basal에 이 값을 곱한 양을 초과할 수 없다는 것을 의미합니다. 이는 알고리즘의 작동 방식을 이해하기 전에 과도하게 높은 최대 기본을 설정하여 위험한 상황에 빠지지 않도록 보호하기 위한 것입니다. 다시한번, 기본 값은 4배인 것을 알아두세요; 일반적으로 이것을 조정할 필요는 전혀 없으며, 대신 이 안전장치를 변경해야할것처럼 생각이 된다면, 다른 설정을 변경해야 할 가능성이 더 큽니다.</string>
     <string name="openapsama_autosens_max_summary">기본값: 1.2\n이 옵션은 autosens의 최대 한계 값을 20%%로 제한하기 위해 autosens(곧 autotune)이 이용하는 승수값입니다. 이 값이 autosens에 대한 Basal의 최대 값, 인슐린 민감도(ISF)의 최소값 및 혈당 목표의 최소값을 결정케 합니다.</string>
     <string name="openapsama_autosens_min_summary">기본값: 0.7\nautosens 안전 제한의 나머지 부분입니다. 이는 Basal을 얼마나 낮게 조절할 수 있는지, ISF와 혈당 목표범위를 얼마나 높게 설정할 수 있는지를 결정합니다.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens가 목표도 조절합니다.</string>
     <string name="openapsama_autosens_adjusttargets_summary">기본값: 활성\n이것은 autosens가 ISF와 Basal뿐만 아니라, 혈당 목표범위를 조절할 수 있게 합니다.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">기본값: 2\n식사주입 후 Bolus snooze가 수행되게 되고, 따라서 식사주입 직후엔 loop가 low temp에 대응하지 않게 됩니다. 기본값이 2일때 예제는 다음과 같습니다; DIA가 3시간일 경우  bolus snooz는 점차적으로 1.5시간에 걸쳐 단계적으로 사라지게 됩니다.(3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">기본값: 3.0 (AMA) 또는 8.0 (SMB). 5분당 탄수화물이 얼만큼 흡수되었는지에 대한 기본값 설정입니다. 기본값은 3mg/dl / 5분 입니다. 이는 혈당이 예상보다 빨리 떨어지거나 혹은 예상보다 오르지 않을때, COB가 얼마나 빨리 사라지게 되는지에 영향을 주게 되고, 추정된 탄수화물 흡수량이 미래 혈당 예측 계산시에도 영향을 주게 됩니다.</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index dc9d389eeb..31cfb4c38a 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -162,7 +162,6 @@
     <string name="filenotfound">Failas nerastas</string>
     <string name="nav_export">Eksportuoti nustatymus</string>
     <string name="nav_import">Importuoti nustatymus</string>
-    <string name="openapsma_maxbasal_title">Maks vv/val skaičius, kuris gali būti nustatytas kaip laikina bazė</string>
     <string name="openapsma_maxbasal_summary">Šis skaičius OpenAPS kontekste vadinamas maks. valandine baze</string>
     <string name="openapsma_maxiob_title">Didžiausias valandinės bazės insulino kiekis, kurį gali suleisti OpenAPS [U]</string>
     <string name="openapsma_maxiob_summary">Ši vertė OpenAPS kontekste vadinama Maks AIO\nTai maksimalus insulino vienetų [U] skaičius, kurį DKS gali suleisti vienu metu.</string>
@@ -282,7 +281,6 @@
     <string name="primefill">Užpildymas</string>
     <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
     <string name="othersettings_title">Kita</string>
-    <string name="fillbolus_title">Standartiniai insulino kiekiai kateterio/kaniulės užpildymui.</string>
     <string name="button1">Mygtukas 1</string>
     <string name="button2">Mygtukas 2</string>
     <string name="button3">Mygtukas 3</string>
@@ -341,7 +339,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Numatytoji reikšmė: 4 tai antras pagrindinis OpenAPS saugiklis, apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\". Jis reiškia, kad jūsų valandinė bazė, nepriklausomai nuo to, kokia maksimali valandinė bazė suprogramuota pompoje, negali būti didesnė, nei keturguba dabartinė valandinė bazė. Tai apsaugo Jus nuo pavojingų situacijų, kai nustatoma pernelyg didelė valandinė bazė, pilnai nesuprantant, kaip veikia algoritmas. Numatytoji reikšmė yra 4x; daugumai vartotojų niekada neprireikia šio skaičiaus keisti, o pajutus, kad \"atsitrenkiama\" į saugiklį, rekomenduojama peržiūrėti kitus nustatymus.</string>
     <string name="openapsama_autosens_max_summary">Numatytoji reikšmė: 1.2\nTai daugiklis Autosens (ir netrukus Autotune) funkcijoje, kuris nustato 20%% maksimalią ribą iki kurios Autosens gali padidinti valandinę bazę, sumažinti JIF ir tikslinę gliukozės vertę.</string>
     <string name="openapsama_autosens_min_summary">Numatytoji reikšmė: 0.7\nTai antras daugiklis Autosens funkcijoje, kuris nustato, kad Autosens gali iki minimalios 70 % ribos sumažinti valandinę bazę bei padidinti JIF ir tikslinę gliukozės vertę.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens nustatomi tikslai</string>
     <string name="openapsama_autosens_adjusttargets_summary">Numatytoji reikšmė: true\nTai suteikia Autosens funkcijai leidimą keisti tikslinės gliukozės vertes, JIF ir valandinę bazę.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Numatytoji reikšmė: 2\nBoluso snaudimas aktyvuojamas iškart po to, kai susileidžiate bolusą maistui. Ši funkcija neleidžia sistemai nustatyti mažų LBD iškart po valgio. Pvz.: jei IVT yra 3 val, tai boluso snaudimas pamažu deaktyvuojamas per 1,5 val (3 val. / 2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Numatytoji reikšmė: 3.0 (AMA) arba 8.0 (SMB). Tai parametras, nurodantis angliavandenių poveikį kraujo gliukozei kas 5 minutes nuo jų suvartojimo. Numatytoji reikšmė yra 3 mg/dl per 5min. Šis skaičius turi įtakos apskaičiavimams, kaip greitai mažės AAO, kokia bus kraujo gliukozės kitimo prognozė, ypač kai ji krenta daugiau nei tikėtasi, arba nedidėja tiek, kiek tikėtasi.</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 7cc7557dbd..36d82676be 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -161,7 +161,6 @@
     <string name="filenotfound">Bestand niet gevonden</string>
     <string name="nav_export">Exporteer instellingen</string>
     <string name="nav_import">Importeer instellingen</string>
-    <string name="openapsma_maxbasal_title">Maximale E/uur dat OpenAPS kan toedienen</string>
     <string name="openapsma_maxbasal_summary">Dit is de maximale waarde waarop het basaal door OpenAPS ingesteld kan worden</string>
     <string name="openapsma_maxiob_title">Maximale basaal IOB, dat OpenAPS kan toedienen [E]</string>
     <string name="openapsma_maxiob_summary">Deze waarde wordt de Max IOB genoemd in OpenAPS context\nDit is de maximale insuline hoeveelheid in [E] dat APS in één keer kan toedienen.</string>
@@ -243,7 +242,6 @@
     <string name="primefill">Ontlucht/vul</string>
     <string name="fillwarning">Verzeker u dat de vulhoeveelheid overeenkomt met de infusieset!</string>
     <string name="othersettings_title">Andere</string>
-    <string name="fillbolus_title">Vull standaard hoeveelheid.</string>
     <string name="button1">Knop 1</string>
     <string name="button2">Knop 2</string>
     <string name="button3">Knop 3</string>
@@ -302,7 +300,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
     <string name="openapsama_autosens_max_summary">Standaard waarde: 1.2\nDit is een vermenigvuldigingsfactor voor autosense (en binnenkort autotune) die zorgt dat de autosens ratio maximaal 20%% kan zijn. Dit maximum bepaalt in hoeverre je basaal kan worden verhoogd, en hoeveel je ISF en BG doel verlaagd kunnen worden.</string>
     <string name="openapsama_autosens_min_summary">Standaard waarde: 0.7\nDit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het streef BG.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens past de streefwaardes ook aan</string>
     <string name="openapsama_autosens_adjusttargets_summary">Standaardwaarde: waar Dit wordt gebruikt om autosens de bevoegdheid te geven BG doelen aan te passen alsook ISF en basalen</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2\nBolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standaardwaarde: 3,0 (AMA) of 8,0 (SMB). Dit is een instelling voor de standaard koolhydraten absorptie-impact per 5 minuten. De standaard is een verwachte 3mg / dl / 5min. Dit is van invloed op hoe snel COB zijn opgenomen en hoeveel koolhydraten absorptie wordt verwacht, bij het voorspellen van toekomstige BG, wanneer BG meer dan verwacht daalt of niet zoveel stijgt als verwacht.</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index e0b4435a1a..b27740a0d0 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -162,7 +162,6 @@
     <string name="filenotfound">Nie znaleziono pliku</string>
     <string name="nav_export">Eksportuj ustawienia</string>
     <string name="nav_import">Importuj ustawienia</string>
-    <string name="openapsma_maxbasal_title">Max U/h Tymczasowa Dawka Bazowa, jaka może być ustawiona</string>
     <string name="openapsma_maxbasal_summary">Wartość określona jako Maksymalna Baza (max basal) w OpenAPS</string>
     <string name="openapsma_maxiob_title">Maksymalna bazowa IOB, którą OpenAPS może dostarczyć [U]</string>
     <string name="openapsma_maxiob_summary">Ta wartość jest nazywana Max IOB w OpenAPS\nTo jest maksymalna wartość insuliny w [U], którą APS może dostarczyć w danej chwili.</string>
@@ -290,7 +289,6 @@
     <string name="primefill">Rozpocznij/Wypełnij</string>
     <string name="fillwarning">Proszę upewnij się, że ilość wypełnienia odpowiada ilości właściwej dla twojego wkłucia!</string>
     <string name="othersettings_title">Inne</string>
-    <string name="fillbolus_title">Rozpocznij/Wypełnij standardowe ilości insuliny.</string>
     <string name="button1">Przycisk 1</string>
     <string name="button2">Przycisk 2</string>
     <string name="button3">Przycisk 3</string>
@@ -349,7 +347,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Wartość domyślna: 4 To jest drugi kluczowy współczynnik bezpieczeństwa OpenAPS, i druga wartość z “3x max dzienna; 4x aktualna”. To oznacza, że Twoja dawka bazowa niezależnie od maksymalnej bazy ustawionej na pompie nie może być większa niż ta ustawiona wartość razy twoja aktualna dawka bazowa. To ma na celu przestrzec ludzi przed ustawieniem zbyt wysokiej dawki maksymalnej przed zrozumieniem jak działa algorytm. Ponownie, wartość domyślna to 4x; większość ludzi nie będzie potrzebowała tego zmienić i raczej będą potrzebować dostosować inne ustawienia, jeśli czują, że zbliżają się do współczynnika bezpieczeństwa.</string>
     <string name="openapsama_autosens_max_summary">Wartość domyślna: 1.2\nTo jest mnożnik dla autosens (wkrótce autotune), ustawia 20%% maks. limit dla najwyższej wartości jaką autosens może przyjąć, co z kolei określa jak wysoko autosens może zwiększyć bazę, jak nisko może ustawić współczynnik wrażliwości insuliny ISF, i jak nisko może ustawić docelową wartość glikemii.</string>
     <string name="openapsama_autosens_min_summary">Wartość domyślna: 0.7\nDruga strona limitu bezpieczeństwa dla autosens, ustawia mnożnik minimalny dla wartości, do jakiej autosens może obniżyć bazę, i jak wysoko może ustawić ISF i wartość docelową BG.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens wpływa na wartości docelowe</string>
     <string name="openapsama_autosens_adjusttargets_summary">Domyślnie włączone\nTa funkcja pozwala wpływać na zmianę wartości docelowe BG, wartości bazy i oraz współczynnika wrażliwości na insulinę ISF.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Wartość domyślna: 2\nBolus snooze jest uruchamiany po wykonaniu bolusa posiłkowego, tak by pętla nie przeciwdziałała niskim wartościom tymczasowym zaraz po posiłku. Jako przykład: wartość domyślna ustawiona jest 2; więc 3 godzinne DIA oznacza, że bolus snooze będzie stopniowo wycofany po 1.5 godziny (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Wartość domyślna: 3.0 (AMA) lub 8.0 (SMB). To jest ustawienie domyślnego wpływu wchłaniania węglowodanów w czasie 5 min. Wartością domyślną jest spodziewane 3mg/dl/5min. Ma to wpływ na szybkość zaniku COB, oraz jak duże wchłanianie węglowodanów będzie przyjęte do obliczeń przyszłych przewidywanych wartości BG, jeżeli BG obniża się bardziej niż w założono, lub nie wzrasta tak szybko jak się spodziewano.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index fbff230423..ffeeffb103 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -36,7 +36,7 @@
     <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
     <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
     <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
-    <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados das últimas 8h ou 24h (usando qualquer um que é mais sensível). Hidratos são cortados (se não absorvidos) após o tempo especificado nas preferências. O Plugin também calcula o UAM.</string>
+    <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados de 8h ou 24h no passado (usando o que é mais sensível). Carboidratos (se não absorvidos) são cortados após o tempo especificado nas preferências. O plugin também calcula o UAM.</string>
     <string name="description_sensitivity_weighted_average">A sensibilidade é calculada como uma média ponderada de desvios. Desvios mais recentes têm maior peso. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências. Este algoritmo é o mais rápido em seguir as mudanças de sensibilidade.</string>
     <string name="description_source_eversense">Receber valores de Glicose da aplicação Eversense modificada.</string>
     <string name="description_source_glimp">Receber valores BG do Glimp.</string>
@@ -131,7 +131,7 @@
     <string name="disableloop">Desativar loop</string>
     <string name="enableloop">Ativar loop</string>
     <string name="openloop_newsuggestion">Nova sugestão disponível</string>
-    <string name="carbssuggestion">Sugestão de Hidratos</string>
+    <string name="carbssuggestion">Sugestão de Carbs</string>
     <string name="unsupportednsversion">Versão não suportada do Nightscout</string>
     <string name="loopdisabled">LOOP DESATIVADO POR RESTRIÇÕES</string>
     <string name="treatments_wizard_basaliob_label">IOB Basal</string>
@@ -164,7 +164,6 @@
     <string name="filenotfound">Arquivo não encontrado</string>
     <string name="nav_export">Exportar configurações</string>
     <string name="nav_import">Importar configurações</string>
-    <string name="openapsma_maxbasal_title">Max U/hr em que uma Temp Basal pode ser definida</string>
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
@@ -300,7 +299,6 @@
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
     <string name="othersettings_title">Outro</string>
-    <string name="fillbolus_title">Purgar/Preencher os valores standard.</string>
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
@@ -328,11 +326,11 @@
     <string name="openapsama">OpenAPS AMA</string>
     <string name="short_avgdelta">Delta médio curto</string>
     <string name="long_avgdelta">Delta médio longo</string>
-    <string name="array_of_elements">Array de %1$d elementos.\nValor actual:</string>
+    <string name="array_of_elements">Array de %1$d elementos.\nValor atual:</string>
     <string name="openapsma_autosensdata_label">Dados Autosens</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
     <string name="openapsama_useautosens">Usar função Autosens</string>
-    <string name="refresheventsfromnightscout">Actualizar tratamentos do NS</string>
+    <string name="refresheventsfromnightscout">Atualizar tratamentos do NS</string>
     <string name="deletefuturetreatments">Apagar tratamentos do futuro</string>
     <string name="eatingsoon">Comer em breve</string>
     <string name="hypo">Hipo</string>
@@ -355,13 +353,12 @@
     <string name="always_use_shortavg">Usar sempre delta médio curto em vez de delta simples</string>
     <string name="always_use_shortavg_summary">Útil quando há ruído nos dados de fontes sem filtro como o xDrip.</string>
     <string name="profile">Perfil</string>
-    <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor actual (qual seja menor) como valores máximos.</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objectivo é evitar que sejam determinadas basais temporárias demasiado elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor atual (qual seja menor) como valores máximos.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objetivo é evitar que sejam determinadas basais temporárias muito elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
     <string name="openapsama_autosens_max_summary">Valor predefinido: 1.2\n Este é um multiplicador para autosens (e em breve autotune) que coloca um limite máximo de 20%% aos rácios superiores e inferiores de autosens, o que por sua vez calcula o quão alto autosens pode ajustar a basal, quão pode baixar o Factor de Sensibilidade (FSI) e baixar o valor alvo de glicose no sangue.</string>
     <string name="openapsama_autosens_min_summary">Valor padrão: 0.7\nO outro lado dos limites de segurança do autosens. Coloca um tecto no quão baixo autosens pode ajustar as basais, e quão alto pode ajustar os valores de ISF e valor alvo de glucose no sangue (BG).</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens também ajusta os alvos</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valor padrão: true\nÉ usado para permitir que autosens possa ajustar os valores alvo de glucose no sangue (BG), além de ISF e basais.</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">Valor padrão: 2\nBolus Snooze (pausa após bolus) é executado depois de realizar um bolus por refeição Desta maneira o algoritmo não irá contrariar com temporárias baixas logo depois da refeição. O valor padrão é 2; Então uma duração de acção da insulina (DIA) de 5h significa que o Bolus Snooze irá ser gradualmente reduzido ao longo de 2,5 horas = 5/2 = DIA/Valor padrão.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Valor padrão: 2\nBolus Snooze (pausa após bolus) é executado depois de realizar um bolus por refeição Desta maneira o algoritmo não irá contrariar com temporárias baixas logo depois da refeição. O valor padrão é 2; Então uma duração de ação da insulina (DIA) de 5h significa que o Bolus Snooze irá ser gradualmente reduzido ao longo de 2,5 horas = 5/2 = DIA/Valor padrão.</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valor padrão: 3.0 para detecção avançada de refeições (AMA) ou 8.0 para super micro bolus (SMB). Esta é a configuração padrão para o calculo de quanto varia a cada 5 min a glucose no sangue (BG)  devido à absorção de hidratos de carbono. O padrão é  3mg/ dl / 5min. Isso afeta a rapidez com que decaem as calorias no corpo (COB), e quantos hidratos de carbono terão de ser considerados no cálculo da previsão de BG, quando é que a BG está baixando mais do que espectável ou não subindo como espectável.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Atenção!\n Normalmente não é necessário modificar os valores abaixo. Por favor PRESSIONE AQUI e LEIA o texto para garantir que ENTENDE as consequenciais antes de alterar algum destes valores.</string>
     <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
@@ -523,7 +520,7 @@
     <string name="openapssmb">SMB OpenAPS</string>
     <string name="enableuam">Activar UAM</string>
     <string name="enablesmb">Activar SMB</string>
-    <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma acção mais rápida</string>
+    <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma ação mais rápida</string>
     <string name="enableuam_summary">Detecção de refeições não Introduzidas</string>
     <string name="insulin_oref_peak">Tempo Pico da curva de IOB</string>
     <string name="insulin_peak_time">Tempo Pico [min]</string>
@@ -984,7 +981,7 @@
     <string name="every">Todo</string>
     <string name="never">Nunca</string>
     <string name="condition">Condição:</string>
-    <string name="action">Acção:</string>
+    <string name="action">Ação:</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="glucose_u">Glicose [%1$s]:</string>
     <string name="delete_short">APAGAR</string>
diff --git a/app/src/main/res/values-pt-rPT/exam.xml b/app/src/main/res/values-pt-rPT/exam.xml
index 829be46b50..4ce02a40a9 100644
--- a/app/src/main/res/values-pt-rPT/exam.xml
+++ b/app/src/main/res/values-pt-rPT/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre DIA?</string>
+    <string name="dia_label_exam">Tópico: Duração da Acção de Insulina (DIA)</string>
     <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
     <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">App de Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">App Spike no iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Tópico: Factor de Sensibilidade de Insulina</string>
     <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
     <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
     <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">A alteração do valor do FSI no seu perfil é suficiente para aplicar a mudança.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Tópico: Rácio IC</string>
     <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3a82cec679..5783674bd7 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -164,7 +164,7 @@
     <string name="filenotfound">Ficheiro não encontrado</string>
     <string name="nav_export">Exportar configurações</string>
     <string name="nav_import">Importar configurações</string>
-    <string name="openapsma_maxbasal_title">Max U/hr em que uma Temp Basal pode ser definida</string>
+    <string name="openapsma_maxbasal_title">Max U/h em que uma Temp Basal pode ser definida</string>
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode administrar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode administrar de uma vez.</string>
@@ -300,7 +300,7 @@
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
     <string name="othersettings_title">Outro</string>
-    <string name="fillbolus_title">Valor Padrão Insulina Purgar/Preencher.</string>
+    <string name="fillbolus_title">Valores Padrão Purgar/Preencher Insulina</string>
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
@@ -359,7 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objectivo é evitar que sejam determinadas basais temporárias demasiado elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
     <string name="openapsama_autosens_max_summary">Valor predefinido: 1.2\n Este é um multiplicador para autosens (e em breve autotune) que coloca um limite máximo de 20%% aos rácios superiores e inferiores de autosens, o que por sua vez calcula o quão alto autosens pode ajustar a basal, quão pode baixar o Factor de Sensibilidade (FSI) e baixar o valor alvo de glicose no sangue.</string>
     <string name="openapsama_autosens_min_summary">Valor padrão: 0.7\nO outro lado dos limites de segurança do autosens. Coloca um tecto no quão baixo autosens pode ajustar as basais, e quão alto pode ajustar os valores de ISF e valor alvo de glucose no sangue (BG).</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens também ajusta os alvos</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens ajusta os alvos, também</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valor padrão: true\nÉ usado para permitir que autosens possa ajustar os valores alvo de glucose no sangue (BG), além de ISF e basais.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valor padrão: 2\nBolus Snooze (pausa após bolus) é executado depois de realizar um bolus por refeição Desta maneira o algoritmo não irá contrariar com temporárias baixas logo depois da refeição. O valor padrão é 2; Então uma duração de acção da insulina (DIA) de 5h significa que o Bolus Snooze irá ser gradualmente reduzido ao longo de 2,5 horas = 5/2 = DIA/Valor padrão.</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valor padrão: 3.0 para detecção avançada de refeições (AMA) ou 8.0 para super micro bolus (SMB). Esta é a configuração padrão para o calculo de quanto varia a cada 5 min a glucose no sangue (BG)  devido à absorção de hidratos de carbono. O padrão é  3mg/ dl / 5min. Isso afeta a rapidez com que decaem as calorias no corpo (COB), e quantos hidratos de carbono terão de ser considerados no cálculo da previsão de BG, quando é que a BG está baixando mais do que espectável ou não subindo como espectável.</string>
@@ -575,6 +575,7 @@
     <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
     <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
     <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
+    <string name="carbsReqThreshold_summary">Mínimo de gramas de hidratos de carbono ara exibir um alerta de sugestão de hidratos. As sugestões de hidratos abaixo deste número não activarão uma notificação.</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic ClienteNS</string>
@@ -662,7 +663,9 @@
     <string name="wear_notifysmb_title">Notificar no SMB</string>
     <string name="wear_notifysmb_summary">Mostrar SMB no relogio como bolus normal.</string>
     <string name="ns_create_announcements_from_errors_title">Criar anúncios dos erros</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Criar anúncios a partir dos alertas de hidratos necessários</string>
     <string name="ns_create_announcements_from_errors_summary">Criar um anúncio no Nightscout para caixas de diálogo de erro e alertas locais (também podem ser visualizados em Careportal sob tratamentos)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Criar anúncios Nightscout para alertas de hidratos necessários</string>
     <string name="wear_predictions_summary">Mostrar a predições na face do relogio.</string>
     <string name="wear_predictions_title">Previsão</string>
     <string name="data_choices">Escolha de Dados</string>
@@ -1226,6 +1229,7 @@
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
     <string name="reorder_label">Reordenar</string>
     <string name="age">Idade:</string>
+    <string name="weight_label">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil mais comum:</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 8a63c33001..f8268cf955 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -158,7 +158,6 @@
     <string name="filenotfound">Nu am găsit fișierul</string>
     <string name="nav_export">Exportă setările</string>
     <string name="nav_import">Importă setările</string>
-    <string name="openapsma_maxbasal_title">Maximul de unități de insulină pe oră poate fi setat la</string>
     <string name="openapsma_maxbasal_summary">Această valoare este denumită bazală maximă în contextul OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximul de bazală IOB pe care o poate livra OpenAPS[U]</string>
     <string name="openapsma_maxiob_summary">Această valoare este denumită Max IOB în contextul OpenAPS\nAceastă valoare este implicit nulă (0). După câteva zile sau săptămâni, în funcție de opțiunea dumneavoastră, puteți ajusta acest număr.</string>
@@ -225,7 +224,6 @@
     <string name="primefill">Pregătire/umplere</string>
     <string name="fillwarning">Asigurați-vă că aveți cantitatea specificată de instrucțiunile setului de infuzie!</string>
     <string name="othersettings_title">Alte</string>
-    <string name="fillbolus_title">Pregătire/umplere cu cantitățile standard de insulină.</string>
     <string name="button1">Buton 1</string>
     <string name="button2">Buton 2</string>
     <string name="button3">Buton 3</string>
@@ -280,7 +278,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Valoare implicită: 4\nAceasta este cealaltă jumătate a cheii de siguranță a OpenAPS și cealaltă jumătate a \"3x max zilnic; 4x curent\" al setărilor de siguranță.Aceasta înseamnă că bazala dumneavoastră, indiferent de bazala maximă configurată în pompă, nu poate fi mai mare de acest număr înmulțit cu nivelul curent al bazalei active. Această limitare este impusă pentru a evita posibilitatea de a intra pe un teritoriu periculos prin setarea unei bazale maxime excesiv de mari înainte de a înțelege funcționarea algoritmului. Din nou, valoarea implictă este 4x; majoritatea oamenilor nu vor trebui să ajusteze această valoare și vor modifica, mai degrabă, alte valori dacă vor simți că această valoare le stă în cale.</string>
     <string name="openapsama_autosens_max_summary">Valoare implicită: 1.2\nAceasta este valoarea limită de multiplicare pentru autosens (și pentru autotune, în curând) pentru a seta o limită maximă de 20%% din cât de mare poate fi raportul autosens, care, la rândul ei, determină cât de mult poate autosens să modifice bazalele, cât de jos poate modifica ISF și cât de jos poate pune ținta glicemiei.</string>
     <string name="openapsama_autosens_min_summary">Valoare implicită: 0.7\nCealaltă parte a limitelor autosens, care limitează cât de jos poate ajusta bazalele și cât de mult poate mări ISF și țintele de glicemie.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens ajustează țintele la</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valoare implicită: adevărat\nAceasta se folosește pentru a permite autosens să ajusteze țintele de glicemie, pe lângă modificările asupra ISF și bazalelor.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valoare implicită: 2\nAmânarea bolusului este aplicată după ce ați făcut un bolus de masă, astfel încât bucla să nu reacționeze cu ținte bazale temporare scăzute atunci când tocmai ați mâncat. Exemplul de față și valoarea implicită sunt 2; astfel o durată de acțiune a insulinei (DIA) de 3 ore duce la o eliminare treptată a întârzierii setării bazalelor temporare după 1.5 ore (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valoarea implicită: 3.0 (AMA) sau 8.0 (SMB). Aceasta este o setare pentru impactul implicit al carbohidraţilor pe 5 minute. Valoarea implicită este 3mg/dl la 5min. Aceasta influenţează rapiditatea cu care se scade COB şi modul în care se ia în calcul absorbţia carbohidraţilor în calcularea valorilor estimate ale glicemiei, atunci când glicemia este în scădere mai mare decât se aştepta sau nu creşte atât de repede pe cât se aştepta.</string>
diff --git a/app/src/main/res/values-ru-rRU/exam.xml b/app/src/main/res/values-ru-rRU/exam.xml
index 0489d0b9cd..732da76770 100644
--- a/app/src/main/res/values-ru-rRU/exam.xml
+++ b/app/src/main/res/values-ru-rRU/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Что верно о длительности работы инсулина DIA?</string>
+    <string name="dia_label_exam">Тема: продолжительность действия инсулина DIA</string>
     <string name="dia_minimumis3h">Минимальное значение 3 часа.</string>
     <string name="dia_minimumis5h">Минимальное значение 5 часов.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -123,6 +124,7 @@ Context | Edit Context</string>
     <string name="nsclient_looponiphone">Приложения Loop на iPhone.</string>
     <string name="nsclient_spikeiphone">Приложения Spike на iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Тема: Коэффициент чувствительности к инсулину</string>
     <string name="isf_increasingvalue">Более высокие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
     <string name="isf_decreasingvalue">Более низкие значения ISF приводят к меньшей подаче инсулина, когда AAPS исправляет высокую ГК.</string>
     <string name="isf_noeffect">Изменение значений ISF никак не влияет на количество инсулина, подаваемого AAPS при коррекции высокой ГК.</string>
@@ -130,6 +132,7 @@ Context | Edit Context</string>
     <string name="isf_profile">Изменение значения ISF в профиле достаточно для применения изменений.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Тема: Соотношение инсулин-углеводы IC</string>
     <string name="ic_increasingvalue">Более высокие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
     <string name="ic_decreasingvalue">Более низкие коэффициенты инсулин-углеводы IC приводят к уменьшению инсулина на данное количество углеводов.</string>
     <string name="ic_noeffect">Если у вас 0 активных углеводов COB, изменение соотношения инсулин-углеводы IC приведет к иному количеству инсулина на коррекцию данной ГК.</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 2ddb9ef219..5a3d200bb0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -164,7 +164,6 @@
     <string name="filenotfound">файл не найден</string>
     <string name="nav_export">экспорт настроек</string>
     <string name="nav_import">импорт настроек</string>
-    <string name="openapsma_maxbasal_title">макс разрешенный врем базал Е/ч</string>
     <string name="openapsma_maxbasal_summary">в контексте OpenAPS называется макс базал</string>
     <string name="openapsma_maxiob_title">макс базал активн инс подаваемый с OpenAPS (ед)</string>
     <string name="openapsma_maxiob_summary">Эта величина называется Max IOB (макс активн инс) в OpenAPS\n. Это макс кол-во инсулина в ед. [U] которое APS может подать единовременно.</string>
@@ -300,7 +299,6 @@
     <string name="primefill">прайм/заполнение</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
     <string name="othersettings_title">другое</string>
-    <string name="fillbolus_title">заполнить стандартное количество инсулина</string>
     <string name="button1">кнопка 1</string>
     <string name="button2">кнопка 2</string>
     <string name="button3">кнопка 3</string>
@@ -359,7 +357,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">значение по умолчанию: 4 . Это вторая половина обеспечения безопасности OpenAPS из дуэта \"максимум 3x ежедневное; 4x текущее\" Означает что ваша база независимо от установок помпы не может быть выше чем это число умноженное на текущее значение базала. Ограничение для того, чтобы предотвратить вторжение в опасную зону из-за высокого уровня установленных значений базы без понимания алгоритма работы приложения. Большинству людей никогда не потребуется изменять это значение, скорее всего нужно поменять другие настройки если вы чувствуете, что вам мешает это ограничение.</string>
     <string name="openapsama_autosens_max_summary">Значение по умолчанию: 1,2\n Это множитель для autosens ( и вскоре autotune) с лимитом 20%% который определяет лимит верхнего значения autosens, который в свою очередь предопределяет верхнюю границу базала, границы изменения чувствительности к инсулину ISF и нижние границы целевой ГК.</string>
     <string name="openapsama_autosens_min_summary">по умолчанию:0.7 Еще один параметр безопасности autosens, определяющий как низко он может опускать базал и как высоко поднимать ISF (чувств к инс) и целевые СК</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens тоже подстроит цели</string>
     <string name="openapsama_autosens_adjusttargets_summary">значение по умолчанию : верно. используется чтобы разрешить юстировку целевых СК, а также ISF и базала</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">значение по умолчанию :2 bolus snoose активируется после введения болюса на еду чтобы цикл не взаимодействовал с временными низкими СК сразу после еды. так, трехчасовой DIA при величине 2 означает постыпенное затихание bolus snooze после 1.5 часов (3DIA/2)</string>
     <string name="openapsama_min_5m_carbimpact_summary">Значение по умолчанию: 3.0 (AMA) или 8.0 (SMB). Эта настройка на усвоение углеводов за 5 мин. По умолчанию ожидается 3мг/дл/5мин. Влияет на скорость учета поглощения углеводов COB и усвоения в расчетах прогнозируемой гликемии, когда СК падает быстрее или не растет так как ожидается.</string>
@@ -1231,6 +1228,7 @@ Context | Edit Context</string>
     <string name="high_mark_comment">Большее значение диапазона целевых значений (только для дисплея)</string>
     <string name="reorder_label">Повторный заказ</string>
     <string name="age">Возраст:</string>
+    <string name="weight_label">Вес:</string>
     <string name="id">Идентификатор:</string>
     <string name="submit">Отправить</string>
     <string name="mostcommonprofile">Наиболее часто применяемый профиль:</string>
diff --git a/app/src/main/res/values-sk-rSK/exam.xml b/app/src/main/res/values-sk-rSK/exam.xml
index ecbfd646d9..07c257c64c 100644
--- a/app/src/main/res/values-sk-rSK/exam.xml
+++ b/app/src/main/res/values-sk-rSK/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Čo je pravda o DIA?</string>
+    <string name="dia_label_exam">Téma: Doba trvania účinku inzulínu</string>
     <string name="dia_minimumis3h">Minimálna hodnota je 3 hodiny.</string>
     <string name="dia_minimumis5h">Minimálna hodnota je 5 hodín.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Configuration/Config-Builder.html#inzulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Aplikácia Loop na iPhone.</string>
     <string name="nsclient_spikeiphone">Aplikácia Spike na iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Children/Children.html</string>
+    <string name="isf_label_exam">Téma: Citlivosť na inzulín</string>
     <string name="isf_increasingvalue">Vyššie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
     <string name="isf_decreasingvalue">Nižšie hodnoty ISF vedú k menšej dávke inzulínu pri korigovaní vysokej glykémie.</string>
     <string name="isf_noeffect">Zmena hodnoty ISF nemá vplyv na dávku inzulínu, keď AAPS koriguje vysokú glykémiu.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Zmena hodnoty citlivosti vo vašom profile stačí k tomu, aby se táto zmena použila.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Getting-Started/FAQ.html#korekcni-faktor-citlivost-na-inzulin-isf-mmol-l-u-nebo-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/cs/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Téma: Inzulínovo-sacharidový pomer</string>
     <string name="ic_increasingvalue">Vyššie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_decreasingvalue">Nižšie hodnoty IC vedú k menšej dávke inzulínu ku rovnakému množstvu sacharidov.</string>
     <string name="ic_noeffect">Pokiaľ máte 0 COB, zmena inzulíno-sacharidového pomeru povedie k inému množstvu inzulínu vydanému pre korekciu glykémie.</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 61b125dbb9..65589834f6 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -131,6 +131,7 @@
     <string name="disableloop">Deaktivovať uzavretý okruh</string>
     <string name="enableloop">Aktivovať uzavretý okruh</string>
     <string name="openloop_newsuggestion">Dostupné nové doporučenie</string>
+    <string name="carbssuggestion">Návrh sacharidov</string>
     <string name="unsupportednsversion">Nepodporovaná verzia Nighscoutu</string>
     <string name="loopdisabled">Uzavretý okruh deaktivovaný obmedzením</string>
     <string name="treatments_wizard_basaliob_label">Bazálny IOB</string>
@@ -163,7 +164,6 @@
     <string name="filenotfound">Súbor nenájdený</string>
     <string name="nav_export">Exportovať nastavenia</string>
     <string name="nav_import">Importovať nastavenia</string>
-    <string name="openapsma_maxbasal_title">Maximálny povolený dočasný bazál [JI/h]</string>
     <string name="openapsma_maxbasal_summary">Táto hodnota je nazývaná v OpenAPS ako \"max basal\"</string>
     <string name="openapsma_maxiob_title">Maximálny bazálny IOB, ktorý OpenAPS môže podať [JI]</string>
     <string name="openapsma_maxiob_summary">Táto hodnota je nazývaná v kontexte OpenAPS ako max IOB, je to maximálne množstvo inzulínu v [JI], ktoré APS môže naraz podať.</string>
@@ -252,6 +252,11 @@
     <string name="smscommunicator_loopisenabled">Uzavretý okruh je aktivovaný</string>
     <string name="valuelimitedto">%1$.2f obmedzené na %2$.2f</string>
     <string name="valueoutofrange">Hodnota %1$s je mimo prednastavený rozsah</string>
+    <string name="smscommunicator_pumpconnectwithcode">Ak chcete pripojiť pumpu, odpovedzte pomocou SMS s kódom %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Pripojenie k pumpe zlyhalo</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Ak chcete odpojiť pumpu na %1d minút, odpovedzte pomocou SMS s kódom %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pumpa odpojená</string>
+    <string name="smscommunicator_reconnect">Pumpa bola znovu pripojená</string>
     <string name="smscommunicator_remotecommandnotallowed">Príkazy na diaľku nie sú povolené</string>
     <string name="smscommunicator_remotebolusnotallowed">Diaľkovo ovládaný bolus nie je momentálne povolený. Skúste to neskôr.</string>
     <string name="smscommunicator_basalreplywithcode">Pre spustenie bazálu %1$.2fJI/h na %2$d min odpovedzte SMS s kódom %3$s</string>
@@ -294,7 +299,6 @@
     <string name="primefill">Plnenie/doplňovanie</string>
     <string name="fillwarning">Prosím uistite sa, že hodnota zodpovedá špecifikácií Vášho setu!</string>
     <string name="othersettings_title">Iné</string>
-    <string name="fillbolus_title">Štandardné hodnoty plnenia/doplňovania.</string>
     <string name="button1">Tlačidlo 1</string>
     <string name="button2">Tlačidlo 2</string>
     <string name="button3">Tlačidlo 3</string>
@@ -353,7 +357,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Štandardná hodnota: 4 Toto je druhá kľúčová hodnota. Hovorí, že maximálna hodnota dočasného bazálu nikdy nebude väčšia, ako štvornásobok aktuálneho bazálu. Je to preto, aby se ľudia nedostali do nebezpečných hodnôt skôr, ako pochopia ako OpenAPS pracuje. Znovu, štandardná hodnota je 4 a väčšina ľudí ju nikdy nebude musieť meniť. Pokiaľ nestačí, obvykle je problém niekde inde.</string>
     <string name="openapsama_autosens_max_summary">Štandardná hodnota: 1.2\nToto je bezpečnostné nastavenie pre detekciu citlivosti (a čoskoro autotune). Hovorí, že autosens môže zvýšiť bazály, znížiť ISF a znížiť cieľovú hodnotu glykémie o 20%%.</string>
     <string name="openapsama_autosens_min_summary">Štandardná hodnota: 0.7\nToto je bezpečnostné nastavenie pre automatickú detekciu citlivosti. Hovorí, že automatická detekcia citlivosti môže znížiť bazály, zvýšiť ISF a zvýšiť cieľovú hodnotu glykémie na 70%.</string>
-    <string name="openapsama_autosens_adjusttargets">Úprava cieľovej glykémie pomocou automatickej detekcie citlivosti</string>
     <string name="openapsama_autosens_adjusttargets_summary">Štandardná hodnota: zapnuté\nToto nastavenie hovorí, že automatická detekcia citlivosti môže meniť tiež cieľové hodnoty glykémií.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Štandardná hodnota: 2\nToto nastavenie hovorí, po akú časť z hodnoty DIA uzavretý okruh po boluse čaká a nereaguje na zmeny glykémií (tu 3DIA/2 = 1,5h).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Štandardná hodnota: 3.0 (AMA), alebo 8.0 (SMB) mg/dl/5min. Táto hodnota definuje minimálnu časť vstrebaných sacharidov za každých 5min. Táto hodnota ovplyvňuje výpočet COB.</string>
@@ -555,6 +558,7 @@
     <string name="enable_missed_bg_readings_alert">Výstraha pri nedostupných hodnotách glykémie</string>
     <string name="enable_pump_unreachable_alert">Výstraha pri nedostupnej pumpe</string>
     <string name="pump_unreachable_threshold">Limit pre nedostupnosť pumpy [min]</string>
+    <string name="enable_carbs_req_alert">Výstraha, ak sú požadované sacharidy</string>
     <string name="urgent_alarm">Urgentný alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense aplikácia (upravená)</string>
@@ -567,6 +571,8 @@
     <string name="smbmaxminutes_summary">Maximálny počet minút bazálu, ku ktorým se limituje SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB max. minút</string>
     <string name="uamsmbmaxminutes_summary">Maximální počet minút bazálu, ku ktorým sa limituje SMB pre UAM</string>
+    <string name="carbsReqThreshold">Minimálne množstvo sacharidov potrebných pre návrh</string>
+    <string name="carbsReqThreshold_summary">Minimálne množstvo sacharidov v gramoch, ktoré spustí upozornenie návrhu sacharidov. Množstvo sacharidov pod touto hodnotou nespustí oznámenie.</string>
     <string name="dexcomg5_xdripupload_title">Odosielať glykémie do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">V xDrip+ vyberte zdroj dát 640g/Eversense</string>
     <string name="nsclientbg">Glykémie z NS</string>
@@ -646,11 +652,17 @@
     <string name="insulin_increment_button_message">Množstvo inzulínu, ktoré má byť pridané po stlačení tlačidla</string>
     <string name="error_starting_cgm">Nie je možné spustiť aplikáciu CGM. Uistite sa, že je nainštalovaná.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorovať 5m</string>
+    <string name="ignore15m">Ignorovať 15m</string>
+    <string name="ignore30m">Ignorovať 30m</string>
+    <string name="required">pož.</string>
     <string name="nav_historybrowser">Prehliadač histórie</string>
     <string name="wear_notifysmb_title">Oznámenie pri SMB</string>
     <string name="wear_notifysmb_summary">Ukazovať SMB na hodinkách ako normálny bolus.</string>
     <string name="ns_create_announcements_from_errors_title">Vytvárať z chýb oznámenia</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Vytvoriť oznámenie z výstrahy požadovaných sacharidov</string>
     <string name="ns_create_announcements_from_errors_summary">Vytvárať oznámenia pre chyby a lokálne výstrahy v NS (zobraziteľné v starostlivosti pod ošetrením)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Pre výstrahy požadovaných sacharidov vytvoriť oznámenie v Nightscoute</string>
     <string name="wear_predictions_summary">Zobrazovať predikcie na hodinkách.</string>
     <string name="wear_predictions_title">Predikcia</string>
     <string name="data_choices">Možnosti dát</string>
@@ -1214,6 +1226,7 @@
     <string name="high_mark_comment">Horná hodnota v oblasti cieľového rozsahu (iba zobrazovanie)</string>
     <string name="reorder_label">Zmena poradia</string>
     <string name="age">Vek:</string>
+    <string name="weight_label">Váha:</string>
     <string name="id">ID:</string>
     <string name="submit">Odoslať</string>
     <string name="mostcommonprofile">Najčastejšie používaný profil:</string>
diff --git a/app/src/main/res/values-sv-rSE/exam.xml b/app/src/main/res/values-sv-rSE/exam.xml
index e7ddb72089..10e769312a 100644
--- a/app/src/main/res/values-sv-rSE/exam.xml
+++ b/app/src/main/res/values-sv-rSE/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Vad är sant om DIA?</string>
+    <string name="dia_label_exam">Ämne: Insulinduration</string>
     <string name="dia_minimumis3h">Minimivärdet är 3 timmar.</string>
     <string name="dia_minimumis5h">Minimivärdet är 5 timmar.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Appen Loop för iPhone.</string>
     <string name="nsclient_spikeiphone">Appen Spike för iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Ämne: Insulinkänslighetsfaktor (ISF)</string>
     <string name="isf_increasingvalue">Högre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
     <string name="isf_decreasingvalue">Lägre ISF-värden leder till mindre insulintillförsel när AAPS korrigerar för högt BG.</string>
     <string name="isf_noeffect">Ändringar av ISF-värden påverkar inte det insulin som levereras när AAPS korrigerar för högt BG.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Om du ändrar ISF-värdet i din profil är det tillräckligt för att tillämpa ändringen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Ämne: KH-kvot</string>
     <string name="ic_increasingvalue">Högre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_decreasingvalue">Lägre IC-kvot leder till mindre insulin som levereras för en given mängd kolhydrater.</string>
     <string name="ic_noeffect">Om du har 0 COB, kommer en förändring av IC-kvoten leda till en annan mängd insulin för att korrigera din BG-nivå.</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 5659d7aec2..b5b0eac484 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -165,7 +165,6 @@ Eversense-appen.</string>
     <string name="filenotfound">Hittade inte filen</string>
     <string name="nav_export">Exportera inställningar</string>
     <string name="nav_import">Importera inställningar</string>
-    <string name="openapsma_maxbasal_title">Max enheter per timme</string>
     <string name="openapsma_maxbasal_summary">Detta värde kallas max basal inom OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximal basal IOB som OpenAPS kan ge [E]</string>
     <string name="openapsma_maxiob_summary">Detta värde kallas Max IOB i OpenAPS. Det är ställt till noll från start. Efter flera dagar till veckor, beroende på hur du känner, kan du välja att justera denna.</string>
@@ -301,7 +300,6 @@ Eversense-appen.</string>
     <string name="primefill">Förfyllning</string>
     <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
     <string name="othersettings_title">Övrigt</string>
-    <string name="fillbolus_title">Standardvärden för förfyllning av slang och kanyl.</string>
     <string name="button1">Knapp 1</string>
     <string name="button2">Knapp 2</string>
     <string name="button3">Knapp 3</string>
@@ -360,7 +358,6 @@ Eversense-appen.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardvärde: 4 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4 gånger din nuvarande basaldos, oberoende av din maximala basaldos. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning.</string>
     <string name="openapsama_autosens_max_summary">Standardvärde: 1.2\nDetta är en multiplikatorbegränsare för autosens/autotune som gör att automatiken kan justera upp basaler, sänka insulinkänslighet (ISF) och/eller målvärde med upp till 20%.</string>
     <string name="openapsama_autosens_min_summary">Standardvärde: 0.7\nDetta är en multiplikatorbegränsare för autosens/autotune som gör att automatiken kan justera ner basaler, höja insulinkänslighet (ISF) och/eller målvärde med upp till 30%% för att kompensera för t ex tillfällig hög insulinkänslighet.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens justerar även mål-BG</string>
     <string name="openapsama_autosens_adjusttargets_summary">Standardvärde: sant. Detta för att tillåta autosens justera mål-BG utöver ISF och basaler.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standardvärde: 2  Bolus snooze är aktivt efter att du givit en måltidsbolus, detta för att inte loop ska lågtempa när du just ätit. I detta exempel och grundvärde är 2; innebär att DIA på 3 tim kommer bolus snooze kommer att fasas ut under 1,5 tim (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standardvärde: 3.0 (AMA) eller 8.0 (SMB). Detta är grundinställning för KH-absorption per 5 min. Detta styr hur snabbt COB minskar, dvs hur snabbt programmet kalkylerar att KH tagits upp, och påverkar BG framöver när BG faller mer än väntat, eller inte stiger som väntat.</string>
@@ -1230,6 +1227,7 @@ Eversense-appen.</string>
     <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
     <string name="reorder_label">Ändra ordning</string>
     <string name="age">Ålder:</string>
+    <string name="weight_label">Vikt:</string>
     <string name="id">ID:</string>
     <string name="submit">Spara</string>
     <string name="mostcommonprofile">Den vanligaste profilen:</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 496fdef5db..f012d7e0b8 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -154,7 +154,6 @@
     <string name="filenotfound">Dosya bulunamadı</string>
     <string name="nav_export">Dışarı aktarma ayarları</string>
     <string name="nav_import">İçe aktarma ayarları</string>
-    <string name="openapsma_maxbasal_title">Max Ü/sa geçici Bazal ayarlanabilir</string>
     <string name="openapsma_maxbasal_summary">Bu değer OpenAPS\'te \"max bazal\" olarak adlandırılır</string>
     <string name="openapsma_maxiob_title">OpenAPS\'nin vermesine izin verilen maksimum bazal IOB (Aktif insülin) [U]</string>
     <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Max IOB denir.\nAPS\'de [U] bir kerede verilen maksimum insülin.</string>
@@ -204,7 +203,6 @@
     <string name="primefill">Hazırla/doldur</string>
     <string name="fillwarning">Lütfen miktarın infüzyon setinizin özelliklerine uygun olduğundan emin olun!</string>
     <string name="othersettings_title">Diğer</string>
-    <string name="fillbolus_title">Hazırla/doldur standart insülin miktarları.</string>
     <string name="button1">Düğme 1</string>
     <string name="button2">Düğme 2</string>
     <string name="button3">Düğme 3</string>
@@ -257,7 +255,6 @@
     <string name="openapsama_max_daily_safety_multiplier_summary">Varsayılan değer: 3 Bu OpenAPS için önemli bir güvenlik ayarıdır. Maksimum bazal Iob\'u, en büyük bazal oranınızın üç katı (varsayılan olarak) ile sınırlar. Genel olarak, bu değeri değiştirmemelisiniz. Ama \"3x max günlük, 4x şuan\" ın bir güvenlik ayarı olarak ne anlama geldiğini bilmelisiniz.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Varsayılan ayar: 4 Bu, OpenAPS güvenlik ayarlarının diğer yarısı ve \"3x max günlük, 4x akım\" güvenlik korumasının diğer yarısıdır. Bu, başlangıç değerinizin, pompada ayarlanan taban maksimum değerinizden bağımsız olarak, mevcut bazal seviyenin bu sayısından daha yüksek olamayacağı anlamına gelir. Bu, insanların, algoritmanın nasıl çalıştığını anlamadan temel çizgiyi büyük ölçüde artırarak kendilerini tehlikeli durumlarda bulmalarını engellemektir. Varsayılan ayar 4x\'dir; Çoğu insan bu ayarları asla değiştirmek zorunda kalmayacak, ancak bu güvenlik sınırına yakınsa diğer terapi ayarlarını ayarlamalıdırlar.</string>
     <string name="openapsama_autosens_min_summary">Varsayılan değer: 0.7\nBu autosens için diğer güvenlik önlemidir. Bazal oranların ne kadar düştüğünü ve İnsülin Duyarlılık Faktörü ve KŞ hedeflerini ne kadar yüksek tutabileceğini gösterir.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens hedefleri de ayarlar</string>
     <string name="openapsama_autosens_adjusttargets_summary">Varsayılan değer: true\nBu autosens in İnsülin Duyarlılık Faktörü ve bazallara ek olarak KŞ hedeflerinin ayarlanmasında kullanılır.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Varsayılan değer: 2\nEğer sadece öğününüzü yerseniz, öğün bolusu alındıktan sonra bolus ertelemesi devreye girer, bu şekilde Döngü karşı bir tetbir olarak geçici bazal oranını azaltmasın diye. Buaradaki örnekte olduğu gibi varsayılan 2; 3 saat DIA olacak şekilde bolus ertelemesi kademeli olarak 1,5 saat üzeri (3DIA/2=1,5).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Varsayılan değer: 3.0 (AMA) Gelişmiş Yemek Asistanı veya 8.0 (SMB) Super Micro Bolus. Bu 5 dakika başına varsayılan karbonhidrat emilimi için bir ayardır. Standart değer AMA için 3mg/dl/5dk aynı şekilde SMB 8mg/dl/5dk dir.
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bfbda9b2e9..1ae888bf46 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -155,7 +155,6 @@
     <string name="filenotfound">找不到文件</string>
     <string name="nav_export">导出配置</string>
     <string name="nav_import">导入配置</string>
-    <string name="openapsma_maxbasal_title">临时基础率可以设置的最大值 U/小时</string>
     <string name="openapsma_maxbasal_summary">这个值在 OpenAPS被称为最大基础率</string>
     <string name="openapsma_maxiob_title">OpenAPS通过基础率可以输注的IOB活性胰岛素的最大值[U]</string>
     <string name="openapsma_maxiob_summary">这个值在OpenAPS中被成为最大IOB\n这是APS单次可以输注的胰岛素的最大值[U]</string>
@@ -222,7 +221,6 @@
     <string name="primefill">充盈</string>
     <string name="fillwarning">请确保数量和输液器里的药量匹配</string>
     <string name="othersettings_title">其他</string>
-    <string name="fillbolus_title">充盈标准数量的胰岛素</string>
     <string name="button1">按钮1</string>
     <string name="button2">按钮2</string>
     <string name="button3">按钮3</string>
@@ -277,7 +275,6 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置,</string>
     <string name="openapsama_autosens_max_summary">默认值: 1.2 \n 这是 autosens 的安全阀值 对 autosens ( 很快autotune) 比率的高值设置最大增加20%% 最大限制, 这反过来决定了 autosens 可以调整的基础率的上限值, 可以调整的胰岛素敏感系数的下限值, 以及它可以设置血糖目标的下限值。</string>
     <string name="openapsama_autosens_min_summary">默认值: 0.7 \n 　这是autosens 的另一个安全阈值, 。这个值决定了 autosens 可以调整的基础率的下限值, 可以调整的胰岛素敏感系数的上限值, 以及它可以设置血糖目标的上限值。</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens 也调整目标血糖</string>
     <string name="openapsama_autosens_adjusttargets_summary">缺省值：是\n　这是用来允许 autosens调整血糖目标，还有 ISF胰岛素敏感系数和基础率这些参数。</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">默认值: 2 \n大剂量snooze是在输注餐时大剂量后开始生效的, 所以在你刚吃完饭的时候, 闭环不会因为你输注了大剂量而减少或停基础。这里的例子和缺省是 2; 因此, 3 小时的DIA(胰岛素持续作用时间) 意味着大剂量snooze将逐步在１. ５小时 (3 DIA/2) 后失效。</string>
     <string name="openapsama_min_5m_carbimpact_summary">默认值: 3.0  (AMA) 或者 8.0 (SMB)。这是默认的每5分钟碳水化合物吸收量。默认值为3毫克/dl/5 分钟。 当血糖的下降超过预期时, 或者不像预期的上升的那么多时，这个值就影响了活性碳水化合物的衰减速度, 以及在计算预测未来血糖时假设的碳水化合物吸收量,</string>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 04395399e2..6132405070 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Сдвояване</string>
     <!--    General-->
     <string name="error">Грешка</string>
     <string name="not_set_short">Не е зададен</string>
@@ -47,24 +48,135 @@
     <string name="serialnumber">Сериен номер</string>
     <string name="battery_label">Батерия</string>
     <string name="lastconnection_label">Последна връзка</string>
+    <string name="lastbolus_label">Последен болус:</string>
+    <string name="dailyunits">Инсулин за деня</string>
+    <string name="basebasalrate_label">Базална стойност</string>
+    <string name="tempbasal_label">Временен базал</string>
+    <string name="virtualpump_extendedbolus_label">Удължен болус</string>
+    <string name="reservoir_label">Резервоар</string>
+    <string name="pumphistory">История</string>
+    <string name="viewprofile">Виж профил</string>
+    <string name="eventtype">Тип събитие</string>
+    <string name="mgdl">мг/дл</string>
+    <string name="mmol">ммол/л</string>
+    <string name="advancedsettings_title">Допълнителни настройки</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT ограничения</string>
+    <string name="btwatchdog_summary">Изключва Bluetooth на телефона за една секунда, ако няма връзка с помпата. Това може да помогне на някои телефони, където Bluetooth блокира.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Ограничаване на макс. базална стойност до %1$.2f Е/ч поради %2$s</string>
+    <string name="pumplimit">лимит на помпата</string>
+    <string name="limitingpercentrate">Ограничаване на максималната процентна стойност до %1$d%% поради %2$s</string>
+    <string name="itmustbepositivevalue">трябва да бъде положително число</string>
+    <string name="limitingbolus">Ограничаване на болус до %1$.1f Е поради %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Помпата не е инициализирана, профила не е зададен!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Потвърждение</string>
+    <string name="message">Съобщение</string>
+    <string name="ok">ОК</string>
+    <string name="cancel">Откажи</string>
+    <string name="dismiss">Разбрах</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy не се поддържа.</string>
+    <string name="ble_not_enabled">Bluetooth не е включен.</string>
+    <string name="location_not_found_title">Локацията не е включена</string>
+    <string name="location_not_found_message">За да работи откриването на нови устройсва чрез Bluetooth, трябва да включите локацията. AAPS не проследява вашето местоположение и ще можете да я изключите след успешното свързване.</string>
     <!--    DateUtil-->
     <string name="minago">преди %1$d мин</string>
+    <string name="hoursago">преди %1$.1fч</string>
+    <string name="shorthour">ч.</string>
+    <string name="days">дни</string>
+    <string name="hours">часа</string>
+    <string name="unit_second">секунда</string>
+    <string name="unit_minute">минута</string>
+    <string name="unit_hour">час</string>
+    <string name="unit_day">ден</string>
+    <string name="unit_week">седмица</string>
+    <string name="unit_seconds">секунди</string>
+    <string name="unit_minutes">минути</string>
+    <string name="unit_hours">часове</string>
+    <string name="unit_days">дни</string>
+    <string name="unit_weeks">седмици</string>
+    <string name="shortminute">мин.</string>
+    <string name="shortday">д</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Базалните стойности не са за кръгли часове: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Базалната стойност е заместена от минимално поддържаната стойност %1$s</string>
+    <string name="maximumbasalvaluereplaced">Базалната стойност е заместена от максимално поддържаната стойност %1$s</string>
+    <string name="profile_per_unit">/Е</string>
+    <string name="profile_ins_units_per_hour">Е/ч</string>
+    <string name="profile_carbs_per_unit">гр/Е</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Няма избран профил</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Само конкретни стойности! Диапазони не се поддържат за базал/болус при виртуална помпа.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Откажи временен базал</string>
+    <string name="let_temp_basal_run">Нека текущия временен базал продължи</string>
+    <string name="rate">Стойност</string>
+    <string name="duration">Срок</string>
+    <string name="reason">Основание</string>
+    <string name="nochangerequested">Не се изисква промяна</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Грешен профил: %1$s</string>
     <!--    Temptarget-->
     <string name="mins">%1$dмин</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Бол: <b>%3$.2f</b> Баз: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Проверка на КЗ</string>
+    <string name="careportal_announcement">Известие</string>
+    <string name="careportal_note">Бележка</string>
+    <string name="careportal_question">Въпрос</string>
+    <string name="careportal_exercise">Физ. активност</string>
+    <string name="careportal_pumpsitechange">Смяна на сет</string>
+    <string name="careportal_cgmsensorinsert">Смяна на сензор</string>
+    <string name="careportal_cgmsensorstart">Старт на сензор</string>
+    <string name="careportal_insulincartridgechange">Смяна на резервоар</string>
+    <string name="careportal_profileswitch">Смяна на профил</string>
+    <string name="careportal_snackbolus">Болус за закуска</string>
+    <string name="careportal_mealbolus">Болус за основно хранене</string>
+    <string name="careportal_correctionbolus">Болус корекция</string>
+    <string name="careportal_combobolus">Комбиниран болус</string>
+    <string name="careportal_tempbasalstart">Старт на временен базал</string>
+    <string name="careportal_tempbasalend">Край на временен базал</string>
+    <string name="careportal_carbscorrection">Корекция с въглехидрати</string>
+    <string name="careportal_openapsoffline">OpenAPS спрян</string>
+    <string name="careportal_pumpbatterychange">Смяна на батерия</string>
+    <string name="careportal_temporarytarget">Временна цел</string>
+    <string name="careportal_temporarytargetcancel">Откажи временна цел</string>
+    <string name="glucosetype_finger">Пръст</string>
+    <string name="glucosetype_sensor">Сензор</string>
+    <string name="manual">Друго</string>
+    <string name="unknown">неизвестно</string>
     <!--    Command-->
+    <string name="connectiontimedout">Времето за връзка изтече</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Приложено</string>
+    <string name="comment">Коментар</string>
+    <string name="success">Успешен</string>
+    <string name="percent">Процент</string>
+    <string name="absolute">Абсолютна</string>
+    <string name="configbuilder_insulin">Инсулин (ед.):</string>
+    <string name="insulin_unit_shortname">Ед.</string>
+    <string name="waitingforpumpresult">Изчаква резултат от помпата</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dгр допълнителни въглехидрати ще са необходими до %d минути</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
+    <string name="cumulative_tdd">Комулативна TDD</string>
+    <string name="expweight">Експоненциално претеглена TDD</string>
+    <string name="basalrate">Базал</string>
+    <string name="bolus">Болус</string>
+    <string name="tdd">ОДД</string>
+    <string name="ratio">Коефициент</string>
+    <string name="amount_days"># дни</string>
+    <string name="weight">Тегло</string>
+    <string name="warning_Message">Възможна неточност, ако сте използвали болус за презареждане!</string>
+    <string name="olddata_Message">Стари данни - натиснете \"ПРЕЗАРЕДИ\"</string>
+    <string name="tbb">Общо базален инсулин</string>
+    <string name="tbb2">ОБИ * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Засичане на времето</string>
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 2a6d73f169..d8122c11bc 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">Čekání na výsledek</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Požadováno %d g dodatečných sacharidů během %d minut</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiky</string>
     <string name="cumulative_tdd">Kumulativní CDD</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index e5c4ba6b93..0593ac980e 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -84,7 +84,7 @@
     <!--    DateUtil-->
     <string name="minago">vor %1$d Min.</string>
     <string name="hoursago">vor %1$.1f Stunde</string>
-    <string name="shorthour">Std</string>
+    <string name="shorthour">h</string>
     <string name="days">Tage</string>
     <string name="hours">Stunden</string>
     <string name="unit_second">Sekunde</string>
@@ -162,7 +162,7 @@
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">\"%dg zusätzliche Kohlenhydrate innerhalb von %d Minuten erforderlich.</string>
+    <string name="carbsreq">Innerhalb der nächsten %d Minuten werden %dg zusätzliche Kohlenhydrate benötigt</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulative TDD</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 5a5de873fe..ba7e875b1f 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -162,7 +162,6 @@
     <string name="waitingforpumpresult">Attente de résultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">\"%dg Glucides Supplémentaires Requis Dans %d Minutes</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Stats</string>
     <string name="cumulative_tdd">DTI cumulé</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 41abc12106..a46eb174d0 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -162,7 +162,7 @@
     <string name="waitingforpumpresult">In attesa del risultato</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">\"%dg di CHO aggiuntivi richiesti entro %d minuti</string>
+    <string name="carbsreq">%dg di CHO aggiuntivi richiesti entro %d minuti</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiche</string>
     <string name="cumulative_tdd">TDD cumulativo</string>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 12c36e5b7b..1f6b4fbd66 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">À espera de resultado</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg Hidratos Adicionais Necessários Dentro de %d Minutos</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Estatísticas</string>
     <string name="cumulative_tdd">Dose diária acumulativa</string>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 51b23371ee..4750e73b08 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -162,7 +162,6 @@
     <string name="waitingforpumpresult">Ожидание результата</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">\"%d г Необходимы дополнительные углеводы в течение %d минут\"</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">накопительные TDD</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 0f8eaf1405..8c2e5f87d7 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">Čakanie na výsledok</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg dodatočných sacharidov vyžadovaných v priebehu %d minút</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Štatistiky</string>
     <string name="cumulative_tdd">Kumulatívny TDD</string>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index d0981235d8..869e6caf83 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -162,7 +162,7 @@
     <string name="waitingforpumpresult">Väntar på resultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">\"%dg kolhydrater krävs inom %d minuter</string>
+    <string name="carbsreq">%dg kolhydrater krävs inom %d minuter</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulativ TDD</string>
diff --git a/dana/src/main/res/values-bg-rBG/strings.xml b/dana/src/main/res/values-bg-rBG/strings.xml
index dfbc3f46c8..72d2e51a94 100644
--- a/dana/src/main/res/values-bg-rBG/strings.xml
+++ b/dana/src/main/res/values-bg-rBG/strings.xml
@@ -1,14 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="danars_pairing">Сдвояване</string>
+    <string name="danars_nodeviceavailable">Все още устройството не е намерено</string>
+    <string name="danars_pairingok">Сдвояване - ОК</string>
+    <string name="danars_pairingtimedout">Времето за сдвояване изтече</string>
+    <string name="danars_waitingforpairing">Очаква сдвояване с помпа</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Поддръжка за Dana Diabecare RS помпи</string>
+    <string name="maxbolusviolation">Превишавате макс болус</string>
+    <string name="commanderror">Грешка при команда</string>
+    <string name="speederror">Скорост грешка</string>
+    <string name="insulinlimitviolation">Нарушение на макс дневен инсулин</string>
+    <string name="boluserrorcode">Стартирано: %1$.2fЕ Доставено: %2$.2fЕ Код на грешка: %3$s</string>
+    <string name="danar_valuenotsetproperly">Неправилна стойност</string>
+    <string name="danar_setbasalstep001">Задайте стъпка на базала 0.01 Е/ч</string>
     <string name="resetpairing">Нулиране на сдвояването?</string>
-    <string name="dana_model">Модел: %1$02X Протокол: %2$02X Код: %3$02X</string>
+    <string name="dana_model">%1$s\nМодел: %2$02X\nПротокол: %3$02X\nКод: %4$02X</string>
+    <string name="processinghistory">Обработва се събитие</string>
+    <string name="danar_enableextendedbolus">Разрешете удължените болуси в настройките на помпата</string>
+    <string name="overview_bolusprogress_delivered">Доставен</string>
+    <string name="overview_bolusprogress_stoped">Спрян</string>
+    <string name="unsupportedfirmware">Неподдържан фърмуер на помпата</string>
+    <string name="pumperror">Грешка в промпата</string>
+    <string name="lowbattery">Изтощена батерия</string>
     <string name="basalcompare">Доставяне на по-малко от предварително зададена базал</string>
+    <string name="pumpshutdown">Помпата е изключена</string>
+    <string name="batterydischarged">Батерията на помпата е изтощена</string>
+    <string name="occlusion">Запушване</string>
+    <string name="emptyreservoir">Празен резервоар</string>
     <string name="checkshaft">Проверете вал</string>
     <string name="basalmax">Базал макс</string>
     <string name="dailymax">Дневния максимум</string>
+    <string name="bloodsugarmeasurementalert">Предупреждение за измерване на КЗ</string>
+    <string name="remaininsulinalert">Оставащ инсулин</string>
     <string name="missedbolus">Пропуснат болус</string>
     <string name="invalidpairing">Невалидна информация при сдвояване. Нов опит </string>
+    <string name="gettingpumpstatus">Получава статус на помпата</string>
+    <string name="gettingextendedbolusstatus">Получава статус на удължен болус</string>
+    <string name="gettingbolusstatus">Получава болус статус</string>
+    <string name="gettingtempbasalstatus">Получава статус на временен базал</string>
+    <string name="gettingpumpsettings">Получава настройките на помпата</string>
+    <string name="gettingpumptime">Получава времето на помпата</string>
+    <string name="largetimedifftitle">Голяма времева разлика</string>
+    <string name="largetimediff">Голяма времева разлика: Помпата е изключена за повече от 1,5 часа. Моля, регулирайте ръчно времето на помпата и се уверете, че четенето на историята от помпата не води до неочаквано поведение. Ако е възможно, премахнете историята от помпата, преди да промените времето или да изключите затворения кръг за едно DIA след последното погрешно влизане в историята, но поне едно DIA отсега.</string>
+    <string name="pairfirst">Моля първо свържете помпата с телефона от Bluetooth настройките </string>
+    <string name="approachingdailylimit">Близо до максмалния дневен инсулин</string>
+    <string name="startingbolus">Стартира доставка на болус</string>
+    <string name="waitingforestimatedbolusend">Изчаква края на болуса. Остават %1$d сек.</string>
+    <string name="stoppingtempbasal">Спира временен базал</string>
+    <string name="settingextendedbolus">Настойва удължен болус</string>
+    <string name="stoppingextendedbolus">Спира удължен болус</string>
+    <string name="updatingbasalrates">Обновява базални стойности</string>
+    <string name="settingtempbasal">Настройва временен базал</string>
+    <string name="waitingfortimesynchronization">Изчаква синхронизация на времето (%1$d сек)</string>
+    <string name="wrongpassword">Грешна парола</string>
+    <string name="wrongpumppassword">Грешна парола за помпата!</string>
+    <string name="danar_history_alarm">Аларми</string>
+    <string name="danar_history_basalhours">Базален по часове</string>
+    <string name="danar_history_bolus">Болуси</string>
+    <string name="danar_history_carbohydrates">Въглехидрати</string>
+    <string name="danar_history_dailyinsulin">Инсулин за деня</string>
+    <string name="danar_history_errors">Грешки</string>
+    <string name="danar_history_glucose">КЗ</string>
+    <string name="danar_history_refill">Презареждане</string>
+    <string name="danar_history_syspend">Спиране</string>
+    <string name="danar_history_prime">Пълнене</string>
+    <string name="danar_useroptions">Потребителски опции</string>
+    <string name="danar_timedisplay">Формат на времето</string>
+    <string name="danar_buttonscroll">Превъртане при задъжане</string>
+    <string name="danar_beep">Звуков сигнал при натискане на бутон</string>
+    <string name="danar_pumpalarm">Тип аларма</string>
+    <string name="danar_pumpalarm_sound">Звукова</string>
+    <string name="danar_pumpalarm_vibrate">Вибрация</string>
+    <string name="danar_pumpalarm_both">И двете</string>
+    <string name="danar_screentimeout">Включен екран за [seconds]</string>
+    <string name="danar_backlight">Подсветка [seconds]</string>
+    <string name="danar_glucoseunits">Единици на КЗ</string>
+    <string name="danar_shutdown">Изключване след [hours]</string>
+    <string name="danar_lowreservoir">Минимален инсулин в резервоара [Units]</string>
+    <string name="danar_saveuseroptions">Запиши опциите в помпата</string>
+    <string name="description_pump_dana_r">Поддръжка за Dana Diabecare R помпи</string>
+    <string name="description_pump_dana_r_korean">Поддръжка за корейски Dana Diabecare R помпи</string>
+    <string name="description_pump_dana_r_v2">Поддръжка за Dana Diabecare R помпи с обновен софтуер</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Не е открит Bluetooth адаптер</string>
+    <string name="devicenotfound">Избраното устройство не е открито</string>
+    <string name="danar_switchtouhmode">Променете режима от U/d на U/h в помпата</string>
+    <string name="danarkoreanpump">DanaR Корейска</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Драйверът за помпата е коригиран</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Забрани EasyUI режим в помпата</string>
+    <string name="profile_set_failed">Неуспешно задаване на базален профил</string>
+    <string name="danar_bluetooth_status">Bluetooh статус</string>
+    <string name="danar_iob_label">IOB на помпата</string>
+    <string name="basal_step">Стъпка при базал</string>
+    <string name="bolus_step">Стъпка при болус</string>
+    <string name="virtualpump_firmware_label">Фърмуер</string>
+    <string name="danar_pump_settings">DanaR настройки</string>
+    <string name="timeformat12h">12ч</string>
+    <string name="timeformat24h">24ч</string>
+    <string name="option_on">Вкл</string>
+    <string name="option_off">Изкл</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth устройство</string>
     <string name="danars_password_title">Парола на помпата (само v1)</string>
+    <string name="danar_password_title">Парола за помпата</string>
+    <string name="danar_useextended_title">Използвай удължени болуси при над  &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Показвай удължените болуси като %%</string>
+    <string name="bolusspeed">Скорост на болус</string>
+    <string name="selectedpump">Избрана помпа</string>
     <string name="rs_loginsulinchange_title">Записвай смените на резервоар</string>
     <string name="rs_loginsulinchange_summary">Добави \"Смяна на резервоар\" в НС, когато е открит в историята</string>
     <string name="rs_logcanulachange_title">Записвай смяна на канюла</string>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
index c6598c41dd..caa501cd1f 100644
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -62,7 +62,7 @@
     <string name="danar_history_dailyinsulin">Dagtotaal insuline</string>
     <string name="danar_history_errors">Storing</string>
     <string name="danar_history_glucose">Glucose</string>
-    <string name="danar_history_refill">Reservoirvullen</string>
+    <string name="danar_history_refill">Reservoir vullen</string>
     <string name="danar_history_syspend">Onderbreken</string>
     <string name="danar_history_prime">Vullen</string>
     <string name="danar_useroptions">Gebruikersopties</string>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index d641178465..2a9b392910 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -29,6 +29,9 @@
     <string name="batterydischarged">Bateria da Bomba Descarregada</string>
     <string name="occlusion">Oclusão</string>
     <string name="emptyreservoir">Reservatório vazio</string>
+    <string name="checkshaft">Verificar Eixo</string>
+    <string name="basalmax">Máx Basal</string>
+    <string name="dailymax">Máx Diário</string>
     <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
     <string name="remaininsulinalert">Nível de insulina restante</string>
     <string name="missedbolus">Bólus não administrado</string>
diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml
index 3a8303f063..42800144e1 100644
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@@ -28,4 +28,29 @@
     <string name="pref_show_phone_battery">Батерия на телефон</string>
     <string name="pref_show_rig_battery">Батерия на устройство</string>
     <string name="pref_show_basal_rate">Покажи базал</string>
+    <string name="pref_low">Ниско</string>
+    <string name="pref_high">Висока</string>
+    <string name="pref_auto">Автом</string>
+    <string name="menu_bolus">Болус</string>
+    <string name="menu_settings">Настройки</string>
+    <string name="menu_status">Статус</string>
+    <string name="menu_prime_fill">Пълнене на сет</string>
+    <string name="action_duration">продължителност</string>
+    <string name="action_target" comment="In temp target menu, single target value">цел</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">ниско</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">висока</string>
+    <string name="action_carbs">вълехидрати</string>
+    <string name="action_percentage">% от профила</string>
+    <string name="action_insulin">инсулин</string>
+    <string name="action_bolus">болус</string>
+    <string name="status_pump">Помпа</string>
+    <string name="status_loop">Режим на APS - Loop</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="unit_mg_dl">мг/дл</string>
+    <string name="unit_mmol_l">ммол/л</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">гр.</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">Е</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">Е/ч</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">д</string>
 </resources>

From 50157d46f77c92159b4a0a4d6a00a29ddf4b838b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 23 Jun 2020 15:43:10 +0200
Subject: [PATCH 222/400] New translations strings.xml (German)

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

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index ae9d944a41..7a06f037c8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">Datei nicht gefunden</string>
     <string name="nav_export">Einstellungen exportieren</string>
     <string name="nav_import">Einstellungen importieren</string>
+    <string name="openapsma_maxbasal_title">Maximale IE/h, die als TBR gesetzt werden können</string>
     <string name="openapsma_maxbasal_summary">Dieser Wert wird \"max basal\" in OpenAPS genannt.</string>
     <string name="openapsma_maxiob_title">Maximales Basal-IOB, das OpenAPS abgeben darf [IE]</string>
     <string name="openapsma_maxiob_summary">Maximale Menge von Nicht-Bolus-IOB, die OpenAPS abgeben kann.</string>
@@ -299,6 +300,7 @@
     <string name="primefill">Katheterwechsel</string>
     <string name="fillwarning">Bitte vergewissere Dich, dass die Füllmenge den Eigenschaften des Katheters entspricht!</string>
     <string name="othersettings_title">Andere</string>
+    <string name="fillbolus_title">Füll-/Vorfüll-Standardmengen</string>
     <string name="button1">Schaltfläche 1</string>
     <string name="button2">Schaltfläche 2</string>
     <string name="button3">Schaltfläche 3</string>
@@ -357,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt das Basal-IOB auf die (im Standardfall) vierfache Menge der aktuellen Basalrate. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
     <string name="openapsama_autosens_max_summary">Standardwert: 1.2\nDies ist eine Sicherheitsgrenze für Autosens (und bald auch Autotune), die besagt, wie stark Autosens Basalraten erhöhen darf und wie niedrig der ISF (Insulin-Sensitivitäts-Faktor) und der BZ-Zielwert eingestellt werden können. 1.2 ist dabei der Multiplikationsfaktor und erlaubt eine Anpassung um 20%%.</string>
     <string name="openapsama_autosens_min_summary">Standardwert: 0.7\nDies ist die andere Sicherheitsgrenze für autosens. Sie beschränkt, wie weit Basalraten abgesenkt und wie sehr ISF und BZ-Zielwerte erhöht werden können.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens passt Zielwerte ebenfalls an</string>
     <string name="openapsama_autosens_adjusttargets_summary">Vorgabe: erlaubt.\nErlaubt Autosens den Ziel-BZ-Bereich in Verbindung mit ISF und Basal anzupassen.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standarwert: 2\nBolus snooze (\"Bolus-Schlummer\") bremst den Loop nach einem Mahleiten-Bolus, damit dieser nicht mit niedrigen TBR reagiert, wenn Du gerade gegessen hast. Beispiel: Der Standardwert 2 bewirkt, dass bei einem 3 Stunden DIA der Bolus snooze während 1.5 Stunden nach dem Bolus linear ausläuft (3 h Dia / 2 = 1.5 h Bolus snooze).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standardwert: 3.0 (AMA) or 8.0 (SMB)\nDies ist eine Einstellung für die Standard-Kohlenhydrat-Absorptionswirkung pro 5 Minuten. Der Standardwert ist 3 mg/dl/5min (AMA) bzw. 8 mg/dl/5min (SMB). Dies wirkt sich darauf aus, wie schnell der COB-Wert fällt und wieviel KH-Absorption bei der Berechnung des vorhergesagten BZ angenommen wird, wenn der BZ stärker als erwartet fällt oder nicht so stark wie erwartet steigt.</string>

From ce41338b7b0dd767ef1ca7f1cfd551928772ee8c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 24 Jun 2020 09:33:19 +0200
Subject: [PATCH 223/400] New translations strings.xml (Bulgarian)

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

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index bbb1549b02..fb83c22155 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">Файлът не е намерен</string>
     <string name="nav_export">Експорт настройки</string>
     <string name="nav_import">Импорт настройки</string>
+    <string name="openapsma_maxbasal_title">Максимален временен базал Е/ч</string>
     <string name="openapsma_maxbasal_summary">Макс. лимит на временен базал [Е/ч] </string>
     <string name="openapsma_maxiob_title">Максимален IOB</string>
     <string name="openapsma_maxiob_summary">Този параметър се нарича максимален IOB в OpenAPS и подразбиране е 0. След няколко дни или седмици можете да го увеличите.</string>
@@ -299,6 +300,7 @@
     <string name="primefill">Пълнене на сет</string>
     <string name="fillwarning">Моля, уверете се, че стойността съответсва на вашият сет! Този инсулин не се включва в IOB!</string>
     <string name="othersettings_title">Други</string>
+    <string name="fillbolus_title">Fill/Prime количества инсулин по подразбиране</string>
     <string name="button1">Бутон 1</string>
     <string name="button2">Бутон 2</string>
     <string name="button3">Бутон 3</string>
@@ -357,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">По подразбиране: 4\nТова е другият основен параметър в сигурността на OpenAPS, и другата половина от \"3x от най-високия дневен; 4x от текущия\". Това означава, че независимо от макс базал настроен в помпата, стойността на базала не може да е по-висока от тази стойност умножена по стойността на базала за текущият час от денонощието. Това е с цел да предпази от прекалено високи стойности на максималния базал преди да разбират как работи алгоритъма. Повечето от Вас няма да имат нужда от смяна на тази стойност и могат да се справят с настойки на другите параметри.</string>
     <string name="openapsama_autosens_max_summary">По подразбиране: 1.2\nТова е максималният множител на autosens (а скоро autotune), за да позволи 20%% максимален лимит на autosens коефициента, който от своя страна настройва базалите, колко може да намали инсулиновата чувствителност, и колко ниско може да свали целевата КЗ.</string>
     <string name="openapsama_autosens_min_summary">По подразбиране: 0.7\nДругата част от сигурността на autosens, слагайки ограничение на колко ниско може да ограничи базалите, колко да повиши чувствителността (ISF) и целевите КЗ.</string>
+    <string name="openapsama_autosens_adjusttargets">Да променя ли autosens и целевата КЗ</string>
     <string name="openapsama_autosens_adjusttargets_summary">По подразбиране: разрешено\nТова позволява на autosens да променя и целевите КЗ(освен чувствителност и базал).</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">По подразбиране: 2\nBolus snooze се активира след като поставите болус за основно хранене, така Loop няма да пуснка/намаля базалите веднага след като сте се хранили. Примерът тук е с 2; така при 3 часа DIA това ще означава че bolus snooze ще бъде внимателно изместен 1.5 часа (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Стойност по подразбиране: 3.0 (АМА) или 8.0 (SMB). Това е настройка на количеството на покачване на КЗ при усвояване на въглехидратите за всеки 5 минути. По подразбиране 3мг/дл за 5мин. Това се отразява на това колко бързо се усвояват COB според алгоритъма, и как това се отразява в предвиждането на КЗ, когато тя не се покачва или пада с различен темп от очакваното.</string>

From dd2c894a785d1ac234c009c3fb9f783e72111310 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 24 Jun 2020 10:04:46 +0200
Subject: [PATCH 224/400] New translations strings.xml (Bulgarian)

---
 wear/src/main/res/values-bg-rBG/strings.xml | 53 +++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/wear/src/main/res/values-bg-rBG/strings.xml b/wear/src/main/res/values-bg-rBG/strings.xml
index 42800144e1..0e633049af 100644
--- a/wear/src/main/res/values-bg-rBG/strings.xml
+++ b/wear/src/main/res/values-bg-rBG/strings.xml
@@ -28,29 +28,82 @@
     <string name="pref_show_phone_battery">Батерия на телефон</string>
     <string name="pref_show_rig_battery">Батерия на устройство</string>
     <string name="pref_show_basal_rate">Покажи базал</string>
+    <string name="pref_show_loop_status">Статус</string>
+    <string name="pref_show_bg">КЗ</string>
+    <string name="pref_show_direction_arrow">Делта стрелка</string>
+    <string name="pref_show_ago">Преди</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Тъмна</string>
+    <string name="pref_highlight_basals">Маркирай базали</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Подходящ разделител</string>
+    <string name="pref_chart_timeframe">Часови разделители</string>
+    <string name="pref_1_hour">1 час</string>
+    <string name="pref_2_hours">2 часа</string>
+    <string name="pref_3_hours">3 часа</string>
+    <string name="pref_4_hours">4 часа</string>
+    <string name="pref_5_hours">5 часа</string>
+    <string name="pref_input_design">Дизайн на въвеждане</string>
+    <string name="pref_default">Стандартен</string>
+    <string name="pref_quick_righty">Десничар</string>
+    <string name="pref_quick_lefty">Левичар</string>
+    <string name="pref_modern_sparse">Модерен</string>
+    <string name="pref_delta_granularity">Делта грануларност (Steampunk)</string>
     <string name="pref_low">Ниско</string>
+    <string name="pref_medium">Среден</string>
     <string name="pref_high">Висока</string>
     <string name="pref_auto">Автом</string>
+    <string name="pref_big_numbers">Големи Цифри</string>
+    <string name="pref_ring_history">История</string>
+    <string name="pref_light_ring_history">Олекотена история</string>
+    <string name="pref_animations">Анимации</string>
+    <string name="pref_wizard_in_menu">Калкулатор в менюто</string>
+    <string name="pref_prime_in_menu">Пълнене в менюто</string>
+    <string name="pref_single_target">Единична цел</string>
+    <string name="pref_wizard_percentage">Калкулатор с %</string>
+    <string name="pref_complication_tap_action">Допълнителни действия при почукване</string>
+    <string name="pref_unicode_in_complications">Unicode кодиране</string>
+    <string name="pref_version">Версия:</string>
+    <string name="menu_tempt">Врем цел</string>
+    <string name="menu_wizard">Калкулатор</string>
     <string name="menu_bolus">Болус</string>
+    <string name="menu_ecarb">уд. въгл.</string>
     <string name="menu_settings">Настройки</string>
     <string name="menu_status">Статус</string>
     <string name="menu_prime_fill">Пълнене на сет</string>
+    <string name="menu_none">Без</string>
+    <string name="menu_default">Стандартен</string>
+    <string name="menu_menu">Меню</string>
     <string name="action_duration">продължителност</string>
     <string name="action_target" comment="In temp target menu, single target value">цел</string>
     <string name="action_low" comment="In temp target menu, lower value from range">ниско</string>
     <string name="action_high" comment="In temp target menu, higher value from range">висока</string>
     <string name="action_carbs">вълехидрати</string>
     <string name="action_percentage">% от профила</string>
+    <string name="action_start_min">старт [min]</string>
+    <string name="action_duration_h">прод [h]</string>
     <string name="action_insulin">инсулин</string>
+    <string name="action_preset_1">Шаблон 1</string>
+    <string name="action_preset_2">Шаблон 2</string>
+    <string name="action_preset_3">Шаблон 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Неограничено кол</string>
+    <string name="action_confirm">ПОТВЪРДИ</string>
+    <string name="action_status_pump">ПОМПА СТАТУС</string>
+    <string name="action_status_loop">СТАТУС НА ЦИКЪЛА</string>
+    <string name="action_timeshift">отместване</string>
+    <string name="action_tdd_weighted">ОДД средно</string>
     <string name="action_bolus">болус</string>
     <string name="status_pump">Помпа</string>
     <string name="status_loop">Режим на APS - Loop</string>
+    <string name="status_cpp">CPP</string>
     <string name="status_tdd">TDD</string>
+    <string name="activity_carb">ВХ</string>
     <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">няма Статус</string>
     <string name="unit_mg_dl">мг/дл</string>
     <string name="unit_mmol_l">ммол/л</string>
     <string name="unit_g" comment="Shortcut for ISO unit: gram">гр.</string>
     <string name="unit_u" comment="Shortcut for: insulin Unit">Е</string>
     <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">Е/ч</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">ч</string>
     <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">д</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">с</string>
 </resources>

From 317daf8d06a8ce38225cb99fc82cd04627d51a70 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 24 Jun 2020 14:13:29 +0200
Subject: [PATCH 225/400] New translations exam.xml (Lithuanian)

---
 app/src/main/res/values-lt-rLT/exam.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values-lt-rLT/exam.xml b/app/src/main/res/values-lt-rLT/exam.xml
index 2deb998a72..dd8f3aba08 100644
--- a/app/src/main/res/values-lt-rLT/exam.xml
+++ b/app/src/main/res/values-lt-rLT/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Koks atsakymas apie IVT yra teisingas?</string>
+    <string name="dia_label_exam">Tema: Insulino veikimo trukmė</string>
     <string name="dia_minimumis3h">Mažiausia reikšmė - 3 valandos.</string>
     <string name="dia_minimumis5h">Mažiausia reikšmė - 5 valandos.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Loop app iPhone telefone.</string>
     <string name="nsclient_spikeiphone">Spike iPhone telefone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Tema: Insulino jautrumo faktorius</string>
     <string name="isf_increasingvalue">Didesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
     <string name="isf_decreasingvalue">Mažesnė JIF reikšmė lemia mažesnį insulino tiekimą, kai AAPS koreguoja aukštą glikemiją.</string>
     <string name="isf_noeffect">JIF reikšmės pakeitimas neturi įtakos AAPS leidžiamo insulino kiekiui koreguojant aukštą glikemiją.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Jei profilyje pakeisite JIF vertę, Ciklas į pokytį iškart atsižvelgs.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Tema: Insulino ir angliavandenių santykis</string>
     <string name="ic_increasingvalue">Didesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_decreasingvalue">Mažesnis insulino ir angliavandenių IA santykis reiškia, kad mažiau insulino reikia padengti tam tikram angliavandenių kiekiui.</string>
     <string name="ic_noeffect">Jei turite 0 AAO (aktyvių angliavandenių organizme), pakeitus IA, glikemija bus koreguojama kitokiu insulino kiekiu.</string>

From 0b0b4fc6371a581e17a4ca19abdc3268d4298f5f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 24 Jun 2020 19:15:35 +0200
Subject: [PATCH 226/400] handle NS announcements properly

---
 .../nightscout/androidaps/services/DataService.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/services/DataService.java b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
index cf1833e892..26814a7644 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/services/DataService.java
@@ -11,6 +11,7 @@ import org.json.JSONObject;
 import javax.inject.Inject;
 
 import dagger.android.DaggerIntentService;
+import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.db.CareportalEvent;
@@ -55,6 +56,7 @@ public class DataService extends DaggerIntentService {
     @Inject XdripPlugin xdripPlugin;
     @Inject NSProfilePlugin nsProfilePlugin;
     @Inject ActivePluginProvider activePlugin;
+    @Inject Config config;
 
     public DataService() {
         super("DataService");
@@ -68,7 +70,6 @@ public class DataService extends DaggerIntentService {
 
 
         boolean acceptNSData = !sp.getBoolean(R.string.key_ns_upload_only, false);
-        Bundle bundles = intent.getExtras();
 
         final String action = intent.getAction();
         if (Intents.ACTION_NEW_BG_ESTIMATE.equals(action)) {
@@ -234,8 +235,11 @@ public class DataService extends DaggerIntentService {
             String notes = JsonHelper.safeGetString(json, "notes", "");
             if (date > now - 15 * 60 * 1000L && !notes.isEmpty()
                     && !enteredBy.equals(sp.getString("careportal_enteredby", "AndroidAPS"))) {
-                Notification announcement = new Notification(Notification.NSANNOUNCEMENT, notes, Notification.ANNOUNCEMENT, 60);
-                rxBus.send(new EventNewNotification(announcement));
+                boolean defaultVal = config.getNSCLIENT();
+                if (sp.getBoolean(R.string.key_ns_announcements, defaultVal)) {
+                    Notification announcement = new Notification(Notification.NSANNOUNCEMENT, notes, Notification.ANNOUNCEMENT, 60);
+                    rxBus.send(new EventNewNotification(announcement));
+                }
             }
         }
     }

From 2606e51eb1257255cb6a8689673c409a91bdf199 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 25 Jun 2020 17:02:18 +0200
Subject: [PATCH 227/400] Second Fix, send all raw values sent in mg/dl (BG
 values, lowline and highline) It's hard coded in mg/dl in Wear Minor
 improvement in Wear code (just increase a little bit highest BG value in
 graphs, 400 mg/dl is sometimes too low => updated to 450 mg/dl)

---
 .../wear/wearintegration/WatchUpdaterService.java  | 14 ++++++++------
 .../androidaps/watchfaces/BgGraphBuilder.java      |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 0adfcb1656..977c1ee6c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -298,14 +298,16 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
     private DataMap dataMapSingleBG(BgReading lastBG, GlucoseStatus glucoseStatus) {
         String units = profileFunction.getUnits();
-
-        double lowLine = defaultValueHelper.determineLowLine();
-        double highLine = defaultValueHelper.determineHighLine();
+        double convert2MGDL = 1.0;
+        if (units.equals(Constants.MMOL))
+            convert2MGDL = Constants.MMOLL_TO_MGDL;
+        double lowLine = defaultValueHelper.determineLowLine()*convert2MGDL;
+        double highLine = defaultValueHelper.determineHighLine()*convert2MGDL;
 
         long sgvLevel = 0L;
-        if (lastBG.valueToUnits(units) > highLine) {
+        if (lastBG.value > highLine) {
             sgvLevel = 1;
-        } else if (lastBG.valueToUnits(units) < lowLine) {
+        } else if (lastBG.value < lowLine) {
             sgvLevel = -1;
         }
 
@@ -323,7 +325,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
             dataMap.putString("avgDelta", deltastring(glucoseStatus.avgdelta, glucoseStatus.avgdelta * Constants.MGDL_TO_MMOLL, units));
         }
         dataMap.putLong("sgvLevel", sgvLevel);
-        dataMap.putDouble("sgvDouble", lastBG.valueToUnits(units));
+        dataMap.putDouble("sgvDouble", lastBG.value);
         dataMap.putDouble("high", highLine);
         dataMap.putDouble("low", lowLine);
         return dataMap;
diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
index ee17d91e76..90a3ea81d5 100644
--- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
+++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/BgGraphBuilder.java
@@ -396,8 +396,8 @@ public class BgGraphBuilder {
         if(singleLine) {
             for (BgWatchData bgReading : bgDataList) {
                 if(bgReading.timestamp > start_time) {
-                    if (bgReading.sgv >= 400) {
-                        inRangeValues.add(new PointValue(fuzz(bgReading.timestamp), (float) 400));
+                    if (bgReading.sgv >= 450) {
+                        inRangeValues.add(new PointValue(fuzz(bgReading.timestamp), (float) 450));
                     } else if (bgReading.sgv >= highMark) {
                         inRangeValues.add(new PointValue(fuzz(bgReading.timestamp), (float) bgReading.sgv));
                     } else if (bgReading.sgv >= lowMark) {
@@ -412,8 +412,8 @@ public class BgGraphBuilder {
         } else {
             for (BgWatchData bgReading : bgDataList) {
                 if (bgReading.timestamp > start_time) {
-                    if (bgReading.sgv >= 400) {
-                        highValues.add(new PointValue(fuzz(bgReading.timestamp), (float) 400));
+                    if (bgReading.sgv >= 450) {
+                        highValues.add(new PointValue(fuzz(bgReading.timestamp), (float) 450));
                     } else if (bgReading.sgv >= highMark) {
                         highValues.add(new PointValue(fuzz(bgReading.timestamp), (float) bgReading.sgv));
                     } else if (bgReading.sgv >= lowMark) {

From 2656e6a12cefa96ad6565de41146b3d02d59706c Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 25 Jun 2020 18:16:10 +0200
Subject: [PATCH 228/400] BG Deltas consistency enhancement - Delta after
 minutes and label right aligned in layout (hard coded for label as it was in
 OverviewFragment) - Signed delta avg values

---
 .../general/overview/OverviewFragment.kt      |  4 +-
 .../main/res/layout/overview_info_layout.xml  | 52 ++++++++++++++-----
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 4afcc52826..2c3a741b0b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -572,9 +572,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
             if (glucoseStatus != null) {
-                overview_delta?.text = "Δ ${Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)}"
+                overview_delta?.text = "${Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)}"
                 overview_deltashort?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
-                overview_avgdelta?.text = "Δ15m: ${Profile.toUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}\nΔ40m: ${Profile.toUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
+                overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}\n${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
             } else {
                 overview_delta?.text = "Δ " + resourceHelper.gs(R.string.notavailable)
                 overview_deltashort?.text = "---"
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 9794abeaff..5bea227071 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -49,20 +49,46 @@
             android:text="n/a"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-        <TextView
-            android:id="@+id/overview_delta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="n/a"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/overview_avgdelta"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:text="n/a"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                <TextView
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd"
+                    android:text="Δ: "
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                <TextView
+                    android:id="@+id/overview_delta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="n/a"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="textEnd"
+                    android:text="15m Δ: \n40m Δ: "
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                <TextView
+                    android:id="@+id/overview_avgdelta"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="24dp"
+                    android:text="n/a"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+            </LinearLayout>
 
     </LinearLayout>
 

From d28770ac08bf02e96b8ab6ee661b4bc8f2551e43 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Thu, 25 Jun 2020 21:33:45 +0200
Subject: [PATCH 229/400] Forgotten prediction lines

---
 .../general/wear/wearintegration/WatchUpdaterService.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 977c1ee6c7..0f8feee2fc 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -541,7 +541,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
                 final String units = profileFunction.getUnits();
                 for (BgReading bg : predArray) {
                     if (bg.value < 40) continue;
-                    predictions.add(predictionMap(bg.date, bg.valueToUnits(units), bg.getPredectionColor()));
+                    predictions.add(predictionMap(bg.date, bg.value, bg.getPredectionColor()));
                 }
             }
         }

From 5477b2122ae91c7ba802f628cc05628aedb23e3d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 25 Jun 2020 21:52:52 +0200
Subject: [PATCH 230/400] New translations strings.xml (French)

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

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 62d287bc55..bc9175b0bc 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">Fichier introuvable</string>
     <string name="nav_export">Exporter les paramètres</string>
     <string name="nav_import">Importer les paramètres</string>
+    <string name="openapsma_maxbasal_title">Débit max en U/h pour une Basal Temp.</string>
     <string name="openapsma_maxbasal_summary">Cette valeur est appelée Basal Maximum dans le contexte OpenAPS</string>
     <string name="openapsma_maxiob_title">IA Basal max que OpenAPS pourra délivrer [U]</string>
     <string name="openapsma_maxiob_summary">Cette valeur est appelée Max IA (Insuline Active) dans le contexte OpenAPS\nC\'estlle maximum d\'insuline en [U] que APS peut délivrer en une seule fois.</string>
@@ -300,6 +301,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="primefill">Amorcer/Remplir</string>
     <string name="fillwarning">Veuillez à ce que la quantité corresponde aux caractéristiques de votre cathéter !</string>
     <string name="othersettings_title">Autres</string>
+    <string name="fillbolus_title">Quantité d\'insuline par défaut pour Amorcer/Remplir</string>
     <string name="button1">Bouton 1</string>
     <string name="button2">Bouton 2</string>
     <string name="button3">Bouton 3</string>
@@ -358,6 +360,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="openapsama_current_basal_safety_multiplier_summary">Valeur par défaut : 4 Ceci est l’autre moitié des paramètres de sécurité limitant l’OpenAPS, et l’autre moitié de “3x max daily, 4x current” des paramètres de sécurité. Quel que soit le basal maximum prédéfini dans votre pompe, il ne pourra pas être plus haut que ce nombre multiplié par le Basal actuel. Ceci est fait pour ne pas mettre l’utilisateur en danger en programmant des débits Basal maximum trop élevés avant de comprendre comment l’algorithme fonctionne. Encore une fois, la valeur par défaut est 4x, la plupart des gens n’auront jamais besoin d’ajuster ce paramètre, plutôt ils auront tendance à ajuster d’autres paramètres s’ils voient qu’ils atteignent ce paramètre de limite de sécurité.</string>
     <string name="openapsama_autosens_max_summary">Valeur par défaut: 1.2\nCeci est la limite du multiplicateur utilisé par Autosens (et bientôt Autotune) pour définir +20%% en limite maximale du ratio Autosens. En consequence, ceci dit va définir la valeur maximale du Basal pour Autosens, la valeur minimale de la Sensibilité à l\'Insuline (SI, ISF), et la valeur minimale de la cible glycémique.</string>
     <string name="openapsama_autosens_min_summary">Valeur par défaut: 0,7\nL\'autre volet des limites de sécurité de l\'autosens, c\'est de définir une limite basse sur l\'ajustement des débits de basal et une limite haute sur l\'ajustement de la SI et des cibles GLY effectués par l\'autosens.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens ajuste aussi les cibles</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valeur par défaut : true\nCeci est utilisé pour autoriser Autosens à ajuster les cibles de glycémie en plus de SI et les basals.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valeur par défaut : 2\nBolus snooze est activé apres votre bolus de repas, la boucle ne réagira pas avec des valeurs basses temporaire quand vous venez juste de manger. L’exemple ici et la valeur par défaut est 2 ; donc avec une Durée d\'Action (DIA) de 3 heures signifie que snooze bolus sera graduellement éliminé après 1,5 heures (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valeur par défaut : 3.0 (AMA) ou 8.0 (SMB). Il s’agit d’un paramètre décrivant l’absorption des glucides par 5 minutes. La valeur par défaut est de 3mg/dl/5min. Cela influe sur la vitesse calculée de disparition des Glucides Actifs (GA), et comment sera estimée la consommation des glucides pour calculer les valeurs futures de glycémies, lorsque la glycémie chute plus que prévu ou n\'augmente pas autant que calculé.</string>

From 11f6b5cbd1a8338d73ffe6dc97a06a48324b9772 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 25 Jun 2020 22:02:52 +0200
Subject: [PATCH 231/400] New translations strings.xml (French)

---
 core/src/main/res/values-fr-rFR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index ba7e875b1f..bfb493cf0c 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">Attente de résultat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg de glucides supplémentaires requis d\'ici %d minutes</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Stats</string>
     <string name="cumulative_tdd">DTI cumulé</string>

From 1ff79905e320ebc398e2c3181eaee47e18e1941a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:32:48 +0200
Subject: [PATCH 232/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 343 ++-------------------
 1 file changed, 18 insertions(+), 325 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index ffeeffb103..18945dd564 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -171,48 +171,15 @@
     <string name="password_preferences_decrypt_prompt">Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
-    <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
+    <string name="preferences_import_list_title">Selecionar arquivo para importar</string>
     <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
     <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
     <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
     <string name="check_preferences_details_btn">Explicar problemas de importação…</string>
-    <string name="check_preferences_details_title">Detalhes de problemas de importação</string>
-    <string name="check_preferences_import_btn">Importar</string>
-    <string name="check_preferences_import_anyway_btn">Importar mesmo assim (PERIGOSO!)</string>
-    <string name="metadata_warning_different_flavour">As preferências foram criadas com uma variante diferente do AAPS (%1$s) enquanto tem: %2$s.\n\nAlgumas configurações podem estar ausentes ou inválidas - após a importação, por favor verifique e actualize suas preferências.</string>
-    <string name="metadata_warning_different_device">Preferências foram criadas num dispositivo diferente. Não há problema se estiver a importar de telefone diferente/antigo, mas se certifique que as preferências importadas estão corretas!</string>
-    <string name="metadata_warning_outdated_format">Está a usar formato ultrapassado herdado a partir de versões antigas do AAPS, o que não é seguro! Use-o apenas como um último recurso, se não tiver uma exportação no actual no formato JSON.</string>
-    <string name="metadata_warning_old_export">Preferências importadas já são %1$s dias antigas! Talvez tenha preferências mais actualizadas ou escolheu o ficheiro errado? Lembre-se de exportar preferências regularmente!</string>
-    <string name="metadata_warning_date_format">Formato de data-hora inválido!</string>
-    <string name="metadata_warning_different_version">Preferências de uma versão menor diferente de aplicação. Está OK se você está importando após o upgrade, mas verifique após a importação se as preferências ainda estão corretas!</string>
-    <string name="metadata_urgent_different_version">Preferências de uma versão principal diferente de aplicação. As principais versões diferem significativamente e podem ter preferências incompatíveis! Certifique-se depois de importar que as preferências ainda estão corretas!</string>
-    <string name="metadata_label_format">Formato do ficheiro</string>
-    <string name="metadata_label_created_at">Criado em</string>
-    <string name="metadata_label_aaps_version">Versão AAPS</string>
-    <string name="metadata_label_aaps_flavour">Variante de Compilação</string>
-    <string name="metadata_label_device_name">A exportar nome do paciente do dispositivo</string>
-    <string name="metadata_label_device_model">A exportar modelo do dispositivo</string>
-    <string name="metadata_label_encryption">Encriptação do Ficheiro</string>
-    <string name="metadata_format_old">Antigo Formato de Exportação</string>
-    <string name="metadata_format_new">Novo formato de encriptação</string>
+    <string name="metadata_warning_different_flavour">As preferências foram criadas com uma variante diferente do AAPS (%1$s) enquanto tem: %2$s.\n\nAlgumas configurações podem estar ausentes ou inválidas - após a importação, por favor verifique e atualize suas preferências.</string>
+    <string name="metadata_warning_outdated_format">Você está usando o formato de legado desatualizado a partir de versões antigas da AAPS, que não é seguro! Use apenas como último recurso, se você não tiver uma exportação em formato atual, JSON.</string>
+    <string name="metadata_warning_old_export">As preferências importadas já têm %1$s dias de idade! Talvez você tenha preferências mais atualizadas ou escolha o arquivo errado? Lembre-se de exportar preferências regularmente!</string>
     <string name="metadata_format_debug">Novo formato de depuração (não encriptado)</string>
-    <string name="metadata_format_other">Formato de exportação desconhecido</string>
-    <string name="prefdecrypt_settings_tampered">Ficheiro de configurações adulterado</string>
-    <string name="prefdecrypt_settings_secure">Ficheiro de configurações é seguro</string>
-    <string name="prefdecrypt_settings_unencrypted">A usar um formato de configurações não seguro e não encriptado</string>
-    <string name="prefdecrypt_wrong_json">Erro de formato JSON, campo necessário ausente (formato, conteúdo, metadados ou segurança)</string>
-    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a senha inserida não pode desencriptar o ficheiro</string>
-    <string name="prefdecrypt_issue_missing_file_hash">Ficheiro de verificação (hash) em falta, não é possível verificar a autenticidade de configurações!</string>
-    <string name="prefdecrypt_issue_modified">Ficheiro foi modificado após exportação!</string>
-    <string name="prefdecrypt_issue_parsing">Erro Desencriptação, a análise de preferências falhou!</string>
-    <string name="prefdecrypt_issue_wrong_pass">Erro de Desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o ficheiro importado foi exportado com uma Senha Mestre diferente.</string>
-    <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
-    <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
-    <string name="exported_today">exportado hoje</string>
-    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado há %1$s</string>
-    <string name="exported_at" comment="at placeholder we add export date">exportado às %1$s</string>
-    <string name="exported_less_than_hour_ago">exportado há menos de uma hora</string>
-    <string name="in_directory" comment="placeholder is for exported file path">no diretório: %1$s</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
@@ -222,23 +189,13 @@
     <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
-    <string name="smscommunicator_mealbolusreplywithcode">Para administrar bólus %1$.2fU responder com código %2$s</string>
-    <string name="smscommunicator_temptargetwithcode">Para definir o Alvo Tempo %1$s responda com o código %2$s</string>
-    <string name="smscommunicator_temptargetcancel">Para cancelar Alvo Temp responda com o código %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">Para desactivar o Serviço Remoto SMS de responda com o código %1$s.\n\nTenha em mente que será capaz de o reactivar directamente apenas a partir do telemóvel mestre do AAPS.</string>
-    <string name="smscommunicator_stoppedsms">SMS Serviço Remoto interrompido. Para reactivá-lo, use o AAPS no telemóvel mestre.</string>
+    <string name="smscommunicator_stopsmswithcode">Para desativar o Serviço Remoto SMS de responda com o código %1$s.\n\nTenha em mente que será capaz de o reativar diretamente apenas a partir do celular principal do AAPS.</string>
+    <string name="smscommunicator_stoppedsms">SMS Serviço Remoto interrompido. Para reativá-lo, use o AAPS no telemóvel mestre.</string>
     <string name="smscommunicator_calibrationreplywithcode">Para enviar calibração %1$.2f responder com código %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus falhou</string>
-    <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
-    <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
-    <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
     <string name="bolusdelivered">Bolus %1$.2fU entregue com sucesso</string>
     <string name="bolusrequested">Vão ser administradas %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
-    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU administrado com sucesso</string>
-    <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
-    <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
-    <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos via SMS</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -252,26 +209,15 @@
     <string name="smscommunicator_loopisenabled">Loop ativado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
-    <string name="smscommunicator_pumpconnectwithcode">Para ligar a bomba responda com o código %1$s</string>
-    <string name="smscommunicator_pumpconnectfail">Ligação à bomba falhou</string>
-    <string name="smscommunicator_pumpdisconnectwithcode">Para desligar a bomba por %1d minutos responda com o código %2$s</string>
-    <string name="smscommunicator_pumpdisconnected">Bomba desligada</string>
-    <string name="smscommunicator_reconnect">Bomba ligada novamente</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bolus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
-    <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
-    <string name="smscommunicator_loopresumereplywithcode">Para retomar o loop responda com o código %1$s</string>
-    <string name="smscommunicator_loopenablereplywithcode">Para activar o loop responda com o código %1$s</string>
-    <string name="smscommunicator_loopdisablereplywithcode">Para desactivar o loop responda com o código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
-    <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
-    <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Falha ao iniciar basal temp</string>
     <string name="smscommunicator_extendedfailed">Falha ao iniciar o bolus estendido</string>
@@ -302,9 +248,6 @@
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
-    <string name="units_colon">Unidades:</string>
-    <string name="units">Unidades</string>
-    <string name="dia">DIA</string>
     <string name="target_range">Intervalo Alvo:</string>
     <string name="prefs_range_title">Intervalo para visualização</string>
     <string name="prefs_range_summary">Marca alta e baixa para as cartas em Visão geral e Smartwatch</string>
@@ -395,16 +338,13 @@
     <string name="wear_detailedIOB_title">Mostrar IOB detalhado</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
     <string name="nosuccess">não foi bem sucedido - por favor, verifique o telefone</string>
-    <string name="notavailable">n/d</string>
     <string name="patientage">Idade do Paciente</string>
     <string name="child">Criança</string>
     <string name="teenage">Adolescente</string>
     <string name="adult">Adulto</string>
     <string name="resistantadult">Adulto resistente insulina</string>
     <string name="patientage_summary">Por favor seleccione a idade do diabético para definir os limites de segurança</string>
-    <string name="patient_name">Nome do Paciente</string>
-    <string name="patient_name_summary">Por favor, forneça nome do paciente ou alcunha para diferenciar entre várias configurações</string>
-    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utilizador</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Usuário</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s necessita de autorizar a não optimização da bateria para assegurar a performance necessária</string>
     <string name="loopsuspended">Loop suspenso</string>
@@ -439,26 +379,10 @@
     <string name="enablesuperbolus">Activar superbólus no assistente</string>
     <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
-    <string name="statuslights_cage_warning">Limite aviso idade canula [h]</string>
-    <string name="statuslights_cage_critical">Limite Crítico Idade Canula [h]</string>
-    <string name="statuslights_iage_warning">Limite aviso idade insulina [h]</string>
-    <string name="statuslights_iage_critical">Limite crítico idade insulina [h]</string>
-    <string name="statuslights_sage_warning">Limite aviso idade sensor [h]</string>
-    <string name="statuslights_sage_critical">Limite crítico idade sensor [h]</string>
-    <string name="statuslights_bage_warning">Limite de aviso de nível de bateria [h]</string>
-    <string name="statuslights_bage_critical">Limite crítico de nível de bateria [h]</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
-    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
-    <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
-    <string name="prediction_shortname">PREV</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
-    <string name="basal_shortname">BAS</string>
-    <string name="deviation_shortname">DESV</string>
-    <string name="activity_shortname">ACT</string>
-    <string name="abs_insulin_shortname">ABS</string>
-    <string name="devslope_shortname">DESVINCLI</string>
     <string name="nav_about">Sobre</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -473,11 +397,8 @@
     <string name="careportal_sensorage_label">Idade do sensor</string>
     <string name="careportal_canulaage_label">Idade da Canula</string>
     <string name="careportal_insulinage_label">Idade de Insulina</string>
-    <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
-    <string name="ns_alarms">Criar notificações dos alarmes NS</string>
-    <string name="ns_announcements">Criar notificações a partir dos anúncios NS</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Tempo limite para Urgência por dados obsoletos [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
@@ -558,7 +479,6 @@
     <string name="enable_missed_bg_readings_alert">Alerta caso nenhuma glicemia seja recebida</string>
     <string name="enable_pump_unreachable_alert">Alerta caso não seja possivel alcançar a bomba</string>
     <string name="pump_unreachable_threshold">Limite para bomba inacessível [min]</string>
-    <string name="enable_carbs_req_alert">Alertar se forem necessários Hidratos</string>
     <string name="urgent_alarm">Alarme Urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicação Eversense (com patch)</string>
@@ -566,12 +486,7 @@
     <string name="bgsource_upload">Configurações de upload de BG</string>
     <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
-    <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
-    <string name="smbmaxminutes">SMB máx. minutos</string>
     <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
-    <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
-    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
-    <string name="carbsReqThreshold">Mínimo De Hidratos Necessários Para Sugestão</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
@@ -630,8 +545,6 @@
     <string name="extendedbolusdeliveryerror">Erro na entrega Bólus Estendido</string>
     <string name="insightpump_shortname">Visão</string>
     <string name="ago">atrás</string>
-    <string name="set_neutral_temps_title">Definir basais temporárias neutras</string>
-    <string name="set_neutral_temps_summary">Se activado, ele irá cancelar basal temporária antes do final de cada hora. Este método pode ajudar a parar o sinal sonoro/vibração em algumas bombas, de hora em hora.</string>
     <string name="enablesmbalways">SMB sempre activado</string>
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
@@ -654,7 +567,6 @@
     <string name="ignore5m">Ignorar 5m</string>
     <string name="ignore15m">Ignorar 15m</string>
     <string name="ignore30m">Ignorar 30m</string>
-    <string name="required">req</string>
     <string name="nav_historybrowser">Navegador do histórico</string>
     <string name="wear_notifysmb_title">Notificar no SMB</string>
     <string name="wear_notifysmb_summary">Mostrar SMB no relogio como bolus normal.</string>
@@ -788,7 +700,6 @@
     <string name="startobjective">Iniciar primeiro objectivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
-    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
@@ -807,10 +718,6 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar sensibilidade para alvostemp >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Baixo alvotemp baixa sensibilidade</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Baixar sensibilidade para alvostemp < 100]]></string>
-    <string name="resistance_lowers_target_title">Resistência reduz alvo</string>
-    <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
-    <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
-    <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
     <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
@@ -861,10 +768,6 @@
     <string name="log_alerts">Alertas de registo</string>
     <string name="enable_tbr_emulation">Ativar a emulação TBR</string>
     <string name="enable_tbr_emulation_summary">Usar bólus prolongados em vez de basais temporárias para contornar o limite de 250%%</string>
-    <string name="disable_vibration">Desactivar vibrações na entrega manual de bólus</string>
-    <string name="disable_vibration_summary">Para bólus e bólus estendidos (só disponível com o firmware Insight 3.x)</string>
-    <string name="disable_vibration_auto">Desactivar vibrações na entrega automática de bólus</string>
-    <string name="disable_vibration_auto_summary">Para SMB e Basal Temp com emulação DBT (só disponível com firmware Insight 3.x)</string>
     <string name="disconnect_delay">Atraso de desconexão [s]</string>
     <string name="serial_number">Número de série</string>
     <string name="release_software_version">Lançar versão de software</string>
@@ -969,8 +872,6 @@
     <string name="tidepool_upload_tbr">Enviar basais temporárias</string>
     <string name="tidepool_upload_profile">Enviar trocas de perfil, alvos temporários</string>
     <string name="tidepool_upload_bg">Enviar testes Glicemia</string>
-    <string name="dst_in_24h_warning">Horário de Verão em 24h ou menos</string>
-    <string name="dst_loop_disabled_warning">Horário de Verão a menos de 3 horas - Closed Loop desligado</string>
     <string name="storage">restrição de armazenamento interno</string>
     <string name="diskfull">Liberte pelo menos %1$d MB do armazenamento interno! Loop desativado!</string>
     <string name="wrongformat">Formato incorrecto</string>
@@ -993,7 +894,7 @@
     <string name="running_invalid_version">Detectamos que está  a correr uma versão inválida. Loop desactivado!</string>
     <string name="old_version">versão antiga</string>
     <string name="very_old_version">versão muito antiga</string>
-    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a SGB após %2$d dias, o loop será desactivado após %3$d dias</string>
+    <string name="new_version_warning">Nova versão para pelo menos %1$d dias disponíveis! Retorno a LGS após %2$d dias, o loop será desativado após %3$d dias</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">App Dexcom (com patch)</string>
     <string name="dexcom_short">DXCM</string>
@@ -1008,8 +909,6 @@
     <string name="exists">existe</string>
     <string name="notexists">não existe</string>
     <string name="temptargetcompared">Alvo Temp %1$s</string>
-    <string name="btdevicecompared">Ligação Bluetooth com o dispositivo %1$s %2$s</string>
-    <string name="btdevice">Ligação ao dispositivo Bluetooth </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -1024,18 +923,13 @@
     <string name="name_short">Nome:</string>
     <string name="locationis">%1$s %2$s</string>
     <string name="location_mode">Quando </string>
-    <string name="location_inside">Quando estiver dentro da área</string>
-    <string name="location_outside">Quando estiver fora da área</string>
-    <string name="location_going_in">Quando entrar na área definida</string>
-    <string name="location_going_out">Quando sair da área definida</string>
     <string name="lastboluslabel">Último bolus atrás</string>
     <string name="lastboluscompared">Última vez do bolus %1$s %2$s atrás</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Nome da Tarefa</string>
     <string name="edit_short">EDITAR</string>
-    <string name="please_choose_an_action_type">Escolha um tipo de acção</string>
-    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho</string>
+    <string name="please_choose_an_action_type">Escolha um tipo de ação</string>
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
@@ -1063,8 +957,6 @@
     <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
     <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
     <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">PROCURAR</string>
@@ -1125,7 +1017,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
     <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá atcivada na bomba. Active-a na bomba.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá ativada na bomba. Ative-a na bomba.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
@@ -1170,11 +1062,6 @@
     <string name="medtronic_cmd_desc_get_tbr">Obter Basal temporário</string>
     <string name="medtronic_cmd_desc_set_tbr">Definir Basal temporário</string>
     <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
-    <string name="profilename">Alterar perfil para</string>
-    <string name="changengetoprofilename">Alterar perfil para %1$s</string>
-    <string name="automation_trigger_pump_last_connection_label">Última ligação à bomba</string>
-    <string name="automation_trigger_pump_last_connection_description">Última ligação à bomba [minutos atrás]</string>
-    <string name="automation_trigger_pump_last_connection_compared">Última ligação à bomba %1$s %2$s min atrás</string>
     <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
     <string name="sendsmsactiondescription">Enviar SMS para todos os números</string>
     <string name="sendsmsactiontext">Enviar SMS com texto</string>
@@ -1185,217 +1072,23 @@
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
-    <string name="time_range">Intervalo de tempo</string>
-    <string name="timerange_value">O tempo está entre %1$s e %2$s</string>
-    <string name="between">Entre </string>
-    <string name="increasingmaxbasal">Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil</string>
-    <string name="smscommunicator_messagebody">Corpo da mensagem inválido</string>
-    <string name="format_bg_isf">%1$s FSI: %2$.1f</string>
-    <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
-    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
-    <string name="format_percent">%1$d%%</string>
-    <string name="boluswizard">Assistente de Bólus</string>
-    <string name="unit_minute_short">min</string>
-    <string name="profile_name">Nome do Perfil:</string>
-    <string name="selected_profile">Seleccionado:</string>
-    <string name="unitsnosemicolon">Unidades</string>
-    <string name="doyouwantswitchprofile">Deseja mudar de perfil e descartar as alterações feitas no perfil actual?</string>
-    <string name="format_carbs">%1$dg</string>
-    <string name="common_on">Ligado</string>
-    <string name="common_off">Desligado</string>
-    <string name="objectives_button_unfinish">Limpar terminado</string>
-    <string name="objectives_button_unstart">Limpar iniciado</string>
-    <string name="doyouwantresetstart">Deseja reiniciar o objectivo? Pode perder seu progresso.</string>
-    <string name="time_or_timezone_change">Alterar Hora e/ou Fuso Horário na Bomba</string>
-    <string name="nopumpselected">Nenhuma bomba seleccionada</string>
-    <string name="setupwizard_units_prompt">Seleccione as unidades em que deseja exibir os valores</string>
-    <string name="ns_ploadlocalprofile">Carregar as alterações do perfil local para NS</string>
-    <string name="dia_short">DIA</string>
-    <string name="ic_short">IC</string>
-    <string name="isf_short">FSI</string>
-    <string name="target_short">ALV</string>
-    <string name="clone_label">Clone</string>
-    <string name="saveorresetchangesfirst">Guardar ou repor as alterações actuais primeiro</string>
-    <string name="deletecurrentprofile">Eliminar perfil actual?</string>
-    <string name="copytolocalprofile">Criar novo perfil local a partir desta troca de perfil?</string>
-    <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não é enviado para o NS.</string>
-    <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
-    <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
-    <string name="reorder_label">Reordenar</string>
-    <string name="age">Idade:</string>
-    <string name="id">ID:</string>
-    <string name="submit">Enviar</string>
-    <string name="mostcommonprofile">Perfil mais comum:</string>
-    <string name="survey_comment">Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Você pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada.</string>
-    <string name="nav_survey">Questionário</string>
-    <string name="invalidage">Entrada de idade inválida</string>
-    <string name="invalidweight">Entrada de peso inválida</string>
-    <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
-    <string name="average">Média</string>
-    <string name="tir">TIR</string>
-    <string name="activitymonitor">Monitor de actividade</string>
-    <string name="doyouwantresetstats">Quer reiniciar as estatísticas de actividade?</string>
-    <string name="statistics">Estatísticas</string>
-    <string name="randombg">Glic. Aleatória</string>
-    <string name="description_source_randombg">Gerar dados de Glic. aleatórios (Somente modo de Demonstração)</string>
-    <string name="randombg_short">GLIC</string>
-    <string name="tools">Ferramentas</string>
-    <string name="show_calculation">Mostrar Localização</string>
-    <string name="automation_event">Evento de automação</string>
-    <string name="alreadyset">Já definido</string>
-    <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
-    <string name="ebstopsloop">O uso do Bólus Prolongado irá parar o modo Closed Loop no tempo do bólus prolongado. Quer realmente isso?</string>
-    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Prolongado</string>
-    <string name="extended_bolus_short">BP</string>
-    <string name="phonechecker">\"VerificadorTelefone\"</string>
-    <string name="chartmenu">Menu do Gráfico</string>
-    <string name="sensitivity_short">AS</string>
-    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
-    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
-    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
-    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
-    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
+    <string name="doyouwantswitchprofile">Deseja mudar de perfil e descartar as alterações feitas no perfil atual?</string>
+    <string name="deletecurrentprofile">Eliminar perfil atual?</string>
+    <string name="activitymonitor">Monitor de atividade</string>
+    <string name="doyouwantresetstats">Quer reiniciar as estatísticas de atividade?</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">a partir da app Autenticador para: %1$s</string>
-    <string name="smscommunicator_otp_enabled">Activar Autenticador</string>
-    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Senha-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
-    <string name="smscommunicator_otp_pin">PIN adicional no token final</string>
-    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Senha-Única que seja gerada</string>
-    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
-    <string name="smscommunicator_otp_verify_label">OTP para verificar:</string>
-    <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
-    <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
-    <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados actualmente como inválidos, e precisará de os configurar novamente.</string>
-    <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode actualizado para os autenticadores.</string>
-    <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
-    <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
-    <string name="smscommunicator_otp_step3_test_header">3. Testar Uma-Senha-Única</string>
-    <string name="smscommunicator_otp_reset_header">Repor Autenticadores</string>
-    <string name="smscommunicator_otp_install_info">Instalar uma app Autenticador que suporte Tokens RFC 6238 TOTP em cada telefone seguidor. Populares aplicativos gratuitos são:\n • Authy\n • o Google Authenticator\n • LastPass Autenticador\n • FreeOTP Autenticador</string>
-    <string name="smscommunicator_otp_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</string>
-    <string name="smscommunicator_otp_reset_warning">Ao repor o autenticador, torna inválidos todos os autenticadores já provisionados. Precisará de os configurar novamente!</string>
-    <string name="onconnect">Ao ligar</string>
-    <string name="ondisconnect">Ao desligar</string>
-    <string name="overview_show_predictions">Previsões</string>
-    <string name="overview_show_deviationslope">Desvio de inclinação</string>
-    <string name="authorizationfailed">Falha na autorização</string>
-    <string name="overview_show_absinsulin">Insulina absoluta</string>
-    <string name="master_password_summary">Senha Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
-    <string name="passwords_dont_match">As senhas não coincidem</string>
-    <string name="current_master_password">Senha Mestre actual</string>
-    <string name="statuslights">Luzes de Estado</string>
-    <string name="statuslights_copy_ns">Copiar definições do NS</string>
-    <string name="copyexistingvalues">Copiar definições do NS (se existir)?</string>
-    <string name="classic_description">Tema Gráfico Original</string>
-    <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
-    <string name="largedisplay_description">Mostrador Grande</string>
-    <string name="skin">Tema gráfico</string>
+    <string name="smscommunicator_otp_enabled">Ativar Autenticador</string>
+    <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados atualmente como inválidos, e precisará de os configurar novamente.</string>
+    <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode atualizado para os autenticadores.</string>
+    <string name="current_master_password">Senha mestra atual</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
     <!-- Omnipod Configuration -->
-    <string name="omnipod_config_beep_bolus_enabled">Sinal Bólus Activado</string>
-    <string name="omnipod_config_beep_basal_enabled">Sinal Basal Activado</string>
-    <string name="omnipod_config_beep_smb_enabled">Sinal SMB Activado</string>
-    <string name="omnipod_config_beep_tbr_enabled">Sinal DBT Activado</string>
-    <string name="omnipod_config_pod_debugging_options_enabled">Opções de Depuração do Pod habilitadas</string>
-    <string name="omnipod_config_timechange_enabled">Detecção de DST/Fuso Horário Activado</string>
     <!-- Omnipod - Fragment -->
-    <string name="omnipod_pod_mgmt">Gestão Pod</string>
-    <string name="omnipod_pod_status">Estado do Pod</string>
-    <string name="omnipod_reservoir_left">%1$.2f U restante</string>
-    <string name="omnipod_reservoir_over50">Mais de 50 U</string>
-    <string name="omnipod_pod_address">Endereço do Pod</string>
-    <string name="omnipod_pod_expiry">Pod Expira</string>
-    <string name="omnipod_pod_name_no_info">Sem info</string>
-    <string name="omnipod_pod_no_pod_connected">Nenhum Pod ligado</string>
-    <string name="omnipod_pod_not_initalized">Não inicializado</string>
-    <string name="omnipod_pod_active_alerts">Alertas Pod Activos</string>
-    <string name="omnipod_ack_short">Reco Alertas</string>
     <!-- Omnipod - Dialogs -->
-    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
-    <string name="omnipod_error_operation_not_possible_no_configuration">A operação não é possível.\n\nPrecisa configurar o Omnipod primeiro, antes de pode usar esta operação.</string>
-    <string name="omnipod_error_operation_not_possible_no_profile">A operação não é possível.\n\n Precisa de esperar alguns minutos, até que AAPS tente definir o perfil para a primeira vez.</string>
-    <string name="omnipod_error_illegal_init_action_type">PodInitActionType Ilegal: %1$s</string>
-    <string name="omnipod_error_pod_not_attached">Nenhum Pod Activo.</string>
-    <string name="omnipod_driver_error_setup_action_verification_failed">A verificação do comando falhou.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">Ocorreu um erro inesperado. Por favor reporte! (digite: %1$s).</string>
-    <string name="omnipod_driver_error_invalid_parameters">Falha na comunicação: foram recebidos parâmetros de entrada inválidos.</string>
-    <string name="omnipod_driver_error_communication_failed_timeout">Falha na comunicação: tempo limite.</string>
-    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Falha na comunicação: ocorreu um erro inesperado. Por favor, reporte!</string>
-    <string name="omnipod_driver_error_crc_mismatch">Falha na comunicação: mensagem de falha de verificação de integridade.</string>
-    <string name="omnipod_driver_error_invalid_packet_type">Falha na comunicação: recebeu um pacote inválido do Pod.</string>
-    <string name="omnipod_driver_error_invalid_progress_state">Falha na comunicação: o Pod está em um estado errado.</string>
-    <string name="omnipod_driver_error_invalid_response">Falha na comunicação: recebeu uma resposta inválida do Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_sequence_number">Falha na comunicação: recebeu uma mensagem com número de sequência inválido do Pod.</string>
-    <string name="omnipod_driver_error_invalid_message_address">Falha na comunicação: recebeu uma mensagem com um endereço inválido do Pod.</string>
-    <string name="omnipod_driver_error_message_decoding_failed">Falha na comunicação: falha ao descodificar a mensagem do Pod.</string>
-    <string name="omnipod_driver_error_nonce_resync_failed">Falha na comunicação: nonce resync falhou.</string>
-    <string name="omnipod_driver_error_nonce_out_of_sync">Falha na comunicação: nonce fora de sincronização.</string>
-    <string name="omnipod_driver_error_not_enough_data">Falha na comunicação: não há dados suficientes recebidos do Pod.</string>
-    <string name="omnipod_driver_error_pod_fault">Uma falha de Pod (%1$03d %2$s) foi detectada. Por favor, desactive o Pod e inicie um novo.</string>
-    <string name="omnipod_driver_error_pod_returned_error_response">Falha na comunicação: o Pod devolveu uma resposta de erro.</string>
     <!-- Omnipod - Pod Mgmt -->
-    <string name="omnipod_pod_mgmt_title">Gestão Pod</string>
-    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
-    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
-    <string name="omnipod_cmd_reset_pod">Repor Pod</string>
-    <string name="omnipod_cmd_pod_history">Histórico do Pod</string>
-    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
-    <string name="omnipod_cmd_cancel_bolus">Cancelar Bólus</string>
-    <string name="omnipod_cmd_set_tbr">Definir Basal Temporária</string>
-    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporária (Forçado pelo controlador)</string>
-    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporária (Forçado pelo utilizador)</string>
-    <string name="omnipod_cmd_set_basal_schedule">Definir Programação Basal</string>
-    <string name="omnipod_cmd_get_pod_status">Obter Status do Pod</string>
-    <string name="omnipod_cmd_get_pod_info">Obter Pod Info</string>
-    <string name="omnipod_cmd_set_time">Definir Hora</string>
-    <string name="omnipod_cmd_configure_alerts">Configurar Alertas</string>
-    <string name="omnipod_cmd_acknowledge_alerts">Reconhecer Alertas</string>
-    <string name="omnipod_cmd_suspend_delivery">Suspender Administração</string>
-    <string name="omnipod_cmd_resume_delivery">Retomar Administração</string>
-    <string name="omnipod_cmd_unknown_entry">Entrada Desconhecida</string>
-    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
-    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, HC=%2$.1f g</string>
-    <string name="omnipod_cmd_tbr_value">Taxa: %1$.1f U, Duração: %2$d min</string>
-    <string name="omnipod_cmd_reset_pod_desc">Se pressionar <b>OK</b>, o estado do Pod vai ser forçado a redefinir e você não será capaz de comunicar mais com o Pod. Faça isso somente se você não pode comunicar mais com o Pod. Se ainda pode comunicar com o Pod, por favor, use o <b>Desactivar Pod</b> opção.</string>
-    <string name="omnipod_cmd_pod_history_na">Histórico do Pod não disponível no momento.</string>
-    <string name="omnipod_init_pod_wizard_step1_title">Encher o Pod</string>
-    <string name="omnipod_init_pod_wizard_step1_desc">\nPreencher o novo Pod com insulina suficiente para 3 dias.\n\nOuvir dois sinais sonoros a partir do Pod durante o processo de enchimento. Isso indica que a quantidade mínima de 85U foi inserida. Certifique-se de esvaziar completamente a seringa, mesmo depois de ouvir dois sinais sonoros.\n\nDepois de preencher o Pod, por favor, pressione <b>Próximo</b>.\n\n<b>Nota:</b> não remova a tampa da agulha do Pod neste momento.</string>
-    <string name="omnipod_init_pod_wizard_step2_title">A Purgar</string>
-    <string name="omnipod_init_pod_wizard_step2_action_header">A tentar emparelhar com o novo Pod e purgá-lo.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> por favor, mantenha o Pod muito perto do RileyLink neste momento.</string>
-    <string name="omnipod_init_pod_wizard_step3_title">Anexar o Pod</string>
-    <string name="omnipod_init_pod_wizard_step3_desc">\nPrepare o local de infusão. Remova a tampa da agulha do Pod e o adesivo e fixe o Pod no local de infusão.\n\nSe a canula sair, por favor, pressione <b>Cancelar</b> e descarte o seu Pod.\n\nPressione <b>Próximo</b> para inserir a canula e começar a administração da basal.</string>
-    <string name="omnipod_init_pod_wizard_step4_title">A inserir canula</string>
-    <string name="omnipod_init_pod_wizard_step4_action_header">A tentar definir um plano da basal inicial e inserir canula.\n\nQuando todos os itens estiverem verificados, pode pressionar <b>Próximo</b>.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_title">Info Pod</string>
-    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nO Pod está agora activo.\n\nO seu plano de basal foi programado e a canula foi inserida.\n\nPor favor, verifique se a canula foi inserida correctamente e substitua o seu Pod se você se sente que não.</string>
-    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step1_desc">\nPressione <b>Próximo</b> para desactivar o Pod.\n\n<b>Nota:</b> Isto irá suspender toda a administração de insulina e desactivar o Pod.</string>
-    <string name="omnipod_remove_pod_wizard_step2_title">A Desactivar Pod</string>
-    <string name="omnipod_remove_pod_wizard_step2_action_header">A desactivar o Pod.\n\nQuando todos os itens forem verificados, pode pressionar <b>Próximo</b>.\n\n<b>Nota:</b> Se desactivar falhar continuamente, por favor, pressione <b>Cancelar</b> e use o <b>Repor Pod</b> opção para forçar a repor o estado do Pod.</string>
-    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, remova o Pod do seu corpo e descarte-o.</string>
-    <string name="omnipod_init_pod_pair_pod">Emparelhar Pod</string>
-    <string name="omnipod_init_pod_prime_pod">Purgar Pod</string>
-    <string name="omnipod_init_pod_fill_cannula">Enchimento de Canula</string>
-    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
-    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar Administração</string>
-    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
-    <string name="description_pump_omnipod_dash">Integração da Bomba para Omnipod Dash.</string>
-    <string name="omnipod_alert_finish_pairing_reminder">Lembrete Concluir Emparelhamento</string>
-    <string name="omnipod_alert_finish_setup_reminder_reminder">Lembrete Terminar Configuração</string>
-    <string name="omnipod_alert_expiration">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_expiration_advisory">Pod vai expirar em breve</string>
-    <string name="omnipod_alert_shutdown_imminent">Encerramento iminente</string>
-    <string name="omnipod_alert_low_reservoir">Reservatório baixo</string>
-    <string name="omnipod_alert_unknown_alert">Alerta desconhecido</string>
-    <string name="omnipod_error_set_basal_failed_uncertain">Pode ter falhado ao definir perfil da basal. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_error_set_temp_basal_failed_uncertain">Pode ter falhado ao definir basal temporária. Se houve uma basal temporária já em execução, pode ter sido cancelada! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_error_set_time_failed_uncertain">Pode ter falhado ao definir a hora. A administração pode estar suspensa! Por favor, actualize o estado do Pod.</string>
-    <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
-    <string name="omnipod_rl_stats">Estatísticas RL</string>
-    <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
 </resources>

From c0e002f292710134be400e179ccc512272ee736f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:42:22 +0200
Subject: [PATCH 233/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 18945dd564..6e2e41ade7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -279,7 +279,7 @@
     <string name="hypo">Hipo</string>
     <string name="activity">Atividade</string>
     <string name="removerecord">Remover registo</string>
-    <string name="actions_shortname">ACÇ</string>
+    <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">LOOP</string>
     <string name="simpleprofile_shortname">PS</string>
@@ -383,6 +383,7 @@
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="activity_shortname">ACT</string>
     <string name="nav_about">Sobre</string>
     <string name="smscommunicator_missingsmspermission">Falta de permissão SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permissão do estado do telefone</string>
@@ -692,12 +693,12 @@
     <string name="sensitivitysetup">Configurar plugin Sensibilidade</string>
     <string name="setupwizard_sensitivity_description">Plugin de Sensibilidade é usado para detecção de sensibilidade e cálculos COB. Para mais info visite:</string>
     <string name="setupwizard_sensitivity_url">https://github.com/MilosKozak/AndroidAPS/wiki/Sensitivity-detection-and-COB</string>
-    <string name="nsclientinfotext">NSCliente gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objectivos até que o configure.</string>
+    <string name="nsclientinfotext">NSCliente gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objetivos até que o configure.</string>
     <string name="diawarning">Lembre-se: novos perfis de insulina requerem diâmetro de pelo menos 5h. DIA 5–6h no novo perfil é igual ao diâmetro 3h nos antigos perfis de insulina.</string>
     <string name="bgsourcesetup">Configure a fonte das glicemias</string>
     <string name="setupwizard_profile_description">Por favor seleccione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o activar executando \"Troca Perfil\"</string>
     <string name="setupwizard_aps_description">Seleccione um dos algoritmos disponíveis. Eles são classificados do mais antigo para o mais recente. Algoritmo mais recente é geralmente mais forte e mais agressivo. Assim, se você é novo looper, poderá provavelmente começar com AMA e não com a versão mais recente. Não se esqueça de ler a documentação de OpenAPS e configurá-lo antes de usar.</string>
-    <string name="startobjective">Iniciar primeiro objectivo</string>
+    <string name="startobjective">Iniciar primeiro objetivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
     <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
@@ -1073,6 +1074,10 @@
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
     <string name="doyouwantswitchprofile">Deseja mudar de perfil e descartar as alterações feitas no perfil atual?</string>
+    <string name="objectives_button_unfinish">Limpeza terminado</string>
+    <string name="objectives_button_unstart">Limpeza iniciado</string>
+    <string name="doyouwantresetstart">Deseja reiniciar o objetivo? Pode perder seu progresso.</string>
+    <string name="saveorresetchangesfirst">Guardar ou repor as alterações atuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil atual?</string>
     <string name="activitymonitor">Monitor de atividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de atividade?</string>

From 0c1a01778f1a9405ee498f40e623dbb13531cfbc Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:42:23 +0200
Subject: [PATCH 234/400] New translations strings.xml (Portuguese, Brazilian)

---
 core/src/main/res/values-pt-rBR/strings.xml | 162 +-------------------
 1 file changed, 2 insertions(+), 160 deletions(-)

diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index 12c36e5b7b..f1445fc05c 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -1,181 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pairing">A Emparelhar</string>
     <!--    General-->
-    <string name="error">Erro</string>
-    <string name="not_set_short">Não definido</string>
-    <string name="failedupdatebasalprofile">Falha a actualizar perfil da basal</string>
-    <string name="profile_set_ok">Perfil Basal actualizado na bomba</string>
-    <string name="invalidinput">Entrada Inválida</string>
-    <string name="tempbasaldeliveryerror">Erro na administração da Basal Temp</string>
-    <string name="goingtodeliver">A ser administrado %1$.2fU</string>
-    <string name="waitingforpump">À espera da bomba</string>
-    <string name="connectingfor">A ligar durante %1$d s</string>
-    <string name="bolusdelivering">A administrar %1$.2fU</string>
-    <string name="handshaking">Cumprimento</string>
-    <string name="connecting">A ligar</string>
-    <string name="connected">Ligado</string>
-    <string name="disconnected">Desligado</string>
-    <string name="disconnecting">A desligar</string>
-    <string name="androidaps_start">AndroidAPS iniciado</string>
-    <string name="formatinsulinunits">%1$.2fU</string>
-    <string name="reservoirvalue">%1$.0f / %2$d U</string>
-    <string name="pump_basebasalrate">%1$.2fU/h</string>
-    <string name="format_hours">%1$.2f h</string>
-    <string name="format_mins">%1$d mins</string>
-    <string name="format_mins_short">%1$dm</string>
-    <string name="pumpbusy">A bomba está ocupada</string>
-    <string name="connectionerror">Erro de ligação da bomba</string>
-    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
-    <string name="objectives">Objectivos</string>
-    <string name="close">Fechar</string>
-    <string name="please_wait">Por favor aguarde…</string>
-    <string name="mute">Silêncio</string>
-    <string name="reload">Recarregar</string>
-    <string name="stoppressed">PARAR PRESSIONADO</string>
-    <string name="stop">Parar</string>
-    <string name="carbs">Hidratos</string>
-    <string name="invalidprofile">Perfil inválido !!!</string>
-    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
-    <string name="date">Data</string>
-    <string name="units_label">Unidades</string>
-    <string name="dia_label">DIA</string>
-    <string name="ic_label">IC</string>
-    <string name="isf_label">FSI</string>
-    <string name="basal_label">Basal</string>
-    <string name="target_label">Alvo</string>
-    <string name="initializing">A inicializar ...</string>
-    <string name="serialnumber">Número de série</string>
-    <string name="battery_label">Bateria</string>
-    <string name="lastconnection_label">Última ligação</string>
-    <string name="lastbolus_label">Último bólus</string>
-    <string name="dailyunits">Unidades diárias</string>
-    <string name="basebasalrate_label">Taxa Basal de base</string>
-    <string name="tempbasal_label">Basal temp</string>
-    <string name="virtualpump_extendedbolus_label">Bólus Prolongado</string>
-    <string name="reservoir_label">Reservatório</string>
-    <string name="pumphistory">Histórico da Bomba</string>
-    <string name="viewprofile">Ver perfil</string>
-    <string name="eventtype">Tipo de evento</string>
-    <string name="mgdl">mg/dL</string>
-    <string name="mmol">mmol/L</string>
-    <string name="advancedsettings_title">Configurações Avançadas</string>
-    <string name="bluetooth">Bluetooth</string>
-    <string name="btwatchdog_title">Watchdog BT</string>
-    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma ligação com bomba for possível. Este parâmetro pode ser útil em alguns telefones, onde o bluetooth congela.</string>
+    <string name="objectives">Objetivos</string>
     <!--    Constraints-->
-    <string name="limitingbasalratio">A basal máx está limitada a %1$.2f U/h por %2$s</string>
-    <string name="pumplimit">limite bomba</string>
-    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
-    <string name="itmustbepositivevalue">deve ser valor positivo</string>
-    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
-    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
     <!--    Dialogs-->
-    <string name="confirmation">Confirmação</string>
-    <string name="message">Mensagem</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancelar</string>
-    <string name="dismiss">DISPENSAR</string>
     <!--    BlePreCheck-->
-    <string name="ble_not_supported">Bluetooth Low Energy não suportado.</string>
-    <string name="ble_not_enabled">Bluetooth não está activado.</string>
-    <string name="location_not_found_title">Localização Não Está Activa</string>
-    <string name="location_not_found_message">Para a Pesquisa Bluetooth funcionar em dispositivos mais recentes, a localização deve ser activada. AAPS não acompanha a sua localização e pode ser desactivada após o emparelhamento bem-sucedido.</string>
     <!--    DateUtil-->
-    <string name="minago">%1$dm atrás</string>
-    <string name="hoursago">%1$.1fh atrás</string>
-    <string name="shorthour">h</string>
-    <string name="days">dias</string>
-    <string name="hours">horas</string>
-    <string name="unit_second">segundo</string>
-    <string name="unit_minute">minuto</string>
-    <string name="unit_hour">hora</string>
-    <string name="unit_day">dia</string>
-    <string name="unit_week">semana</string>
-    <string name="unit_seconds">segundos</string>
-    <string name="unit_minutes">minutos</string>
-    <string name="unit_hours">horas</string>
-    <string name="unit_days">dias</string>
-    <string name="unit_weeks">semanas</string>
-    <string name="shortminute">m</string>
-    <string name="shortday">d</string>
     <!--    Profile-->
-    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
-    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
-    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
-    <string name="profile_per_unit">/U</string>
-    <string name="profile_ins_units_per_hour">U/h</string>
-    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
-    <string name="noprofileselected">Nenhum perfil seleccionado</string>
     <!--    PumpType-->
-    <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
     <!--    APSResult-->
-    <string name="canceltemp">Cancelar Basal Temp</string>
-    <string name="let_temp_basal_run">Permitir Basal Temp Correr</string>
-    <string name="rate">Rácio</string>
-    <string name="duration">Duração</string>
-    <string name="reason">Motivo</string>
-    <string name="nochangerequested">Nenhuma alteração solicitada</string>
     <!--    ProfileSwitch-->
-    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <!--    Temptarget-->
-    <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
-    <string name="careportal_bgcheck">Verificar Glic</string>
-    <string name="careportal_announcement">Anúncio</string>
-    <string name="careportal_note">Nota</string>
-    <string name="careportal_question">Questão</string>
-    <string name="careportal_exercise">Exercício</string>
-    <string name="careportal_pumpsitechange">Mudança Local Bomba</string>
-    <string name="careportal_cgmsensorinsert">Colocação Sensor CGM</string>
-    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
-    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
-    <string name="careportal_profileswitch">Troca de Perfil</string>
-    <string name="careportal_snackbolus">Bólus Lanche</string>
-    <string name="careportal_mealbolus">Bólus Refeição</string>
-    <string name="careportal_correctionbolus">Bólus Correcção</string>
-    <string name="careportal_combobolus">Bólus Combo</string>
-    <string name="careportal_tempbasalstart">Início Basal Temp</string>
-    <string name="careportal_tempbasalend">Fim Basal Temp</string>
-    <string name="careportal_carbscorrection">Correcção Hidratos</string>
-    <string name="careportal_openapsoffline">OpenAPS Offline</string>
-    <string name="careportal_pumpbatterychange">Troca Bateria Bomba</string>
-    <string name="careportal_temporarytarget">Alvo Temporário</string>
-    <string name="careportal_temporarytargetcancel">Cancelar Alvo Temporário</string>
-    <string name="glucosetype_finger">Dedo</string>
-    <string name="glucosetype_sensor">Sensor</string>
-    <string name="manual">Manual</string>
-    <string name="unknown">desconhecido</string>
     <!--    Command-->
-    <string name="connectiontimedout">Ligação expirou</string>
     <!--    PumpEnactResult-->
-    <string name="enacted">Realizado</string>
-    <string name="comment">Comentário</string>
-    <string name="success">Sucesso</string>
-    <string name="percent">Percentagem</string>
-    <string name="absolute">Absoluto</string>
-    <string name="configbuilder_insulin">Insulina</string>
-    <string name="insulin_unit_shortname">U</string>
-    <string name="waitingforpumpresult">À espera de resultado</string>
-    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
-    <string name="stats">Estatísticas</string>
-    <string name="cumulative_tdd">Dose diária acumulativa</string>
-    <string name="expweight">Dose diária exponencialmente ponderada</string>
-    <string name="basalrate">Basal</string>
-    <string name="bolus">Bólus</string>
-    <string name="tdd">TDD</string>
-    <string name="ratio">Rácio</string>
-    <string name="amount_days"># Dias</string>
-    <string name="weight">Peso</string>
-    <string name="warning_Message">Possivelmente impreciso se foram usados bólus para purgar/preencher!</string>
-    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
-    <string name="tbb">Basal Diária Total</string>
-    <string name="tbb2">Basal diária * 2</string>
+    <string name="warning_Message">Possivelmente impreciso se foram usados bolus para purgar/preencher!</string>
     <!--    Ntp-->
-    <string name="timedetection">Detecção de tempo</string>
 </resources>

From 9a7114a60c09626d117d622d6160d97ac1bac70f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:42:25 +0200
Subject: [PATCH 235/400] New translations objectives.xml (Portuguese,
 Brazilian)

---
 app/src/main/res/values-pt-rBR/objectives.xml | 54 ++-----------------
 1 file changed, 4 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index ab4fe5aebe..9c28df6649 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -15,55 +15,9 @@
     <string name="objectives_maxiobzero_objective">Começar a fechar loop com Suspensão por Glicose Baixa</string>
     <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
     <string name="objectives_maxiob_objective">Ajustar o close loop, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de valor glicêmico</string>
-    <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de Glic baixa, antes de baixar Glic</string>
-    <string name="objectives_autosens_objective">Ajuste as basais e os rácios, se necessário, e, em seguida, active o auto-sens</string>
-    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
-    <string name="objectives_ama_objective">A activar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
-    <string name="objectives_smb_objective">Activando recursos adicionais para uso durante o dia, como SMB</string>
-    <string name="objectives_auto_objective">A activar a automação</string>
-    <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
-    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de acção deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é accionada no momento certo substitua a notificação por acção real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
-    <string name="objectives_bgavailableinns">Glic disponível no NS</string>
-    <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
-    <string name="objectives_manualenacts">Execução manual</string>
     <string name="accomplished">Concluído: %1$s</string>
-    <string name="objectives_usage_objective">Aprenda como controlar AndroidAPS</string>
-    <string name="objectives_usage_gate">Executar diferentes acções no AndroidAPS</string>
-    <string name="objectives_useprofileswitch">Definir perfil de 90% por 10 min (pressione longo no nome de perfil na Visão Geral)</string>
-    <string name="objectives_usedisconnectpump">Simular chuveiro. Desligar a bomba de 1h (Pressione longo em Open Loop)</string>
-    <string name="objectives_usereconnectpump">... e volte a ligar de volta da mesma forma</string>
-    <string name="objectives_usetemptarget">Crie um alvo temporário personalizado com 10 min de duração (pressione longo no seu alvo actual)</string>
-    <string name="objectives_useactions">No Configurador active o plugiin de Acções, torne-o visível e exiba o seu conteúdo no menu superior</string>
-    <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
-    <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
-    <string name="objectives_button_enter">Inserir</string>
-    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objectivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
-    <string name="codeaccepted">Código aceite</string>
-    <string name="codeinvalid">Código inválido</string>
-    <string name="objectives_exam_objective">Prove seu conhecimento</string>
-    <string name="objectives_exam_gate">Estude e responda as perguntas correctamente</string>
-    <string name="answerdisabledto">Responder desactivado até: %1$s</string>
-    <string name="wronganswer">Resposta errada!</string>
-    <string name="unfinshed_button">Próximo inacabado</string>
-    <string name="requestcode">Pedir Código: %1$s</string>
-    <string name="objectives_hint">(marque todas as respostas correctas)</string>
-    <string name="disconnectpump_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath</string>
-    <string name="usetemptarget_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
-    <string name="useaction_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder</string>
-    <string name="usescale_hint" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen</string>
-    <string name="notconnected">Não está ligado à internet</string>
-    <string name="failedretrievetime">Falha ao recuperar tempo</string>
-    <string name="requirementnotmet">Requisitos de objectivo não cumpridos</string>
-    <plurals name="objective_days">
-        <item quantity="one">%1$d dia</item>
-        <item quantity="other">%1$d dias</item>
-    </plurals>
-    <plurals name="objective_hours">
-        <item quantity="one">%1$d hora</item>
-        <item quantity="other">%1$d horas</item>
-    </plurals>
-    <plurals name="objective_minutes">
-        <item quantity="one">%1$d minuto</item>
-        <item quantity="other">%1$d minutos</item>
-    </plurals>
+    <string name="objectives_usage_gate">Executar diferentes ações no AndroidAPS</string>
+    <string name="objectives_useactions">No Configurador ative o plugin de Ações, torne-o visível e exiba o seu conteúdo no menu superior</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objetivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
+    <string name="codeaccepted">Código aceito</string>
 </resources>

From 93ad224fc83804c4b9d1ef4ff19d9a0791706667 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:42:27 +0200
Subject: [PATCH 236/400] New translations strings.xml (Portuguese, Brazilian)

---
 dana/src/main/res/values-pt-rBR/strings.xml | 121 +-------------------
 1 file changed, 2 insertions(+), 119 deletions(-)

diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index 2a9b392910..0627cc71b8 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -1,122 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="danars_pairing">A Emparelhar</string>
-    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
-    <string name="danars_pairingok">Emparelhamento OK</string>
-    <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
-    <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
-    <string name="danarspump">DanaRS</string>
-    <string name="danarspump_shortname">Dana</string>
-    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
-    <string name="maxbolusviolation">Transgressão Bólus máx</string>
-    <string name="commanderror">Erro no comando</string>
-    <string name="speederror">Erro velocidade</string>
-    <string name="insulinlimitviolation">Transgressão limite insulina</string>
-    <string name="boluserrorcode">Pedido: %1$.2fU Administrado: %2$.2fU Código Erro: %3$s</string>
-    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
-    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
-    <string name="resetpairing">Repor as informações de emparelhamento?</string>
-    <string name="dana_model">%1$s\nModelo: %2$02X\nProtocolo: %3$02X\nCódigo: %4$02X</string>
-    <string name="processinghistory">A processar acção</string>
-    <string name="danar_enableextendedbolus">Habilitar bólus prolongado na bomba</string>
-    <string name="overview_bolusprogress_delivered">Administrado</string>
-    <string name="overview_bolusprogress_stoped">Parado</string>
-    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
-    <string name="pumperror">Erro Bomba</string>
-    <string name="lowbattery">Bateria fraca</string>
-    <string name="basalcompare">A administrar menos que a taxa de base predefinida</string>
-    <string name="pumpshutdown">Encerrar Bomba</string>
-    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
-    <string name="occlusion">Oclusão</string>
-    <string name="emptyreservoir">Reservatório vazio</string>
-    <string name="checkshaft">Verificar Eixo</string>
-    <string name="basalmax">Máx Basal</string>
-    <string name="dailymax">Máx Diário</string>
-    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
-    <string name="remaininsulinalert">Nível de insulina restante</string>
-    <string name="missedbolus">Bólus não administrado</string>
-    <string name="invalidpairing">Informações de emparelhamento inválidas. A solicitar novo emparelhamento</string>
-    <string name="gettingpumpstatus">A obter estado bomba</string>
-    <string name="gettingextendedbolusstatus">A procurar o estado do bólus prolongado</string>
-    <string name="gettingbolusstatus">A obter estado bólus</string>
-    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
-    <string name="gettingpumpsettings">A obter as definições da bomba</string>
-    <string name="gettingpumptime">A obter hora bomba</string>
-    <string name="largetimedifftitle">Grande diferença Horária</string>
-    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de acção da insulina (DIA) depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correcção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
-    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
-    <string name="approachingdailylimit">Aproximação do limite diário de insulina</string>
-    <string name="startingbolus">A iniciar administração de bólus</string>
-    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d seg.</string>
-    <string name="stoppingtempbasal">A parar basal temp</string>
-    <string name="settingextendedbolus">A configurar bólus prolongado</string>
-    <string name="stoppingextendedbolus">A parar bólus prolongado</string>
-    <string name="updatingbasalrates">A actualizar taxas das basais</string>
-    <string name="settingtempbasal">Definindo basal temp</string>
-    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
-    <string name="wrongpassword">Senha incorrecta</string>
-    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
-    <string name="danar_history_alarm">Alarmes</string>
-    <string name="danar_history_basalhours">Horas de Basal</string>
-    <string name="danar_history_bolus">Bólus</string>
-    <string name="danar_history_carbohydrates">Hidratos de Carbono</string>
-    <string name="danar_history_dailyinsulin">Insulina diária</string>
-    <string name="danar_history_errors">Erros</string>
-    <string name="danar_history_glucose">Glicose</string>
-    <string name="danar_history_refill">Encher</string>
-    <string name="danar_history_syspend">Suspender</string>
-    <string name="danar_history_prime">Purgar</string>
-    <string name="danar_useroptions">Opções do utilizador</string>
-    <string name="danar_timedisplay">Formato hora</string>
-    <string name="danar_buttonscroll">Botão rolamento</string>
-    <string name="danar_beep">Sinal ao pressionar botão</string>
-    <string name="danar_pumpalarm">Alarme</string>
-    <string name="danar_pumpalarm_sound">Som</string>
-    <string name="danar_pumpalarm_vibrate">Vibrar</string>
-    <string name="danar_pumpalarm_both">Ambos</string>
-    <string name="danar_screentimeout">LCD na hora [segundos]</string>
-    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
-    <string name="danar_glucoseunits">Unidades de Glicose</string>
-    <string name="danar_shutdown">Desligar [horas]</string>
-    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
-    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
-    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
-    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
-    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware actualizado</string>
-    <string name="danarpump_shortname">DANA</string>
-    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
-    <string name="devicenotfound">Dispositivo seleccionado não foi encontrado</string>
-    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
-    <string name="danarkoreanpump">DanaR Coreana</string>
-    <string name="danarpump">DanaR</string>
-    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
-    <string name="danarv2pump">DanaRv2</string>
-    <string name="danar_disableeasymode">Desactivar modo EasyUI na bomba</string>
-    <string name="profile_set_failed">Não foi possível configurar o perfil de basal</string>
-    <string name="danar_bluetooth_status">Estado Bluetooth</string>
-    <string name="danar_iob_label">IOB Bomba</string>
-    <string name="basal_step">Incremento Basal</string>
-    <string name="bolus_step">Incremento Bólus</string>
-    <string name="virtualpump_firmware_label">Firmware</string>
-    <string name="danar_pump_settings">Configurações da bomba Dana</string>
-    <string name="timeformat12h">12h</string>
-    <string name="timeformat24h">24h</string>
-    <string name="option_on">Ligado</string>
-    <string name="option_off">Desligado</string>
-    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
-    <string name="danars_password_title">Senha da bomba (apenas v1)</string>
-    <string name="danar_password_title">Senha da bomba</string>
-    <string name="danar_useextended_title">Usar bólus prolongado por &gt;200%%</string>
-    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
-    <string name="bolusspeed">Velocidade Bólus</string>
-    <string name="selectedpump">Bomba seleccionada</string>
-    <string name="rs_loginsulinchange_title">Registar mudança de reservatório</string>
-    <string name="rs_loginsulinchange_summary">Adicionar evento \"Mudança de Insulina\" ao careportal quando detectado no histórico</string>
-    <string name="rs_logcanulachange_title">Registar mudança de canula</string>
-    <string name="rs_logcanulachange_summary">Adicionar evento \"Mudança Local Bomba\" ao careportal, quando detectado no histórico</string>
-    <string name="pin1">PIN1</string>
-    <string name="pin2">PIN2</string>
-    <string name="press_ok_on_the_pump">Pressione OK na bomba\ne digite os 2 números mostrados\nManter o visor da bomba ligado, pressionando o botão menos até que você termine a digitação do código.</string>
-    <string name="num1pin">1: (12 dígitos)</string>
-    <string name="num2pin">2: (8 dígitos)</string>
+    <string name="processinghistory">Processando ação</string>
+    <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de ação da insulina DIA depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
 </resources>

From b8b78718fe3f493695e128dd6516c1bec03968f2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:42:28 +0200
Subject: [PATCH 237/400] New translations strings.xml (Portuguese, Brazilian)

---
 wear/src/main/res/values-pt-rBR/strings.xml | 107 +-------------------
 1 file changed, 1 insertion(+), 106 deletions(-)

diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index 28339639d6..b5fdd0af83 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -1,109 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">AAPS</string>
-    <string name="label_actions_activity">AAPS</string>
-    <string name="label_xdrip">AAPS</string>
-    <string name="label_xdrip_large">AAPS(Grande)</string>
-    <string name="label_xdrip_big_chart">AAPS(GrafGrande)</string>
-    <string name="label_xdrip_no_chart">AAPS(SemGraf)</string>
-    <string name="label_xdrip_circle">AAPS(Círculo)</string>
-    <string name="label_xdrip_v2">AAPSv2</string>
-    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
-    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
-    <string name="label_warning_sync">Sem dados!</string>
-    <string name="label_warning_old">Dados antigos!</string>
-    <string name="label_warning_since">Desde %1$s</string>
-    <string name="label_warning_sync_aaps">Sincronizar com AAPS!</string>
-    <string name="msg_warning_sync">Nenhum dado recebido desde %1$s! Confira se o AAPS no telefone envia dados para o relógio</string>
-    <string name="msg_warning_old">Dados AAPS são %1$s antigos! Verifique sensor, xDrip+, NS, configuração AAPS ou outra!</string>
-    <string name="pref_on">Lig.</string>
-    <string name="pref_off">Desl.</string>
-    <string name="pref_vibrate_on_bolus">Vibrar no Bólus</string>
-    <string name="pref_units_for_actions">Unidades para Acções</string>
-    <string name="pref_show_date">Mostrar Data</string>
-    <string name="pref_show_iob">Mostrar IOB</string>
-    <string name="pref_show_cob">Mostrar COB</string>
-    <string name="pref_show_delta">Mostrar Delta</string>
-    <string name="pref_show_avgdelta">Mostrar MedDelta</string>
-    <string name="pref_show_phone_battery">Mostrar Bateria Telefone</string>
-    <string name="pref_show_rig_battery">Mostrar Bateria Equipamento</string>
-    <string name="pref_show_basal_rate">Mostrar Taxa Basal</string>
-    <string name="pref_show_loop_status">Mostrar Estado Loop</string>
-    <string name="pref_show_bg">Mostrar Glic.</string>
-    <string name="pref_show_direction_arrow">Mostrar Seta Direcção</string>
-    <string name="pref_show_ago">Mostrar Atrás</string>
-    <string name="pref_dark" comment="Enables dark visual theme">Escuro</string>
-    <string name="pref_highlight_basals">Destacar Basais</string>
-    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Divisor correspondente</string>
-    <string name="pref_chart_timeframe">Cronograma do Gráfico</string>
-    <string name="pref_1_hour">1 hora</string>
-    <string name="pref_2_hours">2 horas</string>
-    <string name="pref_3_hours">3 horas</string>
-    <string name="pref_4_hours">4 horas</string>
-    <string name="pref_5_hours">5 horas</string>
-    <string name="pref_input_design">Design de Entrada</string>
-    <string name="pref_default">Padrão</string>
-    <string name="pref_quick_righty">Rápido Direito</string>
-    <string name="pref_quick_lefty">Rápido Esquerdo</string>
-    <string name="pref_modern_sparse">Moderno Esparso</string>
-    <string name="pref_delta_granularity">Delta Granularidade (Steampunk)</string>
-    <string name="pref_low">Baixo</string>
-    <string name="pref_medium">Médio</string>
-    <string name="pref_high">Alto</string>
-    <string name="pref_auto">Auto</string>
-    <string name="pref_big_numbers">Números Grandes</string>
-    <string name="pref_ring_history">Anel Histórico</string>
-    <string name="pref_light_ring_history">Anel Suave Histórico</string>
-    <string name="pref_animations">Animações</string>
-    <string name="pref_wizard_in_menu">Assistente no Menu</string>
-    <string name="pref_prime_in_menu">Purgar no Menu</string>
-    <string name="pref_single_target">Alvo Único</string>
-    <string name="pref_wizard_percentage">Assistente Percentagem</string>
-    <string name="pref_complication_tap_action">Complicação de Toque</string>
-    <string name="pref_unicode_in_complications">Unicode em Complicações</string>
-    <string name="pref_version">Versão:</string>
-    <string name="menu_tempt">AlvoT</string>
-    <string name="menu_wizard">Assistente</string>
-    <string name="menu_bolus">Bólus</string>
-    <string name="menu_ecarb">eCarb</string>
-    <string name="menu_settings">Definições</string>
-    <string name="menu_status">Estado</string>
-    <string name="menu_prime_fill">Purgar/Preencher</string>
-    <string name="menu_none">Nenhum</string>
-    <string name="menu_default">Padrão</string>
-    <string name="menu_menu">Menu</string>
-    <string name="action_duration">duração</string>
-    <string name="action_target" comment="In temp target menu, single target value">alvo</string>
-    <string name="action_low" comment="In temp target menu, lower value from range">hipo</string>
-    <string name="action_high" comment="In temp target menu, higher value from range">hiper</string>
-    <string name="action_carbs">hidratos</string>
-    <string name="action_percentage">percentagem</string>
-    <string name="action_start_min">iniciar [min]</string>
-    <string name="action_duration_h">duração [h]</string>
-    <string name="action_insulin">insulina</string>
-    <string name="action_preset_1">Predefinição 1</string>
-    <string name="action_preset_2">Predefinição 2</string>
-    <string name="action_preset_3">Predefinição 3</string>
-    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Valor livre</string>
-    <string name="action_confirm">CONFIRMAR</string>
-    <string name="action_status_pump">ESTADO BOMBA</string>
-    <string name="action_status_loop">ESTADO LOOP</string>
-    <string name="action_timeshift">alteração turno</string>
-    <string name="action_tdd_weighted">TDD ponderada</string>
-    <string name="action_bolus">bólus</string>
-    <string name="status_pump">Bomba</string>
-    <string name="status_loop">Loop</string>
-    <string name="status_cpp">CPP</string>
-    <string name="status_tdd">TDD</string>
-    <string name="activity_carb">Hidratos</string>
-    <string name="activity_IOB">IOB</string>
-    <string name="activity_no_status">sem estado</string>
-    <string name="unit_mg_dl">mg/dL</string>
-    <string name="unit_mmol_l">mmol/L</string>
-    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
-    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
-    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
-    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
-    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
-    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
+    <string name="pref_units_for_actions">Unidades para Ações</string>
 </resources>

From bbda6e0698c64cd4f84231e30bce8978cc5ca2bd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 03:52:30 +0200
Subject: [PATCH 238/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6e2e41ade7..dc8bfc2b44 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -471,7 +471,7 @@
     <string name="shortenergy">En</string>
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Gor</string>
-    <string name="active"><![CDATA[<Activo>]]></string>
+    <string name="active"><![CDATA[<Ativo>]]></string>
     <string name="executingrightnow">Comando será executado agora</string>
     <string name="pump_unreachable">Bomba inacessível</string>
     <string name="missed_bg_readings">Leituras Glic. perdidas</string>
@@ -1034,13 +1034,13 @@
     <string name="medtronic_history_group_all">Tudo</string>
     <string name="medtronic_pump_history">Histórico da Bomba Medtronic</string>
     <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nunca contactado</string>
+    <string name="medtronic_pump_status_never_contacted">Nunca contatado</string>
     <string name="medtronic_pump_status_waking_up">A acordar</string>
     <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
     <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
     <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
     <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
-    <string name="medtronic_pump_status_active">Activo</string>
+    <string name="medtronic_pump_status_active">Ativo</string>
     <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
@@ -1094,6 +1094,7 @@
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desativado Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
 </resources>

From 4b478a3fc7aea8b21bf8328dd9081cd3d4cca190 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:02:56 +0200
Subject: [PATCH 239/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index dc8bfc2b44..73c9c104c4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">Arquivo não encontrado</string>
     <string name="nav_export">Exportar configurações</string>
     <string name="nav_import">Importar configurações</string>
+    <string name="openapsma_maxbasal_title">Max U/h em que uma Basal temporária pode ser definida</string>
     <string name="openapsma_maxbasal_summary">Este valor é chamado max basal no contexto do OpenAPS</string>
     <string name="openapsma_maxiob_title">Basal Máxima IOB que OpenAPS pode dar [U]</string>
     <string name="openapsma_maxiob_summary">Este valor é denominado Max IOB em contexto OpenAPS \nEste é o valor máximo de insulina em [U] que APS pode dar de uma vez.</string>
@@ -245,6 +246,7 @@
     <string name="primefill">Purgar/Preencher</string>
     <string name="fillwarning">Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão!</string>
     <string name="othersettings_title">Outro</string>
+    <string name="fillbolus_title">Purgar/Preencher os valores padrões</string>
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
@@ -300,9 +302,10 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objetivo é evitar que sejam determinadas basais temporárias muito elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança.</string>
     <string name="openapsama_autosens_max_summary">Valor predefinido: 1.2\n Este é um multiplicador para autosens (e em breve autotune) que coloca um limite máximo de 20%% aos rácios superiores e inferiores de autosens, o que por sua vez calcula o quão alto autosens pode ajustar a basal, quão pode baixar o Factor de Sensibilidade (FSI) e baixar o valor alvo de glicose no sangue.</string>
     <string name="openapsama_autosens_min_summary">Valor padrão: 0.7\nO outro lado dos limites de segurança do autosens. Coloca um tecto no quão baixo autosens pode ajustar as basais, e quão alto pode ajustar os valores de ISF e valor alvo de glucose no sangue (BG).</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens também ajusta os alvos</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valor padrão: true\nÉ usado para permitir que autosens possa ajustar os valores alvo de glucose no sangue (BG), além de ISF e basais.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valor padrão: 2\nBolus Snooze (pausa após bolus) é executado depois de realizar um bolus por refeição Desta maneira o algoritmo não irá contrariar com temporárias baixas logo depois da refeição. O valor padrão é 2; Então uma duração de ação da insulina (DIA) de 5h significa que o Bolus Snooze irá ser gradualmente reduzido ao longo de 2,5 horas = 5/2 = DIA/Valor padrão.</string>
-    <string name="openapsama_min_5m_carbimpact_summary">Valor padrão: 3.0 para detecção avançada de refeições (AMA) ou 8.0 para super micro bolus (SMB). Esta é a configuração padrão para o calculo de quanto varia a cada 5 min a glucose no sangue (BG)  devido à absorção de hidratos de carbono. O padrão é  3mg/ dl / 5min. Isso afeta a rapidez com que decaem as calorias no corpo (COB), e quantos hidratos de carbono terão de ser considerados no cálculo da previsão de BG, quando é que a BG está baixando mais do que espectável ou não subindo como espectável.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Valor padrão: 3.0 para detecção avançada de refeições (AMA) ou 8.0 para super micro bolus (SMB). Esta é a configuração padrão para o calculo de quanto varia a cada 5 min a glucose no sangue (BG)  devido à absorção de carboidratos. O padrão é  3mg/ dl / 5min. Isso afeta a rapidez com que decaem as calorias no corpo (COB), e quantos carboidratos terão de ser considerados no cálculo da previsão de BG, quando é que a BG está baixando mais do que o esperado ou não subindo como esperado.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Atenção!\n Normalmente não é necessário modificar os valores abaixo. Por favor PRESSIONE AQUI e LEIA o texto para garantir que ENTENDE as consequenciais antes de alterar algum destes valores.</string>
     <string name="smscommunicator_invalidphonennumber">SMS número de telefone inválido</string>
     <string name="overview_calibration">Calibração</string>

From 0b8785f33f6eea79517136598af9aa22544e7cc3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:02:57 +0200
Subject: [PATCH 240/400] New translations exam.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/exam.xml | 76 +++----------------------
 1 file changed, 7 insertions(+), 69 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml
index d0abb5b77c..c964bdef28 100644
--- a/app/src/main/res/values-pt-rBR/exam.xml
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@@ -1,66 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">O que é verdade sobre o DIA?</string>
+    <string name="dia_label_exam">Tópico: Duração da Ação de Insulina</string>
     <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
     <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
-    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
     <string name="dia_meaningisequaltodiapump">O significado é igual ao parâmetro DIA usado na bomba.</string>
     <string name="dia_valuemustbedetermined">Você tem que determinar o seu valor individual (mas não menos de 5 horas).</string>
     <string name="hypott_label">Tópico: Hipo Temp-Alvo</string>
-    <string name="hypott_whenhypott">O que é a razão principal para definir TT hipoglicemia?</string>
-    <string name="hypott_goinglow">Para evitar que a Glic fique baixa se já estiver em funcionamento um temp zero.</string>
-    <string name="hypott_preventoversmb">Para evitar o AAPS dosear demasiada insulina após uma subida rápida causada por hidratos de actuação rápida para tratar hipoglicemia.</string>
-    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
+    <string name="hypott_whenhypott">Qual é a razão principal para definir TT hipoglicemia?</string>
+    <string name="hypott_goinglow">Para evitar que a glicose fique baixa se já estiver em funcionamento um temp zero.</string>
+    <string name="hypott_preventoversmb">Para evitar o AAPS dose muita insulina após uma subida rápida causada por carboidratos de atuação rápida para tratar hipoglicemia.</string>
     <string name="offlineprofile_whatprofile">Qual perfil pode ser usado e configurado offline?</string>
     <string name="offlineprofile_label">Tópico: Perfil Offline</string>
     <string name="offlineprofile_nsprofile">Perfil NS pode ser usado, mas não configurado.</string>
-    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Tópico: Desconectando-se da bomba</string>
     <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
-    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina está a ser administrada.</string>
+    <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina será entregue.</string>
     <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
     <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
-    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">Tópico: Configurações do AndroidAPS</string>
     <string name="objectives_howtosave">Quais são as melhores práticas para fazer backup de suas configurações?</string>
     <string name="objectives_exportsettings">Exporte-as localmente do menu Manutenção.</string>
     <string name="objectives_storeelsewhere">Salve o arquivo exportado para outro local como e-mail, Dropbox, Google drive…</string>
     <string name="objectives_doexportonstart">Exporte-as logo após a instalação do AAPS.</string>
     <string name="objectives_doexportafterchange">Exportá-los depois de fazer alterações de configuração.</string>
-    <string name="objectives_doexportafterobjective">Exportá-los depois de completar um objectivo.</string>
+    <string name="objectives_doexportafterobjective">Exportá-los depois de completar um objetivo.</string>
     <string name="objectives_doexportafterfirtssettings">Exporte-as quando concluir as configurações iniciais.</string>
-    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
-    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
     <string name="noisycgm_label">Tópico: Leituras do CGM imprecisas</string>
     <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
     <string name="nothing">Nada, AAPS vai lidar com isso.</string>
-    <string name="noisycgm_pause">Desactivar o loop para evitar sobredosagem.</string>
+    <string name="noisycgm_pause">Desativar o loop para evitar sobredosagem.</string>
     <string name="noisycgm_replacesensor">Substitua o sensor CGM.</string>
     <string name="noisycgm_turnoffphone">Desligue o telefone.</string>
-    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verifique que a app do CGM suaviza os dados da Glicose.</string>
     <string name="exercise_label">Tópico: Exercício</string>
     <string name="exercise_whattodo">Como você pode ajudar o sistema a lidar com exercícios?</string>
-    <string name="exercise_setactivitytt">Usando o recurso de alvo-temp.</string>
     <string name="exercise_switchprofilebelow100">Faça um mudança de perfil abaixo de 100%.</string>
     <string name="exercise_switchprofileabove100">Fazer uma mudança de perfil acima de 100%.</string>
     <string name="exercise_stoploop">Pare o loop.</string>
-    <string name="exercise_doitbeforestart">Definir um alvo-temp de actividade antes de iniciar o exercício.</string>
-    <string name="exercise_afterstart">Definir um alvo-temp de actividade após iniciar o exercício leva a resultados piores do que se iniciado antes.</string>
-    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="suspendloop_label">Tópico: Loop Desactivado/Suspenso</string>
-    <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desactivado/suspenso?</string>
-    <string name="suspendloop_yes">Sim, a insulina basal continua a ser administrada.</string>
     <string name="suspendloop_no">Não, a entrega da insulina está parada.</string>
     <string name="basaltest_label">Tópico: Testando Basal, ISF e IC</string>
     <string name="basaltest_when">Quando devo validar os valores de basal, ISF e IC?</string>
     <string name="basaltest_beforeloop">Antes de começar com o loop.</string>
-    <string name="basaltest_havingregularhypo">Quando ocorrer frequentemente Glic baixa.</string>
-    <string name="basaltest_havingregularhyper">Quando ocorrer frequentemente Glic alta.</string>
-    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
     <string name="prerequisites_label">Tópico: Pré-requisitos</string>
     <string name="prerequisites_what">O que eu preciso?</string>
-    <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FSI, DIA).</string>
     <string name="prerequisites_computer">Um computador para criar um APK.</string>
     <string name="prerequisites_phone">Um telefone compatível.</string>
     <string name="prerequisites_car">Um carro.</string>
@@ -68,51 +51,29 @@
     <string name="prerequisites_tidepoolaccount">Uma conta do Tidepool.</string>
     <string name="prerequisites_googleaccount">Uma conta Google.</string>
     <string name="prerequisites_githubaccount">Uma conta do Github.</string>
-    <string name="prerequisites_beanandroiddeveloper">Experiência de desenvolvimento Android.</string>
     <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
-    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Um Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Um CGM compatível.</string>
-    <string name="update_label">Tópico: Actualização do AndroidAPS</string>
     <string name="whatistrue">O que é verdade?</string>
     <string name="update_git">Você precisa ter o Git instalado.</string>
-    <string name="update_asap">Actualizar assim que nova versão for lançada e tiver tempo suficiente para fazer isso.</string>
-    <string name="update_keys">Você deve utilizar as mesmas chaves de assinatura.</string>
     <string name="update_neverupdate">Nunca atualize se o sistema estiver funcionando bem.</string>
     <string name="update_askfriend">Peça ao seu amigo para a nova APK.</string>
-    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
     <string name="troubleshooting_label">Tópico: Resolução de Problemas</string>
     <string name="troubleshooting_wheretoask">Onde procurar ajuda?</string>
     <string name="troubleshooting_fb">Entrar no grupo AndroidAPS do Facebook.</string>
-    <string name="troubleshooting_wiki">Leia a documentação do AndroidAPS.</string>
     <string name="troubleshooting_gitter">Visite a sala do AndroidAPS no Gitter.</string>
     <string name="troubleshooting_googlesupport">Visite o suporte do Google para o AndroidAPS</string>
     <string name="troubleshooting_yourendo">Fale com seu endocrinologista.</string>
-    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
-    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
-    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Tópico: Plugins de Insulina</string>
-    <string name="insulin_ultrarapid">Qual marca de insulina pode ser usada com o plugin \'Ultra-Rapid-Oref\'?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid ®</string>
     <string name="insulin_humalog">Humalog ®</string>
     <string name="insulin_actrapid">Actrapid ®</string>
-    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
-    <string name="sensitivity_which">Qual algoritmo de sensibilidade tem um intervalo de tempo configurável?</string>
-    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="sensitivityuam_which">Qual plugin de sensibilidade deve ser usado para o recurso UAM?</string>
-    <string name="wrongcarbs_label">Tópico: Erros de Entrada de Hidratos</string>
-    <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorrecta de hidratos?</string>
-    <string name="wrongcarbs_treatmentstab">Em Tratamentos, excluir a entrada incorrecta de hidratos. Insira novos hidratos.</string>
     <string name="wrongcarbs_addfakeinsulin">Adicionar falsa insulina usando a função de Refill</string>
     <string name="extendedcarbs_label">Tópico: Alimentos com Gordura e Proteína</string>
     <string name="extendedcarbs_handling">O que fazer se sua comida contiver uma grande quantidade de gordura e/ou proteínas?</string>
     <string name="extendedcarbs_useextendedcarbs">Recalcule gordura e proteínas para carboidrato e use o recurso \"Carbs estentido\".</string>
     <string name="extendedcarbs_add">Recalcular gordura e proteínas em carboidrato e adicioná-lo ao cálculo de bolus.</string>
     <string name="extendedcarbs_useextendedbolus">Use o bolus estendido para cobrir gordura e proteínas.</string>
-    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Tópico: Monitorização Remota</string>
     <string name="nsclient_howcanyou">Como você pode monitorar AAPS da sua criança remotamente?</string>
     <string name="nsclient_nightscout">Usando o site do Nightscout.</string>
     <string name="nsclient_dexcomfollow">Dexcom Follow app se você estiver usando o aplicativo Dexcom original(apenas Glicemia).</string>
@@ -120,46 +81,23 @@
     <string name="nsclient_xdripfollower">xDrip rodando no modo follower.</string>
     <string name="nsclient_looponiphone">Aplicativo Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">Aplicativo Spike no iPhone.</string>
-    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma administração de menos insulina quando o AAPS corrige Glic alta.</string>
-    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina administrada quando a AAPS corrige Glic alta.</string>
     <string name="isf_preferences">Você precisa inserir o ISF nas Preferências.</string>
     <string name="isf_profile">Alterar o valor do ISF no seu perfil é o suficiente para aplicar a alteração.</string>
-    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
-    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
-    <string name="ic_increasingvalue">Rácios IC mais altos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
-    <string name="ic_decreasingvalue">Rácios IC mais baixos levam a menos insulina administrada para uma dada quantidade de hidratos.</string>
-    <string name="ic_noeffect">Se tiver 0 COB, alterar o rácio IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da Glic.</string>
     <string name="ic_different">O IC será diferente se você contar a unidade de pão como 10g ou 12g.</string>
     <string name="ic_meaning">O significado do IC é: Quantos pães são cobertas por 1U de insulina.</string>
-    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Tópico: Alternando Perfil</string>
-    <string name="profileswitch_pctwillchange"> Ao especificar 90% na mudança de perfil…</string>
     <string name="profileswitch_basalhigher">Os basais serão 10% maiores.</string>
     <string name="profileswitch_basallower">Os basais serão 10% menores.</string>
     <string name="profileswitch_ichigher">O valor do IC será 10% maior.</string>
     <string name="profileswitch_iclower">O valor do IC será 10% menor.</string>
     <string name="profileswitch_isfhigher">O valor do ISF será 10% maior.</string>
     <string name="profileswitch_isflower">O valor do ISF será 10% menor.</string>
-    <string name="profileswitch_overall">Você receberá aproximadamente 10% menos insulina no total.</string>
     <string name="profileswitch_targethigher">O alvo será 10% maior.</string>
     <string name="profileswitch_targetlower">O alvo será 10% menor.</string>
     <string name="profileswitch_targetbottom">Só o alvo inferior será 10% menor.</string>
-    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
-    <string name="profileswitchtime_iwant">Se acordar 1h mais cedo do que o normal, como deve notificar a AAPS da mudança no seu horário?</string>
-    <string name="profileswitchtime_1">Iniciar uma mudança de perfil com uma alteração de turno de 1</string>
-    <string name="profileswitchtime__1">Iniciar uma mudança de perfil com uma alteração de turno de -1</string>
-    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
-    <string name="profileswitchtime_60">Iniciar uma mudança de perfil com uma alteração de turno de 60</string>
-    <string name="profileswitchtime__60">Iniciar uma mudança de perfil com uma alteração de turno de -60</string>
-    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Tópico: Ajuda com taxas basais</string>
     <string name="basalhelp_where">Onde procurar ajuda para taxas basais e etc.</string>
     <string name="basalhelp_diabetesteam">Sua equipe de diabetes</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
-    <string name="other_medication_label">Outra Medicação</string>
-    <string name="other_medication_text">AAPS reduz Basal para aumentar o açúcar no sangue. As drogas do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da Glic e, assim, podem produzir uma deficiência de insulina perigosa (DKA).
-\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nPrometo que não vou tomar tais drogas ao usar o AAPS ou vou desactivar o loop antes de usar essas drogas.</string>
 </resources>

From ce49dd342df8ca627a352b59a60eaeef1cc49460 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:12:26 +0200
Subject: [PATCH 241/400] New translations exam.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/exam.xml | 44 +++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml
index c964bdef28..091f47ec20 100644
--- a/app/src/main/res/values-pt-rBR/exam.xml
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@@ -35,15 +35,25 @@
     <string name="noisycgm_checksmoothing">Verifique que a app do CGM suaviza os dados da Glicose.</string>
     <string name="exercise_label">Tópico: Exercício</string>
     <string name="exercise_whattodo">Como você pode ajudar o sistema a lidar com exercícios?</string>
+    <string name="exercise_setactivitytt">Usando o recurso de alvo-temp.</string>
     <string name="exercise_switchprofilebelow100">Faça um mudança de perfil abaixo de 100%.</string>
     <string name="exercise_switchprofileabove100">Fazer uma mudança de perfil acima de 100%.</string>
     <string name="exercise_stoploop">Pare o loop.</string>
+    <string name="exercise_doitbeforestart">Definir um alvo-temp de atividade antes de iniciar o exercício.</string>
+    <string name="exercise_afterstart">Definir um alvo-temp de atividade após iniciar o exercício leva a resultados piores do que se iniciado antes.</string>
+    <string name="suspendloop_label">Tópico: Loop Desativado/Suspenso</string>
+    <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desativado/suspenso?</string>
+    <string name="suspendloop_yes">Sim, a insulina basal continua a ser entregue.</string>
     <string name="suspendloop_no">Não, a entrega da insulina está parada.</string>
     <string name="basaltest_label">Tópico: Testando Basal, ISF e IC</string>
     <string name="basaltest_when">Quando devo validar os valores de basal, ISF e IC?</string>
     <string name="basaltest_beforeloop">Antes de começar com o loop.</string>
+    <string name="basaltest_havingregularhypo">Quando ocorrer frequentemente glicemia baixa.</string>
+    <string name="basaltest_havingregularhyper">Quando ocorrer frequentemente glicemia alta.</string>
+    <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
     <string name="prerequisites_label">Tópico: Pré-requisitos</string>
     <string name="prerequisites_what">O que eu preciso?</string>
+    <string name="prerequisites_determinedcorrectprofile">Informações do perfil validadas (Basal, IC, FSI, DIA).</string>
     <string name="prerequisites_computer">Um computador para criar um APK.</string>
     <string name="prerequisites_phone">Um telefone compatível.</string>
     <string name="prerequisites_car">Um carro.</string>
@@ -51,29 +61,46 @@
     <string name="prerequisites_tidepoolaccount">Uma conta do Tidepool.</string>
     <string name="prerequisites_googleaccount">Uma conta Google.</string>
     <string name="prerequisites_githubaccount">Uma conta do Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiência de desenvolvimento Android.</string>
     <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
     <string name="prerequisites_smartwatch">Um Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Um CGM compatível.</string>
+    <string name="update_label">Tópico: Atualização do AndroidAPS</string>
     <string name="whatistrue">O que é verdade?</string>
     <string name="update_git">Você precisa ter o Git instalado.</string>
+    <string name="update_asap">Atualizar assim que nova versão for lançada e tiver tempo suficiente para fazer isso.</string>
+    <string name="update_keys">Você deve utilizar as mesmas chaves de assinatura.</string>
     <string name="update_neverupdate">Nunca atualize se o sistema estiver funcionando bem.</string>
     <string name="update_askfriend">Peça ao seu amigo para a nova APK.</string>
     <string name="troubleshooting_label">Tópico: Resolução de Problemas</string>
     <string name="troubleshooting_wheretoask">Onde procurar ajuda?</string>
     <string name="troubleshooting_fb">Entrar no grupo AndroidAPS do Facebook.</string>
+    <string name="troubleshooting_wiki">Leia a documentação do AndroidAPS.</string>
     <string name="troubleshooting_gitter">Visite a sala do AndroidAPS no Gitter.</string>
     <string name="troubleshooting_googlesupport">Visite o suporte do Google para o AndroidAPS</string>
     <string name="troubleshooting_yourendo">Fale com seu endocrinologista.</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Tópico: Plugins de Insulina</string>
+    <string name="insulin_ultrarapid">Qual marca de insulina pode ser usada com o plugin \'Ultra-Rapid-Oref\'?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid ®</string>
     <string name="insulin_humalog">Humalog ®</string>
     <string name="insulin_actrapid">Actrapid ®</string>
+    <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
+    <string name="sensitivity_which">Qual algoritmo de sensibilidade tem um intervalo de tempo configurável?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Qual plugin de sensibilidade deve ser usado para o recurso UAM?</string>
+    <string name="wrongcarbs_label">Tópico: Erros de Entrada de Carboidratos</string>
+    <string name="wrongcarbs_whattodo">O que deve fazer se tiver feito uma entrada incorrecta de carboidratos?</string>
+    <string name="wrongcarbs_treatmentstab">Em Tratamentos, excluir a entrada incorrecta de carboidratos. Insira novos carboidratos.</string>
     <string name="wrongcarbs_addfakeinsulin">Adicionar falsa insulina usando a função de Refill</string>
     <string name="extendedcarbs_label">Tópico: Alimentos com Gordura e Proteína</string>
     <string name="extendedcarbs_handling">O que fazer se sua comida contiver uma grande quantidade de gordura e/ou proteínas?</string>
     <string name="extendedcarbs_useextendedcarbs">Recalcule gordura e proteínas para carboidrato e use o recurso \"Carbs estentido\".</string>
     <string name="extendedcarbs_add">Recalcular gordura e proteínas em carboidrato e adicioná-lo ao cálculo de bolus.</string>
     <string name="extendedcarbs_useextendedbolus">Use o bolus estendido para cobrir gordura e proteínas.</string>
+    <string name="nsclient_label">Tópico: Monitorização Remota</string>
     <string name="nsclient_howcanyou">Como você pode monitorar AAPS da sua criança remotamente?</string>
     <string name="nsclient_nightscout">Usando o site do Nightscout.</string>
     <string name="nsclient_dexcomfollow">Dexcom Follow app se você estiver usando o aplicativo Dexcom original(apenas Glicemia).</string>
@@ -81,23 +108,40 @@
     <string name="nsclient_xdripfollower">xDrip rodando no modo follower.</string>
     <string name="nsclient_looponiphone">Aplicativo Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">Aplicativo Spike no iPhone.</string>
+    <string name="isf_label_exam">Tópico: Fator de Sensibilidade de Insulina</string>
+    <string name="isf_increasingvalue">Valores elevados de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
+    <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
+    <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina entregue quando a AAPS corrige glicemia alta.</string>
     <string name="isf_preferences">Você precisa inserir o ISF nas Preferências.</string>
     <string name="isf_profile">Alterar o valor do ISF no seu perfil é o suficiente para aplicar a alteração.</string>
+    <string name="ic_increasingvalue">Proporções IC mais altos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
+    <string name="ic_decreasingvalue">Proporções IC mais baixos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
+    <string name="ic_noeffect">Se tiver 0 COB, alterar a proporção IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da glicemia.</string>
     <string name="ic_different">O IC será diferente se você contar a unidade de pão como 10g ou 12g.</string>
     <string name="ic_meaning">O significado do IC é: Quantos pães são cobertas por 1U de insulina.</string>
     <string name="profileswitch_label">Tópico: Alternando Perfil</string>
+    <string name="profileswitch_pctwillchange"> Ao especificar 90% na mudança de perfil…</string>
     <string name="profileswitch_basalhigher">Os basais serão 10% maiores.</string>
     <string name="profileswitch_basallower">Os basais serão 10% menores.</string>
     <string name="profileswitch_ichigher">O valor do IC será 10% maior.</string>
     <string name="profileswitch_iclower">O valor do IC será 10% menor.</string>
     <string name="profileswitch_isfhigher">O valor do ISF será 10% maior.</string>
     <string name="profileswitch_isflower">O valor do ISF será 10% menor.</string>
+    <string name="profileswitch_overall">Você receberá aproximadamente 10% menos insulina no total.</string>
     <string name="profileswitch_targethigher">O alvo será 10% maior.</string>
     <string name="profileswitch_targetlower">O alvo será 10% menor.</string>
     <string name="profileswitch_targetbottom">Só o alvo inferior será 10% menor.</string>
+    <string name="profileswitchtime_iwant">Se acordar 1h mais cedo do que o normal, como deve notificar a AAPS da mudança no seu horário?</string>
+    <string name="profileswitchtime_1">Iniciar uma mudança de perfil com uma alteração de turno de 1</string>
+    <string name="profileswitchtime__1">Iniciar uma mudança de perfil com uma alteração de turno de -1</string>
+    <string name="profileswitchtime_60">Iniciar uma mudança de perfil com uma alteração de turno de 60</string>
+    <string name="profileswitchtime__60">Iniciar uma mudança de perfil com uma alteração de turno de -60</string>
     <string name="basalhelp_label">Tópico: Ajuda com taxas basais</string>
     <string name="basalhelp_where">Onde procurar ajuda para taxas basais e etc.</string>
     <string name="basalhelp_diabetesteam">Sua equipe de diabetes</string>
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Outra Medicação</string>
+    <string name="other_medication_text">AAPS reduz Basal para aumentar o açúcar no sangue. As drogas do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da glicose e, assim, podem produzir uma deficiência de insulina perigosa (DKA).
+\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nPrometo que não vou tomar tais drogas ao usar o AAPS ou vou desativar o loop antes de usar essas drogas.</string>
 </resources>

From 7df56225ad25f24fe607002651972c9fe9c6edd5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:12:27 +0200
Subject: [PATCH 242/400] New translations protection.xml (Portuguese,
 Brazilian)

---
 app/src/main/res/values-pt-rBR/protection.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/protection.xml b/app/src/main/res/values-pt-rBR/protection.xml
index 67ae6b40c1..0a2250f87a 100644
--- a/app/src/main/res/values-pt-rBR/protection.xml
+++ b/app/src/main/res/values-pt-rBR/protection.xml
@@ -2,22 +2,4 @@
 <resources>
     <string name="biometric_title">Autenticação necessária</string>
     <string name="biometric_description">Coloque o dedo sobre o leitor de impressões digitais para verificar a sua identidade</string>
-    <string name="settings_protection">Definições Protecção</string>
-    <string name="application_protection">Protecção Aplicação</string>
-    <string name="bolus_protection">Protecção Bólus</string>
-    <string name="master_password">Password Mestre</string>
-    <string name="settings_password">Definições Password</string>
-    <string name="application_password">Password Aplicação</string>
-    <string name="bolus_password">Password Bólus</string>
-    <string name="unlock_settings">Definições Desbloqueio</string>
-    <string name="biometric">Biométrico</string>
-    <string name="custom_password">Password Personalizada</string>
-    <string name="noprotection">Sem Protecção</string>
-    <string name="protection">Protecção</string>
-    <string name="master_password_missing">A Password Mestre não está definida!\n\nPor favor, configure Password Mestre em Preferências (%1$s &#8594; %2$s)</string>
-    <string name="password_set">Password foi definida!</string>
-    <string name="password_not_set">Password não foi definida</string>
-    <string name="password_not_changed">Password não foi alterada</string>
-    <string name="password_cleared">Password apagada!</string>
-    <string name="password_hint">Insira a password aqui</string>
 </resources>

From 2f1e51ffb625240e20795267897a22e3a7dcb1ce Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:22:30 +0200
Subject: [PATCH 243/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 73c9c104c4..d0d12671fb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -177,10 +177,35 @@
     <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
     <string name="check_preferences_dangerous_import">As preferências não devem ser importadas!</string>
     <string name="check_preferences_details_btn">Explicar problemas de importação…</string>
+    <string name="check_preferences_details_title">Detalhes de problemas de importação</string>
+    <string name="check_preferences_import_btn">Importar</string>
+    <string name="check_preferences_import_anyway_btn">Importar mesmo assim (PERIGOSO!)</string>
     <string name="metadata_warning_different_flavour">As preferências foram criadas com uma variante diferente do AAPS (%1$s) enquanto tem: %2$s.\n\nAlgumas configurações podem estar ausentes ou inválidas - após a importação, por favor verifique e atualize suas preferências.</string>
+    <string name="metadata_warning_different_device">Preferências foram criadas num dispositivo diferente. Não há problema se estiver a importar de telefone diferente/antigo, mas se certifique que as preferências importadas estão corretas!</string>
     <string name="metadata_warning_outdated_format">Você está usando o formato de legado desatualizado a partir de versões antigas da AAPS, que não é seguro! Use apenas como último recurso, se você não tiver uma exportação em formato atual, JSON.</string>
     <string name="metadata_warning_old_export">As preferências importadas já têm %1$s dias de idade! Talvez você tenha preferências mais atualizadas ou escolha o arquivo errado? Lembre-se de exportar preferências regularmente!</string>
+    <string name="metadata_warning_date_format">Formato de data-hora inválido!</string>
+    <string name="metadata_label_format">Formato do arquivo</string>
+    <string name="metadata_label_created_at">Criado em</string>
+    <string name="metadata_label_aaps_version">Versão AAPS</string>
+    <string name="metadata_label_aaps_flavour">Variante de Compilação</string>
+    <string name="metadata_label_device_name">Exportando nome do paciente do dispositivo</string>
+    <string name="metadata_label_device_model">Exportando modelo do dispositivo</string>
+    <string name="metadata_label_encryption">Criptografia do arquivo</string>
+    <string name="metadata_format_old">Antigo Formato de Exportação</string>
+    <string name="metadata_format_new">Novo formato de encriptação</string>
     <string name="metadata_format_debug">Novo formato de depuração (não encriptado)</string>
+    <string name="metadata_format_other">Formato de exportação desconhecido</string>
+    <string name="prefdecrypt_settings_tampered">Arquivo de configurações adulterado</string>
+    <string name="prefdecrypt_settings_secure">Arquivo de configurações é seguro</string>
+    <string name="prefdecrypt_settings_unencrypted">A usar um formato de configurações não seguro e não encriptado</string>
+    <string name="prefdecrypt_wrong_json">Erro de formato JSON, campo necessário ausente (formato, conteúdo, metadados ou segurança)</string>
+    <string name="prefdecrypt_wrong_password">Erro ao desencriptar, a senha inserida não pode desencriptar o arquivo</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Arquivo de verificação (hash) em falta, não é possível verificar a autenticidade de configurações!</string>
+    <string name="prefdecrypt_issue_modified">Arquivo foi modificado após exportação!</string>
+    <string name="prefdecrypt_issue_parsing">Erro desencriptação, a análise de preferências falhou!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Erro de desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o arquivo importado foi exportado com uma senha mestre diferente.</string>
+    <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
@@ -250,6 +275,9 @@
     <string name="button1">Botão 1</string>
     <string name="button2">Botão 2</string>
     <string name="button3">Botão 3</string>
+    <string name="units_colon">Unidades:</string>
+    <string name="units">Unidades</string>
+    <string name="dia">DIA</string>
     <string name="target_range">Intervalo Alvo:</string>
     <string name="prefs_range_title">Intervalo para visualização</string>
     <string name="prefs_range_summary">Marca alta e baixa para as cartas em Visão geral e Smartwatch</string>
@@ -347,6 +375,8 @@
     <string name="adult">Adulto</string>
     <string name="resistantadult">Adulto resistente insulina</string>
     <string name="patientage_summary">Por favor seleccione a idade do diabético para definir os limites de segurança</string>
+    <string name="patient_name">Nome do Paciente</string>
+    <string name="patient_name_summary">Por favor, forneça nome do paciente ou apelido para diferenciar entre várias configurações</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Usuário</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s necessita de autorizar a não optimização da bateria para assegurar a performance necessária</string>
@@ -384,6 +414,7 @@
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
+    <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="activity_shortname">ACT</string>

From 07f18c8a8036e41fa781a9f0a969530a3d2952d2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:22:31 +0200
Subject: [PATCH 244/400] New translations protection.xml (Portuguese,
 Brazilian)

---
 app/src/main/res/values-pt-rBR/protection.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/protection.xml b/app/src/main/res/values-pt-rBR/protection.xml
index 0a2250f87a..1c9c3e10d8 100644
--- a/app/src/main/res/values-pt-rBR/protection.xml
+++ b/app/src/main/res/values-pt-rBR/protection.xml
@@ -2,4 +2,22 @@
 <resources>
     <string name="biometric_title">Autenticação necessária</string>
     <string name="biometric_description">Coloque o dedo sobre o leitor de impressões digitais para verificar a sua identidade</string>
+    <string name="settings_protection">Definições Proteção</string>
+    <string name="application_protection">Proteção Aplicação</string>
+    <string name="bolus_protection">Proteção Bólus</string>
+    <string name="master_password">Senha mestra</string>
+    <string name="settings_password">Definições de senha</string>
+    <string name="application_password">Senha da aplicação</string>
+    <string name="bolus_password">Senha do bólus</string>
+    <string name="unlock_settings">Definições de desbloqueio</string>
+    <string name="biometric">Biometria</string>
+    <string name="custom_password">Senha personalizada</string>
+    <string name="noprotection">Sem proteção</string>
+    <string name="protection">Proteção</string>
+    <string name="master_password_missing">A senha mestre não está definida!\n\nPor favor, configure a senha mestre em Preferências (%1$s &#8594; %2$s)</string>
+    <string name="password_set">Senha foi definida!</string>
+    <string name="password_not_set">Senha não foi definida</string>
+    <string name="password_not_changed">Senha não foi alterada</string>
+    <string name="password_cleared">Senha apagada!</string>
+    <string name="password_hint">Insira a senha aqui</string>
 </resources>

From 9b58c4849affeaf1fc114d2db3fc111541c8f306 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:32:26 +0200
Subject: [PATCH 245/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d0d12671fb..d1e7dd22dd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -415,6 +415,7 @@
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
     <string name="statuslights_res_critical">Limite crítico de nível de reservatório [U]</string>
     <string name="statuslights_bat_warning">Limite de aviso de nível de bateria [%]</string>
+    <string name="statuslights_bat_critical">Limite de crítico de nível de bateria [%]</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
     <string name="activity_shortname">ACT</string>
@@ -432,6 +433,7 @@
     <string name="careportal_sensorage_label">Idade do sensor</string>
     <string name="careportal_canulaage_label">Idade da Canula</string>
     <string name="careportal_insulinage_label">Idade de Insulina</string>
+    <string name="doprofileswitch">Fazer Mudança De Perfil</string>
     <string name="careportal_pbage_label">Idade bateria bomba</string>
     <string name="ns_alarmoptions">Opções Alarme</string>
     <string name="nsalarm_staledatavalue_label">Tempo limite para dados obsoletos [min]</string>
@@ -521,7 +523,11 @@
     <string name="bgsource_upload">Configurações de upload de BG</string>
     <string name="wear_detailed_delta_title">Mostrar Delta detalho</string>
     <string name="wear_detailed_delta_summary">Mostrar delta com mais um ponto decimal</string>
+    <string name="smbinterval_summary">Com que frequência em min os SMBs serão dados</string>
+    <string name="smbmaxminutes">SMB máx. minutos</string>
     <string name="smbmaxminutes_summary">Limite de minutos de basal para SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB máx minutos</string>
+    <string name="uamsmbmaxminutes_summary">Max minutos de basal para limitar SMB para UAM</string>
     <string name="dexcomg5_xdripupload_title">Enviar dados Glic. para xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Seleccionar 640g/Eversense como fonte no xDrip+</string>
     <string name="nsclientbg">Glic NSCliente</string>
@@ -965,6 +971,7 @@
     <string name="taskname">Nome da Tarefa</string>
     <string name="edit_short">EDITAR</string>
     <string name="please_choose_an_action_type">Escolha um tipo de ação</string>
+    <string name="please_choose_a_trigger_type">Escolha um tipo de gatilho</string>
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
@@ -1097,6 +1104,11 @@
     <string name="medtronic_cmd_desc_get_tbr">Obter Basal temporário</string>
     <string name="medtronic_cmd_desc_set_tbr">Definir Basal temporário</string>
     <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
+    <string name="profilename">Alterar perfil para</string>
+    <string name="changengetoprofilename">Alterar perfil para %1$s</string>
+    <string name="automation_trigger_pump_last_connection_label">Última ligação com a bomba</string>
+    <string name="automation_trigger_pump_last_connection_description">Última ligação com a bomba [minutos atrás]</string>
+    <string name="automation_trigger_pump_last_connection_compared">Última ligação com a bomba %1$s %2$s min atrás</string>
     <string name="sendsmsactionlabel">Enviar SMS: %1$s</string>
     <string name="sendsmsactiondescription">Enviar SMS para todos os números</string>
     <string name="sendsmsactiontext">Enviar SMS com texto</string>
@@ -1107,14 +1119,27 @@
     <string name="deliverpartofboluswizard">Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB.</string>
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
+    <string name="time_range">Intervalo de tempo</string>
     <string name="doyouwantswitchprofile">Deseja mudar de perfil e descartar as alterações feitas no perfil atual?</string>
     <string name="objectives_button_unfinish">Limpeza terminado</string>
     <string name="objectives_button_unstart">Limpeza iniciado</string>
     <string name="doyouwantresetstart">Deseja reiniciar o objetivo? Pode perder seu progresso.</string>
     <string name="saveorresetchangesfirst">Guardar ou repor as alterações atuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil atual?</string>
+    <string name="copytolocalprofile">Criar novo perfil local a partir desta troca de perfil?</string>
+    <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não foi enviado para o NS.</string>
+    <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
+    <string name="reorder_label">Reordenar</string>
+    <string name="age">Idade:</string>
+    <string name="submit">Enviar</string>
+    <string name="mostcommonprofile">Perfil mais comum:</string>
+    <string name="nav_survey">Questionário</string>
+    <string name="average">Média</string>
     <string name="activitymonitor">Monitor de atividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de atividade?</string>
+    <string name="statistics">Estatísticas</string>
+    <string name="tools">Ferramentas</string>
+    <string name="chartmenu">Menu do Gráfico</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">a partir da app Autenticador para: %1$s</string>
     <string name="smscommunicator_otp_enabled">Ativar Autenticador</string>

From 2ac26b42ecefc68d12e8f74186e5b7c66ac3cc47 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:32:28 +0200
Subject: [PATCH 246/400] New translations strings.xml (Portuguese, Brazilian)

---
 wear/src/main/res/values-pt-rBR/strings.xml | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index b5fdd0af83..a8df75f215 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -1,4 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pref_on">Lig.</string>
+    <string name="pref_off">Desl.</string>
+    <string name="pref_vibrate_on_bolus">Vibrar no Bólus</string>
     <string name="pref_units_for_actions">Unidades para Ações</string>
+    <string name="pref_show_date">Mostrar Data</string>
+    <string name="pref_show_iob">Mostrar IOB</string>
+    <string name="pref_show_cob">Mostrar COB</string>
+    <string name="pref_show_delta">Mostrar Delta</string>
+    <string name="pref_show_avgdelta">Mostrar MedDelta</string>
+    <string name="pref_show_phone_battery">Mostrar Bateria Telefone</string>
+    <string name="pref_show_rig_battery">Mostrar Bateria Equipamento</string>
+    <string name="pref_show_basal_rate">Mostrar Taxa Basal</string>
+    <string name="pref_show_loop_status">Mostrar Estado Loop</string>
+    <string name="pref_show_bg">Mostrar Glic.</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Escuro</string>
+    <string name="pref_highlight_basals">Destacar Basais</string>
+    <string name="pref_1_hour">1 hora</string>
+    <string name="pref_2_hours">2 horas</string>
+    <string name="pref_3_hours">3 horas</string>
+    <string name="pref_4_hours">4 horas</string>
+    <string name="pref_5_hours">5 horas</string>
+    <string name="pref_input_design">Design de Entrada</string>
+    <string name="pref_default">Padrão</string>
+    <string name="pref_low">Baixo</string>
+    <string name="action_confirm">CONFIRMAR</string>
+    <string name="action_status_pump">ESTADO BOMBA</string>
+    <string name="action_status_loop">ESTADO LOOP</string>
+    <string name="action_timeshift">alteração turno</string>
+    <string name="status_pump">Bomba</string>
 </resources>

From 61b0accb922fda66801a962927c42ff697a401d4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:42:21 +0200
Subject: [PATCH 247/400] New translations strings.xml (Portuguese, Brazilian)

---
 wear/src/main/res/values-pt-rBR/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index a8df75f215..42a3df157b 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -29,4 +29,13 @@
     <string name="action_status_loop">ESTADO LOOP</string>
     <string name="action_timeshift">alteração turno</string>
     <string name="status_pump">Bomba</string>
+    <string name="activity_no_status">sem estado</string>
+    <string name="unit_mg_dl">mg/dL</string>
+    <string name="unit_mmol_l">mmol/L</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">d</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
 </resources>

From e757735cca83178d82f5c8d935b5034b0f42c726 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 04:52:14 +0200
Subject: [PATCH 248/400] New translations strings.xml (Portuguese, Brazilian)

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

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d1e7dd22dd..88e577f885 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -35,7 +35,7 @@
     <string name="description_pump_combo">Integração para bombas Accu-Chek Combo, requer ter o ruffy instalado</string>
     <string name="description_pump_mdi">Integração para as pessoas que fazem múltiplas injeções diárias para a sua terapia de diabetes</string>
     <string name="description_pump_virtual">Integração para as bombas que não têm qualquer driver ainda (Open Loop)</string>
-    <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar o período de tempo para o passado. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências.</string>
+    <string name="description_sensitivity_aaps">A sensibilidade é calculada da mesma forma que Oref0, mas você pode especificar um período de tempo no passado. A absorção mínima de carboidratos é calculada a partir do tempo de absorção máxima especificado nas preferências.</string>
     <string name="description_sensitivity_oref1">A sensibilidade é calculada a partir de dados de 8h ou 24h no passado (usando o que é mais sensível). Carboidratos (se não absorvidos) são cortados após o tempo especificado nas preferências. O plugin também calcula o UAM.</string>
     <string name="description_sensitivity_weighted_average">A sensibilidade é calculada como uma média ponderada de desvios. Desvios mais recentes têm maior peso. A absorção mínima de hidratos de carbono é calculada a partir do tempo máximo de absorção de hidratos de carbono das preferências. Este algoritmo é o mais rápido em seguir as mudanças de sensibilidade.</string>
     <string name="description_source_eversense">Receber valores de Glicose da aplicação Eversense modificada.</string>
@@ -483,7 +483,7 @@
     <string name="insulin_oref_peak">Tempo Pico da curva de IOB</string>
     <string name="insulin_peak_time">Tempo Pico [min]</string>
     <string name="free_peak_oref">Oref Pico-Livre</string>
-    <string name="rapid_acting_oref">Oref Acção Rápida</string>
+    <string name="rapid_acting_oref">Oref Ação Rápida</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
     <string name="activate_profile">Activar perfil</string>
@@ -661,7 +661,7 @@
     <string name="autosensdisabledinpreferences">Autosens desabilitado nas preferências</string>
     <string name="smbdisabledinpreferences">SMB desactivado nas configurações</string>
     <string name="uamdisabledinpreferences">UAM desactivado nas configurações</string>
-    <string name="uamdisabledoref1notselected">UAM desactivado porque confia no plugin de sensibilidade Oref1</string>
+    <string name="uamdisabledoref1notselected">UAM desativado porque confia no plugin de sensibilidade Oref1</string>
     <string name="maxbasalmultiplier">multiplicador de basal máx</string>
     <string name="maxdailybasalmultiplier">multiplicador de basal máx diária</string>
     <string name="smb_frequency_exceeded">Um bolus foi injectado nos últimos 3 minutos, saltando SMB</string>

From 077b6a2f3ef3222324ebd7a9aa1318907a6eaf2d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 05:02:23 +0200
Subject: [PATCH 249/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 88e577f885..cf7eb0936f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -409,7 +409,7 @@
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
-    <string name="enablesuperbolus">Activar superbólus no assistente</string>
+    <string name="enablesuperbolus">Ativar superbólus no assistente</string>
     <string name="enablesuperbolus_summary">Habilite a funcionalidade de superbolus no assistente. Não habilite até que aprenda o funcionamento. PODE CAUSAR OVERDOSE DE INSULINA SE USAR INDISCRIMINADAMENTE!</string>
     <string name="show_statuslights">Mostrar luzes de estado no ecrã principal</string>
     <string name="statuslights_res_warning">Limite de aviso de nível de reservatório [U]</string>
@@ -462,22 +462,22 @@
     <string name="virtualpump_extendedbolus_label_short">EST</string>
     <string name="keep_screen_on_title">Manter a tela ligada</string>
     <string name="keep_screen_on_summary">Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador.</string>
-    <string name="sensitivity_warning">Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
+    <string name="sensitivity_warning">Ao ativar a função Autosense lembre-se de introduzir todos os carboidratos (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!!</string>
     <string name="sensitivityweightedaverage">Média ponderada da Sensibilidade</string>
     <string name="mdtp_ok">OK</string>
     <string name="mdtp_cancel">Cancelar</string>
     <string name="notloadedplugins">Nem todos perfis foram carregados!</string>
     <string name="valuesnotstored">Valores não guardados!</string>
     <string name="ns_localbroadcasts">Ative as transmissões para outros apps (como xDrip). Não ative se você tiver mais de uma instância de AAPS ou NSClient instalada!</string>
-    <string name="ns_localbroadcasts_title">Activar partilha local.</string>
+    <string name="ns_localbroadcasts_title">Ativar partilha local.</string>
     <string name="careportal_activity_label">ATIVIDADE &amp; FEEDBACK</string>
     <string name="careportal_carbsandbolus_label">CARBOS &amp; BOLUS</string>
     <string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
     <string name="careportal_pump_label">BOMBA</string>
     <string name="careportal_newnstreatment_duration_min_label">Duração [min]</string>
     <string name="openapssmb">SMB OpenAPS</string>
-    <string name="enableuam">Activar UAM</string>
-    <string name="enablesmb">Activar SMB</string>
+    <string name="enableuam">Ativar UAM</string>
+    <string name="enablesmb">Ativar SMB</string>
     <string name="enablesmb_summary">Use Super Micro Boluses em vez de basal temp para uma ação mais rápida</string>
     <string name="enableuam_summary">Detecção de refeições não Introduzidas</string>
     <string name="insulin_oref_peak">Tempo Pico da curva de IOB</string>
@@ -486,7 +486,7 @@
     <string name="rapid_acting_oref">Oref Ação Rápida</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short">Duração de Acção da Insulina (DIA) de %1$f demasiado curto - corrigido para %2$f!</string>
-    <string name="activate_profile">Activar perfil</string>
+    <string name="activate_profile">Ativar perfil</string>
     <string name="invalid">INVÁLIDO</string>
     <string name="careportal_newnstreatment_percentage_label">Percentagem</string>
     <string name="careportal_newnstreatment_timeshift_label">Alteração Turno</string>
@@ -590,8 +590,8 @@
     <string name="enablesmbalways_summary">SMB sempre activo independentemente dos bolus. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
     <string name="enablesmbaftercarbs">Ativar SMB após carbos</string>
     <string name="enablesmbaftercarbs_summary">SMB activo por 6h após carbs, mesmo com 0 COB. Possível apenas quando o medidor tive um bom filtro de dados como o G5</string>
-    <string name="enablesmbwithcob">Activar SMB com COB</string>
-    <string name="enablesmbwithcob_summary">Activar SMB quando tem COB activo.</string>
+    <string name="enablesmbwithcob">Ativar SMB com COB</string>
+    <string name="enablesmbwithcob_summary">Ativar SMB quando houver COB ativo.</string>
     <string name="enablesmbwithtemptarget">SMB activo com valores alvo temporários</string>
     <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
     <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
@@ -652,7 +652,7 @@
     <string name="about_link_urls">\n\nhttp://www.androidaps.org\nhttp://www.androidaps.de (de)\n\nfacebook:\nhttp://facebook.androidaps.org\nhttp://facebook.androidaps.de (de)</string>
     <string name="combo_check_date">O último bólus tem mais de 24 horas ou está no futuro. Por favor verifique se a data está definida correctamente na bomba.</string>
     <string name="combo_suspious_bolus_time">Hora/data da entrega do bólus na bomba parece errado, IOB aparentemente está incorrecto. Verifique hora/data na bomba.</string>
-    <string name="profileswitch_ismissing">TrocaPerfil em falta. Por favor faça uma troca de perfil ou pressione \"Activar Perfil\" em PerfilLocal.</string>
+    <string name="profileswitch_ismissing">TrocaPerfil em falta. Por favor faça uma troca de perfil ou pressione \"Ativar Perfil\" em PerfilLocal.</string>
     <string name="combo_bolus_count">Contagem Bólus</string>
     <string name="combo_tbr_count">Contagem TBR</string>
     <string name="pumpisnottempbasalcapable">A bomba não é capaz de basais temporárias</string>
@@ -722,13 +722,13 @@
     <string name="wear_wizard_settings_summary">Resultado cálculos incluídos no Assistente:</string>
     <string name="wear_display_settings">Mostrar Configurações</string>
     <string name="wear_general_settings">Configurações gerais</string>
-    <string name="enable_nsclient">Activar NSCliente</string>
+    <string name="enable_nsclient">Ativar NSCliente</string>
     <string name="welcometosetupwizard">Bem-vindo ao assistente de configuração. Vai guiá-lo(a) através do processo de instalação\n</string>
     <string name="pumpsetup">Configurações da bomba</string>
     <string name="readstatus">Ler estado</string>
     <string name="adjustprofileinns">Alterações devem ser feitas no NS</string>
     <string name="exitwizard">Saltar assistente de configuração</string>
-    <string name="setupwizard_loop_description">Pressione o botão abaixo para activar o AndroidAPS para sugerir/fazer alterações basais</string>
+    <string name="setupwizard_loop_description">Pressione o botão abaixo para ativar o AndroidAPS para sugerir/fazer alterações basais</string>
     <string name="apssetup">Configurar plugin APS</string>
     <string name="sensitivitysetup">Configurar plugin Sensibilidade</string>
     <string name="setupwizard_sensitivity_description">Plugin de Sensibilidade é usado para detecção de sensibilidade e cálculos COB. Para mais info visite:</string>
@@ -736,7 +736,7 @@
     <string name="nsclientinfotext">NSCliente gere a ligação ao Nightscout. Pode saltar esta parte mas não será possível passar os objetivos até que o configure.</string>
     <string name="diawarning">Lembre-se: novos perfis de insulina requerem diâmetro de pelo menos 5h. DIA 5–6h no novo perfil é igual ao diâmetro 3h nos antigos perfis de insulina.</string>
     <string name="bgsourcesetup">Configure a fonte das glicemias</string>
-    <string name="setupwizard_profile_description">Por favor seleccione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o activar executando \"Troca Perfil\"</string>
+    <string name="setupwizard_profile_description">Por favor selecione a fonte do perfil. Se o paciente é uma criança deverá utilizar perfil NS. Se ninguém o está a seguir no Nightscout provavelmente preferirá um perfil Local. Lembre-se que apenas está a escolher a fonte de perfil. Para o utilizar terá que o ativar executando \"Troca Perfil\"</string>
     <string name="setupwizard_aps_description">Seleccione um dos algoritmos disponíveis. Eles são classificados do mais antigo para o mais recente. Algoritmo mais recente é geralmente mais forte e mais agressivo. Assim, se você é novo looper, poderá provavelmente começar com AMA e não com a versão mais recente. Não se esqueça de ler a documentação de OpenAPS e configurá-lo antes de usar.</string>
     <string name="startobjective">Iniciar primeiro objetivo</string>
     <string name="permission">Permissão</string>
@@ -763,7 +763,7 @@
     <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
     <string name="storedsettingsfound">Configurações encontradas</string>
-    <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e activar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil da app tem os mesmos valores que estão na bomba. Em caso contrario pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
+    <string name="allow_hardware_pump_text">Atenção: Se conectar à sua bomba física e ativar o perfil, o AndroidAPS irá copiar as definições desse perfil para as definições da bomba, apagando o memorizado na bomba. Por favor verifique que o que preencheu no perfil do app tem os mesmos valores que estão na bomba. Em caso contrário pressione imediatamente cancelar e corrija antes de voltar a ligar à bomba.</string>
     <string name="error_adding_treatment_title">Dados tratamento incompletos</string>
     <string name="maintenance_settings">Configurações de manutenção</string>
     <string name="maintenance_email">Email destinatário</string>
@@ -1005,7 +1005,7 @@
     <string name="rileylink_scanner_scan_stop">PARAR</string>
     <string name="rileylink_scanner_selected_device">Seleccionado</string>
     <string name="rileylink_scanner_title">Procura RileyLink</string>
-    <string name="location_yes">Activar</string>
+    <string name="location_yes">Ativar</string>
     <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
     <string name="rileylink_scanner_scanning_finished">Procura terminada</string>

From 9dcdfb40ea4dbcbb5bfa0d928feb9c39985bde9c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 05:02:25 +0200
Subject: [PATCH 250/400] New translations objectives.xml (Portuguese,
 Brazilian)

---
 app/src/main/res/values-pt-rBR/objectives.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 9c28df6649..7c377311f7 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -15,6 +15,8 @@
     <string name="objectives_maxiobzero_objective">Começar a fechar loop com Suspensão por Glicose Baixa</string>
     <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
     <string name="objectives_maxiob_objective">Ajustar o close loop, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de valor glicêmico</string>
+    <string name="objectives_ama_objective">A ativar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
+    <string name="objectives_auto_objective">A ativar a automação</string>
     <string name="accomplished">Concluído: %1$s</string>
     <string name="objectives_usage_gate">Executar diferentes ações no AndroidAPS</string>
     <string name="objectives_useactions">No Configurador ative o plugin de Ações, torne-o visível e exiba o seu conteúdo no menu superior</string>

From 11539a2464095e99e2872414dccdf12ddd37ab5c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 05:02:27 +0200
Subject: [PATCH 251/400] New translations strings.xml (Portuguese, Brazilian)

---
 dana/src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index 0627cc71b8..3d640c85c0 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="processinghistory">Processando ação</string>
     <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de ação da insulina DIA depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
+    <string name="danar_disableeasymode">Desativar modo EasyUI na bomba</string>
 </resources>

From 5f02a1cc849180ee040b0c6741115af70263e048 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 26 Jun 2020 09:28:12 +0200
Subject: [PATCH 252/400] Fix units in Automation TT Action

---
 .../plugins/general/automation/elements/InputTempTarget.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
index fa1939e951..8208e7e687 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
@@ -4,14 +4,18 @@ import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.NumberPicker
 import java.text.DecimalFormat
+import javax.inject.Inject
 
 class InputTempTarget(injector: HasAndroidInjector) : Element(injector) {
     var units = Constants.MGDL
     var value = 0.0
+    @Inject lateinit var profileFunction: ProfileFunction
 
     init {
+        units = profileFunction.getUnits()
         value = if (units == Constants.MMOL) 6.0 else 110.0
     }
 

From 78242ab0e7bf49cb6c97b5f75c5fe2548e5ceca0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 10:14:03 +0200
Subject: [PATCH 253/400] New translations strings.xml (Swedish)

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

diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b5b0eac484..d8cfc630fa 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -165,6 +165,7 @@ Eversense-appen.</string>
     <string name="filenotfound">Hittade inte filen</string>
     <string name="nav_export">Exportera inställningar</string>
     <string name="nav_import">Importera inställningar</string>
+    <string name="openapsma_maxbasal_title">Max enheter per timme som en temp basal kan sättas till</string>
     <string name="openapsma_maxbasal_summary">Detta värde kallas max basal inom OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximal basal IOB som OpenAPS kan ge [E]</string>
     <string name="openapsma_maxiob_summary">Detta värde kallas Max IOB i OpenAPS. Det är ställt till noll från start. Efter flera dagar till veckor, beroende på hur du känner, kan du välja att justera denna.</string>
@@ -300,6 +301,7 @@ Eversense-appen.</string>
     <string name="primefill">Förfyllning</string>
     <string name="fillwarning">Försäkra dig om att mängden motsvarar det som är specificerat för just ditt infusionsset.</string>
     <string name="othersettings_title">Övrigt</string>
+    <string name="fillbolus_title">Standardvärden för påfyllning/förfyllning </string>
     <string name="button1">Knapp 1</string>
     <string name="button2">Knapp 2</string>
     <string name="button3">Knapp 3</string>
@@ -358,6 +360,7 @@ Eversense-appen.</string>
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardvärde: 4 Detta är en grundsten i OpenAPS säkerhet. Detta begränsar dina tempbasaler till maximalt 4 gånger din nuvarande basaldos, oberoende av din maximala basaldos. Detta för att undvika att man av misstag gör farliga inställningar. Om man når taket i denna inställning så kanske ändringar i andra inställningar behövs. De flesta behöver inte ändra denna inställning.</string>
     <string name="openapsama_autosens_max_summary">Standardvärde: 1.2\nDetta är en multiplikatorbegränsare för autosens/autotune som gör att automatiken kan justera upp basaler, sänka insulinkänslighet (ISF) och/eller målvärde med upp till 20%.</string>
     <string name="openapsama_autosens_min_summary">Standardvärde: 0.7\nDetta är en multiplikatorbegränsare för autosens/autotune som gör att automatiken kan justera ner basaler, höja insulinkänslighet (ISF) och/eller målvärde med upp till 30%% för att kompensera för t ex tillfällig hög insulinkänslighet.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens justerar även mål-BG</string>
     <string name="openapsama_autosens_adjusttargets_summary">Standardvärde: sant. Detta för att tillåta autosens justera mål-BG utöver ISF och basaler.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standardvärde: 2  Bolus snooze är aktivt efter att du givit en måltidsbolus, detta för att inte loop ska lågtempa när du just ätit. I detta exempel och grundvärde är 2; innebär att DIA på 3 tim kommer bolus snooze kommer att fasas ut under 1,5 tim (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standardvärde: 3.0 (AMA) eller 8.0 (SMB). Detta är grundinställning för KH-absorption per 5 min. Detta styr hur snabbt COB minskar, dvs hur snabbt programmet kalkylerar att KH tagits upp, och påverkar BG framöver när BG faller mer än väntat, eller inte stiger som väntat.</string>

From b661e5450dec322ea706d7fa6af5a309e8787195 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 11:06:59 +0200
Subject: [PATCH 254/400] New translations strings.xml (Russian)

---
 core/src/main/res/values-ru-rRU/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 4750e73b08..6c90fe8921 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">Ожидание результата</string>
     <string name="smb_shortname">Супер микро болюс SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Необходимы дополнительные углеводы \"%d г в течение %d минут\"</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Статистика</string>
     <string name="cumulative_tdd">накопительные TDD</string>

From 5104dc1416025dc900b087e3a557e6fc4f6504a1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 12:25:29 +0200
Subject: [PATCH 255/400] fix tests

---
 .../actions/ActionStartTempTargetTest.kt          |  1 -
 .../general/automation/actions/ActionsTestBase.kt | 15 +++++++++++++--
 .../automation/elements/InputTempTargetTest.kt    |  2 ++
 .../automation/triggers/TriggerTestBase.kt        |  5 +++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
index f35e797a0b..0bf99824ec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
@@ -24,7 +24,6 @@ class ActionStartTempTargetTest : ActionsTestBase() {
 
     @Before
     fun setup() {
-        PowerMockito.mockStatic(MainApp::class.java)
         `when`(resourceHelper.gs(R.string.starttemptarget)).thenReturn("Start temp target")
 
         sut = ActionStartTempTarget(injector)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
index 5d56382e0b..84e90208ed 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.general.automation.actions
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -9,11 +10,14 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.junit.Before
 import org.mockito.Mock
+import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 
 @PrepareForTest(VirtualPumpPlugin::class, RxBusWrapper::class, LocalProfilePlugin::class, SmsCommunicatorPlugin::class, ConfigBuilderPlugin::class)
@@ -25,8 +29,8 @@ open class ActionsTestBase : TestBaseWithProfile() {
     @Mock lateinit var virtualPumpPlugin: VirtualPumpPlugin
     @Mock lateinit var loopPlugin: LoopPlugin
     @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var localProfilePlugin : LocalProfilePlugin
-    @Mock lateinit var smsCommunicatorPlugin : SmsCommunicatorPlugin
+    @Mock lateinit var localProfilePlugin: LocalProfilePlugin
+    @Mock lateinit var smsCommunicatorPlugin: SmsCommunicatorPlugin
 
     var injector: HasAndroidInjector = HasAndroidInjector {
         AndroidInjector {
@@ -87,7 +91,14 @@ open class ActionsTestBase : TestBaseWithProfile() {
                 it.aapsLogger = aapsLogger
                 it.resourceHelper = resourceHelper
             }
+            if (it is InputTempTarget) {
+                it.profileFunction = profileFunction
+            }
         }
     }
 
+    @Before
+    fun mock() {
+        `when`(profileFunction.getUnits()).thenReturn(Constants.MGDL)
+    }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
index d98ca75f1c..b137a8ef9b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTargetTest.kt
@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.general.automation.elements
 
 import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
index 2b35932914..bda0b5c532 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTestBase.kt
@@ -6,9 +6,11 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.automation.elements.InputBg
+import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget
 import info.nightscout.androidaps.plugins.general.automation.elements.StaticLabel
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
@@ -71,6 +73,9 @@ open class TriggerTestBase : TestBaseWithProfile() {
             if (it is InputBg) {
                 it.profileFunction = profileFunction
             }
+           if (it is InputTempTarget) {
+                it.profileFunction = profileFunction
+            }
             if (it is GlucoseStatus) {
                 it.aapsLogger = aapsLogger
                 it.iobCobCalculatorPlugin = iobCobCalculatorPlugin

From 2391ebe39949d62d1e2b4aa709fa507da60ec92a Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sat, 27 Jun 2020 01:03:25 +1200
Subject: [PATCH 256/400] Remove the amount of carbs required from the main
 overview if a carb treatment has been made after APS run

---
 .../plugins/general/overview/OverviewFragment.kt         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 4afcc52826..562c6c35b0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -748,13 +748,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         if (config.APS && lastRun?.constraintsProcessed != null) {
             if (lastRun.constraintsProcessed!!.carbsReq > 0) {
-                overview_cob?.text = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
+                //only display carbsreq when carbs havnt been entered recently
+                if (treatmentsPlugin.lastCarbTime < lastRun.lastAPSRun){
+                    cobText = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
+                }
+                overview_cob?.text = cobText
                 if (!carbAnimation.isRunning)
                     carbAnimation.start()
             } else {
                 overview_cob?.text = cobText
-                if (carbAnimation.isRunning)
-                    carbAnimation.stop()
+                carbAnimation.stop()
                 carbAnimation.selectDrawable(0);
             }
         }

From c4a317f5156ba8cd3b53e3e039fec328fac14c24 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Sat, 27 Jun 2020 01:06:28 +1200
Subject: [PATCH 257/400] Dismiss carb notifications automatically if no longer
 needed, crossfingers fix double wear OS notifications

---
 .../plugins/aps/loop/LoopPlugin.java          | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index b97151702b..dcbb0bb9d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -108,6 +108,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
     private boolean isDisconnected;
 
     private long carbsSuggestionsSuspendedUntil = 0;
+    private int prevCarbsreq = 0;
 
     @Nullable private LastRun lastRun = null;
 
@@ -396,7 +397,7 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
             }
             result.percent = (int) (result.rate / profile.getBasal() * 100);
 
-            // check rate for constrais
+            // check rate for constraints
             final APSResult resultAfterConstraints = result.newAndClone(injector);
             resultAfterConstraints.rateConstraint = new Constraint<>(resultAfterConstraints.rate);
             resultAfterConstraints.rate = constraintChecker.applyBasalConstraints(resultAfterConstraints.rateConstraint, profile).value();
@@ -414,6 +415,10 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                 resultAfterConstraints.smb = 0;
             }
 
+            if (lastRun != null) {
+                prevCarbsreq = lastRun.getConstraintsProcessed().carbsReq;
+            }
+
             if (lastRun == null) lastRun = new LastRun();
             lastRun.setRequest(result);
             lastRun.setConstraintsProcessed(resultAfterConstraints);
@@ -494,12 +499,19 @@ public class LoopPlugin extends PluginBase implements LoopInterface {
                             mNotificationManager.notify(Constants.notificationID, builder.build());
                             rxBus.send(new EventNewOpenLoopNotification());
 
-                            // Send to Wear
-                            actionStringHandler.get().handleInitiate("changeRequest");
+                            //only send to wear if Native notifications are turned off
+                            if (!sp.getBoolean(R.string.key_raise_notifications_as_android_notifications, false)) {
+                                // Send to Wear
+                                actionStringHandler.get().handleInitiate("changeRequest");
+                            }
                         }
 
                     } else {
-                        dismissSuggestion();
+                        //If carbs were required previously, but are no longer needed, dismiss notifications
+                        if ( prevCarbsreq > 0 ) {
+                            dismissSuggestion();
+                            rxBus.send(new EventDismissNotification(Notification.CARBS_REQUIRED));
+                        }
                     }
                 }
 

From cb219d6c339957a4039ddd7a90dfbeb3359b85a5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 26 Jun 2020 22:33:40 +0200
Subject: [PATCH 258/400] New translations objectives.xml (Portuguese,
 Brazilian)

---
 app/src/main/res/values-pt-rBR/objectives.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 7c377311f7..4709e3b300 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -16,10 +16,12 @@
     <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
     <string name="objectives_maxiob_objective">Ajustar o close loop, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de valor glicêmico</string>
     <string name="objectives_ama_objective">A ativar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
+    <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A ativar a automação</string>
     <string name="accomplished">Concluído: %1$s</string>
     <string name="objectives_usage_gate">Executar diferentes ações no AndroidAPS</string>
     <string name="objectives_useactions">No Configurador ative o plugin de Ações, torne-o visível e exiba o seu conteúdo no menu superior</string>
     <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objetivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceito</string>
+    <string name="answerdisabledto">Resposta desativada para: %1$s</string>
 </resources>

From 799d4205dd9e2219812dad2f7279d5e7c7fe093b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 27 Jun 2020 01:42:39 +0200
Subject: [PATCH 259/400] Right align label and right align values

---
 .../main/res/layout/overview_info_layout.xml  | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 5bea227071..223ad259c1 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -54,40 +54,54 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <TextView
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textEnd"
-                    android:text="Δ: "
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
-                <TextView
-                    android:id="@+id/overview_delta"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="n/a"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-            </LinearLayout>
+                    android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:textAlignment="textEnd"
+                        android:text="Δ: "
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                <TextView
-                    android:layout_width="50dp"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textEnd"
-                    android:text="15m Δ: \n40m Δ: "
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:textAlignment="textEnd"
+                        android:text="15m Δ: \n40m Δ: "
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
-                <TextView
-                    android:id="@+id/overview_avgdelta"
+                </LinearLayout>
+
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="24dp"
-                    android:text="n/a"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/overview_delta"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:textAlignment="textEnd"
+                        android:text="n/a"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                    <TextView
+                        android:id="@+id/overview_avgdelta"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:textAlignment="textEnd"
+                        android:text="n/a"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+                </LinearLayout>
+
             </LinearLayout>
 
     </LinearLayout>

From a08c1d5269bc9dd7da04b93530764490cf517a51 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 1 Jul 2020 20:54:49 +0200
Subject: [PATCH 260/400] fix clash comming from RS history

---
 .../androidaps/plugins/treatments/TreatmentService.java        | 3 +++
 .../java/info/nightscout/androidaps/danars/DanaRSPlugin.kt     | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
index 5dfceda204..34ab6bde72 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
@@ -308,6 +308,9 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
                         //preserve carbs
                         if (existingTreatment.isValid && existingTreatment.carbs > 0 && treatment.carbs == 0) {
                             treatment.carbs = existingTreatment.carbs;
+                        // preserve insulin
+                        } else if (existingTreatment.isValid && existingTreatment.insulin > 0 && treatment.insulin == 0) {
+                            treatment.insulin = existingTreatment.insulin;
                         }
 
                         getDao().delete(existingTreatment); // need to delete/create because date may change too
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 01ef2637c3..7619c7515a 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -58,8 +58,7 @@ class DanaRSPlugin @Inject constructor(
     private val danaPump: DanaPump,
     private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
     private val fabricPrivacy: FabricPrivacy,
-    private val dateUtil: DateUtil,
-    private val config: ConfigInterface
+    private val dateUtil: DateUtil
 ) : PumpPluginBase(PluginDescription()
     .mainType(PluginType.PUMP)
     .fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name)

From 8cf2d3aeb162e14a6eeb43354545b68e40ca58d6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 1 Jul 2020 22:31:35 +0200
Subject: [PATCH 261/400] fix DanaR reading history

---
 .../androidaps/danar/comm/MsgHistoryAll.kt           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
index f7573d14c2..17b4d54d3e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
@@ -17,8 +17,6 @@ open class MsgHistoryAll(
     override fun handleMessage(bytes: ByteArray) {
         val recordCode = intFromBuff(bytes, 0, 1).toByte()
         val date = dateFromBuff(bytes, 1) // 3 bytes
-        val datetime = dateTimeFromBuff(bytes, 1) // 5 bytes
-        val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
         val dailyBasal = intFromBuff(bytes, 4, 2) * 0.01
         val dailyBolus = intFromBuff(bytes, 6, 2) * 0.01
         //val paramByte5 = intFromBuff(bytes, 4, 1).toByte()
@@ -32,6 +30,7 @@ open class MsgHistoryAll(
         var messageType = ""
         when (recordCode) {
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BOLUS     -> {
+                val datetime = dateTimeFromBuff(bytes, 1) // 5 bytes
                 danaRHistoryRecord.recordDate = datetime
                 when (0xF0 and paramByte8.toInt()) {
                     0xA0 -> {
@@ -69,48 +68,56 @@ open class MsgHistoryAll(
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_PRIME     -> {
                 messageType += "prime"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ERROR     -> {
                 messageType += "error"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_REFILL    -> {
                 messageType += "refill"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_BASALHOUR -> {
                 messageType += "basal hour"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_TB        -> {
                 messageType += "tb"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value * 0.01
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_GLUCOSE   -> {
                 messageType += "glucose"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_CARBO     -> {
                 messageType += "carbo"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 danaRHistoryRecord.recordValue = value
             }
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_ALARM     -> {
                 messageType += "alarm"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 var strAlarm = "None"
                 when (paramByte8.toInt()) {
@@ -125,6 +132,7 @@ open class MsgHistoryAll(
 
             info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_SUSPEND   -> {
                 messageType += "suspend"
+                val datetimewihtsec = dateTimeSecFromBuff(bytes, 1) // 6 bytes
                 danaRHistoryRecord.recordDate = datetimewihtsec
                 var strRecordValue = "Off"
                 if (paramByte8.toInt() == 79) strRecordValue = "On"

From bbfbdb18d5580d3a128580320fb9ce59e168c571 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 10:50:34 +0200
Subject: [PATCH 262/400] fix smb preference

---
 app/src/main/res/xml/pref_openapssmb.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 252ce1ccf4..f30107ea15 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -18,12 +18,12 @@
             validate:testType="floatNumericRange" />
 
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
-            android:defaultValue="1.5"
-            android:dialogMessage="@string/openapsma_maxiob_summary"
+            android:defaultValue="3"
+            android:dialogMessage="@string/openapssmb_maxiob_summary"
             android:inputType="numberDecimal"
-            android:key="@string/key_openapsma_max_iob"
-            android:title="@string/openapsma_maxiob_title"
-            validate:floatmaxNumber="12.0"
+            android:key="@string/key_openapssmb_max_iob"
+            android:title="@string/openapssmb_maxiob_title"
+            validate:floatmaxNumber="25.0"
             validate:floatminNumber="0"
             validate:testType="floatNumericRange" />
 

From b13c39ebc5963299bfd60df8e38dff27779b6cc5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 16:41:48 +0200
Subject: [PATCH 263/400] set predefined values for nsclient

---
 app/src/main/java/info/nightscout/androidaps/MainApp.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 85bfd24f44..1782cfd5aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -53,6 +53,7 @@ public class MainApp extends DaggerApplication {
     @Inject VersionCheckerUtils versionCheckersUtils;
     @Inject SP sp;
     @Inject NSUpload nsUpload;
+    @Inject Config config;
 
     @Inject ConfigBuilderPlugin configBuilderPlugin;
     @Inject KeepAliveReceiver.KeepAliveManager keepAliveManager;
@@ -103,6 +104,11 @@ public class MainApp extends DaggerApplication {
 
 
     private void doMigrations() {
+        // set values for different builds
+        if (!sp.contains(R.string.key_ns_alarms))
+            sp.putBoolean(R.string.key_ns_alarms, config.getNSCLIENT());
+        if (!sp.contains(R.string.key_ns_announcements))
+            sp.putBoolean(R.string.key_ns_announcements, config.getNSCLIENT());
     }
 
     @Override

From 16b549c6fdf5caf12e773e51232662b4cfd24d34 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 17:43:18 +0200
Subject: [PATCH 264/400] New translations strings.xml (German)

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

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 7a06f037c8..44a1cf08b8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -355,8 +355,8 @@
     <string name="always_use_shortavg">Verwende immer das kurze durchschnittliche Delta statt des einfachen Deltas</string>
     <string name="always_use_shortavg_summary">Das ist sinnvoll, wenn die Daten von einer ungefilterten Quelle Signalrauschen haben.</string>
     <string name="profile">Profil</string>
-    <string name="openapsama_max_daily_safety_multiplier_summary">Standardwert: 3\nDies ist eine wichtige Sicherheitseinstellung. Sie begrenzt das maximale Basal-IOB auf die dreifache Menge (im Standardfall) deiner größten Basalrate. In der Regel solltest Du diesen Wert nicht ändern. Aber Du solltest wissen, was \"3x max daily, 4x current\" als Sicherheitseinstellung bedeutet.</string>
-    <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt das Basal-IOB auf die (im Standardfall) vierfache Menge der aktuellen Basalrate. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
+    <string name="openapsama_max_daily_safety_multiplier_summary">Standardwert: 3\nDies ist eine wichtige Sicherheitseinstellung. Sie begrenzt die maximale Basal-Abgabe auf die dreifache Menge (im Standardfall) deiner größten Basalrate im Profil. In der Regel solltest Du diesen Wert nicht ändern. Aber Du solltest wissen, was \"3x max daily, 4x current\" als Sicherheitseinstellung bedeutet.</string>
+    <string name="openapsama_current_basal_safety_multiplier_summary">Standardwert: 4\nDies ist die andere wichtige Sicherheitseinstellung, die zweite Hälfte von \"3x max daily, 4x current\". Diese Grenze beschränkt die Basal-Abgabe auf die (im Standardfall) vierfache Menge der aktuellen Basalrate im Profil. Dies ist wichtig, um Nutzer davor zu bewahren, zuviel Basal-Insulin zu verabreichen. Nochmals, der Standardwert ist 4x. Die meisten Nutzer werden niemals diese Einstellung verändern, sondern andere Einstellungen anpassen, um sich nicht dieser Sicherheitsgrenze zu nähern.</string>
     <string name="openapsama_autosens_max_summary">Standardwert: 1.2\nDies ist eine Sicherheitsgrenze für Autosens (und bald auch Autotune), die besagt, wie stark Autosens Basalraten erhöhen darf und wie niedrig der ISF (Insulin-Sensitivitäts-Faktor) und der BZ-Zielwert eingestellt werden können. 1.2 ist dabei der Multiplikationsfaktor und erlaubt eine Anpassung um 20%%.</string>
     <string name="openapsama_autosens_min_summary">Standardwert: 0.7\nDies ist die andere Sicherheitsgrenze für autosens. Sie beschränkt, wie weit Basalraten abgesenkt und wie sehr ISF und BZ-Zielwerte erhöht werden können.</string>
     <string name="openapsama_autosens_adjusttargets">Autosens passt Zielwerte ebenfalls an</string>

From 3a2790acc323e26c85573c9204e8f135fa2d8dc8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 20:28:42 +0200
Subject: [PATCH 265/400] remove BgSource from setup wizard

---
 .../info/nightscout/androidaps/MainApp.java   |  2 ++
 .../configBuilder/ConfigBuilderFragment.kt    | 22 +++++++++++++------
 .../androidaps/plugins/source/DexcomPlugin.kt | 13 ++++++++---
 .../plugins/source/NSClientSourcePlugin.kt    | 12 +++++++++-
 .../androidaps/setupwizard/SWDefinition.kt    |  2 +-
 5 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 1782cfd5aa..ca60ca93d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -109,6 +109,8 @@ public class MainApp extends DaggerApplication {
             sp.putBoolean(R.string.key_ns_alarms, config.getNSCLIENT());
         if (!sp.contains(R.string.key_ns_announcements))
             sp.putBoolean(R.string.key_ns_announcements, config.getNSCLIENT());
+        if (!sp.contains(R.string.key_language))
+            sp.putString(R.string.key_language, "default");
     }
 
     @Override
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
index 57781a090a..3badb56824 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt
@@ -12,6 +12,7 @@ import android.widget.RadioButton
 import android.widget.TextView
 import androidx.annotation.StringRes
 import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.events.EventRebuildTabs
@@ -20,9 +21,9 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.extensions.plusAssign
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
-import info.nightscout.androidaps.utils.extensions.toVisibility
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.configbuilder_fragment.*
@@ -36,6 +37,7 @@ class ConfigBuilderFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var protectionCheck: ProtectionCheck
+    @Inject lateinit var config: Config
 
     private var disposable: CompositeDisposable = CompositeDisposable()
     private val pluginViewHolders = ArrayList<PluginViewHolder>()
@@ -86,14 +88,20 @@ class ConfigBuilderFragment : DaggerFragment() {
     @Synchronized
     private fun updateGUI() {
         configbuilder_categories.removeAllViews()
-        createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
+        if (!config.NSCLIENT) {
+            createViewsForPlugins(R.string.configbuilder_profile, R.string.configbuilder_profile_description, PluginType.PROFILE, activePlugin.getSpecificPluginsVisibleInListByInterface(ProfileInterface::class.java, PluginType.PROFILE))
+        }
         createViewsForPlugins(R.string.configbuilder_insulin, R.string.configbuilder_insulin_description, PluginType.INSULIN, activePlugin.getSpecificPluginsVisibleInListByInterface(InsulinInterface::class.java, PluginType.INSULIN))
-        createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
-        createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, activePlugin.getSpecificPluginsVisibleInList(PluginType.PUMP))
+        if (!config.NSCLIENT) {
+            createViewsForPlugins(R.string.configbuilder_bgsource, R.string.configbuilder_bgsource_description, PluginType.BGSOURCE, activePlugin.getSpecificPluginsVisibleInListByInterface(BgSourceInterface::class.java, PluginType.BGSOURCE))
+            createViewsForPlugins(R.string.configbuilder_pump, R.string.configbuilder_pump_description, PluginType.PUMP, activePlugin.getSpecificPluginsVisibleInList(PluginType.PUMP))
+        }
         createViewsForPlugins(R.string.configbuilder_sensitivity, R.string.configbuilder_sensitivity_description, PluginType.SENSITIVITY, activePlugin.getSpecificPluginsVisibleInListByInterface(SensitivityInterface::class.java, PluginType.SENSITIVITY))
-        createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, activePlugin.getSpecificPluginsVisibleInList(PluginType.APS))
-        createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
-        createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface::class.java, PluginType.CONSTRAINTS))
+        if (config.APS) {
+            createViewsForPlugins(R.string.configbuilder_aps, R.string.configbuilder_aps_description, PluginType.APS, activePlugin.getSpecificPluginsVisibleInList(PluginType.APS))
+            createViewsForPlugins(R.string.configbuilder_loop, R.string.configbuilder_loop_description, PluginType.LOOP, activePlugin.getSpecificPluginsVisibleInList(PluginType.LOOP))
+            createViewsForPlugins(R.string.constraints, R.string.configbuilder_constraints_description, PluginType.CONSTRAINTS, activePlugin.getSpecificPluginsVisibleInListByInterface(ConstraintsInterface::class.java, PluginType.CONSTRAINTS))
+        }
         createViewsForPlugins(R.string.configbuilder_treatments, R.string.configbuilder_treatments_description, PluginType.TREATMENT, activePlugin.getSpecificPluginsVisibleInList(PluginType.TREATMENT))
         createViewsForPlugins(R.string.configbuilder_general, R.string.configbuilder_general_description, PluginType.GENERAL, activePlugin.getSpecificPluginsVisibleInList(PluginType.GENERAL))
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
index 41d1c07ddc..27ad7fec82 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/DexcomPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
@@ -32,18 +33,24 @@ class DexcomPlugin @Inject constructor(
     private val mainApp: MainApp,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val nsUpload: NSUpload
+    private val nsUpload: NSUpload,
+    config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
     .pluginName(R.string.dexcom_app_patched)
     .shortName(R.string.dexcom_short)
     .preferencesId(R.xml.pref_bgsourcedexcom)
-    .description(R.string.description_source_dexcom)
-    .setDefault(),
+    .description(R.string.description_source_dexcom),
     aapsLogger, resourceHelper, injector
 ), BgSourceInterface {
 
+    init {
+        if (!config.NSCLIENT) {
+            pluginDescription.setDefault()
+        }
+    }
+
     override fun advancedFilteringSupported(): Boolean {
         return true
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
index daf570edc2..4e10a9c728 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/NSClientSourcePlugin.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.source
 
 import android.content.Intent
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.db.BgReading
@@ -26,7 +27,8 @@ class NSClientSourcePlugin @Inject constructor(
     injector: HasAndroidInjector,
     resourceHelper: ResourceHelper,
     aapsLogger: AAPSLogger,
-    private val sp: SP
+    private val sp: SP,
+    config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.BGSOURCE)
     .fragmentClass(BGSourceFragment::class.java.name)
@@ -38,6 +40,14 @@ class NSClientSourcePlugin @Inject constructor(
     private var lastBGTimeStamp: Long = 0
     private var isAdvancedFilteringEnabled = false
 
+    init {
+        if (config.NSCLIENT) {
+            pluginDescription
+                .alwaysEnabled(true)
+                .setDefault()
+        }
+    }
+
     override fun advancedFilteringSupported(): Boolean {
         return isAdvancedFilteringEnabled
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
index d0f8c29138..73cd2d6e37 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@@ -461,7 +461,7 @@ class SWDefinition @Inject constructor(
             .add(screenUnits)
             .add(displaySettings)
             .add(screenNsClient)
-            .add(screenBgSource)
+            //.add(screenBgSource)
             .add(screenPatientName)
             .add(screenAge)
             .add(screenInsulin)

From 6e88d127e5640cc062cd4854952665cc243fa038 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 22:45:47 +0200
Subject: [PATCH 266/400] fix grabbing SSID info

---
 .../java/info/nightscout/androidaps/MainActivity.kt    |  2 +-
 .../general/automation/triggers/TriggerWifiSsid.kt     |  2 +-
 .../general/nsclient/NsClientReceiverDelegate.java     | 10 +++++++---
 app/src/main/res/values/strings.xml                    |  2 +-
 core/src/main/AndroidManifest.xml                      |  4 ++++
 .../nightscout/androidaps/events/EventNetworkChange.kt |  4 ----
 .../androidaps/receivers/NetworkChangeReceiver.kt      |  3 ++-
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 7881fea604..e54addbf71 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -138,8 +138,8 @@ class MainActivity : NoSplashAppCompatActivity() {
         }
         androidPermission.notifyForStoragePermission(this)
         androidPermission.notifyForBatteryOptimizationPermission(this)
+        androidPermission.notifyForLocationPermissions(this)
         if (config.PUMPDRIVERS) {
-            androidPermission.notifyForLocationPermissions(this)
             androidPermission.notifyForSMSPermissions(this, smsCommunicatorPlugin)
             androidPermission.notifyForSystemWindowPermissions(this)
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
index 49aeec14ed..71839a8fae 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
@@ -47,7 +47,7 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
             aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
             return true
         }
-        if (eventNetworkChange.wifiConnected && comparator.value.check(eventNetworkChange.connectedSsid(), ssid.value)) {
+        if (eventNetworkChange.wifiConnected && comparator.value.check(eventNetworkChange.ssid, ssid.value)) {
             aapsLogger.debug(LTag.AUTOMATION, "Ready for execution: " + friendlyDescription())
             return true
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
index 3bc2bde171..d54f48d511 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java
@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.general.nsclient;
 
+import java.util.Arrays;
+
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -48,6 +50,7 @@ class NsClientReceiverDelegate {
                 ev.isChanged(resourceHelper, R.string.key_ns_allowroaming)
         ) {
             receiverStatusStore.updateNetworkStatus();
+            onStatusEvent(receiverStatusStore.getLastNetworkEvent());
         } else if (ev.isChanged(resourceHelper, R.string.key_ns_chargingonly)) {
             receiverStatusStore.broadcastChargingState();
         }
@@ -92,14 +95,15 @@ class NsClientReceiverDelegate {
 
     boolean calculateStatus(final EventNetworkChange ev) {
         boolean wifiOnly = sp.getBoolean(R.string.key_ns_wifionly, false);
-        String allowedSSIDs = sp.getString(R.string.key_ns_wifi_ssids, "");
+        String allowedSSIDstring = sp.getString(R.string.key_ns_wifi_ssids, "");
+        String[] allowedSSIDs = allowedSSIDstring.split(";");
+        if (allowedSSIDstring.isEmpty()) allowedSSIDs = new String[0];
         boolean allowRoaming = sp.getBoolean(R.string.key_ns_allowroaming, true);
 
         boolean newAllowedState = true;
 
         if (ev.getWifiConnected()) {
-            if (!allowedSSIDs.trim().isEmpty() &&
-                    (!allowedSSIDs.contains(ev.connectedSsid()) && !allowedSSIDs.contains(ev.getSsid()))) {
+            if (allowedSSIDs.length != 0 && !Arrays.asList(allowedSSIDs).contains(ev.getSsid())) {
                 newAllowedState = false;
             }
         } else {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e411e05a7..8719ffd7d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -949,7 +949,7 @@
     <string name="permission">Permission</string>
     <string name="askforpermission">Ask for permission</string>
     <string name="needsystemwindowpermission">Application needs system window permission for notifications</string>
-    <string name="needlocationpermission">Application needs location permission for BT scan</string>
+    <string name="needlocationpermission">Application needs location permission for BT scan and WiFi identification</string>
     <string name="needstoragepermission">Application needs storage permission to be able store log files</string>
     <string name="request">Request</string>
     <string name="insulinsourcesetup">Configure Insulin plugin</string>
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 6d8a02d4c2..9ef7e793bf 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="info.nightscout.androidaps.core">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <application>
diff --git a/core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt b/core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
index 87599a9373..716b2b1810 100644
--- a/core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
+++ b/core/src/main/java/info/nightscout/androidaps/events/EventNetworkChange.kt
@@ -11,8 +11,4 @@ class EventNetworkChange : Event() {
     var ssid = ""
     var roaming = false
     var metered = false
-
-    fun connectedSsid(): String {
-        return StringUtils.removeSurroundingQuotes(ssid)
-    }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
index faeb4632cd..9233ee1b1b 100644
--- a/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
+++ b/core/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.kt
@@ -12,6 +12,7 @@ import info.nightscout.androidaps.events.EventNetworkChange
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.StringUtils
 import javax.inject.Inject
 
 class NetworkChangeReceiver : DaggerBroadcastReceiver() {
@@ -39,7 +40,7 @@ class NetworkChangeReceiver : DaggerBroadcastReceiver() {
                 val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
                 val wifiInfo = wifiManager.connectionInfo
                 if (wifiInfo.supplicantState == SupplicantState.COMPLETED) {
-                    event.ssid = wifiInfo.ssid
+                    event.ssid = StringUtils.removeSurroundingQuotes(wifiInfo.ssid)
                     // aapsLogger.debug(LTag.CORE, "NETCHANGE: Wifi connected. SSID: ${event.connectedSsid()}")
                 }
             }

From a934677f51b2cc90ddfd881fcefc556898af23c3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:04:09 +0200
Subject: [PATCH 267/400] fix tests

---
 ...S_Packet_Bolus_Set_Step_Bolus_StartTest.kt |  2 +-
 ...Packet_Notify_Delivery_Rate_DisplayTest.kt |  2 +-
 .../interfaces/ConstraintsCheckerTest.kt      |  2 +-
 .../nsclient/NsClientReceiverDelegateTest.kt  | 34 +++++++++----------
 .../plugins/pump/danaRS/DanaRSPluginTest.kt   |  2 +-
 .../plugins/source/NSClientPluginTest.kt      |  3 +-
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
index 349eeb673b..0247ff9da5 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest.kt
@@ -55,7 +55,7 @@ class DanaRS_Packet_Bolus_Set_Step_Bolus_StartTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
index 0ec1dd5911..66ac024330 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Notify_Delivery_Rate_DisplayTest.kt
@@ -68,7 +68,7 @@ class DanaRS_Packet_Notify_Delivery_Rate_DisplayTest : DanaRSTestBase() {
 
     @Before
     fun mock() {
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         danaPump.bolusingTreatment = Treatment(packetInjector)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index e4f2e86bbd..9956d09295 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -118,7 +118,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         objectivesPlugin = ObjectivesPlugin(injector, aapsLogger, resourceHelper, activePlugin, sp, Config())
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, treatmentsPlugin, sp, commandQueue, context)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
-        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
index b0441c289f..b3a275d255 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegateTest.kt
@@ -14,13 +14,11 @@ import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers
 import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
-import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
@@ -51,12 +49,12 @@ class NsClientReceiverDelegateTest : TestBase() {
 
     @Test fun testCalculateStatusChargingState() {
         PowerMockito.mockStatic(SP::class.java)
-        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
         var ev = EventChargingState(true, 0)
         Assert.assertTrue(sut!!.calculateStatus(ev))
         ev = EventChargingState(false, 0)
         Assert.assertTrue(sut!!.calculateStatus(ev))
-        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(true)
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(true)
         ev = EventChargingState(true, 0)
         Assert.assertTrue(sut!!.calculateStatus(ev))
         ev = EventChargingState(false, 0)
@@ -67,24 +65,24 @@ class NsClientReceiverDelegateTest : TestBase() {
         PowerMockito.mockStatic(SP::class.java)
         // wifiOnly = false
         // allowRoaming = false as well
-        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
-        Mockito.`when`(sp.getString(ArgumentMatchers.anyInt(), ArgumentMatchers.anyString())).thenReturn("")
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
+        `when`(sp.getString(anyInt(), anyString())).thenReturn("")
         val ev = EventNetworkChange()
         ev.ssid = "<unknown ssid>"
         ev.mobileConnected = true
         ev.wifiConnected = true
         Assert.assertTrue(sut!!.calculateStatus(ev))
         ev.ssid = "test"
-        Mockito.`when`(sp.getString(ArgumentMatchers.anyInt(), ArgumentMatchers.anyString())).thenReturn("\"test\"")
+        `when`(sp.getString(anyInt(), anyString())).thenReturn("test")
         Assert.assertTrue(sut!!.calculateStatus(ev))
-        ev.ssid = "\"test\""
+        ev.ssid = "test"
         Assert.assertTrue(sut!!.calculateStatus(ev))
         ev.wifiConnected = false
         Assert.assertTrue(sut!!.calculateStatus(ev))
 
         // wifiOnly = true
         // allowRoaming = true as well
-        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(true)
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(true)
         ev.wifiConnected = true
         Assert.assertTrue(sut!!.calculateStatus(ev))
         ev.wifiConnected = false
@@ -92,39 +90,39 @@ class NsClientReceiverDelegateTest : TestBase() {
 
         // wifiOnly = false
         // allowRoaming = false as well
-        Mockito.`when`(sp.getBoolean(ArgumentMatchers.anyInt(), ArgumentMatchers.anyBoolean())).thenReturn(false)
+        `when`(sp.getBoolean(anyInt(), anyBoolean())).thenReturn(false)
         ev.wifiConnected = false
         ev.roaming = true
         Assert.assertTrue(!sut!!.calculateStatus(ev))
 
         // wifiOnly = false
         // allowRoaming = true
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        `when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
+        `when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
         ev.wifiConnected = false
         ev.roaming = true
         Assert.assertTrue(sut!!.calculateStatus(ev))
 
         // wifiOnly = true
         // allowRoaming = true
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        `when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
+        `when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
         ev.wifiConnected = false
         ev.roaming = true
         Assert.assertTrue(!sut!!.calculateStatus(ev))
 
         // wifiOnly = true
         // allowRoaming = true
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
+        `when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(true)
+        `when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(true)
         ev.wifiConnected = true
         ev.roaming = true
         Assert.assertTrue(sut!!.calculateStatus(ev))
 
         // wifiOnly = false
         // allowRoaming = false
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
-        Mockito.`when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(false)
+        `when`(sp.getBoolean(R.string.key_ns_wifionly, false)).thenReturn(false)
+        `when`(sp.getBoolean(R.string.key_ns_allowroaming, true)).thenReturn(false)
         ev.wifiConnected = true
         ev.roaming = true
         Assert.assertTrue(sut!!.calculateStatus(ev))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
index d33e3d565c..d1619600d5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRS/DanaRSPluginTest.kt
@@ -65,6 +65,6 @@ class DanaRSPluginTest : DanaRSTestBase() {
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio")
         Mockito.`when`(resourceHelper.gs(eq(R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate")
 
-        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil, Config())
+        danaRSPlugin = DanaRSPlugin(HasAndroidInjector { AndroidInjector { Unit } }, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
index 3cbdb53a7e..1f2da4c70d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/source/NSClientPluginTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.source
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -23,7 +24,7 @@ class NSClientPluginTest : TestBase() {
 
     @Before
     fun setup() {
-        nsClientSourcePlugin = NSClientSourcePlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger, sp)
+        nsClientSourcePlugin = NSClientSourcePlugin(HasAndroidInjector { AndroidInjector { } }, resourceHelper, aapsLogger, sp, Config())
     }
 
     @Test fun advancedFilteringSupported() {

From cd90ae10593cfbc585364f78880304cd2fbc9e5f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:26 +0200
Subject: [PATCH 268/400] New translations strings.xml (Romanian)

---
 app/src/main/res/values-ro-rRO/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index f8268cf955..b5bde6ce86 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -674,7 +674,6 @@
     <string name="startobjective">Începeți primul obiectiv</string>
     <string name="permission">Permisiune</string>
     <string name="askforpermission">Solicitați permisiunea</string>
-    <string name="needlocationpermission">Aplicația necesită permisiune de localizare pentru scanarea prin BT</string>
     <string name="needstoragepermission">Aplicația necesită permisiune de acces la mediul de stocare pentru a putea înregistra jurnalele</string>
     <string name="request">Cerință</string>
     <string name="insulinsourcesetup">Configurați plugin insulină</string>

From 240b8f52705466f5494341dd5cc415e7ca6cf747 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:28 +0200
Subject: [PATCH 269/400] New translations strings.xml (Dutch)

---
 app/src/main/res/values-nl-rNL/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 36d82676be..4f111e8fdf 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -701,7 +701,6 @@
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vragen om toestemming</string>
     <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
-    <string name="needlocationpermission">Toepassing heeft toestemming nodig voor bepalen van Locatie (voor BT scan)</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te kunnen slaan</string>
     <string name="request">Verzoek</string>
     <string name="insulinsourcesetup">Gevoeligheid plugin configureren</string>

From 702e79d8b320561d37068ddae2ad49085e231c32 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:32 +0200
Subject: [PATCH 270/400] New translations strings.xml (Portuguese, Brazilian)

---
 app/src/main/res/values-pt-rBR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index cf7eb0936f..4b2c30c4e7 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -741,7 +741,6 @@
     <string name="startobjective">Iniciar primeiro objetivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
-    <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>

From 8e5cc2b8de8a19bc14aaff99c0c0bca2a2a44228 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:34 +0200
Subject: [PATCH 271/400] New translations strings.xml (Chinese Simplified)

---
 app/src/main/res/values-zh-rCN/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ae888bf46..f566195d3e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -667,7 +667,6 @@
     <string name="startobjective">开始你的第一个目标</string>
     <string name="permission">权限</string>
     <string name="askforpermission">请求权限</string>
-    <string name="needlocationpermission">应用程序需要位置权限用于蓝牙扫描</string>
     <string name="needstoragepermission">应用程序需要存储权限才能存储日志文件</string>
     <string name="request">请求</string>
     <string name="insulinsourcesetup">配置胰岛素插件</string>

From 7ec6d0058eeaa069ac4770a9eec69355abcc9c18 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:35 +0200
Subject: [PATCH 272/400] New translations strings.xml (Turkish)

---
 app/src/main/res/values-tr-rTR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index f012d7e0b8..e3da965f38 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -637,7 +637,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="startobjective">İlk hedefinize başlayın</string>
     <string name="permission">Yetki</string>
     <string name="askforpermission">İzin için sorunuz</string>
-    <string name="needlocationpermission">Uygulama Bluetooth taraması için konum izni gerektiriyor</string>
     <string name="needstoragepermission">Uygulama, log dosyalarını depolayabilmek için depolama izni gerektiriyor</string>
     <string name="request">İstek</string>
     <string name="insulinsourcesetup">İnsülin eklentisini yapılandır</string>

From 27dfa124ccd4634da92b28c8f52bb23414094651 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:37 +0200
Subject: [PATCH 273/400] New translations strings.xml (Swedish)

---
 app/src/main/res/values-sv-rSE/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index d8cfc630fa..3ee7ab1a02 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -796,7 +796,6 @@ Eversense-appen.</string>
     <string name="permission">Behörighet</string>
     <string name="askforpermission">Be om behörighet</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
-    <string name="needlocationpermission">Appen behöver behörighet att använda Platsinfo för att kunna söka efter Bluetooth-enheter</string>
     <string name="needstoragepermission">Appen behöver behörighet att använda Lagring för att kunna spara loggfiler</string>
     <string name="request">Begäran</string>
     <string name="insulinsourcesetup">Konfigurera insticksprogram för insulin</string>

From 9bb3db20e36765f28e4b8f583efbdc4d7bf38bb1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:40 +0200
Subject: [PATCH 274/400] New translations strings.xml (Slovak)

---
 app/src/main/res/values-sk-rSK/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 65589834f6..aad5ebb144 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -792,7 +792,6 @@
     <string name="permission">Povolenie</string>
     <string name="askforpermission">Vyžiadať si povolenie</string>
     <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
-    <string name="needlocationpermission">Aplikácia vyžaduje povolenie \"polohy\", aby mohla vyhľadávať BT zariadenia</string>
     <string name="needstoragepermission">Aplikácia vyžaduje prístup k úložisku, aby mohla ukladať logy</string>
     <string name="request">Požiadavka</string>
     <string name="insulinsourcesetup">Nastavenie inzulínového modulu</string>

From 933fe515fba9cb53e7f378eee6db083934b835d4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:42 +0200
Subject: [PATCH 275/400] New translations strings.xml (Russian)

---
 app/src/main/res/values-ru-rRU/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 5a3d200bb0..9b229c67de 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -794,7 +794,6 @@ Context | Edit Context</string>
     <string name="permission">Права доступа</string>
     <string name="askforpermission">Запросить права доступа</string>
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
-    <string name="needlocationpermission">Приложение нуждается в разрешении на доступ к определению местоположения для сканирования bluetooth</string>
     <string name="needstoragepermission">Приложение нуждается в разрешении доступа к хранению данных для хранения лог-файлов</string>
     <string name="request">Запрос</string>
     <string name="insulinsourcesetup">Настроить плагин инсулина</string>

From 93a0350e5806489016980760036b695bb1712d6a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:43 +0200
Subject: [PATCH 276/400] New translations strings.xml (Portuguese)

---
 app/src/main/res/values-pt-rPT/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 5783674bd7..dddc2122b4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -795,7 +795,6 @@
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
-    <string name="needlocationpermission">Aplicação requer permissão de localização para pesquisa BT</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>

From 023814dd1c8fb61f5c8d56bbd62b2e86a7b09d53 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:45 +0200
Subject: [PATCH 277/400] New translations strings.xml (Polish)

---
 app/src/main/res/values-pl-rPL/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index b27740a0d0..2242a82842 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -764,7 +764,6 @@
     <string name="permission">Uprawnienia</string>
     <string name="askforpermission">Zapytaj o uprawnienia</string>
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
-    <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji, aby przeprowadzić skan BT</string>
     <string name="needstoragepermission">Aplikacja wymaga dostępu do magazynu plików, aby móc przechować pliki logów</string>
     <string name="request">Żądanie</string>
     <string name="insulinsourcesetup">Skonfiguruj wtyczkę insuliny</string>

From e28aad965cd950773e6178783bd814fdfc058863 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:47 +0200
Subject: [PATCH 278/400] New translations strings.xml (Lithuanian)

---
 app/src/main/res/values-lt-rLT/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 31cfb4c38a..3fa84dc857 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -746,7 +746,6 @@
     <string name="permission">Leidimas</string>
     <string name="askforpermission">Prašyti leidimo</string>
     <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
-    <string name="needlocationpermission">Aplikacijai reikia vietos nustatymo leidimo BT skenavimui atlikti</string>
     <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus</string>
     <string name="request">Užklausa</string>
     <string name="insulinsourcesetup">Konfigūruoti insulino įskiepį</string>

From 8557e0ebccabb73b91e4a1f26dc4ccfd4ec60509 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:50 +0200
Subject: [PATCH 279/400] New translations strings.xml (French)

---
 app/src/main/res/values-fr-rFR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index bc9175b0bc..1d10a878b9 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -796,7 +796,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="permission">Autorisation</string>
     <string name="askforpermission">Demande d\'autorisation</string>
     <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
-    <string name="needlocationpermission">L\'application requiert l\'autorisation de localisation pour le balayage Bluetooth</string>
     <string name="needstoragepermission">L\'application requiert une autorisation de stockage de données afin de pouvoir sauvegarder les fichiers journaux</string>
     <string name="request">Demande</string>
     <string name="insulinsourcesetup">Configurer le plugin d\'insuline</string>

From 3a6fb27c6a645a21db69f26aab11194313ba71e7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:52 +0200
Subject: [PATCH 280/400] New translations strings.xml (Korean)

---
 app/src/main/res/values-ko-rKR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 1bf6173947..64d2780b01 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -701,7 +701,6 @@
     <string name="permission">권한</string>
     <string name="askforpermission">권한 요청하기</string>
     <string name="needsystemwindowpermission">알림에 대한 시스템 창 권한이 필요합니다</string>
-    <string name="needlocationpermission">블루투스 스캔을 위해 위치 권한이 필요로 합니다.</string>
     <string name="needstoragepermission">로그 파일을 저장하기 위해 저장공간 권한이 필요로 합니다.</string>
     <string name="request">요청</string>
     <string name="insulinsourcesetup">인슐린 플러그인 설정하기</string>

From e837fc5d8b337c1fa695ca3059df0f20d7f33935 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:54 +0200
Subject: [PATCH 281/400] New translations strings.xml (Italian)

---
 app/src/main/res/values-it-rIT/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 944905858e..57885cad69 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -795,7 +795,6 @@
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
     <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
-    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per eseguire la scansione bluetooth</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
     <string name="insulinsourcesetup">Configura il plugin Insulina</string>

From e836cd3a5383c92e159453ac648077ae6e863838 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:13:58 +0200
Subject: [PATCH 282/400] New translations strings.xml (Greek)

---
 app/src/main/res/values-el-rGR/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 2e2ae28735..02d5bb7ce8 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -677,7 +677,6 @@
     <string name="startobjective">Ξεκινήστε τον πρώτο στόχο</string>
     <string name="permission">Άδεια</string>
     <string name="askforpermission">Ζητείστε άδεια</string>
-    <string name="needlocationpermission">Η εφαρμογή απαιτεί άδεια τοποθεσίας για την αναζήτηση συσκευών BT</string>
     <string name="needstoragepermission">Η εφαρμογή απαιτεί πρόσβαση στη μνήμη για την αποθήκευση αρχείων καταγραφής</string>
     <string name="request">Αίτημα</string>
     <string name="insulinsourcesetup">Ρυθμίστε την προσθήκη ινσουλίνης</string>

From 66fc0174a54a24dfda2a6814e77cb33ce210e50e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:14:00 +0200
Subject: [PATCH 283/400] New translations strings.xml (German)

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

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 44a1cf08b8..0f09e0b68d 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -795,7 +795,6 @@
     <string name="permission">Berechtigung</string>
     <string name="askforpermission">Nach Berechtigung fragen</string>
     <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
-    <string name="needlocationpermission">AndroidAPS benötigt die Standortfreigabe für den BT-Scan.</string>
     <string name="needstoragepermission">AndroidAPS benötigt Zugriff auf den Speicher, um Log-Dateien speichern zu können.</string>
     <string name="request">Anfordern</string>
     <string name="insulinsourcesetup">Insulin-Plugin konfigurieren</string>

From 7bef47f455aa4982762b898719c1ae2d25260c54 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:14:02 +0200
Subject: [PATCH 284/400] New translations strings.xml (Czech)

---
 app/src/main/res/values-cs-rCZ/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4d57748e25..01831a128a 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -795,7 +795,6 @@
     <string name="permission">Povolení</string>
     <string name="askforpermission">Získat povolení</string>
     <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
-    <string name="needlocationpermission">Aplikace vyžaduje povolení \"umístění\", aby mohla vyhledávat BT zařízení</string>
     <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy</string>
     <string name="request">Požadavek</string>
     <string name="insulinsourcesetup">Nastavení inzulínu</string>

From 64528008a8f85a982fd95c070e2c45eaf414601b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:14:04 +0200
Subject: [PATCH 285/400] New translations strings.xml (Bulgarian)

---
 app/src/main/res/values-bg-rBG/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index fb83c22155..b8d11797eb 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -795,7 +795,6 @@
     <string name="permission">Разрешение</string>
     <string name="askforpermission">Питане за разрешение</string>
     <string name="needsystemwindowpermission">ААПС изисква разрешение за да може да Ви уведомява</string>
-    <string name="needlocationpermission">Приложението се нуждае от достъп до вашето местоположение за да активира BT сканиране</string>
     <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове</string>
     <string name="request">Искане</string>
     <string name="insulinsourcesetup">Конфигуриране на модула за Инсулин</string>

From 250023eeb5f1972325c54dcaaf53fa5fdf9cc6a8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:14:06 +0200
Subject: [PATCH 286/400] New translations strings.xml (Afrikaans)

---
 app/src/main/res/values-af-rZA/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 905b4239d3..c9b6fb57fd 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -670,7 +670,6 @@
     <string name="startobjective">Begin jou eerste doelwit</string>
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vra vir toestemming</string>
-    <string name="needlocationpermission">Applikasie benodig ligging toestemming vir BT skandering</string>
     <string name="needstoragepermission">Toepassing benodig stoor toestemming om log leers te skryf</string>
     <string name="request">Versoek</string>
     <string name="insulinsourcesetup">Konfigureer insulien plugin</string>

From 696742f687e945e172ba2303fa52c6d7fbc42b21 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:14:08 +0200
Subject: [PATCH 287/400] New translations strings.xml (Spanish)

---
 app/src/main/res/values-es-rES/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ea3257f4a8..562b6c93c0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -736,7 +736,6 @@
     <string name="startobjective">Comienza tu primer objetivo</string>
     <string name="permission">Permiso</string>
     <string name="askforpermission">Pedir permiso</string>
-    <string name="needlocationpermission">La aplicación necesita permiso de localización para el escaneo de BT</string>
     <string name="needstoragepermission">La aplicación necesita permiso para guardar los logs</string>
     <string name="request">Solicitar</string>
     <string name="insulinsourcesetup">Configurar complemento de insulina</string>

From e9670dd20ab5e821bd8ba7b941ce895d044f58bb Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:35:19 +0200
Subject: [PATCH 288/400] fix displaying cob for nsclient

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index d6f91002e7..56bc5de5d0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -760,7 +760,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 carbAnimation.stop()
                 carbAnimation.selectDrawable(0);
             }
-        }
+        } else overview_cob?.text = cobText
 
         val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
 

From c2ae713cc45f37c1de308f10ef5f3ddcb2d3e706 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:50:38 +0200
Subject: [PATCH 289/400] prevent NPE:

---
 .../plugins/general/overview/OverviewFragment.kt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 56bc5de5d0..de785afeb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -600,42 +600,42 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_apsmode?.visibility = View.VISIBLE
             when {
                 loopPlugin.isEnabled() && loopPlugin.isSuperBolus                       -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_superbolus)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_superbolus)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 loopPlugin.isDisconnected                                               -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_disconnected)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_disconnected)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 loopPlugin.isEnabled() && loopPlugin.isSuspended                        -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_paused)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_paused)
                     overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper)
                 }
 
                 pump.isSuspended                                                        -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_paused)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_paused)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_lgs)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_lgs)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && closedLoopEnabled.value()                     -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_closed)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_closed)
                     overview_apsmode_text?.text = ""
                 }
 
                 loopPlugin.isEnabled() && !closedLoopEnabled.value()                    -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_open)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_open)
                     overview_apsmode_text?.text = ""
                 }
 
                 else                                                                    -> {
-                    overview_apsmode.setImageResource(R.drawable.ic_loop_disabled)
+                    overview_apsmode?.setImageResource(R.drawable.ic_loop_disabled)
                     overview_apsmode_text?.text = ""
                 }
             }

From 2ad29034dd1fcfb5d59924942bc7b1066b34aad2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 2 Jul 2020 23:52:59 +0200
Subject: [PATCH 290/400] New translations strings.xml (Slovak)

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

diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index aad5ebb144..f9ca56d06f 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">Súbor nenájdený</string>
     <string name="nav_export">Exportovať nastavenia</string>
     <string name="nav_import">Importovať nastavenia</string>
+    <string name="openapsma_maxbasal_title">Max. JI/h, ktoré je možné nastaviť pre dočas. bazál</string>
     <string name="openapsma_maxbasal_summary">Táto hodnota je nazývaná v OpenAPS ako \"max basal\"</string>
     <string name="openapsma_maxiob_title">Maximálny bazálny IOB, ktorý OpenAPS môže podať [JI]</string>
     <string name="openapsma_maxiob_summary">Táto hodnota je nazývaná v kontexte OpenAPS ako max IOB, je to maximálne množstvo inzulínu v [JI], ktoré APS môže naraz podať.</string>
@@ -299,6 +300,7 @@
     <string name="primefill">Plnenie/doplňovanie</string>
     <string name="fillwarning">Prosím uistite sa, že hodnota zodpovedá špecifikácií Vášho setu!</string>
     <string name="othersettings_title">Iné</string>
+    <string name="fillbolus_title">Štandardné množstvo inzulínu pre Plnenie/Doplňovanie</string>
     <string name="button1">Tlačidlo 1</string>
     <string name="button2">Tlačidlo 2</string>
     <string name="button3">Tlačidlo 3</string>
@@ -357,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Štandardná hodnota: 4 Toto je druhá kľúčová hodnota. Hovorí, že maximálna hodnota dočasného bazálu nikdy nebude väčšia, ako štvornásobok aktuálneho bazálu. Je to preto, aby se ľudia nedostali do nebezpečných hodnôt skôr, ako pochopia ako OpenAPS pracuje. Znovu, štandardná hodnota je 4 a väčšina ľudí ju nikdy nebude musieť meniť. Pokiaľ nestačí, obvykle je problém niekde inde.</string>
     <string name="openapsama_autosens_max_summary">Štandardná hodnota: 1.2\nToto je bezpečnostné nastavenie pre detekciu citlivosti (a čoskoro autotune). Hovorí, že autosens môže zvýšiť bazály, znížiť ISF a znížiť cieľovú hodnotu glykémie o 20%%.</string>
     <string name="openapsama_autosens_min_summary">Štandardná hodnota: 0.7\nToto je bezpečnostné nastavenie pre automatickú detekciu citlivosti. Hovorí, že automatická detekcia citlivosti môže znížiť bazály, zvýšiť ISF a zvýšiť cieľovú hodnotu glykémie na 70%.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosense takisto upravuje cieľovú glykémiu</string>
     <string name="openapsama_autosens_adjusttargets_summary">Štandardná hodnota: zapnuté\nToto nastavenie hovorí, že automatická detekcia citlivosti môže meniť tiež cieľové hodnoty glykémií.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Štandardná hodnota: 2\nToto nastavenie hovorí, po akú časť z hodnoty DIA uzavretý okruh po boluse čaká a nereaguje na zmeny glykémií (tu 3DIA/2 = 1,5h).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Štandardná hodnota: 3.0 (AMA), alebo 8.0 (SMB) mg/dl/5min. Táto hodnota definuje minimálnu časť vstrebaných sacharidov za každých 5min. Táto hodnota ovplyvňuje výpočet COB.</string>
@@ -792,6 +795,7 @@
     <string name="permission">Povolenie</string>
     <string name="askforpermission">Vyžiadať si povolenie</string>
     <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
+    <string name="needlocationpermission">Aplikácia vyžaduje oprávnenie polohy, pre vyhľadávanie BT a identifikáciu WiFi</string>
     <string name="needstoragepermission">Aplikácia vyžaduje prístup k úložisku, aby mohla ukladať logy</string>
     <string name="request">Požiadavka</string>
     <string name="insulinsourcesetup">Nastavenie inzulínového modulu</string>

From 9361010e469d18a0fa10d2f23607480c2c3b9a41 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 00:19:51 +0200
Subject: [PATCH 291/400] do not run automation in main thread

---
 .../androidaps/plugins/general/automation/AutomationPlugin.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index bde4182aef..b67d270c8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Handler
+import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventBTChange
@@ -39,7 +40,6 @@ import org.json.JSONException
 import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.collections.ArrayList
 
 @Singleton
 class AutomationPlugin @Inject constructor(
@@ -71,7 +71,7 @@ class AutomationPlugin @Inject constructor(
     var executionLog: MutableList<String> = ArrayList()
     var btConnects : MutableList<EventBTChange> = ArrayList()
 
-    private val loopHandler = Handler()
+    private val loopHandler : Handler = Handler(HandlerThread(AutomationPlugin::class.java.simpleName + "Handler").also { it.start() }.looper)
     private lateinit var refreshLoop: Runnable
 
     init {

From 045b79d22feb508ff0d067000745ebec8614a343 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 00:24:01 +0200
Subject: [PATCH 292/400] do not run RandomBgPlugin in main thread

---
 .../nightscout/androidaps/plugins/source/RandomBgPlugin.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
index 30ad89d43a..3678f130a4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.plugins.source
 
 import android.content.Intent
 import android.os.Handler
+import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
@@ -12,6 +13,7 @@ import info.nightscout.androidaps.interfaces.PluginDescription
 import info.nightscout.androidaps.interfaces.PluginType
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.utils.DateUtil
@@ -45,7 +47,7 @@ class RandomBgPlugin @Inject constructor(
     aapsLogger, resourceHelper, injector
 ), BgSourceInterface {
 
-    private val loopHandler = Handler()
+    private val loopHandler : Handler = Handler(HandlerThread(RandomBgPlugin::class.java.simpleName + "Handler").also { it.start() }.looper)
     private lateinit var refreshLoop: Runnable
 
     companion object {

From 79a756f4f4e5e52dd426d0960f0fcd2b2d6c1342 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 09:03:47 +0200
Subject: [PATCH 293/400] New translations strings.xml (Bulgarian)

---
 app/src/main/res/values-bg-rBG/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index b8d11797eb..c7c2676199 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -795,6 +795,7 @@
     <string name="permission">Разрешение</string>
     <string name="askforpermission">Питане за разрешение</string>
     <string name="needsystemwindowpermission">ААПС изисква разрешение за да може да Ви уведомява</string>
+    <string name="needlocationpermission">Приложение се нуждае от достъп до местоположението Ви за сканиране и WiFi идентификация</string>
     <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове</string>
     <string name="request">Искане</string>
     <string name="insulinsourcesetup">Конфигуриране на модула за Инсулин</string>

From 77013703a8d8ab801e565fb56868c3864fe2babd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 09:03:49 +0200
Subject: [PATCH 294/400] New translations strings.xml (Bulgarian)

---
 core/src/main/res/values-bg-rBG/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 6132405070..eddcd3314a 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -75,7 +75,6 @@
     <string name="message">Съобщение</string>
     <string name="ok">ОК</string>
     <string name="cancel">Откажи</string>
-    <string name="dismiss">Разбрах</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy не се поддържа.</string>
     <string name="ble_not_enabled">Bluetooth не е включен.</string>

From e20ea88371fcb66ae04972ab396f191ec7bcf1b6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 10:16:06 +0200
Subject: [PATCH 295/400] New translations strings.xml (German)

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

diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 0f09e0b68d..6da0f89032 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -795,6 +795,7 @@
     <string name="permission">Berechtigung</string>
     <string name="askforpermission">Nach Berechtigung fragen</string>
     <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
+    <string name="needlocationpermission">Die App benötigt die Berechtigung für den Standort, um Bluetooth und WLAN nutzen zu können</string>
     <string name="needstoragepermission">AndroidAPS benötigt Zugriff auf den Speicher, um Log-Dateien speichern zu können.</string>
     <string name="request">Anfordern</string>
     <string name="insulinsourcesetup">Insulin-Plugin konfigurieren</string>

From 1f71da4346b012eb81131a2613ac592102a88f2d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 10:38:16 +0200
Subject: [PATCH 296/400] overview target logging

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index de785afeb0..3622e6ed2b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -655,6 +655,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             val targetUsed = lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
             if (targetUsed != 0.0 && profile.targetMgdl != targetUsed) {
+                aapsLogger.debug("Adjusted target. Profile: ${profile.targetMgdl} APS: $targetUsed")
                 overview_temptarget?.text = Profile.toTargetRangeString(targetUsed, targetUsed, Constants.MGDL, units)
                 overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
                 overview_temptarget?.setBackgroundColor(resourceHelper.gc(R.color.tempTargetBackground))

From 9c57e6b9b91b20c8cc6830bf577ae3b69ecba5ea Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 10:46:19 +0200
Subject: [PATCH 297/400] prevent NPE

---
 .../wearintegration/WatchUpdaterService.java   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
index 0f8feee2fc..88228d1018 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/WatchUpdaterService.java
@@ -152,7 +152,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
         if (wearIntegration()) {
             handler.post(() -> {
-                if (googleApiClient.isConnected()) {
+                if (googleApiClient != null && googleApiClient.isConnected()) {
                     if (ACTION_RESEND.equals(action)) {
                         resendData();
                     } else if (ACTION_OPEN_SETTINGS.equals(action)) {
@@ -180,7 +180,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
                         sendData();
                     }
                 } else {
-                    googleApiClient.connect();
+                    if (googleApiClient != null) googleApiClient.connect();
                 }
             });
         }
@@ -594,7 +594,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
 
     private void sendNotification() {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(OPEN_SETTINGS_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
@@ -608,7 +608,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     private void sendBolusProgress(int progresspercent, String status) {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(BOLUS_PROGRESS_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
@@ -624,7 +624,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     private void sendActionConfirmationRequest(String title, String message, String actionstring) {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(ACTION_CONFIRMATION_REQUEST_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
@@ -644,7 +644,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     private void sendChangeConfirmationRequest(String title, String message, String actionstring) {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(ACTION_CHANGECONFIRMATION_REQUEST_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
@@ -664,7 +664,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     private void sendCancelNotificationRequest(String actionstring) {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             PutDataMapRequest dataMapRequest = PutDataMapRequest.create(ACTION_CANCELNOTIFICATION_REQUEST_PATH);
             //unique content
             dataMapRequest.getDataMap().putLong("timestamp", System.currentTimeMillis());
@@ -683,7 +683,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
 
     private void sendStatus() {
 
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
             Profile profile = profileFunction.getProfile();
             String status = resourceHelper.gs(R.string.noprofile);
             String iobSum, iobDetail, cobString, currentBasal, bgiString;
@@ -747,7 +747,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
     }
 
     private void sendPreferences() {
-        if (googleApiClient.isConnected()) {
+        if (googleApiClient != null && googleApiClient.isConnected()) {
 
             boolean wearcontrol = sp.getBoolean("wearcontrol", false);
 

From e9fc704fa01147e77952d859576963981d6fbf99 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 11:54:13 +0200
Subject: [PATCH 298/400] New translations strings.xml (Italian)

---
 app/src/main/res/values-it-rIT/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 57885cad69..c462a03dc5 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -795,6 +795,7 @@
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
     <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
+    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per lo scansione bluetooth e l\'identificazione WiFi</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
     <string name="insulinsourcesetup">Configura il plugin Insulina</string>

From 95cefccf46f158625830e5fbe739f75813548157 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 12:06:39 +0200
Subject: [PATCH 299/400] New translations strings.xml (Italian)

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

diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index c462a03dc5..c07b82596b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -795,7 +795,7 @@
     <string name="permission">Permesso</string>
     <string name="askforpermission">Chiedi il permesso</string>
     <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
-    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per lo scansione bluetooth e l\'identificazione WiFi</string>
+    <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per la scansione bluetooth e l\'identificazione WiFi</string>
     <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
     <string name="request">Richiesta</string>
     <string name="insulinsourcesetup">Configura il plugin Insulina</string>

From d4a37a574e3fa46224c1f576b3c1dc1e4392c89b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 12:54:01 +0200
Subject: [PATCH 300/400] New translations strings.xml (Czech)

---
 app/src/main/res/values-cs-rCZ/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 01831a128a..b760ef7044 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -795,6 +795,7 @@
     <string name="permission">Povolení</string>
     <string name="askforpermission">Získat povolení</string>
     <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
+    <string name="needlocationpermission">Aplikace potřebuje oprávnění k přístupu k poloze kvůli skenování BT a WiFi identifikaci</string>
     <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy</string>
     <string name="request">Požadavek</string>
     <string name="insulinsourcesetup">Nastavení inzulínu</string>

From 888e7f4ab638fd6613242604e5628f0c1a53c563 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 20:09:57 +0200
Subject: [PATCH 301/400] keep reference time for cached values

---
 .../iobCobCalculator/InMemoryGlucoseValue.kt  |  3 +-
 .../IobCobCalculatorPlugin.java               | 92 ++++++++++++-------
 .../nightscout/androidaps/utils/DateUtil.java |  8 +-
 3 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt
index 55acd27b40..497117764e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/InMemoryGlucoseValue.kt
@@ -2,7 +2,8 @@ package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import info.nightscout.androidaps.db.BgReading
 
-class InMemoryGlucoseValue constructor(var timestamp: Long = 0L, var value: Double = 0.0) {
+class InMemoryGlucoseValue @JvmOverloads constructor(var timestamp: Long = 0L, var value: Double = 0.0, var interpolated : Boolean = false) {
 
     constructor(gv: BgReading) : this(gv.date, gv.value)
+    // var generated : value doesn't correspond to real value with timestamp close to real BG
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 138325ef58..5a03702d59 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -79,6 +79,11 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     private LongSparseArray<AutosensData> autosensDataTable = new LongSparseArray<>(); // oldest at index 0
     private LongSparseArray<BasalData> basalDataTable = new LongSparseArray<>(); // oldest at index 0
 
+    // we need to make sure that bucketed_data will always have the same timestamp for correct use of cached values
+    // once referenceTime != null all bucketed data should be (x * 5min) from referenceTime
+    private Long referenceTime = null;
+    private Boolean lastUsed5minCalculation = null; // true if used 5min bucketed data
+
     private volatile List<BgReading> bgReadings = null; // newest at index 0
     private volatile List<InMemoryGlucoseValue> bucketed_data = null;
 
@@ -135,9 +140,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 .subscribe(event -> {
                     stopCalculation("onEventConfigBuilderChange");
                     synchronized (dataLock) {
-                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of configuration change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
-                        iobTable = new LongSparseArray<>();
-                        autosensDataTable = new LongSparseArray<>();
+                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of configuration change.");
+                        resetData();
                     }
                     runCalculation("onEventConfigBuilderChange", System.currentTimeMillis(), false, true, event);
                 }, fabricPrivacy::logException)
@@ -152,10 +156,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     }
                     stopCalculation("onNewProfile");
                     synchronized (dataLock) {
-                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of new profile. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records");
-                        iobTable = new LongSparseArray<>();
-                        autosensDataTable = new LongSparseArray<>();
-                        basalDataTable = new LongSparseArray<>();
+                        getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of new profile.");
+                        resetData();
                     }
                     runCalculation("onNewProfile", System.currentTimeMillis(), false, true, event);
                 }, fabricPrivacy::logException)
@@ -185,10 +187,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     ) {
                         stopCalculation("onEventPreferenceChange");
                         synchronized (dataLock) {
-                            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of preference change. IOB: " + iobTable.size() + " Autosens: " + autosensDataTable.size() + " records" + " BasalData: " + basalDataTable.size() + " records");
-                            iobTable = new LongSparseArray<>();
-                            autosensDataTable = new LongSparseArray<>();
-                            basalDataTable = new LongSparseArray<>();
+                            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data because of preference change.");
+                            resetData();
                         }
                         runCalculation("onEventPreferenceChange", System.currentTimeMillis(), false, true, event);
                     }
@@ -248,6 +248,19 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         return rounded;
     }
 
+    long adjustToReferenceTime(long someTime) {
+        if (referenceTime == null) {
+            referenceTime = someTime;
+            return someTime;
+        }
+        long diff = Math.abs(someTime - referenceTime);
+        diff %= T.mins(5).msecs();
+        if (diff > T.mins(2).plus(T.secs(30)).msecs())
+            diff = diff - T.mins(5).msecs();
+        long newTime = someTime + diff;
+        return newTime;
+    }
+
     void loadBgData(long to) {
         Profile profile = profileFunction.getProfile(to);
         double dia = Constants.defaultDIA;
@@ -291,7 +304,23 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         }
     }
 
+    private void resetData() {
+        synchronized (dataLock) {
+            iobTable = new LongSparseArray<>();
+            autosensDataTable = new LongSparseArray<>();
+            basalDataTable = new LongSparseArray<>();
+            absIobTable = new LongSparseArray<>();
+        }
+    }
+
     public void createBucketedData() {
+        boolean fiveMinData = isAbout5minData();
+        if (lastUsed5minCalculation != null && lastUsed5minCalculation != fiveMinData) {
+            // changing mode => clear cache
+            getAapsLogger().debug("Invalidating cached data because of changed mode.");
+            resetData();
+        }
+        lastUsed5minCalculation = fiveMinData;
         if (isAbout5minData())
             createBucketedData5min();
         else
@@ -332,6 +361,8 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
 
         bucketed_data = new ArrayList<>();
         long currentTime = bgReadings.get(0).date - bgReadings.get(0).date % T.mins(5).msecs();
+        currentTime = adjustToReferenceTime(currentTime);
+        getAapsLogger().debug("Adjusted time " + dateUtil.dateAndTimeAndSecondsString(currentTime));
         //log.debug("First reading: " + new Date(currentTime).toLocaleString());
 
         while (true) {
@@ -348,9 +379,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 long timeDiffToNew = newer.date - currentTime;
 
                 double currentBg = newer.value - (double) timeDiffToNew / (newer.date - older.date) * bgDelta;
-                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
-                newBgreading.setTimestamp(currentTime);
-                newBgreading.setValue(Math.round(currentBg));
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue(currentTime, Math.round(currentBg), true);
                 bucketed_data.add(newBgreading);
                 //log.debug("BG: " + newBgreading.value + " (" + new Date(newBgreading.date).toLocaleString() + ") Prev: " + older.value + " (" + new Date(older.date).toLocaleString() + ") Newer: " + newer.value + " (" + new Date(newer.date).toLocaleString() + ")");
             }
@@ -388,12 +417,10 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                 while (elapsed_minutes > 5) {
                     nextbgTime = lastbgTime - 5 * 60 * 1000;
                     j++;
-                    InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
-                    newBgreading.setTimestamp(nextbgTime);
                     double gapDelta = bgReadings.get(i).value - lastbg;
                     //console.error(gapDelta, lastbg, elapsed_minutes);
                     double nextbg = lastbg + (5d / elapsed_minutes * gapDelta);
-                    newBgreading.setValue(Math.round(nextbg));
+                    InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue(nextbgTime, Math.round(nextbg), true);
                     //console.error("Interpolated", bucketed_data[j]);
                     bucketed_data.add(newBgreading);
                     getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
@@ -403,16 +430,12 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
                     lastbgTime = nextbgTime;
                 }
                 j++;
-                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
-                newBgreading.setValue(bgReadings.get(i).value);
-                newBgreading.setTimestamp(bgTime);
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue(bgTime, bgReadings.get(i).value);
                 bucketed_data.add(newBgreading);
                 getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else if (Math.abs(elapsed_minutes) > 2) {
                 j++;
-                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue();
-                newBgreading.setValue(bgReadings.get(i).value);
-                newBgreading.setTimestamp(bgTime);
+                InMemoryGlucoseValue newBgreading = new InMemoryGlucoseValue(bgTime, bgReadings.get(i).value);
                 bucketed_data.add(newBgreading);
                 getAapsLogger().debug(LTag.AUTOSENS, "Adding. bgTime: " + DateUtil.toISOString(bgTime) + " lastbgTime: " + DateUtil.toISOString(lastbgTime) + " " + newBgreading.toString());
             } else {
@@ -422,12 +445,15 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         }
 
         // Normalize bucketed data
+        InMemoryGlucoseValue oldest = bucketed_data.get(bucketed_data.size() - 1);
+        oldest.setTimestamp(adjustToReferenceTime(oldest.getTimestamp()));
+        getAapsLogger().debug("Adjusted time " + dateUtil.dateAndTimeAndSecondsString(oldest.getTimestamp()));
         for (int i = bucketed_data.size() - 2; i >= 0; i--) {
             InMemoryGlucoseValue current = bucketed_data.get(i);
             InMemoryGlucoseValue previous = bucketed_data.get(i + 1);
             long msecDiff = current.getTimestamp() - previous.getTimestamp();
             long adjusted = (msecDiff - T.mins(5).msecs()) / 1000;
-            getAapsLogger().debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + DateUtil.toISOString(current.getTimestamp()) + " to: " + DateUtil.toISOString(previous.getTimestamp() + T.mins(5).msecs()) + " by " + adjusted + " sec");
+            getAapsLogger().debug(LTag.AUTOSENS, "Adjusting bucketed data time. Current: " + dateUtil.dateAndTimeAndSecondsString(current.getTimestamp()) + " to: " + dateUtil.dateAndTimeAndSecondsString(previous.getTimestamp() + T.mins(5).msecs()) + " by " + adjusted + " sec");
             if (Math.abs(adjusted) > 90) {
                 // too big adjustment, fallback to non 5 min data
                 getAapsLogger().debug(LTag.AUTOSENS, "Fallback to non 5 min data");
@@ -450,7 +476,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         if (limitDataToOldestAvailable) {
             getBGDataFrom = Math.max(oldestDataAvailable, (long) (from - T.hours(1).msecs() * (24 + dia)));
             if (getBGDataFrom == oldestDataAvailable)
-                getAapsLogger().debug(LTag.AUTOSENS, "Limiting data to oldest available temps: " + dateUtil.dateAndTimeString(oldestDataAvailable));
+                getAapsLogger().debug(LTag.AUTOSENS, "Limiting data to oldest available temps: " + dateUtil.dateAndTimeAndSecondsString(oldestDataAvailable));
         } else
             getBGDataFrom = (long) (from - T.hours(1).msecs() * (24 + dia));
         return getBGDataFrom;
@@ -685,7 +711,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             return null;
         }
         if (data.time < System.currentTimeMillis() - 11 * 60 * 1000) {
-            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + dateUtil.dateAndTimeString(data.time));
+            getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA null: data is old (" + reason + ") size()=" + autosensDataTable.size() + " lastdata=" + dateUtil.dateAndTimeAndSecondsString(data.time));
             return null;
         } else {
             getAapsLogger().debug(LTag.AUTOSENS, "AUTOSENSDATA (" + reason + ") " + data.toString());
@@ -696,7 +722,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     @Override
     public String lastDataTime() {
         if (autosensDataTable.size() > 0)
-            return dateUtil.dateAndTimeString(autosensDataTable.valueAt(autosensDataTable.size() - 1).time);
+            return dateUtil.dateAndTimeAndSecondsString(autosensDataTable.valueAt(autosensDataTable.size() - 1).time);
         else
             return "autosensDataTable empty";
     }
@@ -817,7 +843,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
     }
 
     public void runCalculation(String from, long end, boolean bgDataReload, boolean limitDataToOldestAvailable, Event cause) {
-        getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + dateUtil.dateAndTimeString(end));
+        getAapsLogger().debug(LTag.AUTOSENS, "Starting calculation thread: " + from + " to " + dateUtil.dateAndTimeAndSecondsString(end));
         if (thread == null || thread.getState() == Thread.State.TERMINATED) {
             if (sensitivityOref1Plugin.isEnabled())
                 thread = new IobCobOref1Thread(injector, this, treatmentsPlugin, from, end, bgDataReload, limitDataToOldestAvailable, cause);
@@ -834,10 +860,10 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         synchronized (dataLock) {
             // clear up 5 min back for proper COB calculation
             long time = ev.getTime() - 5 * 60 * 1000L;
-            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data to: " + dateUtil.dateAndTimeString(time));
+            getAapsLogger().debug(LTag.AUTOSENS, "Invalidating cached data to: " + dateUtil.dateAndTimeAndSecondsString(time));
             for (int index = iobTable.size() - 1; index >= 0; index--) {
                 if (iobTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from iobTable: " + dateUtil.dateAndTimeString(iobTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from iobTable: " + dateUtil.dateAndTimeAndSecondsString(iobTable.keyAt(index)));
                     iobTable.removeAt(index);
                 } else {
                     break;
@@ -845,7 +871,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = absIobTable.size() - 1; index >= 0; index--) {
                 if (absIobTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from absIobTable: " + dateUtil.dateAndTimeString(absIobTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from absIobTable: " + dateUtil.dateAndTimeAndSecondsString(absIobTable.keyAt(index)));
                     absIobTable.removeAt(index);
                 } else {
                     break;
@@ -853,7 +879,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = autosensDataTable.size() - 1; index >= 0; index--) {
                 if (autosensDataTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + dateUtil.dateAndTimeString(autosensDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from autosensDataTable: " + dateUtil.dateAndTimeAndSecondsString(autosensDataTable.keyAt(index)));
                     autosensDataTable.removeAt(index);
                 } else {
                     break;
@@ -861,7 +887,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
             }
             for (int index = basalDataTable.size() - 1; index >= 0; index--) {
                 if (basalDataTable.keyAt(index) > time) {
-                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from basalDataTable: " + dateUtil.dateAndTimeString(basalDataTable.keyAt(index)));
+                    getAapsLogger().debug(LTag.AUTOSENS, "Removing from basalDataTable: " + dateUtil.dateAndTimeAndSecondsString(basalDataTable.keyAt(index)));
                     basalDataTable.removeAt(index);
                 } else {
                     break;
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
index c5c5b68335..afa469f468 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/DateUtil.java
@@ -215,18 +215,14 @@ public class DateUtil {
         return dateString(mills) + " " + timeStringWithSeconds(mills);
     }
 
-    public static String dateAndTimeFullString(long mills) {
-        return dateString(mills) + " " + timeFullString(mills);
-    }
-
     public static String minAgo(ResourceHelper resourceHelper, long time) {
         int mins = (int) ((now() - time) / 1000 / 60);
         return resourceHelper.gs(R.string.minago, mins);
     }
 
     public static String minAgoShort(long time) {
-        Integer mins = (int) ((time - now()) / 1000 / 60);
-        return (mins > 0 ? "+" : "") + mins.toString();
+        int mins = (int) ((time - now()) / 1000 / 60);
+        return (mins > 0 ? "+" : "") + Integer.toString(mins);
     }
 
     public static String hourAgo(long time, ResourceHelper resourceHelper) {

From 9266546d1c70029b55ea07bf617d676ce014c3f4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 20:21:25 +0200
Subject: [PATCH 302/400] RSv3 support

---
 .../info/nightscout/androidaps/danars/services/BLEComm.kt     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 0ce9182f80..e3e0bc4db0 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -451,9 +451,6 @@ class BLEComm @Inject internal constructor(
             // v3 2nd layer encryption
             v3Encryption = true
             danaPump.v3RSPump = true
-            rxBus.send(EventNewNotification(Notification(Notification.UNSUPPORTED_FIRMWARE, resourceHelper.gs(R.string.unsupportedfirmware), Notification.URGENT)))
-            disconnect("Wrong firmware")
-            /*
             val model = decryptedBuffer[5]
             // val protocol = decryptedBuffer[7]
             if (model == 0x05.toByte()) {
@@ -481,7 +478,6 @@ class BLEComm @Inject internal constructor(
                 val bytes: ByteArray = bleEncryption.getEncryptedPacket(BleEncryption.DANAR_PACKET__OPCODE_ENCRYPTION__GET_EASYMENU_CHECK, null, null)
                 writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
             }
-            */
             // response PUMP : error status
         } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'P'.toByte() && decryptedBuffer[3] == 'U'.toByte() && decryptedBuffer[4] == 'M'.toByte() && decryptedBuffer[5] == 'P'.toByte()) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (PUMP)" + " " + DanaRS_Packet.toHexString(decryptedBuffer))

From b02992e46b6d8f7d9df8ff414f0af5b6ddb9f4c8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 3 Jul 2020 21:07:20 +0200
Subject: [PATCH 303/400] fix tests

---
 .../plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java | 2 +-
 .../GlucoseStatusTest.kt                                     | 5 +----
 .../IobCobCalculatorPluginTest.kt                            | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename app/src/test/java/info/nightscout/androidaps/plugins/iob/{iobCobCalculatorPlugin => iobCobCalculator}/GlucoseStatusTest.kt (97%)
 rename app/src/test/java/info/nightscout/androidaps/plugins/iob/{iobCobCalculatorPlugin => iobCobCalculator}/IobCobCalculatorPluginTest.kt (99%)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 5a03702d59..50a65dc689 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -81,7 +81,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
 
     // we need to make sure that bucketed_data will always have the same timestamp for correct use of cached values
     // once referenceTime != null all bucketed data should be (x * 5min) from referenceTime
-    private Long referenceTime = null;
+    Long referenceTime = null;
     private Boolean lastUsed5minCalculation = null; // true if used 5min bucketed data
 
     private volatile List<BgReading> bgReadings = null; // newest at index 0
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusTest.kt
similarity index 97%
rename from app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
rename to app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusTest.kt
index b7b421035b..1f96b86b83 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/GlucoseStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/GlucoseStatusTest.kt
@@ -1,13 +1,10 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.general.nsclient.data.NSSgv
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.T
 import org.json.JSONException
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPluginTest.kt
similarity index 99%
rename from app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
rename to app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPluginTest.kt
index 93a30ca973..9bb58a0738 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculatorPlugin/IobCobCalculatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPluginTest.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.iob.iobCobCalculatorPlugin
+package info.nightscout.androidaps.plugins.iob.iobCobCalculator
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
@@ -7,7 +7,6 @@ import info.nightscout.androidaps.db.BgReading
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
@@ -340,6 +339,7 @@ class IobCobCalculatorPluginTest : TestBase() {
         bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:50:03Z")).value(100.0))
         bgReadingList.add(BgReading(injector).date(DateUtil.fromISODateString("2018-09-05T03:44:57Z")).value(100.0))
         iobCobCalculatorPlugin.bgReadings = bgReadingList
+        iobCobCalculatorPlugin.referenceTime = null
         Assert.assertEquals(true, iobCobCalculatorPlugin.isAbout5minData)
         iobCobCalculatorPlugin.createBucketedData()
         Assert.assertEquals(DateUtil.fromISODateString("2018-09-05T13:34:57Z").time, iobCobCalculatorPlugin.bucketedData[0].timestamp)

From 91bc31ba1b0172d2e074297fe200da02720b355b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 4 Jul 2020 10:22:37 +0200
Subject: [PATCH 304/400] fix tablet mode

---
 .../general/overview/OverviewFragment.kt      | 29 +++++++++----------
 .../dana/activities/DanaHistoryActivity.kt    |  4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 3622e6ed2b..acc33ba130 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -158,7 +158,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     private val secondaryGraphs = ArrayList<GraphView>()
     private val secondaryGraphsLabel = ArrayList<TextView>()
 
-    private lateinit var carbAnimation: AnimationDrawable
+    private var carbAnimation: AnimationDrawable? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -190,9 +190,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_bggraph?.gridLabelRenderer?.labelVerticalWidth = axisWidth
         overview_bggraph?.layoutParams?.height = resourceHelper.dpToPx(skinProvider.activeSkin().mainGraphHeight)
 
-        carbAnimation = overview_carbs_icon.background as AnimationDrawable
-        carbAnimation.setEnterFadeDuration(1200)
-        carbAnimation.setExitFadeDuration(1200)
+        carbAnimation = overview_carbs_icon?.background as AnimationDrawable?
+        carbAnimation?.setEnterFadeDuration(1200)
+        carbAnimation?.setExitFadeDuration(1200)
 
         rangeToDisplay = sp.getInt(R.string.key_rangetodisplay, 6)
 
@@ -643,6 +643,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             overview_apsmode_text?.visibility = View.GONE
         }
         val lastRun = loopPlugin.lastRun
+        val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
 
         // temp target
         val tempTarget = treatmentsPlugin.tempTargetFromHistory
@@ -682,9 +683,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             ?: resourceHelper.gc(R.color.defaulttextcolor))
 
         if (activeTemp != null)
-            overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low)
+            overview_basebasal_icon?.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low)
         else
-            overview_basebasal_icon.setImageResource(R.drawable.ic_cp_basal_no_tbr)
+            overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_no_tbr)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
@@ -750,21 +751,19 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (config.APS && lastRun?.constraintsProcessed != null) {
             if (lastRun.constraintsProcessed!!.carbsReq > 0) {
                 //only display carbsreq when carbs havnt been entered recently
-                if (treatmentsPlugin.lastCarbTime < lastRun.lastAPSRun){
+                if (treatmentsPlugin.lastCarbTime < lastRun.lastAPSRun) {
                     cobText = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
                 }
                 overview_cob?.text = cobText
-                if (!carbAnimation.isRunning)
-                    carbAnimation.start()
+                if (carbAnimation?.isRunning == false)
+                    carbAnimation?.start()
             } else {
                 overview_cob?.text = cobText
-                carbAnimation.stop()
-                carbAnimation.selectDrawable(0);
+                carbAnimation?.stop()
+                carbAnimation?.selectDrawable(0)
             }
         } else overview_cob?.text = cobText
 
-        val predictionsAvailable = if (config.APS) lastRun?.request?.hasPredictions == true else config.NSCLIENT
-
         // pump status from ns
         overview_pump?.text = nsDeviceStatus.pumpStatus
         overview_pump?.setOnClickListener { activity?.let { OKDialog.show(it, resourceHelper.gs(R.string.pump), nsDeviceStatus.extendedPumpStatus) } }
@@ -779,9 +778,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         // Sensitivity
         if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) {
-            overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
+            overview_sensitivity_icon?.setImageResource(R.drawable.ic_swap_vert_black_48dp_green)
         } else {
-            overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert)
+            overview_sensitivity_icon?.setImageResource(R.drawable.ic_x_swap_vert)
         }
 
         overview_sensitivity?.text =
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index 05dbba234c..56faab3e57 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -109,7 +109,7 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
         danar_history_spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
 
         danar_history_reload.setOnClickListener {
-            val selected = danar_history_spinner.selectedItem as TypeList
+            val selected = danar_history_spinner.selectedItem as TypeList? ?: return@setOnClickListener
             runOnUiThread {
                 danar_history_reload?.visibility = View.GONE
                 danar_history_status?.visibility = View.VISIBLE
@@ -127,7 +127,7 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
         }
         danar_history_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
-                val selected = danar_history_spinner?.selectedItem as TypeList? ?: return
+                val selected = typeList[position]
                 loadDataFromDB(selected.type)
                 showingType = selected.type
             }

From 73cb4856077f6e547651109e5cccc06c2a2af167 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 4 Jul 2020 21:57:27 +0200
Subject: [PATCH 305/400] Warn user of insecure fallback on missing master
 password and activated fingerprint

---
 .../activities/MyPreferenceFragment.kt        | 44 ++++++++++++++++---
 app/src/main/res/values/protection.xml        |  2 +
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 1d8740f631..fce062f89f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -13,16 +13,20 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.AndroidSupportInjection
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
 import info.nightscout.androidaps.interfaces.PluginBase
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.automation.AutomationPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.MaintenancePlugin
@@ -34,10 +38,6 @@ import info.nightscout.androidaps.plugins.general.wear.WearPlugin
 import info.nightscout.androidaps.plugins.general.xdripStatusline.StatusLinePlugin
 import info.nightscout.androidaps.plugins.insulin.InsulinOrefFreePeakPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
@@ -204,14 +204,44 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             activity?.recreate()
             return
         }
-        if (key == resourceHelper.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false))
+        if (key == resourceHelper.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
             activity?.let {
                 show(it, resourceHelper.gs(R.string.configbuilder_sensitivity), resourceHelper.gs(R.string.sensitivity_warning))
             }
+        }
+        checkForBiometricFallback(key)
 
         updatePrefSummary(findPreference(key))
     }
 
+    private fun checkForBiometricFallback(key: String) {
+        // Biometric protection activated without set master password
+        if ((resourceHelper.gs(R.string.key_settings_protection) == key ||
+                resourceHelper.gs(R.string.key_application_protection) == key ||
+                resourceHelper.gs(R.string.key_bolus_protection) == key) &&
+            sp.getString(R.string.key_master_password, "") == "" &&
+            sp.getInt(key, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal
+        ) {
+            activity?.let {
+                val title = resourceHelper.gs(R.string.unsecure_fallback_biometric)
+                val message = resourceHelper.gs(R.string.master_password_missing, resourceHelper.gs(R.string.configbuilder_general), resourceHelper.gs(R.string.protection))
+                show(it, title = title, message = message)
+            }
+        }
+
+        // Master password erased with activated Biometric protection
+        val isBiometricActivated = sp.getInt(R.string.key_settings_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal ||
+            sp.getInt(R.string.key_application_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal ||
+            sp.getInt(R.string.key_bolus_protection, ProtectionCheck.ProtectionType.NONE.ordinal) == ProtectionCheck.ProtectionType.BIOMETRIC.ordinal
+        if (resourceHelper.gs(R.string.key_master_password) == key && sp.getString(key, "") == "" && isBiometricActivated) {
+            activity?.let {
+                val title = resourceHelper.gs(R.string.unsecure_fallback_biometric)
+                val message = resourceHelper.gs(R.string.unsecure_fallback_descriotion_biometric)
+                show(it, title = title, message = message)
+            }
+        }
+    }
+
     @SuppressLint("RestrictedApi")
     private fun addPreferencesFromResource(@XmlRes preferencesResId: Int, key: String?) {
         val xmlRoot = preferenceManager.inflateFromResource(context,
@@ -276,7 +306,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         }
 
         for (plugin in pluginStore.plugins) {
-            pref?.let { it.key?.let { plugin.updatePreferenceSummary(pref) }}
+            pref?.let { it.key?.let { plugin.updatePreferenceSummary(pref) } }
         }
 
         val hmacPasswords = arrayOf(
diff --git a/app/src/main/res/values/protection.xml b/app/src/main/res/values/protection.xml
index bb09c5ca9e..0b39654d2b 100644
--- a/app/src/main/res/values/protection.xml
+++ b/app/src/main/res/values/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">No protection</string>
     <string name="protection">Protection</string>
     <string name="master_password_missing">Master password is not set!\n\nPlease set your Master password in Preferences (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Unsecure Fallback</string>
+    <string name="unsecure_fallback_descriotion_biometric">In order to be effective, biometric protection needs a master password set for fallback.\n\nPlease set a master password!</string>
 
     <string name="password_set">Password set!</string>
     <string name="password_not_set">Password not set</string>

From c45de9af11dc1a35f0178744f5da4dfaca41ffaa Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 4 Jul 2020 21:58:51 +0200
Subject: [PATCH 306/400] update libs

---
 app/build.gradle    | 4 ++--
 build.gradle        | 6 +++---
 core/build.gradle   | 4 ++--
 dana/build.gradle   | 2 +-
 danar/build.gradle  | 2 +-
 danars/build.gradle | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5ceed5c438..8b9a0adc36 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -243,9 +243,9 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
     implementation "com.google.android.gms:play-services-location:17.0.0"
-    implementation 'com.google.firebase:firebase-core:17.4.2'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
     implementation 'com.google.firebase:firebase-auth:19.3.1'
-    implementation 'com.google.firebase:firebase-database:19.3.0'
+    implementation 'com.google.firebase:firebase-database:19.3.1'
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
diff --git a/build.gradle b/build.gradle
index 1e9b924fc7..acf667df6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,15 @@
 buildscript {
     ext {
         kotlin_version = '1.3.72'
-        android_ktx_version = '1.2.0'
+        coreVersion = '1.3.0'
         rxjava_version = '2.2.19'
         rxandroid_version = '2.1.1'
         rxkotlin_version = '2.4.0'
         room_version = '2.2.5'
         lifecycle_version = '2.2.0'
-        dagger_version = '2.28'
+        dagger_version = '2.28.1'
         coroutinesVersion = '1.3.7'
-        activityVersion = '1.2.0-alpha05'
+        activityVersion = '1.2.0-alpha06'
         ormLiteVersion = "4.46"
     }
     repositories {
diff --git a/core/build.gradle b/core/build.gradle
index 5f2fed073e..1362716c47 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -58,8 +58,8 @@ dependencies {
     //Logger
     implementation 'org.slf4j:slf4j-api:1.7.30'
     //Fabric
-    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.2'
-    implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
+    implementation 'com.google.firebase:firebase-analytics-ktx:17.4.3'
+    implementation 'com.google.firebase:firebase-crashlytics:17.1.0'
 
     //RxBus
     implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
diff --git a/dana/build.gradle b/dana/build.gradle
index 08a34677fa..48f8c44cce 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.core:core-ktx:${coreVersion}"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
diff --git a/danar/build.gradle b/danar/build.gradle
index 878641c87a..349db5dbad 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.core:core-ktx:${coreVersion}"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 
diff --git a/danars/build.gradle b/danars/build.gradle
index 4e991b502d..e27dc5df75 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.core:core-ktx:${coreVersion}"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
 

From b91f8e668ad0cc95f236b7d204ac45d94a79d38e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 6 Jul 2020 13:52:10 +0200
Subject: [PATCH 307/400] Profile comparator

---
 .../androidaps/activities/SurveyActivity.kt   |  25 ++--
 .../nightscout/androidaps/data/Profile.java   |   2 +-
 .../androidaps/dialogs/ProfileViewerDialog.kt | 138 ++++++++++++++++--
 .../treatments/fragments/ProfileGraph.kt      |  41 +++++-
 core/src/main/res/values/colors.xml           |   1 +
 5 files changed, 180 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index ff3e361a9b..86c90e1657 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -8,9 +8,9 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.utils.ActivityMonitor
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.InstanceId
@@ -62,16 +62,19 @@ class SurveyActivity : NoSplashAppCompatActivity() {
                 ToastUtils.showToastInUiThread(this, R.string.invalidweight)
                 return@setOnClickListener
             }
-            val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
-            val args = Bundle()
-            args.putLong("time", DateUtil.now())
-            args.putInt("mode", ProfileViewerDialog.Mode.CUSTOM_PROFILE.ordinal)
-            args.putString("customProfile", profile.data.toString())
-            args.putString("customProfileUnits", profile.units)
-            args.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
-            val pvd = ProfileViewerDialog()
-            pvd.arguments = args
-            pvd.show(supportFragmentManager, "ProfileViewDialog")
+            profileFunction.getProfile()?.let { runningProfile ->
+                val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+                ProfileViewerDialog().also { pvd ->
+                    pvd.arguments = Bundle().also {
+                        it.putLong("time", DateUtil.now())
+                        it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
+                        it.putString("customProfile", runningProfile.data.toString())
+                        it.putString("customProfile2", profile.data.toString())
+                        it.putString("customProfileUnits", profile.units)
+                        it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
+                    }
+                }.show(supportFragmentManager, "ProfileViewDialog")
+            }
         }
 
         survey_submit.setOnClickListener {
diff --git a/core/src/main/java/info/nightscout/androidaps/data/Profile.java b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
index 7f583663bb..9fe8c7846e 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/core/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -370,7 +370,7 @@ public class Profile {
         return lastValue;
     }
 
-    protected String format_HH_MM(Integer timeAsSeconds) {
+    public static String format_HH_MM(Integer timeAsSeconds) {
         String time;
         int hour = timeAsSeconds / 60 / 60;
         int minutes = (timeAsSeconds - hour * 60 * 60) / 60;
diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 56e48bd894..75708b76ae 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.dialogs
 
 import android.os.Bundle
+import android.text.Spanned
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,10 +15,12 @@ import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.HtmlHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlinx.android.synthetic.main.close.*
 import kotlinx.android.synthetic.main.dialog_profileviewer.*
 import org.json.JSONObject
+import java.text.DecimalFormat
 import javax.inject.Inject
 
 class ProfileViewerDialog : DaggerDialogFragment() {
@@ -32,11 +35,13 @@ class ProfileViewerDialog : DaggerDialogFragment() {
     enum class Mode(val i: Int) {
         RUNNING_PROFILE(1),
         CUSTOM_PROFILE(2),
-        DB_PROFILE(3)
+        DB_PROFILE(3),
+        PROFILE_COMPARE(4)
     }
 
     private var mode: Mode = Mode.RUNNING_PROFILE
     private var customProfileJson: String = ""
+    private var customProfileJson2: String = ""
     private var customProfileName: String = ""
     private var customProfileUnits: String = Constants.MGDL
 
@@ -49,6 +54,8 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             customProfileJson = bundle.getString("customProfile", "")
             customProfileUnits = bundle.getString("customProfileUnits", Constants.MGDL)
             customProfileName = bundle.getString("customProfileName", "")
+            if (mode == Mode.PROFILE_COMPARE)
+                customProfileJson2 = bundle.getString("customProfile2", "")
         }
 
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
@@ -65,11 +72,13 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         close.setOnClickListener { dismiss() }
 
         val profile: Profile?
+        val profile2: Profile?
         val profileName: String?
         val date: String?
         when (mode) {
             Mode.RUNNING_PROFILE -> {
                 profile = activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.profileObject
+                profile2 = null
                 profileName = activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.customizedName
                 date = dateUtil.dateAndTimeString(activePlugin.activeTreatments.getProfileSwitchFromHistory(time)?.date
                     ?: 0)
@@ -78,6 +87,15 @@ class ProfileViewerDialog : DaggerDialogFragment() {
 
             Mode.CUSTOM_PROFILE  -> {
                 profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
+                profile2 = null
+                profileName = customProfileName
+                date = ""
+                profileview_datelayout.visibility = View.GONE
+            }
+
+            Mode.PROFILE_COMPARE -> {
+                profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
+                profile2 = Profile(injector, JSONObject(customProfileJson2), customProfileUnits)
                 profileName = customProfileName
                 date = ""
                 profileview_datelayout.visibility = View.GONE
@@ -86,6 +104,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             Mode.DB_PROFILE      -> {
                 val profileList = databaseHelper.getProfileSwitchData(time, true)
                 profile = if (profileList.isNotEmpty()) profileList[0].profileObject else null
+                profile2 = null
                 profileName = if (profileList.isNotEmpty()) profileList[0].customizedName else null
                 date = if (profileList.isNotEmpty()) dateUtil.dateAndTimeString(profileList[0].date) else null
                 profileview_datelayout.visibility = View.VISIBLE
@@ -93,20 +112,38 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         }
         profileview_noprofile.visibility = View.VISIBLE
 
-        profile?.let {
-            profileview_units.text = it.units
-            profileview_dia.text = resourceHelper.gs(R.string.format_hours, it.dia)
-            profileview_activeprofile.text = profileName
-            profileview_date.text = date
-            profileview_ic.text = it.icList
-            profileview_isf.text = it.isfList
-            profileview_basal.text = it.basalList
-            profileview_target.text = it.targetList
-            basal_graph.show(it)
+        if (mode == Mode.PROFILE_COMPARE)
+            profile?.let { profile1 ->
+                profile2?.let { profile2 ->
+                    profileview_units.text = profile1.units
+                    profileview_dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile1.dia, DecimalFormat("0.00"), resourceHelper.gs(R.string.shorthour)))
+                    profileview_activeprofile.text = profileName
+                    profileview_date.text = date
+                    profileview_ic.text = ics(profile1, profile2)
+                    profileview_isf.text = isfs(profile1, profile2)
+                    profileview_basal.text = basals(profile1, profile2)
+                    profileview_target.text = HtmlHelper.fromHtml(formatColors("", profile1.targetList + "<br>", profile2.targetList, ""))
+                    basal_graph.show(profile1, profile2)
+                }
 
-            profileview_noprofile.visibility = View.GONE
-            profileview_invalidprofile.visibility = if (it.isValid("ProfileViewDialog")) View.GONE else View.VISIBLE
-        }
+                profileview_noprofile.visibility = View.GONE
+                profileview_invalidprofile.visibility = if (profile1.isValid("ProfileViewDialog")) View.GONE else View.VISIBLE
+            }
+        else
+            profile?.let {
+                profileview_units.text = it.units
+                profileview_dia.text = resourceHelper.gs(R.string.format_hours, it.dia)
+                profileview_activeprofile.text = profileName
+                profileview_date.text = date
+                profileview_ic.text = it.icList
+                profileview_isf.text = it.isfList
+                profileview_basal.text = it.basalList
+                profileview_target.text = it.targetList
+                basal_graph.show(it)
+
+                profileview_noprofile.visibility = View.GONE
+                profileview_invalidprofile.visibility = if (it.isValid("ProfileViewDialog")) View.GONE else View.VISIBLE
+            }
     }
 
     override fun onStart() {
@@ -121,6 +158,79 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         bundle.putString("customProfile", customProfileJson)
         bundle.putString("customProfileName", customProfileName)
         bundle.putString("customProfileUnits", customProfileUnits)
+        if (mode == Mode.PROFILE_COMPARE)
+            bundle.putString("customProfile2", customProfileJson2)
     }
 
+    private fun formatColors(label: String, value1: Double, value2: Double, format: DecimalFormat, units: String): String {
+        return formatColors(label, format.format(value1), format.format(value2), units)
+    }
+
+    private fun formatColors(label: String, text1: String, text2: String, units: String): String {
+        var s = "<font color='${resourceHelper.gc(R.color.white)}'>$label</font>"
+        s += "    "
+        s += "<font color='${resourceHelper.gc(R.color.tempbasal)}'>$text1</font>"
+        s += "    "
+        s += "<font color='${resourceHelper.gc(R.color.examinedProfile)}'>$text2</font>"
+        s += "    "
+        s += "<font color='${resourceHelper.gc(R.color.white)}'>$units</font>"
+        return s
+    }
+
+    private fun basals(profile1: Profile, profile2: Profile): Spanned {
+        var prev1 = 0.0
+        var prev2 = 0.0
+        val s = StringBuilder()
+        for (hour in 0..23) {
+            val val1 = profile1.getBasalTimeFromMidnight(hour * 60 * 60)
+            val val2 = profile2.getBasalTimeFromMidnight(hour * 60 * 60)
+            if (val1 != prev1 || val2 != prev2) {
+                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), resourceHelper.gs(R.string.profile_ins_units_per_hour)))
+                s.append("<br>")
+            }
+            prev1 = val1
+            prev2 = val2
+        }
+        s.append(formatColors(
+            "    ∑ ",
+            profile1.baseBasalSum(),
+            profile2.baseBasalSum(),
+            DecimalFormat("0.00"),
+            resourceHelper.gs(R.string.insulin_unit_shortname)))
+        return HtmlHelper.fromHtml(s.toString())
+    }
+
+    private fun ics(profile1: Profile, profile2: Profile): Spanned {
+        var prev1 = 0.0
+        var prev2 = 0.0
+        val s = StringBuilder()
+        for (hour in 0..23) {
+            val val1 = profile1.getIcTimeFromMidnight(hour * 60 * 60)
+            val val2 = profile2.getIcTimeFromMidnight(hour * 60 * 60)
+            if (val1 != prev1 || val2 != prev2) {
+                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit)))
+                s.append("<br>")
+            }
+            prev1 = val1
+            prev2 = val2
+        }
+        return HtmlHelper.fromHtml(s.toString())
+    }
+
+    private fun isfs(profile1: Profile, profile2: Profile): Spanned {
+        var prev1 = 0.0
+        var prev2 = 0.0
+        val s = StringBuilder()
+        for (hour in 0..23) {
+            val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
+            val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
+            if (val1 != prev1 || val2 != prev2) {
+                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit)))
+                s.append("<br>")
+            }
+            prev1 = val1
+            prev2 = val2
+        }
+        return HtmlHelper.fromHtml(s.toString())
+    }
 }
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt b/core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
index a48f5e4118..8dd922ca60 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/ProfileGraph.kt
@@ -1,13 +1,16 @@
 package info.nightscout.androidaps.plugins.treatments.fragments
 
 import android.content.Context
+import android.graphics.Color
 import android.util.AttributeSet
 import com.jjoe64.graphview.GraphView
 import com.jjoe64.graphview.series.DataPoint
 import com.jjoe64.graphview.series.LineGraphSeries
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.Round
 import java.util.*
+import kotlin.math.max
 
 class ProfileGraph : GraphView {
 
@@ -21,7 +24,7 @@ class ProfileGraph : GraphView {
             basalArray.add(DataPoint(hour.toDouble(), profile.getBasalTimeFromMidnight(hour * 60 * 60)))
             basalArray.add(DataPoint((hour + 1).toDouble(), profile.getBasalTimeFromMidnight(hour * 60 * 60)))
         }
-        val basalDataPoints: Array<DataPoint> = Array(basalArray.size){ i-> basalArray[i]}
+        val basalDataPoints: Array<DataPoint> = Array(basalArray.size) { i -> basalArray[i] }
         val basalSeries: LineGraphSeries<DataPoint> = LineGraphSeries(basalDataPoints)
         addSeries(basalSeries)
         basalSeries.thickness = 8
@@ -35,4 +38,40 @@ class ProfileGraph : GraphView {
         gridLabelRenderer.numHorizontalLabels = 13
         gridLabelRenderer.verticalLabelsColor = basalSeries.color
     }
+
+    fun show(profile1: Profile, profile2: Profile) {
+        removeAllSeries()
+
+        // profile 1
+        val basalArray1: MutableList<DataPoint> = ArrayList()
+        for (hour in 0..23) {
+            basalArray1.add(DataPoint(hour.toDouble(), profile1.getBasalTimeFromMidnight(hour * 60 * 60)))
+            basalArray1.add(DataPoint((hour + 1).toDouble(), profile1.getBasalTimeFromMidnight(hour * 60 * 60)))
+        }
+        val basalSeries1: LineGraphSeries<DataPoint> = LineGraphSeries(Array(basalArray1.size) { i -> basalArray1[i] })
+        addSeries(basalSeries1)
+        basalSeries1.thickness = 8
+        basalSeries1.isDrawBackground = true
+
+        // profile 2
+        val basalArray2: MutableList<DataPoint> = ArrayList()
+        for (hour in 0..23) {
+            basalArray2.add(DataPoint(hour.toDouble(), profile2.getBasalTimeFromMidnight(hour * 60 * 60)))
+            basalArray2.add(DataPoint((hour + 1).toDouble(), profile2.getBasalTimeFromMidnight(hour * 60 * 60)))
+        }
+        val basalSeries2: LineGraphSeries<DataPoint> = LineGraphSeries(Array(basalArray2.size) { i -> basalArray2[i] })
+        addSeries(basalSeries2)
+        basalSeries2.thickness = 8
+        basalSeries2.isDrawBackground = false
+        basalSeries2.color = context.getColor(R.color.examinedProfile)
+        basalSeries2.backgroundColor = context.getColor(R.color.examinedProfile)
+
+        viewport.isXAxisBoundsManual = true
+        viewport.setMinX(0.0)
+        viewport.setMaxX(24.0)
+        viewport.isYAxisBoundsManual = true
+        viewport.setMinY(0.0)
+        viewport.setMaxY(Round.ceilTo(max(profile1.maxDailyBasal, profile2.maxDailyBasal) * 1.1, 0.5))
+        gridLabelRenderer.numHorizontalLabels = 13
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 27e0e33010..d6def91fd7 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
     <color name="warningAlertHeaderText">#FF000000</color>
     <color name="errorAlertBackground">#FFFF5555</color>
     <color name="errorAlertHeaderText">#FF000000</color>
+    <color name="examinedProfile">#FFFF5555</color>
 
     <!--    Treatment-->
     <color name="tempbasal">#C803A9F4</color>

From 2c884821e05c1a116f51f4bc589af9ef1cf9f8c5 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 6 Jul 2020 21:14:00 +0200
Subject: [PATCH 308/400] ProfileHelper

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../nightscout/androidaps/MainActivity.kt     |  8 +-
 .../activities/ProfileHelperActivity.kt       | 66 +++++++++++++
 .../androidaps/activities/SurveyActivity.kt   |  4 +-
 .../dependencyInjection/ActivitiesModule.kt   |  1 +
 .../androidaps/utils/stats/TddCalculator.kt   | 11 ++-
 .../res/layout/activity_profilehelper.xml     | 96 +++++++++++++++++++
 ...urvey_activity.xml => activity_survey.xml} |  0
 app/src/main/res/menu/menu_main.xml           |  4 +
 app/src/main/res/values/strings.xml           |  2 +
 .../data/defaultProfile/DefaultProfile.kt     |  4 +-
 .../info/nightscout/androidaps/db/TDD.java    | 15 ++-
 core/src/main/res/values/strings.xml          |  3 +-
 13 files changed, 201 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
 create mode 100644 app/src/main/res/layout/activity_profilehelper.xml
 rename app/src/main/res/layout/{survey_activity.xml => activity_survey.xml} (100%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb31b1ce3c..6ad0c33dbf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,7 @@
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
+        <activity android:name=".activities.ProfileHelperActivity" />
         <activity android:name=".activities.StatsActivity" />
 
         <!-- Receive new BG readings from other local apps -->
diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index e54addbf71..cbe698c9bf 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -27,6 +27,7 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
 import com.joanzapata.iconify.Iconify
 import com.joanzapata.iconify.fonts.FontAwesomeModule
+import info.nightscout.androidaps.activities.ProfileHelperActivity
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
@@ -49,10 +50,10 @@ import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicato
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
 import info.nightscout.androidaps.utils.AndroidPermission
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
+import info.nightscout.androidaps.utils.locale.LocaleHelper
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.IconsProvider
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -324,6 +325,11 @@ class MainActivity : NoSplashAppCompatActivity() {
                 return true
             }
 */
+            R.id.nav_defaultprofile     -> {
+                startActivity(Intent(this, ProfileHelperActivity::class.java))
+                return true
+            }
+
             R.id.nav_stats              -> {
                 startActivity(Intent(this, StatsActivity::class.java))
                 return true
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
new file mode 100644
index 0000000000..786b30f959
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -0,0 +1,66 @@
+package info.nightscout.androidaps.activities
+
+import android.os.Bundle
+import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
+import info.nightscout.androidaps.dialogs.ProfileViewerDialog
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.stats.TddCalculator
+import kotlinx.android.synthetic.main.activity_profilehelper.*
+import java.text.DecimalFormat
+import javax.inject.Inject
+
+class ProfileHelperActivity : NoSplashAppCompatActivity() {
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var tddCalculator: TddCalculator
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var defaultProfile: DefaultProfile
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_profilehelper)
+
+        profilehelper_age.setParams(15.0, 1.0, 80.0, 1.0, DecimalFormat("0"), false, null)
+        profilehelper_weight.setParams(50.0, 5.0, 150.0, 1.0, DecimalFormat("0"), false, null)
+        profilehelper_tdd.setParams(50.0, 3.0, 200.0, 1.0, DecimalFormat("0"), false, null)
+
+        profilehelper_tdds.text = tddCalculator.stats()
+
+        profilehelper_profile.setOnClickListener {
+            val age = profilehelper_age.value
+            val weight = profilehelper_weight.value
+            val tdd = profilehelper_tdd.value
+            if (age < 1 || age > 120) {
+                ToastUtils.showToastInUiThread(this, R.string.invalidage)
+                return@setOnClickListener
+            }
+            if ((weight < 5 || weight > 150) && tdd == 0.0) {
+                ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                return@setOnClickListener
+            }
+            if ((tdd < 5 || tdd > 150) && weight == 0.0) {
+                ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                return@setOnClickListener
+            }
+            profileFunction.getProfile()?.let { runningProfile ->
+                val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+                ProfileViewerDialog().also { pvd ->
+                    pvd.arguments = Bundle().also {
+                        it.putLong("time", DateUtil.now())
+                        it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
+                        it.putString("customProfile", runningProfile.data.toString())
+                        it.putString("customProfile2", profile.data.toString())
+                        it.putString("customProfileUnits", profile.units)
+                        it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
+                    }
+                }.show(supportFragmentManager, "ProfileViewDialog")
+            }
+        }
+
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index 86c90e1657..2ca326d4a3 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -19,7 +19,7 @@ import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import info.nightscout.androidaps.utils.stats.TirCalculator
-import kotlinx.android.synthetic.main.survey_activity.*
+import kotlinx.android.synthetic.main.activity_survey.*
 import javax.inject.Inject
 
 class SurveyActivity : NoSplashAppCompatActivity() {
@@ -34,7 +34,7 @@ class SurveyActivity : NoSplashAppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.survey_activity)
+        setContentView(R.layout.activity_survey)
 
         survey_id.text = InstanceId.instanceId()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 593d1e09e1..3c2e89b348 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -38,5 +38,6 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity
     @ContributesAndroidInjector abstract fun contributesStatsActivity(): StatsActivity
     @ContributesAndroidInjector abstract fun contributesSurveyActivity(): SurveyActivity
+    @ContributesAndroidInjector abstract fun contributesDefaultProfileActivity(): ProfileHelperActivity
     @ContributesAndroidInjector abstract fun contributesPrefImportListActivity(): PrefImportListActivity
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 1e567dd94a..1f8338f7d8 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -54,6 +54,7 @@ class TddCalculator @Inject constructor(
             val midnight = MidnightTime.calc(t.date)
             val tdd = result[midnight] ?: TDD(midnight, 0.0, 0.0, 0.0)
             tdd.bolus += t.insulin
+            tdd.carbs += t.carbs
             result.put(midnight, tdd)
         }
 
@@ -81,10 +82,12 @@ class TddCalculator @Inject constructor(
             totalTdd.basal += tdd.basal
             totalTdd.bolus += tdd.bolus
             totalTdd.total += tdd.total
+            totalTdd.carbs += tdd.carbs
         }
         totalTdd.basal /= tdds.size().toDouble()
         totalTdd.bolus /= tdds.size().toDouble()
         totalTdd.total /= tdds.size().toDouble()
+        totalTdd.carbs /= tdds.size().toDouble()
         return totalTdd
     }
 
@@ -93,16 +96,16 @@ class TddCalculator @Inject constructor(
         val averageTdd = averageTDD(tdds)
         return HtmlHelper.fromHtml(
             "<b>" + resourceHelper.gs(R.string.tdd) + ":</b><br>" +
-                toText(tdds) +
+                toText(tdds, true) +
                 "<b>" + resourceHelper.gs(R.string.average) + ":</b><br>" +
-                averageTdd.toText(resourceHelper, tdds.size())
+                averageTdd.toText(resourceHelper, tdds.size(), true)
         )
     }
 
-    private fun toText(tdds: LongSparseArray<TDD>): String {
+    private fun toText(tdds: LongSparseArray<TDD>, includeCarbs: Boolean): String {
         var t = ""
         for (i in 0 until tdds.size()) {
-            t += "${tdds.valueAt(i).toText(resourceHelper, dateUtil)}<br>"
+            t += "${tdds.valueAt(i).toText(resourceHelper, dateUtil, includeCarbs)}<br>"
         }
         return t
     }
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
new file mode 100644
index 0000000000..68d97b98a8
--- /dev/null
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activities.SurveyActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TableLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/profilehelper_age_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:labelFor="@+id/profilehelper_age"
+                    android:text="@string/age"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                <info.nightscout.androidaps.utils.NumberPicker
+                    android:id="@+id/profilehelper_age"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/profilehelper_weigth_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:labelFor="@+id/profilehelper_weight"
+                    android:text="@string/weight_label"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                <info.nightscout.androidaps.utils.NumberPicker
+                    android:id="@+id/profilehelper_weight"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
+
+            </TableRow>
+
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/profilehelper_tdd_label"
+                    android:layout_width="150dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:labelFor="@+id/profilehelper_weight"
+                    android:text="@string/tdd_total"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                <info.nightscout.androidaps.utils.NumberPicker
+                    android:id="@+id/profilehelper_tdd"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp" />
+
+            </TableRow>
+
+        </TableLayout>
+
+        <TextView
+            android:id="@+id/profilehelper_tdds"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+        <Button
+            android:id="@+id/profilehelper_profile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/comapareprofile" />
+
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/survey_activity.xml b/app/src/main/res/layout/activity_survey.xml
similarity index 100%
rename from app/src/main/res/layout/survey_activity.xml
rename to app/src/main/res/layout/activity_survey.xml
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b84a30e497..09b4509d73 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -27,6 +27,10 @@
         app:showAsAction="never"
         android:title="@string/nav_survey" />
 -->
+    <item
+        android:id="@+id/nav_defaultprofile"
+        app:showAsAction="never"
+        android:title="@string/nav_profilehelper" />
     <item
         android:id="@+id/nav_about"
         app:showAsAction="never"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8719ffd7d0..f05d08a31d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1708,5 +1708,7 @@
     <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please verify that your Pod is bolusing or cancel the bolus.</string>
     <string name="omnipod_rl_stats">RL Stats</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="comapareprofile">Compare with current profile</string>
+    <string name="nav_profilehelper">Profile helper</string>
 
 </resources>
diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 536c5ed68f..ecab21784c 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -126,7 +126,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         return res
     }
 
-    fun arrayToJson(b: Array<Double>): JSONArray {
+    private fun arrayToJson(b: Array<Double>): JSONArray {
         val basals = JSONArray()
         for (i in 0..23) {
             val time = String.format(Locale.ENGLISH, "%02d:00", i)
@@ -135,7 +135,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         return basals
     }
 
-    fun singleValueArray(value: Double, sample: Array<Double>): JSONArray {
+    private fun singleValueArray(value: Double, sample: Array<Double>): JSONArray {
         val array = JSONArray()
         array.put(JSONObject().put("time", "00:00").put("value", value + sample[0]))
         array.put(JSONObject().put("time", "06:00").put("value", value + sample[1]))
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TDD.java b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
index 05b9025491..5717abec74 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -29,6 +29,7 @@ public class TDD {
     @DatabaseField
     public double total;
 
+    public double carbs;
 
     public double getTotal() {
         return (total > 0d) ? total : (bolus + basal);
@@ -56,11 +57,17 @@ public class TDD {
                 ']';
     }
 
-    public String toText(ResourceHelper resourceHelper, DateUtil dateUtil) {
-        return resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(date), total, bolus, basal);
+    public String toText(ResourceHelper resourceHelper, DateUtil dateUtil, boolean includeCarbs) {
+        if (includeCarbs)
+            return resourceHelper.gs(R.string.tddwithcarbsformat, dateUtil.dateStringShort(date), total, bolus, basal, carbs);
+        else
+            return resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(date), total, bolus, basal);
     }
 
-    public String toText(ResourceHelper resourceHelper, int days) {
-        return resourceHelper.gs(R.string.tddformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal);
+    public String toText(ResourceHelper resourceHelper, int days, boolean includeCarbs) {
+        if (includeCarbs)
+            return resourceHelper.gs(R.string.tddwithcarbsformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal, carbs);
+        else
+            return resourceHelper.gs(R.string.tddformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal);
     }
 }
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6a5bcfd214..93289388fb 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -156,7 +156,8 @@
     <string name="mins">%1$dmin</string>
 
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Carbs: <b>%5$.0fg</b>]]></string>
 
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Check</string>

From 2b7cb0d558e449f109ff1060ada29fedbb3ec328 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 7 Jul 2020 17:16:22 +0200
Subject: [PATCH 309/400] prevent kotlin exceptions

---
 .../persistentNotification/DummyService.kt    |  2 +-
 .../receivers/TimeDateOrTZChangeReceiver.kt   | 53 ++++++++++---------
 .../androidaps/services/LocationService.kt    |  2 +-
 .../androidaps/services/AlarmSoundService.kt  |  4 +-
 .../dana/activities/DanaHistoryActivity.kt    |  2 +-
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
index 82bc322824..5fcf9ee85b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -27,7 +27,7 @@ class DummyService : DaggerService() {
 
     private val disposable = CompositeDisposable()
 
-    override fun onBind(intent: Intent): IBinder? = null
+    override fun onBind(intent: Intent?): IBinder? = null
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
index 916239ae82..55a186fc9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
@@ -39,32 +39,37 @@ class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() {
         val activePump: PumpInterface = activePlugin.activePump
 
         aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Date, Time and/or TimeZone changed. [action={}]", action)
-        aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent))
+        try {
+            aapsLogger.debug(LTag.PUMP, "TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent))
+        } catch (ignored : Exception) {}
 
-        if (action == null) {
-            aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.")
-        } else if (Intent.ACTION_TIMEZONE_CHANGED == action) {
-            aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
-            activePump.timezoneOrDSTChanged(TimeChangeType.TimezoneChange)
-        } else if (Intent.ACTION_TIME_CHANGED == action) {
-            val currentDst = calculateDST()
-            if (currentDst == isDST) {
-                aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
-                activePump.timezoneOrDSTChanged(TimeChangeType.ManualTimeChange)
-            } else {
-                if (currentDst) {
-                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
-                    activePump.timezoneOrDSTChanged(TimeChangeType.DST_Started)
-                } else {
-                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
-                    activePump.timezoneOrDSTChanged(TimeChangeType.DST_Ended)
-                }
+        when {
+            action == null                           -> {
+                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.")
+            }
+            Intent.ACTION_TIMEZONE_CHANGED == action -> {
+                aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
+                activePump.timezoneOrDSTChanged(TimeChangeType.TimezoneChange)
+            }
+            Intent.ACTION_TIME_CHANGED == action     -> {
+                val currentDst = calculateDST()
+                if (currentDst == isDST) {
+                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
+                    activePump.timezoneOrDSTChanged(TimeChangeType.ManualTimeChange)
+                } else {
+                    if (currentDst) {
+                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
+                        activePump.timezoneOrDSTChanged(TimeChangeType.DST_Started)
+                    } else {
+                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
+                        activePump.timezoneOrDSTChanged(TimeChangeType.DST_Ended)
+                    }
+                }
+                isDST = currentDst
+            }
+            else                                     -> {
+                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
             }
-            isDST = currentDst
-        } else {
-            aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
         }
     }
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
index 4af050da21..2357dcebeb 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -72,7 +72,7 @@ class LocationService : DaggerService() {
         }
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         try {
             startForeground(notificationHolder.notificationID, notificationHolder.notification)
diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
index 140cfda5b4..f84e6af6e2 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -29,13 +29,13 @@ class AlarmSoundService : DaggerService() {
         startForeground(notificationHolder.notificationID, notificationHolder.notification)
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         startForeground(notificationHolder.notificationID, notificationHolder.notification)
 
         player?.let { if (it.isPlaying) it.stop() }
 
         aapsLogger.debug(LTag.CORE, "onStartCommand")
-        if (intent.hasExtra("soundid")) resourceId = intent.getIntExtra("soundid", R.raw.error)
+        if (intent?.hasExtra("soundid") == true) resourceId = intent.getIntExtra("soundid", R.raw.error)
         player = MediaPlayer()
         try {
             val afd = resourceHelper.openRawResourceFd(resourceId) ?: return START_STICKY
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index 56faab3e57..78c2655dec 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -126,7 +126,7 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
             })
         }
         danar_history_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 val selected = typeList[position]
                 loadDataFromDB(selected.type)
                 showingType = selected.type

From 31b6ce48917093a9ed921dcb59513bb10f49a957 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 7 Jul 2020 17:16:37 +0200
Subject: [PATCH 310/400] New Crowdin updates (#2798)

* New translations strings.xml (French)

* New translations protection.xml (Russian)

* New translations strings.xml (Russian)

* New translations protection.xml (Slovak)

* New translations protection.xml (Czech)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations protection.xml (German)

* New translations protection.xml (Czech)

* New translations strings.xml (Swedish)

* New translations protection.xml (Swedish)

* New translations strings.xml (Spanish)

* New translations protection.xml (Italian)

* New translations strings.xml (Spanish)

* New translations objectives.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations objectives.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations protection.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations objectives.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations protection.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Spanish)

* New translations exam.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations protection.xml (Spanish)

* New translations protection.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations protection.xml (Dutch)

* New translations protection.xml (Dutch)

* New translations exam.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations protection.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations exam.xml (Portuguese, Brazilian)

* New translations objectives.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations protection.xml (Portuguese)
---
 app/src/main/res/values-bg-rBG/protection.xml |   2 +
 app/src/main/res/values-bg-rBG/strings.xml    |   4 +-
 app/src/main/res/values-cs-rCZ/protection.xml |   2 +
 app/src/main/res/values-de-rDE/protection.xml |   2 +
 app/src/main/res/values-es-rES/exam.xml       |   3 +
 app/src/main/res/values-es-rES/objectives.xml |   3 +
 app/src/main/res/values-es-rES/protection.xml |  25 +-
 app/src/main/res/values-es-rES/strings.xml    | 182 ++++++++++++++
 app/src/main/res/values-fr-rFR/strings.xml    |   1 +
 app/src/main/res/values-it-rIT/protection.xml |   2 +
 app/src/main/res/values-lt-rLT/objectives.xml |   3 +
 app/src/main/res/values-lt-rLT/protection.xml |  25 +-
 app/src/main/res/values-lt-rLT/strings.xml    | 178 ++++++++++++++
 app/src/main/res/values-nl-rNL/exam.xml       |   3 +
 app/src/main/res/values-nl-rNL/protection.xml |  10 +
 app/src/main/res/values-nl-rNL/strings.xml    | 227 +++++++++++++++++-
 app/src/main/res/values-pt-rBR/exam.xml       |  21 ++
 app/src/main/res/values-pt-rBR/objectives.xml |  38 +++
 app/src/main/res/values-pt-rBR/strings.xml    | 107 +++++++++
 app/src/main/res/values-pt-rPT/protection.xml |   2 +
 app/src/main/res/values-pt-rPT/strings.xml    |   1 +
 app/src/main/res/values-ru-rRU/protection.xml |   2 +
 app/src/main/res/values-ru-rRU/strings.xml    |   4 +
 app/src/main/res/values-sk-rSK/protection.xml |   2 +
 app/src/main/res/values-sv-rSE/protection.xml |   2 +
 app/src/main/res/values-sv-rSE/strings.xml    |   1 +
 core/src/main/res/values-bg-rBG/strings.xml   |   1 +
 core/src/main/res/values-es-rES/strings.xml   | 160 ++++++++++++
 core/src/main/res/values-lt-rLT/strings.xml   | 161 +++++++++++++
 core/src/main/res/values-nl-rNL/strings.xml   |   1 +
 core/src/main/res/values-pt-rBR/strings.xml   | 150 ++++++++++++
 dana/src/main/res/values-es-rES/strings.xml   | 106 +++++++-
 dana/src/main/res/values-lt-rLT/strings.xml   | 122 +++++++++-
 dana/src/main/res/values-nl-rNL/strings.xml   |   1 +
 dana/src/main/res/values-pt-rBR/strings.xml   |  96 ++++++++
 wear/src/main/res/values-pt-rBR/strings.xml   |  68 ++++++
 36 files changed, 1703 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/protection.xml b/app/src/main/res/values-bg-rBG/protection.xml
index 71b706e2fc..5fd2ed4e54 100644
--- a/app/src/main/res/values-bg-rBG/protection.xml
+++ b/app/src/main/res/values-bg-rBG/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Няма защита</string>
     <string name="protection">Защита</string>
     <string name="master_password_missing">Главната парола не е зададена!\n\nМоля, настройте Вашата главна парола в Предпочитания (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Грешка при биометрични данни!</string>
+    <string name="unsecure_fallback_descriotion_biometric">За да бъде ефективна, биометричната защита се нуждае от главна парола.\n\nМоля, въведете главна парола!</string>
     <string name="password_set">Паролата е зададена!</string>
     <string name="password_not_set">Паролата не е зададена</string>
     <string name="password_not_changed">Паролата не е променена</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index c7c2676199..908c1851cf 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1217,8 +1217,8 @@
     <string name="setupwizard_units_prompt">Изберете единиците, в които искате да работите</string>
     <string name="ns_ploadlocalprofile">Качване на локални промени в НС профила</string>
     <string name="dia_short">DIA</string>
-    <string name="ic_short">IC (Инсулин/въглехидр.):</string>
-    <string name="isf_short">ISF (Инс.чувствителност)</string>
+    <string name="ic_short">И / Въгл</string>
+    <string name="isf_short">Чувств</string>
     <string name="target_short">Цел</string>
     <string name="clone_label">Клонирай</string>
     <string name="saveorresetchangesfirst">Първо запазете или се откажете от промените</string>
diff --git a/app/src/main/res/values-cs-rCZ/protection.xml b/app/src/main/res/values-cs-rCZ/protection.xml
index 01ec1022d6..d8117ca6dc 100644
--- a/app/src/main/res/values-cs-rCZ/protection.xml
+++ b/app/src/main/res/values-cs-rCZ/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Bez ochrany</string>
     <string name="protection">Ochrana</string>
     <string name="master_password_missing">Hlavní heslo není nastaveno!\n\nProsím nastavte své hlavní heslo v Preferencích (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Nezabezpečené záložní řešení</string>
+    <string name="unsecure_fallback_descriotion_biometric">Aby bylo biometrické zabezpečení účinné, je třeba pro záložní řešení nastavit hlavní heslo.\n\nNastavte hlavní heslo!</string>
     <string name="password_set">Heslo nastaveno!</string>
     <string name="password_not_set">Heslo není nastavené</string>
     <string name="password_not_changed">Heslo nezměněno</string>
diff --git a/app/src/main/res/values-de-rDE/protection.xml b/app/src/main/res/values-de-rDE/protection.xml
index 83fce7bd9a..2655bd08d8 100644
--- a/app/src/main/res/values-de-rDE/protection.xml
+++ b/app/src/main/res/values-de-rDE/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Kein Schutz</string>
     <string name="protection">Schutz</string>
     <string name="master_password_missing">Das Master-Passwort ist nicht festgelegt!\n\nLege Dein Master-Passwort bitte in den Einstellungen fest (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Unsicherer Fallback</string>
+    <string name="unsecure_fallback_descriotion_biometric">Zur Absicherung braucht der biometrischer Schutz ein Masterpasswort als Fallback.\n\nBitte gib ein Master-Passwort ein!</string>
     <string name="password_set">Passwort festgelegt!</string>
     <string name="password_not_set">Passwort nicht festgelegt</string>
     <string name="password_not_changed">Passwort nicht geändert</string>
diff --git a/app/src/main/res/values-es-rES/exam.xml b/app/src/main/res/values-es-rES/exam.xml
index e5fde44174..d10c0449d3 100644
--- a/app/src/main/res/values-es-rES/exam.xml
+++ b/app/src/main/res/values-es-rES/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">¿Qué es cierto acerca de DIA?</string>
+    <string name="dia_label_exam">Tema: Duración de la acción de la insulina</string>
     <string name="dia_minimumis3h">El valor mínimo es de 3 horas.</string>
     <string name="dia_minimumis5h">El valor mínimo es de 5 horas.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Aplicación de Loop en el iPhone.</string>
     <string name="nsclient_spikeiphone">App de Spike en el iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Tema: Factor de sensibilidad de insulina</string>
     <string name="isf_increasingvalue">Los valores más altos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
     <string name="isf_decreasingvalue">Los valores más bajos de ISF llevan a una menor cantidad de insulina cuando AAPS corrige los valores altos de glucemia.</string>
     <string name="isf_noeffect">El cambio de los valores de ISF no afecta a la cantidad de insulina que se entrega cuando AAPS corrige para compensar los valores altos de glucemia.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">El cambio del valor de ISF en el perfil es suficiente para aplicar el cambio.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Tema: El ratio insulina carbohidratos- IC</string>
     <string name="ic_increasingvalue">Los ratios IC más altos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
     <string name="ic_decreasingvalue">Los ratios IC más bajos conducen a menos insulina entregada por una cantidad determinada de carbohidratos.</string>
     <string name="ic_noeffect">Si tiene 0 COB, cambiar la ratio IC conducirá a una cantidad distinta de insulina para corregir un valor de glucemia determinado.</string>
diff --git a/app/src/main/res/values-es-rES/objectives.xml b/app/src/main/res/values-es-rES/objectives.xml
index 047ce04909..d1377e8706 100644
--- a/app/src/main/res/values-es-rES/objectives.xml
+++ b/app/src/main/res/values-es-rES/objectives.xml
@@ -20,7 +20,9 @@
     <string name="objectives_autosens_gate">Una semana con éxito en lazo cerrado durante el día con entrada regular de carbohidratos</string>
     <string name="objectives_ama_objective">Habilitar funciones adicionales para su uso durante el día, como el asistente de comida avanzado</string>
     <string name="objectives_smb_objective">Habilitar funciones adicionales para uso durante el día como SMB</string>
+    <string name="objectives_auto_objective">Activar automatización</string>
     <string name="objectives_smb_gate">¡Debes leer el wiki y subir maxIOB para que SMB funcione bien! Para comenzar un buen valor sería maxIOB = bolo de comida medio + 3 x máximo basal diario</string>
+    <string name="objectives_auto_gate">Lea los documentos sobre cómo funciona la automatización. Configura tus primeras reglas simples. En lugar de acción, deje que AAPS muestre solo notificaciones. Cuando esté seguro de que la automatización se activa en el momento adecuado, reemplace la notificación por acción real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glucosa disponible en NS</string>
     <string name="objectives_pumpstatusavailableinns">Estado de la bomba disponible en NS</string>
     <string name="objectives_manualenacts">Aprobación Manual</string>
@@ -35,6 +37,7 @@
     <string name="objectives_useloop">Mostrar contenido del plugin Loop</string>
     <string name="objectives_usescale">Usar función de escala mediante un gráfico BG pulsado largo</string>
     <string name="objectives_button_enter">Intro</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Si tienes al menos 3 meses de experiencia con el lazo cerrado de otros sistemas puedes cualificarte para obtener un código para saltarte los objetivos. Para información detallada (en inglés): https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Código aceptado</string>
     <string name="codeinvalid">Código no válido</string>
     <string name="objectives_exam_objective">Compruebe su conocimiento</string>
diff --git a/app/src/main/res/values-es-rES/protection.xml b/app/src/main/res/values-es-rES/protection.xml
index 3ea04e700d..81480ef4d5 100644
--- a/app/src/main/res/values-es-rES/protection.xml
+++ b/app/src/main/res/values-es-rES/protection.xml
@@ -1,2 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autentificación requerida</string>
+    <string name="biometric_description">Coloque el dedo en el lector de huellas dactilares para verificar su identidad</string>
+    <string name="settings_protection">Protección de ajustes</string>
+    <string name="application_protection">Protección de aplicación</string>
+    <string name="bolus_protection">Protección de bolo</string>
+    <string name="master_password">Contraseña maestra</string>
+    <string name="settings_password">Contraseña de configuración</string>
+    <string name="application_password">Contraseña de aplicación</string>
+    <string name="bolus_password">Contraseña de Bolus</string>
+    <string name="unlock_settings">Desbloquear ajustes</string>
+    <string name="biometric">Biométrico</string>
+    <string name="custom_password">Contraseña personalizada</string>
+    <string name="noprotection">Sin protección</string>
+    <string name="protection">Protección</string>
+    <string name="master_password_missing">¡La contraseña maestra no está configurada!\n\nPor favor, configure su contraseña maestra en Preferencias (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">No es seguro volver atrás</string>
+    <string name="unsecure_fallback_descriotion_biometric">Para ser eficaz, la protección biométrica necesita una contraseña maestra establecida para el respaldo.\n\nPor favor, establezca una contraseña maestra!</string>
+    <string name="password_set">¡Contraseña establecida!</string>
+    <string name="password_not_set">Contraseña no establecida</string>
+    <string name="password_not_changed">Contraseña no cambiada</string>
+    <string name="password_cleared">¡Contraseña borrada!</string>
+    <string name="password_hint">Introducir contraseña aquí</string>
+</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 562b6c93c0..81b20b96d1 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -36,6 +36,7 @@
     <string name="description_pump_mdi">Integración de bomba de insulina para personas que usan varias inyecciones diarias para su terapia de diabetes</string>
     <string name="description_pump_virtual">Integración para bombas de insulina que aún no tienen ningún controlador/driver (lazo abierto)</string>
     <string name="description_sensitivity_aaps">Sensibilidad calculada de la misma manera que Oref0, pero puede especificarse el rango de tiempo. Absorción de carbohidratos mínima se calcula con el máximo tiempo de absorción de carbohidratos en preferencias.</string>
+    <string name="description_sensitivity_oref1">La sensibilidad se calcula con las últimas 8 h y los carbohidratos (si no son absorbidos) se anulan después del tiempo indicado en preferencias. El complemento también calcula UAM.</string>
     <string name="description_sensitivity_weighted_average">La sensibilidad se calcula como un promedio ampliado de las desviaciones. Desviaciones más recientes tienen mayor impacto. Absorción de carbohidratos mínima se calcula desde el tiempo de absorción de carbohidratos máximo en preferencias. Este algoritmo es el más rápido siguiendo los cambios de sensibilidad.</string>
     <string name="description_source_eversense">Recibir los valores de glucosa de la aplicación Eversense parcheada.</string>
     <string name="description_source_glimp">Recibir valores de glucosa de Glimp.</string>
@@ -125,10 +126,12 @@
     <string name="apsmode_title">Modo APS</string>
     <string name="closedloop">Lazo cerrado</string>
     <string name="openloop">Lazo abierto</string>
+    <string name="lowglucosesuspend">Suspensión por glucosa baja</string>
     <string name="disabledloop">Lazo Inactivo</string>
     <string name="disableloop">Desactivar lazo</string>
     <string name="enableloop">Activar lazo</string>
     <string name="openloop_newsuggestion">Nueva propuesta disponible</string>
+    <string name="carbssuggestion">Sugerencia de carbohidratos</string>
     <string name="unsupportednsversion">Versión no aceptada de Nightscout</string>
     <string name="loopdisabled">LOOP DESACTIVADO POR RESTRICCIONES</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
@@ -161,6 +164,7 @@
     <string name="filenotfound">Archivo no encontrado</string>
     <string name="nav_export">Exportar ajustes</string>
     <string name="nav_import">Importar ajustes</string>
+    <string name="openapsma_maxbasal_title">Max U/h para la basal temporal</string>
     <string name="openapsma_maxbasal_summary">Este valor es llamado max basal en OpenAPS</string>
     <string name="openapsma_maxiob_title">Max IOB basal que OpenAPs puede emitir [U]</string>
     <string name="openapsma_maxiob_summary">Este valor es llamado Max Iob en el OpenAPS\nEsta es la máxima insulina en [U] que APS puede entregar a la vez.</string>
@@ -168,19 +172,25 @@
     <string name="password_preferences_decrypt_prompt">Se le solicitará la contraseña maestra, que es necesaria para descifrar las preferencias importadas.</string>
     <string name="preferences_export_canceled">¡Exportación cancelada! ¡Las preferencias NO se han exportado!</string>
     <string name="preferences_import_canceled">¡Importación cancelada! ¡Las preferencias NO se han importado!</string>
+    <string name="preferences_import_list_title">Seleccionar fichero para importar</string>
     <string name="check_preferences_before_import">Por favor, compruebe las preferencias antes de importar:</string>
     <string name="check_preferences_cannot_import">¡Las preferencias no se pueden importar!</string>
     <string name="check_preferences_dangerous_import">¡Las preferencias no se deben importar!</string>
     <string name="check_preferences_details_btn">Explicar problemas de importación…</string>
+    <string name="check_preferences_details_title">Importar Detalles del problema</string>
     <string name="check_preferences_import_btn">Importar</string>
     <string name="check_preferences_import_anyway_btn">Importar de todos modos (¡PELIGROSO!)</string>
+    <string name="metadata_warning_different_flavour">Las preferencias se han creado con distinta versión de AAPS (%1$s), la versión instalada es: %2$s.\n\nAlgunos valores pueden faltar o no ser válidos después de importar, por favor, compruebe y actualice sus preferencias.</string>
     <string name="metadata_warning_different_device">Las preferencias se han creado en un dispositivo distinto. Está bien si va a importar desde un teléfono más antiguo/diferente, pero ¡asegúrese de que las preferencias importadas son correctas!</string>
     <string name="metadata_warning_outdated_format">¡Estás usando el obsoleto formato heredado de versiones antiguas de AAPS, que no es seguro! Únicamente utilizarlo como último recurso, si no tiene una exportación en formato JSON actual.</string>
     <string name="metadata_warning_old_export">Las preferencias importadas ya tienen %1$s días! ¿Tal vez tengas preferencias más actualizadas o eligiste el archivo equivocado? ¡Recuerda exportar las preferencias regularmente!</string>
     <string name="metadata_warning_date_format">¡Formato de fecha no válido!</string>
+    <string name="metadata_warning_different_version">Preferencias de una versión menor de la aplicación. Está bien si va a importar después de la actualización, pero ¡compruebe después de la importación si las preferencias siguen siendo correctas!</string>
+    <string name="metadata_urgent_different_version">Preferencias de la versión principal distinta de la aplicación. ¡Las versiones principales difieren significativamente y pueden tener preferencias incompatibles! ¡Asegúrese de que, después de importar, las preferencias siguen siendo correctas!</string>
     <string name="metadata_label_format">Formato del archivo</string>
     <string name="metadata_label_created_at">Creado el</string>
     <string name="metadata_label_aaps_version">Versión de AAPS</string>
+    <string name="metadata_label_aaps_flavour">Construir Variante</string>
     <string name="metadata_label_device_name">Exportar el nombre del paciente del dispositivo</string>
     <string name="metadata_label_device_model">Exportar modelo de dispositivo</string>
     <string name="metadata_label_encryption">Encriptación de archivos</string>
@@ -190,10 +200,20 @@
     <string name="metadata_format_other">Formato de exportación desconocido</string>
     <string name="prefdecrypt_settings_tampered">Archivo de configuración alterado</string>
     <string name="prefdecrypt_settings_secure">El archivo de configuración es seguro</string>
+    <string name="prefdecrypt_settings_unencrypted">Uso no seguro, sin cifrar del formato de configuración</string>
+    <string name="prefdecrypt_wrong_json">Error de formato JSON, falta campo necesario (formato, contenido, metadatos o seguridad)</string>
     <string name="prefdecrypt_wrong_password">Error de descifrado, la contraseña proporcionada no puede descifrar el archivo</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Falta el archivo de la suma de comprobación (hash), ¡no se puede verificar la autenticidad de configuración!</string>
     <string name="prefdecrypt_issue_modified">¡El archivo se ha modificado tras la exportación!</string>
     <string name="prefdecrypt_issue_parsing">Error de descifrado, ¡el análisis de las preferencias ha fallado!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Error de descifrado, ¡la contraseña proporcionada no es válida o se ha modificado el archivo de ajustes! Puede suceder que el archivo importado se haya exportado con una contraseña maestra distinta.</string>
+    <string name="prefdecrypt_issue_wrong_format">Falta la configuración de cifrado, ¡el formato configuración no es válido!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">¡Algoritmo de cifrado no soportado o no especificado!</string>
+    <string name="exported_today">exportado hoy</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado hace %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportado en %1$s</string>
+    <string name="exported_less_than_hour_ago">exportado hace menos de una hora</string>
+    <string name="in_directory" comment="placeholder is for exported file path">en el directorio: %1$s</string>
     <string name="end_user_license_agreement">Acuerdo de licencia de usuario final</string>
     <string name="end_user_license_agreement_text">NO DEBE UTILIZARSE PARA TOMAR DECISIONES MÉDICAS. NO HAY NINGUNA GARANTÍA PARA EL PROGRAMA, EN LA MEDIDA PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE LO CONTRARIO POR ESCRITO, LOS TITULARES DE LOS DERECHOS DE AUTOR Y/O OTRAS PARTES PROPORCIONAN EL PROGRAMA \"TAL CUAL\" SIN GARANTÍA DE NINGÚN TIPO, YA SEA EXPRESA O IMPLÍCITA, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDAD Y ADECUACIÓN PARA UN PROPÓSITO EN PARTICULAR. TODO EL RIESGO EN CUANTO A LA CALIDAD Y EL RENDIMIENTO DEL PROGRAMA ES SUYA. SI EL PROGRAMA TUVIERA UN ERROR, USTED ASUME EL COSTE DE TODO SERVICIO, REPARACIÓN O CORRECCIÓN NECESARIOS.</string>
     <string name="end_user_license_agreement_i_understand">ENTIENDO Y ACEPTO</string>
@@ -233,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Lazo activo</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">El valor %1$s está fuera de límites</string>
+    <string name="smscommunicator_pumpconnectwithcode">Para conectar la infusora responder con el código %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Error al conectar a la bomba</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Para desconectar la bomba durante %1dminutos responde con el código %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Bomba desconectada</string>
+    <string name="smscommunicator_reconnect">Bomba reconectada</string>
     <string name="smscommunicator_remotecommandnotallowed">Comando remoto no permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">El bolo remoto no está disponible. Inténtalo de nuevo más tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para iniciar una basal de %1$.2fU/h durante %2$d min, responder con el código %3$s</string>
@@ -241,6 +266,9 @@
     <string name="smscommunicator_carbsreplywithcode">Para introducir %1$dg en %2$s responder con código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para iniciar una basal de %1$d%% durante %2$d min, responder con el código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para cancelar lazo por %1$d minutos responde con código %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Para retomar el lazo responder con código %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Para activar el lazo responder con código %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Para desactivar el lazo responder con código %1$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporal %1$.2fU/h para %2$d min iniciada correctamente</string>
     <string name="smscommunicator_extendedset">Bolo ampliado de %1$.2fU durante %2$d min se inició correctamente</string>
     <string name="smscommunicator_carbsset">Los carbohidratos %1$dg introducidos con éxito</string>
@@ -272,6 +300,7 @@
     <string name="primefill">Rellenar/Llenar</string>
     <string name="fillwarning">¡Por favor asegurar que la cantidad coincide con la especificación del set de infusión!</string>
     <string name="othersettings_title">Otros</string>
+    <string name="fillbolus_title">Llenar/Rellenar cantidad de insulina estándar</string>
     <string name="button1">Botón 1</string>
     <string name="button2">Botón 2</string>
     <string name="button3">Botón 3</string>
@@ -330,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Ajuste pro defecto: 4 Esto es la otra mitad de los ajustes de seguridad de OpenAPS y la otra mitad de la protección de seguridad de \"3x max diaria, 4x actual\". Esto significa, que tu basal, independientemente de tu máxima basal ajustada en la bomba, no puede ser mas alta que este número de veces el actual nivel de basal. Esto es para evitar que las personas se encuentren en situaciones peligrosas por aumentar mucho la basal sin entender como trabaja el algoritmo. El ajuste por defecto es 4x; la mayoría de las personas nunca tendrá que cambiar estos ajustes, sino que debe modificar otros ajustes en la terapia si se encuentran cerca de este límite de seguridad.</string>
     <string name="openapsama_autosens_max_summary">Valor por defecto: 1.2\nEste es un límite multiplicador para autosens (y pronto autotune) para establecer un límite máximo de 20%% en cuanto puede ser la ratio de autosens, lo que determina a su vez cuán alto puede ajustar las basales autosens, cuán bajo puede ajustar ISF, y cuán bajo puede establecer el objetivo BG.</string>
     <string name="openapsama_autosens_min_summary">Ajuste por defecto: 0.7\nEl otro lado de los límites de seguridad de autosens, limitando a cuanto puede autosens bajar la basal y a cuanto puede subir ISF y objetivo de glucosa en sangre (BG).</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens también ajusta los objetivos</string>
     <string name="openapsama_autosens_adjusttargets_summary">Ajuste por defecto: true\nEsto se usa para permitir a autosens el ajuste de objetivos BG además de ISF y bases.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Ajuste por defecto: 2 \nEl retardo del bolo se realiza después de suministrar un bolo de comida, por lo que el lazo no se contrarrestará con bajas temporales cuando acaba de comer. Con el valor predeterminado de 2 y siendo DIA de 3 horas, el retardo del del bolo se realizará gradualmente durante 1,5 horas (3 DIA / 2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valor por defecto: 3.0 (AMA) o 8.0 (SMB). Este es un escenario de impacto de absorción de carbohidratos por defecto por 5 minutos. El valor predeterminado es un esperado 3mg/dl / 5min. Esto afecta la rapidez con la que los COB decaen, y cuánta absorción de carbohidratos se supone en el cálculo de futuras BG, cuando BG está cayendo más que esperado, o no aumento tanto como esperaba.</string>
@@ -368,6 +398,7 @@
     <string name="wear_detailedIOB_title">Mostrar detalles IOB</string>
     <string name="wear_detailedIOB_summary">Separar IOB en bolo y base en el reloj</string>
     <string name="nosuccess">sin efecto - por favor verificar en móvil</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Edad paciente</string>
     <string name="child">Menor de edad</string>
     <string name="teenage">Adolescente</string>
@@ -411,12 +442,26 @@
     <string name="enablesuperbolus">Activar superbolo en asistente</string>
     <string name="enablesuperbolus_summary">Activar función superbolo en asistente. No lo actives hasta que hayas aprendido lo que realmente hace. ¡PUEDE CAUSAR SOBREDOSIS DE INSULINA usándolo sin precaución!</string>
     <string name="show_statuslights">Mostrar luces de estado en la pantalla de inicio</string>
+    <string name="statuslights_cage_warning">Umbral de advertencia de la edad de la cánula [h]</string>
+    <string name="statuslights_cage_critical">Umbral crítico de la edad de la cánula [h]</string>
+    <string name="statuslights_iage_warning">Umbral de advertencia de la edad de la insulina [h]</string>
+    <string name="statuslights_iage_critical">Umbral crítico de la edad de la insulina [h]</string>
+    <string name="statuslights_sage_warning">Umbral de advertencia de la edad del sensor [h]</string>
+    <string name="statuslights_sage_critical">Umbral crítico de la edad del sensor [h]</string>
+    <string name="statuslights_bage_warning">Umbral de advertencia de nivel de pila [h]</string>
+    <string name="statuslights_bage_critical">Umbral crítico de nivel de batería [h]</string>
     <string name="statuslights_res_warning">Umbral de advertencia de nivel de reservorio [U]</string>
     <string name="statuslights_res_critical">Umbral crítico de nivel de reservorio [U]</string>
     <string name="statuslights_bat_warning">Umbral de advertencia de nivel de pila [%]</string>
     <string name="statuslights_bat_critical">Umbral crítico de nivel de batería [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Acerca de</string>
     <string name="smscommunicator_missingsmspermission">Falta permiso SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Falta permiso de estado del teléfono</string>
@@ -434,6 +479,8 @@
     <string name="doprofileswitch">Cambio de perfil</string>
     <string name="careportal_pbage_label">Edad batería bomba</string>
     <string name="ns_alarmoptions">Opciones alarma</string>
+    <string name="ns_alarms">Crear notificaciones de alarmas NS</string>
+    <string name="ns_announcements">Crear notificaciones de avisos de NS</string>
     <string name="nsalarm_staledatavalue_label">Datos antiguos limite [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Datos antiguos urgentes limite [min]</string>
     <string name="openapsama_autosens_period">Intervalo para autosens [h]</string>
@@ -514,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Alarma si no llegan datos BG</string>
     <string name="enable_pump_unreachable_alert">Alarma si bomba no es alcanzable</string>
     <string name="pump_unreachable_threshold">Bomba no alcanzable durante [min]</string>
+    <string name="enable_carbs_req_alert">Alerta si se necesitan carbohidratos</string>
     <string name="urgent_alarm">Alarma urgente</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (parcheada)</string>
@@ -526,6 +574,8 @@
     <string name="smbmaxminutes_summary">Minutos máximos de basal para limitar SMB</string>
     <string name="uamsmbmaxminutes">Minutos máximos de UAM SMB</string>
     <string name="uamsmbmaxminutes_summary">Minutos máximos de basal para limitar SMB para UAM</string>
+    <string name="carbsReqThreshold">Carbohidratos mínimos necesarios para la sugerencia</string>
+    <string name="carbsReqThreshold_summary">Gramos mínimos de carbohidratos para mostrar una alerta de sugerencia de carbohitratos: las sugerencias de carbohidratos debajo de este número no iniciarán una notificación.</string>
     <string name="dexcomg5_xdripupload_title">Mandar datos BG a xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">En xDrip+ elige 640g/Eversense como fuente de datos</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -584,6 +634,8 @@
     <string name="extendedbolusdeliveryerror">Error al emitir bolo extendido</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">hace</string>
+    <string name="set_neutral_temps_title">Establecer basales temporales neutras</string>
+    <string name="set_neutral_temps_summary">Si está activado, cancelará un basal temporal antes del final de cada hora. Este método puede ayudar a evitar que algunas bombas pitan/vibran al final de la hora.</string>
     <string name="enablesmbalways">Habilitar SMB siempre</string>
     <string name="enablesmbalways_summary">Habilitar SMB siempre de forma independiente a los Bolos. Solo posible con fuente BG con buen filtrado de datos como G5</string>
     <string name="enablesmbaftercarbs">Habilitar SMB después de Carbohidratos</string>
@@ -603,11 +655,17 @@
     <string name="insulin_increment_button_message">Cantidad de insulina que se agrega cuando se presiona el botón</string>
     <string name="error_starting_cgm">No se pudo iniciar la aplicación CGM. Asegúrate de que está instalada.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorar 5m</string>
+    <string name="ignore15m">Ignorar 15m</string>
+    <string name="ignore30m">Ignorar 30m</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">Historial</string>
     <string name="wear_notifysmb_title">Notificar SMB</string>
     <string name="wear_notifysmb_summary">Mostrar SMB en el reloj como un bolo estándar.</string>
     <string name="ns_create_announcements_from_errors_title">Crear notificaciones de los errores</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Crear mensajes de alertas de carbohidratos necesarios</string>
     <string name="ns_create_announcements_from_errors_summary">Crear notificaciones en Nightscout para diálogos de error y alertas locales (también visibles en Careportal en Tratamientos)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Crear mensajes de Nightscout para las alertas de carbohidratos necesarios</string>
     <string name="wear_predictions_summary">Mostrar predicciones en el reloj</string>
     <string name="wear_predictions_title">Predicciones</string>
     <string name="data_choices">Opciones de datos</string>
@@ -736,6 +794,8 @@
     <string name="startobjective">Comienza tu primer objetivo</string>
     <string name="permission">Permiso</string>
     <string name="askforpermission">Pedir permiso</string>
+    <string name="needsystemwindowpermission">La aplicación necesita permiso de ventana del sistema para las notificaciones</string>
+    <string name="needlocationpermission">La aplicación necesita permiso de ubicación para la exploración de BT e identificación de WiFi</string>
     <string name="needstoragepermission">La aplicación necesita permiso para guardar los logs</string>
     <string name="request">Solicitar</string>
     <string name="insulinsourcesetup">Configurar complemento de insulina</string>
@@ -753,7 +813,10 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar la sensibilidad para objetivos temporales >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Objetivo temporal bajo reduce sensibilidad</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Reduce la sensibilidad para objetivos temporales < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistencia baja objetivo</string>
+    <string name="resistance_lowers_target_summary">Cuando se detecta resistencia, se baja el objetivo de glucosa</string>
     <string name="sensitivity_raises_target_title">Sensibilidad aumenta objetivo</string>
+    <string name="sensitivity_raises_target_summary">Cuando se detecta sensibilidad a insulina, aumenta el objetivo de glucosa</string>
     <string name="combo_invalid_setup">Configuración de la bomba incorrecta, leer la documentación y comprobar que el menú de Quick Info se llama QUICK INFO usando el software de configuración 360.</string>
     <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpiar eventos AndroidAPS iniciado</string>
@@ -804,6 +867,10 @@
     <string name="log_alerts">Registro de alarmas</string>
     <string name="enable_tbr_emulation">Activar emulación de dosis basal temporal</string>
     <string name="enable_tbr_emulation_summary">Usa bolos extendidos en lugar de TBRs para pasar por alto el límite de 250%%</string>
+    <string name="disable_vibration">Desactivar vibraciones en la administración manual del bolo</string>
+    <string name="disable_vibration_summary">Para bolo y bolo extendido (sólo disponible con el firmware de Insight 3.x)</string>
+    <string name="disable_vibration_auto">Desactivar vibraciones en la administración automática del bolo</string>
+    <string name="disable_vibration_auto_summary">Para SMB y basal temp. con la emulación TBR (sólo disponible con el firmware de Insight 3.x)</string>
     <string name="disconnect_delay">Desconectar el retraso [s]</string>
     <string name="serial_number">Número de serie</string>
     <string name="release_software_version">Versión de software</string>
@@ -1015,6 +1082,7 @@
     <string name="rileylink_scanner_scanning">Buscando</string>
     <string name="rileylink_scanner_scanning_finished">Búsqueda Finalizada</string>
     <string name="rileylink_scanner_scanning_error">Error de escaneo: %1$d</string>
+    <string name="common_never">Nunca</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Configuración</string>
     <string name="rileylink_settings_tab2">Historico</string>
@@ -1144,6 +1212,7 @@
     <string name="objectives_button_unfinish">Limpieza finalizada</string>
     <string name="objectives_button_unstart">Limpieza iniciada</string>
     <string name="doyouwantresetstart">¿Desea reiniciar el objetivo? Puedes perder tu progreso.</string>
+    <string name="time_or_timezone_change">Cambio de hora y/o huso horario en la bomba</string>
     <string name="nopumpselected">Ninguna bomba seleccionada</string>
     <string name="setupwizard_units_prompt">Seleccione las unidades en las que desea visualizar los valores</string>
     <string name="ns_ploadlocalprofile">Subir cambios de perfil local a NS</string>
@@ -1160,6 +1229,7 @@
     <string name="high_mark_comment">Valor superior al área de rango (sólo visualización)</string>
     <string name="reorder_label">Repetir</string>
     <string name="age">Edad:</string>
+    <string name="weight_label">Peso:</string>
     <string name="id">ID:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil más común:</string>
@@ -1184,28 +1254,140 @@
     <string name="ebstopsloop">El uso de la función de bolo extendido detendrá el modo de bucle cerrado durante el tiempo de ejecución del bolo extendido. ¿Realmente quieres esto?</string>
     <string name="closed_loop_disabled_with_eb">Bucle cerrado inhabilitado debido a la ejecución del bolo extendido</string>
     <string name="extended_bolus_short">EB</string>
+    <string name="phonechecker">\"Verificación de teléfono\"</string>
     <string name="chartmenu">Menú gráfico</string>
     <string name="sensitivity_short">AS</string>
     <string name="loop_smbrequest_time_label">Tiempo requerido de SMB</string>
     <string name="loop_smbexecution_time_label">Tiempo de ejecución de SMB</string>
+    <string name="loop_tbrrequest_time_label">Tiempo requerido para Basal temporal</string>
+    <string name="loop_tbrexecution_time_label">Tiempo de ejecución para Temp Basal</string>
+    <string name="insight_alert_notification_channel">Alertas de bomba Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">de app de Autentificación a: %1$s</string>
     <string name="smscommunicator_otp_enabled">Habilitar autentificador</string>
+    <string name="smscommunicator_otp_enabled_summary">Comandos de autentificación usando One Time Password de Google Autenticator o apps 2FA similar.</string>
+    <string name="smscommunicator_otp_pin">PIN adicional en token final</string>
+    <string name="smscommunicator_otp_pin_summary">Los dígitos adicionales se deben memorizar y pegar al final de cada una de las contraseñas generadas por One Time Password</string>
     <string name="smscomunicator_tab_otp_label">Configuración de autentificación</string>
+    <string name="smscommunicator_otp_verify_label">OTP para comprobar:</string>
+    <string name="smscommunicator_otp_reset_btn">Restablecer autentificadores</string>
+    <string name="smscommunicator_otp_reset_title">Restablecer clave de autentificación</string>
     <string name="smscommunicator_otp_reset_prompt">¿Está seguro de que desea restablecer la clave del autenticador? Los autenticadores configurados actualmente no seran válidos, y tendrá que volver a configurarlos.</string>
     <string name="smscommunicator_otp_reset_successful">¡Se ha generado una clave de autenticador nueva! Utilice QRCode actualizado para suministrar autenticadores.</string>
     <string name="smscommunicator_otp_step1_install_header">1. Instalar autenticador</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Escanea el código para instalar códigos AndroidAPS OTP</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Probar la contraseña de Uso único</string>
     <string name="smscommunicator_otp_reset_header">Restablecer autentificadores</string>
+    <string name="smscommunicator_otp_install_info">En cada teléfono seguidor, instale la aplicación Authenticator que admita tokens RFC 6238 TOTP. Las aplicaciones gratuitas populares son:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NO COMPARTA este código en línea!\nUsa sólo para la instalación de la Aplicación google Authenticator en teléfonos seguidores.</string>
     <string name="smscommunicator_otp_reset_warning">Al resetear el autenticador haces que todos los autenticadores ya provistos no sean válidos. ¡Necesitarás configurarlos de nuevo!</string>
     <string name="onconnect">Al conectar</string>
     <string name="ondisconnect">Al desconectar</string>
     <string name="overview_show_predictions">Predicciones</string>
+    <string name="overview_show_deviationslope">Pendiente de desviación</string>
+    <string name="authorizationfailed">Ha fallado la autorización</string>
+    <string name="overview_show_absinsulin">Insulina en total</string>
+    <string name="master_password_summary">La contraseña maestra se usa para cifrar la copia de seguridad y para sustituir la seguridad en la aplicación. Recordar o almacenar en sitio seguro.</string>
+    <string name="passwords_dont_match">Contraseñas no coinciden</string>
+    <string name="current_master_password">Contraseña maestra actual</string>
+    <string name="statuslights">Luces de estado</string>
+    <string name="statuslights_copy_ns">Copiar ajustes de NS</string>
+    <string name="copyexistingvalues">¿Copiar los ajustes de NS (si existe)?</string>
+    <string name="classic_description">Tema original</string>
+    <string name="buttonson_description">Los botones siempre se muestran en la parte inferior de la pantalla</string>
+    <string name="largedisplay_description">Pantalla grande</string>
+    <string name="skin">Tema</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">La integración de la bomba para Omnipod requiere el dispositivo RileyLink (con al menos 2,0 firmware).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Aviso de bolo activado</string>
+    <string name="omnipod_config_beep_basal_enabled">Aviso de basal activado</string>
+    <string name="omnipod_config_beep_smb_enabled">Aviso de SMB activado</string>
+    <string name="omnipod_config_beep_tbr_enabled">Aviso de TBT activado</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Opciones de depuración de Pod habilitadas</string>
+    <string name="omnipod_config_timechange_enabled">Detección de DST/Timezone habilitada</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_pod_status">Estado de Pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U restantes</string>
+    <string name="omnipod_reservoir_over50">Más De 50 U</string>
+    <string name="omnipod_pod_address">Dirección de Pod</string>
+    <string name="omnipod_pod_expiry">Pod Caduca</string>
+    <string name="omnipod_pod_name_no_info">Sin info</string>
+    <string name="omnipod_pod_no_pod_connected">Sin Pod conectado</string>
+    <string name="omnipod_pod_not_initalized">No Inicializado</string>
+    <string name="omnipod_pod_active_alerts">Alertas de Pod activas</string>
+    <string name="omnipod_ack_short">Alertas Ack</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">La operación no es posible.\n\nDebe configurar Omnipod primero, antes de poder usar esta operación.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">La operación no es posible.\n\n Necesitas esperar unos minutos, hasta que AAPS intente establecer el perfil por primera vez.</string>
+    <string name="omnipod_error_illegal_init_action_type">Ilegal PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Ningún pod activo.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Falló la verificación del comando.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Error inesperado. Por favor, informe! (tipo: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Comunicación fallida: se han recibido parámetros de entrada inválidos.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Comunicación fallida: tiempo de espera.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">La comunicación ha fallado: error inesperado. ¡Por favor, Informe!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Comunicación fallida: falló la verificación de integridad del mensaje.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">La comunicación ha fallado: se ha recibido un paquete no válido del Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">La comunicación ha fallado: el Pod está en un estado incorrecto.</string>
+    <string name="omnipod_driver_error_invalid_response">La comunicación ha fallado: se ha recibido una respuesta no válida del Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Ha fallado la comunicación: se ha recibido un mensaje con un número de secuencia no válido del Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">La comunicación ha fallado: se ha recibido un mensaje con una dirección no válida desde el Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">La comunicación ha fallado: no se ha podido descodificar el mensaje del Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">La comunicación ha fallado: nonce resync ha fallado.</string>
+    <string name="omnipod_driver_error_not_enough_data">La comunicación ha fallado: no se han recibido suficientes datos del Pod.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Administración de Pod</string>
+    <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Desactivar Pod</string>
+    <string name="omnipod_cmd_reset_pod">Restablecer Pod</string>
+    <string name="omnipod_cmd_pod_history">Historial de Pod</string>
+    <string name="omnipod_cmd_set_bolus">Establecer Bolo</string>
+    <string name="omnipod_cmd_cancel_bolus">Cancelar Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Establecer la basal temporal</string>
+    <string name="omnipod_cmd_cancel_tbr">Cancelar Basal Temporal (Internamente por controlador)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Cancelar Basal Temporal (forzado por el usuario)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Establecer Planificación Basal</string>
+    <string name="omnipod_cmd_get_pod_status">Obtener estado de Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Obtener información de Pod</string>
+    <string name="omnipod_cmd_set_time">Establecer hora</string>
+    <string name="omnipod_cmd_configure_alerts">Configurar alertas</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspender la entrega</string>
+    <string name="omnipod_cmd_resume_delivery">Reanudar la entrega</string>
+    <string name="omnipod_cmd_unknown_entry">Entrada desconocida</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1fU</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Tasa: %1$.1f U, Duración: %2$d min</string>
+    <string name="omnipod_cmd_pod_history_na">Historial del Pod no disponible en el momento.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Llenar el Pod</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Cebado</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Adherir el Pod</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Insertar cánula</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nEl Pod ahora está activo.\n\nSu horario basal ha sido programado y la cánula ha sido insertada.\n\nPor favor, verifique que la cánula ha sido insertada correctamente y reemplace su Pod si usted siente que no lo ha hecho.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nPulsa <b>Siguiente</b> para desactivar el Pod.\n\n<b>Nota:</b> Esto suspenderá toda la entrega insulina y desactivará el Pod.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Desactivando el Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, retire el Pod de su cuerpo y desecharlo.</string>
+    <string name="omnipod_init_pod_pair_pod">Emparejar Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Llenado de cánula del Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Llenar cánula</string>
+    <string name="omnipod_init_pod_set_basal_profile">Establecer el perfil basal</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Cancelar entrega</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Desactivar Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integración de la bomba para Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Finalizar recordatorio de emparejamiento</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Recordatorio de configuración finalizado</string>
+    <string name="omnipod_alert_expiration">Pod a punto de caducar</string>
+    <string name="omnipod_alert_expiration_advisory">Pod a punto de caducar</string>
+    <string name="omnipod_alert_shutdown_imminent">El apagado es inminente</string>
+    <string name="omnipod_alert_low_reservoir">Reservorio bajo</string>
+    <string name="omnipod_alert_unknown_alert">Alerta desconocida</string>
+    <string name="omnipod_rl_stats">Estadísticas del RL</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1d10a878b9..5da915b220 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -796,6 +796,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="permission">Autorisation</string>
     <string name="askforpermission">Demande d\'autorisation</string>
     <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
+    <string name="needlocationpermission">L\'application a besoin de l\'autorisation de localisation pour l\'analyse BT et l\'identification WiFi</string>
     <string name="needstoragepermission">L\'application requiert une autorisation de stockage de données afin de pouvoir sauvegarder les fichiers journaux</string>
     <string name="request">Demande</string>
     <string name="insulinsourcesetup">Configurer le plugin d\'insuline</string>
diff --git a/app/src/main/res/values-it-rIT/protection.xml b/app/src/main/res/values-it-rIT/protection.xml
index 6696bb44c4..2b1d73801e 100644
--- a/app/src/main/res/values-it-rIT/protection.xml
+++ b/app/src/main/res/values-it-rIT/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Nessuna protezione</string>
     <string name="protection">Protezione</string>
     <string name="master_password_missing">La password master non è impostata!\n\nImposta la tua password master in Preferenze (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Fallback non sicuro</string>
+    <string name="unsecure_fallback_descriotion_biometric">Per essere efficace, la protezione biometrica richiede una password master per impostare un\'alternativa in caso di necessità (fallback).\n\nImposta una password master!</string>
     <string name="password_set">Password impostata!</string>
     <string name="password_not_set">Password non impostata</string>
     <string name="password_not_changed">Password non modificata</string>
diff --git a/app/src/main/res/values-lt-rLT/objectives.xml b/app/src/main/res/values-lt-rLT/objectives.xml
index 2ef9dbd944..b833792c44 100644
--- a/app/src/main/res/values-lt-rLT/objectives.xml
+++ b/app/src/main/res/values-lt-rLT/objectives.xml
@@ -20,7 +20,10 @@
     <string name="objectives_autosens_gate">1 savaitę praleiskite sėkmingai naudodami uždarąjį ciklą dienos metu ir įvesdami visus valgomus angliavandenius</string>
     <string name="objectives_ama_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip pažangioji maisto skaičiuoklė (AMA Advanced Meal Assist)</string>
     <string name="objectives_smb_objective">Dienos metu aktyvuokite papildomas funkcijas, tokias kaip SMB (Super Mikro Bolusas)</string>
+    <string name="objectives_auto_objective">Automatizavimo įjungimas</string>
     <string name="objectives_smb_gate">Norėdami, kad SMB veiktų gerai, turite perskaityti dokumentaciją ir padidinti max AIO! Pradžiai patartina skaičiuoti taip: maxAIO=(didžiausia valandinė bazė x 3) + vidutinis bolusas</string>
+    <string name="objectives_auto_gate">Perskaitykite automatizavimo dokumentaciją. Nustatykite pirmąsias paprastas taisykles. Užuot įjungę veiksmus, leiskite AAPS tik rodyti pranešimus. Kai būsite tikri, kad automatizavimas prasidės tinkamu laiku, pakeiskite pranešimą realiu veiksmu.
+(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">KG matoma NS</string>
     <string name="objectives_pumpstatusavailableinns">NS matomas pompos statusas</string>
     <string name="objectives_manualenacts">Įvesti rankiniu būdu</string>
diff --git a/app/src/main/res/values-lt-rLT/protection.xml b/app/src/main/res/values-lt-rLT/protection.xml
index 3ea04e700d..4057e2737a 100644
--- a/app/src/main/res/values-lt-rLT/protection.xml
+++ b/app/src/main/res/values-lt-rLT/protection.xml
@@ -1,2 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Reikalingas tapatybės nustatymas</string>
+    <string name="biometric_description">Uždėkite pirštą ant pirštų atspaudų skaitytuvo jūsų tapatybės patvirtinimui</string>
+    <string name="settings_protection">Nustatymų apsauga</string>
+    <string name="application_protection">Programos apsauga</string>
+    <string name="bolus_protection">Bolusų apsauga</string>
+    <string name="master_password">Pagrindinis slaptažodis</string>
+    <string name="settings_password">Nustatymų slaptažodis</string>
+    <string name="application_password">Programos slaptažodis</string>
+    <string name="bolus_password">Bolusų slaptažodis</string>
+    <string name="unlock_settings">Atrakinti nustatymus</string>
+    <string name="biometric">Biometriniai</string>
+    <string name="custom_password">Pasirinktinis slaptažodis</string>
+    <string name="noprotection">Apsaugos nėra</string>
+    <string name="protection">Apsauga</string>
+    <string name="master_password_missing">Pagrindinis slaptažodis nėra nustatytas!\n\nPrašome nustatyti savo pagrindinį slaptažodį Nustatymuose(%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Nesaugus atsarginis įrašas</string>
+    <string name="unsecure_fallback_descriotion_biometric">Saugumui užtikrinti, biometrinei apsaugai reikia pagrindinio slaptažodžio atsarginiam įrašui.\n\nĮveskite pagrindinį slaptažodį!</string>
+    <string name="password_set">Slaptažodis nustatytas!</string>
+    <string name="password_not_set">Slaptažodis nenustatytas</string>
+    <string name="password_not_changed">Slaptažodis nepakeistas</string>
+    <string name="password_cleared">Slaptažodis išvalytas!</string>
+    <string name="password_hint">Įveskite slaptažodį čia</string>
+</resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 3fa84dc857..e117fd3736 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -126,10 +126,12 @@
     <string name="apsmode_title">DKS režimas</string>
     <string name="closedloop">Uždaras Ciklas</string>
     <string name="openloop">Atviras Ciklas</string>
+    <string name="lowglucosesuspend">Sustabdymas esant žemai gliukozei</string>
     <string name="disabledloop">Ciklas išjungtas</string>
     <string name="disableloop">Išjungti Ciklą</string>
     <string name="enableloop">Įjungti Ciklą</string>
     <string name="openloop_newsuggestion">Gautas naujas pasiūlymas</string>
+    <string name="carbssuggestion">Angliavandenių pasiūlymas</string>
     <string name="unsupportednsversion">Nepalaikoma Nightscout versija</string>
     <string name="loopdisabled">CIKLAS NEAKTYVUS DĖL APRIBOJIMŲ</string>
     <string name="treatments_wizard_basaliob_label">Bazės AIO</string>
@@ -162,6 +164,7 @@
     <string name="filenotfound">Failas nerastas</string>
     <string name="nav_export">Eksportuoti nustatymus</string>
     <string name="nav_import">Importuoti nustatymus</string>
+    <string name="openapsma_maxbasal_title">Maks vv/val skaičius, kuris gali būti nustatytas kaip laikina bazė</string>
     <string name="openapsma_maxbasal_summary">Šis skaičius OpenAPS kontekste vadinamas maks. valandine baze</string>
     <string name="openapsma_maxiob_title">Didžiausias valandinės bazės insulino kiekis, kurį gali suleisti OpenAPS [U]</string>
     <string name="openapsma_maxiob_summary">Ši vertė OpenAPS kontekste vadinama Maks AIO\nTai maksimalus insulino vienetų [U] skaičius, kurį DKS gali suleisti vienu metu.</string>
@@ -169,6 +172,7 @@
     <string name="password_preferences_decrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas atšifruojant importuotus nustatymus.</string>
     <string name="preferences_export_canceled">Eksportas nutrauktas! Nustatymai NE eksportuoti!</string>
     <string name="preferences_import_canceled">Importas nutrauktas! Nustatymai NE importuoti!</string>
+    <string name="preferences_import_list_title">Pasirinkite failą importavimui</string>
     <string name="check_preferences_before_import">Prašom patikrinti nustatymus prieš importuojant:</string>
     <string name="check_preferences_cannot_import">Nustatymai negali būti importuoti!</string>
     <string name="check_preferences_dangerous_import">Nustatymai neturėtų būti importuoti!</string>
@@ -181,6 +185,8 @@
     <string name="metadata_warning_outdated_format">Jūs naudojate pasenusį formatą iš senos AAPS versijos, kuris nėra saugus! Naudokite tik kraštutiniu atveju, jei neturite nustatymų failo dabartiniu, JSON formatu.</string>
     <string name="metadata_warning_old_export">Importuoti nustatymai yra %1$s d. senumo! Patikrinkite, gal pasirinkote neteisingą failą ir turite naujesnius? Nepamirškite reguliariai eksportuoti nustatymų!</string>
     <string name="metadata_warning_date_format">Neteisingas datos ir laiko formatas!</string>
+    <string name="metadata_warning_different_version">Parametrai iš kitos palaikomosios programos versijos. Jei importuojate po atnaujinimo, tai yra normalu, bet po importavimo patikrinkite, ar visos nuostatos vis dar teisingos!</string>
+    <string name="metadata_urgent_different_version">Parametrai iš kitos pagrindinės programos versijos. Pagrindinės versijos labai skiriasi ir gali turėti nesuderinamų parametrų! Po importavimo įsitikinkite, kad parametrai vis dar teisingi!</string>
     <string name="metadata_label_format">Failo formatas</string>
     <string name="metadata_label_created_at">Sukurta</string>
     <string name="metadata_label_aaps_version">AAPS versija</string>
@@ -203,6 +209,11 @@
     <string name="prefdecrypt_issue_wrong_pass">Iššifravimas klaida, slaptažodis yra neteisingas arba nustatymų failas buvo pakeistas! Taip nutinka, jei importuotas failas buvo eksportuotas su kitu slaptažodžiu.</string>
     <string name="prefdecrypt_issue_wrong_format">Trūksta šifravimo sąrankos parametrų, nustatymų formatas yra neteisingas!</string>
     <string name="prefdecrypt_issue_wrong_algorithm">Nepalaikomas arba nepatikslintas šifravimo algoritmas!</string>
+    <string name="exported_today">eksportuota šiandien</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">eksportuota prieš %1$s</string>
+    <string name="exported_at" comment="at placeholder we add export date">eksportuota %1$s</string>
+    <string name="exported_less_than_hour_ago">eksportuota mažiau nei prieš valandą</string>
+    <string name="in_directory" comment="placeholder is for exported file path">kataloge: %1$s</string>
     <string name="end_user_license_agreement">Licencinė sutartis su vartotoju</string>
     <string name="end_user_license_agreement_text">PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI.</string>
     <string name="end_user_license_agreement_i_understand">SUPRATAU IR SUTINKU</string>
@@ -242,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Ciklas įjungtas</string>
     <string name="valuelimitedto">%1$.2f apribotas iki %2$.2f</string>
     <string name="valueoutofrange">Vertė %1$s viršija griežtą limitą</string>
+    <string name="smscommunicator_pumpconnectwithcode">Pompos prijungimui atsakykite su kodu %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Nepavyko prisijungti prie pompos</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Norėdami atjungti pompą %1d min., atsakykite kodu %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pompa atjungta</string>
+    <string name="smscommunicator_reconnect">Pompa prijungta</string>
     <string name="smscommunicator_remotecommandnotallowed">Nuotolinis valdymas negalimas</string>
     <string name="smscommunicator_remotebolusnotallowed">Nuotolinis bolusas negalimas. Bandykite vėliau.</string>
     <string name="smscommunicator_basalreplywithcode">Norėdami aktyvuoti %1$.2fvv/val bazę, kurios trukmė %2$d min, atsakykite kodu %3$s</string>
@@ -250,6 +266,9 @@
     <string name="smscommunicator_carbsreplywithcode">Įvedimui %1$dg %2$s atsakykite kodu %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Norėdami aktyvuoti %1$d%% bazę %2$d min., atsakykite kodu %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Norėdami sustabdyti Ciklą %1$d min., atsakykite kodu %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Ciklo atnaujinimui atsakykite su kodu %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Ciklo įjungimui atsakykite su kodu %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Ciklo išjungimui atsakykite su kodu %1$s</string>
     <string name="smscommunicator_tempbasalset">%1$.2f vv/val laikina bazė, kurios trukmė %2$d min., aktyvuota sėkmingai</string>
     <string name="smscommunicator_extendedset">%1$.2f vv ištęstas bolusas, kurio trukmė %2$d min., aktyvuotas sėkmingai</string>
     <string name="smscommunicator_carbsset">%1$dg angliavandeniai įrašyti sėkmingai</string>
@@ -281,6 +300,7 @@
     <string name="primefill">Užpildymas</string>
     <string name="fillwarning">Įsitikinkite, kad nurodytas kiekis atitinka Jūsų infuzijos rinkinio specifikaciją!</string>
     <string name="othersettings_title">Kita</string>
+    <string name="fillbolus_title">Standartiniai insulino kiekiai kateterio/kaniulės užpildymui</string>
     <string name="button1">Mygtukas 1</string>
     <string name="button2">Mygtukas 2</string>
     <string name="button3">Mygtukas 3</string>
@@ -339,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Numatytoji reikšmė: 4 tai antras pagrindinis OpenAPS saugiklis, apskaičiuojant \"3x maksimali dienos bazė; 4x dabartinė valandinė bazė\". Jis reiškia, kad jūsų valandinė bazė, nepriklausomai nuo to, kokia maksimali valandinė bazė suprogramuota pompoje, negali būti didesnė, nei keturguba dabartinė valandinė bazė. Tai apsaugo Jus nuo pavojingų situacijų, kai nustatoma pernelyg didelė valandinė bazė, pilnai nesuprantant, kaip veikia algoritmas. Numatytoji reikšmė yra 4x; daugumai vartotojų niekada neprireikia šio skaičiaus keisti, o pajutus, kad \"atsitrenkiama\" į saugiklį, rekomenduojama peržiūrėti kitus nustatymus.</string>
     <string name="openapsama_autosens_max_summary">Numatytoji reikšmė: 1.2\nTai daugiklis Autosens (ir netrukus Autotune) funkcijoje, kuris nustato 20%% maksimalią ribą iki kurios Autosens gali padidinti valandinę bazę, sumažinti JIF ir tikslinę gliukozės vertę.</string>
     <string name="openapsama_autosens_min_summary">Numatytoji reikšmė: 0.7\nTai antras daugiklis Autosens funkcijoje, kuris nustato, kad Autosens gali iki minimalios 70 % ribos sumažinti valandinę bazę bei padidinti JIF ir tikslinę gliukozės vertę.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens nustatomi tikslai, taip pat</string>
     <string name="openapsama_autosens_adjusttargets_summary">Numatytoji reikšmė: true\nTai suteikia Autosens funkcijai leidimą keisti tikslinės gliukozės vertes, JIF ir valandinę bazę.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Numatytoji reikšmė: 2\nBoluso snaudimas aktyvuojamas iškart po to, kai susileidžiate bolusą maistui. Ši funkcija neleidžia sistemai nustatyti mažų LBD iškart po valgio. Pvz.: jei IVT yra 3 val, tai boluso snaudimas pamažu deaktyvuojamas per 1,5 val (3 val. / 2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Numatytoji reikšmė: 3.0 (AMA) arba 8.0 (SMB). Tai parametras, nurodantis angliavandenių poveikį kraujo gliukozei kas 5 minutes nuo jų suvartojimo. Numatytoji reikšmė yra 3 mg/dl per 5min. Šis skaičius turi įtakos apskaičiavimams, kaip greitai mažės AAO, kokia bus kraujo gliukozės kitimo prognozė, ypač kai ji krenta daugiau nei tikėtasi, arba nedidėja tiek, kiek tikėtasi.</string>
@@ -377,6 +398,7 @@
     <string name="wear_detailedIOB_title">Rodyti AIO detaliai</string>
     <string name="wear_detailedIOB_summary">Rodyti laikrodyje bazės ir bolusų AIO</string>
     <string name="nosuccess">Bandymas nesėkmingas - pasitikrinkite telefoną</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Paciento amžius</string>
     <string name="child">Vaikas</string>
     <string name="teenage">Paauglys</string>
@@ -420,12 +442,26 @@
     <string name="enablesuperbolus">Įgalinti superbolusus skaičiuoklėje</string>
     <string name="enablesuperbolus_summary">Įgalina superbolusų naudojimą insulino skaičiuoklėje. Nenaudokite, kol nesuprantate, ką superbolus funkcija atlieka. NAUDODAMI AKLAI GALITE PERDOZUOTI INSULINO!</string>
     <string name="show_statuslights">Pradžios ekrane rodyti spalvotus indikatorius</string>
+    <string name="statuslights_cage_warning">Kaniulės ribinio laiko įspėjimas [h]</string>
+    <string name="statuslights_cage_critical">Kaniulės kritinio laiko įspėjimas [h]</string>
+    <string name="statuslights_iage_warning">Insulino ribinio laiko įspėjimas [h]</string>
+    <string name="statuslights_iage_critical">Insulino kritinio laiko įspėjimas [h]</string>
+    <string name="statuslights_sage_warning">Jutiklio ribinio laiko įspėjimas [h]</string>
+    <string name="statuslights_sage_critical">Jutiklio kritinio laiko įspėjimas [h]</string>
+    <string name="statuslights_bage_warning">Baterijos ribinio laiko įspėjimas [h]</string>
+    <string name="statuslights_bage_critical">Baterijos kritinio laiko įspėjimas [h]</string>
     <string name="statuslights_res_warning">Įspėjimo apie žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_res_critical">Įspėjimo apie kritiškai žemą rezervuaro lygį riba [U]</string>
     <string name="statuslights_bat_warning">Įspėjimo apie žemą baterijos įkrovimo lygį riba [%]</string>
     <string name="statuslights_bat_critical">Įspėjimo apie kritiškai žemą baterijos įkrovimo lygį riba [%]</string>
+    <string name="prediction_shortname">PROGN</string>
     <string name="iob">AIO</string>
     <string name="cob">AAO</string>
+    <string name="basal_shortname">VB</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">VEIKS</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Apie</string>
     <string name="smscommunicator_missingsmspermission">Trūksta leidimo SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Trūksta telefono būsenos leidimo</string>
@@ -443,6 +479,8 @@
     <string name="doprofileswitch">Profilio keitimas</string>
     <string name="careportal_pbage_label">Baterija</string>
     <string name="ns_alarmoptions">Aliarmų nustatymai</string>
+    <string name="ns_alarms">Sukurti pranešimus iš NS aliarmų</string>
+    <string name="ns_announcements">Sukurkite pranešimus iš NS perspėjimų</string>
     <string name="nsalarm_staledatavalue_label">Seni duomenys, riba [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Kritiškai seni duomenys, riba [min]</string>
     <string name="openapsama_autosens_period">Autosens intervalas [h]</string>
@@ -523,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Perspėjimas apie negautus KG duomenis</string>
     <string name="enable_pump_unreachable_alert">Perspėjimas apie nepasiekiamą pompą</string>
     <string name="pump_unreachable_threshold">Perspėjimo apie nepasiekiamą pompą riba [min]</string>
+    <string name="enable_carbs_req_alert">Perspėti, jei būtini angliavandeniai</string>
     <string name="urgent_alarm">Kritiniai perspėjimai</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense programėlė (modifikuota)</string>
@@ -535,6 +574,8 @@
     <string name="smbmaxminutes_summary">SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
     <string name="uamsmbmaxminutes">NDM SMB maks. min.</string>
     <string name="uamsmbmaxminutes_summary">NDM SMB atitinka valandinės bazės insulino kiekį, kuris gaunamas ne daugiau, kaip per</string>
+    <string name="carbsReqThreshold">Minimali būtinų angliavandenių priminimo riba</string>
+    <string name="carbsReqThreshold_summary">Minimalus angliavandenių kiekis gramais, apie kurį reikia įspėti. Angliavandenių pasiūlymai, mažesni už šį kiekį, nėra pranešami.</string>
     <string name="dexcomg5_xdripupload_title">Siųsti KG duomenis į xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Xdrip+ pasirinkite 640g/Eversense duomenų šaltinį</string>
     <string name="nsclientbg">NSClient KG</string>
@@ -593,6 +634,8 @@
     <string name="extendedbolusdeliveryerror">Ištęstinio boluso suleidimo klaida</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">prieš</string>
+    <string name="set_neutral_temps_title">Nustatyti neutralią laikiną bazę</string>
+    <string name="set_neutral_temps_summary">Jei įjungta, laikina valandinė bazė bus anuliuota iki kiekvienos valandos pabaigos. Šis metodas gali padėti išvengti kai kurių pompų pypsėjimo ar vibravimo.</string>
     <string name="enablesmbalways">Leisti SMB visada</string>
     <string name="enablesmbalways_summary">Leisti SMB visada, nepriklausomai nuo bolusų. Įmanoma tik naudojant patikimų, filtruotų KG duomenų šaltinį, pvz.: Dexcom G5</string>
     <string name="enablesmbaftercarbs">Leisti SMB po angliavandenių įvedimo</string>
@@ -612,11 +655,17 @@
     <string name="insulin_increment_button_message">Paspaudus mygtuką įvedamas nustatytas insulino kiekis</string>
     <string name="error_starting_cgm">Nepavyko paleisti NGJ programos.  Įsitikinkite, kad ji įdiegta.</string>
     <string name="overview_cgm">NGJ</string>
+    <string name="ignore5m">Ignoruoti 5 min</string>
+    <string name="ignore15m">Ignoruoti 15 min</string>
+    <string name="ignore30m">Ignoruoti 30 min</string>
+    <string name="required">reikal.</string>
     <string name="nav_historybrowser">Istorija</string>
     <string name="wear_notifysmb_title">Pranešti apie SMB</string>
     <string name="wear_notifysmb_summary">Rodyti SMB laikrodyje kaip standartinį bolusą.</string>
     <string name="ns_create_announcements_from_errors_title">Kurti klaidų pranešimus</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Sukurkite pranešimus apie būtinų angliavandenių įspėjimus</string>
     <string name="ns_create_announcements_from_errors_summary">Sukurti Nightscout pranešimus apie klaidas ir vietinius įspėjimus (taip pat matomi Priežiūroje prie Terapijos)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Sukurkite NS pranešimus apie būtinų angliavandenių įspėjimus</string>
     <string name="wear_predictions_summary">Rodyti prognozes laikrodyje.</string>
     <string name="wear_predictions_title">Prognozė</string>
     <string name="data_choices">Duomenų pasirinkimas</string>
@@ -746,6 +795,7 @@
     <string name="permission">Leidimas</string>
     <string name="askforpermission">Prašyti leidimo</string>
     <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
+    <string name="needlocationpermission">Programai reikia vietos nustatymo leidimo, kad būtų galima naudoti Bluetooth ir WiFi</string>
     <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus</string>
     <string name="request">Užklausa</string>
     <string name="insulinsourcesetup">Konfigūruoti insulino įskiepį</string>
@@ -766,6 +816,7 @@
     <string name="resistance_lowers_target_title">Rezistencija mažina tikslą</string>
     <string name="resistance_lowers_target_summary">Kai nustatoma rezistencija, tikslinė gliukozės vertė sumažinama</string>
     <string name="sensitivity_raises_target_title">Jautrumas didina tikslą</string>
+    <string name="sensitivity_raises_target_summary">Kai aptinkamas padidėjęs jautrumas insulinui, tikslinis gliukozės lygis padidinamas</string>
     <string name="combo_invalid_setup">Netinkami pompos nustatymai, patikrinkite dokumentaciją ir įsitikinkite, kad Quick info meniu yra pavadintas QUICK INFO, naudojant 360 configuration software.</string>
     <string name="custom">Pasirinktinis</string>
     <string name="careportal_removestartedevents">Ištrinti \"AndroidAPS paleista\" įrašus</string>
@@ -774,6 +825,7 @@
     <string name="error_adding_treatment_title">Terapijos duomenys nepilni</string>
     <string name="maintenance_settings">Serviso nustatymai</string>
     <string name="maintenance_email">Gavėjo el. paštas</string>
+    <string name="maintenance_encrypt_exported_prefs">Užšifruoti eksportuotus parametrus</string>
     <string name="maintenance_amount">Siunčiamų įrašų skaičius</string>
     <string name="maintenance">Servisas</string>
     <string name="maintenance_shortname">Serv</string>
@@ -815,6 +867,10 @@
     <string name="log_alerts">Įrašyti įspėjimus</string>
     <string name="enable_tbr_emulation">Aktyvuoti LBD emuliaciją</string>
     <string name="enable_tbr_emulation_summary">Naudoti ištęstinius bolusus vietoj laikinos bazės, kai viršijama 250%% riba</string>
+    <string name="disable_vibration">Išjungti vibracijas rankinio boluso suleidimo metu</string>
+    <string name="disable_vibration_summary">Bolusui ir ištęstam bolusui (tik su Insight programinės įrangos 3.x versija)</string>
+    <string name="disable_vibration_auto">Išjungti vibracijas automatinio boluso suleidimo metu</string>
+    <string name="disable_vibration_auto_summary">SMB ir laikinai valandinei bazei su TBR emuliacija (tik Insight su programinės įrangos versija 3.x)</string>
     <string name="disconnect_delay">Atjungimo vėlavimas [s]</string>
     <string name="serial_number">Serijos numeris</string>
     <string name="release_software_version">Išleistos programinės įrangos versija</string>
@@ -958,6 +1014,8 @@
     <string name="exists">egzistuoja</string>
     <string name="notexists">neegzistuoja</string>
     <string name="temptargetcompared">Laikinas tikslas %1$s</string>
+    <string name="btdevicecompared">Bluetooth ryšys su įrenginiu %1$s %2$s</string>
+    <string name="btdevice">Ryšys su Bluetooth įrenginiu </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -1012,6 +1070,7 @@
     <string name="medtronic_pump_battery_alkaline">Šarminė (išplėstinis vaizdas)</string>
     <string name="medtronic_pump_battery_lithium">Ličio (išplėstinis vaizdas)</string>
     <string name="medtronic_pump_battery_nizn">Šarminė (išplėstinis vaizdas)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (išplėstinis vaizdas)</string>
     <string name="medtronic_bolus_debugging">Boluso/Terapijos Derinimas</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SKENAVIMAS</string>
@@ -1023,6 +1082,7 @@
     <string name="rileylink_scanner_scanning">Skanuojama</string>
     <string name="rileylink_scanner_scanning_finished">Skanavimas baigtas</string>
     <string name="rileylink_scanner_scanning_error">Skanavimo klaida: %1$d</string>
+    <string name="common_never">Niekada</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Parametrai</string>
     <string name="rileylink_settings_tab2">Istorija</string>
@@ -1152,6 +1212,7 @@
     <string name="objectives_button_unfinish">Išvalyti užbaigtus</string>
     <string name="objectives_button_unstart">Išvalyti pradėtus</string>
     <string name="doyouwantresetstart">Ar norite iš naujo nustatyti tikslų pradžią? Jūs galite prarasti jau pasiektus.</string>
+    <string name="time_or_timezone_change">Laiko ir/ar laiko zonos pakeitimas pompoje</string>
     <string name="nopumpselected">Pompa nepasirinkta</string>
     <string name="setupwizard_units_prompt">Pasirinkite vienetus, kurių vertes norite parodyti</string>
     <string name="ns_ploadlocalprofile">Įkelti vietinio profilio pakeitimus į NS</string>
@@ -1168,6 +1229,7 @@
     <string name="high_mark_comment">Didžiausia tikslinės srities vertė (tik rodymui)</string>
     <string name="reorder_label">Pertvarkyti</string>
     <string name="age">Amžius:</string>
+    <string name="weight_label">Svoris:</string>
     <string name="id">ID:</string>
     <string name="submit">Pateikti</string>
     <string name="mostcommonprofile">Dažniausiai naudojamas profilis:</string>
@@ -1201,30 +1263,146 @@
     <string name="loop_tbrexecution_time_label">Laikinos bazės įvykdymo laikas</string>
     <string name="insight_alert_notification_channel">Insight pompos aliarmai</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">iš tapatybės nustatymo programos: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Įgalinti tapatybės nustatymo funkciją</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentifikuokite komandas naudodami vienkartinius slaptažodžius, sugeneruotus Google Authenticator ar panašiose 2FA programose.</string>
+    <string name="smscommunicator_otp_pin">Papildomas PIN kodas žymeklio gale</string>
+    <string name="smscommunicator_otp_pin_summary">Papildomi skaitmenys, kuriuos reikia atsiminti ir pridėti kiekvieno sugeneruoto slaptažodžio pabaigoje</string>
+    <string name="smscomunicator_tab_otp_label">Autentifikavimo sąrankos nustatymas</string>
+    <string name="smscommunicator_otp_verify_label">OTP tikrinimas:</string>
+    <string name="smscommunicator_otp_reset_btn">Atstatyti tapatybės nustatymą</string>
+    <string name="smscommunicator_otp_reset_title">Atstatyti autentifikatoriaus kodą</string>
+    <string name="smscommunicator_otp_reset_prompt">Ar tikrai norite iš naujo nustatyti autentifikatoriaus raktą? Dėl to visi šiuo metu konfigūruojami autentifikatoriai negalios, ir jums reikės juos nustatyti dar kartą.</string>
+    <string name="smscommunicator_otp_reset_successful">Sukurtas naujas autentifikavimo raktas! Autentifikatoriams pateikti naudokite atnaujintą QR kodą.</string>
     <string name="smscommunicator_otp_step1_install_header">1. Įdiegti Authenticator</string>
     <string name="smscommunicator_otp_step2_provisioning_header">2. Nuskanuoti kodą AndroidAPS OTP kodų nustatymyu</string>
     <string name="smscommunicator_otp_step3_test_header">3. Patikrinti vienkartinį slaptažodį</string>
+    <string name="smscommunicator_otp_reset_header">Atstatyti tapatybės nustatymą</string>
+    <string name="smscommunicator_otp_install_info">Kiekviename telefone, palaikančiame RFC 6238 TOTP prieigos raktus, įdiekite autentifikavimo programą. Populiariausios nemokamos programos yra:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NESIDALINKITE šiuo kodu internete!\nNaudokite tik nustatydami Authenticator programą sekėjų telefonuose.</string>
+    <string name="smscommunicator_otp_reset_warning">Jei iš naujo nustatysite autentifikavimo priemonę, visi esami autentifikatoriai taps negaliojantys. Tada turėsite juos vėl nustatyti!</string>
     <string name="onconnect">Sujungimo metu</string>
     <string name="ondisconnect">Išjungimo metu</string>
+    <string name="overview_show_predictions">Prognozė</string>
+    <string name="overview_show_deviationslope">Nukrypimo koeficientas</string>
     <string name="authorizationfailed">Autorizacija nepavyko</string>
     <string name="overview_show_absinsulin">Insulinas absoliučiais vienetais</string>
+    <string name="master_password_summary">Pagrindinis slaptažodis naudojamas atsarginiam šifravimui ir programos saugumo ignoravimui. Atsiminkite jį arba laikykite užsirašę saugioje vietoje.</string>
     <string name="passwords_dont_match">Slaptažodžiai nesutampa</string>
     <string name="current_master_password">Dabartinis pagrindinis slaptažodis</string>
+    <string name="statuslights">Būklės indikatoriai</string>
     <string name="statuslights_copy_ns">Kopijuoti nustatymus iš NS</string>
     <string name="copyexistingvalues">Kopijuoti NS nustatymus (jei yra)?</string>
     <string name="classic_description">Originali išvaizda</string>
     <string name="buttonson_description">Mygtukai visada rodomi ekrano apačioje</string>
+    <string name="largedisplay_description">Didelis ekranas</string>
     <string name="skin">Išvaizda</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Omnipod pompos integracijai reikalingas RileyLink (programinės įrangos versija ne mažiau 2.0).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Boluso signalas įjungtas</string>
+    <string name="omnipod_config_beep_basal_enabled">Bazės signalas įjungtas</string>
+    <string name="omnipod_config_beep_smb_enabled">SMB signalas įjungtas</string>
+    <string name="omnipod_config_beep_tbr_enabled">Laikinos bazės signalas įjungtas</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Įgalintos POD derinimo galimybės</string>
+    <string name="omnipod_config_timechange_enabled">Vasaros laiko/laiko juostos aptikimas įgalintas</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">POD valdymas</string>
+    <string name="omnipod_pod_status">POD būklė</string>
     <string name="omnipod_reservoir_left">liko %1$.2f U</string>
     <string name="omnipod_reservoir_over50">Daugiau nei 50 U</string>
+    <string name="omnipod_pod_address">POD adresas</string>
+    <string name="omnipod_pod_expiry">POD laikas pasibaigs</string>
     <string name="omnipod_pod_name_no_info">Nėra informacijos</string>
+    <string name="omnipod_pod_no_pod_connected">POD neprijungta</string>
+    <string name="omnipod_pod_not_initalized">Nepavyko paleisti</string>
+    <string name="omnipod_pod_active_alerts">Aktyvaus POD signalai</string>
+    <string name="omnipod_ack_short">Priimti pranešimus</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operacija negalima.\n\n Pirmiausia turite sukonfigūruoti Omnipod pompą prieš atliekant šią operaciją.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operacija negalima.\n\n Jūs turite palaukti kelias minutes, kol AAPS bando nustatyti profilį pirmą kartą.</string>
+    <string name="omnipod_error_illegal_init_action_type">Neteisingas inicijavimo tipas:%1$s</string>
+    <string name="omnipod_error_pod_not_attached">Nėra aktyvaus POD.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Komandos patikra nepavyko.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Įvyko netikėta klaida. Prašome pranešti! (tipas: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Ryšio klaida: gauti neteisingi įvesties parametrai.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Ryšio klaida: skirtas laikas baigėsi.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Ryšio klaida: įvyko netikėta klaida. Prašome pranešti!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Ryšio klaida: pranešimo vientisumo patikra nepavyko.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Ryšio klaida: netinkami įvesties iš POD parametrai.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Ryšio klaida: Pod būklė yra netinkama.</string>
+    <string name="omnipod_driver_error_invalid_response">Ryšio klaida: gautas netinkamas atsakymas iš POD.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Ryšio klaida: iš POD gautas pranešimas su negaliojančiu serijos numeriu.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Ryšio klaida: iš POD gautas pranešimas su netinkamu adresu.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Ryšio klaida: nepavyko iššifruoti pranešimo iš POD.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Ryšio klaida: nepavyko iš naujo sinchronizuoti Nonce.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Ryšio klaida: Nonce nebuvo sinchronizuota.</string>
+    <string name="omnipod_driver_error_not_enough_data">Ryšio klaida: nepakankamai duomenų gauta iš POD.</string>
+    <string name="omnipod_driver_error_pod_fault">Aptikta POD klaida (%1$03d %2$s). Išjunkite POD ir pradėkite naują.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Ryšio klaida: POD pateikė klaidos atsakymą.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">POD valdymas</string>
+    <string name="omnipod_cmd_init_pod">Inicijuoti POD</string>
+    <string name="omnipod_cmd_deactivate_pod">Išjungti POD</string>
+    <string name="omnipod_cmd_reset_pod">Atstatyti POD</string>
+    <string name="omnipod_cmd_pod_history">POD istorija</string>
+    <string name="omnipod_cmd_set_bolus">Nustatyti bolusą</string>
+    <string name="omnipod_cmd_cancel_bolus">Atšaukti bolusą</string>
+    <string name="omnipod_cmd_set_tbr">Nustatyti laikiną bazę</string>
+    <string name="omnipod_cmd_cancel_tbr">Atšaukti laikiną bazę (vidinis valdiklis)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Atšaukti laikiną bazę (Inicijuota vartotojo)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Nustatyti bazės tvarkaraštį</string>
+    <string name="omnipod_cmd_get_pod_status">Gauti POD būklę</string>
+    <string name="omnipod_cmd_get_pod_info">Gauti POD informaciją</string>
+    <string name="omnipod_cmd_set_time">Nustatyti laiką</string>
+    <string name="omnipod_cmd_configure_alerts">Konfigūruoti perspėjimus</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Patvirtinti perspėjimus</string>
+    <string name="omnipod_cmd_suspend_delivery">Sustabdyti suleidimą</string>
+    <string name="omnipod_cmd_resume_delivery">Atnaujinti suleidimą</string>
+    <string name="omnipod_cmd_unknown_entry">Nežinomas Įrašas</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f vv</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f vv, AV=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Kiekis: %1$.1f vv, Trukmė: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Jei spustelėsite <b>OK</b>, ryšys su POD bus priverstinai nutrauktas ir nebegalėsite prie jo prisijungti. Atlikite tai tik tada, kai AAPS nebegali bendrauti su POD. Jei ryšys su POD vis tiek veikia, naudokite parinktį <b>Išjungti POD</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">POD istorija šiuo metu nėra prieinama.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Užpildyti POD</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nUžpildykite naują POD insulinu, kurio pakaktų 3 dienas.\n\nTaip pat atkreipkite dėmesį į du pyptelėjimus iš POD, kai pildote. Tai rodo, kad rezervuaras buvo užpildytas mažiausiai 85vv. Visiškai ištuštinkite švirkštą, net jei girdėjote du pyptelėjimus.\n\nUžpildę POD, spustelėkite <b>Kitas</b>.\n\n <b>Pastaba:</b> vykdant šiuos veiksmus, nenuimkite POD adatos apsauginio dangtelio.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Užpildymas</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Pabandykite suporuoti naują POD ir užpildykite jį.\n\nKai pažymėti visi elemetai, galite spustelėti <b>Kitas</b>.\n\n <b>Pastaba:</b> POD ir RileyLink turi būti būti labai arti vienas kito.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Prijunkite POD</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nParuoškite infuzijos vietą. Nuimkite adatos apsauginį dangtelį, pleistro apsaugą ir užklijuokite POD ant infuzijos vietos.\n\nJei kaniulė atšoks, paspauskite <b>Atšaukti</b> ir pakeiskite POD.\n\nSpauskite <b>Kitas</b>, norėdami įvesti kaniulę ir pradėti leisti insuliną.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Įvedama kaniulė</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Mėginkite nustatyti pradinį bazės profilį ir įvesti kaniulę.\n\nKai visi elementai yra patikrinti, galite paspausti <b>Kitas</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">POD informacija</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPOD yra aktyvus.\n\nJūsų bazės profilis yra suprogramuotas ir kaniulė įvesta.\n\nPatikrinkite, ar kaniulė buvo tinkamai įvesta, ir, jei jaučiate, kad taip nėra, pakeiskite POD.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Išjungti POD</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nSpustelėkite<b>Kitas</b>, kad išjungtumėte POD.\n\n<b>Pastaba:</b> Tai sustabdys insulino leidimą ir išjungs POD.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">POD išjungimas</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">POD išjungimas.\n\nJei visi elementai pažymėti, galite paspausti <b>Kitas</b>.\n\n <b>Pastaba:</b> Jei išjungimas vis nepavyksta, paspauskite <b> Atšaukti</b> ir naudokite parinktį <b>Atstatyti POD </b>, kad priverstinai atkurtumėte POD būklę.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">POD išjungtas.\n\nNuimkite POD nuo odos ir jį išmeskite.</string>
+    <string name="omnipod_init_pod_pair_pod">POD suporavimas</string>
+    <string name="omnipod_init_pod_prime_pod">POD užpildymas</string>
+    <string name="omnipod_init_pod_fill_cannula">Kaniulės užpildymas</string>
+    <string name="omnipod_init_pod_set_basal_profile">Nustatyti bazės profilį</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Atšauti insulino leidimą</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Išjungti POD</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integracija su Omnipod Dash pompa.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Priminimas apie suporavimo pabaigą</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Priminimas apie sąrankos pabaigą</string>
+    <string name="omnipod_alert_expiration">POD galiojimas greitai baigsis</string>
+    <string name="omnipod_alert_expiration_advisory">POD galiojimas greitai baigsis</string>
+    <string name="omnipod_alert_shutdown_imminent">Išjungimas yra neišvengiamas</string>
+    <string name="omnipod_alert_low_reservoir">Žemas rezervuaro lygis</string>
+    <string name="omnipod_alert_unknown_alert">Nežinomas perspėjimas</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Gali nepavykti nustatyti bazės profilio. Insulino leidimas gali būti sustabdytas! Atkurkite POD būseną.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Laikinos valandinės bazės nustatymas gali būti nesėkmingas. Jei laikina valandinė bazė iki šiol buvo nustatyta ir galioja, ji gali būti atšaukta! Atnaujinkite POD būseną.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Laiko nustatymas gali būti nesėkmingas. Insulino leidimas gali būti sustabdytas! Atkurkite POD būseną.</string>
+    <string name="omnipod_bolus_failed_uncertain">Neįmanoma patikrinti, ar bolusas suleistas sėkmingai. Patikrinkite, ar jūsų POD leidžia bolusą, arba bolusą atšaukite.</string>
+    <string name="omnipod_rl_stats">RL statistika</string>
+    <string name="omnipod_read_pulse_log_short">Pulse žurnalas</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/exam.xml b/app/src/main/res/values-nl-rNL/exam.xml
index 9762b98a8a..a63d6cda98 100644
--- a/app/src/main/res/values-nl-rNL/exam.xml
+++ b/app/src/main/res/values-nl-rNL/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Wat is waar over DIA?</string>
+    <string name="dia_label_exam">Thema: Duur van Insuline Actie</string>
     <string name="dia_minimumis3h">De minimumwaarde is 3 uur.</string>
     <string name="dia_minimumis5h">De minimumwaarde is 5 uur.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Configuration/Config-Builder.html#insuline</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Loop app op de iPhone.</string>
     <string name="nsclient_spikeiphone">Spike app op de iPhone.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Children/Children.html</string>
+    <string name="isf_label_exam">Thema: Insulinegevoeligheidsfactor</string>
     <string name="isf_increasingvalue">Hogere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_decreasingvalue">Lagere ISF-waarden leiden tot minder insulineafgifte wanneer AAPS voor hoge BG corrigeert.</string>
     <string name="isf_noeffect">Het wijzigen van de ISF-waarden heeft geen effect op de hoeveelheid insuline die wordt geleverd wanneer AAPS voor hoge BG corrigeert.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Het wijzigen van de ISF-waarde in uw profiel is voldoende om de wijziging toe te passen.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Getting-Started/FAQ.html#insuline-gevoeligheids-factor-insulin-sensitivity-factor-ISF-mmol-l-E-of-mg-dl-E</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/CROWDIN/nl/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Thema: KH ratio</string>
     <string name="ic_increasingvalue">Hogere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_decreasingvalue">Lagere KH ratios leiden tot minder insuline afgifte voor een bepaalde hoeveelheid koolhydraten.</string>
     <string name="ic_noeffect">Als je 0 COB hebt zal het veranderen van KH ratio leiden tot een andere hoeveelheid insuline om jouw BG te corrigeren.</string>
diff --git a/app/src/main/res/values-nl-rNL/protection.xml b/app/src/main/res/values-nl-rNL/protection.xml
index 8b73d107d3..04865f9606 100644
--- a/app/src/main/res/values-nl-rNL/protection.xml
+++ b/app/src/main/res/values-nl-rNL/protection.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="biometric_title">Authentificatie vereist</string>
     <string name="biometric_description">Plaats uw vinger op de vingerafdruklezer om uw identiteit te verifiëren</string>
     <string name="settings_protection">Instellingen beveiliging</string>
+    <string name="application_protection">App beveiliging</string>
+    <string name="bolus_protection">Bolus beveiliging</string>
+    <string name="master_password">Masterwachtwoord</string>
     <string name="settings_password">Instellingen wachtwoord</string>
+    <string name="application_password">App wachtwoord</string>
     <string name="bolus_password">Bolus wachtwoord</string>
     <string name="unlock_settings">Instellingen ontgrendelen</string>
     <string name="biometric">Biometrisch</string>
     <string name="custom_password">Aangepast wachtwoord</string>
+    <string name="noprotection">Geen beveiliging</string>
+    <string name="protection">Beveiliging</string>
+    <string name="master_password_missing">Masterwachtwoord is niet ingesteld!\n\nStel een masterwachtwoord in in Instellingen (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Niet beveiligde fallback</string>
+    <string name="unsecure_fallback_descriotion_biometric">Om biometrische beveiliging te kunnen gebruiken, heb je een masterwachtwoord nodig als backup optie.\n\nStel dus een masterwachtwoord in!</string>
     <string name="password_set">Wachtwoord ingesteld!</string>
     <string name="password_not_set">Wachtwoord niet ingesteld</string>
     <string name="password_not_changed">Wachtwoord niet gewijzigd</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 4f111e8fdf..0edbfa7414 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -35,8 +35,9 @@
     <string name="description_pump_combo">Pomp integratie voor Accu-Chek Combo pompen, vereist dat ruffy geïnstalleerd is</string>
     <string name="description_pump_mdi">Pomp integratie voor mensen met pen-therapie (meerdere dagelijkse injecties)</string>
     <string name="description_pump_virtual">Pomp integratie voor pompen, waar nog geen driver voor is (Open Loop)</string>
-    <string name="description_sensitivity_aaps">Gevoeligheid wordt berekend op dezelfde manier als Oref0, maar u kunt een tijdframe naar het verleden specificeren. Minimale koolhydraat absorptie is berekend op basis van max koolhydraat absorptie tijd van de voorkeursinstellingen.</string>
-    <string name="description_sensitivity_weighted_average">Gevoeligheid wordt berekend als een gewogen gemiddelde van afwijkingen. Nieuwere afwijkingen wegen hierbij zwaarder. Minimale koolhydraat absorptie is berekend op basis van de max koolhydraat absorptie tijd uit de voorkeursinstellingen. Dit algoritme is de snelste in het volgen van wijzigingen van de gevoeligheid.</string>
+    <string name="description_sensitivity_aaps">Gevoeligheid wordt berekend op dezelfde manier als Oref0, maar je kunt een tijdframe naar het verleden specificeren. Minimale koolhydraat absorptie is berekend op basis van max koolhydraat absorptie tijd zoals in jouw instellingen.</string>
+    <string name="description_sensitivity_oref1">Gevoeligheid wordt berekend met gegevens van de afgelopen 8 of 24 uur (de meest gevoelige van die twee) en koolhydraten (indien niet geabsorbeerd) worden hiervan afgehaald, na de duur die is opgegeven in de instellingen. Berekend ook UAM.</string>
+    <string name="description_sensitivity_weighted_average">Gevoeligheid wordt berekend als een gewogen gemiddelde van afwijkingen. Nieuwere afwijkingen wegen hierbij zwaarder. Minimale koolhydraat absorptie is berekend op basis van de max koolhydraat absorptie tijd uit jouw instellingen. Dit algoritme is de snelste in het volgen van wijzigingen van de gevoeligheid.</string>
     <string name="description_source_eversense">Ontvang BG waardes van de aangepaste Eversense app.</string>
     <string name="description_source_glimp">Ontvang BG waardes van Glimp.</string>
     <string name="description_source_mm640g">Ontvang BG waardes van 600SeriesAndroidUploader.</string>
@@ -125,10 +126,12 @@
     <string name="apsmode_title">APS Mode</string>
     <string name="closedloop">Closed loop</string>
     <string name="openloop">Open loop</string>
+    <string name="lowglucosesuspend">Stop bij laag</string>
     <string name="disabledloop">Loop gedeactiveerd</string>
     <string name="disableloop">Loop deactiveren</string>
     <string name="enableloop">Activeer Loop</string>
     <string name="openloop_newsuggestion">Nieuw voorstel beschikbaar</string>
+    <string name="carbssuggestion">Koolhydraten Voorstel</string>
     <string name="unsupportednsversion">Niet ondersteunde versie van Nightscout</string>
     <string name="loopdisabled">Loop gedeactiveerd door doelen tab</string>
     <string name="treatments_wizard_basaliob_label">Basaal IOB</string>
@@ -154,16 +157,63 @@
     <string name="overview_extendedbolus_button">Vertraagde bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout versie:</string>
     <string name="missing_carbs">Ontbrekend %1$dg</string>
-    <string name="exported">Voorkeuren geëxporteerd</string>
+    <string name="exported">Instellingen geëxporteerd</string>
     <string name="export_to">Exporteer instellingen naar</string>
     <string name="import_from">Importeer instellingen van</string>
     <string name="setting_imported">Instellingen geïmporteerd</string>
     <string name="filenotfound">Bestand niet gevonden</string>
     <string name="nav_export">Exporteer instellingen</string>
     <string name="nav_import">Importeer instellingen</string>
+    <string name="openapsma_maxbasal_title">Maximaal instelbaar basaal Eh/u</string>
     <string name="openapsma_maxbasal_summary">Dit is de maximale waarde waarop het basaal door OpenAPS ingesteld kan worden</string>
     <string name="openapsma_maxiob_title">Maximale basaal IOB, dat OpenAPS kan toedienen [E]</string>
     <string name="openapsma_maxiob_summary">Deze waarde wordt de Max IOB genoemd in OpenAPS context\nDit is de maximale insuline hoeveelheid in [E] dat APS in één keer kan toedienen.</string>
+    <string name="password_preferences_encrypt_prompt">Je wordt gevraagd om een masterwachtwoord. Daarmee worden geëxporteerde instellingen versleuteld.</string>
+    <string name="password_preferences_decrypt_prompt">Je wordt gevraagd om een masterwachtwoord. Daarmee worden geïmporteerde instellingen ontsleuteld.</string>
+    <string name="preferences_export_canceled">Exporteren geannuleerd! Instellingen zijn NIET geëxporteerd!</string>
+    <string name="preferences_import_canceled">Importeren geannuleerd! Instellingen zijn NIET geïmporteerd!</string>
+    <string name="preferences_import_list_title">Kies bestand om te importeren</string>
+    <string name="check_preferences_before_import">Controleer instellingen voor het importeren:</string>
+    <string name="check_preferences_cannot_import">Instellingen kunnen niet worden geïmporteerd!</string>
+    <string name="check_preferences_dangerous_import">Instellingen zouden niet moeten worden geïmporteerd!</string>
+    <string name="check_preferences_details_btn">Beschrijf import problemen…</string>
+    <string name="check_preferences_details_title">Importeer problemen - details</string>
+    <string name="check_preferences_import_btn">Importeren</string>
+    <string name="check_preferences_import_anyway_btn">Toch importeren (GEVAARLIJK!)</string>
+    <string name="metadata_warning_different_flavour">Instellingen zijn gemaakt met een andere variant van AAPS (%1$s) terwijl je nu: %2$s gebruikt.\n\nEr kunnen instellingen ontbreken of ongeldig zijn - controleer aub jouw instellingen na het importeren en corrigeer ze zonodig.</string>
+    <string name="metadata_warning_different_device">Instellingen zijn gemaakt op een ander apparaat. Het is OK als ze zijn geïmporteerd van een oude/andere telefoon, maar zorg ervoor dat de geïmporteerde instellingen correct zijn!</string>
+    <string name="metadata_warning_outdated_format">Je gebruikt de verouderde indeling van een vorige AAPS versie, dit is niet veilig! Gebruik dit alleen als je niet anders kunt, wanneer je geen export hebt met de huidige JSON-indeling.</string>
+    <string name="metadata_warning_old_export">Geïmporteerde instellingen zijn al %1$s dagen oud! Misschien heb je een meer recente versie of heb je het verkeerde bestand gekozen? Vergeet niet om regelmatig jouw instellingen te exporteren!</string>
+    <string name="metadata_warning_date_format">Ongeldige notatie voor datum/tijd!</string>
+    <string name="metadata_warning_different_version">Instellingen zijn afkomstig van een vorige minor versie van de AAPS app. Het is OK als je deze importeert na een app upgrade, maar controleer na importeren dan wel of de instellingen nog steeds correct zijn!</string>
+    <string name="metadata_urgent_different_version">Instellingen van een andere major versie van de AAPS app. Deze versies kunnen aanzienlijk verschillen en kunnen instellingen hebben die incompatibel zijn! Zorg ervoor dat na het importeren alle instellingen nog steeds correct zijn!</string>
+    <string name="metadata_label_format">Bestandsformaat</string>
+    <string name="metadata_label_created_at">Gemaakt op</string>
+    <string name="metadata_label_aaps_version">AAPS versie</string>
+    <string name="metadata_label_aaps_flavour">Build variant</string>
+    <string name="metadata_label_device_name">Patiëntnaam van exporterend apparaat</string>
+    <string name="metadata_label_device_model">Modelnaam/nr van exporterend apparaat</string>
+    <string name="metadata_label_encryption">Bestandsversleuteling</string>
+    <string name="metadata_format_old">Oude export indeling</string>
+    <string name="metadata_format_new">Nieuwe versleutelde indeling</string>
+    <string name="metadata_format_debug">Nieuwe debug indeling (onversleuteld)</string>
+    <string name="metadata_format_other">Onbekende export indeling</string>
+    <string name="prefdecrypt_settings_tampered">Geknoeid met instellingenbestand</string>
+    <string name="prefdecrypt_settings_secure">Instellingenbestand is veilig</string>
+    <string name="prefdecrypt_settings_unencrypted">Gebruikt niet veilige, niet-versleutelde indeling voor instellingen</string>
+    <string name="prefdecrypt_wrong_json">JSON-indelingsfout, vereist veld ontbreekt (indeling, inhoud, metagegevens of beveiliging)</string>
+    <string name="prefdecrypt_wrong_password">Decryptie fout, het opgegeven wachtwoord kan het bestand niet ontsleutelen</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Bestand checksum (hash) ontbreekt, kan de authenticiteit van instellingen niet controleren!</string>
+    <string name="prefdecrypt_issue_modified">Bestand is gewijzigd na export!</string>
+    <string name="prefdecrypt_issue_parsing">Decoderingsfout, uitlezen van instellingen is mislukt!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Decoderingsfout, het opgegeven wachtwoord is ongeldig of het instellingenbestand is gewijzigd / mee geknoeid. Wellicht was het geïmporteerde bestand geëxporteerd met een ander masterwachtwoord.</string>
+    <string name="prefdecrypt_issue_wrong_format">Ontbrekende versleutelingsconfiguratie, instellingen indeling is ongeldig!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Niet-ondersteund of niet opgegeven versleutelingsalgoritme!</string>
+    <string name="exported_today">vandaag geëxporteerd</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">%1$s geleden geëxporteerd</string>
+    <string name="exported_at" comment="at placeholder we add export date">geëxporteerd op %1$s</string>
+    <string name="exported_less_than_hour_ago">minder dan een uur geleden geëxporteerd</string>
+    <string name="in_directory" comment="placeholder is for exported file path">in map: %1$s</string>
     <string name="end_user_license_agreement">Eind gebruiker overeenkomst</string>
     <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
     <string name="end_user_license_agreement_i_understand">Begrepen en goedgekeurd</string>
@@ -203,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Loop is ingeschakeld</string>
     <string name="valuelimitedto">%1$.2f gelimiteerd tot %2$.2f</string>
     <string name="valueoutofrange">Waarde %1$s valt buiten de toegestane harde limieten</string>
+    <string name="smscommunicator_pumpconnectwithcode">Om verbinding te maken met pomp antwoord met code %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Verbinding maken met pomp is mislukt</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Om verbinding te verbreken met pomp gedurende %1d minuten antwoord met code %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pomp verbinding verbroken</string>
+    <string name="smscommunicator_reconnect">Pomp opnieuw verbonden</string>
     <string name="smscommunicator_remotecommandnotallowed">Commando\'s op afstand zijn niet toegestaan</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus op afstand niet beschikbaar. Probeer het later opnieuw.</string>
     <string name="smscommunicator_basalreplywithcode">Om een basaal van %1$.2fE/u voor %2$d min te starten antwoord met code %3$s</string>
@@ -211,6 +266,9 @@
     <string name="smscommunicator_carbsreplywithcode">Antwoord met code %3$s om %1$dg in te voeren op %2$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Om een basaal van %1$d%% voor %2$d min te starten antwoord met code %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Om de loop te onderbreken voor %1$d minuten antwoord met de code %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Om loop te hervatten antwoord met code %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Om loop in te schakelen antwoord met code %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Om loop uit te schakelen antwoord met code %1$s</string>
     <string name="smscommunicator_tempbasalset">Tijdelijk basaal %1$.2fE/u voor %2$d minuten succesvol gestart</string>
     <string name="smscommunicator_extendedset">Vertraagde bolus %1$.2fE voor %2$d minuten succesvol gestart</string>
     <string name="smscommunicator_carbsset">Koolhydraten %1$dg succesvol ingevoerd</string>
@@ -242,6 +300,7 @@
     <string name="primefill">Ontlucht/vul</string>
     <string name="fillwarning">Verzeker u dat de vulhoeveelheid overeenkomt met de infusieset!</string>
     <string name="othersettings_title">Andere</string>
+    <string name="fillbolus_title">Vul/Prime standaard insuline hoeveelheden</string>
     <string name="button1">Knop 1</string>
     <string name="button2">Knop 2</string>
     <string name="button3">Knop 3</string>
@@ -300,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standaard waarde: 4 Dit is een combinatie van enerzijds het OpenAPS veiligheid limieten en anderzijds van “3 x max dagelijks basaal; 4x actueel”. Dit betekent dat het basaal niet hoger kan ingesteld worden dan het ingestelde nummer keer het actueel basaal waarbij de limiet in de pomp geen invloed heeft. Dit is een veiligheidsmaatregel om te voorkomen dat patiënten in gevaarlijke laag bereik komen zonder te snappen hoe het algoritme werkt. Nogmaals de standaard waarde is 4x; de meeste zullen deze waarde nooit moeten aanpassen maar zullen eerder andere waardes moeten aanpassen als ze tegen een limiet aanstoten.</string>
     <string name="openapsama_autosens_max_summary">Standaard waarde: 1.2\nDit is een vermenigvuldigingsfactor voor autosense (en binnenkort autotune) die zorgt dat de autosens ratio maximaal 20%% kan zijn. Dit maximum bepaalt in hoeverre je basaal kan worden verhoogd, en hoeveel je ISF en BG doel verlaagd kunnen worden.</string>
     <string name="openapsama_autosens_min_summary">Standaard waarde: 0.7\nDit is de andere kan van de autosens veiligheid limiet. Dit zet een limiet op hoe laag het basaal kan aangepast worden, en hoe hoog het ISF en het streef BG.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens past ook de streefwaardes aan</string>
     <string name="openapsama_autosens_adjusttargets_summary">Standaardwaarde: waar Dit wordt gebruikt om autosens de bevoegdheid te geven BG doelen aan te passen alsook ISF en basalen</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Standaard waarde: 2\nBolus snooze is actief nadat je een maaltijd bolus toegediend hebt, zodat de loop geen tegenvoorstel met een verlaagd tijdelijk basaal doet nadat je gegeten hebt. Het voorbeeld hier van van standaard 2; dus een 3 u DIA betekent dat de bolus snooze gemiddeld 1.5u actief is (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Standaardwaarde: 3,0 (AMA) of 8,0 (SMB). Dit is een instelling voor de standaard koolhydraten absorptie-impact per 5 minuten. De standaard is een verwachte 3mg / dl / 5min. Dit is van invloed op hoe snel COB zijn opgenomen en hoeveel koolhydraten absorptie wordt verwacht, bij het voorspellen van toekomstige BG, wanneer BG meer dan verwacht daalt of niet zoveel stijgt als verwacht.</string>
@@ -338,12 +398,16 @@
     <string name="wear_detailedIOB_title">Toon gedetailleerde IOB</string>
     <string name="wear_detailedIOB_summary">Splits IOB in bolus en basaal op de watchface</string>
     <string name="nosuccess">Niet geslaagd - controleer de telefoon</string>
+    <string name="notavailable">n.v.t.</string>
     <string name="patientage">Leeftijd Patient</string>
     <string name="child">Kind</string>
     <string name="teenage">Tiener</string>
     <string name="adult">Volwassene</string>
     <string name="resistantadult">insuline resistente volwassene</string>
     <string name="patientage_summary">Kies leeftijd van de patient voor veiligheids limieten</string>
+    <string name="patient_name">Naam patiënt</string>
+    <string name="patient_name_summary">Geef de naam of roepnaam van de patiënt op om onderscheid te maken tussen meerdere setups</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Gebruiker</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">Voor een goede werking van %1$s moeten de accubesparing-opties zijn uitgeschakeld in de telefooninstellingen</string>
     <string name="loopsuspended">Loop pauzeren</string>
@@ -378,12 +442,26 @@
     <string name="enablesuperbolus">Activeer superbolus in de wizard</string>
     <string name="enablesuperbolus_summary">Activeer de superbolus functie in de wizard. Activeer deze niet tot je begrijpt wat dit doet. OVERDOSIS IS MOGELIJK BIJ BLINDELINGS GEBRUIK!</string>
     <string name="show_statuslights">Toon statusindicatoren op startscherm</string>
+    <string name="statuslights_cage_warning">Drempel waarschuwing infuus leeftijd [h]</string>
+    <string name="statuslights_cage_critical">Drempel alarm infuus leeftijd [h]</string>
+    <string name="statuslights_iage_warning">Drempel waarschuwing insuline leeftijd [h]</string>
+    <string name="statuslights_iage_critical">Drempel alarm insuline leeftijd [h]</string>
+    <string name="statuslights_sage_warning">Drempel waarschuwing sensor leeftijd [h]</string>
+    <string name="statuslights_sage_critical">Drempel alarm sensor leeftijd [h]</string>
+    <string name="statuslights_bage_warning">Drempel waarschuwing batterij leeftijd [h]</string>
+    <string name="statuslights_bage_critical">Drempel alarm batterij niveau [h]</string>
     <string name="statuslights_res_warning">Drempel waarschuwing reservoir niveau [E]</string>
     <string name="statuslights_res_critical">Drempel alarm reservoir niveau [E]</string>
     <string name="statuslights_bat_warning">Drempel waarschuwing batterij niveau [%]</string>
     <string name="statuslights_bat_critical">Drempel alarm batterij niveau [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAS</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Over</string>
     <string name="smscommunicator_missingsmspermission">Geen SMS bevoegdheid</string>
     <string name="smscommunicator_missingphonestatepermission">Machtiging ontbreekt voor telefoon gebruik</string>
@@ -401,6 +479,8 @@
     <string name="doprofileswitch">Profiel wissel uitvoeren</string>
     <string name="careportal_pbage_label">Ouderdom batterij</string>
     <string name="ns_alarmoptions">Alarm opties</string>
+    <string name="ns_alarms">Maak meldingen van NS alarmen</string>
+    <string name="ns_announcements">Maak meldingen van NS aankondigingen</string>
     <string name="nsalarm_staledatavalue_label">Oude gegevens sinds [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Alarm oude gegevens sinds [min]</string>
     <string name="openapsama_autosens_period">Interval voor autosens [uur]</string>
@@ -481,6 +561,7 @@
     <string name="enable_missed_bg_readings_alert">Alarm als er geen BG gegevens ontvangen zijn</string>
     <string name="enable_pump_unreachable_alert">Waarschuwing bij niet bereikbare pomp</string>
     <string name="pump_unreachable_threshold">Pomp niet beschikbaar sinds [min]</string>
+    <string name="enable_carbs_req_alert">Waarschuwen als koolhydraten nodig zijn</string>
     <string name="urgent_alarm">Dringend alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (aangepast)</string>
@@ -488,8 +569,13 @@
     <string name="bgsource_upload">BG upload instellingen</string>
     <string name="wear_detailed_delta_title">Toon gedetailleerde delta</string>
     <string name="wear_detailed_delta_summary">Toon delta met een extra decimaal punt</string>
+    <string name="smbinterval_summary">Tijdsinterval in minuten tussen afgeven van SMBs</string>
     <string name="smbmaxminutes">SMB max minuten</string>
     <string name="smbmaxminutes_summary">Max minuten basaal om SMB tot te limiteren</string>
+    <string name="uamsmbmaxminutes">UAM SMB max minuten</string>
+    <string name="uamsmbmaxminutes_summary">Max minuten basaal om SMB tot te limiteren voor UAM</string>
+    <string name="carbsReqThreshold">Minimaal benodigde koolhydraten voor waarschuwing</string>
+    <string name="carbsReqThreshold_summary">Minimum gram benodigde koolhydraten waarbij een waarschuwing wordt gegeven. Wanneer er minder koolhydraten nodig zijn dan dit getal, wordt er geen waarschuwing gegeven.</string>
     <string name="dexcomg5_xdripupload_title">Stuur BG data naar xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">In xDrip+ kies 640g/Eversense data bron</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -548,6 +634,8 @@
     <string name="extendedbolusdeliveryerror">Vertraagde bolus toedieningsfout</string>
     <string name="insightpump_shortname">Insight</string>
     <string name="ago">voorbij</string>
+    <string name="set_neutral_temps_title">Stel neutraal tijdelijk basaal in</string>
+    <string name="set_neutral_temps_summary">Als deze optie is ingeschakeld, wordt een tijdelijk basaal geannuleerd vlak voor het einde van elk uur. Handige optie voor sommige pompen die elk uur piepen/vibreren zolang een tijdelijk basaal actief is.</string>
     <string name="enablesmbalways">Activeer SMB altijd</string>
     <string name="enablesmbalways_summary">SMB altijd aan onafhankelijk van bolussen. Enkel mogelijk met een BG bron met goed gefilterde data zoals de G5</string>
     <string name="enablesmbaftercarbs">Activeer SMB na koolhydraten</string>
@@ -567,11 +655,17 @@
     <string name="insulin_increment_button_message">Hoeveelheid insuline dat wordt toegevoegd wanneer er op de knop gedrukt wordt</string>
     <string name="error_starting_cgm">Kon de CGM applicatie niet starten. Zorg dat deze geïnstalleerd is.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Negeer 5m</string>
+    <string name="ignore15m">Negeer 15m</string>
+    <string name="ignore30m">Negeer 30m</string>
+    <string name="required">nodig</string>
     <string name="nav_historybrowser">Historiek venster</string>
     <string name="wear_notifysmb_title">Waarschuw bij SMB</string>
     <string name="wear_notifysmb_summary">Toon SMB op horloge zoals gewone bolussen.</string>
     <string name="ns_create_announcements_from_errors_title">Creëer een melding bij storingen</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Maak melding bij waarschuwingen voor benodigde koolhydraten</string>
     <string name="ns_create_announcements_from_errors_summary">Creëer een Nightscout melding voor storingen en lokale waarschuwingen (ook zichtbaar in het Careportal en Behandelingen)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Maak Nightscout melding bij waarschuwingen voor benodigde koolhydraten</string>
     <string name="wear_predictions_summary">Toon de voorspellingen op het horloge.</string>
     <string name="wear_predictions_title">Voorspellingen</string>
     <string name="data_choices">Data Keuzes</string>
@@ -616,10 +710,10 @@
     <string name="combo_tbr_count">Aantal TBR</string>
     <string name="pumpisnottempbasalcapable">Pomp kan geen tijdelijk basaal aanvaarden</string>
     <string name="novalidbasalrate">Geen correcte basale snelheid van pomp kunnen lezen</string>
-    <string name="closedmodedisabledinpreferences">Closed Loop modus gedeactiveerd in de voorkeuren</string>
-    <string name="autosensdisabledinpreferences">Autosens gedeactiveerd in de voorkeuren</string>
-    <string name="smbdisabledinpreferences">SMB gedeactiveerd in de voorkeuren</string>
-    <string name="uamdisabledinpreferences">UAM gedeactiveerd in configuratie</string>
+    <string name="closedmodedisabledinpreferences">Closed Loop modus gedeactiveerd in de instellingen</string>
+    <string name="autosensdisabledinpreferences">Autosens gedeactiveerd in de instellingen</string>
+    <string name="smbdisabledinpreferences">SMB gedeactiveerd in de instellingen</string>
+    <string name="uamdisabledinpreferences">UAM gedeactiveerd in de instellingen</string>
     <string name="uamdisabledoref1notselected">UAM gedeactiveerd omdat het Oref1 gevoeligheid plugin nodig heeft</string>
     <string name="maxbasalmultiplier">Max basaal vermenigvuldiger</string>
     <string name="maxdailybasalmultiplier">Max dagelijks basaal vermenigvuldiger</string>
@@ -629,7 +723,7 @@
     <string name="limitingmaxiob">Max IOB wordt beperkt tot %1$.1f E doordat %2$s</string>
     <string name="limitingcarbs">Koolhydraten worden beperkt tot %1$d gr doordat %2$s</string>
     <string name="limitingiob">IOB gelimiteerd tot %1$.1f E doordat %2$s</string>
-    <string name="maxvalueinpreferences">Maximum waarde in voorkeuren</string>
+    <string name="maxvalueinpreferences">Maximum waarde in instellingen</string>
     <string name="hardlimit">max limiet (SC)</string>
     <string name="unsafeusage">Onveilig gebruik</string>
     <string name="readstatusfailed">Lezen van status mislukt</string>
@@ -701,13 +795,14 @@
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vragen om toestemming</string>
     <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
+    <string name="needlocationpermission">App heeft locatie toestemming nodig voor Bluetooth scan en WiFi identificatie</string>
     <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te kunnen slaan</string>
     <string name="request">Verzoek</string>
     <string name="insulinsourcesetup">Gevoeligheid plugin configureren</string>
     <string name="exit">Afsluiten</string>
     <string name="open_navigation">Open navigatie</string>
     <string name="close_navigation">Sluit navigatie</string>
-    <string name="nav_plugin_preferences">Plugin voorkeuren</string>
+    <string name="nav_plugin_preferences">Plugin instellingen</string>
     <string name="completed_well_done">Voltooid, goed gedaan!</string>
     <string name="not_completed_yet">Nog niet voltooid</string>
     <string name="time_elapsed">Verstreken tijd</string>
@@ -718,6 +813,10 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Verhogen van de gevoeligheid voor temptargets > = 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Laag tijdelijk streefdoel verlaagt gevoeligheid</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Lagere gevoeligheid voor temptargets < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistentie verlaagt het doel</string>
+    <string name="resistance_lowers_target_summary">Wanneer insulineresistentie wordt gedetecteerd, wordt het BG streefdoel verlaagd</string>
+    <string name="sensitivity_raises_target_title">Gevoeligheid verhoogt het doel</string>
+    <string name="sensitivity_raises_target_summary">Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd</string>
     <string name="combo_invalid_setup">Ongeldige pompinstellingen, controleer de documenten en controleer of het Quick Info-menu QUICK INFO wordt genoemd met behulp van de 360-configuratiesoftware.</string>
     <string name="custom">Aangepast</string>
     <string name="careportal_removestartedevents">Verwijder AndroidAPS start-meldingen</string>
@@ -725,6 +824,8 @@
     <string name="allow_hardware_pump_text">Let op: als u activeert en verbinding maakt met een hardwarepomp, kopieert AndroidAPS de basale instellingen van het profiel naar de pomp en overschrijft de bestaande basaal snelheid die op de pomp is opgeslagen. Zorg ervoor dat u de juiste basaal instelling hebt in AndroidAPS. Als u niet zeker weet of niet wilt dat de basaal instellingen op uw pomp worden overschreven, drukt u op Annuleren en herhaalt u het overschakelen naar de pomp op een later tijdstip.</string>
     <string name="error_adding_treatment_title">Behandelingen data incompleet</string>
     <string name="maintenance_settings">Onderhoudsinstellingen</string>
+    <string name="maintenance_email">E-mail</string>
+    <string name="maintenance_encrypt_exported_prefs">Geëxporteerde instellingen versleutelen</string>
     <string name="maintenance_amount">Aantal Logs om te verzenden</string>
     <string name="maintenance">Onderhoud</string>
     <string name="maintenance_shortname">ONDH</string>
@@ -766,6 +867,10 @@
     <string name="log_alerts">Alarmen noteren</string>
     <string name="enable_tbr_emulation">TBR-emulatie inschakelen</string>
     <string name="enable_tbr_emulation_summary">Gebruik vertraagde bolus ipv TBRs om de limiet van 250%% te omzeilen</string>
+    <string name="disable_vibration">Trillen uitschakelen bij handmatige bolus toediening</string>
+    <string name="disable_vibration_summary">Voor bolus en verlengde bolus (alleen mogelijk voor Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Trillen uitschakelen bij automatische bolus toediening</string>
+    <string name="disable_vibration_auto_summary">Voor SMB en tijdelijke basalen met TBR emulatie (alleen mogelijk voor Insight firmware 3.x)</string>
     <string name="disconnect_delay">Verbindingsvertraging [s]</string>
     <string name="serial_number">Serienummer</string>
     <string name="release_software_version">Release softwareversie</string>
@@ -909,6 +1014,8 @@
     <string name="exists">bestaand</string>
     <string name="notexists">niet bestaand</string>
     <string name="temptargetcompared">Tijdelijk streefdoel %1$s</string>
+    <string name="btdevicecompared">Bluetooth verbinding met apparaat %1$s %2$s</string>
+    <string name="btdevice">Verbinding met Bluetooth apparaat </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Gevoeligheid %1$s %2$s %%</string>
     <string name="autosenslabel">Gevoeligheid %</string>
@@ -963,6 +1070,7 @@
     <string name="medtronic_pump_battery_alkaline">Alkaline (uitgebreide weergave)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (uitgebreide weergave)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (uitgebreide weergave)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Uitgebreide weergave)</string>
     <string name="medtronic_bolus_debugging">Bolus/Behandelingen Debuggen</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SCAN</string>
@@ -974,6 +1082,7 @@
     <string name="rileylink_scanner_scanning">Scannen</string>
     <string name="rileylink_scanner_scanning_finished">Scannen voltooid</string>
     <string name="rileylink_scanner_scanning_error">Scanfout: %1$d</string>
+    <string name="common_never">Nooit</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Instellingen</string>
     <string name="rileylink_settings_tab2">Geschiedenis</string>
@@ -1103,6 +1212,7 @@
     <string name="objectives_button_unfinish">Voltooiing wissen</string>
     <string name="objectives_button_unstart">Wissen gestart</string>
     <string name="doyouwantresetstart">Wil je dit leerdoel opnieuw starten? Je kunt je voortgang verliezen.</string>
+    <string name="time_or_timezone_change">Tijd en/of tijdzone wijzigen op de pomp</string>
     <string name="nopumpselected">Geen pomp geselecteerd</string>
     <string name="setupwizard_units_prompt">Selecteer eenheden waarin je waarden wilt weergeven</string>
     <string name="ns_ploadlocalprofile">Upload lokale profielwijzigingen naar NS</string>
@@ -1119,6 +1229,7 @@
     <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
     <string name="reorder_label">Sorteren</string>
     <string name="age">Leeftijd:</string>
+    <string name="weight_label">Gewicht:</string>
     <string name="id">ID:</string>
     <string name="submit">Verzenden</string>
     <string name="mostcommonprofile">Meest voorkomende profiel:</string>
@@ -1152,14 +1263,112 @@
     <string name="loop_tbrexecution_time_label">Tijdelijke basaal uitvoering tijd</string>
     <string name="insight_alert_notification_channel">Insight pomp waarschuwingen</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">van authentificatie app voor: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Authentificatie inschakelen</string>
+    <string name="smscommunicator_otp_enabled_summary">Authentificeer SMS commando\'s met behulp van One Time Passwords (OTPs, eenmalige wachtwoorden) gegenereerd door Google Authenticator of soortgelijke 2FA apps.</string>
+    <string name="smscommunicator_otp_pin">Extra PIN aan einde van token</string>
+    <string name="smscommunicator_otp_pin_summary">Extra cijfers die je moet onthouden, en aan het eind van elk gegenereerd eenmalig wachtwoord moet toevoegen.</string>
+    <string name="smscomunicator_tab_otp_label">Authentificatie instellingen</string>
+    <string name="smscommunicator_otp_verify_label">Te controleren OTP:</string>
+    <string name="smscommunicator_otp_reset_btn">Reset Authentificatie</string>
+    <string name="smscommunicator_otp_reset_title">Reset Authentificatie-sleutel</string>
+    <string name="smscommunicator_otp_reset_prompt">Weet je zeker dat je de Autentificatie-sleutel wilt resetten? Met deze actie maak je alle Authentificatie instellingen van verbonden telefoons ongeldig, en je zult ze opnieuw moeten instellen.</string>
+    <string name="smscommunicator_otp_reset_successful">Er is een nieuwe Authentificatie-sleutel gegenereerd! Gebruik de nieuwe QR-Code voor het instellen van geautoriseerde telefoons.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Installeer Authenticator app</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scan code om AndroidAPS OTP codes in te stellen</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Test eenmalig wachtwoord (One Time Password)</string>
+    <string name="smscommunicator_otp_reset_header">Reset Authentificatie</string>
+    <string name="smscommunicator_otp_install_info">Installeer de Authenticator-app op elke volger telefoon die RFC 6238 TOTP tokens ondersteunt. Populaire gratis apps zijn:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">DEEL deze code met NIEMAND ANDERS!\nGebruik hem alleen om de Authenticator-app in te stellen op telefoons van volgers.</string>
+    <string name="smscommunicator_otp_reset_warning">Door de Athentificator te resetten, maak je alle Authentificatie-instellingen van reeds verbonden telefoons ongeldig! Je zult ze opnieuw moeten instellen!</string>
+    <string name="onconnect">Bij verbinden</string>
+    <string name="ondisconnect">Bij verbinding verbreken</string>
+    <string name="overview_show_predictions">Voorspellingen</string>
+    <string name="overview_show_deviationslope">Richtingscoëfficiënt afwijking</string>
+    <string name="authorizationfailed">Authorisatie mislukt</string>
+    <string name="overview_show_absinsulin">Absolute insuline</string>
+    <string name="master_password_summary">Het masterwachtwoord wordt gebruikt voor het versleutelen van backups en om de app-beveiligingen te kunnen overschrijven. Onthoud het goed of bewaar het op een veilige plaats.</string>
+    <string name="passwords_dont_match">Wachtwoorden komen niet overeen</string>
+    <string name="current_master_password">Huidig masterwachtwoord</string>
+    <string name="statuslights">Statusindicatoren</string>
+    <string name="statuslights_copy_ns">Kopieer instellingen van NS</string>
+    <string name="copyexistingvalues">NS instellingen kopiëren (indien aanwezig)?</string>
+    <string name="classic_description">Klassiek weergave thema</string>
+    <string name="buttonson_description">Knoppen worden altijd weergegeven aan de onderkant van het scherm</string>
+    <string name="largedisplay_description">Groot scherm</string>
+    <string name="skin">Skin</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Pomp integratie voor Omnipod, vereist RileyLink (met firmware 2.0 of hoger).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Bolus pieptoon ingeschakeld</string>
+    <string name="omnipod_config_beep_basal_enabled">Basaal pieptoon ingeschakeld</string>
+    <string name="omnipod_config_beep_smb_enabled">SMB pieptoon ingeschakeld</string>
+    <string name="omnipod_config_beep_tbr_enabled">Tijdelijk basaal pieptoon ingeschakeld</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Pod debugging opties ingeschakeld</string>
+    <string name="omnipod_config_timechange_enabled">DST/tijdzone detectie ingeschakeld</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod Beheer</string>
+    <string name="omnipod_pod_status">Pod Status</string>
+    <string name="omnipod_reservoir_left">%1$.2f E over</string>
+    <string name="omnipod_reservoir_over50">Meer dan 50 E</string>
+    <string name="omnipod_pod_address">Pod adres</string>
+    <string name="omnipod_pod_expiry">Pod verloopt</string>
+    <string name="omnipod_pod_name_no_info">Geen info</string>
+    <string name="omnipod_pod_no_pod_connected">Geen pod verbonden</string>
+    <string name="omnipod_pod_not_initalized">Niet geïnitialiseerd</string>
+    <string name="omnipod_pod_active_alerts">Actieve pod alarmen</string>
+    <string name="omnipod_ack_short">Alarmen bevestigen</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\nJe moet eerst Omnipod ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Bewerking is niet mogelijk.\n\nJe moet enkele minuten wachten, totdat AAPS voor de eerste keer probeert om het profiel in te stellen.</string>
+    <string name="omnipod_error_illegal_init_action_type">Ongeldig PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Geen actieve pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Opdracht verificatie is mislukt.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Er is een onverwachte fout opgetreden. Rapporteer dit alsjeblieft! (type: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Communicatie mislukt: ongeldige invoerparameters ontvangen.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Communicatie mislukt: timeout.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communicatie mislukt: er is een onvoorziene fout opgetreden. Rapporteer dit alsjeblieft!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Communicatie mislukt: berichtintegriteit kon niet worden geverifieerd.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Communicatie mislukt: ongeldige gegevens ontvangen van de Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Communicatie mislukt: de Pod bevindt zich in een verkeerde staat.</string>
+    <string name="omnipod_driver_error_invalid_response">Communicatie mislukt: ongeldig antwoord ontvangen van de Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Communicatie mislukt: bericht met ongeldig volgnummer ontvangen van de Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Communicatie mislukt: bericht met ongeldig adres ontvangen van de Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Communicatie is mislukt: kon bericht van de Pod niet decoderen.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Communicatie mislukt: nonce resync is mislukt.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Communicatie mislukt: nonce out of sync.</string>
+    <string name="omnipod_driver_error_not_enough_data">Communicatie mislukt: onvoldoende gegevens ontvangen van de Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Een pod-fout (%1$03d %2$s) is gedetecteerd. Deactiveer je Pod en start een nieuwe.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Communicatie mislukt: de Pod heeft een foutrespons gegeven.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Pod Beheer</string>
+    <string name="omnipod_cmd_init_pod">Initialiseer Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Deactiveer Pod</string>
+    <string name="omnipod_cmd_reset_pod">Reset Pod</string>
+    <string name="omnipod_cmd_pod_history">Pod Historie</string>
     <string name="omnipod_cmd_set_bolus">Bolus instellen</string>
+    <string name="omnipod_cmd_cancel_bolus">Annuleer Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Instellen Tijdelijke Basaal</string>
+    <string name="omnipod_cmd_cancel_tbr">Annuleer Tijdelijk Basaal (Intern door stuurprogramma)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Annuleer Tijdelijk Basaal (Geforceerd door gebruiker)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Basaalprofiel instellen</string>
+    <string name="omnipod_cmd_get_pod_status">Pod status ophalen</string>
+    <string name="omnipod_cmd_get_pod_info">Pod info ophalen</string>
+    <string name="omnipod_cmd_set_time">Tijd instellen</string>
+    <string name="omnipod_cmd_configure_alerts">Configureer alarmen</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Bevestig alarmen</string>
+    <string name="omnipod_cmd_suspend_delivery">Onderbreek toediening</string>
+    <string name="omnipod_cmd_resume_delivery">Hervat toediening</string>
+    <string name="omnipod_cmd_unknown_entry">Onbekende invoer</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f E</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f E, KH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Basaal: %1$.1f E, Duur: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Als je op <b>OK</b> klikt, zal de Pod gedwongen worden gereset en kun je niet meer communiceren met de Pod. Doe dit alleen als je al niet meer met de Pod kunt communiceren. Als je nog wel kunt communiceren met de Pod, gebruik dan de optie <b>Deactiveer Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Pod Historie momenteel niet beschikbaar.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Vul de Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml
index 091f47ec20..cd256141c4 100644
--- a/app/src/main/res/values-pt-rBR/exam.xml
+++ b/app/src/main/res/values-pt-rBR/exam.xml
@@ -4,20 +4,24 @@
     <string name="dia_label_exam">Tópico: Duração da Ação de Insulina</string>
     <string name="dia_minimumis3h">O valor mínimo é de 3 horas.</string>
     <string name="dia_minimumis5h">O valor mínimo é de 5 horas.</string>
+    <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
     <string name="dia_meaningisequaltodiapump">O significado é igual ao parâmetro DIA usado na bomba.</string>
     <string name="dia_valuemustbedetermined">Você tem que determinar o seu valor individual (mas não menos de 5 horas).</string>
     <string name="hypott_label">Tópico: Hipo Temp-Alvo</string>
     <string name="hypott_whenhypott">Qual é a razão principal para definir TT hipoglicemia?</string>
     <string name="hypott_goinglow">Para evitar que a glicose fique baixa se já estiver em funcionamento um temp zero.</string>
     <string name="hypott_preventoversmb">Para evitar o AAPS dose muita insulina após uma subida rápida causada por carboidratos de atuação rápida para tratar hipoglicemia.</string>
+    <string name="hypott_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html</string>
     <string name="offlineprofile_whatprofile">Qual perfil pode ser usado e configurado offline?</string>
     <string name="offlineprofile_label">Tópico: Perfil Offline</string>
     <string name="offlineprofile_nsprofile">Perfil NS pode ser usado, mas não configurado.</string>
+    <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
     <string name="pumpdisconnect_label">Tópico: Desconectando-se da bomba</string>
     <string name="pumpdisconnect_whattodo">O que deve ser feito ao desligar a bomba?</string>
     <string name="pumpdisconnect_letknow">Clique em \'Desligar bomba\' para que o AAPS saiba que nenhuma insulina será entregue.</string>
     <string name="pumpdisconnect_suspend">Clique em \'Suspender loop\' para que AAPS pare o looping enquanto a bomba estiver desconectada.</string>
     <string name="pumpdisconnect_dontchnage">Não altere nada no AAPS, apenas desconecte a bomba.</string>
+    <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">Tópico: Configurações do AndroidAPS</string>
     <string name="objectives_howtosave">Quais são as melhores práticas para fazer backup de suas configurações?</string>
     <string name="objectives_exportsettings">Exporte-as localmente do menu Manutenção.</string>
@@ -26,12 +30,15 @@
     <string name="objectives_doexportafterchange">Exportá-los depois de fazer alterações de configuração.</string>
     <string name="objectives_doexportafterobjective">Exportá-los depois de completar um objetivo.</string>
     <string name="objectives_doexportafterfirtssettings">Exporte-as quando concluir as configurações iniciais.</string>
+    <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
+    <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
     <string name="noisycgm_label">Tópico: Leituras do CGM imprecisas</string>
     <string name="noisycgm_whattodo">O que deve ser feito se os dados do CGM são irregulares?</string>
     <string name="nothing">Nada, AAPS vai lidar com isso.</string>
     <string name="noisycgm_pause">Desativar o loop para evitar sobredosagem.</string>
     <string name="noisycgm_replacesensor">Substitua o sensor CGM.</string>
     <string name="noisycgm_turnoffphone">Desligue o telefone.</string>
+    <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verifique que a app do CGM suaviza os dados da Glicose.</string>
     <string name="exercise_label">Tópico: Exercício</string>
     <string name="exercise_whattodo">Como você pode ajudar o sistema a lidar com exercícios?</string>
@@ -41,6 +48,7 @@
     <string name="exercise_stoploop">Pare o loop.</string>
     <string name="exercise_doitbeforestart">Definir um alvo-temp de atividade antes de iniciar o exercício.</string>
     <string name="exercise_afterstart">Definir um alvo-temp de atividade após iniciar o exercício leva a resultados piores do que se iniciado antes.</string>
+    <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
     <string name="suspendloop_label">Tópico: Loop Desativado/Suspenso</string>
     <string name="suspendloop_doigetinsulin">Eu recebo insulina quando o loop estiver desativado/suspenso?</string>
     <string name="suspendloop_yes">Sim, a insulina basal continua a ser entregue.</string>
@@ -63,6 +71,7 @@
     <string name="prerequisites_githubaccount">Uma conta do Github.</string>
     <string name="prerequisites_beanandroiddeveloper">Experiência de desenvolvimento Android.</string>
     <string name="prerequisites_own670g">Uma bomba MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
     <string name="prerequisites_smartwatch">Um Smartwatch.</string>
     <string name="prerequisites_supportedcgm">Um CGM compatível.</string>
     <string name="update_label">Tópico: Atualização do AndroidAPS</string>
@@ -72,6 +81,7 @@
     <string name="update_keys">Você deve utilizar as mesmas chaves de assinatura.</string>
     <string name="update_neverupdate">Nunca atualize se o sistema estiver funcionando bem.</string>
     <string name="update_askfriend">Peça ao seu amigo para a nova APK.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
     <string name="troubleshooting_label">Tópico: Resolução de Problemas</string>
     <string name="troubleshooting_wheretoask">Onde procurar ajuda?</string>
     <string name="troubleshooting_fb">Entrar no grupo AndroidAPS do Facebook.</string>
@@ -79,6 +89,7 @@
     <string name="troubleshooting_gitter">Visite a sala do AndroidAPS no Gitter.</string>
     <string name="troubleshooting_googlesupport">Visite o suporte do Google para o AndroidAPS</string>
     <string name="troubleshooting_yourendo">Fale com seu endocrinologista.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
     <string name="insulin_label">Tópico: Plugins de Insulina</string>
@@ -87,6 +98,7 @@
     <string name="insulin_novorapid">NovoRapid ®</string>
     <string name="insulin_humalog">Humalog ®</string>
     <string name="insulin_actrapid">Actrapid ®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
     <string name="sensitivity_label">Tópico: Plugins de Sensibilidade</string>
     <string name="sensitivity_which">Qual algoritmo de sensibilidade tem um intervalo de tempo configurável?</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
@@ -100,6 +112,7 @@
     <string name="extendedcarbs_useextendedcarbs">Recalcule gordura e proteínas para carboidrato e use o recurso \"Carbs estentido\".</string>
     <string name="extendedcarbs_add">Recalcular gordura e proteínas em carboidrato e adicioná-lo ao cálculo de bolus.</string>
     <string name="extendedcarbs_useextendedbolus">Use o bolus estendido para cobrir gordura e proteínas.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
     <string name="nsclient_label">Tópico: Monitorização Remota</string>
     <string name="nsclient_howcanyou">Como você pode monitorar AAPS da sua criança remotamente?</string>
     <string name="nsclient_nightscout">Usando o site do Nightscout.</string>
@@ -108,17 +121,22 @@
     <string name="nsclient_xdripfollower">xDrip rodando no modo follower.</string>
     <string name="nsclient_looponiphone">Aplicativo Loop no iPhone.</string>
     <string name="nsclient_spikeiphone">Aplicativo Spike no iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
     <string name="isf_label_exam">Tópico: Fator de Sensibilidade de Insulina</string>
     <string name="isf_increasingvalue">Valores elevados de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
     <string name="isf_decreasingvalue">Valores baixos de FSI levam a uma entrega de menos insulina quando o AAPS corrige glicemia alta.</string>
     <string name="isf_noeffect">Alterar os valores FSI não tem efeito sobre a quantidade de insulina entregue quando a AAPS corrige glicemia alta.</string>
     <string name="isf_preferences">Você precisa inserir o ISF nas Preferências.</string>
     <string name="isf_profile">Alterar o valor do ISF no seu perfil é o suficiente para aplicar a alteração.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Tópico: Porporção IC</string>
     <string name="ic_increasingvalue">Proporções IC mais altos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
     <string name="ic_decreasingvalue">Proporções IC mais baixos levam a menos insulina entregue para uma dada quantidade de carboidratos.</string>
     <string name="ic_noeffect">Se tiver 0 COB, alterar a proporção IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da glicemia.</string>
     <string name="ic_different">O IC será diferente se você contar a unidade de pão como 10g ou 12g.</string>
     <string name="ic_meaning">O significado do IC é: Quantos pães são cobertas por 1U de insulina.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
     <string name="profileswitch_label">Tópico: Alternando Perfil</string>
     <string name="profileswitch_pctwillchange"> Ao especificar 90% na mudança de perfil…</string>
     <string name="profileswitch_basalhigher">Os basais serão 10% maiores.</string>
@@ -131,11 +149,14 @@
     <string name="profileswitch_targethigher">O alvo será 10% maior.</string>
     <string name="profileswitch_targetlower">O alvo será 10% menor.</string>
     <string name="profileswitch_targetbottom">Só o alvo inferior será 10% menor.</string>
+    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
     <string name="profileswitchtime_iwant">Se acordar 1h mais cedo do que o normal, como deve notificar a AAPS da mudança no seu horário?</string>
     <string name="profileswitchtime_1">Iniciar uma mudança de perfil com uma alteração de turno de 1</string>
     <string name="profileswitchtime__1">Iniciar uma mudança de perfil com uma alteração de turno de -1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
     <string name="profileswitchtime_60">Iniciar uma mudança de perfil com uma alteração de turno de 60</string>
     <string name="profileswitchtime__60">Iniciar uma mudança de perfil com uma alteração de turno de -60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
     <string name="basalhelp_label">Tópico: Ajuda com taxas basais</string>
     <string name="basalhelp_where">Onde procurar ajuda para taxas basais e etc.</string>
     <string name="basalhelp_diabetesteam">Sua equipe de diabetes</string>
diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml
index 4709e3b300..2f75aa94e4 100644
--- a/app/src/main/res/values-pt-rBR/objectives.xml
+++ b/app/src/main/res/values-pt-rBR/objectives.xml
@@ -15,13 +15,51 @@
     <string name="objectives_maxiobzero_objective">Começar a fechar loop com Suspensão por Glicose Baixa</string>
     <string name="objectives_maxiobzero_gate">Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose</string>
     <string name="objectives_maxiob_objective">Ajustar o close loop, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de valor glicêmico</string>
+    <string name="objectives_maxiob_gate">Utilizar por alguns dias e pelo menos uma noite sem alarmes de Glic baixa, antes de baixar Glic</string>
+    <string name="objectives_autosens_objective">Ajuste as basais e os rácios, se necessário, e, em seguida, active o auto-sens</string>
+    <string name="objectives_autosens_gate">1 semana de looping durante o dia com sucesso com entrada regular de hidratos de carbono</string>
     <string name="objectives_ama_objective">A ativar recursos adicionais para uso durante o dia, como assistente avançado de refeição</string>
     <string name="objectives_smb_objective">Ativando recursos adicionais para uso durante o dia, como SMB</string>
     <string name="objectives_auto_objective">A ativar a automação</string>
+    <string name="objectives_smb_gate">Deverá ler a wiki e aumentar a IOB máx para que os SMBs funcionem devidamente! Inicialmente poderá considerar maxIOB=média dos bólus + 3 x a basal máxima</string>
+    <string name="objectives_auto_gate">Leia os documentos de como a automação funciona. Configure primeiro regras simples. Em vez de ação deixe AAPS apresentar apenas a notificação. Quando tem certeza de automação é acionada no momento certo substitua a notificação por ação real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
+    <string name="objectives_bgavailableinns">Glic disponível no NS</string>
+    <string name="objectives_pumpstatusavailableinns">Estado da Bomba disponível no NS</string>
+    <string name="objectives_manualenacts">Execução manual</string>
     <string name="accomplished">Concluído: %1$s</string>
+    <string name="objectives_usage_objective">Aprenda como controlar AndroidAPS</string>
     <string name="objectives_usage_gate">Executar diferentes ações no AndroidAPS</string>
+    <string name="objectives_useprofileswitch">Definir perfil de 90% por 10 min (pressione longo no nome de perfil na Visão Geral)</string>
+    <string name="objectives_usedisconnectpump">Simular chuveiro. Desligar a bomba de 1h (Pressione longo em Open Loop)</string>
+    <string name="objectives_usereconnectpump">... e volte a ligar de volta da mesma forma</string>
+    <string name="objectives_usetemptarget">Crie um alvo temporário personalizado com 10 min de duração (pressione longo no seu alvo atual)</string>
     <string name="objectives_useactions">No Configurador ative o plugin de Ações, torne-o visível e exiba o seu conteúdo no menu superior</string>
+    <string name="objectives_useloop">Mostrar conteúdo do plugin Loop</string>
+    <string name="objectives_usescale">Utilizar a função de escala premindo longamente gráfico Glic</string>
+    <string name="objectives_button_enter">Inserir</string>
     <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Se tiver pelo menos 3 meses de experiência com Close Loop com outros sistemas, pode-se qualificar para um código para ignorar objetivos. Ver https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives para mais detalhes.</string>
     <string name="codeaccepted">Código aceito</string>
+    <string name="codeinvalid">Código inválido</string>
+    <string name="objectives_exam_objective">Prove seu conhecimento</string>
+    <string name="objectives_exam_gate">Estude e responda as perguntas corretamente</string>
     <string name="answerdisabledto">Resposta desativada para: %1$s</string>
+    <string name="wronganswer">Resposta errada!</string>
+    <string name="unfinshed_button">Próximo inacabado</string>
+    <string name="requestcode">Pedir Código: %1$s</string>
+    <string name="objectives_hint">(marque todas as respostas correctas)</string>
+    <string name="notconnected">Não está ligado à internet</string>
+    <string name="failedretrievetime">Falha ao recuperar tempo</string>
+    <string name="requirementnotmet">Requisitos de objetivo não cumpridos</string>
+    <plurals name="objective_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dias</item>
+    </plurals>
+    <plurals name="objective_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
+    <plurals name="objective_minutes">
+        <item quantity="one">%1$d minuto</item>
+        <item quantity="other">%1$d minutos</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4b2c30c4e7..0069fdc11a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -206,6 +206,10 @@
     <string name="prefdecrypt_issue_parsing">Erro desencriptação, a análise de preferências falhou!</string>
     <string name="prefdecrypt_issue_wrong_pass">Erro de desencriptação, a senha é inválida ou configurações de arquivo foram modificadas! Pode acontecer que o arquivo importado foi exportado com uma senha mestre diferente.</string>
     <string name="prefdecrypt_issue_wrong_format">Configuração de encriptação ausente, formato de configurações é inválido!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Algoritmo de encriptação não suportado ou não especificado!</string>
+    <string name="exported_today">exportado hoje</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportado %1$s atrás</string>
+    <string name="exported_less_than_hour_ago">exportado há menos de uma hora</string>
     <string name="end_user_license_agreement">Condições de Utilização</string>
     <string name="end_user_license_agreement_text">NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS.</string>
     <string name="end_user_license_agreement_i_understand">EU ENTENDO E CONCORDO</string>
@@ -215,13 +219,23 @@
     <string name="smscommunicator_allowednumbers">Números de telefone permitidos</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Para dar bolus %1$.2fU responder com código %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Para dar bólus %1$.2fU responder com código %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Para definir o Alvo Tempo %1$s responda com o código %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Para cancelar Alvo Temp responda com o código %1$s</string>
     <string name="smscommunicator_stopsmswithcode">Para desativar o Serviço Remoto SMS de responda com o código %1$s.\n\nTenha em mente que será capaz de o reativar diretamente apenas a partir do celular principal do AAPS.</string>
     <string name="smscommunicator_stoppedsms">SMS Serviço Remoto interrompido. Para reativá-lo, use o AAPS no telemóvel mestre.</string>
     <string name="smscommunicator_calibrationreplywithcode">Para enviar calibração %1$.2f responder com código %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus falhou</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo</string>
+    <string name="smscommunicator_remotebolusmindistance">Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone.</string>
     <string name="bolusdelivered">Bolus %1$.2fU entregue com sucesso</string>
     <string name="bolusrequested">Vão ser administradas %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bólus %1$.2fU enviado com êxito</string>
+    <string name="smscommunicator_mealbolusdelivered">Bólus de refeição %1$.2fU entregue com sucesso</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Alvo %1$s para %2$d minutos</string>
+    <string name="smscommunicator_tt_set">Alvo %1$s para %2$d minutos definido com sucesso</string>
+    <string name="smscommunicator_tt_canceled">Alvo Temp cancelado com êxito</string>
     <string name="smscommunicator_remotecommandsallowed">Permitir comandos remotos via SMS</string>
     <string name="danarprofile">Definições perfil DanaR</string>
     <string name="danarprofile_dia">DIA [h]</string>
@@ -235,15 +249,20 @@
     <string name="smscommunicator_loopisenabled">Loop ativado</string>
     <string name="valuelimitedto">%1$.2f limitado a %2$.2f</string>
     <string name="valueoutofrange">O valor %1$s está fora dos limites permitidos</string>
+    <string name="smscommunicator_pumpdisconnected">Bomba desconectada</string>
+    <string name="smscommunicator_reconnect">Bomba reconectada</string>
     <string name="smscommunicator_remotecommandnotallowed">O comando remoto não é permitido</string>
     <string name="smscommunicator_remotebolusnotallowed">O bolus remoto não está disponível. Tente novamente mais tarde.</string>
     <string name="smscommunicator_basalreplywithcode">Para começar a basal %1$.2fU/h durante%2$d min responda com o código %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Para mudar o perfil para %1$s %2$d%% responda com o código %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Para inserir %1$dg em %2$s responda com código %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Para suspender o loop por %1$d minutos resposta com código %2$s</string>
     <string name="smscommunicator_tempbasalset">Basal temporária %1$.2fU/h para %2$d min iniciada com êxito</string>
     <string name="smscommunicator_extendedset">Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito</string>
+    <string name="smscommunicator_carbsset">Hidratos %1$dg inseridos com sucesso</string>
+    <string name="smscommunicator_carbsfailed">Introdução de %1$dg de hidratos falhou</string>
     <string name="smscommunicator_tempbasalset_percent">Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito</string>
     <string name="smscommunicator_tempbasalfailed">Falha ao iniciar basal temp</string>
     <string name="smscommunicator_extendedfailed">Falha ao iniciar o bolus estendido</string>
@@ -369,6 +388,7 @@
     <string name="wear_detailedIOB_title">Mostrar IOB detalhado</string>
     <string name="wear_detailedIOB_summary">Dividir IOB entre IOB de bolus e de basal na face do relógio</string>
     <string name="nosuccess">não foi bem sucedido - por favor, verifique o telefone</string>
+    <string name="notavailable">n/a</string>
     <string name="patientage">Idade do Paciente</string>
     <string name="child">Criança</string>
     <string name="teenage">Adolescente</string>
@@ -741,6 +761,7 @@
     <string name="startobjective">Iniciar primeiro objetivo</string>
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
+    <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
@@ -758,6 +779,10 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Aumentar sensibilidade para alvostemp >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Baixo alvotemp baixa sensibilidade</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Baixar sensibilidade para alvostemp < 100]]></string>
+    <string name="resistance_lowers_target_title">Resistência reduz alvo</string>
+    <string name="resistance_lowers_target_summary">Quando a resistência for detectada, diminui o alvo de glicose</string>
+    <string name="sensitivity_raises_target_title">Sensibilidade aumenta o alvo</string>
+    <string name="sensitivity_raises_target_summary">Quando a sensibilidade é detectada, aumenta o alvo glicose</string>
     <string name="combo_invalid_setup">Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360.</string>
     <string name="custom">Personalizado</string>
     <string name="careportal_removestartedevents">Limpar AndroidAPS iniciado</string>
@@ -912,6 +937,8 @@
     <string name="tidepool_upload_tbr">Enviar basais temporárias</string>
     <string name="tidepool_upload_profile">Enviar trocas de perfil, alvos temporários</string>
     <string name="tidepool_upload_bg">Enviar testes Glicemia</string>
+    <string name="dst_in_24h_warning">Horário de Verão em 24h ou menos</string>
+    <string name="dst_loop_disabled_warning">Horário de Verão a menos de 3 horas - Closed Loop desligado</string>
     <string name="storage">restrição de armazenamento interno</string>
     <string name="diskfull">Liberte pelo menos %1$d MB do armazenamento interno! Loop desativado!</string>
     <string name="wrongformat">Formato incorrecto</string>
@@ -949,6 +976,8 @@
     <string name="exists">existe</string>
     <string name="notexists">não existe</string>
     <string name="temptargetcompared">Alvo Temp %1$s</string>
+    <string name="btdevicecompared">Ligação Bluetooth com o dispositivo %1$s %2$s</string>
+    <string name="btdevice">Ligação ao dispositivo Bluetooth </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -963,6 +992,10 @@
     <string name="name_short">Nome:</string>
     <string name="locationis">%1$s %2$s</string>
     <string name="location_mode">Quando </string>
+    <string name="location_inside">Quando estiver dentro da área</string>
+    <string name="location_outside">Quando estiver fora da área</string>
+    <string name="location_going_in">Quando entrar na área definida</string>
+    <string name="location_going_out">Quando sair da área definida</string>
     <string name="lastboluslabel">Último bolus atrás</string>
     <string name="lastboluscompared">Última vez do bolus %1$s %2$s atrás</string>
     <string name="triggercoblabel">COB</string>
@@ -998,6 +1031,8 @@
     <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
     <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
     <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
     <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">PROCURAR</string>
@@ -1119,32 +1154,99 @@
     <string name="loading">A carregar ...</string>
     <string name="snooze">Silenciar</string>
     <string name="time_range">Intervalo de tempo</string>
+    <string name="timerange_value">O tempo está entre %1$s e %2$s</string>
+    <string name="between">Entre </string>
+    <string name="increasingmaxbasal">Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil</string>
+    <string name="smscommunicator_messagebody">Corpo da mensagem inválido</string>
+    <string name="format_bg_isf">%1$s FSI: %2$.1f</string>
+    <string name="boluswizard">Assistente de Bólus</string>
+    <string name="profile_name">Nome do Perfil:</string>
+    <string name="selected_profile">Seleccionado:</string>
+    <string name="unitsnosemicolon">Unidades</string>
     <string name="doyouwantswitchprofile">Deseja mudar de perfil e descartar as alterações feitas no perfil atual?</string>
+    <string name="common_on">Ligado</string>
+    <string name="common_off">Desligado</string>
     <string name="objectives_button_unfinish">Limpeza terminado</string>
     <string name="objectives_button_unstart">Limpeza iniciado</string>
     <string name="doyouwantresetstart">Deseja reiniciar o objetivo? Pode perder seu progresso.</string>
+    <string name="nopumpselected">Nenhuma bomba seleccionada</string>
+    <string name="setupwizard_units_prompt">Seleccione as unidades em que deseja exibir os valores</string>
+    <string name="ns_ploadlocalprofile">Carregar as alterações do perfil local para NS</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">FSI</string>
+    <string name="target_short">ALV</string>
     <string name="saveorresetchangesfirst">Guardar ou repor as alterações atuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil atual?</string>
     <string name="copytolocalprofile">Criar novo perfil local a partir desta troca de perfil?</string>
     <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não foi enviado para o NS.</string>
     <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
+    <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
     <string name="reorder_label">Reordenar</string>
     <string name="age">Idade:</string>
     <string name="submit">Enviar</string>
     <string name="mostcommonprofile">Perfil mais comum:</string>
+    <string name="survey_comment">Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Você pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada.</string>
     <string name="nav_survey">Questionário</string>
+    <string name="invalidage">Entrada de idade inválida</string>
+    <string name="invalidweight">Entrada de peso inválida</string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
     <string name="activitymonitor">Monitor de atividade</string>
     <string name="doyouwantresetstats">Quer reiniciar as estatísticas de atividade?</string>
     <string name="statistics">Estatísticas</string>
+    <string name="randombg">Glic. Aleatória</string>
+    <string name="description_source_randombg">Gerar dados de Glic. aleatórios (Somente modo de Demonstração)</string>
+    <string name="randombg_short">GLIC</string>
     <string name="tools">Ferramentas</string>
+    <string name="show_calculation">Mostrar Localização</string>
+    <string name="automation_event">Evento de automação</string>
+    <string name="alreadyset">Já definido</string>
+    <string name="clearqueueconfirm">Limpar fila? Todos os dados na fila serão perdidos!</string>
+    <string name="ebstopsloop">O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso?</string>
+    <string name="closed_loop_disabled_with_eb">Closed Loop desabilitado por causa da execução do Bólus Estendido</string>
+    <string name="extended_bolus_short">BE</string>
+    <string name="phonechecker">\"VerificadorTelefone\"</string>
     <string name="chartmenu">Menu do Gráfico</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Hora de solicitação SMB</string>
+    <string name="loop_smbexecution_time_label">Hora de execução do SMB</string>
+    <string name="loop_tbrrequest_time_label">Hora de solicitação Basal Temp</string>
+    <string name="loop_tbrexecution_time_label">Hora de execução Basal Temp</string>
+    <string name="insight_alert_notification_channel">Alertas Bomba Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">a partir da app Autenticador para: %1$s</string>
     <string name="smscommunicator_otp_enabled">Ativar Autenticador</string>
+    <string name="smscommunicator_otp_enabled_summary">Autenticar comandos usando Uma-Password-Única que sejam geradas pelo Google Authenticator ou app 2FA similar.</string>
+    <string name="smscommunicator_otp_pin">PIN adicional no token final</string>
+    <string name="smscommunicator_otp_pin_summary">Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Password-Única que seja gerada</string>
+    <string name="smscomunicator_tab_otp_label">Configuração do Autenticador</string>
+    <string name="smscommunicator_otp_verify_label">OTP para verificar:</string>
+    <string name="smscommunicator_otp_reset_btn">Repor Autenticadores</string>
+    <string name="smscommunicator_otp_reset_title">Repor Chave Autenticador</string>
     <string name="smscommunicator_otp_reset_prompt">Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados atualmente como inválidos, e precisará de os configurar novamente.</string>
     <string name="smscommunicator_otp_reset_successful">Nova Chave do Autenticador foi gerada! Por favor, use o QRCode atualizado para os autenticadores.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Instalar Autenticador</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Pesquise o código para configurar os códigos OTP do AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Teste Uma-Password-Única</string>
+    <string name="smscommunicator_otp_reset_header">Repor Autenticadores</string>
+    <string name="smscommunicator_otp_install_info">Instalar uma app Autenticador que suporte Tokens RFC 6238 TOTP em cada telefone seguidor. Populares aplicativos gratuitos são:\n • Authy\n • o Google Authenticator\n • LastPass Autenticador\n • FreeOTP Autenticador</string>
+    <string name="smscommunicator_otp_provisioning_warning">NÃO PARTILHE este código online!\nUse-o apenas para a instalação da app Autenticador nos telefones seguidores.</string>
+    <string name="smscommunicator_otp_reset_warning">Ao repor o autenticador, torna inválidos todos os autenticadores já provisionados. Precisará de os configurar novamente!</string>
+    <string name="onconnect">Ao ligar</string>
+    <string name="ondisconnect">Ao desligar</string>
+    <string name="overview_show_predictions">Previsões</string>
+    <string name="overview_show_deviationslope">Desvio de inclinação</string>
+    <string name="authorizationfailed">Falha na autorização</string>
+    <string name="overview_show_absinsulin">Insulina absoluta</string>
+    <string name="master_password_summary">Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro.</string>
+    <string name="passwords_dont_match">As passwords não coincidem</string>
     <string name="current_master_password">Senha mestra atual</string>
+    <string name="statuslights_copy_ns">Copiar definições do NS</string>
+    <string name="classic_description">Tema original</string>
+    <string name="buttonson_description">Botões são sempre exibidos na parte inferior da tela</string>
+    <string name="largedisplay_description">Mostrador Grande</string>
+    <string name="skin">Tema</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
@@ -1152,6 +1254,11 @@
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_cmd_deactivate_pod">Desativado Pod</string>
+    <string name="omnipod_cmd_set_bolus">Definir Bólus</string>
+    <string name="omnipod_cmd_set_tbr">Definir Basal temporário</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_init_pod_set_basal_profile">Definir Perfil Basal</string>
     <string name="omnipod_deactivate_pod_deactivate_pod">Desativado Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
diff --git a/app/src/main/res/values-pt-rPT/protection.xml b/app/src/main/res/values-pt-rPT/protection.xml
index 1d65b8cf53..2fa347f1b5 100644
--- a/app/src/main/res/values-pt-rPT/protection.xml
+++ b/app/src/main/res/values-pt-rPT/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Sem Protecção</string>
     <string name="protection">Protecção</string>
     <string name="master_password_missing">A Senha Mestre não está definida!\n\nPor favor, configure Senha Mestre em Preferências (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Reverter Inseguro</string>
+    <string name="unsecure_fallback_descriotion_biometric">Para ser eficaz, a protecção biométrica precisa de uma senha mestre definida para reverter.\n\nPor favor, defina uma senha mestre!</string>
     <string name="password_set">Senha foi definida!</string>
     <string name="password_not_set">Senha não foi definida</string>
     <string name="password_not_changed">Senha não foi alterada</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index dddc2122b4..3a0d584d40 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -795,6 +795,7 @@
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
+    <string name="needlocationpermission">Aplicação necessita de permissão de localização para pesquisa Bluetooth e identificação Wi-Fi</string>
     <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
diff --git a/app/src/main/res/values-ru-rRU/protection.xml b/app/src/main/res/values-ru-rRU/protection.xml
index 6198bca5d9..ebc9b10c25 100644
--- a/app/src/main/res/values-ru-rRU/protection.xml
+++ b/app/src/main/res/values-ru-rRU/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Без защиты</string>
     <string name="protection">Защита</string>
     <string name="master_password_missing">Не задан главный пароль!\n\nЗадайте главный пароль в настройках (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Небезопасный резервный вход</string>
+    <string name="unsecure_fallback_descriotion_biometric">Биометрической защите требуется главный пароль для безопасности.\n\n Установите главный пароль!</string>
     <string name="password_set">Пароль задан!</string>
     <string name="password_not_set">Пароль не задан</string>
     <string name="password_not_changed">Пароль не был изменён</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9b229c67de..1a5f1a6a56 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -164,6 +164,7 @@
     <string name="filenotfound">файл не найден</string>
     <string name="nav_export">экспорт настроек</string>
     <string name="nav_import">импорт настроек</string>
+    <string name="openapsma_maxbasal_title">Максимальное значение ед./ч для скорости временного базала</string>
     <string name="openapsma_maxbasal_summary">в контексте OpenAPS называется макс базал</string>
     <string name="openapsma_maxiob_title">макс базал активн инс подаваемый с OpenAPS (ед)</string>
     <string name="openapsma_maxiob_summary">Эта величина называется Max IOB (макс активн инс) в OpenAPS\n. Это макс кол-во инсулина в ед. [U] которое APS может подать единовременно.</string>
@@ -299,6 +300,7 @@
     <string name="primefill">прайм/заполнение</string>
     <string name="fillwarning">убедитесь что количество соответствует характеристикам вашей инфузионной системы</string>
     <string name="othersettings_title">другое</string>
+    <string name="fillbolus_title">Заполнить стандартное количество инсулина</string>
     <string name="button1">кнопка 1</string>
     <string name="button2">кнопка 2</string>
     <string name="button3">кнопка 3</string>
@@ -357,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">значение по умолчанию: 4 . Это вторая половина обеспечения безопасности OpenAPS из дуэта \"максимум 3x ежедневное; 4x текущее\" Означает что ваша база независимо от установок помпы не может быть выше чем это число умноженное на текущее значение базала. Ограничение для того, чтобы предотвратить вторжение в опасную зону из-за высокого уровня установленных значений базы без понимания алгоритма работы приложения. Большинству людей никогда не потребуется изменять это значение, скорее всего нужно поменять другие настройки если вы чувствуете, что вам мешает это ограничение.</string>
     <string name="openapsama_autosens_max_summary">Значение по умолчанию: 1,2\n Это множитель для autosens ( и вскоре autotune) с лимитом 20%% который определяет лимит верхнего значения autosens, который в свою очередь предопределяет верхнюю границу базала, границы изменения чувствительности к инсулину ISF и нижние границы целевой ГК.</string>
     <string name="openapsama_autosens_min_summary">по умолчанию:0.7 Еще один параметр безопасности autosens, определяющий как низко он может опускать базал и как высоко поднимать ISF (чувств к инс) и целевые СК</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens тоже подстроит цели</string>
     <string name="openapsama_autosens_adjusttargets_summary">значение по умолчанию : верно. используется чтобы разрешить юстировку целевых СК, а также ISF и базала</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">значение по умолчанию :2 bolus snoose активируется после введения болюса на еду чтобы цикл не взаимодействовал с временными низкими СК сразу после еды. так, трехчасовой DIA при величине 2 означает постыпенное затихание bolus snooze после 1.5 часов (3DIA/2)</string>
     <string name="openapsama_min_5m_carbimpact_summary">Значение по умолчанию: 3.0 (AMA) или 8.0 (SMB). Эта настройка на усвоение углеводов за 5 мин. По умолчанию ожидается 3мг/дл/5мин. Влияет на скорость учета поглощения углеводов COB и усвоения в расчетах прогнозируемой гликемии, когда СК падает быстрее или не растет так как ожидается.</string>
@@ -794,6 +797,7 @@ Context | Edit Context</string>
     <string name="permission">Права доступа</string>
     <string name="askforpermission">Запросить права доступа</string>
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
+    <string name="needlocationpermission">Приложению требуется разрешение на доступ к местоположению для сканирования BT и идентификации WiFi</string>
     <string name="needstoragepermission">Приложение нуждается в разрешении доступа к хранению данных для хранения лог-файлов</string>
     <string name="request">Запрос</string>
     <string name="insulinsourcesetup">Настроить плагин инсулина</string>
diff --git a/app/src/main/res/values-sk-rSK/protection.xml b/app/src/main/res/values-sk-rSK/protection.xml
index 99bcd7815b..18f88d1b9c 100644
--- a/app/src/main/res/values-sk-rSK/protection.xml
+++ b/app/src/main/res/values-sk-rSK/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Bez ochrany</string>
     <string name="protection">Ochrana</string>
     <string name="master_password_missing">Hlavné heslo nie je nastavené!\n\nProsím nastavte svoje hlavné heslo v nastaveniach (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Nezabezpečené záložné riešenie</string>
+    <string name="unsecure_fallback_descriotion_biometric">Aby bolo biometrické zabezpečenie účinné, je potrebné pre záložné riešenie nastaviť hlavné heslo.\n\nProsím nastavte hlavné heslo!</string>
     <string name="password_set">Heslo nastavené!</string>
     <string name="password_not_set">Heslo nie je nastavené</string>
     <string name="password_not_changed">Heslo nezmenené</string>
diff --git a/app/src/main/res/values-sv-rSE/protection.xml b/app/src/main/res/values-sv-rSE/protection.xml
index 2586a94122..a890fea8cf 100644
--- a/app/src/main/res/values-sv-rSE/protection.xml
+++ b/app/src/main/res/values-sv-rSE/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Inget skydd</string>
     <string name="protection">Skydd</string>
     <string name="master_password_missing">Huvudlösenord har inte angetts.\n\nAnge huvudlösenord i Inställningar (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Osäker alternativ autentisering</string>
+    <string name="unsecure_fallback_descriotion_biometric">Biometrisk verifiering kräver att huvudlösenordet är inställt (som reservlösning).\n\nVänligen sätt ett huvudlösenord!</string>
     <string name="password_set">Lösenord sparat!</string>
     <string name="password_not_set">Lösenord inte inställt</string>
     <string name="password_not_changed">Lösenordet har inte ändrats</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 3ee7ab1a02..28018d79d5 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -796,6 +796,7 @@ Eversense-appen.</string>
     <string name="permission">Behörighet</string>
     <string name="askforpermission">Be om behörighet</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
+    <string name="needlocationpermission">Appen behöver platsåtkomst för bluetooth- och WiFi-identifiering</string>
     <string name="needstoragepermission">Appen behöver behörighet att använda Lagring för att kunna spara loggfiler</string>
     <string name="request">Begäran</string>
     <string name="insulinsourcesetup">Konfigurera insticksprogram för insulin</string>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index eddcd3314a..6132405070 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -75,6 +75,7 @@
     <string name="message">Съобщение</string>
     <string name="ok">ОК</string>
     <string name="cancel">Откажи</string>
+    <string name="dismiss">Разбрах</string>
     <!--    BlePreCheck-->
     <string name="ble_not_supported">Bluetooth Low Energy не се поддържа.</string>
     <string name="ble_not_enabled">Bluetooth не е включен.</string>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index accb96c26b..3dd51612dd 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -1,21 +1,181 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Emparejando</string>
     <!--    General-->
+    <string name="error">Error</string>
+    <string name="not_set_short">No configurado</string>
+    <string name="failedupdatebasalprofile">Error al actualizar el perfil basal</string>
+    <string name="profile_set_ok">Perfil basal actualizado en bomba</string>
+    <string name="invalidinput">Datos inválidos</string>
+    <string name="tempbasaldeliveryerror">Basal Temporal no emitida</string>
+    <string name="goingtodeliver">Se van a infundir %1$.2fU</string>
+    <string name="waitingforpump">Esperando bomba</string>
+    <string name="connectingfor">Conexión por %1$d s</string>
+    <string name="bolusdelivering">Infundiendo %1$.2fU</string>
+    <string name="handshaking">Estableciendo comunicacion</string>
+    <string name="connecting">Conectando</string>
+    <string name="connected">Conectado</string>
+    <string name="disconnected">Desconectado</string>
+    <string name="disconnecting">Desconectando</string>
+    <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f/%2$dU</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Bomba ocupada</string>
+    <string name="connectionerror">Error de conexión de la bomba</string>
+    <string name="youareonallowedlimit">Límite permitido alcanzado</string>
+    <string name="objectives">Objetivos</string>
+    <string name="close">Cerrar</string>
+    <string name="please_wait">Por favor, espere…</string>
+    <string name="mute">Silenciar</string>
+    <string name="reload">Recargar</string>
+    <string name="stoppressed">STOP pulsado</string>
+    <string name="stop">Detener</string>
+    <string name="carbs">Carbohidratos [g]</string>
+    <string name="invalidprofile">Perfil inválido !!!</string>
+    <string name="noprofileset">NINGÚN PERFIL ACTIVO</string>
+    <string name="date">Fecha</string>
+    <string name="units_label">Unidades</string>
+    <string name="dia_label">DIA (Duración Insulina Activa)</string>
+    <string name="ic_label">IC (Ratio Insulina/Carbohidratos)</string>
+    <string name="isf_label">ISF (Factor Sensibilidad Insulina)</string>
+    <string name="basal_label">Dosis Basal</string>
+    <string name="target_label">Objetivo</string>
+    <string name="initializing">Iniciando...</string>
+    <string name="serialnumber">Número de serie</string>
+    <string name="battery_label">Batería</string>
+    <string name="lastconnection_label">Última conexión</string>
+    <string name="lastbolus_label">Último bolo</string>
+    <string name="dailyunits">Unidades diarias</string>
+    <string name="basebasalrate_label">Dosis Basal</string>
+    <string name="tempbasal_label">Basal Temporal</string>
+    <string name="virtualpump_extendedbolus_label">Bolo extendido</string>
+    <string name="reservoir_label">Reservorio</string>
+    <string name="pumphistory">Historial de la bomba</string>
+    <string name="viewprofile">Ver perfil</string>
+    <string name="eventtype">Tipo de evento</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Ajustes avanzados</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_summary">Apaga el bluetooth del móvil por un segundo si no hay conexión con la bomba. Esto ayuda con algunos móviles con problemas para establecer conexión bluetooth estable.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Limitando max basal rate a %1$.2f U/h debido a %2$s</string>
+    <string name="pumplimit">límite de la bomba</string>
+    <string name="limitingpercentrate">Limitando porcentaje máximo de dosis a %1$d%% debido a %2$s</string>
+    <string name="itmustbepositivevalue">tiene que ser un valor positivo</string>
+    <string name="limitingbolus">Limitando el bolo a %1$.1f U debido a %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Bomba no iniciada, ¡perfil establecido!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Confirmación</string>
+    <string name="message">Mensaje</string>
+    <string name="ok">Ok</string>
+    <string name="cancel">Cancelar</string>
+    <string name="dismiss">DESCARTAR</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth de baja energía no soportado.</string>
+    <string name="ble_not_enabled">Bluetooth no activado.</string>
+    <string name="location_not_found_title">Ubicación no habilitada</string>
+    <string name="location_not_found_message">Para activar la visibilidad Bluetooth en nuevos dispositivos, la ubicación debe estar habilitada. AAPS no hace un seguimiento de su ubicación y se puede desactivar después de realizar la vinculación.</string>
     <!--    DateUtil-->
+    <string name="minago">Hace %1$dm</string>
+    <string name="hoursago">Hace %1$.1fh</string>
+    <string name="shorthour">h</string>
+    <string name="days">días</string>
+    <string name="hours">horas</string>
+    <string name="unit_second">segundo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">hora</string>
+    <string name="unit_day">día</string>
+    <string name="unit_week">semana</string>
+    <string name="unit_seconds">segundos</string>
+    <string name="unit_minutes">minutos</string>
+    <string name="unit_hours">horas</string>
+    <string name="unit_days">días</string>
+    <string name="unit_weeks">semanas</string>
+    <string name="shortminute">m</string>
+    <string name="shortday">d</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Valores basales no alineados a las horas: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valor basal reemplazado por el valor mínimo soportado: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valor basal reemplazado por el valor máximo soportado: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Ningun perfil seleccionado</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Sólo se soportan valores discretos, no rangos, como entrada de datos para basal/bolo en la bomba virtual.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Cancelar basal temporal</string>
+    <string name="let_temp_basal_run">Deja ejecutar basal temporal</string>
+    <string name="rate">Dosis</string>
+    <string name="duration">Duración</string>
+    <string name="reason">Motivo</string>
+    <string name="nochangerequested">Ningún cambio solicitado</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Medir glucosa</string>
+    <string name="careportal_announcement">Aviso</string>
+    <string name="careportal_note">Nota</string>
+    <string name="careportal_question">Pregunta</string>
+    <string name="careportal_exercise">Ejercicio</string>
+    <string name="careportal_pumpsitechange">Cambio Cánula de Bomba</string>
+    <string name="careportal_cgmsensorinsert">Inserción de sensor</string>
+    <string name="careportal_cgmsensorstart">Inicio de Sensor</string>
+    <string name="careportal_insulincartridgechange">Cambio Cartucho insulina</string>
+    <string name="careportal_profileswitch">Cambio de perfil</string>
+    <string name="careportal_snackbolus">Bolo de aperitivo</string>
+    <string name="careportal_mealbolus">Bolo de comida</string>
+    <string name="careportal_correctionbolus">Bolo de corrección</string>
+    <string name="careportal_combobolus">Bolo combo</string>
+    <string name="careportal_tempbasalstart">Inicio Basal Temp</string>
+    <string name="careportal_tempbasalend">Fin Basal Temp</string>
+    <string name="careportal_carbscorrection">Corrección Carbohidratos</string>
+    <string name="careportal_openapsoffline">OpenAPS sin conexión</string>
+    <string name="careportal_pumpbatterychange">Cambio batería bomba</string>
+    <string name="careportal_temporarytarget">Objetivo temporal</string>
+    <string name="careportal_temporarytargetcancel">Cancelar Objetivo temporal</string>
+    <string name="glucosetype_finger">Dedo</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manualmente</string>
+    <string name="unknown">desconocido</string>
     <!--    Command-->
+    <string name="connectiontimedout">Tiempo de conexión agotado</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Establecido</string>
+    <string name="comment">Comentario</string>
+    <string name="success">Exito</string>
+    <string name="percent">Porcentaje</string>
+    <string name="absolute">Absoluto</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Esperando resultado</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg Carbohidratos adicionales son necesarios dentro de %d minutos</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Estadísticas</string>
+    <string name="cumulative_tdd">TDD acumulativa</string>
+    <string name="expweight">TDD ampliada exponencialmente</string>
+    <string name="basalrate">Dosis Basal</string>
+    <string name="bolus">Bolo</string>
+    <string name="tdd">Dosis diaria</string>
+    <string name="ratio">Ratio</string>
+    <string name="amount_days"># Días</string>
+    <string name="weight">Peso</string>
+    <string name="warning_Message">Probablemente impreciso si se usan bolos para llenar/rellenar!</string>
+    <string name="olddata_Message">Datos caducados por favor pulsa RELOAD</string>
+    <string name="tbb">Basal total</string>
+    <string name="tbb2">Basal diaria *2</string>
     <!--    Ntp-->
+    <string name="timedetection">Detección de tiempo</string>
 </resources>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index accb96c26b..4417df2d7a 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -1,21 +1,182 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Sujungiama</string>
     <!--    General-->
+    <string name="error">Klaida</string>
+    <string name="not_set_short">Nenustatyta</string>
+    <string name="failedupdatebasalprofile">Nepavyko atnaujinti bazės profilio</string>
+    <string name="profile_set_ok">Bazės profilis pompoje atnaujintas</string>
+    <string name="invalidinput">Neteisingai įvesti duomenys</string>
+    <string name="tempbasaldeliveryerror">Laikinos bazės suleidimo klaida</string>
+    <string name="goingtodeliver">Bus suleista %1$.2fvv</string>
+    <string name="waitingforpump">Laukiama ryšio su pompa</string>
+    <string name="connectingfor">Jungiamasi %1$d s</string>
+    <string name="bolusdelivering">Leidžiama %1$.2fvv</string>
+    <string name="handshaking">Ryšio užmezgimas</string>
+    <string name="connecting">Jungiamasi</string>
+    <string name="connected">Prisijungta</string>
+    <string name="disconnected">Atsijungta</string>
+    <string name="disconnecting">Atsijungiama</string>
+    <string name="androidaps_start">AndroidAPS paleista</string>
+    <string name="formatinsulinunits">%1$.2fvv</string>
+    <string name="reservoirvalue">%1$.0f / %2$d vv</string>
+    <string name="pump_basebasalrate">%1$.2fvv/val</string>
+    <string name="format_hours">%1$.2f val.</string>
+    <string name="format_mins">%1$d min.</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pompa šiuo metu veikia</string>
+    <string name="connectionerror">Pompos prisijungimo klaida</string>
+    <string name="youareonallowedlimit">Pasiekėte leistiną ribą</string>
+    <string name="objectives">Tikslai</string>
+    <string name="close">Uždaryti</string>
+    <string name="please_wait">Palaukite…</string>
+    <string name="mute">Nutildyti</string>
+    <string name="reload">Atnaujinti</string>
+    <string name="stoppressed">Paspausta STOP</string>
+    <string name="stop">Stop</string>
+    <string name="carbs">AV</string>
+    <string name="invalidprofile">Netinkamas profilis!!!</string>
+    <string name="noprofileset">Nenustatytas profilis</string>
+    <string name="date">Data</string>
+    <string name="units_label">Vienetai</string>
+    <string name="dia_label">IVT</string>
+    <string name="ic_label">IA</string>
+    <string name="isf_label">JIF</string>
+    <string name="basal_label">VB</string>
+    <string name="target_label">Tikslas</string>
+    <string name="initializing">Inicijuojama ...</string>
+    <string name="serialnumber">Serijos numeris</string>
+    <string name="battery_label">Baterija</string>
+    <string name="lastconnection_label">Paskutinis prisijungimas</string>
+    <string name="lastbolus_label">Paskutinis bolusas</string>
+    <string name="dailyunits">Paros insulinas</string>
+    <string name="basebasalrate_label">Pagrindinis bazės dydis</string>
+    <string name="tempbasal_label">Laikina bazė</string>
+    <string name="virtualpump_extendedbolus_label">Ištęstas bolusas</string>
+    <string name="reservoir_label">Rezervuaras</string>
+    <string name="pumphistory">Pompos istorija</string>
+    <string name="viewprofile">Peržiūrėti profilį</string>
+    <string name="eventtype">Įvykio tipas</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Papildomi nustatymai</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Vienai sekundei išjungia telefono bluetooth, jei ryšys su pompa nutrūksta. Gali būti veiksminga kai kuriems telefonų modeliams, turintiems BT problemų.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Ribojamas maksimalus bazės dydis%1$.2f vv/val dėl %2$s</string>
+    <string name="pumplimit">pompos limitas</string>
+    <string name="limitingpercentrate">Ribojamas maks procentų skaičius %1$d%%, nes %2$s</string>
+    <string name="itmustbepositivevalue">reikšmė turi būti teigiama</string>
+    <string name="limitingbolus">Bolusas ribojamas iki %1$.1f vv dėl %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompa neprijungta, profilis nepasirinktas!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Patvirtinimas</string>
+    <string name="message">Pranešimas</string>
+    <string name="ok">Gerai</string>
+    <string name="cancel">Atšaukti</string>
+    <string name="dismiss">ATMESTI</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy nepalaikoma.</string>
+    <string name="ble_not_enabled">Bluetooth neįjungta.</string>
+    <string name="location_not_found_title">Vietovės nustatymas neįjungtas</string>
+    <string name="location_not_found_message">Vietos nustatymo paslauga turi būti įjungta, kad Bluetooth aptikimas veiktų naujesniuose įrenginiuose. AAPS neseka Jūsų lokacijos, o vietos nustatymo paslauga gali būti išjungta po sėkmingo įrenginių suporavimo.</string>
     <!--    DateUtil-->
+    <string name="minago">prieš %1$d min</string>
+    <string name="hoursago">Prieš %1$.1f val.</string>
+    <string name="shorthour">val</string>
+    <string name="days">d.</string>
+    <string name="hours">val.</string>
+    <string name="unit_second">sek.</string>
+    <string name="unit_minute">min.</string>
+    <string name="unit_hour">val.</string>
+    <string name="unit_day">d.</string>
+    <string name="unit_week">savaitė</string>
+    <string name="unit_seconds">sekundės</string>
+    <string name="unit_minutes"> min.</string>
+    <string name="unit_hours">val.</string>
+    <string name="unit_days">d.</string>
+    <string name="unit_weeks">savaičių</string>
+    <string name="shortminute">min.</string>
+    <string name="shortday">d</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Bazės reikšmės nesuderintos su valandomis: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valandinė bazė pakeista mažiausia palaikoma verte: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valandinė bazė pakeista didžiausia palaikoma verte: %1$s</string>
+    <string name="profile_per_unit">/vv</string>
+    <string name="profile_ins_units_per_hour">Vv/val</string>
+    <string name="profile_carbs_per_unit">g/vv</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Nepasirinktas profilis</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Virtualioje pompoje palaikomos tik atskiros vertės, o ne diapazonas detalumui užtikrinti.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Atšaukti laikiną bazę</string>
+    <string name="let_temp_basal_run">Paleisti laikinąją bazę</string>
+    <string name="rate">Vertė</string>
+    <string name="duration">Trukmė</string>
+    <string name="reason">Priežastis</string>
+    <string name="nochangerequested">Pakeitimai nereikalingi</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Netinkamas profilis: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bolusas: <b>%3$.2f</b> Bazė: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">KG testas</string>
+    <string name="careportal_announcement">Pranešimas</string>
+    <string name="careportal_note">Pastaba</string>
+    <string name="careportal_question">Klausimas</string>
+    <string name="careportal_exercise">Aktyvumas</string>
+    <string name="careportal_pumpsitechange">Kateterio keitimas</string>
+    <string name="careportal_cgmsensorinsert">NGJ įvedimas</string>
+    <string name="careportal_cgmsensorstart">NGJ paleidimas</string>
+    <string name="careportal_insulincartridgechange">Rezervuaro keitimas</string>
+    <string name="careportal_profileswitch">Profilio keitimas</string>
+    <string name="careportal_snackbolus">Bolusas užkandžiui</string>
+    <string name="careportal_mealbolus">Bolusas valgiui</string>
+    <string name="careportal_correctionbolus">Bolusas korekcijai</string>
+    <string name="careportal_combobolus">Kombinuotas bolusas</string>
+    <string name="careportal_tempbasalstart">Pradėta laikina bazė</string>
+    <string name="careportal_tempbasalend">Užbaigta laikina bazė</string>
+    <string name="careportal_carbscorrection">AV korekcijai</string>
+    <string name="careportal_openapsoffline">OpenAPS neprisijungus</string>
+    <string name="careportal_pumpbatterychange">Baterijos keitimas</string>
+    <string name="careportal_temporarytarget">Laikinas tikslas</string>
+    <string name="careportal_temporarytargetcancel">Laikino tikslo atšaukimas</string>
+    <string name="glucosetype_finger">Iš piršto</string>
+    <string name="glucosetype_sensor">Iš sensoriaus</string>
+    <string name="manual">Rankiniu būdu</string>
+    <string name="unknown">nežinoma</string>
     <!--    Command-->
+    <string name="connectiontimedout">Prijungimo laikas baigėsi</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Vykdoma</string>
+    <string name="comment">Komentaras</string>
+    <string name="success">Atlikta</string>
+    <string name="percent">Procentai</string>
+    <string name="absolute">Absoliutus</string>
+    <string name="configbuilder_insulin">Insulinas</string>
+    <string name="insulin_unit_shortname">vv</string>
+    <string name="waitingforpumpresult">Laukiama rezultato</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Būtini %dg papildomų AV per %d min</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistika</string>
+    <string name="cumulative_tdd">BPD viso</string>
+    <string name="expweight">Eksponentiškai svertinė BPD</string>
+    <string name="basalrate">Valandinė bazė</string>
+    <string name="bolus">Bolusas</string>
+    <string name="tdd">BPD</string>
+    <string name="ratio">Vertė</string>
+    <string name="amount_days"># d.</string>
+    <string name="weight">Svoris</string>
+    <string name="warning_Message">Duomenys netikslūs, jei bolusai naudojami kateterių užpildymui!</string>
+    <string name="olddata_Message">Duomenys seni, spauskite \"ATNAUJINTI\"</string>
+    <string name="tbb">Pagrindinė bazė (PB)</string>
+    <string name="tbb2">PB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Laiko nustatymas</string>
 </resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 3648be0016..e8243c3709 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -162,6 +162,7 @@
     <string name="waitingforpumpresult">Wachtend op resultaat</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg Extra Koolhydraten Nodig Binnen %d Minuten</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistieken</string>
     <string name="cumulative_tdd">Cumulatieve TDD</string>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index f1445fc05c..a124e98e4d 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -1,23 +1,173 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">A emparelhar</string>
     <!--    General-->
+    <string name="error">Erro</string>
+    <string name="not_set_short">Não definido</string>
+    <string name="failedupdatebasalprofile">Falha ao atualizar o perfil basal</string>
+    <string name="profile_set_ok">Perfil Basal atualizado na bomba</string>
+    <string name="invalidinput">Dados de entrada inválidos</string>
+    <string name="tempbasaldeliveryerror">Erro na entrega da basal temporária</string>
+    <string name="goingtodeliver">Vão ser administradas %1$.2fU</string>
+    <string name="waitingforpump">Aguardando a bomba</string>
+    <string name="connectingfor">Conectando para %1$d</string>
+    <string name="bolusdelivering">Administrando %1$.2fU</string>
+    <string name="handshaking">Cumprimento</string>
+    <string name="connecting">Conectando</string>
+    <string name="connected">Conectado</string>
+    <string name="disconnected">Desconectado</string>
+    <string name="disconnecting">A desligar</string>
+    <string name="androidaps_start">AndroidAPS iniciado</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="pumpbusy">A bomba está ocupada</string>
+    <string name="connectionerror">Erro de conexão com a bomba</string>
+    <string name="youareonallowedlimit">Atingiu o limite autorizado</string>
     <string name="objectives">Objetivos</string>
+    <string name="close">Fechar</string>
+    <string name="please_wait">Por favor aguarde…</string>
+    <string name="mute">Silêncio</string>
+    <string name="reload">Recarregar</string>
+    <string name="stoppressed">STOP PRESSIONADO</string>
+    <string name="stop">Parar</string>
+    <string name="carbs">Carbos</string>
+    <string name="invalidprofile">Perfil inválido !!!</string>
+    <string name="noprofileset">SEM PERFIL DEFINIDO</string>
+    <string name="date">Data</string>
+    <string name="units_label">Unidades</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Basal</string>
+    <string name="target_label">Meta</string>
+    <string name="initializing">Inicializando...</string>
+    <string name="serialnumber">Número de série</string>
+    <string name="battery_label">Bateria</string>
+    <string name="lastconnection_label">Última ligação</string>
+    <string name="lastbolus_label">Último Bolus</string>
+    <string name="dailyunits">Unidades diárias</string>
+    <string name="basebasalrate_label">Taxa Basal de base</string>
+    <string name="tempbasal_label">Basal temporaria</string>
+    <string name="virtualpump_extendedbolus_label">Bólus estendido</string>
+    <string name="reservoir_label">Reservatório</string>
+    <string name="pumphistory">Histórico da Bomba</string>
+    <string name="viewprofile">Ver perfil</string>
+    <string name="eventtype">Tipo de evento</string>
+    <string name="mgdl">mg/dL</string>
+    <string name="mmol">mmol/L</string>
+    <string name="advancedsettings_title">Configurações Avançadas</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Watchdog BT</string>
+    <string name="btwatchdog_summary">Desliga o bluetooth do telefone durante um segundo se nenhuma conexão com bomba for possível. Este parâmetro pode ser util em alguns telefones, onde a pilha bluetooth congela.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">A basal max está limitada a %1$.2f U/h por %2$s</string>
+    <string name="pumplimit">limite bomba</string>
+    <string name="limitingpercentrate">A limitar rácio percentagem máx para %1$d%% porque %2$s</string>
+    <string name="itmustbepositivevalue">deve ser valor positivo</string>
+    <string name="limitingbolus">A limitar bólus para %1$.1f U porque %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Bomba não inicializada, perfil não definido!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Confirmação</string>
+    <string name="message">Mensagem</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancelar</string>
+    <string name="dismiss">Dispensar</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth de energia baixa (LE) não suportado.</string>
+    <string name="ble_not_enabled">Bluetooth não está activado.</string>
+    <string name="location_not_found_title">Localização Não Está Activada</string>
+    <string name="location_not_found_message">Para que a procura de Bluetooth funcione em aparelhos mais recentes, a localização tem que ser activada. A app não rastreia a sua localização e pode ser desativada depois de um emparelhamento bem sucedido.</string>
     <!--    DateUtil-->
+    <string name="hoursago">%1$.1fh atrás</string>
+    <string name="shorthour">h</string>
+    <string name="days">dias</string>
+    <string name="hours">horas</string>
+    <string name="unit_second">segundo</string>
+    <string name="unit_minute">minuto</string>
+    <string name="unit_hour">hora</string>
+    <string name="unit_day">dia</string>
+    <string name="unit_week">semana</string>
+    <string name="unit_seconds">segundos</string>
+    <string name="unit_minutes">minutos</string>
+    <string name="unit_hours">horas</string>
+    <string name="unit_days">dias</string>
+    <string name="unit_weeks">semanas</string>
+    <string name="shortminute">m</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Valores das basais não definidos por horas: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valor da basal alterado para o valor mínimo suportado: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valor da basal alterado para o valor máximo suportado: %1$s</string>
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Nenhum perfil selecionado</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Somente valores discretos nos intervalos são suportados como granularidade para basal/bolus na bomba virtual.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Cancelar basal temporária</string>
+    <string name="let_temp_basal_run">Permitir basal temp correr</string>
+    <string name="rate">Rácio</string>
+    <string name="duration">Duração</string>
+    <string name="reason">Motivo</string>
+    <string name="nochangerequested">Nenhuma alteração solicitada</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Perfil inválido: %1$s</string>
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="careportal_bgcheck">Verificação BG</string>
+    <string name="careportal_announcement">Anúncio</string>
+    <string name="careportal_note">Anotação</string>
+    <string name="careportal_question">Pergunta</string>
+    <string name="careportal_exercise">Exercício</string>
+    <string name="careportal_pumpsitechange">Alteração do local do cateter</string>
+    <string name="careportal_cgmsensorinsert">Colocação do Sensor CGM</string>
+    <string name="careportal_cgmsensorstart">Início do Sensor CGM</string>
+    <string name="careportal_insulincartridgechange">Mudança de Cartucho de Insulina</string>
+    <string name="careportal_profileswitch">Troca de Perfil</string>
+    <string name="careportal_snackbolus">Bólus Lanche</string>
+    <string name="careportal_mealbolus">Bólus Refeição</string>
+    <string name="careportal_correctionbolus">Bólus Correcção</string>
+    <string name="careportal_combobolus">Bólus Combo</string>
+    <string name="careportal_tempbasalstart">Início Basal Temp</string>
+    <string name="careportal_tempbasalend">Fim de Basal Temp</string>
+    <string name="careportal_carbscorrection">Correção Carbos</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
+    <string name="careportal_pumpbatterychange">Mudança de Bateria</string>
+    <string name="careportal_temporarytarget">Alvo Temporário</string>
+    <string name="careportal_temporarytargetcancel">Cancelar alvo temporário</string>
+    <string name="glucosetype_finger">Dedo</string>
+    <string name="glucosetype_sensor">Sensor</string>
+    <string name="manual">Manual</string>
+    <string name="unknown">desconhecido</string>
     <!--    Command-->
+    <string name="connectiontimedout">Ligação expirou</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Executado</string>
+    <string name="comment">Commentário</string>
+    <string name="success">Sucesso</string>
+    <string name="percent">Percentagem</string>
+    <string name="absolute">Absoluto</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Aguardando resultados</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
+    <string name="cumulative_tdd">Dose diária acumulativa</string>
+    <string name="expweight">Dose diária exponencialmente ponderada</string>
+    <string name="basalrate">Basal</string>
+    <string name="bolus">Bólus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Média</string>
+    <string name="amount_days"># Dias</string>
+    <string name="weight">Peso</string>
     <string name="warning_Message">Possivelmente impreciso se foram usados bolus para purgar/preencher!</string>
+    <string name="olddata_Message">Dados antigos, pressione \"Recarregar\"</string>
+    <string name="tbb">Basal Diária Total</string>
+    <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Detecção de tempo</string>
 </resources>
diff --git a/dana/src/main/res/values-es-rES/strings.xml b/dana/src/main/res/values-es-rES/strings.xml
index 3ea04e700d..ec4d92fb33 100644
--- a/dana/src/main/res/values-es-rES/strings.xml
+++ b/dana/src/main/res/values-es-rES/strings.xml
@@ -1,2 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Emparejando</string>
+    <string name="danars_nodeviceavailable">Aparato no encontrado</string>
+    <string name="danars_pairingok">Conexión OK</string>
+    <string name="danars_pairingtimedout">Tiempo de Vinculación agotado</string>
+    <string name="danars_waitingforpairing">Esperando para conectar con bomba</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integración de bombas de insulina de DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Violación de bolo Max</string>
+    <string name="commanderror">Error de comando</string>
+    <string name="speederror">Error de velocidad</string>
+    <string name="insulinlimitviolation">Límite de insulina sobrepasado</string>
+    <string name="boluserrorcode">Solicitado: %1$.2fU Entregado: %2$.2fU Código de error: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
+    <string name="danar_setbasalstep001">Ajustar paso basal a 0.01 U/h</string>
+    <string name="processinghistory">Procesando evento</string>
+    <string name="danar_enableextendedbolus">Habilitar bolos extendidos en bomba</string>
+    <string name="overview_bolusprogress_delivered">Entregado</string>
+    <string name="overview_bolusprogress_stoped">Detenido</string>
+    <string name="unsupportedfirmware">Firmware de la bomba no soportado</string>
+    <string name="pumperror">Error de bomba</string>
+    <string name="lowbattery">Batería Baja</string>
+    <string name="pumpshutdown">Bomba apagada</string>
+    <string name="batterydischarged">Batería de la bomba descargada</string>
+    <string name="occlusion">Oclusión</string>
+    <string name="emptyreservoir">Reservorio vacío</string>
+    <string name="basalmax">Basal max</string>
+    <string name="dailymax">Máximo diario</string>
+    <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
+    <string name="remaininsulinalert">Insulina restante en reservorio</string>
+    <string name="gettingpumpstatus">Recibir estado de bomba</string>
+    <string name="gettingextendedbolusstatus">Recibiendo estado de bolo extendido</string>
+    <string name="gettingbolusstatus">Recibiendo estado bolo</string>
+    <string name="gettingtempbasalstatus">Recibiendo estado basal temporal</string>
+    <string name="gettingpumpsettings">Recibiendo configuración de la bomba</string>
+    <string name="gettingpumptime">Recibiendo hora bomba</string>
+    <string name="largetimedifftitle">Diferencia de tiempo grande</string>
+    <string name="largetimediff">Gran diferencia de tiempo: \nLa bomba esta desincronizada más de 1,5 horas. \npor favor ajusta la hora manualmente en la bomba y asegúrate de que la lectura del histórico de la bomba no causa comportamiento inesperado. \nSi es posible, borra el historial de la bomba antes de cambiar la hora o desactiva el lazo cerrado durante el periodo DIA (duracion insulina activa) después del último registro erróneo pero mínimo durante el DIA a partir de ahora.</string>
+    <string name="pairfirst">Por favor, empareje su bomba con su teléfono!</string>
+    <string name="approachingdailylimit">Alcanzando el limite de insulina diario</string>
+    <string name="startingbolus">Iniciando bolo</string>
+    <string name="waitingforestimatedbolusend">Esperando finalización del bolo. Faltan %1$d seg.</string>
+    <string name="stoppingtempbasal">Parando basal temporal</string>
+    <string name="settingextendedbolus">Iniciando bolo extendido</string>
+    <string name="stoppingextendedbolus">Parando bolo extendido</string>
+    <string name="updatingbasalrates">Actualizando dosis basales</string>
+    <string name="settingtempbasal">Ajustando basal temporal</string>
+    <string name="waitingfortimesynchronization">Esperando para sincronización (%1$d sec)</string>
+    <string name="wrongpassword">Contraseña incorrecta</string>
+    <string name="wrongpumppassword">¡Contraseña de la bomba incorrecta!</string>
+    <string name="danar_history_alarm">Alarmas</string>
+    <string name="danar_history_basalhours">Basal Horas</string>
+    <string name="danar_history_bolus">Bolos</string>
+    <string name="danar_history_carbohydrates">Carbohidratos</string>
+    <string name="danar_history_dailyinsulin">Insulina Diaria</string>
+    <string name="danar_history_errors">Errores</string>
+    <string name="danar_history_glucose">Glucosa</string>
+    <string name="danar_history_refill">Llenar</string>
+    <string name="danar_history_syspend">Suspender</string>
+    <string name="danar_history_prime">Cebado</string>
+    <string name="danar_useroptions">Opciones de usuario</string>
+    <string name="danar_timedisplay">Mostrar formato de tiempo</string>
+    <string name="danar_buttonscroll">Botones de desplazamiento</string>
+    <string name="danar_beep">Señal sonora de pulsación</string>
+    <string name="danar_pumpalarm">Alarma</string>
+    <string name="danar_pumpalarm_sound">Sonido</string>
+    <string name="danar_pumpalarm_vibrate">Vibrar</string>
+    <string name="danar_pumpalarm_both">Ambos</string>
+    <string name="danar_screentimeout">Tiempo de encendido de LCD [seconds]</string>
+    <string name="danar_backlight">Tiempo de luz fondo encendida [seconds]</string>
+    <string name="danar_glucoseunits">Unidades de glucosa</string>
+    <string name="danar_shutdown">Apagar [hours]</string>
+    <string name="danar_lowreservoir">Reservorio bajo [Units]</string>
+    <string name="danar_saveuseroptions">Guardar las opciones en la bomba</string>
+    <string name="description_pump_dana_r">Integración de bombas de insulina de DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Integración de bombas de insulina DANA Diabecare R</string>
+    <string name="description_pump_dana_r_v2">Integración para bombas de insulina DANA Diabecare R con el firmware actualizado</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
+    <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
+    <string name="danar_switchtouhmode">Cambio de modo de U/d a U/h en bomba</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Control de la bomba corregido</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Inhabilitar modo EasyUI en bomba</string>
+    <string name="profile_set_failed">Error al activar perfil basal</string>
+    <string name="danar_bluetooth_status">Estado de bluetooth</string>
+    <string name="danar_iob_label">Bomba IOB</string>
+    <string name="basal_step">Nivel base</string>
+    <string name="bolus_step">Nivel bolo</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Ajustes de la bomba Dana</string>
+    <string name="timeformat12h">12 h</string>
+    <string name="timeformat24h">24 h</string>
+    <string name="option_on">Activado</string>
+    <string name="option_off">Desactivado</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danar_password_title">Contraseña de la bomba</string>
+    <string name="danar_useextended_title">Usar bolos extendidos para &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizar bolo extendido como %%</string>
+    <string name="bolusspeed">Velocidad bolo</string>
+    <string name="selectedpump">Bomba seleccionada</string>
+</resources>
diff --git a/dana/src/main/res/values-lt-rLT/strings.xml b/dana/src/main/res/values-lt-rLT/strings.xml
index 3ea04e700d..bca4fcbf52 100644
--- a/dana/src/main/res/values-lt-rLT/strings.xml
+++ b/dana/src/main/res/values-lt-rLT/strings.xml
@@ -1,2 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Sujungiama</string>
+    <string name="danars_nodeviceavailable">Nerasta jokio prietaiso</string>
+    <string name="danars_pairingok">Sujungta</string>
+    <string name="danars_pairingtimedout">Sujungimui skirtas laikas baigėsi</string>
+    <string name="danars_waitingforpairing">Laukiama ryšio su pompa</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">DANA Diabecare RS pompos integracija</string>
+    <string name="maxbolusviolation">Pažeistas maks boluso limitas</string>
+    <string name="commanderror">Komandos klaida</string>
+    <string name="speederror">Greičio klaida</string>
+    <string name="insulinlimitviolation">Pažeistas insulino dozės limitas</string>
+    <string name="boluserrorcode">Įvesta: %1$.2fvv Suleista: %2$.2fvv Klaidos kodas: %3$s</string>
+    <string name="danar_valuenotsetproperly">Vertė nėra tinkamai nustatyta</string>
+    <string name="danar_setbasalstep001">Nustatyti bazės žingsnį 0.01 vv/val</string>
+    <string name="resetpairing">Panaikinti sąsajos informaciją?</string>
+    <string name="dana_model">%1$s\nModelis: %2$02X\nProtokolas: %3$02X\nKodas: %4$02X</string>
+    <string name="processinghistory">Apdorojama</string>
+    <string name="danar_enableextendedbolus">Aktyvuoti ištęstinius bolusus pompoje</string>
+    <string name="overview_bolusprogress_delivered">Suleista</string>
+    <string name="overview_bolusprogress_stoped">Sustabdyta</string>
+    <string name="unsupportedfirmware">Pompos programinės įrangos versija nepalaikoma</string>
+    <string name="pumperror">Pompos klaida</string>
+    <string name="lowbattery">Senka baterija</string>
+    <string name="basalcompare">Suleidžiama mažiau už nustatytą valandinę bazę</string>
+    <string name="pumpshutdown">Pompa išsijungė</string>
+    <string name="batterydischarged">Pompos baterija išsikrovusi</string>
+    <string name="occlusion">Užsikimšimas</string>
+    <string name="emptyreservoir">Rezervuaras tuščias</string>
+    <string name="checkshaft">Patikrinti stūmoklį pompoje</string>
+    <string name="basalmax">Maks. valandinė bazė</string>
+    <string name="dailymax">Dienos maksimumas</string>
+    <string name="bloodsugarmeasurementalert">Gliukozės kiekio kraujyje matavimo perspėjimas</string>
+    <string name="remaininsulinalert">Likusio insulino kiekis</string>
+    <string name="missedbolus">Nesuleistas bolusas</string>
+    <string name="invalidpairing">Netinkama susiejimo informacija. Bandoma susieti iš naujo</string>
+    <string name="gettingpumpstatus">Gaunamas pompos statusas</string>
+    <string name="gettingextendedbolusstatus">Gaunamas ištęstinio boluso statusas</string>
+    <string name="gettingbolusstatus">Gaunamas boluso statusas</string>
+    <string name="gettingtempbasalstatus">Gaunamas laikinos bazės statusas</string>
+    <string name="gettingpumpsettings">Gaunami pompos nustatymai</string>
+    <string name="gettingpumptime">Gaunamas pompos laikas</string>
+    <string name="largetimedifftitle">Didelis laiko neatitikimas</string>
+    <string name="largetimediff">Didelis laiko skirtumas:\nLaikas pompoje skiriasi daugiau nei 1,5 val.\nNustatykite laiką pompoje rankiniu būdu ir įsitikinkite, kad įrašai iš pompos istorijos nesukelia netikėtų sistemos veiksmų.\nJei įmanoma, ištrinkite istoriją pompoje prieš keisdami laiką arba atjunkite uždarąjį ciklą vienai IVT po paskutinio neteisingo istorijos įrašo ar mažiausiai vienai IVT nuo dabar.</string>
+    <string name="pairfirst">Atnaujinkite pompos ir telefono ryšį!</string>
+    <string name="approachingdailylimit">Artėja paros insulino limitas</string>
+    <string name="startingbolus">Pradedamas bolusas</string>
+    <string name="waitingforestimatedbolusend">Laukiama boluso pabaigos. Liko %1$d s.</string>
+    <string name="stoppingtempbasal">Laikinos bazės sustabdymas</string>
+    <string name="settingextendedbolus">Ištęsto boluso nustatymas</string>
+    <string name="stoppingextendedbolus">Ištęsto boluso sustabdymas</string>
+    <string name="updatingbasalrates">Bazė naujinama</string>
+    <string name="settingtempbasal">Laikinos bazės nustatymas</string>
+    <string name="waitingfortimesynchronization">Laukiama laiko sinchronizavimo (%1$d sek.)</string>
+    <string name="wrongpassword">Neteisingas slaptažodis</string>
+    <string name="wrongpumppassword">Neteisingas pompos slaptažodis!</string>
+    <string name="danar_history_alarm">Aliarmai</string>
+    <string name="danar_history_basalhours">Valandinė bazė</string>
+    <string name="danar_history_bolus">Bolusai</string>
+    <string name="danar_history_carbohydrates">AV</string>
+    <string name="danar_history_dailyinsulin">Paros insulinas</string>
+    <string name="danar_history_errors">Klaidos</string>
+    <string name="danar_history_glucose">Gliukozė</string>
+    <string name="danar_history_refill">Užpildymas</string>
+    <string name="danar_history_syspend">Sustabdyta</string>
+    <string name="danar_history_prime">Užpildyti sistemą</string>
+    <string name="danar_useroptions">Vartotojo parinktys</string>
+    <string name="danar_timedisplay">Rodyti laiko formatą</string>
+    <string name="danar_buttonscroll">Mygtukų slinkties funkcija</string>
+    <string name="danar_beep">Pypsėjimas spaudžiant mygtukus</string>
+    <string name="danar_pumpalarm">Aliarmas</string>
+    <string name="danar_pumpalarm_sound">Garsas</string>
+    <string name="danar_pumpalarm_vibrate">Vibravimas</string>
+    <string name="danar_pumpalarm_both">Abu</string>
+    <string name="danar_screentimeout">Ekrano aktyvumo laikas [seconds]</string>
+    <string name="danar_backlight">Ekrano apšvietimo laikas [seconds]</string>
+    <string name="danar_glucoseunits">KG vienetai</string>
+    <string name="danar_shutdown">Išjungimas [hours]</string>
+    <string name="danar_lowreservoir">Žemas rezervuaro lygis [Units]</string>
+    <string name="danar_saveuseroptions">Išsaugoti nustatymus pompoje</string>
+    <string name="description_pump_dana_r">DANA Diabecare R pompos integracija</string>
+    <string name="description_pump_dana_r_korean">DANA Diabecare R pompos, skirtos vietinei P. Korėjos rinkai, integracija</string>
+    <string name="description_pump_dana_r_v2">DANA Diabecare R pompos su atnaujinta programine-aparatine įranga integracija</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Bluetooth adapteris nerastas</string>
+    <string name="devicenotfound">Pasirinktas įrenginys nerastas</string>
+    <string name="danar_switchtouhmode">Pakeisti pompoje vv/d režimą į vv/val</string>
+    <string name="danarkoreanpump">DanaR Korean</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Pompos valdiklis pakoreguotas</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Išjungti pompos EasyUI režimą</string>
+    <string name="profile_set_failed">Nepavyko nustatyti bazės profilio</string>
+    <string name="danar_bluetooth_status">Bluetooth statusas</string>
+    <string name="danar_iob_label">Pompos AIO</string>
+    <string name="basal_step">Bazės žingsnis</string>
+    <string name="bolus_step">Boluso žingsnis</string>
+    <string name="virtualpump_firmware_label">Programinė įranga</string>
+    <string name="danar_pump_settings">Dana pompos nustatymai</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Įjungti</string>
+    <string name="option_off">Išjungti</string>
+    <string name="danar_bt_name_title">DanaR Bluetooth įrenginys</string>
+    <string name="danars_password_title">Pompos slaptažodis (tik v1)</string>
+    <string name="danar_password_title">Pompos slaptažodis</string>
+    <string name="danar_useextended_title">Naudoti ištęstinį bolusą &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Rodyti ištęstinį boliusą kaip %%</string>
+    <string name="bolusspeed">Boluso greitis</string>
+    <string name="selectedpump">Pasirinkta pompa</string>
+    <string name="rs_loginsulinchange_title">Įrašyti rezervuaro keitimą</string>
+    <string name="rs_loginsulinchange_summary">Įtraukti į terapijos skiltį įvykį „Insulino pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="rs_logcanulachange_title">Įrašyti kaniulės pakeitimą</string>
+    <string name="rs_logcanulachange_summary">Įtraukti į terapijos skiltį įvykį „Kaniulės pakeitimas“, jei jis aptinkamas istorijoje</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Paspauskite pompos mygtuką OK\n ir įveskite 2 rodomus skaičius\nĮjunkite pompos ekraną spausdami minuso mygtuką, kol baigsite įvesti kodą.</string>
+    <string name="num1pin">1: (12 skaitmenų)</string>
+    <string name="num2pin">2: (8 skaitmenys)</string>
+</resources>
diff --git a/dana/src/main/res/values-nl-rNL/strings.xml b/dana/src/main/res/values-nl-rNL/strings.xml
index caa501cd1f..ac4438bf96 100644
--- a/dana/src/main/res/values-nl-rNL/strings.xml
+++ b/dana/src/main/res/values-nl-rNL/strings.xml
@@ -29,6 +29,7 @@
     <string name="batterydischarged">Pomp Batterij Leeg</string>
     <string name="occlusion">Afsluiting</string>
     <string name="emptyreservoir">Reservoir leeg</string>
+    <string name="checkshaft">Controleer aandrijfstang</string>
     <string name="basalmax">Max basaal</string>
     <string name="dailymax">Max per dag</string>
     <string name="bloodsugarmeasurementalert">Bloed glucose meting alarm</string>
diff --git a/dana/src/main/res/values-pt-rBR/strings.xml b/dana/src/main/res/values-pt-rBR/strings.xml
index 3d640c85c0..756ea27a45 100644
--- a/dana/src/main/res/values-pt-rBR/strings.xml
+++ b/dana/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="danars_pairing">A emparelhar</string>
+    <string name="danars_nodeviceavailable">Nenhum dispositivo encontrado até agora</string>
+    <string name="danars_pairingok">Emparelhamento OK</string>
+    <string name="danars_pairingtimedout">Tempo emparelhamento excedido</string>
+    <string name="danars_waitingforpairing">Aguardando emparelhamento na bomba</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integração para bombas DANA Diabecare RS</string>
+    <string name="maxbolusviolation">Transgressão Bólus máx</string>
+    <string name="commanderror">Erro no comando</string>
+    <string name="speederror">Erro velocidade</string>
+    <string name="insulinlimitviolation">Transgressão limite insulina</string>
+    <string name="boluserrorcode">Pedido: %1$.2fU Entregue: %2$.2fU Código Erro: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valor não definido corretamente</string>
+    <string name="danar_setbasalstep001">Coloque o incremento da basal em 0.01 U/h</string>
     <string name="processinghistory">Processando ação</string>
+    <string name="danar_enableextendedbolus">Habilitar bolus estendido na bomba</string>
+    <string name="overview_bolusprogress_delivered">Entregue</string>
+    <string name="overview_bolusprogress_stoped">Parado</string>
+    <string name="unsupportedfirmware">Firmware bomba não suportado</string>
+    <string name="pumperror">Erro da Bomba</string>
+    <string name="lowbattery">Bateria fraca</string>
+    <string name="pumpshutdown">Bomba desligada</string>
+    <string name="batterydischarged">Bateria da Bomba Descarregada</string>
+    <string name="occlusion">Oclusão</string>
+    <string name="emptyreservoir">Reservatório vazio</string>
+    <string name="bloodsugarmeasurementalert">Alerta medição da glicemia</string>
+    <string name="remaininsulinalert">Nível de insulina restante</string>
+    <string name="gettingpumpstatus">A obter estado bomba</string>
+    <string name="gettingextendedbolusstatus">Procurando o status do bolus estendido</string>
+    <string name="gettingbolusstatus">A obter estado bólus</string>
+    <string name="gettingtempbasalstatus">A obter o status da basal temporária</string>
+    <string name="gettingpumpsettings">A obter as definições da bomba</string>
+    <string name="gettingpumptime">A obter hora bomba</string>
+    <string name="largetimedifftitle">Grande diferença Horária</string>
     <string name="largetimediff">Grande diferença horária:\n A diferença de hora para a bomba é superior a 1.5h.\nPor favor ajuste manualmente a hora na bomba e certifique-se que a leitura do histórico da bomba não provoca problemas.\nSe possível apague o histórico da bomba antes de modificar a hora ou desabilite o loop durante toda a duração de ação da insulina DIA depois da ultima entrada no histórico da bomba ou mais um DIA desde o momento da correção, qual delas seja a que mantenha o loop aberto durante mais tempo.</string>
+    <string name="pairfirst">Emparelhe a sua bomba com o seu telefone!</string>
+    <string name="approachingdailylimit">Aproximação do limite diario de insulina</string>
+    <string name="startingbolus">A iniciar administração de bolus</string>
+    <string name="waitingforestimatedbolusend">A aguardar o final do bolus. Restam %1$d sec.</string>
+    <string name="stoppingtempbasal">A parar basal temp</string>
+    <string name="settingextendedbolus">Configurando bolus prolongado</string>
+    <string name="stoppingextendedbolus">Parando bolus prolongado</string>
+    <string name="updatingbasalrates">Atualizar valores das basais</string>
+    <string name="settingtempbasal">Definindo basal temp</string>
+    <string name="waitingfortimesynchronization">À espera da sincronização da hora (%1$d sec)</string>
+    <string name="wrongpassword">Senha incorrecta</string>
+    <string name="wrongpumppassword">Senha da bomba incorrecta!</string>
+    <string name="danar_history_alarm">Alarmes</string>
+    <string name="danar_history_basalhours">Horas de Basal</string>
+    <string name="danar_history_bolus">Bolus</string>
+    <string name="danar_history_carbohydrates">Carboidratos</string>
+    <string name="danar_history_dailyinsulin">Insulina diária</string>
+    <string name="danar_history_errors">Erros</string>
+    <string name="danar_history_glucose">Glicose</string>
+    <string name="danar_history_refill">Reabastecimento</string>
+    <string name="danar_history_syspend">Suspender</string>
+    <string name="danar_history_prime">Purge/Encha</string>
+    <string name="danar_useroptions">Opções do utilizador</string>
+    <string name="danar_timedisplay">Formato hora</string>
+    <string name="danar_buttonscroll">Botão rolamento</string>
+    <string name="danar_beep">Sinal ao pressionar botão</string>
+    <string name="danar_pumpalarm">Alarme</string>
+    <string name="danar_pumpalarm_sound">Som</string>
+    <string name="danar_pumpalarm_vibrate">Vibrar</string>
+    <string name="danar_pumpalarm_both">Ambos</string>
+    <string name="danar_screentimeout">LCD na hora [segundos]</string>
+    <string name="danar_backlight">Luz de fundo na hora [segundos]</string>
+    <string name="danar_glucoseunits">Unidades de Glucose</string>
+    <string name="danar_shutdown">Desligar [horas]</string>
+    <string name="danar_lowreservoir">Reservatório baixo [Unidades]</string>
+    <string name="danar_saveuseroptions">Gravar opções para a bomba</string>
+    <string name="description_pump_dana_r">Integração para bombas DANA Diabecare R</string>
+    <string name="description_pump_dana_r_korean">Integração para bombas DANA Diabecare R Coreanas</string>
+    <string name="description_pump_dana_r_v2">Integração para as bombas DANA Diabecare R com firmware atualizado</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nenhum dispositivo bluetooth encontrado</string>
+    <string name="devicenotfound">Dispositivo selecionado não foi encontrado</string>
+    <string name="danar_switchtouhmode">Mudar de modo U/d para U/h na bomba</string>
+    <string name="danarkoreanpump">DanaR Coreana</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Controlador bomba corrigido</string>
+    <string name="danarv2pump">DanaRv2</string>
     <string name="danar_disableeasymode">Desativar modo EasyUI na bomba</string>
+    <string name="profile_set_failed">Não foi possivel configurar o perfil de basal</string>
+    <string name="danar_bluetooth_status">Estado Bluetooth</string>
+    <string name="danar_iob_label">IOB Bomba</string>
+    <string name="basal_step">Valor da Basal</string>
+    <string name="bolus_step">Incremento de bolus</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Configurações da bomba Dana</string>
+    <string name="option_on">Ligado</string>
+    <string name="option_off">Desligado</string>
+    <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danar_password_title">Senha da bomba</string>
+    <string name="danar_useextended_title">Usar bólus prolongado de &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Visualizar bólus prolongado como %%</string>
+    <string name="bolusspeed">Velocidade Bólus</string>
+    <string name="selectedpump">Bomba seleccionada</string>
 </resources>
diff --git a/wear/src/main/res/values-pt-rBR/strings.xml b/wear/src/main/res/values-pt-rBR/strings.xml
index 42a3df157b..1390a92cc7 100644
--- a/wear/src/main/res/values-pt-rBR/strings.xml
+++ b/wear/src/main/res/values-pt-rBR/strings.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(Grande)</string>
+    <string name="label_xdrip_big_chart">AAPS(GrafGrande)</string>
+    <string name="label_xdrip_no_chart">AAPS(SemGraf)</string>
+    <string name="label_xdrip_circle">AAPS(Círculo)</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Cockpit)</string>
+    <string name="label_xdrip_steampunk">AAPS(Steampunk)</string>
+    <string name="label_warning_sync">Sem dados!</string>
+    <string name="label_warning_old">Dados antigos!</string>
+    <string name="label_warning_since">Desde %1$s</string>
+    <string name="label_warning_sync_aaps">Sincronizar com AAPS!</string>
+    <string name="msg_warning_sync">Nenhum dado recebido desde %1$s! Confira se o AAPS no telefone envia dados para o relógio</string>
+    <string name="msg_warning_old">Dados AAPS são %1$s antigos! Verifique sensor, xDrip+, NS, configuração AAPS ou outra!</string>
     <string name="pref_on">Lig.</string>
     <string name="pref_off">Desl.</string>
     <string name="pref_vibrate_on_bolus">Vibrar no Bólus</string>
@@ -14,8 +30,12 @@
     <string name="pref_show_basal_rate">Mostrar Taxa Basal</string>
     <string name="pref_show_loop_status">Mostrar Estado Loop</string>
     <string name="pref_show_bg">Mostrar Glic.</string>
+    <string name="pref_show_direction_arrow">Mostrar Seta Direção</string>
+    <string name="pref_show_ago">Mostrar Atrás</string>
     <string name="pref_dark" comment="Enables dark visual theme">Escuro</string>
     <string name="pref_highlight_basals">Destacar Basais</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Divisor correspondente</string>
+    <string name="pref_chart_timeframe">Cronograma do Gráfico</string>
     <string name="pref_1_hour">1 hora</string>
     <string name="pref_2_hours">2 horas</string>
     <string name="pref_3_hours">3 horas</string>
@@ -23,12 +43,60 @@
     <string name="pref_5_hours">5 horas</string>
     <string name="pref_input_design">Design de Entrada</string>
     <string name="pref_default">Padrão</string>
+    <string name="pref_quick_righty">Rápido Direito</string>
+    <string name="pref_quick_lefty">Rápido Esquerdo</string>
+    <string name="pref_modern_sparse">Moderno Esparso</string>
+    <string name="pref_delta_granularity">Delta Granularidade (Steampunk)</string>
     <string name="pref_low">Baixo</string>
+    <string name="pref_medium">Médio</string>
+    <string name="pref_high">Alto</string>
+    <string name="pref_auto">Auto</string>
+    <string name="pref_big_numbers">Números Grandes</string>
+    <string name="pref_ring_history">Anel Histórico</string>
+    <string name="pref_light_ring_history">Anel Suave Histórico</string>
+    <string name="pref_animations">Animações</string>
+    <string name="pref_wizard_in_menu">Assistente no Menu</string>
+    <string name="pref_prime_in_menu">Purgar no Menu</string>
+    <string name="pref_single_target">Alvo Único</string>
+    <string name="pref_wizard_percentage">Assistente Percentagem</string>
+    <string name="pref_complication_tap_action">Complicação de Toque</string>
+    <string name="pref_unicode_in_complications">Unicode em Complicações</string>
+    <string name="pref_version">Versão:</string>
+    <string name="menu_tempt">AlvoT</string>
+    <string name="menu_wizard">Assistente</string>
+    <string name="menu_bolus">Bólus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Definições</string>
+    <string name="menu_status">Estado</string>
+    <string name="menu_prime_fill">Purgar/Preencher</string>
+    <string name="menu_none">Nenhum</string>
+    <string name="menu_default">Padrão</string>
+    <string name="menu_menu">Menu</string>
+    <string name="action_duration">duração</string>
+    <string name="action_target" comment="In temp target menu, single target value">alvo</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">hipo</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">hiper</string>
+    <string name="action_carbs">hidratos</string>
+    <string name="action_percentage">percentagem</string>
+    <string name="action_start_min">iniciar [min]</string>
+    <string name="action_duration_h">duração [h]</string>
+    <string name="action_insulin">insulina</string>
+    <string name="action_preset_1">Predefinição 1</string>
+    <string name="action_preset_2">Predefinição 2</string>
+    <string name="action_preset_3">Predefinição 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Valor livre</string>
     <string name="action_confirm">CONFIRMAR</string>
     <string name="action_status_pump">ESTADO BOMBA</string>
     <string name="action_status_loop">ESTADO LOOP</string>
     <string name="action_timeshift">alteração turno</string>
+    <string name="action_tdd_weighted">TDD ponderada</string>
+    <string name="action_bolus">bólus</string>
     <string name="status_pump">Bomba</string>
+    <string name="status_loop">Loop</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Hidratos</string>
+    <string name="activity_IOB">IOB</string>
     <string name="activity_no_status">sem estado</string>
     <string name="unit_mg_dl">mg/dL</string>
     <string name="unit_mmol_l">mmol/L</string>

From a93485a3c08697e914bec653a8d11de9ed5d7039 Mon Sep 17 00:00:00 2001
From: Tim Gunn <2896311+Tornado-Tim@users.noreply.github.com>
Date: Thu, 9 Jul 2020 00:46:10 +1200
Subject: [PATCH 311/400] Fix the greenbox

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index acc33ba130..dde10f747f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -655,7 +655,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             // If the target is not the same as set in the profile then oref has overridden it
             val targetUsed = lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
-            if (targetUsed != 0.0 && profile.targetMgdl != targetUsed) {
+            if (targetUsed != 0.0 && abs(profile.targetMgdl-targetUsed) > 0.01) {
                 aapsLogger.debug("Adjusted target. Profile: ${profile.targetMgdl} APS: $targetUsed")
                 overview_temptarget?.text = Profile.toTargetRangeString(targetUsed, targetUsed, Constants.MGDL, units)
                 overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))

From 45f168d427083a07f5871dd0d3a3bbadfc6f6fd4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 8 Jul 2020 22:29:26 +0200
Subject: [PATCH 312/400] fix nsclient layout

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt      | 1 +
 app/src/main/res/layout/overview_info_layout.xml                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index acc33ba130..64a2eff624 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -640,6 +640,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 }
             }
         } else {
+            overview_apsmode?.visibility = View.GONE
             overview_apsmode_text?.visibility = View.GONE
         }
         val lastRun = loopPlugin.lastRun
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 223ad259c1..46b9ab16f4 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -46,6 +46,7 @@
             android:id="@+id/overview_timeago"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
             android:text="n/a"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 

From 112032ab0e7248447bfb2a90ccaf9b40eec6360a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 9 Jul 2020 14:26:19 +0200
Subject: [PATCH 313/400] fix nullable params

---
 .../java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt | 2 +-
 .../plugins/general/automation/elements/Comparator.kt           | 2 +-
 .../plugins/general/automation/elements/ComparatorConnect.kt    | 2 +-
 .../plugins/general/automation/elements/ComparatorExists.kt     | 2 +-
 .../plugins/general/automation/elements/InputDelta.kt           | 2 +-
 .../plugins/general/automation/elements/InputDropdownMenu.kt    | 2 +-
 .../plugins/general/automation/elements/InputLocationMode.kt    | 2 +-
 .../plugins/general/automation/elements/InputProfileName.kt     | 2 +-
 .../plugins/general/automation/triggers/TriggerConnector.kt     | 2 +-
 .../plugins/general/overview/dialogs/EditQuickWizardDialog.kt   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
index a16c6ac471..e4f5208471 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
@@ -76,7 +76,7 @@ class TempTargetDialog : DialogFragmentWithDate() {
             val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList)
             overview_temptarget_reason.adapter = adapterReason
             overview_temptarget_reason.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-                override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+                override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                     val defaultDuration: Double
                     val defaultTarget: Double
                     when (reasonList[position]) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
index 86fd8dc73e..11b8d1b952 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/Comparator.kt
@@ -74,7 +74,7 @@ class Comparator(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 value = Compare.values()[position]
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
index 3e293fef5a..5d2d47edf9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorConnect.kt
@@ -48,7 +48,7 @@ class ComparatorConnect(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 value = Compare.values()[position]
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
index 2e7e437bd9..cb7eb8a32e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/ComparatorExists.kt
@@ -48,7 +48,7 @@ class ComparatorExists(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 value = Compare.values()[position]
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
index a667b51099..e7624a98c7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
@@ -76,7 +76,7 @@ class InputDelta(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 deltaType = DeltaType.values()[position]
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
index 7f894293f9..473d26bb4b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDropdownMenu.kt
@@ -38,7 +38,7 @@ class InputDropdownMenu(injector: HasAndroidInjector) : Element(injector) {
         ).also { it.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4)) }
 
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 setValue(itemList[position].toString())
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
index 9e3f7280cc..e5e42fa60a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputLocationMode.kt
@@ -62,7 +62,7 @@ class InputLocationMode(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 value = Mode.values()[position]
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
index 57e010eabe..57f2b904b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputProfileName.kt
@@ -36,7 +36,7 @@ class InputProfileName(injector: HasAndroidInjector) : Element(injector) {
         spinnerParams.setMargins(0, resourceHelper.dpToPx(4), 0, resourceHelper.dpToPx(4))
         spinner.layoutParams = spinnerParams
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 value = profileList[position].toString()
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
index 8574bfa05c..6d19c24441 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
@@ -160,7 +160,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
         params.weight = 1.0f
         spinner.layoutParams = params
         spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 setType(Type.values()[position])
             }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
index 188ce707db..463c7564fa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt
@@ -104,7 +104,7 @@ class EditQuickWizardDialog : DaggerDialogFragment() {
         overview_editquickwizard_usetemptarget_spinner.setSelection(entry.useTempTarget())
 
         overview_editquickwizard_usecob_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) = processCob()
+            override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) = processCob()
             override fun onNothingSelected(parent: AdapterView<*>) {}
         }
         processCob()

From 16c167ee7bdd97a10ffe70eb7792f35e3149bc79 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 9 Jul 2020 15:16:52 +0200
Subject: [PATCH 314/400] fix test

---
 .../test/java/info/nightscout/androidaps/data/ProfileTest.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
index ac4988d8ac..a0776e8365 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/data/ProfileTest.kt
@@ -57,7 +57,7 @@ class ProfileTest : TestBaseWithProfile() {
         JSONAssert.assertEquals(okProfile, p.data, false)
         Assert.assertEquals(3.0, p.dia, 0.01)
         Assert.assertEquals(TimeZone.getTimeZone("UTC"), p.timeZone)
-        Assert.assertEquals("00:30", p.format_HH_MM(30 * 60))
+        Assert.assertEquals("00:30", Profile.format_HH_MM(30 * 60))
         val c = Calendar.getInstance()
         c[Calendar.HOUR_OF_DAY] = 1
         c[Calendar.MINUTE] = 0

From 1b5b419b50f48e653ec50744f4e88d7da2fbcc0e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 9 Jul 2020 18:13:36 +0200
Subject: [PATCH 315/400] New Crowdin updates (#2802)

* New translations strings.xml (Dutch)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations exam.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations objectives.xml (Romanian)

* New translations exam.xml (Romanian)

* New translations protection.xml (Romanian)

* New translations protection.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)
---
 app/src/main/res/values-bg-rBG/strings.xml    |  18 +--
 app/src/main/res/values-de-rDE/strings.xml    |   1 +
 app/src/main/res/values-es-rES/strings.xml    |  15 +++
 app/src/main/res/values-nl-rNL/strings.xml    |  34 +++++
 app/src/main/res/values-pt-rPT/strings.xml    |   2 +
 app/src/main/res/values-ro-rRO/exam.xml       | 122 ++++++++++++++++++
 app/src/main/res/values-ro-rRO/objectives.xml |   4 +
 app/src/main/res/values-ro-rRO/protection.xml |  25 +++-
 app/src/main/res/values-ro-rRO/strings.xml    |  68 ++++++++++
 app/src/main/res/values-sv-rSE/strings.xml    |   2 +
 core/src/main/res/values-bg-rBG/strings.xml   |   3 +-
 core/src/main/res/values-cs-rCZ/strings.xml   |   1 -
 core/src/main/res/values-de-rDE/strings.xml   |   3 +-
 core/src/main/res/values-es-rES/strings.xml   |   2 +-
 core/src/main/res/values-fr-rFR/strings.xml   |   1 -
 core/src/main/res/values-it-rIT/strings.xml   |   1 -
 core/src/main/res/values-lt-rLT/strings.xml   |   3 +-
 core/src/main/res/values-nl-rNL/strings.xml   |   1 -
 core/src/main/res/values-pl-rPL/strings.xml   |   1 -
 core/src/main/res/values-pt-rPT/strings.xml   |   3 +-
 core/src/main/res/values-ro-rRO/strings.xml   |  50 +++++++
 core/src/main/res/values-ru-rRU/strings.xml   |   1 -
 core/src/main/res/values-sk-rSK/strings.xml   |   1 -
 core/src/main/res/values-sv-rSE/strings.xml   |   3 +-
 dana/src/main/res/values-es-rES/strings.xml   |  16 +++
 dana/src/main/res/values-ro-rRO/strings.xml   |  45 ++++++-
 wear/src/main/res/values-ro-rRO/strings.xml   |  16 ++-
 27 files changed, 418 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 908c1851cf..8293bacc5d 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -196,7 +196,7 @@
     <string name="metadata_label_encryption">Криптиране</string>
     <string name="metadata_format_old">Стар формат</string>
     <string name="metadata_format_new">Нов формат</string>
-    <string name="metadata_format_debug">Нов формат (некриптирани)</string>
+    <string name="metadata_format_debug">Нов формат (незащитен)</string>
     <string name="metadata_format_other">Непознат формат</string>
     <string name="prefdecrypt_settings_tampered">Файлът с настройки е преправян</string>
     <string name="prefdecrypt_settings_secure">Файлът с настройки е сигурен</string>
@@ -230,8 +230,8 @@
     <string name="smscommunicator_stoppedsms">Отдалечен SMS контрол е изключен. Можете да го включите от AndroidAPS телефона.</string>
     <string name="smscommunicator_calibrationreplywithcode">За да изпратите калибрация %1$.2f отговорете с код %2$s</string>
     <string name="smscommunicator_bolusfailed">Болус отказан</string>
-    <string name="smscommunicator_remotebolusmindistance_summary">Минимален брой минути, в които трябва да мине между един отдалечен болус и следващия</string>
-    <string name="smscommunicator_remotebolusmindistance">Колко най-малко минути трябва да минат два болуса</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Минимално време в минути, което трябва да е изминало след отдалечен болус, преди да може да бъде доставен следващият</string>
+    <string name="smscommunicator_remotebolusmindistance">Колко най-малко минути трябва да минат между доставката на два болуса</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">За вашата сигурност, променете тази настройка, трябва да добавите най-малко 2 телефонни номера.</string>
     <string name="bolusdelivered">Болус от %1$.2fЕ доставен успешно</string>
     <string name="bolusrequested">Ще стартира %1$.2fЕ болус</string>
@@ -451,7 +451,7 @@
     <string name="statuslights_bage_warning">Аларма при възраст на батерия над [часа]</string>
     <string name="statuslights_bage_critical">Праг за критична възраст на батерията над [часа]</string>
     <string name="statuslights_res_warning">Ниво за аларма за останал инсулин в резервоара [Е]</string>
-    <string name="statuslights_res_critical">Критично ниво на останал инсулин в резервоар [Е]</string>
+    <string name="statuslights_res_critical">Предупреждение за критично ниво на останал инсулин в резервоар [Е]</string>
     <string name="statuslights_bat_warning">Аларма при заряд на батерия под [%]</string>
     <string name="statuslights_bat_critical">Критично ниво на батерията под [%]</string>
     <string name="prediction_shortname">Предв</string>
@@ -513,7 +513,7 @@
     <string name="mdtp_cancel">Откажи</string>
     <string name="notloadedplugins">Не всички профили са заредени!</string>
     <string name="valuesnotstored">Стойностите не са запазени!</string>
-    <string name="ns_localbroadcasts">Включете излъчване към други приложения (като xDrip). Не включвайте, ако имате повече от един AAPS или имате инсталиран NSClient!</string>
+    <string name="ns_localbroadcasts">Активирайте предаване на данни към други приложения (като xDrip). Не активирайте, ако имате повече от един AAPS или имате инсталиран NSClient!</string>
     <string name="ns_localbroadcasts_title">Разреши локално предаване на данни</string>
     <string name="careportal_activity_label">АКТИВНОСТ И ОБРАТНА ВРЪЗКА</string>
     <string name="careportal_carbsandbolus_label">ХРАНА И БОЛУС</string>
@@ -570,7 +570,7 @@
     <string name="wear_detailed_delta_title">Показвай подробна делта</string>
     <string name="wear_detailed_delta_summary">Показвай делта с още един десетичен знак</string>
     <string name="smbinterval_summary">Интервал между SMB в минути</string>
-    <string name="smbmaxminutes">Максимум минути СМБ</string>
+    <string name="smbmaxminutes">Максимум минути SMB</string>
     <string name="smbmaxminutes_summary">Максимални минути за ограничаване на базала от SMB</string>
     <string name="uamsmbmaxminutes">Максимум минути за отчитане на необявени хранения UAM</string>
     <string name="uamsmbmaxminutes_summary">Максимални минути за ограничаване на базала при SMB за UAM</string>
@@ -663,9 +663,9 @@
     <string name="wear_notifysmb_title">Уведомяване при SMB</string>
     <string name="wear_notifysmb_summary">Покажи SMB на часовника като стандартен болус.</string>
     <string name="ns_create_announcements_from_errors_title">Създаване на известие при грешки</string>
-    <string name="ns_create_announcements_from_carbs_req_title">Създаване на съобщения при предупреждения за нужни въглехидрати</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Създаване на известия при предупреждения за необходими въглехидрати</string>
     <string name="ns_create_announcements_from_errors_summary">Създаване на Nightscout известие при грешки и локални аларми (също видими в Careportal - Treatments)</string>
-    <string name="ns_create_announcements_from_carbs_req_summary">Създаване на Nightscout  съобщения при аларма за нужни въглехидрати</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Създаване на Nightscout известия при предупреждения за необходими въглехидрати</string>
     <string name="wear_predictions_summary">Показвай прогнозините КЗ на часовника.</string>
     <string name="wear_predictions_title">Прогнозни КЗ</string>
     <string name="data_choices">Избор на данни</string>
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Не може да се провери статус на болус. Моля, уверете се, че вашият под е стартирал болус или го отменете.</string>
     <string name="omnipod_rl_stats">Статистика на RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse лог</string>
+    <string name="comapareprofile">Сравни с текущия профил</string>
+    <string name="nav_profilehelper">Профил съветник</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 6da0f89032..32e3a40d82 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1407,4 +1407,5 @@ Mache das nur, wenn AAPS nicht mehr mit dem Pod kommunizieren kann. Wenn dies no
     <string name="omnipod_bolus_failed_uncertain">Erfolgreiche Bolusabgabe konnte nicht sicher ermittelt werden. Stelle sicher, dass der Pod Insulin abgibt oder brich den Bolus ab.</string>
     <string name="omnipod_rl_stats">RL Stats</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="nav_profilehelper">Profil-Helfer</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 81b20b96d1..4dc505384e 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1339,7 +1339,10 @@
     <string name="omnipod_driver_error_invalid_message_address">La comunicación ha fallado: se ha recibido un mensaje con una dirección no válida desde el Pod.</string>
     <string name="omnipod_driver_error_message_decoding_failed">La comunicación ha fallado: no se ha podido descodificar el mensaje del Pod.</string>
     <string name="omnipod_driver_error_nonce_resync_failed">La comunicación ha fallado: nonce resync ha fallado.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicación fallida: nonce no sincronizada.</string>
     <string name="omnipod_driver_error_not_enough_data">La comunicación ha fallado: no se han recibido suficientes datos del Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">Un error de Pod (%1$03d %2$s) se ha detectado. Por favor, desactive su Pod e inicie uno nuevo.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">La comunicación ha fallado: el Pod ha devuelto una respuesta de error.</string>
     <!-- Omnipod - Pod Mgmt -->
     <string name="omnipod_pod_mgmt_title">Administración de Pod</string>
     <string name="omnipod_cmd_init_pod">Iniciar Pod</string>
@@ -1356,22 +1359,29 @@
     <string name="omnipod_cmd_get_pod_info">Obtener información de Pod</string>
     <string name="omnipod_cmd_set_time">Establecer hora</string>
     <string name="omnipod_cmd_configure_alerts">Configurar alertas</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Confirmar Alertas</string>
     <string name="omnipod_cmd_suspend_delivery">Suspender la entrega</string>
     <string name="omnipod_cmd_resume_delivery">Reanudar la entrega</string>
     <string name="omnipod_cmd_unknown_entry">Entrada desconocida</string>
     <string name="omnipod_cmd_bolus_value">%1$.1fU</string>
     <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
     <string name="omnipod_cmd_tbr_value">Tasa: %1$.1f U, Duración: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Si pulsa <b>OK</b>, el estado de Pod se restablecerá por la fuerza y ya no podrá comunicarse con el Pod. Hágalo sólo si ya no puede comunicarse con el Pod. Si todavía puede comunicarse con el Pod, utilice la opción <b>Desactivar Pod</b>.</string>
     <string name="omnipod_cmd_pod_history_na">Historial del Pod no disponible en el momento.</string>
     <string name="omnipod_init_pod_wizard_step1_title">Llenar el Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nLlenar el nuevo Pod con suficiente insulina durante 3 días.\n\nEscucha dos pitidos del Pod durante el proceso de llenado. Esto indica que se ha insertado la cantidad mínima de 85U. Asegúrese de vaciar completamente la jeringa, incluso después de escuchar los dos pitidos.\n\nDespués de llenar el Pod, por favor pulse <b>Next</b>.\n\n<b>Nota:</b> no retire el capuchón de la aguja del Pod en este momento.</string>
     <string name="omnipod_init_pod_wizard_step2_title">Cebado</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Intentando emparejar con el nuevo Pod y primarlo.\n\nCuando todos los elementos están marcados, puedes pulsar <b>Siguiente</b>.\n\n<b>Nota:</b> por favor mantenga el Pod muy cerca del RileyLink en este momento.</string>
     <string name="omnipod_init_pod_wizard_step3_title">Adherir el Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPreparar el sitio de infusión. Retire el capuchón de la aguja del Pod y el adhesivo y aplique el Pod al sitio de perfusión.\n\nSi la cánula se queda fuera, por favor presione <b>Cancel</b> y descarte su Pod.\n\nPress <b>Next</b> para insertar la cánula y comenzar la entrega basal.</string>
     <string name="omnipod_init_pod_wizard_step4_title">Insertar cánula</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Intentando establecer la programación basal inicial e insertar la cánula.\n\nCuando todos los elementos están marcados, puede pulsar <b>Siguiente</b>.</string>
     <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
     <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nEl Pod ahora está activo.\n\nSu horario basal ha sido programado y la cánula ha sido insertada.\n\nPor favor, verifique que la cánula ha sido insertada correctamente y reemplace su Pod si usted siente que no lo ha hecho.</string>
     <string name="omnipod_remove_pod_wizard_step1_title">Desactivar Pod</string>
     <string name="omnipod_remove_pod_wizard_step1_desc">\nPulsa <b>Siguiente</b> para desactivar el Pod.\n\n<b>Nota:</b> Esto suspenderá toda la entrega insulina y desactivará el Pod.</string>
     <string name="omnipod_remove_pod_wizard_step2_title">Desactivando el Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Desactivando el Pod.\n\nCuando se comprueban todos los elementos, puede pulsar <b>Next</b>.\n\n<b>Nota:</b> Si la desactivación falla, por favor pulse <b>Cancelar</b> y utilice la opción <b>Restablecer Pod</b> para restablecer por la fuerza el estado de Pod.</string>
     <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod desactivado.\n\nPor favor, retire el Pod de su cuerpo y desecharlo.</string>
     <string name="omnipod_init_pod_pair_pod">Emparejar Pod</string>
     <string name="omnipod_init_pod_prime_pod">Llenado de cánula del Pod</string>
@@ -1389,5 +1399,10 @@
     <string name="omnipod_alert_shutdown_imminent">El apagado es inminente</string>
     <string name="omnipod_alert_low_reservoir">Reservorio bajo</string>
     <string name="omnipod_alert_unknown_alert">Alerta desconocida</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">La configuración del perfil basal podría haber fallado. ¡La entrega podría ser suspendida! Por favor, actualiza el estado de Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">La configuración de basal temporal podría haber fallado. Si ya se está ejecutando una basal temporal, ¡puede que haya sido cancelada! Por favor, actualice el estado del pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Ajuste de la hora puede ser que haya fallado. La entrega puede ser suspendido! Por favor, actualizar estado de Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">No se puede verificar si el bolo ha sido exitoso. Por favor verifique que su Pod está poniendo bolo o cancele el bolo.</string>
     <string name="omnipod_rl_stats">Estadísticas del RL</string>
+    <string name="omnipod_read_pulse_log_short">Registro de pulso</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0edbfa7414..0c700b271d 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1369,6 +1369,40 @@
     <string name="omnipod_cmd_reset_pod_desc">Als je op <b>OK</b> klikt, zal de Pod gedwongen worden gereset en kun je niet meer communiceren met de Pod. Doe dit alleen als je al niet meer met de Pod kunt communiceren. Als je nog wel kunt communiceren met de Pod, gebruik dan de optie <b>Deactiveer Pod</b>.</string>
     <string name="omnipod_cmd_pod_history_na">Pod Historie momenteel niet beschikbaar.</string>
     <string name="omnipod_init_pod_wizard_step1_title">Vul de Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nVul de nieuwe Pod met voldoende insuline voor 3 dagen.\n\nLuister of je twee piepjes hoort tijdens het vullen. Deze geven aan dat de minimum hoeveelheid van 85E is bereikt. Ook als je de twee piepjes hebt gehoord ga je verder met vullen totdat de vulspuit volledig leeg is.\n\nNa het vullen van de Pod druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> verwijder de beschermkap van de Pod naald nog niet!</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Uitvullen</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Probeer te koppelen met de nieuwe Pod en laat de Pod de naald uitvullen.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> Houd de Pod goed dicht bij de RileyLink terwijl je dit doet.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Plaats de Pod</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nBereid het plaatsen voor. Verwijder de beschermdop van de naald en haal de papiertjes van de sticker.\n\n(Mocht je zien dat de canule uitsteekt, druk dan op <b>Annuleren</b> en begin overnieuw met een andere Pod.)\n\nBevestig de Pod op de huid. Druk op <b>Volgende</b> om de canule te gaan inschieten en de insulinetoediening te laten starten.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Canule inschieten</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">De basaalstand wordt ingesteld en de canule wordt ingeschoten.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Pod Info</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nDe Pod is nu actief.\n\nJouw basaalprofiel is ingeladen in de Pod en de canule is ingebracht.\n\nControleer of de canule correct is geplaatst en vervang de Pod als je denkt dat er iets is misgegaan.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Deactiveer Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nDruk op <b>Volgende</b> om de Pod te deactiveren.\n\n<b>Opmerking:</b> Hiermee wordt de insuline toediening gestopt en wordt de Pod gedeactiveerd.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Deactiveren van de Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deactiveren van de Pod.\n\nWanneer alle onderdelen zijn afgerond, druk je op <b>Volgende</b>.\n\n<b>Opmerking:</b> Als deactiveren herhaaldelijk niet wil lukken, druk je op <b>Annuleren</b> en gebruik de optie <b>Reset Pod</b> om de Pod-status geforceerd te deactiveren.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod gedeactiveerd.\n\nVerwijder de Pod van je lichaam en gooi hem weg.</string>
+    <string name="omnipod_init_pod_pair_pod">Pod Koppelen</string>
+    <string name="omnipod_init_pod_prime_pod">Pod Uitvullen</string>
+    <string name="omnipod_init_pod_fill_cannula">Canule vullen</string>
+    <string name="omnipod_init_pod_set_basal_profile">Instellen Basaal Profiel</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Annuleer toediening</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Deactiveer Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Pomp integratie voor Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Herinnering koppeling afronden</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Herinnering setup afronden</string>
+    <string name="omnipod_alert_expiration">Pod verloopt binnenkort</string>
+    <string name="omnipod_alert_expiration_advisory">Pod verloopt binnenkort</string>
+    <string name="omnipod_alert_shutdown_imminent">Schakelt zeer binnenkort uit</string>
+    <string name="omnipod_alert_low_reservoir">Laag reservoir</string>
+    <string name="omnipod_alert_unknown_alert">Onbekend alarm</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Het instellen van basaal profiel is mogelijk mislukt. De toediening is misschien gestopt! Vernieuw de status van Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Het instellen van tijdelijk basaal is mogelijk mislukt. Als er al een tijdelijk basaal actief was, is dat misschien geannuleerd! Vernieuw de status van de Pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Het instellen van de tijd is mogelijk mislukt. De toediening is misschien gestopt! Vernieuw de status van Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer of de Pod de bolus aan het toedienen is of annuleer de bolus.</string>
+    <string name="omnipod_rl_stats">RL Statistieken</string>
+    <string name="omnipod_read_pulse_log_short">Pulsen Log</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 3a0d584d40..211f12e032 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
     <string name="omnipod_rl_stats">Estatísticas RL</string>
     <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
+    <string name="comapareprofile">Comparar com o perfil atual</string>
+    <string name="nav_profilehelper">Assistente de Perfil</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/exam.xml b/app/src/main/res/values-ro-rRO/exam.xml
index c5d07b7e4b..be73b91f50 100644
--- a/app/src/main/res/values-ro-rRO/exam.xml
+++ b/app/src/main/res/values-ro-rRO/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Care afirmații despre DIA sunt adevărate?</string>
+    <string name="dia_label_exam">Subiect: Durata de acțiune a insulinei</string>
     <string name="dia_minimumis3h">Valoarea minimă este de 3 ore.</string>
     <string name="dia_minimumis5h">Valoarea minimă este de 5 ore.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -19,28 +20,149 @@
     <string name="pumpdisconnect_whattodo">Ce trebuie să faceți atunci când deconectați pompa?</string>
     <string name="pumpdisconnect_letknow">Apăsați ‘Deconectează pompa’ astfel încât AAPS să știe că nu se va putea livra insulină.</string>
     <string name="pumpdisconnect_suspend">Apăsați ‘Suspendă bucla’ astfel încât AAPS să dezactiveze bucla atâta timp cât pompa este deconectată.</string>
+    <string name="pumpdisconnect_dontchnage">Nu modificați nimic în AAPS, doar deconectați pompa.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
     <string name="objectives_label">Subiect: Setări AndroidAPS</string>
     <string name="objectives_howtosave">Care sunt cele mai bune metode de a păstra o copie de siguranță a setărilor AndroidAPS?</string>
     <string name="objectives_exportsettings">Export pe un mediu de stocare local folosind meniul Mentenanță.</string>
     <string name="objectives_storeelsewhere">Stocarea fișierului exportat într-un alt loc, precum email, Dropbox, Google drive…</string>
     <string name="objectives_doexportonstart">Exportarea imedia după instalarea AAPS.</string>
+    <string name="objectives_doexportafterchange">Exportați-le după ce modificați setările.</string>
+    <string name="objectives_doexportafterobjective">Exportaţi-le după finalizarea unui obiectiv.</string>
     <string name="objectives_doexportafterfirtssettings">Exportarea atunci când ați terminat setarea inițială.</string>
     <string name="objectives_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html</string>
     <string name="objectives_hint2">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me</string>
     <string name="noisycgm_label">Subiect: Citiri zgomotoase ale glicemiei</string>
+    <string name="noisycgm_whattodo">Ce ar trebui făcut dacă valorile CGM sunt nesigure?</string>
+    <string name="nothing">Nimic, AAPS se va descurca.</string>
+    <string name="noisycgm_pause">Dezactivați bucla închisă pentru a evita supra-dozarea.</string>
     <string name="noisycgm_replacesensor">Se va înlocui senzorul CGM.</string>
     <string name="noisycgm_turnoffphone">Se va opri telefonul.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
+    <string name="noisycgm_checksmoothing">Verificați dacă aplicația de senzor normalizează valorile glicemiei.</string>
     <string name="exercise_label">Subiect: Exerciții fizice</string>
     <string name="exercise_whattodo">Cum puteți ajuta sistemul să facă față exercițiilor fizice?</string>
+    <string name="exercise_setactivitytt">Folosirea funcționalității de țintă temporară.</string>
     <string name="exercise_switchprofilebelow100">Se va face un schimb de profil de sub 100%.</string>
     <string name="exercise_switchprofileabove100">Se va face o schimbare de profil de peste 100%.</string>
     <string name="exercise_stoploop">Se va opri bucla.</string>
+    <string name="exercise_doitbeforestart">Setați o valoare-țintă temporară de activitate înainte de a începe exercițiul fizic.</string>
+    <string name="exercise_afterstart">Setarea unei valori-țintă temporare pentru activitate după ce exercițiul fizic a început generează rezultate mai proaste decât dacă ar fi fost setată înainte.</string>
     <string name="exercise_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
+    <string name="suspendloop_label">Subiect: Dezactivarea/Suspendarea buclei închise</string>
+    <string name="suspendloop_doigetinsulin">Primesc insulina atunci când bucla închisă este dezactivata/suspendata?</string>
+    <string name="suspendloop_yes">Da, insulina bazală este livrată în continuare.</string>
     <string name="suspendloop_no">Nu, livrarea de insulină este oprită.</string>
     <string name="basaltest_label">Subiect: Bazală, ISF și testare IC</string>
     <string name="basaltest_when">Când ar trebui să validez bazalele, ISF și valorile IC?</string>
     <string name="basaltest_beforeloop">Înainte de pornirea buclei.</string>
+    <string name="basaltest_havingregularhypo">Atunci când hipoglicemiile apar frecvent.</string>
+    <string name="basaltest_havingregularhyper">Atunci când hiperglicemiile apar frecvent.</string>
     <string name="basaltest_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings</string>
+    <string name="prerequisites_label">Subiect: Cerințe preliminare</string>
+    <string name="prerequisites_what">Ce am nevoie?</string>
+    <string name="prerequisites_determinedcorrectprofile">Profil validat (ratele bazale, IC, ISF, DIA).</string>
+    <string name="prerequisites_computer">Un calculator pentru a crea APK-ul.</string>
+    <string name="prerequisites_phone">Un telefon compatibil.</string>
+    <string name="prerequisites_car">O mașină.</string>
+    <string name="prerequisites_nightscout">Nightscout pentru a finaliza obiectivele.</string>
+    <string name="prerequisites_tidepoolaccount">Un cont Tidepool.</string>
+    <string name="prerequisites_googleaccount">Un cont de Google.</string>
+    <string name="prerequisites_githubaccount">Un cont de Github.</string>
+    <string name="prerequisites_beanandroiddeveloper">Experiență în dezvoltarea Android.</string>
+    <string name="prerequisites_own670g">O pompă MiniMed 670G.</string>
+    <string name="prerequisites_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
+    <string name="prerequisites_smartwatch">Un ceas inteligent.</string>
+    <string name="prerequisites_supportedcgm">Un sistem de senzori CGM compatibil.</string>
+    <string name="update_label">Subiect: Actualizarea AndroidAPS</string>
+    <string name="whatistrue">Ce este adevărat?</string>
+    <string name="update_git">Aveți nevoie de Git instalat.</string>
+    <string name="update_asap">Actualizați când o versiune noua este lansată și aveți timp să o instalați.</string>
+    <string name="update_keys">Ar trebui sa folosiți aceleași chei de semnare.</string>
+    <string name="update_neverupdate">Nu actualizați niciodată dacă sistemul funcționează corect.</string>
+    <string name="update_askfriend">Cereți unui prieten noul APK.</string>
+    <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
+    <string name="troubleshooting_label">Subiect: Rezolvarea Problemelor</string>
+    <string name="troubleshooting_wheretoask">Unde căutați ajutor?</string>
+    <string name="troubleshooting_fb">Alăturaţi-vă grupului de Facebook AndroidAPS.</string>
+    <string name="troubleshooting_wiki">Citiți documentația AndroidAPS.</string>
+    <string name="troubleshooting_gitter">Vizitați canalul AndroidAPS pe Gitter.</string>
+    <string name="troubleshooting_googlesupport">Vizitați AndroidAPS Google support</string>
+    <string name="troubleshooting_yourendo">Vă consultați cu diabetologul.</string>
+    <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
+    <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
+    <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
+    <string name="insulin_label">Subiect: Plugin-uri pentru Insulină</string>
+    <string name="insulin_ultrarapid">Ce brand de insulină poate fi folosit cu plugin-ul ‘Ultra-Rapid-Oref’?</string>
+    <string name="insulin_fiasp">Fiasp®</string>
+    <string name="insulin_novorapid">NovoRapid®</string>
+    <string name="insulin_humalog">Humalog®</string>
+    <string name="insulin_actrapid">Actrapid®</string>
+    <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
+    <string name="sensitivity_label">Subiect: Plugin-uri pentru sensibilitate</string>
+    <string name="sensitivity_which">Ce algoritm de sensibilitate are un interval de timp configurabil?</string>
+    <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
+    <string name="sensitivityuam_which">Ce plugin de sensibilitate trebuie folosit pentru funcționalitatea UAM?</string>
+    <string name="wrongcarbs_label">Subiect: Erori la introducerea carbohidraților</string>
+    <string name="wrongcarbs_whattodo">Ce ar trebui sa faceți dacă ați introdus o cantitate de carbohidrați greșită?</string>
+    <string name="wrongcarbs_treatmentstab">În secțiunea Tratamente, ștergeți intrarea greșită. Introduceți din nou cantitatea de carbohidrați.</string>
+    <string name="wrongcarbs_addfakeinsulin">Adăugați unități false de insulina folosind funcția de Reîncărcare</string>
+    <string name="extendedcarbs_label">Subiect: Alimente cu Lipide și Proteine</string>
+    <string name="extendedcarbs_handling">Cum procedați atunci când mâncarea conține o cantitate mare de lipide și\/sau proteine?</string>
+    <string name="extendedcarbs_useextendedcarbs">Convertiți lipidele și proteinele în carbohidrați și folosiți funcționalitatea de \"Carbohidrați extinși\".</string>
+    <string name="extendedcarbs_add">Convertiți lipidele și proteinele în carbohidrați și adăugați-i la calcularea bolusului.</string>
+    <string name="extendedcarbs_useextendedbolus">Folosiți bolusul extins pentru a acoperi lipidele și proteinele.</string>
+    <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
+    <string name="nsclient_label">Subiect: Monitorizarea la distanţă</string>
+    <string name="nsclient_howcanyou">Cum puteți monitoriza AAPS-ul copilului dumneavoastră de la distanță?</string>
+    <string name="nsclient_nightscout">Folosind un site Nightscout.</string>
+    <string name="nsclient_dexcomfollow">Aplicația Dexcom Flollow dacă folosiți aplicația Dexcom originală (doar valorile glicemiei).</string>
+    <string name="nsclient_dexcomfollowxdrip">Dexcom Follow dacă folosiți aplicația xDrip.</string>
+    <string name="nsclient_xdripfollower">Aplicația xDrip în modul \"follower\".</string>
+    <string name="nsclient_looponiphone">Aplicația Loop pe iPhone.</string>
+    <string name="nsclient_spikeiphone">Aplicația Spike pe iPhone.</string>
+    <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Subiect: Factorul de Sensibilitate la Insulină (ISF)</string>
+    <string name="isf_increasingvalue">Valorile ISF mai mari determina livrarea unor cantități mai mici de insulina atunci când AAPS corectează hiperglicemiile.</string>
+    <string name="isf_decreasingvalue">Valorile ISF mai mici determina livrarea unor cantități mai mici de insulina atunci când AAPS corectează hiperglicemiile.</string>
+    <string name="isf_noeffect">Modificările ISF nu au nicio influență asupra cantităților de insulina livrate atunci când AAPS corectează hiperglicemiile.</string>
+    <string name="isf_preferences">Trebuie sa setați ISF in Preferințe.</string>
+    <string name="isf_profile">Schimbarea valorii ISF în profil este suficientă pentru a produce efecte.</string>
+    <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
+    <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Subiect: Rația insulină-carbohidrați (IC)</string>
+    <string name="ic_increasingvalue">Valorile IC mai mari determină o cantitate mai mică de insulină livrată pentru o cantitate dată de carbohidrați.</string>
+    <string name="ic_decreasingvalue">Valorile IC mai mici determină o cantitate mai mică de insulină livrată pentru o cantitate dată de carbohidrați.</string>
+    <string name="ic_noeffect">Dacă aveți 0 CoB (carbohidrați activi), schimbarea IC va determina modificarea cantității de insulină livrată pentru a corecta glicemia.</string>
+    <string name="ic_different">Valoarea IC va fi diferita dacă considerați 1BE (unitate de pâine) ca 10g sau 12g glucide.</string>
+    <string name="ic_meaning">IC înseamnă: Câte unități de pâine sunt acoperite de 1 unitate de insulină.</string>
+    <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>
+    <string name="profileswitch_label">Subiect: Schimbarea de profil</string>
+    <string name="profileswitch_pctwillchange"> Atunci când se specifică 90% la schimbarea de profil…</string>
+    <string name="profileswitch_basalhigher">Ratele bazale vor fi cu 10% mai mari.</string>
+    <string name="profileswitch_basallower">Ratele bazale vor fi cu 10% mai mici.</string>
+    <string name="profileswitch_ichigher">Valoarea IC va fi cu 10% mai mare.</string>
+    <string name="profileswitch_iclower">Valoarea IC va fi cu 10% mai mica.</string>
+    <string name="profileswitch_isfhigher">Valoarea ISF va fi cu 10% mai mare.</string>
+    <string name="profileswitch_isflower">Valoarea ISF va fi cu 10% mai mică.</string>
+    <string name="profileswitch_overall">Veți primi în total cam cu 10% mai puțină insulină.</string>
+    <string name="profileswitch_targethigher">Intervalul-ţintă va fi cu 10% mai mare.</string>
+    <string name="profileswitch_targetlower">Intervalul-ţintă va fi cu 10% mai mic.</string>
+    <string name="profileswitch_targetbottom">Doar valoarea-ţintă inferioară va fi cu 10% mai mică.</string>
+    <string name="profileswitch_hint1" formatted="false">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch</string>
+    <string name="profileswitchtime_iwant">Dacă va treziți cu o ora mai devreme decât de obicei, cum veți anunța AAPS de schimbarea din programul dumneavoastră?</string>
+    <string name="profileswitchtime_1">Inițiați o schimbare de profil cu decalaj de timp de 1</string>
+    <string name="profileswitchtime__1">Inițiați o schimbare de profil cu decalaj de timp de -1</string>
+    <string name="profileswitchtime_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift</string>
+    <string name="profileswitchtime_60">Inițiați o schimbare de profil cu decalaj de timp de 60</string>
+    <string name="profileswitchtime__60">Inițiați o schimbare de profil cu decalaj de timp de -60</string>
+    <string name="basalhelp_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy</string>
+    <string name="basalhelp_label">Subiect: Ajutor pentru ratele bazale</string>
+    <string name="basalhelp_where">Unde căutați ajutor pentru a seta ratele bazale etc.</string>
+    <string name="basalhelp_diabetesteam">Medicul dumneavoastră diabetolog</string>
+    <string name="basalhelp_google">Google</string>
+    <string name="basalhelp_facebook">Facebook</string>
+    <string name="other_medication_label">Alte tratamente</string>
+    <string name="other_medication_text">AAPS reduce ratele bazale pentru a crește glicemia. Medicamentele din grupa inhibitorilor SGLT2 (gliflozins) pot împiedica această creștere a glicemiei si, prin urmare, pot mări riscul de cetoacidoza diabetica (DKA).
+\nBranduri comune sunt: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nDeclar pe propria răspundere că nu voi lua asemenea medicamente cât folosesc AAPS sau că voi dezactiva bucla închisă înainte de le folosi.</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/objectives.xml b/app/src/main/res/values-ro-rRO/objectives.xml
index cdf5312139..80b2837283 100644
--- a/app/src/main/res/values-ro-rRO/objectives.xml
+++ b/app/src/main/res/values-ro-rRO/objectives.xml
@@ -20,7 +20,9 @@
     <string name="objectives_autosens_gate">O săptămână de buclă închisă încheiată cu succes în condițiile introducerii regulate a carbohidraților</string>
     <string name="objectives_ama_objective">Activarea unor facilități adiționale pentru funcționarea în timpul zilei, cum ar fi advanced meal assist</string>
     <string name="objectives_smb_objective">Se activează opțiuni pentru uzul în timpul zilei, cum ar fi SMB</string>
+    <string name="objectives_auto_objective">Activarea automatizării</string>
     <string name="objectives_smb_gate">Trebuie sa citiți wiki și să măriți maxIOB pentru a obține SMB corect! Un start bun este maxIOB=media bolusurilor + 3x maxima bazalei din zi</string>
+    <string name="objectives_auto_gate">Citiți documentația despre cum funcționează automatizarea. Setați primele reguli simple. În loc de a acționa, lăsați AAPS doar să afișeze notificări. Când sunteți siguri ca automatizarea acționează la momentul potrivit, înlocuiți notificările cu acțiuni reale.(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html)</string>
     <string name="objectives_bgavailableinns">Glicemie disponibilă în NS</string>
     <string name="objectives_pumpstatusavailableinns">Starea pompei disponibilă în NS</string>
     <string name="objectives_manualenacts">Acțiuni manuale</string>
@@ -35,10 +37,12 @@
     <string name="objectives_useloop">Afișați conținutul facilității Buclă</string>
     <string name="objectives_usescale">Folosiți funcția scală prin apăsarea prelungă a graficului glicemiei</string>
     <string name="objectives_button_enter">Introduceţi</string>
+    <string name="enter_code_obtained_from_developers_to_bypass_the_rest_of_objectives">Dacă aveți cel puțin 3 luni de experiență cu un sistem în bucla închisă, puteți beneficia de un cod pentru a sări peste obiective. Pentru mai multe detalii vezi: https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives.</string>
     <string name="codeaccepted">Cod acceptat</string>
     <string name="codeinvalid">Cod invalid</string>
     <string name="objectives_exam_objective">Dovediți-vă cunoștințele</string>
     <string name="objectives_exam_gate">Studiați și răspundeți corect la întrebări</string>
+    <string name="answerdisabledto">Posibilitatea de a răspunde este dezactivată până la: %1$s</string>
     <string name="wronganswer">Răspuns greșit!</string>
     <string name="unfinshed_button">Următoarea nefinalizată</string>
     <string name="requestcode">Solicită codul: %1$s</string>
diff --git a/app/src/main/res/values-ro-rRO/protection.xml b/app/src/main/res/values-ro-rRO/protection.xml
index 3ea04e700d..03b44e5135 100644
--- a/app/src/main/res/values-ro-rRO/protection.xml
+++ b/app/src/main/res/values-ro-rRO/protection.xml
@@ -1,2 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="biometric_title">Autentificarea este obligatorie</string>
+    <string name="biometric_description">Puneți degetul pe cititorul de amprente pentru a verifica identitatea</string>
+    <string name="settings_protection">Protecţie setări</string>
+    <string name="application_protection">Protecție aplicație</string>
+    <string name="bolus_protection">Protecție bolus</string>
+    <string name="master_password">Parola principală</string>
+    <string name="settings_password">Parolă setări</string>
+    <string name="application_password">Parolă aplicație</string>
+    <string name="bolus_password">Parolă bolus</string>
+    <string name="unlock_settings">Deblochează setările</string>
+    <string name="biometric">Biometric</string>
+    <string name="custom_password">Parolă personalizată</string>
+    <string name="noprotection">Fără protecţie</string>
+    <string name="protection">Protecţie</string>
+    <string name="master_password_missing">Parola principală nu este setată!\n\nVă rugăm să vă setaţi parola principală în Preferinţe (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Trecere la modul nesecurizat biometric</string>
+    <string name="unsecure_fallback_descriotion_biometric">Pentru a fi eficientă, protecţia biometrică are nevoie de o parolă principală pentru regresie.\n\nVă rugăm să setaţi o parolă principală!</string>
+    <string name="password_set">Parola a fost setată!</string>
+    <string name="password_not_set">Parola nu a fost setată</string>
+    <string name="password_not_changed">Parola nu a fost modificată</string>
+    <string name="password_cleared">Parolă ștearsă!</string>
+    <string name="password_hint">Introduceți parola aici</string>
+</resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index b5bde6ce86..268988058d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -36,6 +36,7 @@
     <string name="description_pump_mdi">Integrare cu pompă virtuală, pentru persoanele ce folosesc terapia cu pen</string>
     <string name="description_pump_virtual">Integrare cu pompele ce nu au încă un driver software disponibil (Buclă Deschisă)</string>
     <string name="description_sensitivity_aaps">Sensibilitatea este calculată la fel ca în algoritmul Oref0, dar se poate specifica un interval de timp în trecut. Absorbția minimă de carbohidrați este calculată din parametrul echivalent, stabilit în preferințe.</string>
+    <string name="description_sensitivity_oref1">Sensibilitatea este calculată folosind datele din ultimele 8 sau 24 ore (se alege cea mai mare din ele), iar carbohidrații (când nu sunt absorbiți) sunt ignorați după timpul specificat în preferințe. Plugin-ul calculează și UAM.</string>
     <string name="description_sensitivity_weighted_average">Sensibilitatea este calculată ca o medie ponderată a deviațiilor. Deviațiile noi au o importanță mai mare. Absorbția minimă de carbohidrați este calculată în funcție de parametrul absorbție maximă de carbohidrați, stabilit în preferințe. Acest algoritm este cel mai rapid atunci când sensibilitatea la insulină este fluctuantă.</string>
     <string name="description_source_eversense">Primește valorile glicemiei din aplicația Eversense modificată.</string>
     <string name="description_source_glimp">Primește valorile glicemiei din aplicația Glimp.</string>
@@ -73,6 +74,7 @@
     <string name="openapsma_profile_label">Profil</string>
     <string name="openapsma_mealdata_label">Date despre masă</string>
     <string name="result">Rezultat</string>
+    <string name="result_insulin_carbs">Rezultat: %1$s %2$s</string>
     <string name="openapsma_noglucosedata">Nu există date despre glicemie</string>
     <string name="openapsma_request_label">Solicită</string>
     <string name="glucose">Glicemie</string>
@@ -109,6 +111,7 @@
     <string name="openapsma_disabled">Modul inactiv</string>
     <string name="constraints_violation">Încălcare a unei limite</string>
     <string name="treatmentdeliveryerror">Eroare la livrarea bolusului</string>
+    <string name="overview_newtempbasal_basalpercent">Valoare bazală [%]</string>
     <string name="setbasalquestion">Acceptă noua bazală temporară:</string>
     <string name="overview_treatment_label">Tratament</string>
     <string name="overview_calculator_label">Calculator</string>
@@ -123,10 +126,12 @@
     <string name="apsmode_title">Mod APS</string>
     <string name="closedloop">Buclă închisă</string>
     <string name="openloop">Buclă deschisă</string>
+    <string name="lowglucosesuspend">Suspendare la hipoglicemie</string>
     <string name="disabledloop">Buclă inactivă</string>
     <string name="disableloop">Dezactivează bucla</string>
     <string name="enableloop">Activează bucla</string>
     <string name="openloop_newsuggestion">O nouă sugestie este disponibilă</string>
+    <string name="carbssuggestion">Sugestie carbohidrați</string>
     <string name="unsupportednsversion">Versiune incompatibilă de Nightscout</string>
     <string name="loopdisabled">BUCLĂ DEZACTIVATĂ DATORITĂ CONSTRÂNGERILOR</string>
     <string name="treatments_wizard_basaliob_label">IOB bazală</string>
@@ -143,6 +148,7 @@
     <string name="careportal_newnstreatment_percent_label">Procent</string>
     <string name="careportal_newnstreatment_absolute_label">Absolut</string>
     <string name="careportal_newnstreatment_notes_label">Note</string>
+    <string name="event_time_label">Ora evenimentului</string>
     <string name="careportal_newnstreatment_profile_label">Profil</string>
     <string name="careportal_newnstreatment_enteredby_title">Introdus de</string>
     <string name="careportal_newnstreatment_glucosetype">Tip glicemie</string>
@@ -158,9 +164,48 @@
     <string name="filenotfound">Nu am găsit fișierul</string>
     <string name="nav_export">Exportă setările</string>
     <string name="nav_import">Importă setările</string>
+    <string name="openapsma_maxbasal_title">Valoarea maximă în U/ora a unei rate bazale temporare poate fi setată la</string>
     <string name="openapsma_maxbasal_summary">Această valoare este denumită bazală maximă în contextul OpenAPS</string>
     <string name="openapsma_maxiob_title">Maximul de bazală IOB pe care o poate livra OpenAPS[U]</string>
     <string name="openapsma_maxiob_summary">Această valoare este denumită Max IOB în contextul OpenAPS\nAceastă valoare este implicit nulă (0). După câteva zile sau săptămâni, în funcție de opțiunea dumneavoastră, puteți ajusta acest număr.</string>
+    <string name="password_preferences_encrypt_prompt">Vi se va solicita parola principală, care va fi utilizată pentru criptare la exportarea setărilor.</string>
+    <string name="password_preferences_decrypt_prompt">Vi se va solicita parola principală, care este necesară pentru a decripta setările importate.</string>
+    <string name="preferences_export_canceled">Exportarea a eșuat! Preferințele NU au fost exportate!</string>
+    <string name="preferences_import_canceled">Importarea a eșuat! Preferințele NU au fost importate!</string>
+    <string name="preferences_import_list_title">Selectați fișierul pentru import</string>
+    <string name="check_preferences_before_import">Verificați preferințele înainte de a le importa:</string>
+    <string name="check_preferences_cannot_import">Preferințele nu pot fi importate!</string>
+    <string name="check_preferences_dangerous_import">Preferințele nu ar trebui importate!</string>
+    <string name="check_preferences_details_btn">Explicații problemele de import…</string>
+    <string name="check_preferences_details_title">Detalii probleme de import</string>
+    <string name="check_preferences_import_btn">Importă</string>
+    <string name="check_preferences_import_anyway_btn">Importă oricum (PERICOL!)</string>
+    <string name="metadata_warning_different_flavour">Preferințele au fost create folosind o alta versiune de AAPS (%1$s) în timp ce versiunea curentă este: %2$s.\n\nCâteva setări pot lipsi sau pot fi invalide - după import verificați și actualizați preferințele.</string>
+    <string name="metadata_warning_different_device">Preferințele au fost create pe un dispozitiv diferit. Este în regulă să le importați de pe un alt telefon, dar asigurați-vă că sunt corecte!</string>
+    <string name="metadata_warning_outdated_format">Folosiți un format neactualizat dintr-o versiune veche de AAPS care nu este securizat! Folosiți acest format în ultima instanța, doar dacă nu aveți un export în formatul curent de JSON.</string>
+    <string name="metadata_warning_old_export">Preferințele importate sunt vechi de %1$s zile deja! Poate aveți preferințe mai recente sau ați ales un fișier greșit? Amintiți-vă să exportați preferințele în mod regulat!</string>
+    <string name="metadata_warning_date_format">Format dată invalid!</string>
+    <string name="metadata_warning_different_version">Preferințe dintr-o versiune minoră diferită a aplicației. Este OK dacă importați după upgrade, dar verificați după import că preferințele sunt corecte!</string>
+    <string name="metadata_label_format">Formatul fișierului</string>
+    <string name="metadata_label_created_at">Creat la</string>
+    <string name="metadata_label_aaps_version">Versiune AAPS</string>
+    <string name="metadata_label_aaps_flavour">Versiune de build</string>
+    <string name="metadata_label_device_name">Exporta numele dispozitivului pacientului</string>
+    <string name="metadata_label_device_model">Exportarea modelului dispozitivului</string>
+    <string name="metadata_label_encryption">Criptarea fișierului</string>
+    <string name="metadata_format_old">Format vechi de export</string>
+    <string name="metadata_format_new">Format nou criptat</string>
+    <string name="metadata_format_debug">Format nou pentru debug (necriptat)</string>
+    <string name="metadata_format_other">Format de export necunoscut</string>
+    <string name="prefdecrypt_settings_tampered">Fişier de setări modificat</string>
+    <string name="prefdecrypt_settings_secure">Fișierul de setări este securizat</string>
+    <string name="prefdecrypt_settings_unencrypted">Folosirea formatului nesecurizat, necriptat pentru setări</string>
+    <string name="prefdecrypt_wrong_json">Eroare format JSON, lipsește un câmp necesar (format, conținut, metadate sau securitate)</string>
+    <string name="prefdecrypt_wrong_password">Eroare la decriptare, parola dată nu poate decripta fişierul</string>
+    <string name="prefdecrypt_issue_missing_file_hash">Suma de control a fişierului (hash) lipseşte, nu se poate verifica autenticitatea setărilor!</string>
+    <string name="prefdecrypt_issue_modified">Fişierul a fost modificat după export!</string>
+    <string name="prefdecrypt_issue_parsing">Eroare la decriptare, parsarea preferinţelor a eşuat!</string>
+    <string name="prefdecrypt_issue_wrong_pass">Eroare la decriptare, parola furnizată este invalidă sau fişierul de setări a fost modificat! Se poate întâmpla ca fişierul importat să fi fost exportat cu o parolă master diferită.</string>
     <string name="end_user_license_agreement">Licență utilizator final</string>
     <string name="end_user_license_agreement_text">NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
     <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
@@ -188,6 +233,8 @@
     <string name="smscommunicator_loopisenabled">Bucla este activată</string>
     <string name="valuelimitedto">%1$.2f este limitată la %2$.2f</string>
     <string name="valueoutofrange">Valoarea %1$s este mai mare decât limita stabilită</string>
+    <string name="smscommunicator_pumpdisconnected">Pompă deconectată</string>
+    <string name="smscommunicator_reconnect">Pompă reconectată</string>
     <string name="smscommunicator_remotecommandnotallowed">Comanda de la distanță nu este permisă</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus de la distanță nu este disponibil. Încearcă din nou mai târziu.</string>
     <string name="smscommunicator_basalreplywithcode">Pentru a iniția bazala de %1$.2fU/h pentru %2$d min trimiteți codul %3$s</string>
@@ -322,6 +369,7 @@
     <string name="adult">Adult</string>
     <string name="resistantadult">Adult rezistent la insulină</string>
     <string name="patientage_summary">Vă rog să selectați vârsta pacientului în vederea stabilirii valorilor maxime admise de siguranță</string>
+    <string name="patient_name">Numele pacientului</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s necesită excluderea din lista de optimizare a bateriei pentru o funcționare corespunzătoare</string>
     <string name="loopsuspended">Buclă suspendată</string>
@@ -891,6 +939,8 @@
     <string name="longitude_short">Long:</string>
     <string name="distance_short">Dist [m]:</string>
     <string name="name_short">Nume:</string>
+    <string name="locationis">%1$s %2$s</string>
+    <string name="location_mode">Când </string>
     <string name="lastboluslabel">Ultimul bolus</string>
     <string name="lastboluscompared">Ultimul bolus acum %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
@@ -1051,15 +1101,33 @@
     <string name="format_percent">%1$d%%</string>
     <string name="boluswizard">Asistent bolusare</string>
     <string name="unit_minute_short">min</string>
+    <string name="unitsnosemicolon">Unități</string>
     <string name="format_carbs">%1$dg</string>
+    <string name="common_on">Pornit</string>
+    <string name="common_off">Oprit</string>
+    <string name="deletecurrentprofile">Ştergeţi profilul curent?</string>
+    <string name="age">Vârstă:</string>
+    <string name="weight_label">Greutate:</string>
+    <string name="randombg_short">Glicemie</string>
+    <string name="tools">Instrumente</string>
     <!-- SMS Communicator & OTP Authenticator -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_reservoir_left">%1$.2f U rămase</string>
+    <string name="omnipod_reservoir_over50">Peste 50 U</string>
     <!-- Omnipod - Dialogs -->
     <!-- Omnipod - Error -->
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_cmd_init_pod">Inițializare Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Dezactivare Pod</string>
+    <string name="omnipod_cmd_reset_pod">Resetare Pod</string>
+    <string name="omnipod_cmd_pod_history">Istoric Pod</string>
+    <string name="omnipod_cmd_configure_alerts">Configurare alerte</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Confirmare alerte</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Amorsare</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 28018d79d5..b039d62802 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1406,4 +1406,6 @@ Eversense-appen.</string>
     <string name="omnipod_bolus_failed_uncertain">Det går inte att verifiera om bolusen är slutförd. Verifiera att din pod leverarar bolus eller avsluta bolus.</string>
     <string name="omnipod_rl_stats">RL-statistik</string>
     <string name="omnipod_read_pulse_log_short">Pulslogg</string>
+    <string name="comapareprofile">Jämför med aktuell profil</string>
+    <string name="nav_profilehelper">Profilguide</string>
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 6132405070..1dc39354e4 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -122,7 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dмин</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Бол: <b>%3$.2f</b> Баз: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ</b> Въгл: <b>%5$.0fгр</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка на КЗ</string>
     <string name="careportal_announcement">Известие</string>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index d8122c11bc..df2937d30b 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$d minut</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámení</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 0593ac980e..98874eda3d 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -122,7 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d Min.</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> KH: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BZ-Test</string>
     <string name="careportal_announcement">Ankündigung</string>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 3dd51612dd..84c0484cdc 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -61,6 +61,7 @@
     <string name="mmol">mmol/l</string>
     <string name="advancedsettings_title">Ajustes avanzados</string>
     <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">Vigilante de BT</string>
     <string name="btwatchdog_summary">Apaga el bluetooth del móvil por un segundo si no hay conexión con la bomba. Esto ayuda con algunos móviles con problemas para establecer conexión bluetooth estable.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limitando max basal rate a %1$.2f U/h debido a %2$s</string>
@@ -121,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Medir glucosa</string>
     <string name="careportal_announcement">Aviso</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index bfb493cf0c..3f526625f6 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Contrôle Glycémie</string>
     <string name="careportal_announcement">Notification</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index a46eb174d0..6c6a2fa917 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Controllo BG</string>
     <string name="careportal_announcement">Avviso</string>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index 4417df2d7a..543eb2f728 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -122,7 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bolusas: <b>%3$.2f</b> Bazė: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU</b> AV: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">KG testas</string>
     <string name="careportal_announcement">Pranešimas</string>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index e8243c3709..ad245b7265 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Controle</string>
     <string name="careportal_announcement">Mededeling</string>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index c0d40219a0..7693dc81f4 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -69,7 +69,6 @@
     <string name="zerovalueinprofile">Nieprawidłowy profil: %1$s</string>
     <!--    Temptarget-->
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Sprawdź BG</string>
     <string name="careportal_announcement">Powiadomienie</string>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 1f6b4fbd66..6695a167f1 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -122,7 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Hidratos: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Verificar Glic</string>
     <string name="careportal_announcement">Anúncio</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index accb96c26b..aa06e80fd8 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -1,21 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--    General-->
+    <string name="error">Eroare</string>
+    <string name="connecting">Se conectează</string>
+    <string name="connected">Conectat</string>
+    <string name="disconnected">Deconectat</string>
+    <string name="disconnecting">Se deconectează</string>
+    <string name="formatinsulinunits">%1$.2fU</string>
+    <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="close">Închide</string>
+    <string name="please_wait">Așteptați…</string>
+    <string name="reload">Reîncărcare</string>
+    <string name="stop">Stop</string>
+    <string name="basal_label">Bazală</string>
+    <string name="target_label">Țintă</string>
+    <string name="initializing">Inițializare...</string>
+    <string name="serialnumber">Număr serial</string>
+    <string name="battery_label">Baterie</string>
+    <string name="lastconnection_label">Ultima conexiune</string>
+    <string name="lastbolus_label">Ultimul bolus</string>
     <!--    Constraints-->
     <!--    Dialogs-->
+    <string name="confirmation">Confirmare</string>
+    <string name="message">Mesaj</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Renunță</string>
     <!--    BlePreCheck-->
     <!--    DateUtil-->
+    <string name="days">zile</string>
+    <string name="hours">ore</string>
+    <string name="unit_second">secundă</string>
+    <string name="unit_minute">minut</string>
+    <string name="unit_hour">oră</string>
+    <string name="unit_day">zi</string>
+    <string name="unit_week">săptămână</string>
+    <string name="unit_seconds">secunde</string>
+    <string name="unit_minutes">minute</string>
+    <string name="unit_hours">ore</string>
+    <string name="unit_days">zile</string>
+    <string name="unit_weeks">săptămâni</string>
+    <string name="shortminute">min</string>
+    <string name="shortday">z</string>
     <!--    Profile-->
+    <string name="profile_per_unit">/U</string>
+    <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <!--    PumpType-->
     <!--    APSResult-->
+    <string name="duration">Durată</string>
+    <string name="reason">Motiv</string>
     <!--    ProfileSwitch-->
     <!--    Temptarget-->
     <!--    TDD-->
     <!--    Translator-->
+    <string name="careportal_announcement">Anunț</string>
+    <string name="careportal_note">Notă</string>
+    <string name="careportal_question">Întrebare</string>
+    <string name="careportal_exercise">Activitate fizică</string>
+    <string name="careportal_pumpsitechange">Schimbare loc pompă</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
+    <string name="basalrate">Bazală</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="weight">Greutate</string>
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 6c90fe8921..6e3bcb1b92 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$d мин</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2f</b>Бол:<b>%3$.2f</b>Баз:<b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка ГК</string>
     <string name="careportal_announcement">Оовещение</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 8c2e5f87d7..6d94bd4433 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -122,7 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Baz: <b>%4$.2f</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámenie</string>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 869e6caf83..28f5c83b0a 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -122,7 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d min</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2f</b> Bol: <b>%3$.2f</b> Bas: <b>%4$.2f</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> KH: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG-kontroll</string>
     <string name="careportal_announcement">Meddelande</string>
diff --git a/dana/src/main/res/values-es-rES/strings.xml b/dana/src/main/res/values-es-rES/strings.xml
index ec4d92fb33..f2c9d14b44 100644
--- a/dana/src/main/res/values-es-rES/strings.xml
+++ b/dana/src/main/res/values-es-rES/strings.xml
@@ -15,6 +15,8 @@
     <string name="boluserrorcode">Solicitado: %1$.2fU Entregado: %2$.2fU Código de error: %3$s</string>
     <string name="danar_valuenotsetproperly">Valor no establecido correctamente</string>
     <string name="danar_setbasalstep001">Ajustar paso basal a 0.01 U/h</string>
+    <string name="resetpairing">¿Restablecer información de emparejamiento?</string>
+    <string name="dana_model">%1$s\nModelo: %2$02X\nProtocol: %3$02X\nCódigo: %4$02X</string>
     <string name="processinghistory">Procesando evento</string>
     <string name="danar_enableextendedbolus">Habilitar bolos extendidos en bomba</string>
     <string name="overview_bolusprogress_delivered">Entregado</string>
@@ -22,14 +24,18 @@
     <string name="unsupportedfirmware">Firmware de la bomba no soportado</string>
     <string name="pumperror">Error de bomba</string>
     <string name="lowbattery">Batería Baja</string>
+    <string name="basalcompare">Entregar menos de la tasa basal preestablecida</string>
     <string name="pumpshutdown">Bomba apagada</string>
     <string name="batterydischarged">Batería de la bomba descargada</string>
     <string name="occlusion">Oclusión</string>
     <string name="emptyreservoir">Reservorio vacío</string>
+    <string name="checkshaft">Comprobar eje</string>
     <string name="basalmax">Basal max</string>
     <string name="dailymax">Máximo diario</string>
     <string name="bloodsugarmeasurementalert">Alerta de control de BG</string>
     <string name="remaininsulinalert">Insulina restante en reservorio</string>
+    <string name="missedbolus">Bolo perdido</string>
+    <string name="invalidpairing">Información de emparejamiento no válida. Solicitando un nuevo emparejamiento</string>
     <string name="gettingpumpstatus">Recibir estado de bomba</string>
     <string name="gettingextendedbolusstatus">Recibiendo estado de bolo extendido</string>
     <string name="gettingbolusstatus">Recibiendo estado bolo</string>
@@ -98,9 +104,19 @@
     <string name="option_on">Activado</string>
     <string name="option_off">Desactivado</string>
     <string name="danar_bt_name_title">Dispositivo Bluetooth DanaR</string>
+    <string name="danars_password_title">Bomba de contraseña (v1 solamente)</string>
     <string name="danar_password_title">Contraseña de la bomba</string>
     <string name="danar_useextended_title">Usar bolos extendidos para &gt;200%%</string>
     <string name="danar_visualizeextendedaspercentage_title">Visualizar bolo extendido como %%</string>
     <string name="bolusspeed">Velocidad bolo</string>
     <string name="selectedpump">Bomba seleccionada</string>
+    <string name="rs_loginsulinchange_title">Registrar cambios de reservorio</string>
+    <string name="rs_loginsulinchange_summary">Añadir evento \"Cambio de Insulina\" al portal de cuidados cuando se detecte en el historial</string>
+    <string name="rs_logcanulachange_title">Registro de cambio de cánula</string>
+    <string name="rs_logcanulachange_summary">Añadir evento \"Cambio de Cánula\" al portal de cuidados cuando se detecte en el historial</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Pulse Aceptar en la bomba\ny entre 2 números visualizados\nMantener la pantalla en la bomba ON pulsando el botón menos hasta que termine de introducir el código.</string>
+    <string name="num1pin">1: (12 dígitos)</string>
+    <string name="num2pin">2: (8 dígitos)</string>
 </resources>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
index 3ea04e700d..18b02bafb7 100644
--- a/dana/src/main/res/values-ro-rRO/strings.xml
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -1,2 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="overview_bolusprogress_delivered">Livrat</string>
+    <string name="overview_bolusprogress_stoped">Oprit</string>
+    <string name="occlusion">Ocluzie</string>
+    <string name="emptyreservoir">Rezervor gol</string>
+    <string name="stoppingtempbasal">Se oprește bazala temporară</string>
+    <string name="stoppingextendedbolus">Se oprește bolusul extins</string>
+    <string name="wrongpassword">Parolă greșită</string>
+    <string name="wrongpumppassword">Parola pompei greșită!</string>
+    <string name="danar_history_alarm">Alarme</string>
+    <string name="danar_history_bolus">Bolusuri</string>
+    <string name="danar_history_carbohydrates">Carbohidrați</string>
+    <string name="danar_history_errors">Erori</string>
+    <string name="danar_history_glucose">Glicemie</string>
+    <string name="danar_history_refill">Reumplere</string>
+    <string name="danar_history_syspend">Suspendare</string>
+    <string name="danar_history_prime">Amorsare</string>
+    <string name="danar_pumpalarm">Alarmă</string>
+    <string name="danar_pumpalarm_sound">Sunet</string>
+    <string name="danar_pumpalarm_vibrate">Vibrație</string>
+    <string name="danar_pumpalarm_both">Ambele</string>
+    <string name="danar_saveuseroptions">Salvați opțiunile în pompă</string>
+    <string name="description_pump_dana_r">Integrare cu pompele DANA Diabcare R</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="danarkoreanpump">DanaR din Coreea</string>
+    <string name="danarpump">DanaR</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_bluetooth_status">Status Bluetooth</string>
+    <string name="danar_iob_label">IOB din pompă</string>
+    <string name="basal_step">Pas bazală</string>
+    <string name="bolus_step">Pas bolus</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Setări pompă Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Pornit</string>
+    <string name="option_off">Oprit</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="num1pin">1: (12 cifre)</string>
+    <string name="num2pin">2: (8 cifre)</string>
+</resources>
diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml
index 3ea04e700d..75a59a0d4f 100644
--- a/wear/src/main/res/values-ro-rRO/strings.xml
+++ b/wear/src/main/res/values-ro-rRO/strings.xml
@@ -1,2 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">AAPS</string>
+    <string name="label_actions_activity">AAPS</string>
+    <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_warning_sync_aaps">Sincronizare cu AAPS!</string>
+    <string name="pref_on">Pornit</string>
+    <string name="pref_off">Oprit</string>
+    <string name="pref_1_hour">1 oră</string>
+    <string name="pref_2_hours">2 ore</string>
+    <string name="pref_3_hours">3 ore</string>
+    <string name="pref_4_hours">4 ore</string>
+    <string name="pref_5_hours">5 ore</string>
+    <string name="pref_default">Implicit</string>
+</resources>

From f39df8e8eb42a4c7c481531645815c4a0dd565ba Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 9 Jul 2020 18:48:28 +0200
Subject: [PATCH 316/400] check for input data

---
 .../activities/ProfileHelperActivity.kt       | 25 +++++++++++--------
 .../androidaps/activities/SurveyActivity.kt   | 23 +++++++++--------
 .../data/defaultProfile/DefaultProfile.kt     |  4 +--
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index 786b30f959..b113d180be 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -48,18 +48,21 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                 return@setOnClickListener
             }
             profileFunction.getProfile()?.let { runningProfile ->
-                val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
-                ProfileViewerDialog().also { pvd ->
-                    pvd.arguments = Bundle().also {
-                        it.putLong("time", DateUtil.now())
-                        it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
-                        it.putString("customProfile", runningProfile.data.toString())
-                        it.putString("customProfile2", profile.data.toString())
-                        it.putString("customProfileUnits", profile.units)
-                        it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
-                    }
-                }.show(supportFragmentManager, "ProfileViewDialog")
+                defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
+                    ProfileViewerDialog().also { pvd ->
+                        pvd.arguments = Bundle().also {
+                            it.putLong("time", DateUtil.now())
+                            it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
+                            it.putString("customProfile", runningProfile.data.toString())
+                            it.putString("customProfile2", profile.data.toString())
+                            it.putString("customProfileUnits", profile.units)
+                            it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
+                        }
+                    }.show(supportFragmentManager, "ProfileViewDialog")
+                    return@setOnClickListener
+                }
             }
+            ToastUtils.showToastInUiThread(this, R.string.invalidinput)
         }
 
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
index 2ca326d4a3..1d03ddb344 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/SurveyActivity.kt
@@ -63,17 +63,18 @@ class SurveyActivity : NoSplashAppCompatActivity() {
                 return@setOnClickListener
             }
             profileFunction.getProfile()?.let { runningProfile ->
-                val profile = defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
-                ProfileViewerDialog().also { pvd ->
-                    pvd.arguments = Bundle().also {
-                        it.putLong("time", DateUtil.now())
-                        it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
-                        it.putString("customProfile", runningProfile.data.toString())
-                        it.putString("customProfile2", profile.data.toString())
-                        it.putString("customProfileUnits", profile.units)
-                        it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
-                    }
-                }.show(supportFragmentManager, "ProfileViewDialog")
+                defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
+                    ProfileViewerDialog().also { pvd ->
+                        pvd.arguments = Bundle().also {
+                            it.putLong("time", DateUtil.now())
+                            it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
+                            it.putString("customProfile", runningProfile.data.toString())
+                            it.putString("customProfile2", profile.data.toString())
+                            it.putString("customProfileUnits", profile.units)
+                            it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
+                        }
+                    }.show(supportFragmentManager, "ProfileViewDialog")
+                }
             }
         }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index ecab21784c..00dd367f99 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -17,7 +17,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
     var twelveToSeventeen: TreeMap<Double, Array<Double>> = TreeMap()
     var eighteenToTwentyfor: TreeMap<Double, Array<Double>> = TreeMap()
 
-    fun profile(age: Double, tdd: Double, weight: Double, units: String): Profile {
+    fun profile(age: Double, tdd: Double, weight: Double, units: String): Profile? {
         val profile = JSONObject()
         if (age >= 1 && age < 6) {
             val _tdd = if (tdd == 0.0) 0.6 * weight else tdd
@@ -41,7 +41,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
             val isf = Round.roundTo(100.0 / _tdd, 0.1)
             profile.put("sens", singleValueArray(isf, arrayOf(0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2)))
         } else if (age >= 18) {
-
+            return null
         }
         profile.put("dia", 5.0)
         profile.put("carbs_hr", 20) // not used

From c2e5470da72acdfa56d9323a9cf6844d016168a9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 9 Jul 2020 18:52:09 +0200
Subject: [PATCH 317/400] prevent ArrayIndexOutOfBoundsException

---
 app/src/main/java/info/nightscout/androidaps/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index e54addbf71..b79c2a1b0b 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -146,7 +146,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     private fun checkPluginPreferences(viewPager: ViewPager2) {
-        pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
+        if (viewPager.currentItem > 0) pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {

From bd39387b979a604bd1155a2ffeca96287ddec40b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 10 Jul 2020 15:11:55 +0200
Subject: [PATCH 318/400] Fix units for ISF value in compare profile dialog

---
 .../info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 75708b76ae..1fb90c7da3 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -225,7 +225,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
             val val1 = Profile.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
             val val2 = Profile.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60), profile1.units)
             if (val1 != prev1 || val2 != prev2) {
-                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), resourceHelper.gs(R.string.profile_carbs_per_unit)))
+                s.append(formatColors(Profile.format_HH_MM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), profile1.units + resourceHelper.gs(R.string.profile_per_unit)))
                 s.append("<br>")
             }
             prev1 = val1

From 34f78b4f8c2dd2d7e3a5d8809291fc2ff3726070 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 10 Jul 2020 15:25:30 +0200
Subject: [PATCH 319/400] Add units in defaultprofile json

---
 .../nightscout/androidaps/data/defaultProfile/DefaultProfile.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index ecab21784c..3d3ee67611 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.data.defaultProfile
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.Round
 import org.json.JSONArray
@@ -49,6 +50,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         profile.put("timezone", TimeZone.getDefault().getID())
         profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
         profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
+        profile.put("units", units)
         return Profile(injector, profile, units)
     }
 

From de8b63ac4d427026715a12a09d82e94ba2197f25 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 10 Jul 2020 15:29:19 +0200
Subject: [PATCH 320/400] existing map is to seventeen

---
 .../nightscout/androidaps/data/defaultProfile/DefaultProfile.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 3d3ee67611..62796140b4 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -34,7 +34,7 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -3.0, 0.0, -1.0, -3.0, 0.0, -2.0)))
             val isf = Round.roundTo(170.0 / _tdd, 0.1)
             profile.put("sens", singleValueArray(isf, arrayOf(0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0)))
-        } else if (age >= 12 && age < 17) {
+        } else if (age >= 12 && age < 18) {
             val _tdd = if (tdd == 0.0) 1.0 * weight else tdd
             closest(twelveToSeventeen, _tdd * 0.5)?.let { array -> profile.put("basal", arrayToJson(array)) }
             val ic = Round.roundTo(500.0 / _tdd, 1.0)

From 0091571b5d0c98bd65982ee8c6dbdc9364af5060 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 10 Jul 2020 15:44:50 +0200
Subject: [PATCH 321/400] Convert isf defaultprofile values to units

---
 .../data/defaultProfile/DefaultProfile.kt      | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 62796140b4..5fa76dfb0e 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -26,21 +26,21 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
             val ic = Round.roundTo(250.0 / _tdd, 1.0)
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -4.0, -1.0, -2.0, -4.0, 0.0, -4.0)))
             val isf = Round.roundTo(200.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf(0.0, -2.0, -0.0, -0.0, -2.0, 0.0, -2.0)))
+            profile.put("sens", singleValueArrayFromMmolToUnits(isf, arrayOf(0.0, -2.0, -0.0, -0.0, -2.0, 0.0, -2.0),units))
         } else if (age >= 6 && age < 12) {
             val _tdd = if (tdd == 0.0) 0.8 * weight else tdd
             closest(sixToEleven, _tdd * 0.4)?.let { array -> profile.put("basal", arrayToJson(array)) }
             val ic = Round.roundTo(375.0 / _tdd, 1.0)
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -3.0, 0.0, -1.0, -3.0, 0.0, -2.0)))
             val isf = Round.roundTo(170.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf(0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0)))
+            profile.put("sens", singleValueArrayFromMmolToUnits(isf, arrayOf(0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0),units))
         } else if (age >= 12 && age < 18) {
             val _tdd = if (tdd == 0.0) 1.0 * weight else tdd
             closest(twelveToSeventeen, _tdd * 0.5)?.let { array -> profile.put("basal", arrayToJson(array)) }
             val ic = Round.roundTo(500.0 / _tdd, 1.0)
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -1.0, 0.0, 0.0, -1.0, 0.0, -1.0)))
             val isf = Round.roundTo(100.0 / _tdd, 0.1)
-            profile.put("sens", singleValueArray(isf, arrayOf(0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2)))
+            profile.put("sens", singleValueArrayFromMmolToUnits(isf, arrayOf(0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2),units))
         } else if (age >= 18) {
 
         }
@@ -148,4 +148,16 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         array.put(JSONObject().put("time", "19:00").put("value", value + sample[6]))
         return array
     }
+
+    private fun singleValueArrayFromMmolToUnits(value: Double, sample: Array<Double>, units: String): JSONArray {
+        val array = JSONArray()
+        array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value + sample[0],units)))
+        array.put(JSONObject().put("time", "06:00").put("value", Profile.fromMmolToUnits(value + sample[1],units)))
+        array.put(JSONObject().put("time", "09:00").put("value", Profile.fromMmolToUnits(value + sample[2],units)))
+        array.put(JSONObject().put("time", "11:00").put("value", Profile.fromMmolToUnits(value + sample[3],units)))
+        array.put(JSONObject().put("time", "14:00").put("value", Profile.fromMmolToUnits(value + sample[4],units)))
+        array.put(JSONObject().put("time", "16:00").put("value", Profile.fromMmolToUnits(value + sample[5],units)))
+        array.put(JSONObject().put("time", "19:00").put("value", Profile.fromMmolToUnits(value + sample[6],units)))
+        return array
+    }
 }
\ No newline at end of file

From 43ad3490ce221902cb2998d0ea51562d3db39196 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 10 Jul 2020 16:01:17 +0200
Subject: [PATCH 322/400] Remove unused import

---
 .../nightscout/androidaps/data/defaultProfile/DefaultProfile.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 5fa76dfb0e..9fba2d81dc 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.data.defaultProfile
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.utils.Round
 import org.json.JSONArray

From ea80eb3c9bf26b9da929457ab784cd7437ae34f8 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Sun, 12 Jul 2020 20:15:11 +0100
Subject: [PATCH 323/400] - created 2 modules: rileylink and medtronic -
 refactored some classes

---
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              |  11 +-
 .../activities/MyPreferenceFragment.kt        |   2 +-
 .../androidaps/db/DatabaseHelperProvider.java |  24 +++
 .../dependencyInjection/ActivitiesModule.kt   |   5 +-
 .../dependencyInjection/FragmentsModule.kt    |  12 +-
 .../dependencyInjection/MedtronicModule.kt    |  44 ++---
 .../dependencyInjection/PluginsModule.kt      |   2 +-
 .../dependencyInjection/ReceiversModule.kt    |   4 +-
 .../dependencyInjection/ServicesModule.kt     |   5 +-
 .../automation/actions/ActionLoopResume.kt    |   1 -
 .../plugins/pump/combo/ComboPlugin.java       |   1 -
 .../pump/medtronic/defs/PumpDeviceState.java  |  30 ---
 .../EventMedtronicDeviceStatusChange.kt       |  30 ---
 .../plugins/pump/omnipod/OmnipodFragment.kt   |  18 +-
 .../pump/omnipod/OmnipodPumpPlugin.java       |   5 +
 .../comm/OmnipodCommunicationManager.java     |   2 +-
 .../omnipod/comm/message/OmnipodPacket.java   |   2 -
 .../omnipod/data/RLHistoryItemOmnipod.java    |  40 ++++
 .../OmnipodCommunicationManagerInterface.java |   1 -
 .../pump/omnipod/defs/PodDeviceState.java     |   2 +-
 .../omnipod/driver/OmnipodPumpStatus.java     |  23 ++-
 .../driver/db/PodHistoryEntryType.java        |   1 -
 .../events/EventOmnipodDeviceStatusChange.kt  |   6 +-
 .../service/RileyLinkOmnipodService.java      |   2 +-
 .../pump/omnipod/util/OmnipodUtil.java        |   9 +-
 .../comm/OmnipodDashCommunicationManager.java |   1 -
 .../plugins/treatments/TreatmentsPlugin.java  |   7 +-
 app/src/main/jniLibs/README.md                |   1 +
 .../jniLibs/arm64-v8a/libBleCommandUtil.so    | Bin 0 -> 14000 bytes
 .../jniLibs/armeabi-v7a/libBleCommandUtil.so  | Bin 0 -> 13728 bytes
 .../main/jniLibs/armeabi/libBleCommandUtil.so | Bin 0 -> 13724 bytes
 .../main/jniLibs/mips/libBleCommandUtil.so    | Bin 0 -> 71484 bytes
 .../main/jniLibs/mips64/libBleCommandUtil.so  | Bin 0 -> 14808 bytes
 app/src/main/jniLibs/x86/libBleCommandUtil.so | Bin 0 -> 13668 bytes
 .../main/jniLibs/x86_64/libBleCommandUtil.so  | Bin 0 -> 14272 bytes
 app/src/main/res/values/strings.xml           | 178 ++----------------
 .../pump/common/utils/DateTimeUtilUTest.java  |   2 -
 .../comm/MedtronicConverterUTest.java         |   9 -
 .../comm/MedtronicHistoryDataUTest.java       |  13 --
 .../MedtronicPumpHistoryDecoderUTest.java     |   2 -
 .../history/pump/PumpHistoryEntryUTest.java   |   1 -
 .../medtronic/data/dto/BasalProfileUTest.java |  11 --
 core/build.gradle                             |   3 +
 .../events/EventCustomActionsChanged.kt       |   0
 .../androidaps/events/EventRefreshOverview.kt |   0
 .../interfaces/DatabaseHelperInterface.kt     |  12 +-
 .../interfaces/TreatmentsInterface.java       |   3 +
 .../pump/common/PumpPluginAbstract.java       |  12 +-
 .../plugins/pump/common/data/PumpStatus.java  |  13 +-
 .../pump/common/data/TempBasalPair.java       |   5 -
 .../pump/common/defs/PumpDeviceState.java     |  29 +++
 .../common/defs/PumpHistoryEntryGroup.java    |  23 +--
 .../common/dialog/RefreshableInterface.java   |   0
 .../common}/events/EventRefreshButtonState.kt |   2 +-
 .../plugins/pump/common/utils/ByteUtil.java   |   0
 .../plugins/pump/common/utils/CRC.java        |   0
 .../pump/common/utils/DateTimeUtil.java       |   5 -
 .../pump/common/utils/ProfileUtil.java        |   0
 .../plugins/pump/common/utils/StringUtil.java |   0
 .../plugins/pump/common/utils/ThreadUtil.java |   0
 .../treatments/TreatmentUpdateReturn.java     |  27 +++
 core/src/main/res/values/strings.xml          |  53 ++++++
 medtronic/.gitignore                          |   1 +
 medtronic/build.gradle                        |  83 ++++++++
 medtronic/consumer-rules.pro                  |   0
 medtronic/proguard-rules.pro                  |  21 +++
 .../medtronic/ExampleInstrumentedTest.java    |  27 +++
 medtronic/src/main/AndroidManifest.xml        |   2 +
 .../pump/medtronic/MedtronicFragment.kt       |  66 +++----
 .../pump/medtronic/MedtronicPumpPlugin.java   |  20 +-
 .../comm/MedtronicCommunicationManager.java   |   7 +-
 .../medtronic/comm/MedtronicConverter.java    |   0
 .../comm/history/MedtronicHistoryDecoder.java |   0
 .../MedtronicHistoryDecoderInterface.java     |   0
 .../comm/history/MedtronicHistoryEntry.java   |   1 -
 .../MedtronicHistoryEntryInterface.java       |   0
 .../comm/history/RawHistoryPage.java          |   0
 .../comm/history/RecordDecodeStatus.java      |   0
 .../comm/history/cgms/CGMSHistoryEntry.java   |   0
 .../history/cgms/CGMSHistoryEntryType.java    |   0
 .../cgms/MedtronicCGMSHistoryDecoder.java     |   0
 .../pump/MedtronicPumpHistoryDecoder.java     |   0
 .../comm/history/pump/PumpHistoryEntry.java   |   0
 .../history/pump/PumpHistoryEntryType.java    |   0
 .../comm/history/pump/PumpHistoryResult.java  |   0
 .../comm/message/CarelinkLongMessageBody.java |   0
 .../message/CarelinkShortMessageBody.java     |   0
 .../GetHistoryPageCarelinkMessageBody.java    |   0
 .../medtronic/comm/message/MessageBody.java   |   0
 .../medtronic/comm/message/PacketType.java    |   0
 .../comm/message/PumpAckMessageBody.java      |   0
 .../medtronic/comm/message/PumpMessage.java   |   0
 .../comm/message/UnknownMessageBody.java      |   0
 .../medtronic/comm/ui/MedtronicUIComm.java    |   0
 .../comm/ui/MedtronicUIPostprocessor.java     |   0
 .../medtronic/comm/ui/MedtronicUITask.java    |   8 +-
 .../medtronic/data/MedtronicHistoryData.java  |  38 ++--
 .../pump/medtronic/data/dto/BasalProfile.java |   1 -
 .../medtronic/data/dto/BasalProfileEntry.java |   0
 .../medtronic/data/dto/BatteryStatusDTO.java  |   0
 .../pump/medtronic/data/dto/BolusDTO.java     |   0
 .../medtronic/data/dto/BolusWizardDTO.java    |   0
 .../pump/medtronic/data/dto/ClockDTO.java     |   0
 .../medtronic/data/dto/DailyTotalsDTO.java    |  60 +++---
 .../medtronic/data/dto/PumpSettingDTO.java    |   0
 .../data/dto/PumpTimeStampedRecord.java       |   0
 .../data/dto/RLHistoryItemMedtronic.java      |  41 ++++
 .../medtronic/data/dto/TempBasalPair.java     |   1 -
 .../data/dto/TempBasalProcessDTO.java         |   0
 .../medtronic/defs/BasalProfileStatus.java    |   0
 .../pump/medtronic/defs/BatteryType.java      |   4 +-
 .../defs/CommandValueDefinitionMDTType.java   |   0
 .../medtronic/defs/MedtronicCommandType.java  |   2 +-
 .../defs/MedtronicCustomActionType.java       |   0
 .../medtronic/defs/MedtronicDeviceType.java   |   0
 .../defs/MedtronicNotificationType.java       |   6 +-
 .../defs/MedtronicStatusRefreshType.java      |   0
 .../defs/MedtronicUIResponseType.java         |   0
 .../pump/medtronic/defs/PumpBolusType.java    |   0
 .../defs/PumpConfigurationGroup.java          |   0
 .../dialog/MedtronicHistoryActivity.java      |   2 +-
 .../RileyLinkStatusDeviceMedtronic.java       |   2 +-
 .../medtronic/driver/MedtronicPumpStatus.java |  33 +++-
 .../EventMedtronicPumpConfigurationChanged.kt |   0
 .../events/EventMedtronicPumpValuesChanged.kt |   0
 .../service/RileyLinkMedtronicService.java    |  14 +-
 .../pump/medtronic/util/MedtronicConst.java   |   4 +-
 .../pump/medtronic/util/MedtronicUtil.java    |  17 +-
 .../main/res/layout/medtronic_fragment.xml    |   0
 .../res/layout/medtronic_history_activity.xml |   0
 .../res/layout/medtronic_history_item.xml     |   0
 medtronic/src/main/res/values/strings.xml     | 117 ++++++++++++
 .../src/main/res/xml/pref_medtronic.xml       |   0
 .../pump/medtronic/ExampleUnitTest.java       |  17 ++
 rileylink/.gitignore                          |   1 +
 rileylink/build.gradle                        |  81 ++++++++
 rileylink/consumer-rules.pro                  |   0
 rileylink/proguard-rules.pro                  |  21 +++
 .../pump/common/ExampleInstrumentedTest.java  |  27 +++
 rileylink/src/main/AndroidManifest.xml        |  20 ++
 .../dialog/RileyLinkBLEScanActivity.java      |  26 +--
 .../EventRileyLinkDeviceStatusChange.kt       |  28 +++
 .../RileyLinkCommunicationManager.java        |   2 +-
 .../common/hw/rileylink/RileyLinkConst.java   |  12 +-
 .../common/hw/rileylink/RileyLinkUtil.java    |   0
 .../pump/common/hw/rileylink/ble/RFSpy.java   |   9 +-
 .../common/hw/rileylink/ble/RFSpyReader.java  |   0
 .../common/hw/rileylink/ble/RileyLinkBLE.java |   0
 .../ble/RileyLinkCommunicationException.java  |   0
 .../hw/rileylink/ble/command/GetVersion.java  |   0
 .../hw/rileylink/ble/command/Reset.java       |   0
 .../ble/command/ResetRadioConfig.java         |   0
 .../ble/command/RileyLinkCommand.java         |   0
 .../rileylink/ble/command/SendAndListen.java  |   1 -
 .../ble/command/SetHardwareEncoding.java      |   0
 .../hw/rileylink/ble/command/SetPreamble.java |   1 -
 .../rileylink/ble/command/UpdateRegister.java |   0
 .../ble/data/FrequencyScanResults.java        |   0
 .../hw/rileylink/ble/data/FrequencyTrial.java |   0
 .../hw/rileylink/ble/data/GattAttributes.java |   0
 .../hw/rileylink/ble/data/RFSpyResponse.java  |   0
 .../hw/rileylink/ble/data/RLMessage.java      |   0
 .../hw/rileylink/ble/data/RLMessageType.java  |   0
 .../hw/rileylink/ble/data/RadioPacket.java    |   0
 .../hw/rileylink/ble/data/RadioResponse.java  |   2 +-
 .../ble/data/encoding/Encoding4b6b.java       |   0
 .../data/encoding/Encoding4b6bAbstract.java   |   0
 .../ble/data/encoding/Encoding4b6bGeoff.java  |   1 -
 .../ble/data/encoding/Encoding4b6bGo.java     |   1 -
 .../ble/data/encoding/Encoding4b6bLoop.java   |   1 -
 .../hw/rileylink/ble/defs/CC111XRegister.java |   0
 .../hw/rileylink/ble/defs/RFSpyCommand.java   |   0
 .../rileylink/ble/defs/RFSpyRLResponse.java   |   0
 .../hw/rileylink/ble/defs/RLMessageType.java  |   0
 .../hw/rileylink/ble/defs/RXFilterMode.java   |   0
 .../rileylink/ble/defs/RileyLinkBLEError.java |   0
 .../ble/defs/RileyLinkCommandType.java        |   0
 .../ble/defs/RileyLinkEncodingType.java       |   4 +-
 .../ble/defs/RileyLinkFirmwareVersion.java    |   5 +-
 .../ble/defs/RileyLinkTargetFrequency.java    |   0
 .../ble/operations/BLECommOperation.java      |   0
 .../operations/BLECommOperationResult.java    |   0
 .../CharacteristicReadOperation.java          |   0
 .../CharacteristicWriteOperation.java         |   0
 .../operations/DescriptorWriteOperation.java  |   0
 .../hw/rileylink/data/BleAdvertisedData.java  |   0
 .../data/CommandValueDefinition.java          |   0
 .../hw/rileylink/data/RLHistoryItem.java      |  67 ++++---
 .../defs/CommandValueDefinitionRLType.java    |   0
 .../defs/CommandValueDefinitionType.java      |   0
 .../hw/rileylink/defs/RileyLinkError.java     |   3 +-
 .../rileylink/defs/RileyLinkPumpDevice.java   |   2 +
 .../rileylink/defs/RileyLinkServiceState.java |   3 +-
 .../rileylink/defs/RileyLinkTargetDevice.java |   3 +-
 .../dialog/RileyLinkStatusActivity.java       |   3 +-
 .../dialog/RileyLinkStatusDevice.java         |   3 +-
 .../RileyLinkStatusGeneralFragment.java       |  45 ++---
 .../RileyLinkStatusHistoryFragment.java       |   6 +-
 .../RileyLinkBluetoothStateReceiver.kt        |   0
 .../service/RileyLinkBroadcastReceiver.java   |   7 -
 .../rileylink/service/RileyLinkService.java   |   4 +-
 .../service/RileyLinkServiceData.java         |   6 +-
 .../service/data/ServiceCommand.java          |   0
 .../service/data/ServiceMessage.java          |   0
 .../service/data/ServiceNotification.java     |   0
 .../rileylink/service/data/ServiceResult.java |   0
 .../service/data/ServiceTransport.java        |   0
 .../service/data/ServiceTransportType.java    |   0
 .../tasks/DiscoverGattServicesTask.java       |   0
 .../tasks/InitializePumpManagerTask.java      |   0
 .../hw/rileylink/service/tasks/PumpTask.java  |   0
 .../ResetRileyLinkConfigurationTask.java      |   4 +-
 .../rileylink/service/tasks/ServiceTask.java  |   0
 .../service/tasks/ServiceTaskExecutor.java    |   0
 .../service/tasks/WakeAndTuneTask.java        |   4 +-
 .../res/layout/rileylink_scan_activity.xml    |   0
 .../main/res/layout/rileylink_scan_item.xml   |   0
 .../src/main/res/layout/rileylink_status.xml  |   0
 .../res/layout/rileylink_status_device.xml    |   0
 .../layout/rileylink_status_device_item.xml   |   0
 .../res/layout/rileylink_status_general.xml   |   0
 .../res/layout/rileylink_status_history.xml   |   0
 .../layout/rileylink_status_history_item.xml  |   0
 .../main/res/menu/menu_rileylink_ble_scan.xml |   0
 rileylink/src/main/res/values/strings.xml     |  89 +++++++++
 .../plugins/pump/common/ExampleUnitTest.java  |  17 ++
 settings.gradle                               |   3 +-
 228 files changed, 1165 insertions(+), 638 deletions(-)
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpDeviceState.java
 delete mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicDeviceStatusChange.kt
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
 create mode 100644 app/src/main/jniLibs/README.md
 create mode 100644 app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/armeabi/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/mips/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/mips64/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/x86/libBleCommandUtil.so
 create mode 100644 app/src/main/jniLibs/x86_64/libBleCommandUtil.so
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventCustomActionsChanged.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.kt (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java (97%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java (91%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java (93%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.java
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java (72%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RefreshableInterface.java (100%)
 rename {app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic => core/src/main/java/info/nightscout/androidaps/plugins/pump/common}/events/EventRefreshButtonState.kt (63%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java (98%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java (100%)
 rename {app => core}/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java (100%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentUpdateReturn.java
 create mode 100644 medtronic/.gitignore
 create mode 100644 medtronic/build.gradle
 create mode 100644 medtronic/consumer-rules.pro
 create mode 100644 medtronic/proguard-rules.pro
 create mode 100644 medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java
 create mode 100644 medtronic/src/main/AndroidManifest.xml
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt (79%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java (95%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java (97%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java (83%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java (100%)
 create mode 100644 medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java (98%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java (91%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java (89%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java (99%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java (98%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java (87%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt (100%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java (96%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java (94%)
 rename {app => medtronic}/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java (95%)
 rename {app => medtronic}/src/main/res/layout/medtronic_fragment.xml (100%)
 rename {app => medtronic}/src/main/res/layout/medtronic_history_activity.xml (100%)
 rename {app => medtronic}/src/main/res/layout/medtronic_history_item.xml (100%)
 create mode 100644 medtronic/src/main/res/values/strings.xml
 rename {app => medtronic}/src/main/res/xml/pref_medtronic.xml (100%)
 create mode 100644 medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
 create mode 100644 rileylink/.gitignore
 create mode 100644 rileylink/build.gradle
 create mode 100644 rileylink/consumer-rules.pro
 create mode 100644 rileylink/proguard-rules.pro
 create mode 100644 rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java
 create mode 100644 rileylink/src/main/AndroidManifest.xml
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java (95%)
 create mode 100644 rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java (99%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java (86%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java (98%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java (97%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java (94%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java (98%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java (99%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java (99%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java (99%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java (95%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java (95%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java (62%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java (95%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java (89%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java (98%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java (91%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java (98%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java (98%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java (79%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java (97%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java (97%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java (97%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java (94%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceCommand.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceMessage.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceNotification.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceResult.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransportType.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java (91%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java (100%)
 rename {app => rileylink}/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java (84%)
 rename {app => rileylink}/src/main/res/layout/rileylink_scan_activity.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_scan_item.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status_device.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status_device_item.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status_general.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status_history.xml (100%)
 rename {app => rileylink}/src/main/res/layout/rileylink_status_history_item.xml (100%)
 rename {app => rileylink}/src/main/res/menu/menu_rileylink_ble_scan.xml (100%)
 create mode 100644 rileylink/src/main/res/values/strings.xml
 create mode 100644 rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java

diff --git a/app/build.gradle b/app/build.gradle
index 5ceed5c438..7bb7e61aec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -239,6 +239,8 @@ dependencies {
     implementation project(':dana')
     implementation project(':danars')
     implementation project(':danar')
+    implementation project(':rileylink')
+    implementation project(':medtronic')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb31b1ce3c..3dbee4a29c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -256,16 +256,7 @@
             android:name=".plugins.pump.medtronic.service.RileyLinkMedtronicService"
             android:enabled="true"
             android:exported="true" />
-        <activity android:name=".plugins.pump.common.dialog.RileyLinkBLEScanActivity">
-            <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity"
-            android:label="@string/title_activity_rileylink_settings"
-            android:theme="@style/Theme.AppCompat.NoTitle" />
+
         <activity android:name=".plugins.pump.medtronic.dialog.MedtronicHistoryActivity" />
 
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 1d8740f631..706ad90ecb 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -76,7 +76,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var localInsightPlugin: LocalInsightPlugin
-    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
+    @Inject lateinit var medtronicPumpPlugin: info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
index d174f170f5..e888727984 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java
@@ -69,4 +69,28 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
     @Override public long roundDateToSec(long date) {
         return MainApp.getDbHelper().roundDateToSec(date);
     }
+
+    @Override public void createOrUpdateTDD(@NotNull TDD record) {
+        MainApp.getDbHelper().createOrUpdateTDD(record);
+    }
+
+    @Override public void createOrUpdate(@NotNull TemporaryBasal tempBasal) {
+        MainApp.getDbHelper().createOrUpdate(tempBasal);
+    }
+
+    @NotNull @Override public TemporaryBasal findTempBasalByPumpId(long id) {
+        return MainApp.getDbHelper().findTempBasalByPumpId(id);
+    }
+
+    @NotNull @Override public List<TemporaryBasal> getTemporaryBasalsDataFromTime(long mills, boolean ascending) {
+        return MainApp.getDbHelper().getTemporaryBasalsDataFromTime(mills, ascending);
+    }
+
+    @NotNull @Override public CareportalEvent getCareportalEventFromTimestamp(long timestamp) {
+        return MainApp.getDbHelper().getCareportalEventFromTimestamp(timestamp);
+    }
+
+    @NotNull @Override public List<TDD> getTDDsForLastXDays(int days) {
+        return MainApp.getDbHelper().getTDDsForLastXDays(days);
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 593d1e09e1..8608d86269 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImp
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
@@ -27,11 +26,11 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity
     @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
     @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity
-    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
+    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
     @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
     @ContributesAndroidInjector abstract fun contributesRileyLinkBLEScanActivity(): RileyLinkBLEScanActivity
     @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
     @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 3fb97d8a32..46028b4161 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -10,7 +10,6 @@ import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBFragment
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesFragment
 import info.nightscout.androidaps.plugins.constraints.objectives.activities.ObjectivesExamDialog
-import info.nightscout.androidaps.dialogs.NtpProgressDialog
 import info.nightscout.androidaps.plugins.general.actions.ActionsFragment
 import info.nightscout.androidaps.plugins.general.automation.AutomationFragment
 import info.nightscout.androidaps.plugins.general.automation.dialogs.ChooseActionDialog
@@ -30,9 +29,6 @@ import info.nightscout.androidaps.plugins.insulin.InsulinFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
-import info.nightscout.androidaps.danars.dialogs.PairingProgressDialog
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
@@ -67,7 +63,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
     @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
@@ -110,7 +106,7 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
 
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
index 7166906611..454ef6800c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
@@ -2,39 +2,25 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
-import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
-import info.nightscout.androidaps.plugins.general.automation.actions.*
-import info.nightscout.androidaps.plugins.general.automation.elements.*
-import info.nightscout.androidaps.plugins.general.automation.triggers.*
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
-import info.nightscout.androidaps.queue.CommandQueue
-import info.nightscout.androidaps.queue.commands.*
 
 @Module
 @Suppress("unused")
 abstract class MedtronicModule {
-    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager
-    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
-    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
-    @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask
-    @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask
-    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask
-    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): InitializePumpManagerTask
-    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask
-    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): WakeAndTuneTask
-    @ContributesAndroidInjector abstract fun radioResponseProvider(): RadioResponse
-    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): RileyLinkBLE
-    @ContributesAndroidInjector abstract fun rfSpyProvider(): RFSpy
-    @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
-    @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
-    @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
+    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
+    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
+    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
+    @ContributesAndroidInjector abstract fun serviceTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTask
+    @ContributesAndroidInjector abstract fun pumpTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.PumpTask
+    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.DiscoverGattServicesTask
+    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.InitializePumpManagerTask
+    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
+    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
+    @ContributesAndroidInjector abstract fun radioResponseProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
+    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
+    @ContributesAndroidInjector abstract fun rfSpyProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
+    @ContributesAndroidInjector abstract fun sendAndListenProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
+    @ContributesAndroidInjector abstract fun setPreambleProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
+    @ContributesAndroidInjector abstract fun radioPacketProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index f179580a55..40e2e91bd7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -145,7 +145,7 @@ abstract class PluginsModule {
     @PumpDriver
     @IntoMap
     @IntKey(150)
-    abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
+    abstract fun bindMedtronicPumpPlugin(plugin: info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin): PluginBase
 
     @Binds
     @NotNSClient
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
index 4c6e67608c..d92bc9262a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -16,9 +16,9 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
     @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): RileyLinkBroadcastReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBroadcastReceiver
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index f961c3a863..fbf47a9ed2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientServ
 import info.nightscout.androidaps.plugins.general.overview.notifications.DismissNotificationService
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
@@ -28,7 +27,7 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService
     @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
     @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
index 4e155bcdcc..051e1c8bb0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt
@@ -8,7 +8,6 @@ import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
index 50f40318d9..e443ac4657 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
@@ -20,7 +20,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpDeviceState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpDeviceState.java
deleted file mode 100644
index ba86963869..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpDeviceState.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.defs;
-
-import info.nightscout.androidaps.R;
-
-/**
- * Created by andy on 6/11/18.
- */
-
-public enum PumpDeviceState {
-
-    NeverContacted(R.string.medtronic_pump_status_never_contacted), //
-    Sleeping(R.string.medtronic_pump_status_sleeping), //
-    WakingUp(R.string.medtronic_pump_status_waking_up), //
-    Active(R.string.medtronic_pump_status_active), //
-    ErrorWhenCommunicating(R.string.medtronic_pump_status_error_comm), //
-    TimeoutWhenCommunicating(R.string.medtronic_pump_status_timeout_comm), //
-    // ProblemContacting(R.string.medtronic_pump_status_problem_contacting), //
-    PumpUnreachable(R.string.medtronic_pump_status_pump_unreachable), //
-    InvalidConfiguration(R.string.medtronic_pump_status_invalid_config);
-
-    Integer resourceId;
-
-    PumpDeviceState(int resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public Integer getResourceId() {
-        return resourceId;
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicDeviceStatusChange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicDeviceStatusChange.kt
deleted file mode 100644
index 37e6649252..0000000000
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicDeviceStatusChange.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.events
-
-import info.nightscout.androidaps.events.Event
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState
-
-class EventMedtronicDeviceStatusChange : Event {
-
-    private var rileyLinkServiceState: RileyLinkServiceState? = null
-    private var rileyLinkError: RileyLinkError? = null
-
-    private var pumpDeviceState: PumpDeviceState? = null
-    private var errorDescription: String? = null
-
-
-    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError?) {
-        this.rileyLinkServiceState = rileyLinkServiceState
-        this.rileyLinkError = rileyLinkError
-    }
-
-    constructor(pumpDeviceState: PumpDeviceState?) {
-        this.pumpDeviceState = pumpDeviceState
-    }
-
-    constructor(pumpDeviceState: PumpDeviceState?, errorDescription: String?) {
-        this.pumpDeviceState = pumpDeviceState
-        this.errorDescription = errorDescription
-    }
-}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index 843beed61f..000d6651c6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -85,7 +85,7 @@ class OmnipodFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        omnipod_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.Omnipod))
+        omnipod_rl_status.text = resourceHelper.gs(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod))
 
         omnipod_pod_status.setTextColor(Color.WHITE)
         omnipod_pod_status.text = "{fa-bed}"
@@ -114,7 +114,7 @@ class OmnipodFragment : DaggerFragment() {
 
         omnipod_stats.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
-                startActivity(Intent(context, RileyLinkStatusActivity::class.java))
+                startActivity(Intent(context, info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
             }
@@ -211,16 +211,16 @@ class OmnipodFragment : DaggerFragment() {
 
         aapsLogger.info(LTag.PUMP, "setDeviceStatus: [pumpStatus={}]", omnipodPumpStatus)
 
-        val resourceId = omnipodPumpStatus.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.Omnipod)
+        val resourceId = omnipodPumpStatus.rileyLinkServiceState.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod)
         val rileyLinkError = omnipodPumpPlugin.rileyLinkService?.error
 
         omnipod_rl_status.text =
             when {
-                omnipodPumpStatus.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
-                else                                                                        -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState == info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
+                else                                                                                                                                         -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
             }
         omnipod_rl_status.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
@@ -229,7 +229,7 @@ class OmnipodFragment : DaggerFragment() {
 
         omnipod_errors.text =
             omnipodPumpStatus.rileyLinkError?.let {
-                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.Omnipod))
+                resourceHelper.gs(it.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod))
             } ?: "-"
 
         val driverState = omnipodUtil.getDriverState();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index 76d39f7318..236d084ca8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -418,6 +418,11 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         rileyLinkOmnipodService.doTuneUpDevice();
     }
 
+    @Override
+    public void triggerPumpConfigurationChangedEvent() {
+        rxBus.send(new EventOmnipodPumpValuesChanged());
+    }
+
 
     @Override
     public RileyLinkOmnipodService getRileyLinkService() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
index 89b6a43559..31d3fbd531 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java
@@ -9,6 +9,7 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -17,7 +18,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMe
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkBLEError;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.OmnipodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
index 157e72e51b..3764cf7b60 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.comm.message;
 
-import java.util.Arrays;
-
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
new file mode 100644
index 0000000000..ed4dcb6255
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/data/RLHistoryItemOmnipod.java
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.data;
+
+import org.joda.time.LocalDateTime;
+
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+
+public class RLHistoryItemOmnipod extends RLHistoryItem {
+
+    private OmnipodCommandType omnipodCommandType;
+
+    public RLHistoryItemOmnipod(OmnipodCommandType omnipodCommandType) {
+        super(new LocalDateTime(), RLHistoryItemSource.OmnipodCommand, RileyLinkTargetDevice.Omnipod);
+        this.omnipodCommandType = omnipodCommandType;
+    }
+
+    public String getDescription(ResourceHelper resourceHelper) {
+
+        switch (this.source) {
+            case RileyLink:
+                return "State: " + resourceHelper.gs(serviceState.getResourceId(targetDevice))
+                        + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
+
+            case MedtronicPump:
+                return resourceHelper.gs(pumpDeviceState.getResourceId());
+
+            case OmnipodCommand:
+                return omnipodCommandType.name();
+
+            default:
+                return "Unknown Description";
+        }
+    }
+
+
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
index d345a3c385..7ad3b58799 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/OmnipodCommunicationManagerInterface.java
@@ -5,7 +5,6 @@ import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoRecentPulseLog;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 
 public interface OmnipodCommunicationManagerInterface {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodDeviceState.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodDeviceState.java
index 5e903b5ae4..2670f63295 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodDeviceState.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodDeviceState.java
@@ -5,7 +5,7 @@ import info.nightscout.androidaps.R;
 /**
  * Created by andy on 4.8.2019
  */
-
+// TODO remove this class and use PumpDeviceState instead
 public enum PodDeviceState {
 
     // FIXME
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
index 1262304203..67fae56e08 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java
@@ -8,14 +8,14 @@ import javax.inject.Singleton;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodDeviceState;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
@@ -53,7 +53,7 @@ public class OmnipodPumpStatus extends PumpStatus {
 
     public String podNumber;
     public PodDeviceState podDeviceState = PodDeviceState.NeverContacted;
-    public boolean podAvailable = false;
+    public Boolean podAvailable = false;
     public boolean podAvailibityChecked = false;
     public boolean ackAlertsAvailable = false;
     public String ackAlertsText = null;
@@ -101,6 +101,21 @@ public class OmnipodPumpStatus extends PumpStatus {
         return (this.errorDescription == null) ? "-" : this.errorDescription;
     }
 
+    @Override
+    public <E> E getCustomData(String key, Class<E> clazz) {
+        switch(key) {
+            case "POD_LOT_NUMBER":
+                return (E)podLotNumber;
+
+            case "POD_AVAILABLE":
+                return (E)podAvailable;
+
+            default:
+                return null;
+        }
+
+    }
+
 
 //    public boolean setNotInPreInit() {
 //        this.inPreInit = false;
@@ -187,7 +202,7 @@ public class OmnipodPumpStatus extends PumpStatus {
 
         rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(pumpDeviceState, RileyLinkTargetDevice.Omnipod));
 
-        rxBus.send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
+        rxBus.send(new EventRileyLinkDeviceStatusChange(pumpDeviceState));
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
index e776de681f..981796b497 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/db/PodHistoryEntryType.java
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.driver.db;
 
-import androidx.annotation.IdRes;
 import androidx.annotation.StringRes;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
index db46550a05..4100ee3a8c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
@@ -11,14 +11,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionStat
  */
 class EventOmnipodDeviceStatusChange : Event {
 
-    var rileyLinkServiceState: RileyLinkServiceState? = null
-    var rileyLinkError: RileyLinkError? = null
+    var rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState? = null
+    var rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null
     var podSessionState: PodSessionState? = null
     var errorDescription: String? = null
     var podDeviceState: PodDeviceState? = null
 
     @JvmOverloads
-    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError? = null) {
+    constructor(rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState?, rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null) {
         this.rileyLinkServiceState = rileyLinkServiceState
         this.rileyLinkError = rileyLinkError
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
index 908748b991..61fd548f7b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
@@ -14,6 +14,7 @@ import javax.inject.Inject;
 
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -23,7 +24,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.Rile
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
index dfaa18bcaa..c79aa9fdb6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
@@ -1,7 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.util;
 
-import android.content.Context;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonDeserializer;
@@ -17,8 +15,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
@@ -27,14 +23,15 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.data.RLHistoryItemOmnipod;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPodType;
+
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodDeviceState;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodDeviceStatusChange;
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -103,7 +100,7 @@ public class OmnipodUtil {
         this.currentCommand = currentCommand;
 
         if (currentCommand != null)
-            rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(currentCommand));
+            rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItemOmnipod(currentCommand));
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
index 39ccadd308..3247f02c8d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java
@@ -12,7 +12,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommunication
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitReceiver;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 
 /**
  * Created by andy on 4.8.2019
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 68d1be2f23..3b49779bd3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -8,7 +8,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.gson.GsonBuilder;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -605,6 +604,12 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
         return newRecordCreated;
     }
 
+    public TreatmentUpdateReturn createOrUpdateMedtronic(Treatment treatment, boolean fromNightScout) {
+        TreatmentService.UpdateReturn resultRecord = getService().createOrUpdateMedtronic(treatment, fromNightScout);
+
+        return new TreatmentUpdateReturn(resultRecord.success, resultRecord.newRecord);
+    }
+
     // return true if new record is created
     @Override
     public boolean addToHistoryTreatment(DetailedBolusInfo detailedBolusInfo, boolean allowUpdate) {
diff --git a/app/src/main/jniLibs/README.md b/app/src/main/jniLibs/README.md
new file mode 100644
index 0000000000..7041df4e10
--- /dev/null
+++ b/app/src/main/jniLibs/README.md
@@ -0,0 +1 @@
+# danars-support-lib
\ No newline at end of file
diff --git a/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so b/app/src/main/jniLibs/arm64-v8a/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..69e283b5feb97bb8a055667ad99ef5a9da19f549
GIT binary patch
literal 14000
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

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi-v7a/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..0c717bc3e836ca2b3bc7a546fa4d7779e1f52334
GIT binary patch
literal 13728
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
a1zkzJ0ZhE85RTh`+WnyWD^+48PWL~3K&c}D

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/armeabi/libBleCommandUtil.so b/app/src/main/jniLibs/armeabi/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..a51a8c7d9a16654b7d0e34c9d6e15b1a866b74f9
GIT binary patch
literal 13724
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
b9efny>4#*|LpbdNqECYFchpEdX}<pgP_0qI

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/mips/libBleCommandUtil.so b/app/src/main/jniLibs/mips/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..fcff5eb6b250d8a7f2ad4de289cc827108591260
GIT binary patch
literal 71484
zcmeI2dvILUeaC<I?n+u2VK1_5%a6ca>F#=YR9TG32%>3rWq}<=VHCiOp`Na;c30BI
zdR4nNHf5&kN5C_6wTlS}WHMzXW8!u^mP^cIT4-f3vD?YChM|<{G!yYEZU<5W=2afI
z-`{;mtF`11LZ<)xj_0S}dEawB=bYbptpDt~j_VagA=i1xM;wY)5j8{KvRI)iKXo>f
zMhhrR%c-6`M8n&V$(4HKWAQ?K5V+w2(p@P{=R910sXN_B#8P2JDpvYa3l(yO>p2Rk
zbkbGmlSp@^1!*i?w<`w`c11@#i<{Q@MmE{mK;+6Mq_Mc^-$got=Q#epA954Y-L|oA
z$G2FxJk)s|=dqo}*zGR6QP9Ig`$~eg7XY|i9R%!Y-HjXQvCWUB)}-_|vp3cr%qQC~
ztNs2T9=Zr=UxRR^iy;?6*wsR~>~apkErZlRcw81iRzj9QmO`o_=W{ddKQ|YT%LNcj
z9cvyiuLY1*5N<a+=EsiPx&pG01Ltu(57~K8)7yYM?6(Q~=^b+tUN_y3^sUI(iB9!F
z*CKoxx`^_70D{9-NuEq_i%~wr9zZz?#pyR7DGU&kPIv&}(+mch)AR7w1yG-p{tDtd
zO4@TX=Lf{3lYRnWnoh5!HUytU`_?<@|5{f5BZN!)_gBbw6z%ImANc!mggY>JUgYEO
zKbMt%tE~K+WnmuwGXea8<2liT^r@0?9N|+X;Xg%qvLwuF%ym3|s}Vj@lFnmYED2M*
zcQ~F*XND;rPi!;dJ?TNCKYeG)2^!hdwse-R+m=ei*QK)Y>jo3?P9w1y-cBQv*__%w
zZ`vJ0Bgr`vZ@zKP=v&eQDZ)2m!^8dQgpo}T4f2<a-qei-Qf@G|8u7%?0OZbrp?K05
zG)CfEvg!VKTYqZp(7=E(nB2g@-c+_dl^EGRoJ}R|rrt1^{;i6mljX(Z@k|zti6{Ct
z$9s%)Kk&>%^lmZG)kI$^u^El0-qc`f1mM<=Bxu0s?;nCn4J3xQQ-+(iHJz|~l*x`H
z28O9W-Q7Rb+msn%A38BIlukOKgrf%>oyjH>mtXD#lKt$7_h5vwP)Q?eP&{R;cy}hl
z4IJSV_>nM}M4LGpzIYsdTjQIv`EjKk-)>uLO(M4Qwyk%4b8D4K|8brlW8S%TByk~I
zJC&BO@hNeWu*;Us!TNJ;Pf7Au=2dA`>*SuFtPV^)=vkk8Fz+MHQ=i+-rowU_%J~B)
zbFhb+)eIj^S(?l3amoe4IjYayosT%>SCy1U-&?!(wCPWpPp@vLf0&5U-%qsC6B8};
z_(U^3HW8tt6IamBCc^aSgie1mq0y0v;F+Q)kh_h72d5}ln55vI97S_WM~RM&uA*ZT
zM1j$}=$gG}P-pc=nkN{Js(yNUwU$#xFK-CxtgmfYt#iKJPQIX~sZL(7e|j~i?I}s)
zI;`|a)Jb1#m48^Zzr*E`hd2**a^3x&zd_fz9j&?Lqi%X|iqtxa`t9#<o1e)y`Wk4t
zN8@dbg8nWwczV)<zUI;AJo=sogFIN|!6Xkhc`(X@RUXVRCR3jEX!9m|A%7)B+4R8$
zM$6h}wV&G-d>~4Cu5R=e|ISe#MeDd7+{PBP@dEPdRzJ~3jz^xuM8-a%SW$sipjBuU
z+5_!@_CkB1E1)Z&E1@f)tDvi(eb7GWYUl+Ng^m@ueFtZ=bNF^y-`z+r=1<YsW$mO{
zOW|%RTK!T;)h|}Yc`HXBl+jLq!=YfI=n49Yo-<~%UbtOtRjS*XRmIbK;6S2T&v{30
zrwWWg<Ds)=!=aDNU=e-Vy8`@!r*kUWRj8)5g@DgMjcc)cwig2RyRhO|C#gV5Yzv8&
zY6`Se(RGDNy1r0B>k3|4U+_>H{5!@yv}?SQc8>>qsuJ+6rhqR531TG&TD(Z-zD}0(
zmHAeqP0W|ag43g(YxbVT82B;Y?YY#26<=wMMKx9F^~jqw32lz5r%2JCr!kAi^YH&W
zjg|1wX7M-x9?$>ktK)IN;qj|4!Q=U_m`B9nVb6n^exJrX;IYL?LWgzKYZMi8p$&7P
zax~b&^W+Vr7wI(S!x{6n;#;Oxe8-%^ym)3WVSL{<L&bN^|HOR1zVK`K--BO;|9{{=
z3%>{cGw{C;zZZU-w2B|VUjhHS@P7zD&y)Ay{|Npn_|L-sG5kLG--rKy;jf1O1Nc9I
z-=xac8jQ2oI#K!bfNwwMMHurjq0<5{>6lX#@>0;ZgVY*@O!8hCVt+uv8FzPt{nV&X
zNZWz5KxERV&{S1867(s`TV`(^$KQ^*Qj7U`5yX%As-oV@u?`klb2Nr;+3Uaq?RC~c
zg|iNLJyc@;2kKLp+dAxhJJt=t+QU?Zb+D9<@2{g{`vbmioVAbb_s~u>xKiJ+L212p
zLu2zoj71$ix4NF5CBKj8nQvirV68;4x&qPbu~z;O_H@C$0pBas=sSkAF<uvikT0g-
zfI9Y$sV@meH2BY5ON)PtwY1n-OJkqgYl-L163W$f`n5w`_o1?N8Vu(wdxRslpVw*z
zdC@R#+q`)<J9%*m#~OcW!cRu%BU9CN*!UXy<wWC?W1isYDOIJdA=t!_4|^7;>ABj`
zQ?PFb4tSbzBhniWj(I%v`nXCTz=pi`2+_miUV3$0q4DvJ{upexR)=}4y0%+InNr)m
z(cgCXQtIMs2<}%eS^MIY(?8sXblcA4ruPN5M=I?PRnY69jsELK1HK<(Cf$nCKQCbN
z6$8Gl@Uwm#<MmSLLvt(aPN>K%2=<HH;no?9xO-uhW#>50rjq^CYNx{%ZOfbV%$gC3
z!q$6q%<Wci%hzB(^I;#L1s=?QOpl8_nE!?~|B3eR3$cGW&;LY3p~pg|*`{+Gt;9O0
zH%it)5bI!!-ZrCk98abZ`6G;xT8rsqjZxY7XgoeS>;ZSo8lM9P)aEg?ud%@CQ5AL{
zcHu|p|IUZ8cVJB&pYYQC#UPj~w866bGrX6~!+UMWPsj2Vq+`wBPl50TwCMnN2f=v@
zI6oHp*xUlnL44<T<80EaYx*q4UNH8w+IFRJmR-S3A6#ebib6LzTzAZ2UrM;bzL2>i
z^4)2!D$o7tF%0<LQ!A+vHnO33JLY&5v=74T?-qZ<-X^PE=sNae*ADq$hpJ&`RJJqN
zPkCRiLYVCk+gdO7Vcvt6(zA~3c@=iU-h0_bu^sx%G%j0)b;31!=v7$IM2TI}n{AtP
z{7c%TblrS5$+a8j?(a{Wv%d#haw_ldcYS8tB%Jrb?uC57cQcsj|If_YelN^;+&5v|
zmpS9k<5cI2Q|TN~tv#s`W5;__BkY*1D=_W>e*?#(eMyX|fxV&uqihsSbGQD9nXBWy
zlfTo2?<^|$PR*?Ea6PfIdSY|dlSDmyZsfVdZLG)q!g;u`+?i*Kr{~!Wv(HU0&Th})
zDdCuI?RhOYA4aZ6`I7~`<#lT0aLZ2-ezOp2sZxke;EZALyh7aUy^d{RsogwxZaq5h
z+`_(-fBjQjUEtVGx8tl|x>qQ;hrN7fn?8lKRk(-M<Gxjg`<5T~E$gne2luQ(4y9w(
z-O6r<hBH>ox<i%Ut%90!U&5V;^YC4Y<AP!5o`wB^<N1za$GiJQrFB2!dsF$HNujnY
z(4IWnl}G#XXs31e(Xe*7{q<=7%V@uj_G>stufn}?RzDuVoiR5_SKxVw?~KgX{yyK`
zXnG$E7WjUYweClixE~=SwdA&!+>N?a`(6~=hdvZB2b_CR%()lEoO@BsxfjKpdr{1}
z7sZ@=QOvm)#m>1G+54#7ChVm+gOv9BXL<AwcSF1XVf23~6`j3Pg<a?U5^G`Bez^<l
zV`jfJ%>%kZyXV<2L)b5mVZSU|`z7BmO|u(&tlD~X+sqsZOx;G&+)lg&#9+TC{q;14
zGsZF4?`N(1ln2^NCvawb4SVSc*zA+=_rXT5#`*CCY&*i3^HtE5IAbiOpTdrh;SAY>
zJYm@HvHg`a7Iy9TC+2?LgEr#@);U)OVZR^2neq+Wey`&*WtgH-==Jwt@BDA%y&Pvs
zMQOyjGJrl|%$Wn$Spa9s@6`ockQwc-r*Z2J?se91>D+3^y9Lj8o(Id&PuAQn*Ir?5
z7jU9QpJV7JYqm?a_By(PHSE<)A9gtQY6t990`{s4_G-88zMm{A`Ob{JVzyjQtgN0G
zS~Pb(JZ5yq++(()WXza5_rqoG+OnDUR_ULc6*$8`g0=RF{tUB@hGDzz!MFdbphqi|
zMh-_$BJ8_26b*yxY1@{yXo&mbjJeGnTfgL+(2*$$J^)*V^&Q1|8sDAgO~`&{D7RZ|
z6TbMHP?z&&5rtvpH=|{kZ|A(beBn2t9g6)H!*!f{51F*?A;E)Dundg4=Stg7OitS_
z>rJ7^_N!*pK3g?nZFc!P{X74H_eh13n4dc^Ka*ISDeL~GLRU}^{C8uG1hF<#Sepok
zpTl{p2WvBdwfUTL#@dBEA?s{~H86d)!aNCKZDJoTU7J7uo!2JbnXb6OS(D{w2L8Ug
z1~Ja)n|*)%O=pIgw$8l<%g+q_otZVr-)VE#pwnlr=iD{O^_=g_!1d0ovvJh53;Zgv
z&gMEZ^kCf2cV>uLX9kt-+xf9M7Wy?^g?(!opTQ?;=ob@si<`cK@*7Cwkui@-ckf(4
zll6FO#9ik5AwCy0^E;(BsRr@>XYKJ%Vm-A?S#yu;tEaA7epfN6dyTE<yGI-^yGOkA
zh3^po|NZKxW-LdmyyU?i_P1nMd+=u*w-j+pReFqKRvh*b>t0*_z7`DI>l^lWR^Peb
zK5)MfbIR^Fzf*W{_j*<hXlucEH^!IkaRPTPy@>q`d%B8!vH|<a)i^rLzJvMc-}1rm
zlp2iWoHcm9`|gyg(Ab(g@utb^6t;XHzvZoP`l8}nOQ+|09p;YxK8r?KXEuJHEx+R<
z&taZt8~uU3xS(MlT3du=Mjv9+ZU19xuvqc;Oo~NbK!1bOXvOKdB`AAzw3>40@BH5h
z!loeKVU?c6nP(T?JdfebvtyjgC;j6nZ=aLqdy7Dx!zhQc+`b*wdC6t_jk5N^{_9sd
zarjjed*X@wHDsWD%XAgt8oZZx`eTRq4SUlZj4I3CL68USK8A1en>Dwa->i9DV@0l`
z0)BqSu7u`y>?&w}$L^Y=?sERfa~SV8R^8QLa}Rbz{?3JD;AM-)p!99`aqE2Ub><AO
zb!&~abXoU5?kC=bFbce9*}n-aa^^$Ok2&@weiNAQtpC>F%$Z=;8M%NnvU4`(-%zaf
z<<JfEgZD)(7ju3?iCMp)@cv`vvCjGSZzlGh<k*i0?~SEr*O@arDkVS8R)K9(9<E~*
z)$66<m1SZ4-;7!5^=08@W#Od=^EXOeda!4xX)xW}m(3)Gwq%=}9}SJ+41Rmemi}lO
zzO>_e_}%pD{l;ML*Kf{_qz8MyNu;dwd~+izTmb2O!!(DXUw+p#e**o$d#3pm>$9dg
z1^p@XS!nveG;0+6ZV#<NAAxR$PJU>b9ni-=H_dI(*1;0ll{;@D<*rMVl{H_(|46a_
zAH&P9n<oFxPaO-__dTTirTQb!554zS{Gjr_s(rqDs|yR-FT9xlA3{5%8SR;bMqaJ+
zA!VO>uLpZQkp@XZUPL<Kdq@v&d`S6$dY@;X_udNZ^L88dKp#P0I4?Uk6x=^Tf4p`%
zt^FazYVT1*zlHcdPKV<@@Ch*bzG<%K2skePACN5KI6t?G%ZK4T3-N<TSCtii-o7!r
z_RqipS<CyzQR0Mv5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@LO=)z0U;m+gn$qb0zyCt2mv7=1cZPP
z5CTF#2nYcoAOwVf5D)@FKnMr{As_^ZqE$8p1!^b$u-@zFA3J*7(SPmeC!iN{F_maJ
z)Kd!;S_$oitbj}+yb9Xq#Qg&KE8yRR43*G(QEmbB3g`=<{SXgpzd{#5pF*Zu=z7Rv
z2-kxuh9O+fFp6<K!%$q$FsGy3@YkSGZa4sqa>GlZxej)pnC1|d{~Y=V3Y$*&4D?oR
z)R%Q=^BgWmi0^XP+EndaXVADQ$SKGqgxwM7B4pj#wbyFlbvJIfRBLX!rfHkDCUWJ~
zkt^3+rG<w_QX{GUl#xkYO0mJ@$WS_|CHjrQUTte?B$FN*)UIxdG+h;mL|P)67VbvI
zq=wjzj$6M|l5}ZFo9u79f0^AS5O+Sf@ve5$w@vrSO|i9`UbNE9$xi{;&9NSyiy>Tp
zcnQZ=<x0~v#JJ^8Tj`g~N)MN&^PtY*-0~gEti)O6HAK1To$iDvtHVuy@;9Vg6P{?^
z`j7I0p!xe>XN~#%{f{j|@!r8Lq%cTt1vO>*GTD)=(M?U?`F7{cO-6URr{Cz!P}4}N
zH$B)hL`{Q3*;EtCG<9!D_b2}#ousBdBhyDs$?b!g?E|*Xj*ykdnJ=>fain2-aeivb
zrnY6BZ)LJuy7@yxNh51eQ>riCGhz&+;(bXJa6{CT9!zKB#>j}Votk<OaQ&#x7)U4Z
zeXDry5bEvDpu)t^z(8scp<%9wTW(~tBkArf*;Iz{eL=^z<1(yswg=l3TS|wI?E;6{
zCb7NXd<EoVDb2@ri^Gi&rq1~eA`goWzw0<3yKg|)o^d|5Z7h>c9F%1TId3b3+sOIY
z=CPbYUN$!z$9dTHwL{qcaU9!77PgJ9LlMh$;4j-PPGXzIaxMJa7IqxZavOy09Q)bU
zv1sr^S@xa3%dQVn4dHxjb6J>!TOa3RhJOO#HgI{i4=h~_)p6Vhc6UJBd~DBHEF*2D
z+WlqkE+^j_Xn%t(-{J(vaUCpw?r3gbC-Sjug5Py+KORH`=jVKfkcXv}BOK@E+mA5s
zTg;mGEEYG7v%3BX_<0#}KHke%n1k!we1C@sX2Rb+i99SV_%6q><9uB1IE0(S_3^&I
z;xe<M_z&DaL7aSk-V0fH4!MrYaGn1G;d;5gPUPu;Xz;tvt@}kpaD5Rcf%7HZOimi7
w|I+chNk@>c$O(?)Z?bz8@;>I36~Ld)+S&bZi?Fu(>SXLfzIWY1&~Co}1MRzcO#lD@

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/mips64/libBleCommandUtil.so b/app/src/main/jniLibs/mips64/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..a8a292ea13037eccfe791f25e6526e8947b64a24
GIT binary patch
literal 14808
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
Vi@KXCds`=a1^r1Ij<dz|{{^|Ld3yi=

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86/libBleCommandUtil.so b/app/src/main/jniLibs/x86/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..638a9def954cf6ee4f3347adb3ffac94c61f6984
GIT binary patch
literal 13668
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

literal 0
HcmV?d00001

diff --git a/app/src/main/jniLibs/x86_64/libBleCommandUtil.so b/app/src/main/jniLibs/x86_64/libBleCommandUtil.so
new file mode 100644
index 0000000000000000000000000000000000000000..94873d3732404ea850d7758d70e77e81b415dcc4
GIT binary patch
literal 14272
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
Pob#VbL?SQx73lv3RqkM5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf2f9a199b..a9f9a21bf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1242,175 +1242,8 @@
     <string name="preconditions">Preconditions:</string>
 
 
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operation not supported by pump and/or driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operation not YET supported by pump.</string>
-
-    <!-- Medtronic (MDT) - Base -->
-    <string name="medtronic_name" translatable="false">Medtronic</string>
-    <string name="medtronic_name_short" translatable="false">MDT</string>
-    <string name="description_pump_medtronic">Pump integration for Medtronic, requires RileyLink device and specific Pump Model</string>
-
-    <!-- MDT Configuration -->
-    <string name="key_medtronic_serial" translatable="false">pref_medtronic_serial</string>
-    <string name="key_medtronic_pump_type" translatable="false">pref_medtronic_pump_type</string>
-    <string name="key_medtronic_frequency" translatable="false">pref_medtronic_frequency</string>
-    <string name="key_medtronic_max_bolus" translatable="false">pref_medtronic_max_bolus</string>
-    <string name="key_medtronic_max_basal" translatable="false">pref_medtronic_max_basal</string>
-    <string name="key_medtronic_bolus_delay" translatable="false">pref_medtronic_bolus_delay</string>
-    <string name="key_medtronic_encoding" translatable="false">pref_medtronic_encoding</string>
-    <string name="key_medtronic_battery_type" translatable="false">pref_medtronic_battery_type</string>
-    <string name="key_medtronic_bolus_debug" translatable="false">pref_medtronic_bolus_debug</string>
-    <string name="key_rileylink_mac_address" translatable="false">pref_rileylink_mac_address</string>
-    <string name="key_medtronic_pump_frequency_us_ca" translatable="false">medtronic_pump_frequency_us_ca</string>
-    <string name="key_medtronic_pump_frequency_worldwide" translatable="false">medtronic_pump_frequency_worldwide</string>
-    <string name="key_medtronic_pump_encoding_4b6b_local" translatable="false">medtronic_pump_encoding_4b6b_local</string>
-    <string name="key_medtronic_pump_encoding_4b6b_rileylink" translatable="false">medtronic_pump_encoding_4b6b_rileylink</string>
-    <string name="key_medtronic_pump_battery_no" translatable="false">medtronic_pump_battery_no</string>
-    <string name="key_medtronic_pump_battery_alkaline" translatable="false">medtronic_pump_battery_alkaline</string>
-    <string name="key_medtronic_pump_battery_lithium" translatable="false">medtronic_pump_battery_lithium</string>
-    <string name="key_medtronic_pump_battery_nizn" translatable="false">medtronic_pump_battery_nizn</string>
-    <string name="key_medtronic_pump_battery_nimh" translatable="false">medtronic_pump_battery_nimh</string>
-
-    <string name="medtronic_serial_number">Pump Serial Number</string>
-    <string name="medtronic_pump_type">Pump Type</string>
-    <string name="medtronic_pump_frequency">Pump Frequency</string>
-    <string name="medtronic_pump_bolus_delay">Delay before Bolus is started (s)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolus on Pump (U)</string>
-    <string name="medtronic_pump_max_basal">Max Basal on Pump (U/h)</string>
-    <string name="medtronic_pump_encoding">Medtronic Encoding</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Worldwide (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Encoding</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Encoding</string>
-    <string name="medtronic_custom_action_wake_and_tune">Wake and Tune Up</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Clear Bolus Block</string>
-    <string name="medtronic_custom_action_reset_rileylink">Reset RileyLink Config</string>
-    <string name="medtronic_pump_battery_select">Battery Type (Power View)</string>
-    <string name="medtronic_pump_battery_no">Not selected (Simple view)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaline (Extended view)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (Extended view)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
-    <string name="medtronic_bolus_debugging">Bolus/Treatments Debugging</string>
-
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Selected</string>
-    <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="location_yes">Enable</string>
-    <string name="location_no">No</string>
-    <string name="rileylink_scanner_scanning">Scanning</string>
-    <string name="rileylink_scanner_scanning_finished">Scanning finished</string>
-    <string name="rileylink_scanner_scanning_error">Scanning error: %1$d</string>
-    <string name="common_never">Never</string>
-
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Settings</string>
-    <string name="rileylink_settings_tab2">History</string>
-    <string name="rileylink_status">RileyLink Status</string>
-    <string name="medtronic_pump_status">Pump Status</string>
-    <string name="title_activity_rileylink_settings">RileyLink Settings</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Configured Address</string>
-    <string name="rileylink_connected_device">Connected Device</string>
-    <string name="rileylink_connection_status">Connection Status</string>
-    <string name="rileylink_connection_error">Connection Error</string>
-    <string name="rileylink_device">Device</string>
-    <string name="rileylink_device_type">Device Type</string>
-    <string name="rileylink_device_model">Device Model</string>
-    <string name="rileylink_last_used_frequency">Last used frequency</string>
-    <string name="rileylink_last_device_contact">Last device contact</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
 
 
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth Initializing…</string>
-    <string name="rileylink_state_bt_error">Bluetooth Error</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Ready</string>
-    <string name="rileylink_state_not_started">Not Started</string>
-    <string name="rileylink_state_rl_init">RileyLink Initialization…</string>
-    <string name="rileylink_state_rl_error">RileyLink Error</string>
-    <string name="rileylink_state_pc_tune_up">Tuning up RileyLink and Pump</string>
-    <string name="rileylink_state_pc_error">Problem connecting to Pump</string>
-    <string name="rileylink_state_connected">Connected</string>
-
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Device is not RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink unreachable</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth disabled</string>
-    <string name="rileylink_error_no_bt_adapter">No Bluetooth Adapter</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp Failed</string>
-    <string name="rileylink_error_pump_unreachable">Pump unreachable</string>
-    <string name="rileylink_error_pod_unreachable">Pod unreachable</string>
-
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronic Pump</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-
-
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Errors</string>
-    <string name="medtronic_error_serial_not_set">Serial # not set.</string>
-    <string name="medtronic_error_serial_invalid">Serial # invalid.</string>
-    <string name="medtronic_error_pump_type_not_set">Pump Type not set.</string>
-    <string name="medtronic_error_pump_type_invalid">Pump Type unsupported.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Pump Frequency not set.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Pump Frequency unsupported.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink Address invalid.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Pump type detected is not the same as configured type.</string>
-
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal profiles/patterns setting is not enabled on pump. Enable it on the pump.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basal profile set on pump is incorrect (must be STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Wrong TBR type set on pump (must be Absolute).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Wrong Max Bolus set on Pump (must be %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Wrong Max Basal set on Pump (must be %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operation is not possible.\n\n You need to configure Medtronic Pump first, before you can use this operation.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Over 24h Time change was requested.</string>
-
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basals</string>
-    <string name="medtronic_history_group_configuration">Configurations</string>
-    <string name="medtronic_history_group_notification">Notifications</string>
-    <string name="medtronic_history_group_statistic">Statistics</string>
-    <string name="medtronic_history_group_unknown">Unknowns</string>
-    <string name="medtronic_history_group_all">All</string>
-    <string name="medtronic_pump_history">Medtronic Pump History</string>
-
-
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Never contacted</string>
-    <string name="medtronic_pump_status_waking_up">Waking up</string>
-    <string name="medtronic_pump_status_error_comm">Error with communication</string>
-    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>
-    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>
-    <string name="medtronic_pump_status_active">Active</string>
-    <string name="medtronic_pump_status_sleeping">Sleeping</string>
-
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">You cancelled Bolus, after it was already set on Pump. Since Medtronic Pump doesn\'t support cancel, you will need to manually cancel it. Put the Pump into Suspend mode and then do Resume (if you still want to cancel). Application will pick up changes, on next update (in less than 5 minutes).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Could not read current TBR.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Could not cancel current TBR. Stopping operation.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Profile set failed, because following patterns, have too big basal rate: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus could not be delivered.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus could not be delivered, because available insulin amount (%1$.2f) is less than bolus required (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR could not be set.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Could not cancel current TBR.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basal profile could not be set.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
-
-    <string name="medtronic_cmd_desc_get_history">Get History - Page %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Get History - Page %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Get Pump Time</string>
-    <string name="medtronic_cmd_desc_get_settings">Get Settings</string>
-    <string name="medtronic_cmd_desc_get_model">Get Pump Model</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Get Basal Profile</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Set Basal Profile</string>
-    <string name="medtronic_cmd_desc_get_tbr">Get Temporary Basal</string>
-    <string name="medtronic_cmd_desc_set_tbr">Set Temporary Basal</string>
-    <string name="medtronic_cmd_desc_set_bolus">Set Bolus</string>
     <string name="profilename">Change profile to</string>
     <string name="changengetoprofilename">Change profile to %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Last connection to pump</string>
@@ -1565,6 +1398,17 @@
     <string name="skin">Skin</string>
 
 
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Never contacted</string>
+    <string name="medtronic_pump_status_waking_up">Waking up</string>
+    <string name="medtronic_pump_status_error_comm">Error with communication</string>
+    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>
+    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>
+    <string name="medtronic_pump_status_active">Active</string>
+    <string name="medtronic_pump_status_sleeping">Sleeping</string>
+
+
     <!-- Omnipod -->
 
     <!-- Omnipod - Base -->
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtilUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtilUTest.java
index 5d069f0345..7b79c62e82 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtilUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtilUTest.java
@@ -6,8 +6,6 @@ import junit.framework.Assert;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class DateTimeUtilUTest {
 
     @Test
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
index 1e10544e88..be499cdc97 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
@@ -1,15 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm;
 
-import java.util.Map;
-
 import org.junit.Ignore;
-import org.junit.Test;
-
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
 /**
  * Created by andy on 1/30/19.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
index 824d9a3f1e..e02c4bab20 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
@@ -1,18 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm;
 
-import android.util.Log;
-
-import org.junit.Before;
-
-import java.util.List;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RawHistoryPage;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.MedtronicPumpHistoryDecoder;
-import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
-
-import static org.mockito.Mockito.when;
 //import uk.org.lidalia.slf4jtest.TestLogger;
 //import uk.org.lidalia.slf4jtest.TestLoggerFactory;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
index 0420dba922..3cfd7dc067 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
@@ -1,10 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
 
-import org.junit.Before;
 import org.junit.Ignore;
 
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
-import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 
 /**
  * Created by andy on 11/1/18.
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
index c668f53f06..af8c7b0d0a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump;
 
 import org.junit.Assert;
-import org.junit.Test;
 
 import java.util.Date;
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
index 21b98660d6..8b2eaa3e7e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
@@ -1,20 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
 
-import junit.framework.Assert;
-
-import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Test;
-import org.powermock.api.mockito.PowerMockito;
 
-import info.nightscout.androidaps.interfaces.PumpDescription;
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.DateUtil;
-import info.nightscout.androidaps.utils.T;
-
-import static org.mockito.Mockito.when;
 
 /**
  * Created by andy on 6/16/18.
diff --git a/core/build.gradle b/core/build.gradle
index 5f2fed073e..3b10b7b96f 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -75,6 +75,9 @@ dependencies {
     implementation "com.j256.ormlite:ormlite-core:${ormLiteVersion}"
     implementation "com.j256.ormlite:ormlite-android:${ormLiteVersion}"
 
+    // pumpCommon
+    implementation "com.google.code.gson:gson:2.8.6"
+
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventCustomActionsChanged.kt b/core/src/main/java/info/nightscout/androidaps/events/EventCustomActionsChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventCustomActionsChanged.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventCustomActionsChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.kt b/core/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.kt
rename to core/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.kt
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index fbaab3d3db..35226a2537 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -1,11 +1,7 @@
 package info.nightscout.androidaps.interfaces
 
 import com.j256.ormlite.dao.CloseableIterator
-import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.DanaRHistoryRecord
-import info.nightscout.androidaps.db.DbRequest
-import info.nightscout.androidaps.db.TDD
+import info.nightscout.androidaps.db.*
 
 interface DatabaseHelperInterface {
 
@@ -21,4 +17,10 @@ interface DatabaseHelperInterface {
     fun deleteDbRequestbyMongoId(action: String, _id: String)
     fun getDbRequestInterator(): CloseableIterator<DbRequest>
     fun roundDateToSec(date: Long): Long
+    fun createOrUpdateTDD(record: TDD)
+    fun createOrUpdate(tempBasal: TemporaryBasal)
+    fun findTempBasalByPumpId(id: Long) : TemporaryBasal
+    fun getTemporaryBasalsDataFromTime(mills: Long, ascending: Boolean) : List<TemporaryBasal>
+    fun getCareportalEventFromTimestamp(timestamp: Long): CareportalEvent
+    fun getTDDsForLastXDays(days: Int): List<TDD>
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
index 8856f8a74e..8c8d7f026f 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/TreatmentsInterface.java
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.db.ProfileSwitch;
 import info.nightscout.androidaps.db.TempTarget;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.plugins.treatments.TreatmentUpdateReturn;
 
 /**
  * Created by mike on 14.06.2016.
@@ -84,4 +85,6 @@ public interface TreatmentsInterface {
 
     long oldestDataAvailable();
 
+    TreatmentUpdateReturn createOrUpdateMedtronic(Treatment treatment, boolean fromNightScout);
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 6227d2ea2a..a4475886f6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -13,8 +13,7 @@ import org.json.JSONObject;
 import java.util.Date;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.BuildConfig;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
@@ -37,7 +36,6 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
-import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.DecimalFormatter;
@@ -118,7 +116,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
     @Override
     protected void onStart() {
         super.onStart();
-        // TODO: moved from constructor .... test if it works
+
         initPumpStatusData();
 
         Intent intent = new Intent(context, getServiceClass());
@@ -418,8 +416,8 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
                 // bolus needed, ask pump to deliver it
                 return deliverBolus(detailedBolusInfo);
             } else {
-                if (MedtronicHistoryData.doubleBolusDebug)
-                    aapsLogger.debug("DoubleBolusDebug: deliverTreatment::(carb only entry)");
+                //if (MedtronicHistoryData.doubleBolusDebug)
+                //    aapsLogger.debug("DoubleBolusDebug: deliverTreatment::(carb only entry)");
 
                 // no bolus required, carb only treatment
                 activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, true);
@@ -433,7 +431,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
                 aapsLogger.debug(LTag.PUMP, "deliverTreatment: Carb only treatment.");
 
                 return new PumpEnactResult(getInjector()).success(true).enacted(true).bolusDelivered(0d)
-                        .carbsDelivered(detailedBolusInfo.carbs).comment(getResourceHelper().gs(R.string.virtualpump_resultok));
+                        .carbsDelivered(detailedBolusInfo.carbs).comment(getResourceHelper().gs(R.string.common_resultok));
             }
         } finally {
             triggerUIChange();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
index 3c51b484e8..08c8e60d56 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
@@ -49,7 +49,7 @@ public abstract class PumpStatus {
     public int tempBasalRatio = 0;
     public int tempBasalRemainMin = 0;
     public Date tempBasalStart;
-    private PumpType pumpType;
+    public PumpType pumpType;
     //protected PumpDescription pumpDescription;
 
 
@@ -69,9 +69,20 @@ public abstract class PumpStatus {
         this.lastConnection = System.currentTimeMillis();
     }
 
+
     public void setLastFailedCommunicationToNow() {
         this.lastErrorConnection = System.currentTimeMillis();
     }
 
+
     public abstract String getErrorInfo();
+
+
+    public abstract <E> E getCustomData(String key, Class<E> clazz);
+
+    public String getCustomDataAsString(String key) {
+        return getCustomData(key, String.class);
+    }
+
+
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java
similarity index 93%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java
index 08ff0c3b49..5a1e0b4249 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/TempBasalPair.java
@@ -2,11 +2,6 @@ package info.nightscout.androidaps.plugins.pump.common.data;
 
 import com.google.gson.annotations.Expose;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import info.nightscout.androidaps.logging.L;
-
 public class TempBasalPair {
 
     @Expose
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.java
new file mode 100644
index 0000000000..4a9814c490
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.java
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.common.defs;
+
+import info.nightscout.androidaps.core.R;
+
+/**
+ * Created by andy on 6/11/18.
+ */
+public enum PumpDeviceState {
+
+    NeverContacted(R.string.pump_status_never_contacted), //
+    Sleeping(R.string.pump_status_sleeping), //
+    WakingUp(R.string.pump_status_waking_up), //
+    Active(R.string.pump_status_active), //
+    ErrorWhenCommunicating(R.string.pump_status_error_comm), //
+    TimeoutWhenCommunicating(R.string.pump_status_timeout_comm), //
+    // ProblemContacting(R.string.medtronic_pump_status_problem_contacting), //
+    PumpUnreachable(R.string.pump_status_pump_unreachable), //
+    InvalidConfiguration(R.string.pump_status_invalid_config);
+
+    Integer resourceId;
+
+    PumpDeviceState(int resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getResourceId() {
+        return resourceId;
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
similarity index 72%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
index 9958d290e4..d17244615f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.java
@@ -3,7 +3,8 @@ package info.nightscout.androidaps.plugins.pump.common.defs;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.core.R;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 
@@ -16,16 +17,16 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public enum PumpHistoryEntryGroup {
 
-    All(R.string.medtronic_history_group_all),
-    Bolus(R.string.danar_history_bolus),
-    Basal(R.string.medtronic_history_group_basal),
-    Prime(R.string.danar_history_prime),
-    Configuration(R.string.medtronic_history_group_configuration),
-    Alarm(R.string.danar_history_alarm),
-    Glucose(R.string.danar_history_glucose),
-    Notification(R.string.medtronic_history_group_notification),
-    Statistic(R.string.medtronic_history_group_statistic),
-    Unknown(R.string.medtronic_history_group_unknown),
+    All(R.string.history_group_all),
+    Bolus(R.string.history_group_bolus),
+    Basal(R.string.history_group_basal),
+    Prime(R.string.history_group_prime),
+    Configuration(R.string.history_group_configuration),
+    Alarm(R.string.history_group_alarm),
+    Glucose(R.string.history_group_glucose),
+    Notification(R.string.history_group_notification),
+    Statistic(R.string.history_group_statistic),
+    Unknown(R.string.history_group_unknown),
     ;
 
     private int resourceId;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RefreshableInterface.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RefreshableInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RefreshableInterface.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RefreshableInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventRefreshButtonState.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt
similarity index 63%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventRefreshButtonState.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt
index 81b9af4ff3..54f4773141 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventRefreshButtonState.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRefreshButtonState.kt
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.plugins.pump.medtronic.events
+package info.nightscout.androidaps.plugins.pump.common.events
 
 import info.nightscout.androidaps.events.Event
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/CRC.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 20c19c644c..96063673da 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -6,15 +6,10 @@ package info.nightscout.androidaps.plugins.pump.common.utils;
 
 import org.joda.time.LocalDateTime;
 import org.joda.time.Minutes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
-
 /**
  * This is simple version of ATechDate, limited only to one format (yyyymmddHHMIss)
  */
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentUpdateReturn.java b/core/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentUpdateReturn.java
new file mode 100644
index 0000000000..42b71b0217
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentUpdateReturn.java
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.treatments;
+
+import info.nightscout.androidaps.db.Treatment;
+
+public class TreatmentUpdateReturn {
+
+    public TreatmentUpdateReturn(boolean success, boolean newRecord) {
+        this.success = success;
+        this.newRecord = newRecord;
+    }
+
+    boolean newRecord;
+    boolean success;
+
+    @Override
+    public String toString() {
+        return "UpdateReturn [" +
+                "newRecord=" + newRecord +
+                ", success=" + success +
+                ']';
+    }
+
+}
+
+
+
+
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6a5bcfd214..e893703cea 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -220,4 +220,57 @@
     <!--    Ntp-->
     <string name="timedetection">Time detection</string>
 
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operation not supported by pump and/or driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operation not YET supported by pump.</string>
+    <string name="common_resultok">OK</string>
+
+    <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Never contacted</string>
+    <string name="pump_status_waking_up">Waking up</string>
+    <string name="pump_status_error_comm">Error with communication</string>
+    <string name="pump_status_timeout_comm">Timeout on communication</string>
+    <string name="pump_status_pump_unreachable">Pump unreachable</string>
+    <string name="pump_status_invalid_config">Invalid configuration</string>
+    <string name="pump_status_active">Active</string>
+    <string name="pump_status_sleeping">Sleeping</string>
+
+    <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basals</string>
+    <string name="history_group_configuration">Configurations</string>
+    <string name="history_group_notification">Notifications</string>
+    <string name="history_group_statistic">Statistics</string>
+    <string name="history_group_unknown">Unknowns</string>
+    <string name="history_group_all">All</string>
+    <string name="history_group_bolus">Boluses</string>
+    <string name="history_group_prime">Prime</string>
+    <string name="history_group_alarm">Alarms</string>
+    <string name="history_group_glucose">Glucose</string>
+
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+
+
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
+
+
+
 </resources>
\ No newline at end of file
diff --git a/medtronic/.gitignore b/medtronic/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/medtronic/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/medtronic/build.gradle b/medtronic/build.gradle
new file mode 100644
index 0000000000..9551210275
--- /dev/null
+++ b/medtronic/build.gradle
@@ -0,0 +1,83 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation project(':core')
+    implementation project(':rileylink')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
+
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+
+    // medtronic - start
+    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'net.danlew:android.joda:2.10.6'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation "com.google.code.gson:gson:2.8.6"
+    // medtronic - end
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/medtronic/consumer-rules.pro b/medtronic/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/medtronic/proguard-rules.pro b/medtronic/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/medtronic/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java b/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000..63cded8fe7
--- /dev/null
+++ b/medtronic/src/androidTest/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.medtronic;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("info.nightscout.androidaps.plugins.pump.medtronic.test", appContext.getPackageName());
+    }
+}
diff --git a/medtronic/src/main/AndroidManifest.xml b/medtronic/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..35ba1d4ce4
--- /dev/null
+++ b/medtronic/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.plugins.pump.medtronic" />
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index da9a2321f6..079ab51586 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -8,8 +8,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.MainApp
-import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
@@ -18,20 +16,14 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState
+import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.events.EventQueueChanged
@@ -49,7 +41,7 @@ import javax.inject.Inject
 
 class MedtronicFragment : DaggerFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
-    @Inject lateinit var mainApp: MainApp
+    //@Inject lateinit var mainApp: MainApp
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var rxBus: RxBusWrapper
@@ -57,10 +49,10 @@ class MedtronicFragment : DaggerFragment() {
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var warnColors: WarnColors
-    @Inject lateinit var rileyLinkUtil: RileyLinkUtil
+    @Inject lateinit var rileyLinkUtil: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
     @Inject lateinit var medtronicUtil: MedtronicUtil
     @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
-    @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
+    @Inject lateinit var rileyLinkServiceData: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -83,7 +75,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        medtronic_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+        medtronic_rl_status.text = resourceHelper.gs(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
 
         medtronic_pump_status.setTextColor(Color.WHITE)
         medtronic_pump_status.text = "{fa-bed}"
@@ -112,7 +104,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_stats.setOnClickListener {
             if (medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
-                startActivity(Intent(context, RileyLinkStatusActivity::class.java))
+                startActivity(Intent(context, info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
             }
@@ -128,7 +120,7 @@ class MedtronicFragment : DaggerFragment() {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ medtronic_refresh.isEnabled = it.newState }, { fabricPrivacy.logException(it) })
         disposable += rxBus
-            .toObservable(EventMedtronicDeviceStatusChange::class.java)
+            .toObservable(EventRileyLinkDeviceStatusChange::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
                 aapsLogger.debug(LTag.PUMP, "onStatusEvent(EventMedtronicDeviceStatusChange): $it")
@@ -175,34 +167,34 @@ class MedtronicFragment : DaggerFragment() {
 
     @Synchronized
     private fun setDeviceStatus() {
-        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.MedtronicPump)
+        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump)
         val rileyLinkError = medtronicPumpPlugin.rileyLinkService?.error
         medtronic_rl_status.text =
             when {
-                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isConnecting                        -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null   -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
-                else                                                                          -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState == info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
+                else                                                                                                                                            -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
             }
         medtronic_rl_status.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
         medtronic_errors.text =
             rileyLinkServiceData.rileyLinkError?.let {
-                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                resourceHelper.gs(it.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
             } ?: "-"
 
         when (medtronicPumpStatus.pumpDeviceState) {
             null,
-            PumpDeviceState.Sleeping             -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
-            PumpDeviceState.NeverContacted,
-            PumpDeviceState.WakingUp,
-            PumpDeviceState.PumpUnreachable,
-            PumpDeviceState.ErrorWhenCommunicating,
-            PumpDeviceState.TimeoutWhenCommunicating,
-            PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.Sleeping             -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.NeverContacted,
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.WakingUp,
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.PumpUnreachable,
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.ErrorWhenCommunicating,
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.TimeoutWhenCommunicating,
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
 
-            PumpDeviceState.Active               -> {
+            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.Active               -> {
                 val cmd = medtronicUtil.getCurrentCommand()
                 if (cmd == null)
                     medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
@@ -235,7 +227,7 @@ class MedtronicFragment : DaggerFragment() {
 
     private fun displayNotConfiguredDialog() {
         context?.let {
-            OKDialog.show(it, resourceHelper.gs(R.string.combo_warning),
+            OKDialog.show(it, resourceHelper.gs(R.string.medtronic_warning),
                 resourceHelper.gs(R.string.medtronic_error_operation_not_possible_no_configuration), null)
         }
     }
@@ -252,7 +244,7 @@ class MedtronicFragment : DaggerFragment() {
             val minAgo = DateUtil.minAgo(resourceHelper, medtronicPumpStatus.lastConnection)
             val min = (System.currentTimeMillis() - medtronicPumpStatus.lastConnection) / 1000 / 60
             if (medtronicPumpStatus.lastConnection + 60 * 1000 > System.currentTimeMillis()) {
-                medtronic_lastconnection.setText(R.string.combo_pump_connected_now)
+                medtronic_lastconnection.setText(R.string.medtronic_pump_connected_now)
                 medtronic_lastconnection.setTextColor(Color.WHITE)
             } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) {
 
@@ -260,13 +252,13 @@ class MedtronicFragment : DaggerFragment() {
                     medtronic_lastconnection.text = resourceHelper.gs(R.string.minago, min)
                 } else if (min < 1440) {
                     val h = (min / 60).toInt()
-                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.objective_hours, h, h) + " "
+                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.duration_hours, h, h) + " "
                         + resourceHelper.gs(R.string.ago))
                 } else {
                     val h = (min / 60).toInt()
                     val d = h / 24
                     // h = h - (d * 24);
-                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.objective_days, d, d) + " "
+                    medtronic_lastconnection.text = (resourceHelper.gq(R.plurals.duration_days, d, d) + " "
                         + resourceHelper.gs(R.string.ago))
                 }
                 medtronic_lastconnection.setTextColor(Color.RED)
@@ -285,13 +277,13 @@ class MedtronicFragment : DaggerFragment() {
             val unit = resourceHelper.gs(R.string.insulin_unit_shortname)
             val ago: String
             if (agoMsc < 60 * 1000) {
-                ago = resourceHelper.gs(R.string.combo_pump_connected_now)
+                ago = resourceHelper.gs(R.string.medtronic_pump_connected_now)
             } else if (bolusMinAgo < 60) {
                 ago = DateUtil.minAgo(resourceHelper, medtronicPumpStatus.lastBolusTime.time)
             } else {
                 ago = DateUtil.hourAgo(medtronicPumpStatus.lastBolusTime.time, resourceHelper)
             }
-            medtronic_lastbolus.text = resourceHelper.gs(R.string.combo_last_bolus, bolus, unit, ago)
+            medtronic_lastbolus.text = resourceHelper.gs(R.string.mdt_last_bolus, bolus, unit, ago)
         } else {
             medtronic_lastbolus.text = ""
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 89480fcdf3..9cd138f4d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -30,13 +30,13 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.ErrorHelperActivity;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.data.PumpEnactResult;
 import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TemporaryBasal;
+
 import info.nightscout.androidaps.events.EventRefreshOverview;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.CommandQueueProvider;
@@ -79,8 +79,9 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificat
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicStatusRefreshType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
+import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
@@ -242,10 +243,16 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         return true;
     }
 
-    @Override public void doTuneUpDevice() {
+    @Override
+    public void doTuneUpDevice() {
         rileyLinkMedtronicService.doTuneUpDevice();
     }
 
+    @Override
+    public void triggerPumpConfigurationChangedEvent() {
+        rxBus.send(new EventMedtronicPumpConfigurationChanged());
+    }
+
     private void migrateSettings() {
 
         if ("US (916 MHz)".equals(sp.getString(MedtronicConst.Prefs.PumpFrequency, "US (916 MHz)"))) {
@@ -860,7 +867,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                         Intent i = new Intent(context, ErrorHelperActivity.class);
                         i.putExtra("soundid", R.raw.boluserror);
                         i.putExtra("status", getResourceHelper().gs(R.string.medtronic_cmd_cancel_bolus_not_supported));
-                        i.putExtra("title", getResourceHelper().gs(R.string.combo_warning));
+                        i.putExtra("title", getResourceHelper().gs(R.string.medtronic_warning));
                         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         context.startActivity(i);
 
@@ -1538,7 +1545,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                     Intent i = new Intent(context, ErrorHelperActivity.class);
                     i.putExtra("soundid", R.raw.boluserror);
                     i.putExtra("status", getResourceHelper().gs(R.string.medtronic_error_operation_not_possible_no_configuration));
-                    i.putExtra("title", getResourceHelper().gs(R.string.combo_warning));
+                    i.putExtra("title", getResourceHelper().gs(R.string.medtronic_warning));
                     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     context.startActivity(i);
                 }
@@ -1571,7 +1578,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         this.hasTimeDateOrTimeZoneChanged = true;
     }
 
-    @Override public boolean setNeutralTempAtFullHour() {
+    @Override
+    public boolean setNeutralTempAtFullHour() {
         return sp.getBoolean(R.string.key_set_neutral_temps, true);
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
index 3737dd0226..b71dec4621 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
@@ -12,9 +12,9 @@ import java.util.Map;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -24,8 +24,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMe
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RLMessageType;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
@@ -48,7 +46,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
@@ -151,6 +148,8 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
 
         PumpDeviceState state = medtronicPumpStatus.getPumpDeviceState();
 
+        // check connection
+
         byte[] pumpMsgContent = createPumpMessageContent(RLMessageType.ReadSimpleData); // simple
         RFSpyResponse rfSpyResponse = rfspy.transmitThenReceive(new RadioPacket(injector, pumpMsgContent), (byte) 0, (byte) 200,
                 (byte) 0, (byte) 0, 25000, (byte) 0);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverter.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoderInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
index fb42eca31c..b59dce7113 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntry.java
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history;
 import com.google.gson.annotations.Expose;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryEntryInterface.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RawHistoryPage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/RecordDecodeStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/CGMSHistoryEntryType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/cgms/MedtronicCGMSHistoryDecoder.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkLongMessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/CarelinkShortMessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/GetHistoryPageCarelinkMessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/MessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PacketType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpAckMessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/UnknownMessageBody.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
index 51a8020fcd..fedacfd117 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUITask.java
@@ -8,15 +8,15 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicUIResponseType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 
@@ -201,10 +201,10 @@ public class MedtronicUITask {
         }
 
         if (responseType == MedtronicUIResponseType.Invalid) {
-            rxBus.send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+            rxBus.send(new EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
                     "Unsupported command in MedtronicUITask"));
         } else if (responseType == MedtronicUIResponseType.Error) {
-            rxBus.send(new EventMedtronicDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
+            rxBus.send(new EventRileyLinkDeviceStatusChange(PumpDeviceState.ErrorWhenCommunicating,
                     errorDescription));
         } else {
             rxBus.send(new EventMedtronicPumpValuesChanged());
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
index 76f011da16..5c2489a5ef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.DetailedBolusInfo;
 import info.nightscout.androidaps.db.CareportalEvent;
 import info.nightscout.androidaps.db.DbObjectBase;
@@ -31,6 +30,7 @@ import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.TDD;
 import info.nightscout.androidaps.db.TemporaryBasal;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
@@ -52,8 +52,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpSta
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 import info.nightscout.androidaps.db.Treatment;
-import info.nightscout.androidaps.plugins.treatments.TreatmentService;
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin;
+import info.nightscout.androidaps.plugins.treatments.TreatmentUpdateReturn;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
@@ -81,6 +80,7 @@ public class MedtronicHistoryData {
     private final NSUpload nsUpload;
     private final MedtronicUtil medtronicUtil;
     private final MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
+    private final DatabaseHelperInterface databaseHelper;
 
     private List<PumpHistoryEntry> allHistory;
     private List<PumpHistoryEntry> newHistory = null;
@@ -98,8 +98,10 @@ public class MedtronicHistoryData {
      * Double bolus debug. We seem to have small problem with double Boluses (or sometimes also missing boluses
      * from history. This flag turns on debugging for that (default is off=false)... Debuging is pretty detailed,
      * so log files will get bigger.
+     * Note: June 2020. Since this seems to be fixed, I am disabling this per default. I will leave code inside
+     * in case we need it again. Code that turns this on is commented out RileyLinkMedtronicService#verifyConfiguration()
      */
-    public static boolean doubleBolusDebug = false;
+    public static final boolean doubleBolusDebug = false;
 
     @Inject
     public MedtronicHistoryData(
@@ -109,7 +111,8 @@ public class MedtronicHistoryData {
             ActivePluginProvider activePlugin,
             NSUpload nsUpload,
             MedtronicUtil medtronicUtil,
-            MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder
+            MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder,
+            DatabaseHelperInterface databaseHelperInterface
     ) {
         this.allHistory = new ArrayList<>();
 
@@ -120,6 +123,7 @@ public class MedtronicHistoryData {
         this.nsUpload = nsUpload;
         this.medtronicUtil = medtronicUtil;
         this.medtronicPumpHistoryDecoder = medtronicPumpHistoryDecoder;
+        this.databaseHelper = databaseHelperInterface;
     }
 
     private Gson gson() {
@@ -532,7 +536,7 @@ public class MedtronicHistoryData {
 
 
     private void uploadCareportalEvent(long date, String event) {
-        if (MainApp.getDbHelper().getCareportalEventFromTimestamp(date) != null)
+        if (databaseHelper.getCareportalEventFromTimestamp(date) != null)
             return;
         try {
             JSONObject data = new JSONObject();
@@ -545,7 +549,7 @@ public class MedtronicHistoryData {
             careportalEvent.source = Source.USER;
             careportalEvent.eventType = event;
             careportalEvent.json = data.toString();
-            MainApp.getDbHelper().createOrUpdate(careportalEvent);
+            databaseHelper.createOrUpdate(careportalEvent);
             nsUpload.uploadCareportalEntryToNS(data);
         } catch (JSONException e) {
             aapsLogger.error("Unhandled exception", e);
@@ -559,7 +563,7 @@ public class MedtronicHistoryData {
 
         aapsLogger.debug(LTag.PUMP, getLogPrefix() + "TDDs found: {}.\n{}", tdds.size(), gson().toJson(tdds));
 
-        List<TDD> tddsDb = MainApp.getDbHelper().getTDDsForLastXDays(3);
+        List<TDD> tddsDb = databaseHelper.getTDDsForLastXDays(3);
 
         for (PumpHistoryEntry tdd : tdds) {
 
@@ -575,7 +579,7 @@ public class MedtronicHistoryData {
 
                 aapsLogger.debug(LTag.PUMP, "TDD Add: {}", tddNew);
 
-                MainApp.getDbHelper().createOrUpdateTDD(tddNew);
+                databaseHelper.createOrUpdateTDD(tddNew);
 
             } else {
 
@@ -584,7 +588,7 @@ public class MedtronicHistoryData {
 
                     aapsLogger.debug(LTag.PUMP, "TDD Edit: {}", tddDbEntry);
 
-                    MainApp.getDbHelper().createOrUpdateTDD(tddDbEntry);
+                    databaseHelper.createOrUpdateTDD(tddDbEntry);
                 }
             }
         }
@@ -745,7 +749,7 @@ public class MedtronicHistoryData {
 
                         tempBasal.durationInMinutes = tempBasalProcessDTO.getDuration();
 
-                        MainApp.getDbHelper().createOrUpdate(tempBasal);
+                        databaseHelper.createOrUpdate(tempBasal);
 
                         aapsLogger.debug(LTag.PUMP, "Edit " + ProcessHistoryRecord.TBR.getDescription() + " - (entryFromDb={}) ", tempBasal);
                     } else {
@@ -793,7 +797,7 @@ public class MedtronicHistoryData {
             }
         }
 
-        TemporaryBasal tempBasal = MainApp.getDbHelper().findTempBasalByPumpId(pumpId);
+        TemporaryBasal tempBasal = databaseHelper.findTempBasalByPumpId(pumpId);
         return tempBasal;
     }
 
@@ -884,7 +888,7 @@ public class MedtronicHistoryData {
         if (processHistoryRecord == ProcessHistoryRecord.Bolus) {
             return activePlugin.getActiveTreatments().getTreatmentsFromHistoryAfterTimestamp(startTimestamp);
         } else {
-            return MainApp.getDbHelper().getTemporaryBasalsDataFromTime(startTimestamp, true);
+            return databaseHelper.getTemporaryBasalsDataFromTime(startTimestamp, true);
         }
     }
 
@@ -992,7 +996,7 @@ public class MedtronicHistoryData {
             treatment.pumpId = bolus.getPumpId();
             treatment.insulin = bolusDTO.getDeliveredAmount();
 
-            TreatmentService.UpdateReturn updateReturn = ((TreatmentsPlugin) activePlugin.getActiveTreatments()).getService().createOrUpdateMedtronic(treatment, false);
+            TreatmentUpdateReturn updateReturn = activePlugin.getActiveTreatments().createOrUpdateMedtronic(treatment, false);
 
             if (doubleBolusDebug)
                 aapsLogger.debug(LTag.PUMP, "DoubleBolusDebug: addBolus(tretament!=null): NewTreatment={}, UpdateReturn={}", treatment, updateReturn);
@@ -1042,7 +1046,7 @@ public class MedtronicHistoryData {
 
         treatment.setLinkedObject(temporaryBasalDb);
 
-        MainApp.getDbHelper().createOrUpdate(temporaryBasalDb);
+        databaseHelper.createOrUpdate(temporaryBasalDb);
 
         aapsLogger.debug(LTag.PUMP, operation + " - [date={},pumpId={}, rate={} {}, duration={}]", //
                 temporaryBasalDb.date, //
@@ -1058,7 +1062,7 @@ public class MedtronicHistoryData {
 
         for (TempBasalProcessDTO tempBasalProcess : tempBasalProcessList) {
 
-            TemporaryBasal tempBasal = MainApp.getDbHelper().findTempBasalByPumpId(tempBasalProcess.itemOne.getPumpId());
+            TemporaryBasal tempBasal = databaseHelper.findTempBasalByPumpId(tempBasalProcess.itemOne.getPumpId());
 
             if (tempBasal == null) {
                 // add
@@ -1074,7 +1078,7 @@ public class MedtronicHistoryData {
                 tempBasalProcess.itemOne.setLinkedObject(tempBasal);
                 tempBasalProcess.itemTwo.setLinkedObject(tempBasal);
 
-                MainApp.getDbHelper().createOrUpdate(tempBasal);
+                databaseHelper.createOrUpdate(tempBasal);
 
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
index f5ff77cf72..c3f2050805 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileEntry.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BatteryStatusDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BolusWizardDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/ClockDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
similarity index 83%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
index 8ca17e152f..902686ff19 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
@@ -1,14 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
 
-import com.google.common.base.MoreObjects;
 import com.google.gson.annotations.Expose;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import info.nightscout.androidaps.db.TDD;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
@@ -212,35 +208,35 @@ public class DailyTotalsDTO {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this) //
-                .add("bgAvg", bgAvg) //
-                .add("bgLow", bgLow) //
-                .add("bgHigh", bgHigh) //
-                .add("bgCount", bgCount) //
-                .add("sensorAvg", sensorAvg) //
-                .add("sensorMin", sensorMin) //
-                .add("sensorMax", sensorMax) //
-                .add("sensorCalcCount", sensorCalcCount) //
-                .add("sensorDataCount", sensorDataCount) //
-                .add("insulinTotal", insulinTotal) //
-                .add("insulinBasal", insulinBasal) //
-                .add("insulinBolus", insulinBolus) //
-                .add("insulinCarbs", insulinCarbs) //
-                .add("bolusTotal", bolusTotal) //
-                .add("bolusFood", bolusFood) //
-                .add("bolusCorrection", bolusCorrection) //
-                .add("bolusManual", bolusManual) //
-                .add("bolusCount", bolusCount) //
-                .add("bolusCountFoodOrCorr", bolusCountFoodOrCorr) //
-                .add("bolusCountFoodAndCorr", bolusCountFoodAndCorr) //
-                .add("bolusCountFood", bolusCountFood) //
-                .add("bolusCountCorr", bolusCountCorr) //
-                .add("bolusCountManual", bolusCountManual) //
-                .omitNullValues() //
-                .toString();
+        return "DailyTotalsDTO [" +
+                "bgAvg=" + bgAvg +
+                ", bgLow=" + bgLow +
+                ", bgHigh=" + bgHigh +
+                ", bgCount=" + bgCount +
+                ", sensorAvg=" + sensorAvg +
+                ", sensorMin=" + sensorMin +
+                ", sensorMax=" + sensorMax +
+                ", sensorCalcCount=" + sensorCalcCount +
+                ", sensorDataCount=" + sensorDataCount +
+                ", insulinTotal=" + insulinTotal +
+                ", insulinBasal=" + insulinBasal +
+                ", insulinBolus=" + insulinBolus +
+                ", insulinCarbs=" + insulinCarbs +
+                ", bolusTotal=" + bolusTotal +
+                ", bolusFood=" + bolusFood +
+                ", bolusFoodAndCorr=" + bolusFoodAndCorr +
+                ", bolusCorrection=" + bolusCorrection +
+                ", bolusManual=" + bolusManual +
+                ", bolusCount=" + bolusCount +
+                ", bolusCountFoodOrCorr=" + bolusCountFoodOrCorr +
+                ", bolusCountFoodAndCorr=" + bolusCountFoodAndCorr +
+                ", bolusCountManual=" + bolusCountManual +
+                ", bolusCountFood=" + bolusCountFood +
+                ", bolusCountCorr=" + bolusCountCorr +
+                ", entry=" + entry +
+                ']';
     }
 
-
     public void setTDD(TDD tdd) {
         tdd.date = DateTimeUtil.toMillisFromATD(this.entry.atechDateTime);
         tdd.basal = insulinBasal;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpSettingDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/PumpTimeStampedRecord.java
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
new file mode 100644
index 0000000000..399f58e8ac
--- /dev/null
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/RLHistoryItemMedtronic.java
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.plugins.pump.medtronic.data.dto;
+
+import org.joda.time.LocalDateTime;
+
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
+import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+
+public class RLHistoryItemMedtronic extends RLHistoryItem {
+
+    private MedtronicCommandType medtronicCommandType;
+
+    public RLHistoryItemMedtronic(MedtronicCommandType medtronicCommandType) {
+        super(new LocalDateTime(), RLHistoryItemSource.MedtronicCommand, RileyLinkTargetDevice.MedtronicPump);
+        this.medtronicCommandType = medtronicCommandType;
+    }
+
+    public String getDescription(ResourceHelper resourceHelper) {
+
+        switch (this.source) {
+            case RileyLink:
+                return "State: " + resourceHelper.gs(serviceState.getResourceId(targetDevice))
+                        + (this.errorCode == null ? "" : ", Error Code: " + errorCode);
+
+            case MedtronicPump:
+                return resourceHelper.gs(pumpDeviceState.getResourceId());
+
+            case MedtronicCommand:
+                return medtronicCommandType.name();
+
+            default:
+                return "Unknown Description";
+        }
+    }
+
+
+
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
index bf3e771b1e..983f428a8f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.Locale;
 
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalProcessDTO.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BasalProfileStatus.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
index 7552b50d7f..503074e640 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/BatteryType.java
@@ -5,8 +5,8 @@ import androidx.annotation.StringRes;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
+
 
 /**
  * Created by andy on 6/4/18.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/CommandValueDefinitionMDTType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
index 516085269a..0c14ac42f8 100755
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCommandType.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.MessageBody;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.PumpAckMessageBody;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.message.UnknownMessageBody;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicCustomActionType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
index d11d6ad64c..c472ad3520 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicNotificationType.java
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.defs;
 
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 
 /**
  * Created by andy on 10/15/18.
@@ -16,8 +16,8 @@ public enum MedtronicNotificationType {
     PumpWrongTBRTypeSet(R.string.medtronic_error_pump_wrong_tbr_type_set, Notification.URGENT), //
     PumpWrongMaxBolusSet(R.string.medtronic_error_pump_wrong_max_bolus_set, Notification.NORMAL), //
     PumpWrongMaxBasalSet(R.string.medtronic_error_pump_wrong_max_basal_set, Notification.NORMAL), //
-    PumpWrongTimeUrgent(R.string.combo_notification_check_time_date, Notification.URGENT),
-    PumpWrongTimeNormal(R.string.combo_notification_check_time_date, Notification.NORMAL),
+    PumpWrongTimeUrgent(R.string.medtronic_notification_check_time_date, Notification.URGENT),
+    PumpWrongTimeNormal(R.string.medtronic_notification_check_time_date, Notification.NORMAL),
     TimeChangeOver24h(Notification.OVER_24H_TIME_CHANGE_REQUESTED, R.string.medtronic_error_pump_24h_time_change_requested, Notification.URGENT),
     //
     ;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicStatusRefreshType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicUIResponseType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpBolusType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/PumpConfigurationGroup.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
index 1d5d300b49..fc986f4f83 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.java
@@ -18,9 +18,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
index 616f033799..0d21b195df 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/RileyLinkStatusDeviceMedtronic.java
@@ -14,10 +14,10 @@ import java.util.List;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
similarity index 87%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
index f7686fa824..1dcf799a2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
@@ -12,7 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
@@ -20,18 +20,19 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
+
+
 /**
  * Created by andy on 4/28/18.
  */
 
 @Singleton
-public class MedtronicPumpStatus extends PumpStatus {
+public class MedtronicPumpStatus extends info.nightscout.androidaps.plugins.pump.common.data.PumpStatus  {
 
     private final ResourceHelper resourceHelper;
     private final SP sp;
@@ -164,6 +165,28 @@ public class MedtronicPumpStatus extends PumpStatus {
         return (errorDescription == null) ? "-" : errorDescription;
     }
 
+    @Override
+    public <E> E getCustomData(String key, Class<E> clazz) {
+        switch(key) {
+            case "SERIAL_NUMBER":
+                return (E)serialNumber;
+
+            case "PUMP_FREQUENCY":
+                return (E)pumpFrequency;
+
+            case "PUMP_MODEL": {
+                if (medtronicDeviceType==null)
+                    return null;
+                else
+                    return (E)medtronicDeviceType.getPumpModel();
+            }
+
+
+            default:
+                return null;
+        }
+    }
+
     public PumpDeviceState getPumpDeviceState() {
         return pumpDeviceState;
     }
@@ -174,6 +197,6 @@ public class MedtronicPumpStatus extends PumpStatus {
 
         rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(pumpDeviceState, RileyLinkTargetDevice.MedtronicPump));
 
-        rxBus.send(new EventMedtronicDeviceStatusChange(pumpDeviceState));
+        rxBus.send(new EventRileyLinkDeviceStatusChange(pumpDeviceState));
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpConfigurationChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/events/EventMedtronicPumpValuesChanged.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
similarity index 96%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
index 7ae299036d..097633f574 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
@@ -8,9 +8,8 @@ import android.os.IBinder;
 
 import javax.inject.Inject;
 
-import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
@@ -22,16 +21,15 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIComm;
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUIPostprocessor;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
  * RileyLinkMedtronicService is intended to stay running when the gui-app is closed.
@@ -339,11 +337,9 @@ public class RileyLinkMedtronicService extends RileyLinkService {
                 medtronicPumpStatus.batteryType = batteryType;
             }
 
-            String bolusDebugEnabled = sp.getStringOrNull(MedtronicConst.Prefs.BolusDebugEnabled, null);
-
-            boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on));
-
-            MedtronicHistoryData.doubleBolusDebug = bolusDebug;
+            //String bolusDebugEnabled = sp.getStringOrNull(MedtronicConst.Prefs.BolusDebugEnabled, null);
+            //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on));
+            //MedtronicHistoryData.doubleBolusDebug = bolusDebug;
 
             reconfigureService();
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
index fef95087de..141b23ed3a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicConst.java
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.util;
 
-import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.plugins.pump.medtronic.R;
 
 /**
  * Created by andy on 5/12/18.
@@ -10,7 +10,7 @@ public class MedtronicConst {
 
     static final String Prefix = "AAPS.Medtronic.";
 
-    public class Prefs {
+    public static class Prefs {
         public static final int PumpSerial = R.string.key_medtronic_serial;
         public static final int PumpType = R.string.key_medtronic_pump_type;
         public static final int PumpFrequency = R.string.key_medtronic_frequency;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
rename to medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
index a4e7a51ec2..2e17b7808f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
@@ -26,11 +26,12 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.ClockDTO;
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.PumpSettingDTO;
+import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.RLHistoryItemMedtronic;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType;
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicNotificationType;
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /**
@@ -42,7 +43,7 @@ public class MedtronicUtil {
 
     private int ENVELOPE_SIZE = 4; // 0xA7 S1 S2 S3 CMD PARAM_COUNT [PARAMS]
     private static boolean lowLevelDebug = true;
-    private MedtronicDeviceType medtronicPumpModel;
+    //private MedtronicDeviceType medtronicPumpModel;
     private MedtronicCommandType currentCommand;
     private Map<String, PumpSettingDTO> settings;
     private int BIG_FRAME_LENGTH = 65;
@@ -144,7 +145,7 @@ public class MedtronicUtil {
 
     public byte[] getBolusStrokes(double amount) {
 
-        int strokesPerUnit = medtronicPumpModel.getBolusStrokes();
+        int strokesPerUnit = medtronicPumpStatus.medtronicDeviceType.getBolusStrokes();
 
         int length;
         int scrollRate;
@@ -391,15 +392,15 @@ public class MedtronicUtil {
     }
 
     public boolean isModelSet() {
-        return medtronicPumpModel != null;
+        return medtronicPumpStatus.medtronicDeviceType != null;
     }
 
     public MedtronicDeviceType getMedtronicPumpModel() {
-        return medtronicPumpModel;
+        return medtronicPumpStatus.medtronicDeviceType;
     }
 
     public void setMedtronicPumpModel(MedtronicDeviceType medtronicPumpModel) {
-        this.medtronicPumpModel = medtronicPumpModel;
+        this.medtronicPumpStatus.medtronicDeviceType = medtronicPumpModel;
     }
 
     public MedtronicCommandType getCurrentCommand() {
@@ -410,7 +411,7 @@ public class MedtronicUtil {
         this.currentCommand = currentCommand;
 
         if (currentCommand != null)
-            rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(currentCommand));
+            rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItemMedtronic(currentCommand));
 
     }
 
@@ -426,7 +427,7 @@ public class MedtronicUtil {
             setCurrentCommand(currentCommand);
         }
 
-        rxBus.send(new EventMedtronicDeviceStatusChange(medtronicPumpStatus.getPumpDeviceState()));
+        rxBus.send(new EventRileyLinkDeviceStatusChange(medtronicPumpStatus.getPumpDeviceState()));
     }
 
 
diff --git a/app/src/main/res/layout/medtronic_fragment.xml b/medtronic/src/main/res/layout/medtronic_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/medtronic_fragment.xml
rename to medtronic/src/main/res/layout/medtronic_fragment.xml
diff --git a/app/src/main/res/layout/medtronic_history_activity.xml b/medtronic/src/main/res/layout/medtronic_history_activity.xml
similarity index 100%
rename from app/src/main/res/layout/medtronic_history_activity.xml
rename to medtronic/src/main/res/layout/medtronic_history_activity.xml
diff --git a/app/src/main/res/layout/medtronic_history_item.xml b/medtronic/src/main/res/layout/medtronic_history_item.xml
similarity index 100%
rename from app/src/main/res/layout/medtronic_history_item.xml
rename to medtronic/src/main/res/layout/medtronic_history_item.xml
diff --git a/medtronic/src/main/res/values/strings.xml b/medtronic/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..abcf6d97d6
--- /dev/null
+++ b/medtronic/src/main/res/values/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="medtronic_name" translatable="false">Medtronic</string>
+    <string name="medtronic_name_short" translatable="false">MDT</string>
+    <string name="description_pump_medtronic">Pump integration for Medtronic, requires RileyLink device and specific Pump Model</string>
+
+    <!-- MDT Configuration -->
+    <string name="key_medtronic_serial" translatable="false">pref_medtronic_serial</string>
+    <string name="key_medtronic_pump_type" translatable="false">pref_medtronic_pump_type</string>
+    <string name="key_medtronic_frequency" translatable="false">pref_medtronic_frequency</string>
+    <string name="key_medtronic_max_bolus" translatable="false">pref_medtronic_max_bolus</string>
+    <string name="key_medtronic_max_basal" translatable="false">pref_medtronic_max_basal</string>
+    <string name="key_medtronic_bolus_delay" translatable="false">pref_medtronic_bolus_delay</string>
+    <string name="key_medtronic_encoding" translatable="false">pref_medtronic_encoding</string>
+    <string name="key_medtronic_battery_type" translatable="false">pref_medtronic_battery_type</string>
+    <string name="key_medtronic_bolus_debug" translatable="false">pref_medtronic_bolus_debug</string>
+    <string name="key_rileylink_mac_address" translatable="false">pref_rileylink_mac_address</string>
+    <string name="key_medtronic_pump_frequency_us_ca" translatable="false">medtronic_pump_frequency_us_ca</string>
+    <string name="key_medtronic_pump_frequency_worldwide" translatable="false">medtronic_pump_frequency_worldwide</string>
+    <string name="key_medtronic_pump_encoding_4b6b_local" translatable="false">medtronic_pump_encoding_4b6b_local</string>
+    <string name="key_medtronic_pump_encoding_4b6b_rileylink" translatable="false">medtronic_pump_encoding_4b6b_rileylink</string>
+    <string name="key_medtronic_pump_battery_no" translatable="false">medtronic_pump_battery_no</string>
+    <string name="key_medtronic_pump_battery_alkaline" translatable="false">medtronic_pump_battery_alkaline</string>
+    <string name="key_medtronic_pump_battery_lithium" translatable="false">medtronic_pump_battery_lithium</string>
+    <string name="key_medtronic_pump_battery_nizn" translatable="false">medtronic_pump_battery_nizn</string>
+    <string name="key_medtronic_pump_battery_nimh" translatable="false">medtronic_pump_battery_nimh</string>
+
+    <string name="medtronic_serial_number">Pump Serial Number</string>
+    <string name="medtronic_pump_type">Pump Type</string>
+    <string name="medtronic_pump_frequency">Pump Frequency</string>
+    <string name="medtronic_pump_bolus_delay">Delay before Bolus is started (s)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolus on Pump (U)</string>
+    <string name="medtronic_pump_max_basal">Max Basal on Pump (U/h)</string>
+    <string name="medtronic_pump_encoding">Medtronic Encoding</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Worldwide (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Encoding</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Encoding</string>
+    <string name="medtronic_custom_action_wake_and_tune">Wake and Tune Up</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Clear Bolus Block</string>
+    <string name="medtronic_custom_action_reset_rileylink">Reset RileyLink Config</string>
+    <string name="medtronic_pump_battery_select">Battery Type (Power View)</string>
+    <string name="medtronic_pump_battery_no">Not selected (Simple view)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaline (Extended view)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (Extended view)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Treatments Debugging</string>
+
+
+
+    <!-- MDT Errors -->
+    <string name="medtronic_errors">Errors</string>
+    <string name="medtronic_error_serial_not_set">Serial # not set.</string>
+    <string name="medtronic_error_serial_invalid">Serial # invalid.</string>
+    <string name="medtronic_error_pump_type_not_set">Pump Type not set.</string>
+    <string name="medtronic_error_pump_type_invalid">Pump Type unsupported.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pump Frequency not set.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pump Frequency unsupported.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink Address invalid.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Pump type detected is not the same as configured type.</string>
+
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal profiles/patterns setting is not enabled on pump. Enable it on the pump.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basal profile set on pump is incorrect (must be STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Wrong TBR type set on pump (must be Absolute).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Wrong Max Bolus set on Pump (must be %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Wrong Max Basal set on Pump (must be %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operation is not possible.\n\n You need to configure Medtronic Pump first, before you can use this operation.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Over 24h Time change was requested.</string>
+
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Medtronic Pump History</string>
+
+
+
+
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">You cancelled Bolus, after it was already set on Pump. Since Medtronic Pump doesn\'t support cancel, you will need to manually cancel it. Put the Pump into Suspend mode and then do Resume (if you still want to cancel). Application will pick up changes, on next update (in less than 5 minutes).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Could not read current TBR.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Could not cancel current TBR. Stopping operation.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profile set failed, because following patterns, have too big basal rate: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus could not be delivered.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus could not be delivered, because available insulin amount (%1$.2f) is less than bolus required (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR could not be set.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Could not cancel current TBR.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basal profile could not be set.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
+
+    <string name="medtronic_cmd_desc_get_history">Get History - Page %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Get History - Page %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Get Pump Time</string>
+    <string name="medtronic_cmd_desc_get_settings">Get Settings</string>
+    <string name="medtronic_cmd_desc_get_model">Get Pump Model</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Get Basal Profile</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Set Basal Profile</string>
+    <string name="medtronic_cmd_desc_get_tbr">Get Temporary Basal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Set Temporary Basal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Set Bolus</string>
+
+    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>
+    <string name="medtronic_warning">Warning</string>  <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Now</string> <!-- combo_pump_connected_now -->
+    <string name="ago">ago</string>
+    <string name="medtronic_notification_check_time_date">Pump clock update needed</string> <!-- combo_notification_check_time_date -->
+    <string name="common_on">On</string>
+    <string name="common_off">Off</string>
+    <string name="pump_time_updated">Pump time updated</string>
+    <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_medtronic.xml b/medtronic/src/main/res/xml/pref_medtronic.xml
similarity index 100%
rename from app/src/main/res/xml/pref_medtronic.xml
rename to medtronic/src/main/res/xml/pref_medtronic.xml
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
new file mode 100644
index 0000000000..98bc082706
--- /dev/null
+++ b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.medtronic;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/rileylink/.gitignore b/rileylink/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/rileylink/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/rileylink/build.gradle b/rileylink/build.gradle
new file mode 100644
index 0000000000..07b262bfeb
--- /dev/null
+++ b/rileylink/build.gradle
@@ -0,0 +1,81 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation project(':core')
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation "io.reactivex.rxjava2:rxandroid:${rxandroid_version}"
+
+    // Graphview cannot be upgraded
+    implementation "com.jjoe64:graphview:4.0.1"
+
+    implementation "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2"
+
+    // rileylink - start
+    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'net.danlew:android.joda:2.10.6'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    // rileylink - end
+
+    implementation "com.google.dagger:dagger-android:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
+
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
diff --git a/rileylink/consumer-rules.pro b/rileylink/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/rileylink/proguard-rules.pro b/rileylink/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/rileylink/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java b/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java
new file mode 100644
index 0000000000..9942e86384
--- /dev/null
+++ b/rileylink/src/androidTest/java/info/nightscout/androidaps/plugins/pump/common/ExampleInstrumentedTest.java
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.plugins.pump.common;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        assertEquals("info.nightscout.androidaps.plugins.pump.common.test", appContext.getPackageName());
+    }
+}
diff --git a/rileylink/src/main/AndroidManifest.xml b/rileylink/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..280768811b
--- /dev/null
+++ b/rileylink/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.plugins.pump.common" >
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <application>
+        <activity android:name=".dialog.RileyLinkBLEScanActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".hw.rileylink.dialog.RileyLinkStatusActivity"
+            android:label="@string/title_activity_rileylink_settings"
+            android:theme="@style/Theme.AppCompat.NoTitle" />
+    </application>
+
+</manifest>
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
index c70b7e033a..78db788350 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
@@ -24,6 +24,7 @@ import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
 
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -34,21 +35,20 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.R;
+
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
+import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
-import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -116,7 +116,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                 RileyLinkPumpDevice rileyLinkPump = (RileyLinkPumpDevice) activePump;
                 rileyLinkPump.getRileyLinkService().verifyConfiguration(); // force reloading of address
 
-                rxBus.send(new EventMedtronicPumpConfigurationChanged());
+                rileyLinkPump.triggerPumpConfigurationChangedEvent();
 
             } else if (activePlugin.getActivePump().manufacturer() == ManufacturerType.Insulet) {
                 if (activePump.model() == PumpType.Insulet_Omnipod_Dash) {
@@ -125,7 +125,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                     RileyLinkPumpDevice rileyLinkPump = (RileyLinkPumpDevice) activePump;
                     rileyLinkPump.getRileyLinkService().verifyConfiguration(); // force reloading of address
 
-                    rxBus.send(new EventOmnipodPumpValuesChanged());
+                    rileyLinkPump.triggerPumpConfigurationChangedEvent();
                 }
             }
 
@@ -157,14 +157,14 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.rileylink_miScan: {
-                scanLeDevice(menuItem.getTitle().equals(actionTitleStart));
-                return true;
-            }
-
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getTitle().equals(actionTitleStart)) {
+            scanLeDevice(true);
+            return true;
+        } else if (item.getTitle().equals(actionTitleStop)) {
+            scanLeDevice(false);
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
         }
     }
 
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
new file mode 100644
index 0000000000..f9846bbb05
--- /dev/null
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.common.events
+
+import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
+
+class EventRileyLinkDeviceStatusChange : Event {
+
+    private var rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState? = null
+    private var rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null
+
+    private var pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState? = null
+    private var errorDescription: String? = null
+
+
+    constructor(rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState?, rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError?) {
+        this.rileyLinkServiceState = rileyLinkServiceState
+        this.rileyLinkError = rileyLinkError
+    }
+
+    constructor(pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState?) {
+        this.pumpDeviceState = pumpDeviceState
+    }
+
+    constructor(pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState?, errorDescription: String?) {
+        this.pumpDeviceState = pumpDeviceState
+        this.errorDescription = errorDescription
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
index 12a0f0f4d0..b8395241e2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkCommunicationManager.java
@@ -6,6 +6,7 @@ import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.FrequencyScanResults;
@@ -20,7 +21,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
similarity index 86%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
index bff2a39240..40d17aee84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 
 /**
  * Created by andy on 16/05/2018.
@@ -10,7 +11,7 @@ public class RileyLinkConst {
 
     static final String Prefix = "AAPS.RileyLink.";
 
-    public class Intents {
+    public static class Intents {
 
         public static final String RileyLinkReady = Prefix + "RileyLink_Ready";
         public static final String RileyLinkGattFailed = Prefix + "RileyLink_Gatt_Failed";
@@ -27,22 +28,21 @@ public class RileyLinkConst {
         public static final String RileyLinkDisconnect = Prefix + "RileyLink_Disconnect";
     }
 
-    public class Prefs {
+    public static class Prefs {
 
         //public static final String PrefPrefix = "pref_rileylink_";
         //public static final String RileyLinkAddress = PrefPrefix + "mac_address"; // pref_rileylink_mac_address
         public static final int RileyLinkAddress = R.string.key_rileylink_mac_address;
         public static final String LastGoodDeviceCommunicationTime = Prefix + "lastGoodDeviceCommunicationTime";
         public static final String LastGoodDeviceFrequency = Prefix + "LastGoodDeviceFrequency";
+        public static final int Encoding = R.string.key_medtronic_encoding;
     }
 
-    public class IPC {
+    public static class IPC {
 
         // needs to br renamed (and maybe removed)
         public static final String MSG_PUMP_quickTune = Prefix + "MSG_PUMP_quickTune";
         public static final String MSG_PUMP_tunePump = Prefix + "MSG_PUMP_tunePump";
-        public static final String MSG_PUMP_fetchHistory = Prefix + "MSG_PUMP_fetchHistory";
-        public static final String MSG_PUMP_fetchSavedHistory = Prefix + "MSG_PUMP_fetchSavedHistory";
 
         public static final String MSG_ServiceCommand = Prefix + "MSG_ServiceCommand";
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkUtil.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index f3f6399570..7971b6a7aa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -7,9 +7,11 @@ import java.util.UUID;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.R;
+
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.Reset;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.RileyLinkCommand;
@@ -31,7 +33,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst;
+
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -369,7 +371,8 @@ public class RFSpy {
         RileyLinkEncodingType encoding = RileyLinkEncodingType.FourByteSixByteLocal;
 
         if (RileyLinkFirmwareVersion.isSameVersion(rileyLinkServiceData.firmwareVersion, RileyLinkFirmwareVersion.Version2AndHigher)) {
-            if (sp.getString(MedtronicConst.Prefs.Encoding, "None").equals(resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))) {
+            if (sp.getString(RileyLinkConst.Prefs.Encoding, "None")
+                    .equals(resourceHelper.gs(R.string.key_medtronic_pump_encoding_4b6b_rileylink))) {
                 encoding = RileyLinkEncodingType.FourByteSixByteRileyLink;
             }
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpyReader.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/GetVersion.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/Reset.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/ResetRadioConfig.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/RileyLinkCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java
index 6304567751..d54fef0599 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SendAndListen.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkCommandType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetHardwareEncoding.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
index d58525deb0..b3f32727c3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
@@ -7,7 +7,6 @@ import org.apache.commons.lang3.NotImplementedException;
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkCommandType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/UpdateRegister.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyScanResults.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/FrequencyTrial.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/GattAttributes.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RFSpyResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RLMessageType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioPacket.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
index 785691e4c2..66a3a446cb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/RadioResponse.java
@@ -77,7 +77,7 @@ public class RadioResponse {
         byte[] encodedPayload;
 
         if (RileyLinkFirmwareVersion.isSameVersion(rileyLinkServiceData.versionCC110,
-                RileyLinkFirmwareVersion.Version2)) {
+                RileyLinkFirmwareVersion.Version2AndHigher)) {
             encodedPayload = ByteUtil.substring(rxData, 3, rxData.length - 3);
             rssi = rxData[1];
             responseNumber = rxData[2];
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6b.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
index 47f13f3095..32176040f5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.encoding;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
index 6b4bd73760..3b0152455c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java
@@ -4,7 +4,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
similarity index 99%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
index 56ec7751a5..d7a3a5f9d1 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java
@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkCommunicationException;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/CC111XRegister.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RFSpyRLResponse.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RLMessageType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RXFilterMode.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkBLEError.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkCommandType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
index fcfe1915a0..55c2ce9539 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkEncodingType.java
@@ -3,8 +3,8 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs;
 import java.util.HashMap;
 import java.util.Map;
 
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.MainApp;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public enum RileyLinkEncodingType {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java
index b6d0eab3cd..1a6b42c443 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkFirmwareVersion.java
@@ -12,11 +12,12 @@ public enum RileyLinkFirmwareVersion {
     Version_1_0(1, 0, "1.0"), //
     Version_2_0(2, 0, "2.0"), //
     Version_2_2(2, 2, "2.2"), //
-    Version_3_0(3, 0, "3.0"), //
+    Version_3_x(3, 0, "3.x"), //
+    Version_4_x(4, 0, "4.x"), //
     UnknownVersion(0, 0, "???"), //
     Version1(Version_0_0, Version_0_9, Version_1_0), //
     Version2(Version_2_0, Version_2_2), //
-    Version2AndHigher(Version_2_0, Version_2_2, Version_3_0), //
+    Version2AndHigher(Version_2_0, Version_2_2, Version_3_x, Version_4_x), //
     ;
 
     private static final String FIRMWARE_IDENTIFICATION_PREFIX = "subg_rfspy ";
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/defs/RileyLinkTargetFrequency.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperation.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/BLECommOperationResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicReadOperation.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/CharacteristicWriteOperation.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/operations/DescriptorWriteOperation.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/BleAdvertisedData.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/CommandValueDefinition.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
similarity index 62%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
index a75e59b17a..c845a3afe2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/data/RLHistoryItem.java
@@ -2,13 +2,17 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data;
 
 import org.joda.time.LocalDateTime;
 
+
+
+
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
+//import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType;
+//import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
+//import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 
 
 /**
@@ -17,16 +21,21 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 
 public class RLHistoryItem {
 
-    private MedtronicCommandType medtronicCommandType;
-    private LocalDateTime dateTime;
-    private RLHistoryItemSource source;
-    private RileyLinkServiceState serviceState;
-    private RileyLinkError errorCode;
+    //private MedtronicCommandType medtronicCommandType;
+    protected LocalDateTime dateTime;
+    protected RLHistoryItemSource source;
+    protected RileyLinkServiceState serviceState;
+    protected RileyLinkError errorCode;
 
-    private RileyLinkTargetDevice targetDevice;
-    private PumpDeviceState pumpDeviceState;
-    private OmnipodCommandType omnipodCommandType;
+    protected RileyLinkTargetDevice targetDevice;
+    protected PumpDeviceState pumpDeviceState;
+    //private OmnipodCommandType omnipodCommandType;
 
+    public RLHistoryItem(LocalDateTime dateTime,  RLHistoryItemSource source, RileyLinkTargetDevice targetDevice) {
+        this.dateTime = dateTime;
+        this.source = source;
+        this.targetDevice = targetDevice;
+    }
 
     public RLHistoryItem(RileyLinkServiceState serviceState, RileyLinkError errorCode,
                          RileyLinkTargetDevice targetDevice) {
@@ -46,18 +55,18 @@ public class RLHistoryItem {
     }
 
 
-    public RLHistoryItem(MedtronicCommandType medtronicCommandType) {
-        this.dateTime = new LocalDateTime();
-        this.medtronicCommandType = medtronicCommandType;
-        source = RLHistoryItemSource.MedtronicCommand;
-    }
-
-
-    public RLHistoryItem(OmnipodCommandType omnipodCommandType) {
-        this.dateTime = new LocalDateTime();
-        this.omnipodCommandType = omnipodCommandType;
-        source = RLHistoryItemSource.OmnipodCommand;
-    }
+//    public RLHistoryItem(MedtronicCommandType medtronicCommandType) {
+//        this.dateTime = new LocalDateTime();
+//        this.medtronicCommandType = medtronicCommandType;
+//        source = RLHistoryItemSource.MedtronicCommand;
+//    }
+//
+//
+//    public RLHistoryItem(OmnipodCommandType omnipodCommandType) {
+//        this.dateTime = new LocalDateTime();
+//        this.omnipodCommandType = omnipodCommandType;
+//        source = RLHistoryItemSource.OmnipodCommand;
+//    }
 
 
     public LocalDateTime getDateTime() {
@@ -86,11 +95,11 @@ public class RLHistoryItem {
             case MedtronicPump:
                 return resourceHelper.gs(pumpDeviceState.getResourceId());
 
-            case MedtronicCommand:
-                return medtronicCommandType.name();
-
-            case OmnipodCommand:
-                return omnipodCommandType.name();
+//            case MedtronicCommand:
+//                return medtronicCommandType.name();
+//
+//            case OmnipodCommand:
+//                return omnipodCommandType.name();
 
             default:
                 return "Unknown Description";
@@ -130,7 +139,7 @@ public class RLHistoryItem {
 
         @Override
         public int compare(RLHistoryItem o1, RLHistoryItem o2) {
-            return o2.dateTime.compareTo(o1.dateTime);
+            return o2.dateTime.compareTo(o1.getDateTime());
         }
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionRLType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/CommandValueDefinitionType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
similarity index 95%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
index 07867a781a..0334c8d54e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkError.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 
 /**
  * Created by andy on 14/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java
similarity index 89%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java
index 7ad31c2066..71c2b5d20a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkPumpDevice.java
@@ -14,6 +14,8 @@ public interface RileyLinkPumpDevice {
 
     void doTuneUpDevice();
 
+    void triggerPumpConfigurationChangedEvent();
+
     RileyLinkService getRileyLinkService();
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
index 2ae66b53c9..31c5f981f3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkServiceState.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 
 /**
  * Created by andy on 14/05/2018.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
index 2d0dea69f7..99b4ecd40a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/defs/RileyLinkTargetDevice.java
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 
 /**
  * Created by andy on 5/19/18.
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
index 57aa01123f..7bcc9a93ac 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java
@@ -16,8 +16,9 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import info.nightscout.androidaps.R;
+
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
+import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
similarity index 98%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
index 226d7fc622..3140b1107e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusDevice.java
@@ -14,7 +14,8 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.CommandValueDefinition;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.CommandValueDefinitionType;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
similarity index 79%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index bec19c7d1f..e4b6f154af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -13,25 +13,18 @@ import java.util.Locale;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
 import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
+import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.data.PumpStatus;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
 import info.nightscout.androidaps.plugins.pump.common.utils.StringUtil;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
@@ -43,7 +36,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
 
     @Inject ActivePluginProvider activePlugin;
     @Inject ResourceHelper resourceHelper;
-    @Inject MedtronicUtil medtronicUtil;
+    //@Inject MedtronicUtil medtronicUtil;
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject DateUtil dateUtil;
@@ -118,7 +111,6 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
                     "-"
                     : resourceHelper.gs(rileyLinkServiceData.rileyLinkError.getResourceId(targetDevice)));
 
-
             RileyLinkFirmwareVersion firmwareVersion = rileyLinkServiceData.versionCC110;
 
             if (firmwareVersion == null) {
@@ -133,15 +125,17 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
         PumpPluginAbstract pumpPlugin = (PumpPluginAbstract)activePlugin.getActivePump();
 
         if (pumpPlugin.manufacturer()== ManufacturerType.Medtronic) {
-            MedtronicPumpStatus medtronicPumpStatus = (MedtronicPumpStatus)pumpPlugin.getPumpStatusData();
+            //MedtronicPumpStatus medtronicPumpStatus = (MedtronicPumpStatus)pumpPlugin.getPumpStatusData();
+
+            PumpStatus pumpStatusData = pumpPlugin.getPumpStatusData();
 
             this.deviceType.setText(resourceHelper.gs(RileyLinkTargetDevice.MedtronicPump.getResourceId()));
             this.deviceModel.setText(pumpPlugin.getPumpType().getDescription());
-            this.serialNumber.setText(medtronicPumpStatus.serialNumber);
-            this.pumpFrequency.setText(resourceHelper.gs(medtronicPumpStatus.pumpFrequency.equals("medtronic_pump_frequency_us_ca") ? R.string.medtronic_pump_frequency_us_ca : R.string.medtronic_pump_frequency_worldwide));
+            this.serialNumber.setText(pumpStatusData.getCustomDataAsString("SERIAL_NUMBER")); // medtronicPumpStatus.serialNumber);
+            this.pumpFrequency.setText(resourceHelper.gs(pumpStatusData.getCustomDataAsString("PUMP_FREQUENCY").equals("medtronic_pump_frequency_us_ca") ? R.string.medtronic_pump_frequency_us_ca : R.string.medtronic_pump_frequency_worldwide));
 
-            if (medtronicUtil.getMedtronicPumpModel() != null)
-                this.connectedDevice.setText("Medtronic " + medtronicUtil.getMedtronicPumpModel().getPumpModel());
+            if (pumpStatusData.getCustomDataAsString("PUMP_MODEL") != null)
+                this.connectedDevice.setText("Medtronic " + pumpStatusData.getCustomDataAsString("PUMP_MODEL"));
             else
                 this.connectedDevice.setText("???");
 
@@ -149,14 +143,15 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
                 this.lastUsedFrequency.setText(String.format(Locale.ENGLISH, "%.2f MHz",
                         rileyLinkServiceData.lastGoodFrequency));
 
-            if (medtronicPumpStatus.lastConnection != 0)
+            if (pumpStatusData.lastConnection != 0)
                 this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(
-                        medtronicPumpStatus.lastDataTime)));
+                        pumpStatusData.lastDataTime)));
             else
                 this.lastDeviceContact.setText(resourceHelper.gs(R.string.common_never));
         } else {
 
-            OmnipodPumpStatus omnipodPumpStatus = (OmnipodPumpStatus)pumpPlugin.getPumpStatusData();
+            //OmnipodPumpStatus omnipodPumpStatus = (OmnipodPumpStatus)pumpPlugin.getPumpStatusData();
+            PumpStatus pumpStatusData = pumpPlugin.getPumpStatusData();
 
             this.deviceType.setText(resourceHelper.gs(RileyLinkTargetDevice.Omnipod.getResourceId()));
             this.deviceModel.setText(pumpPlugin.getPumpType() == PumpType.Insulet_Omnipod ? "Eros" : "Dash");
@@ -169,11 +164,11 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
 
                 this.pumpFrequency.setText(resourceHelper.gs(R.string.omnipod_frequency));
 
-                if (omnipodPumpStatus != null) {
+                if (pumpStatusData != null) {
 
-                    if (omnipodPumpStatus.podAvailable) {
-                        this.serialNumber.setText(omnipodPumpStatus.podLotNumber);
-                        this.connectedDevice.setText(omnipodPumpStatus.pumpType == PumpType.Insulet_Omnipod ? "Eros Pod" : "Dash Pod");
+                    if (pumpStatusData.getCustomData("POD_AVAILABLE", Boolean.class)) {
+                        this.serialNumber.setText(pumpStatusData.getCustomDataAsString("POD_LOT_NUMBER"));
+                        this.connectedDevice.setText(pumpStatusData.pumpType == PumpType.Insulet_Omnipod ? "Eros Pod" : "Dash Pod");
                     } else {
                         this.serialNumber.setText("??");
                         this.connectedDevice.setText("-");
@@ -183,16 +178,14 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
                         this.lastUsedFrequency.setText(String.format(Locale.ENGLISH, "%.2f MHz",
                                 rileyLinkServiceData.lastGoodFrequency));
 
-                    if (omnipodPumpStatus.lastConnection != 0)
+                    if (pumpStatusData.lastConnection != 0)
                         this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(
-                                omnipodPumpStatus.lastDataTime)));
+                                pumpStatusData.lastDataTime)));
                     else
                         this.lastDeviceContact.setText(resourceHelper.gs(R.string.common_never));
                 }
             }
-
         }
-
     }
 
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
index 8a3ff18207..11c8ac2f80 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusHistoryFragment.java
@@ -18,11 +18,13 @@ import java.util.List;
 import javax.inject.Inject;
 
 import dagger.android.support.DaggerFragment;
-import info.nightscout.androidaps.R;
+
+import info.nightscout.androidaps.plugins.pump.common.R;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
+
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBluetoothStateReceiver.kt
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
index 4beea20154..7fefacc8c5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java
@@ -81,13 +81,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
                 RileyLinkConst.Intents.RileyLinkDisconnected, //
                 RileyLinkConst.Intents.RileyLinkNewAddressSet, //
                 RileyLinkConst.Intents.RileyLinkDisconnect));
-
-        // Device Specific
-        // TODO remove from service instance
-        //deviceSpecificPrefix = serviceInstance.getDeviceSpecificBroadcastsIdentifierPrefix();
-
-        // Application specific
-
     }
 
     private RileyLinkService getServiceInstance() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
similarity index 97%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
index 09273eb719..08503155af 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java
@@ -15,6 +15,7 @@ import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
@@ -26,9 +27,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceResult;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceTransport;
-import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
-import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus;
-import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
similarity index 94%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
index b16c4971b9..f3362e0db7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkServiceData.java
@@ -6,6 +6,7 @@ import javax.inject.Singleton;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency;
@@ -13,7 +14,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistor
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicDeviceStatusChange;
+
 
 /**
  * Created by andy on 16/05/2018.
@@ -79,7 +80,8 @@ public class RileyLinkServiceData {
             aapsLogger.info(LTag.PUMP, "RileyLink State Changed: {} {}", newState, errorCode == null ? "" : " - Error State: " + errorCode.name());
 
             rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(rileyLinkServiceState, errorCode, targetDevice));
-            rxBus.send(new EventMedtronicDeviceStatusChange(newState, errorCode));
+            rxBus.send(new EventRileyLinkDeviceStatusChange(newState, errorCode));
+
             return null;
 
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceCommand.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceCommand.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceCommand.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceCommand.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceMessage.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceMessage.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceMessage.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceMessage.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceNotification.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceNotification.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceNotification.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceNotification.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceResult.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceResult.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceResult.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceResult.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransportType.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransportType.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransportType.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransportType.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/PumpTask.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
similarity index 91%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
index bc9a4a3aa0..3263253e5e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
@@ -5,12 +5,12 @@ import javax.inject.Inject;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceTransport;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState;
 
 /**
- * Created by geoff on 7/16/16.
+ * Created by andy on 9/16/18.
  */
 public class ResetRileyLinkConfigurationTask extends PumpTask {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTask.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
similarity index 84%
rename from app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
rename to rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
index 219da8bf3f..d3011eede2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
@@ -5,11 +5,9 @@ import javax.inject.Inject;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.pump.common.PumpPluginAbstract;
+import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.data.ServiceTransport;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
-import info.nightscout.androidaps.plugins.pump.medtronic.events.EventRefreshButtonState;
 
 /**
  * Created by geoff on 7/16/16.
diff --git a/app/src/main/res/layout/rileylink_scan_activity.xml b/rileylink/src/main/res/layout/rileylink_scan_activity.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_scan_activity.xml
rename to rileylink/src/main/res/layout/rileylink_scan_activity.xml
diff --git a/app/src/main/res/layout/rileylink_scan_item.xml b/rileylink/src/main/res/layout/rileylink_scan_item.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_scan_item.xml
rename to rileylink/src/main/res/layout/rileylink_scan_item.xml
diff --git a/app/src/main/res/layout/rileylink_status.xml b/rileylink/src/main/res/layout/rileylink_status.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status.xml
rename to rileylink/src/main/res/layout/rileylink_status.xml
diff --git a/app/src/main/res/layout/rileylink_status_device.xml b/rileylink/src/main/res/layout/rileylink_status_device.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status_device.xml
rename to rileylink/src/main/res/layout/rileylink_status_device.xml
diff --git a/app/src/main/res/layout/rileylink_status_device_item.xml b/rileylink/src/main/res/layout/rileylink_status_device_item.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status_device_item.xml
rename to rileylink/src/main/res/layout/rileylink_status_device_item.xml
diff --git a/app/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status_general.xml
rename to rileylink/src/main/res/layout/rileylink_status_general.xml
diff --git a/app/src/main/res/layout/rileylink_status_history.xml b/rileylink/src/main/res/layout/rileylink_status_history.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status_history.xml
rename to rileylink/src/main/res/layout/rileylink_status_history.xml
diff --git a/app/src/main/res/layout/rileylink_status_history_item.xml b/rileylink/src/main/res/layout/rileylink_status_history_item.xml
similarity index 100%
rename from app/src/main/res/layout/rileylink_status_history_item.xml
rename to rileylink/src/main/res/layout/rileylink_status_history_item.xml
diff --git a/app/src/main/res/menu/menu_rileylink_ble_scan.xml b/rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml
similarity index 100%
rename from app/src/main/res/menu/menu_rileylink_ble_scan.xml
rename to rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml
diff --git a/rileylink/src/main/res/values/strings.xml b/rileylink/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..ddb9beaf9b
--- /dev/null
+++ b/rileylink/src/main/res/values/strings.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Selected</string>
+    <string name="rileylink_scanner_title">RileyLink Scan</string>
+    <string name="location_yes">Enable</string>
+    <string name="location_no">No</string>
+    <string name="rileylink_scanner_scanning">Scanning</string>
+    <string name="rileylink_scanner_scanning_finished">Scanning finished</string>
+    <string name="rileylink_scanner_scanning_error">Scanning error: %1$d</string>
+    <string name="common_never">Never</string>
+
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Settings</string>
+    <string name="rileylink_settings_tab2">History</string>
+    <string name="rileylink_status">RileyLink Status</string>
+    <string name="medtronic_pump_status">Pump Status</string>
+    <string name="title_activity_rileylink_settings">RileyLink Settings</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Configured Address</string>
+    <string name="rileylink_connected_device">Connected Device</string>
+    <string name="rileylink_connection_status">Connection Status</string>
+    <string name="rileylink_connection_error">Connection Error</string>
+    <string name="rileylink_device">Device</string>
+    <string name="rileylink_device_type">Device Type</string>
+    <string name="rileylink_device_model">Device Model</string>
+    <string name="rileylink_last_used_frequency">Last used frequency</string>
+    <string name="rileylink_last_device_contact">Last device contact</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+
+
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth Initializing…</string>
+    <string name="rileylink_state_bt_error">Bluetooth Error</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Ready</string>
+    <string name="rileylink_state_not_started">Not Started</string>
+    <string name="rileylink_state_rl_init">RileyLink Initialization…</string>
+    <string name="rileylink_state_rl_error">RileyLink Error</string>
+    <string name="rileylink_state_pc_tune_up">Tuning up RileyLink and Pump</string>
+    <string name="rileylink_state_pc_error">Problem connecting to Pump</string>
+    <string name="rileylink_state_connected">Connected</string>
+
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Device is not RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink unreachable</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth disabled</string>
+    <string name="rileylink_error_no_bt_adapter">No Bluetooth Adapter</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp Failed</string>
+    <string name="rileylink_error_pump_unreachable">Pump unreachable</string>
+    <string name="rileylink_error_pod_unreachable">Pod unreachable</string>
+
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic Pump</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+
+
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Worldwide (868 Mhz)</string>
+
+    <string name="key_medtronic_pump_encoding_4b6b_local" translatable="false">medtronic_pump_encoding_4b6b_local</string>
+    <string name="key_medtronic_pump_encoding_4b6b_rileylink" translatable="false">medtronic_pump_encoding_4b6b_rileylink</string>
+
+    <string name="key_rileylink_mac_address" translatable="false">pref_rileylink_mac_address</string>
+    <string name="key_medtronic_encoding" translatable="false">pref_medtronic_encoding</string>
+
+    <string name="mdt_last_bolus" translatable="false">%1$.1f %2$s (%3$s)</string>
+
+
+
+
+    <plurals name="duration_days">
+        <item quantity="one">%1$d day</item>
+        <item quantity="other">%1$d days</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hour</item>
+        <item quantity="other">%1$d hours</item>
+    </plurals>
+<!--    <plurals name="objective_minutes">-->
+<!--        <item quantity="one">%1$d minute</item>-->
+<!--        <item quantity="other">%1$d minutes</item>-->
+<!--    </plurals>-->
+
+
+</resources>
\ No newline at end of file
diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java
new file mode 100644
index 0000000000..9c4318ff41
--- /dev/null
+++ b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.common;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 661d9ef66a..19da851b52 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
-include ':app', ':wear', ':core', ':dana', ':danar', ':danars'
+include ':app', ':wear', ':core', ':dana', ':danar', ':danars', ':rileylink', ':medtronic'
+

From 24f60ebc65b69f39de7dc10c607f4d540ac55306 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 14 Jul 2020 16:51:13 +0200
Subject: [PATCH 324/400] profile helper

---
 app/src/main/AndroidManifest.xml              |   3 +-
 .../activities/ProfileHelperActivity.kt       | 246 +++++++++++++--
 app/src/main/res/drawable/ic_clone_48.xml     |   9 +
 .../res/layout/activity_profilehelper.xml     | 294 +++++++++++++-----
 app/src/main/res/menu/menu_profilehelper.xml  |  17 +
 app/src/main/res/values/strings.xml           |  10 +-
 app/src/main/res/values/styles.xml            |   2 +-
 .../data/defaultProfile/DefaultProfile.kt     |  16 +-
 core/src/main/res/values/styles.xml           |   4 +
 9 files changed, 495 insertions(+), 106 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_clone_48.xml
 create mode 100644 app/src/main/res/menu/menu_profilehelper.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ad0c33dbf..93f89e91ca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,7 +68,8 @@
         <activity android:name=".plugins.general.maintenance.activities.PrefImportListActivity" />
         <activity android:name=".historyBrowser.HistoryBrowseActivity" />
         <activity android:name=".activities.SurveyActivity" />
-        <activity android:name=".activities.ProfileHelperActivity" />
+        <activity android:name=".activities.ProfileHelperActivity"
+            android:theme="@style/ProfileHelperAppTheme" />
         <activity android:name=".activities.StatsActivity" />
 
         <!-- Receive new BG readings from other local apps -->
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index b113d180be..3f0155e515 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -1,13 +1,27 @@
 package info.nightscout.androidaps.activities
 
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.Menu
+import android.widget.PopupMenu
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
+import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
+import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfileChanged
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.stats.TddCalculator
 import kotlinx.android.synthetic.main.activity_profilehelper.*
@@ -20,43 +34,157 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var tddCalculator: TddCalculator
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultProfile: DefaultProfile
+    @Inject lateinit var localProfilePlugin: LocalProfilePlugin
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var activePlugin: ActivePluginProvider
+    @Inject lateinit var databaseHelper: DatabaseHelperInterface
+
+    enum class ProfileType {
+        MOTOL_DEFAULT,
+        CURRENT,
+        AVAILABLE_PROFILE,
+        PROFILE_SWITCH
+    }
+
+    var tabSelected = 0
+    val typeSelected = arrayOf(ProfileType.MOTOL_DEFAULT, ProfileType.CURRENT)
+
+    val ageUsed = arrayOf(15.0, 15.0)
+    val weightUsed = arrayOf(50.0, 50.0)
+    val tddUsed = arrayOf(50.0, 50.0)
+
+    lateinit var profileList: ArrayList<CharSequence>
+    val profileUsed = arrayOf(0, 0)
+
+    lateinit var profileSwitch: List<ProfileSwitch>
+    val profileSwitchUsed = arrayOf(0, 0)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_profilehelper)
 
-        profilehelper_age.setParams(15.0, 1.0, 80.0, 1.0, DecimalFormat("0"), false, null)
-        profilehelper_weight.setParams(50.0, 5.0, 150.0, 1.0, DecimalFormat("0"), false, null)
-        profilehelper_tdd.setParams(50.0, 3.0, 200.0, 1.0, DecimalFormat("0"), false, null)
+        profilehelper_menu1.setOnClickListener {
+            switchTab(0)
+        }
+        profilehelper_menu2.setOnClickListener {
+            switchTab(1)
+        }
 
-        profilehelper_tdds.text = tddCalculator.stats()
+        profilehelper_profiletype.setOnClickListener {
+            PopupMenu(this, profilehelper_profiletype).apply {
+                menuInflater.inflate(R.menu.menu_profilehelper, menu)
+                setOnMenuItemClickListener { item ->
+                    profilehelper_profiletype.setText(item.title)
+                    when (item.itemId) {
+                        R.id.menu_default       -> switchContent(ProfileType.MOTOL_DEFAULT)
+                        R.id.menu_current       -> switchContent(ProfileType.CURRENT)
+                        R.id.menu_available     -> switchContent(ProfileType.AVAILABLE_PROFILE)
+                        R.id.menu_profileswitch -> switchContent(ProfileType.PROFILE_SWITCH)
+                    }
+                    true
+                }
+                show()
+            }
+        }
 
-        profilehelper_profile.setOnClickListener {
+        // Active profile
+        profileList = activePlugin.activeProfileInterface.profile?.getProfileList() ?: ArrayList()
+
+        profilehelper_available_profile_list.setOnClickListener {
+            PopupMenu(this, profilehelper_available_profile_list).apply {
+                var order = 0
+                for (name in profileList) menu.add(Menu.NONE, order, order++, name)
+                setOnMenuItemClickListener { item ->
+                    profilehelper_available_profile_list.setText(item.title)
+                    profileUsed[tabSelected] = item.itemId
+                    true
+                }
+                show()
+            }
+        }
+
+        // Profile switch
+        profileSwitch = databaseHelper.getProfileSwitchData(dateUtil._now() - T.months(2).msecs(), true)
+
+        profilehelper_profileswitch_list.setOnClickListener {
+            PopupMenu(this, profilehelper_profileswitch_list).apply {
+                var order = 0
+                for (name in profileSwitch) menu.add(Menu.NONE, order, order++, name.customizedName)
+                setOnMenuItemClickListener { item ->
+                    profilehelper_profileswitch_list.setText(item.title)
+                    profileSwitchUsed[tabSelected] = item.itemId
+                    true
+                }
+                show()
+            }
+        }
+
+        // Default profile
+
+        profilehelper_copytolocalprofile.setOnClickListener {
             val age = profilehelper_age.value
             val weight = profilehelper_weight.value
             val tdd = profilehelper_tdd.value
-            if (age < 1 || age > 120) {
-                ToastUtils.showToastInUiThread(this, R.string.invalidage)
-                return@setOnClickListener
+            defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
+                OKDialog.showConfirmation(this, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile), Runnable {
+                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "DefaultProfile" + dateUtil.dateAndTimeAndSecondsString(dateUtil._now())))
+                    rxBus.send(EventLocalProfileChanged())
+                })
             }
-            if ((weight < 5 || weight > 150) && tdd == 0.0) {
-                ToastUtils.showToastInUiThread(this, R.string.invalidweight)
-                return@setOnClickListener
+        }
+
+        profilehelper_age.setParams(0.0, 1.0, 80.0, 1.0, DecimalFormat("0"), false, null)
+        profilehelper_weight.setParams(0.0, 0.0, 150.0, 1.0, DecimalFormat("0"), false, null, object : TextWatcher {
+            override fun afterTextChanged(s: Editable) {}
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                profilehelper_tdd_row.visibility = (profilehelper_weight.value == 0.0).toVisibility()
             }
-            if ((tdd < 5 || tdd > 150) && weight == 0.0) {
-                ToastUtils.showToastInUiThread(this, R.string.invalidweight)
-                return@setOnClickListener
+        })
+        profilehelper_tdd.setParams(0.0, 0.0, 200.0, 1.0, DecimalFormat("0"), false, null, object : TextWatcher {
+            override fun afterTextChanged(s: Editable) {}
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                profilehelper_weight_row.visibility = (profilehelper_tdd.value == 0.0).toVisibility()
             }
-            profileFunction.getProfile()?.let { runningProfile ->
-                defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
+        })
+
+        profilehelper_tdds.text = tddCalculator.stats()
+
+        // Current profile
+        profilehelper_current_profile_text.text = profileFunction.getProfileName()
+
+        // General
+        profilehelper_compareprofile.setOnClickListener {
+            val age = profilehelper_age.value
+            val weight = profilehelper_weight.value
+            val tdd = profilehelper_tdd.value
+            if (typeSelected[0] == ProfileType.MOTOL_DEFAULT || typeSelected[1] == ProfileType.MOTOL_DEFAULT) {
+                if (age < 1 || age > 17) {
+                    ToastUtils.showToastInUiThread(this, R.string.invalidage)
+                    return@setOnClickListener
+                }
+                if ((weight < 5 || weight > 150) && tdd == 0.0) {
+                    ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                    return@setOnClickListener
+                }
+                if ((tdd < 5 || tdd > 150) && weight == 0.0) {
+                    ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                    return@setOnClickListener
+                }
+            }
+
+            getProfile(age, tdd, weight, 0)?.let { profile0 ->
+                getProfile(age, tdd, weight, 1)?.let { profile1 ->
                     ProfileViewerDialog().also { pvd ->
                         pvd.arguments = Bundle().also {
                             it.putLong("time", DateUtil.now())
                             it.putInt("mode", ProfileViewerDialog.Mode.PROFILE_COMPARE.ordinal)
-                            it.putString("customProfile", runningProfile.data.toString())
-                            it.putString("customProfile2", profile.data.toString())
-                            it.putString("customProfileUnits", profile.units)
-                            it.putString("customProfileName", "Age: $age TDD: $tdd Weight: $weight")
+                            it.putString("customProfile", profile0.data.toString())
+                            it.putString("customProfile2", profile1.data.toString())
+                            it.putString("customProfileUnits", profileFunction.getUnits())
+                            it.putString("customProfileName", getProfileName(age, tdd, weight, 0) + "\n" + getProfileName(age, tdd, weight, 1))
                         }
                     }.show(supportFragmentManager, "ProfileViewDialog")
                     return@setOnClickListener
@@ -65,5 +193,83 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             ToastUtils.showToastInUiThread(this, R.string.invalidinput)
         }
 
+        switchTab(0)
     }
+
+    private fun getProfile(age: Double, tdd: Double, weight: Double, tab: Int): Profile? =
+        when (typeSelected[tab]) {
+            ProfileType.MOTOL_DEFAULT     -> defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+            ProfileType.CURRENT           -> profileFunction.getProfile()?.convertToNonCustomizedProfile()
+            ProfileType.AVAILABLE_PROFILE -> activePlugin.activeProfileInterface.profile?.getSpecificProfile(profileList[profileUsed[tab]].toString())
+            ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].profileObject?.convertToNonCustomizedProfile()
+        }
+
+    private fun getProfileName(age: Double, tdd: Double, weight: Double, tab: Int): String =
+        when (typeSelected[tab]) {
+            ProfileType.MOTOL_DEFAULT     -> if (tdd > 0) resourceHelper.gs(R.string.formatwithtdd, age, tdd) else resourceHelper.gs(R.string.formatwithweight, age, weight)
+            ProfileType.CURRENT           -> profileFunction.getProfileName()
+            ProfileType.AVAILABLE_PROFILE -> profileList[profileUsed[tab]].toString()
+            ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].customizedName
+        }
+
+    private fun switchTab(tab: Int) {
+        setBackgroundColorOnSelected(tab)
+        when (typeSelected[tab]) {
+            ProfileType.MOTOL_DEFAULT     -> {
+                ageUsed[tabSelected] = profilehelper_age.value
+                weightUsed[tabSelected] = profilehelper_weight.value
+                tddUsed[tabSelected] = profilehelper_tdd.value
+                profilehelper_profiletype.setText(resourceHelper.gs(R.string.motoldefaultprofile))
+            }
+
+            ProfileType.CURRENT           -> {
+                profilehelper_profiletype.setText(resourceHelper.gs(R.string.currentprofile))
+            }
+
+            ProfileType.AVAILABLE_PROFILE -> {
+                profilehelper_profiletype.setText(resourceHelper.gs(R.string.availableprofile))
+            }
+
+            ProfileType.PROFILE_SWITCH    -> {
+                profilehelper_profiletype.setText(resourceHelper.gs(R.string.careportal_profileswitch))
+            }
+        }
+        tabSelected = tab
+        switchContent(typeSelected[tabSelected])
+    }
+
+    private fun switchContent(newContent: ProfileType) {
+        profilehelper_default_profile.visibility = (newContent == ProfileType.MOTOL_DEFAULT).toVisibility()
+        profilehelper_current_profile.visibility = (newContent == ProfileType.CURRENT).toVisibility()
+        profilehelper_available_profile.visibility = (newContent == ProfileType.AVAILABLE_PROFILE).toVisibility()
+        profilehelper_profile_switch.visibility = (newContent == ProfileType.PROFILE_SWITCH).toVisibility()
+
+        typeSelected[tabSelected] = newContent
+        when (newContent) {
+            ProfileType.MOTOL_DEFAULT     -> {
+                profilehelper_age.value = ageUsed[tabSelected]
+                profilehelper_weight.value = weightUsed[tabSelected]
+                profilehelper_tdd.value = tddUsed[tabSelected]
+            }
+
+            ProfileType.CURRENT           -> {
+            }
+
+            ProfileType.AVAILABLE_PROFILE -> {
+                if (profileList.size > 0)
+                    profilehelper_available_profile_list.setText(profileList[profileUsed[tabSelected]].toString())
+            }
+
+            ProfileType.PROFILE_SWITCH    -> {
+                if (profileSwitch.size > 0)
+                    profilehelper_profileswitch_list.setText(profileSwitch[profileSwitchUsed[tabSelected]].customizedName)
+            }
+        }
+    }
+
+    private fun setBackgroundColorOnSelected(tab: Int) {
+        profilehelper_menu1.setBackgroundColor(resourceHelper.gc(if (tab == 1) R.color.defaultbackground else R.color.tabBgColorSelected))
+        profilehelper_menu2.setBackgroundColor(resourceHelper.gc(if (tab == 0) R.color.defaultbackground else R.color.tabBgColorSelected))
+    }
+
 }
diff --git a/app/src/main/res/drawable/ic_clone_48.xml b/app/src/main/res/drawable/ic_clone_48.xml
new file mode 100644
index 0000000000..5156d7525e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clone_48.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20.964,12.509V2.983l-2.932,2.932c-4.317,-3.412 -9.981,-3.694 -13.245,-0.43c-3.581,3.581 -2.909,10.058 1.5,14.467c0.427,0.427 0.877,0.807 1.338,1.163c-0.548,-0.841 -1.031,-1.781 -1.411,-2.812C4.438,13.481 5.49,8.653 8.565,7.519c1.867,-0.688 4.047,0.152 5.872,1.99l-3,3H20.964z"
+      android:fillColor="#739BE0"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index 68d97b98a8..55f03f9f26 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,85 +12,230 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <TableLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TextView
-                    android:id="@+id/profilehelper_age_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:labelFor="@+id/profilehelper_age"
-                    android:text="@string/age"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/profilehelper_age"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-            </TableRow>
-
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TextView
-                    android:id="@+id/profilehelper_weigth_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:labelFor="@+id/profilehelper_weight"
-                    android:text="@string/weight_label"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/profilehelper_weight"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-            </TableRow>
-
-            <TableRow
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <TextView
-                    android:id="@+id/profilehelper_tdd_label"
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:labelFor="@+id/profilehelper_weight"
-                    android:text="@string/tdd_total"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/profilehelper_tdd"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-            </TableRow>
-
-        </TableLayout>
-
-        <TextView
-            android:id="@+id/profilehelper_tdds"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-
         <Button
-            android:id="@+id/profilehelper_profile"
+            android:id="@+id/profilehelper_compareprofile"
+            style="@style/ButtonMediumFontStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_auto_delta"
             android:text="@string/comapareprofile" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:background="@color/defaultbackground"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/profilehelper_menu1"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="1" />
+
+            <TextView
+                android:id="@+id/profilehelper_menu2"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="2" />
+
+        </LinearLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/profiletype"
+            android:textColorHint="@color/tabBgColorSelected"
+            app:boxStrokeColor="@color/tabBgColorSelected">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/profilehelper_profiletype"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:clickable="true"
+                android:cursorVisible="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false"
+                android:importantForAutofill="no" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <LinearLayout
+            android:id="@+id/profilehelper_default_profile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TableLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/profilehelper_age_label"
+                        android:layout_width="150dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:labelFor="@+id/profilehelper_age"
+                        android:text="@string/age"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                    <info.nightscout.androidaps.utils.NumberPicker
+                        android:id="@+id/profilehelper_age"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp" />
+
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/profilehelper_tdd_row"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/profilehelper_tdd_label"
+                        android:layout_width="150dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:labelFor="@+id/profilehelper_weight"
+                        android:text="@string/tdd_total"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                    <info.nightscout.androidaps.utils.NumberPicker
+                        android:id="@+id/profilehelper_tdd"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp" />
+
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/profilehelper_weight_row"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/profilehelper_weigth_label"
+                        android:layout_width="150dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:labelFor="@+id/profilehelper_weight"
+                        android:text="@string/weight_label"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                    <info.nightscout.androidaps.utils.NumberPicker
+                        android:id="@+id/profilehelper_weight"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp" />
+
+                </TableRow>
+
+            </TableLayout>
+
+            <TextView
+                android:id="@+id/profilehelper_tdds"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+
+            <Button
+                android:id="@+id/profilehelper_copytolocalprofile"
+                style="@style/ButtonMediumFontStyle"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:drawableStart="@drawable/ic_clone_48"
+                android:text="@string/clone_label" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/profilehelper_current_profile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/profilehelper_current_profile_text"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:labelFor="@+id/profilehelper_age"
+                android:text="@string/age"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/profilehelper_available_profile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/selected_profile"
+                android:textColorHint="@color/white"
+                app:boxStrokeColor="@color/white">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/profilehelper_available_profile_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:clickable="true"
+                    android:cursorVisible="false"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
+                    android:importantForAutofill="no" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/profilehelper_profile_switch"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.textfield.TextInputLayout
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/careportal_profileswitch"
+                android:textColorHint="@color/white"
+                app:boxStrokeColor="@color/white">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/profilehelper_profileswitch_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:clickable="true"
+                    android:cursorVisible="false"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"
+                    android:importantForAutofill="no" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/menu/menu_profilehelper.xml b/app/src/main/res/menu/menu_profilehelper.xml
new file mode 100644
index 0000000000..ed73bb6f72
--- /dev/null
+++ b/app/src/main/res/menu/menu_profilehelper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_default"
+        android:title="@string/motoldefaultprofile" />
+    <item
+        android:id="@+id/menu_current"
+        android:title="@string/currentprofile" />
+    <item
+        android:id="@+id/menu_available"
+        android:title="@string/availableprofile" />
+    <item
+        android:id="@+id/menu_profileswitch"
+        android:title="@string/careportal_profileswitch" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f05d08a31d..5f5c7f407a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1465,7 +1465,7 @@
     <string name="clone_label">Clone</string>
     <string name="saveorresetchangesfirst">Save or reset current changes first</string>
     <string name="deletecurrentprofile">Delete current profile?</string>
-    <string name="copytolocalprofile">Create new local profile from this profile switch?</string>
+    <string name="copytolocalprofile">Create new local profile from this profile?</string>
     <string name="profilenamecontainsdot">Profile name contains dots.\nThis is not supported by NS.\nProfile is not uploaded to NS.</string>
     <string name="low_mark_comment">Lower value of in range area (display only)</string>
     <string name="high_mark_comment">Higher value of in range area (display only)</string>
@@ -1708,7 +1708,13 @@
     <string name="omnipod_bolus_failed_uncertain">Unable to verify whether the bolus succeeded. Please verify that your Pod is bolusing or cancel the bolus.</string>
     <string name="omnipod_rl_stats">RL Stats</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
-    <string name="comapareprofile">Compare with current profile</string>
+    <string name="comapareprofile">Compare profiles</string>
     <string name="nav_profilehelper">Profile helper</string>
+    <string name="motoldefaultprofile">Motol default profile</string>
+    <string name="currentprofile">Current profile</string>
+    <string name="availableprofile">Available profile</string>
+    <string name="profiletype">Profile type</string>
+    <string name="formatwithtdd">Age: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwithweight">Age: %1$.0f Weight: %2$.0f kg</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cd9e3d509c..29f4ef5bc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -83,5 +83,5 @@
         <item name="android:dividerHeight">1dp</item>
     </style>
 
-
+    <style name="ProfileHelperAppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"/>
 </resources>
diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 00dd367f99..0dab749c24 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -130,20 +130,20 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
         val basals = JSONArray()
         for (i in 0..23) {
             val time = String.format(Locale.ENGLISH, "%02d:00", i)
-            basals.put(JSONObject().put("time", time).put("value", b[i].toString()))
+            basals.put(JSONObject().put("time", time).put("value", b[i].toString()).put("timeAsSeconds", i * 3600))
         }
         return basals
     }
 
     private fun singleValueArray(value: Double, sample: Array<Double>): JSONArray {
         val array = JSONArray()
-        array.put(JSONObject().put("time", "00:00").put("value", value + sample[0]))
-        array.put(JSONObject().put("time", "06:00").put("value", value + sample[1]))
-        array.put(JSONObject().put("time", "09:00").put("value", value + sample[2]))
-        array.put(JSONObject().put("time", "11:00").put("value", value + sample[3]))
-        array.put(JSONObject().put("time", "14:00").put("value", value + sample[4]))
-        array.put(JSONObject().put("time", "16:00").put("value", value + sample[5]))
-        array.put(JSONObject().put("time", "19:00").put("value", value + sample[6]))
+        array.put(JSONObject().put("time", "00:00").put("value", value + sample[0]).put("timeAsSeconds", 0 * 3600))
+        array.put(JSONObject().put("time", "06:00").put("value", value + sample[1]).put("timeAsSeconds", 6 * 3600))
+        array.put(JSONObject().put("time", "09:00").put("value", value + sample[2]).put("timeAsSeconds", 9 * 3600))
+        array.put(JSONObject().put("time", "11:00").put("value", value + sample[3]).put("timeAsSeconds", 11 * 3600))
+        array.put(JSONObject().put("time", "14:00").put("value", value + sample[4]).put("timeAsSeconds", 14 * 3600))
+        array.put(JSONObject().put("time", "16:00").put("value", value + sample[5]).put("timeAsSeconds", 16 * 3600))
+        array.put(JSONObject().put("time", "19:00").put("value", value + sample[6]).put("timeAsSeconds", 19 * 3600))
         return array
     }
 }
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index bcfae4473e..7e8020884a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -46,6 +46,10 @@
         <item name="android:textSize">10sp</item>
     </style>
 
+    <style name="ButtonMediumFontStyle">
+        <item name="android:textSize">15sp</item>
+    </style>
+
     <!--    Buttons from MaterialDateTimePicker    -->
     <dimen name="mdtp_material_button_height">48dp</dimen>
     <dimen name="mdtp_material_button_textsize">14sp</dimen>

From b40b78d14a38c1599b7c7afe18af9df710fb9a9c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 14 Jul 2020 16:51:53 +0200
Subject: [PATCH 325/400] New Crowdin updates (#2807)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations protection.xml (French)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations protection.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Russian)
---
 app/src/main/res/values-cs-rCZ/strings.xml    |   2 +
 app/src/main/res/values-es-rES/strings.xml    |   2 +
 app/src/main/res/values-fr-rFR/protection.xml |   2 +
 app/src/main/res/values-fr-rFR/strings.xml    |   2 +
 app/src/main/res/values-it-rIT/strings.xml    |   2 +
 app/src/main/res/values-nl-rNL/strings.xml    |   2 +
 app/src/main/res/values-ro-rRO/strings.xml    | 209 +++++++++++++++++-
 app/src/main/res/values-ru-rRU/strings.xml    |   6 +-
 app/src/main/res/values-sk-rSK/strings.xml    |   2 +
 core/src/main/res/values-es-rES/strings.xml   |   2 +
 core/src/main/res/values-fr-rFR/strings.xml   |   2 +
 core/src/main/res/values-it-rIT/strings.xml   |   2 +
 core/src/main/res/values-nl-rNL/strings.xml   |   2 +
 core/src/main/res/values-ro-rRO/strings.xml   |  78 +++++++
 core/src/main/res/values-ru-rRU/strings.xml   |   2 +
 core/src/main/res/values-sk-rSK/strings.xml   |   2 +
 dana/src/main/res/values-ro-rRO/strings.xml   |  40 ++++
 wear/src/main/res/values-ro-rRO/strings.xml   |  38 ++++
 18 files changed, 391 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index b760ef7044..0fa23656c6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Nelze ověřit, zda byl bolus úspěšný. Ověřte prosím, zda Váš Pod dodává bolus nebo ho zrušte.</string>
     <string name="omnipod_rl_stats">Statistika RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="comapareprofile">Porovnat s aktuálním profilem</string>
+    <string name="nav_profilehelper">Pomocník s profilem</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 4dc505384e..9ea50c32d0 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">No se puede verificar si el bolo ha sido exitoso. Por favor verifique que su Pod está poniendo bolo o cancele el bolo.</string>
     <string name="omnipod_rl_stats">Estadísticas del RL</string>
     <string name="omnipod_read_pulse_log_short">Registro de pulso</string>
+    <string name="comapareprofile">Comparar con el perfil actual</string>
+    <string name="nav_profilehelper">Asistente de perfil</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/protection.xml b/app/src/main/res/values-fr-rFR/protection.xml
index 4b38aa53da..7d47f26e8a 100644
--- a/app/src/main/res/values-fr-rFR/protection.xml
+++ b/app/src/main/res/values-fr-rFR/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Pas de Protection</string>
     <string name="protection">Protection</string>
     <string name="master_password_missing">Le mot de passe principal n\'est pas défini !\n\nVeuillez définir votre mot de passe principal dans les préférences (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Retour arrière non sécurisé</string>
+    <string name="unsecure_fallback_descriotion_biometric">Pour être effective, la protection biométrique nécessite un mot de passe principal pour revenir en arrière.\n\nMerci de définir un mot de passe principal !</string>
     <string name="password_set">Mot de passe défini !</string>
     <string name="password_not_set">Mot de passe non défini</string>
     <string name="password_not_changed">Mot de passe non modifié</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 5da915b220..7e72ee4e5f 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1406,4 +1406,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="omnipod_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Vérifiez que votre Pod délivre le bolus ou annulez le bolus.</string>
     <string name="omnipod_rl_stats">État RL</string>
     <string name="omnipod_read_pulse_log_short">Enreg. Pulse</string>
+    <string name="comapareprofile">Comparer avec le profil actuel</string>
+    <string name="nav_profilehelper">Assistant Profil</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index c07b82596b..ea0ba0fcb3 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Impossibile verificare che il bolo sia riuscito. Verifica che il tuo pod stia erogando il bolo oppure cancellalo.</string>
     <string name="omnipod_rl_stats">Statistiche RL</string>
     <string name="omnipod_read_pulse_log_short">Log impulsi</string>
+    <string name="comapareprofile">Compara col profilo corrente</string>
+    <string name="nav_profilehelper">Assistente profilo</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0c700b271d..1005731363 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer of de Pod de bolus aan het toedienen is of annuleer de bolus.</string>
     <string name="omnipod_rl_stats">RL Statistieken</string>
     <string name="omnipod_read_pulse_log_short">Pulsen Log</string>
+    <string name="comapareprofile">Vergelijk met huidig profiel</string>
+    <string name="nav_profilehelper">Profiel hulp</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 268988058d..9d03121acf 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -186,6 +186,7 @@
     <string name="metadata_warning_old_export">Preferințele importate sunt vechi de %1$s zile deja! Poate aveți preferințe mai recente sau ați ales un fișier greșit? Amintiți-vă să exportați preferințele în mod regulat!</string>
     <string name="metadata_warning_date_format">Format dată invalid!</string>
     <string name="metadata_warning_different_version">Preferințe dintr-o versiune minoră diferită a aplicației. Este OK dacă importați după upgrade, dar verificați după import că preferințele sunt corecte!</string>
+    <string name="metadata_urgent_different_version">Preferințe dintr-o versiune majoră a aplicației. Versiunile majore au diferențe semnificative și pot avea preferințe incompatibile! Asigurați-vă după import ca preferințele sunt corecte!</string>
     <string name="metadata_label_format">Formatul fișierului</string>
     <string name="metadata_label_created_at">Creat la</string>
     <string name="metadata_label_aaps_version">Versiune AAPS</string>
@@ -206,6 +207,13 @@
     <string name="prefdecrypt_issue_modified">Fişierul a fost modificat după export!</string>
     <string name="prefdecrypt_issue_parsing">Eroare la decriptare, parsarea preferinţelor a eşuat!</string>
     <string name="prefdecrypt_issue_wrong_pass">Eroare la decriptare, parola furnizată este invalidă sau fişierul de setări a fost modificat! Se poate întâmpla ca fişierul importat să fi fost exportat cu o parolă master diferită.</string>
+    <string name="prefdecrypt_issue_wrong_format">Lipseşte configuraţia de criptare, formatul setărilor este invalid!</string>
+    <string name="prefdecrypt_issue_wrong_algorithm">Algoritm de criptare nesuportat sau nespecificat!</string>
+    <string name="exported_today">exportat azi</string>
+    <string name="exported_ago" comment="at placeholder we add pluralized number of hours/minutes">exportat cu %1$s în urmă</string>
+    <string name="exported_at" comment="at placeholder we add export date">exportat în data de %1$s</string>
+    <string name="exported_less_than_hour_ago">exportat acum mai puțin de o ora</string>
+    <string name="in_directory" comment="placeholder is for exported file path">în folderul: %1$s</string>
     <string name="end_user_license_agreement">Licență utilizator final</string>
     <string name="end_user_license_agreement_text">NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII.</string>
     <string name="end_user_license_agreement_i_understand">ÎNȚELEG ȘI SUNT DE ACORD</string>
@@ -215,14 +223,26 @@
     <string name="smscommunicator_allowednumbers">Numere de telefon permise</string>
     <string name="smscommunicator_allowednumbers_summary">+ XXXXXXXXXX; + YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">Pentru a livra un bolus de %1$.2fU răspundeți cu codul %2$s</string>
+    <string name="smscommunicator_mealbolusreplywithcode">Pentru a livra un bolus de %1$.2fU raspundeți cu: %2$s</string>
+    <string name="smscommunicator_temptargetwithcode">Pentru a seta tinta temporara %1$s raspundeti cu: %2$s</string>
+    <string name="smscommunicator_temptargetcancel">Pentru a anula tinta temporara raspundeți cu: %1$s</string>
+    <string name="smscommunicator_stopsmswithcode">Pentru a dezactiva serviciul SMS la distanta raspundeti cu: %1$s.\n\nRetineti ca o sa il puteti reactiva doar direct de pe smartphone-ul master AAPS.</string>
+    <string name="smscommunicator_stoppedsms">Serviciul SMS la distanta s-a oprit. Pentru a il reactiva, utilizati AAPS de pe smartphone-ul master.</string>
     <string name="smscommunicator_calibrationreplywithcode">Pentru a trimite calibrarea cu %1$.2f răspundeți cu codul %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolusare eșuată</string>
+    <string name="smscommunicator_remotebolusmindistance_summary">Numarul minim de minute care trebuie sa treaca intre un bolus la distanta si urmatorul</string>
+    <string name="smscommunicator_remotebolusmindistance">Cate minute trebuie sa treaca, cel puţin, intre un bolus si următorul</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">Pentru siguranta dumneavoastra, pentru a edita aceasta preferinta trebuie sa adaugati cel putin 2 numere de telefon.</string>
     <string name="bolusdelivered">Bolusul de %1$.2fU a fost livrat cu succes</string>
     <string name="bolusrequested">Se va livra un bolus de %1$.2fU</string>
     <string name="smscommunicator_bolusdelivered">Bolusul de %1$.2fU a fost livrat cu succes</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolusul de %1$.2fU a fost livrat cu succes</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Țintă %1$s pentru %2$d minute</string>
+    <string name="smscommunicator_tt_set">Tinta %1$s pentru %2$d minute este setata cu succes</string>
+    <string name="smscommunicator_tt_canceled">Tinta temporara anulata cu succes</string>
     <string name="smscommunicator_remotecommandsallowed">Permite comenzi de la distanță, prin SMS</string>
     <string name="danarprofile">Setări de profil DanaR</string>
-    <string name="danarprofile_dia">DIA [o]</string>
+    <string name="danarprofile_dia">DIA [h]</string>
     <string name="danarprofile_dia_summary">Durata de Acțiune a Insulinei (DIA)</string>
     <string name="uploading">Se trimite</string>
     <string name="bolusstopped">Bolus oprit</string>
@@ -233,6 +253,9 @@
     <string name="smscommunicator_loopisenabled">Bucla este activată</string>
     <string name="valuelimitedto">%1$.2f este limitată la %2$.2f</string>
     <string name="valueoutofrange">Valoarea %1$s este mai mare decât limita stabilită</string>
+    <string name="smscommunicator_pumpconnectwithcode">Pentru a conecta pompa raspundeti cu codul %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Conectarea cu pompa a esuat</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Pentru a deconecta pompa timp de %1d minute, raspundeti cu: %2$s</string>
     <string name="smscommunicator_pumpdisconnected">Pompă deconectată</string>
     <string name="smscommunicator_reconnect">Pompă reconectată</string>
     <string name="smscommunicator_remotecommandnotallowed">Comanda de la distanță nu este permisă</string>
@@ -240,10 +263,16 @@
     <string name="smscommunicator_basalreplywithcode">Pentru a iniția bazala de %1$.2fU/h pentru %2$d min trimiteți codul %3$s</string>
     <string name="smscommunicator_profilereplywithcode">Pentru a schimba profilul în %1$s %2$d%% trimiteți codul %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">Pentru a stabili bazala de %1$.2fU/h pentru %2$d min trimiteți codul %3$s</string>
+    <string name="smscommunicator_carbsreplywithcode">Pentru a introduce %1$dg la %2$s, raspundeti cu: %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Pentru a iniția bazala de %1$d%% pentru %2$d min trimiteți codul %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Pentru suspendarea buclei pentru %1$d minute trimiteți codul %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Pentru a reactiva bucla inchisa, raspundeti cu %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Pentru a activa bucla inchisa, raspundeti cu %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Pentru a dezactiva bucla inchisa, raspundeti cu %1$s</string>
     <string name="smscommunicator_tempbasalset">Bazala temporară %1$.2fU/h pentru %2$d minute a fost trimisă cu succes</string>
     <string name="smscommunicator_extendedset">Bolusul extins de %1$.2fU pentru %2$d min a fost inițiat</string>
+    <string name="smscommunicator_carbsset">%1$dg carbohidrati introdusi cu succes</string>
+    <string name="smscommunicator_carbsfailed">Introducerea a %1$dg de carbohidrati a esuat</string>
     <string name="smscommunicator_tempbasalset_percent">Bazala temporară %1$d%% pentru %2$d minute a fost stabilită cu succes</string>
     <string name="smscommunicator_tempbasalfailed">Trimiterea bazalei temporare a eșuat</string>
     <string name="smscommunicator_extendedfailed">Pornirea bolusului extins a eșuat</string>
@@ -274,6 +303,9 @@
     <string name="button1">Buton 1</string>
     <string name="button2">Buton 2</string>
     <string name="button3">Buton 3</string>
+    <string name="units_colon">Unități:</string>
+    <string name="units">Unități</string>
+    <string name="dia">DIA</string>
     <string name="target_range">Intervalul țintă:</string>
     <string name="prefs_range_title">Intervalul pentru vizualizare</string>
     <string name="prefs_range_summary">Valoarea maximă și minimă pentru graficele din vizualizare și pentru smartwatch</string>
@@ -304,6 +336,7 @@
     <string name="eatingsoon">Masă în curând</string>
     <string name="hypo">Hipo</string>
     <string name="activity">Activitate</string>
+    <string name="removerecord">Șterge înregistrarea</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">CONF</string>
     <string name="loop_shortname">BUCL</string>
@@ -325,6 +358,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Valoare implicită: 4\nAceasta este cealaltă jumătate a cheii de siguranță a OpenAPS și cealaltă jumătate a \"3x max zilnic; 4x curent\" al setărilor de siguranță.Aceasta înseamnă că bazala dumneavoastră, indiferent de bazala maximă configurată în pompă, nu poate fi mai mare de acest număr înmulțit cu nivelul curent al bazalei active. Această limitare este impusă pentru a evita posibilitatea de a intra pe un teritoriu periculos prin setarea unei bazale maxime excesiv de mari înainte de a înțelege funcționarea algoritmului. Din nou, valoarea implictă este 4x; majoritatea oamenilor nu vor trebui să ajusteze această valoare și vor modifica, mai degrabă, alte valori dacă vor simți că această valoare le stă în cale.</string>
     <string name="openapsama_autosens_max_summary">Valoare implicită: 1.2\nAceasta este valoarea limită de multiplicare pentru autosens (și pentru autotune, în curând) pentru a seta o limită maximă de 20%% din cât de mare poate fi raportul autosens, care, la rândul ei, determină cât de mult poate autosens să modifice bazalele, cât de jos poate modifica ISF și cât de jos poate pune ținta glicemiei.</string>
     <string name="openapsama_autosens_min_summary">Valoare implicită: 0.7\nCealaltă parte a limitelor autosens, care limitează cât de jos poate ajusta bazalele și cât de mult poate mări ISF și țintele de glicemie.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens ajustează si target-urile</string>
     <string name="openapsama_autosens_adjusttargets_summary">Valoare implicită: adevărat\nAceasta se folosește pentru a permite autosens să ajusteze țintele de glicemie, pe lângă modificările asupra ISF și bazalelor.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Valoare implicită: 2\nAmânarea bolusului este aplicată după ce ați făcut un bolus de masă, astfel încât bucla să nu reacționeze cu ținte bazale temporare scăzute atunci când tocmai ați mâncat. Exemplul de față și valoarea implicită sunt 2; astfel o durată de acțiune a insulinei (DIA) de 3 ore duce la o eliminare treptată a întârzierii setării bazalelor temporare după 1.5 ore (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Valoarea implicită: 3.0 (AMA) sau 8.0 (SMB). Aceasta este o setare pentru impactul implicit al carbohidraţilor pe 5 minute. Valoarea implicită este 3mg/dl la 5min. Aceasta influenţează rapiditatea cu care se scade COB şi modul în care se ia în calcul absorbţia carbohidraţilor în calcularea valorilor estimate ale glicemiei, atunci când glicemia este în scădere mai mare decât se aştepta sau nu creşte atât de repede pe cât se aştepta.</string>
@@ -363,6 +397,7 @@
     <string name="wear_detailedIOB_title">Arată IOB detaliat</string>
     <string name="wear_detailedIOB_summary">Separă IOB în bolus și IOB bazal pe ceas</string>
     <string name="nosuccess">fără succes - verificați telefonul</string>
+    <string name="notavailable">indisponibil</string>
     <string name="patientage">Vârsta pacientului</string>
     <string name="child">Copil</string>
     <string name="teenage">Adolescent</string>
@@ -370,6 +405,8 @@
     <string name="resistantadult">Adult rezistent la insulină</string>
     <string name="patientage_summary">Vă rog să selectați vârsta pacientului în vederea stabilirii valorilor maxime admise de siguranță</string>
     <string name="patient_name">Numele pacientului</string>
+    <string name="patient_name_summary">Vă rugăm să furnizați numele sau porecla pacientului pentru a diferenția între configurări</string>
+    <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Utilizator</string>
     <string name="Glimp">Glimp</string>
     <string name="needwhitelisting">%1$s necesită excluderea din lista de optimizare a bateriei pentru o funcționare corespunzătoare</string>
     <string name="loopsuspended">Buclă suspendată</string>
@@ -404,10 +441,26 @@
     <string name="enablesuperbolus">Activează superbolus în asistent</string>
     <string name="enablesuperbolus_summary">Activează funcționalitatea de superbolus în asistentul de buclă. Nu activați până nu înțelegeți ce face cu adevărat. DACĂ ESTE FOLOSIT ÎN NECUNOȘTINȚĂ DE CAUZĂ POATE DUCE LA SUPRADOZĂ DE INSULINĂ!</string>
     <string name="show_statuslights">Afișați indicatorii luminoși ai pompei pe ecranul de start</string>
+    <string name="statuslights_cage_warning">Prag de avertizare timp de utilizare canulă [h]</string>
+    <string name="statuslights_cage_critical">Prag critic timp de utilizare canulă [h]</string>
+    <string name="statuslights_iage_warning">Prag de avertizare vechime insulină [h]</string>
+    <string name="statuslights_iage_critical">Prag critic vechime insulină [h]</string>
+    <string name="statuslights_sage_warning">Prag de avertizare vechime senzor [h]</string>
+    <string name="statuslights_sage_critical">Prag critic vechime senzor [h]</string>
+    <string name="statuslights_bage_warning">Prag de avertizare nivel baterie [h]</string>
+    <string name="statuslights_bage_critical">Prag critic nivel baterie [h]</string>
     <string name="statuslights_res_warning">Pragul de avertisment pentru insulina din rezervor [U]</string>
     <string name="statuslights_res_critical">Pragul critic al nivelului insulinei în rezervor [U]</string>
+    <string name="statuslights_bat_warning">Pragul de avertizare nivel baterie [%]</string>
+    <string name="statuslights_bat_critical">Pragul critic al nivelului baterie [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">R_BAZ</string>
+    <string name="deviation_shortname">DEV</string>
+    <string name="activity_shortname">ACT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Despre</string>
     <string name="smscommunicator_missingsmspermission">Lipsesc permisiunile de SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Nu este acordată permisiunea de citire a stării telefonului</string>
@@ -422,8 +475,11 @@
     <string name="careportal_sensorage_label">Vechime senzor</string>
     <string name="careportal_canulaage_label">Vechime canulă</string>
     <string name="careportal_insulinage_label">Vechime insulină</string>
+    <string name="doprofileswitch">Schimbă profilul</string>
     <string name="careportal_pbage_label">Vechime baterie pompă</string>
     <string name="ns_alarmoptions">Opțiuni alarmare</string>
+    <string name="ns_alarms">Creare notificări din alarmele NS</string>
+    <string name="ns_announcements">Creare notificări din anunţurile NS</string>
     <string name="nsalarm_staledatavalue_label">Prag vechime date [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Prag date mult prea vechi [min]</string>
     <string name="openapsama_autosens_period">Interval pentru autosens [o]</string>
@@ -504,6 +560,7 @@
     <string name="enable_missed_bg_readings_alert">Alarmează dacă nu se primesc glicemii</string>
     <string name="enable_pump_unreachable_alert">Se alertează dacă pompa este indisponibilă</string>
     <string name="pump_unreachable_threshold">Prag pompă indisponibilă [min]</string>
+    <string name="enable_carbs_req_alert">Alertează dacă sunt necesari carbohidrați</string>
     <string name="urgent_alarm">Alarmă urgentă</string>
     <string name="info">INFO</string>
     <string name="eversense">Aplicația Eversense (modificată)</string>
@@ -511,7 +568,13 @@
     <string name="bgsource_upload">Setări înregistrare glicemie</string>
     <string name="wear_detailed_delta_title">Arată variație detaliată</string>
     <string name="wear_detailed_delta_summary">Arată variație cu încă o zecimală</string>
+    <string name="smbinterval_summary">Cât de des se vor administra SMB în min</string>
+    <string name="smbmaxminutes">SMB maxim minute</string>
     <string name="smbmaxminutes_summary">Max minute de bazală la care să se limiteze SMB</string>
+    <string name="uamsmbmaxminutes">UAM SMB maxim minute</string>
+    <string name="uamsmbmaxminutes_summary">Durata maxima (în minute) a bazalei pentru a limita SMB în cazul UAM</string>
+    <string name="carbsReqThreshold">Numărul minim de carbohidrați solicitați în Sugestii</string>
+    <string name="carbsReqThreshold_summary">Numărul minim de carbohidrați pentru a afișa o alertă-sugestie. Sugestiile de carbohidrați mai jos acest număr nu vor declanșa o notificare.</string>
     <string name="dexcomg5_xdripupload_title">Trimite date glicemie la xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">Selectați 640g/Eversense ca sursă de date în xDrip+</string>
     <string name="nsclientbg">Glicemie NSClient</string>
@@ -570,6 +633,8 @@
     <string name="extendedbolusdeliveryerror">Eroare de livrare a bolusului extins</string>
     <string name="insightpump_shortname">Obiectiv</string>
     <string name="ago">în trecut</string>
+    <string name="set_neutral_temps_title">Setați bazale temporare neutre</string>
+    <string name="set_neutral_temps_summary">Dacă este activată, va anula o bazală temporară înainte de sfârșitul fiecărei ore. Aceasta metoda poate ajuta la oprirea vibrațiilor/bipurilor orare pe anumite pompe.</string>
     <string name="enablesmbalways">Activează SMB întotdeauna</string>
     <string name="enablesmbalways_summary">Activează SMB întotdeauna independent de bolusuri. Este posibil doar în cazul unei surse de glicemii filtrate, cum ar fi G5</string>
     <string name="enablesmbaftercarbs">Activează SMB după carbohidrați</string>
@@ -589,11 +654,17 @@
     <string name="insulin_increment_button_message">Cantitatea de insulină de adăugat când se apasă butonul</string>
     <string name="error_starting_cgm">Nu s-a putut deschide aplicația CGM. Asigurați-vă că este instalată.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignorați 5min</string>
+    <string name="ignore15m">Ignorați 15min</string>
+    <string name="ignore30m">Ignorați 30min</string>
+    <string name="required">req</string>
     <string name="nav_historybrowser">Vizualizare istoric</string>
     <string name="wear_notifysmb_title">Notifică despre SMB</string>
     <string name="wear_notifysmb_summary">Arată SMB pe ceas ca și un bolus standard.</string>
     <string name="ns_create_announcements_from_errors_title">Crează anunțuri pentru erori</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Crează anunțuri din alertele de cerere carbohidrați</string>
     <string name="ns_create_announcements_from_errors_summary">Crează anunțuri în Nightscout pentru dialoguri de erori și alerte locale (vizibile și în Careportal - Tratamente)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Creează anunțuri Nightscout din alertele de cerere carbohidrați</string>
     <string name="wear_predictions_summary">Arată previziunile pe ceas.</string>
     <string name="wear_predictions_title">Predicții</string>
     <string name="data_choices">Alegeri date</string>
@@ -667,7 +738,7 @@
     <string name="pump_stopped">Pompă oprită</string>
     <string name="pump_started">Pompă pornită</string>
     <string name="pump_paused">Pompă în pauză</string>
-    <string name="absorption_cutoff_title">Timpul maxim de absorbție a mesei [o]</string>
+    <string name="absorption_cutoff_title">Timpul maxim de absorbție a mesei [h]</string>
     <string name="absorption_cutoff_summary">Timpul în care orice mâncare se consideră absorbită. Carbohidrații rămași vor fi ignorați.</string>
     <string name="time">Timp</string>
     <string name="overview_show_notes_field_in_dialogs_title">Afișează câmp pentru note în dialogurile de tratamente</string>
@@ -722,6 +793,8 @@
     <string name="startobjective">Începeți primul obiectiv</string>
     <string name="permission">Permisiune</string>
     <string name="askforpermission">Solicitați permisiunea</string>
+    <string name="needsystemwindowpermission">Aplicația are nevoie de permisiune la fereastra sistemului pentru a afișa notificări</string>
+    <string name="needlocationpermission">Aplicația are nevoie sa acceseze locația pentru scanare Bluetooth și identificare WiFi</string>
     <string name="needstoragepermission">Aplicația necesită permisiune de acces la mediul de stocare pentru a putea înregistra jurnalele</string>
     <string name="request">Cerință</string>
     <string name="insulinsourcesetup">Configurați plugin insulină</string>
@@ -739,6 +812,10 @@
     <string name="high_temptarget_raises_sensitivity_summary"><![CDATA[Creșterea sensibilității pentru ținte temporare >= 100]]></string>
     <string name="low_temptarget_lowers_sensitivity_title">Țintele temporare joase scad sensibilitatea</string>
     <string name="low_temptarget_lowers_sensitivity_summary"><![CDATA[Sensibilitate scăzută pentru ținte temporare < 100]]></string>
+    <string name="resistance_lowers_target_title">Rezistența la insulină poate coborî targetul</string>
+    <string name="resistance_lowers_target_summary">Când e detectata rezistență la insulină, coboară targetul</string>
+    <string name="sensitivity_raises_target_title">Sensibilitatea la insulină crește targetul</string>
+    <string name="sensitivity_raises_target_summary">Când este detectată sensibilitate la insulină, crește targetul</string>
     <string name="combo_invalid_setup">Setare pompă invalidă, verificați documentația și asigurați-vă că meniul Quick Info este denumit QUICK INFO, folosind aplicația 360 Configuration Software.</string>
     <string name="custom">Personalizat</string>
     <string name="careportal_removestartedevents">AndroidAPS pornit curat</string>
@@ -746,6 +823,7 @@
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
     <string name="error_adding_treatment_title">Date incomplete despre tratament</string>
     <string name="maintenance_settings">Setări de întreținere</string>
+    <string name="maintenance_encrypt_exported_prefs">Criptează setările exportate</string>
     <string name="maintenance_amount">Nr de loguri de trimis</string>
     <string name="maintenance">Mentenanță</string>
     <string name="maintenance_shortname">MENTN</string>
@@ -787,6 +865,9 @@
     <string name="log_alerts">Înregistrează alertele</string>
     <string name="enable_tbr_emulation">Activează emularea RBT</string>
     <string name="enable_tbr_emulation_summary">Folosește bolus extins în locul RBT pentru a trece de limita de 250%%</string>
+    <string name="disable_vibration">Dezactivează vibrațiile la livrarea manuală de bolus</string>
+    <string name="disable_vibration_summary">Pentru bolus și bolus extins (valabil doar cu modelul Insight firmware 3.x)</string>
+    <string name="disable_vibration_auto">Dezactivați vibrațiile la livrarea automată de bolus</string>
     <string name="disconnect_delay">Întârziere a deconectării [s]</string>
     <string name="serial_number">Număr de serie</string>
     <string name="release_software_version">Versiunea de software</string>
@@ -913,7 +994,7 @@
     <string name="running_invalid_version">S-a detectat rularea unei versiuni invalide. Buclă dezactivată!</string>
     <string name="old_version">versiune veche</string>
     <string name="very_old_version">versiune foarte veche</string>
-    <string name="twohours">2o</string>
+    <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Aplicația Dexcom (modificată)</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">Primește valori glicemie de la aplicația Dexcom modificată.</string>
@@ -961,7 +1042,7 @@
     <string name="medtronic_pump_frequency">Frecvență pompă</string>
     <string name="medtronic_pump_bolus_delay">Întârziere până la pornirea bolusului (s)</string>
     <string name="medtronic_pump_max_bolus">Bolusul maxim în pompă (U)</string>
-    <string name="medtronic_pump_max_basal">Bazală maximă în pompă (U/o)</string>
+    <string name="medtronic_pump_max_basal">Bazală maximă în pompă (U/h)</string>
     <string name="medtronic_pump_encoding">Criptare Medtronic</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Globală (868 Mhz)</string>
@@ -974,6 +1055,8 @@
     <string name="medtronic_pump_battery_no">Fără selecție (Afișare simplificată)</string>
     <string name="medtronic_pump_battery_alkaline">Alcalină (Afișare extinsă)</string>
     <string name="medtronic_pump_battery_lithium">Litiu (Afișare extinsă)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Afișare extinsă)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Afișare extinsă)</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SCAN</string>
     <string name="rileylink_scanner_scan_stop">STOP</string>
@@ -984,6 +1067,7 @@
     <string name="rileylink_scanner_scanning">Scanează</string>
     <string name="rileylink_scanner_scanning_finished">Scanare terminată</string>
     <string name="rileylink_scanner_scanning_error">Eroare la scanare: %1$d</string>
+    <string name="common_never">Niciodată</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Setări</string>
     <string name="rileylink_settings_tab2">Istoric</string>
@@ -1101,33 +1185,150 @@
     <string name="format_percent">%1$d%%</string>
     <string name="boluswizard">Asistent bolusare</string>
     <string name="unit_minute_short">min</string>
+    <string name="profile_name">Nume profil:</string>
+    <string name="selected_profile">Selectat:</string>
     <string name="unitsnosemicolon">Unități</string>
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">Pornit</string>
     <string name="common_off">Oprit</string>
+    <string name="nopumpselected">Nicio pompă selectată</string>
+    <string name="dia_short">DIA</string>
+    <string name="ic_short">IC</string>
+    <string name="isf_short">ISF</string>
+    <string name="target_short">TARG</string>
+    <string name="clone_label">Clonează</string>
     <string name="deletecurrentprofile">Ştergeţi profilul curent?</string>
+    <string name="reorder_label">Reordonează</string>
     <string name="age">Vârstă:</string>
     <string name="weight_label">Greutate:</string>
+    <string name="id">ID:</string>
+    <string name="submit">Trimiteți</string>
+    <string name="invalidage">Valoare vârstă invalidă</string>
+    <string name="invalidweight">Valoare greutate invalidă</string>
+    <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Normal: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
+    <string name="average">Medie</string>
+    <string name="tir">Timp în țintă</string>
+    <string name="statistics">Statistici</string>
     <string name="randombg_short">Glicemie</string>
     <string name="tools">Instrumente</string>
+    <string name="automation_event">Eveniment automatizare</string>
+    <string name="alreadyset">Deja setat</string>
+    <string name="clearqueueconfirm">Ștergeți coada? Toate datele din coadă vor fi pierdute!</string>
+    <string name="ebstopsloop">Utilizarea unui bolus extins va opri modul buclă închisă pe timpul livrării bolusului extins. Sigur doriți acest lucru?</string>
+    <string name="closed_loop_disabled_with_eb">Bucla închisă dezactivată din cauza livrării bolusului extins</string>
+    <string name="extended_bolus_short">BE</string>
+    <string name="phonechecker">\"Verificator de telefon\"</string>
+    <string name="chartmenu">Meniu diagramă</string>
+    <string name="sensitivity_short">AS</string>
+    <string name="loop_smbrequest_time_label">Timp solicitare SMB</string>
+    <string name="loop_smbexecution_time_label">Timp de execuţie SMB</string>
+    <string name="loop_tbrrequest_time_label">Timp solicitare bazală temporară</string>
+    <string name="loop_tbrexecution_time_label">Timpul de execuție al bazalei temporare</string>
+    <string name="insight_alert_notification_channel">Alerte pompă Insight</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <string name="smscommunicator_code_from_authenticator_for" comment="This is continuation of sentence: To [ACTION] reply with code">de la aplicația Authenticator pentru: %1$s</string>
+    <string name="smscommunicator_otp_enabled">Activare Authenticator</string>
+    <string name="smscommunicator_otp_enabled_summary">Autentificați comenzile folosind o parolă unica generată de Google Authenticator sau alte aplicații 2FA similare.</string>
+    <string name="smscommunicator_otp_pin">PIN adițional la sfârșitul token-ului</string>
+    <string name="smscommunicator_otp_pin_summary">Cifre suplimentare care ar trebui să fie memorate și adăugate la sfârșitul fiecărei parole unice generate</string>
+    <string name="smscomunicator_tab_otp_label">Setare Authenticator</string>
+    <string name="smscommunicator_otp_verify_label">Parola unică pentru verificare:</string>
+    <string name="smscommunicator_otp_reset_btn">Resetați Authenticatori</string>
+    <string name="smscommunicator_otp_reset_title">Resetați cheia pentru Authenticator</string>
+    <string name="smscommunicator_otp_reset_prompt">Sunteți sigur că vreți sa resetați cheia pentru Authenticator? Acest lucru va invalida toți Authenticatorii configurați și va trebui să ii setați din nou.</string>
+    <string name="smscommunicator_otp_reset_successful">S-a generat o nouă cheie pentru Authenticator! Vă rugăm să utilizați QRCode actualizat pentru a configura autentificatori.</string>
+    <string name="smscommunicator_otp_step1_install_header">1. Instalați Authenticator</string>
+    <string name="smscommunicator_otp_step2_provisioning_header">2. Scanați codul pentru a seta codurile unice pentru AndroidAPS</string>
+    <string name="smscommunicator_otp_step3_test_header">3. Testați o parolă unică</string>
+    <string name="smscommunicator_otp_reset_header">Resetați Authenticatori</string>
+    <string name="smscommunicator_otp_install_info">Pe fiecare telefon urmăritor instalați o aplicație de tip Authenticator care suporta tokens RFC 6238 TOTP. Asemenea aplicații gratuite populare sunt:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator</string>
+    <string name="smscommunicator_otp_provisioning_warning">NU DISTRIBUIȚI acest cod online!\nUtilizaţi-l doar pentru a seta aplicația Authenticator pe telefoanele urmăritoare.</string>
+    <string name="smscommunicator_otp_reset_warning">Prin resetarea autentificatorului invalidați toți autentificatorii existenți. Va trebui să îi configurați din nou!</string>
+    <string name="onconnect">La conectare</string>
+    <string name="ondisconnect">La deconectare</string>
+    <string name="overview_show_predictions">Predicții</string>
+    <string name="overview_show_deviationslope">Panta deviaţiei</string>
+    <string name="authorizationfailed">Autorizarea a eșuat</string>
+    <string name="overview_show_absinsulin">Insulină totală</string>
+    <string name="master_password_summary">Parola master (principală) este folosită pentru criptarea copiilor de rezervă și pentru a suprascrie securitatea în aplicație. Rețineți-o sau păstrați-o într-un loc sigur.</string>
+    <string name="passwords_dont_match">Parolele nu coincid</string>
+    <string name="current_master_password">Parola principală curentă</string>
+    <string name="statuslights">Lumini de stare</string>
+    <string name="statuslights_copy_ns">Copiați setările din NS</string>
+    <string name="copyexistingvalues">Copiaţi setările NS (dacă există)?</string>
+    <string name="classic_description">Tema originală</string>
+    <string name="buttonson_description">Butoanele sunt afișate întotdeauna în partea de jos a ecranului</string>
+    <string name="largedisplay_description">Display mare</string>
+    <string name="skin">Tema</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integrare pompa pentru Omnipod, necesită dispozitivul RileyLink (cu versiune firmware de cel puțin 2.0).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Bip pentru Bolus Activat</string>
+    <string name="omnipod_config_beep_basal_enabled">Bip pentru Bazală Activat</string>
+    <string name="omnipod_config_beep_smb_enabled">Bip pentru SMB Activat</string>
     <!-- Omnipod - Fragment -->
     <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_pod_status">Status Pod</string>
     <string name="omnipod_reservoir_left">%1$.2f U rămase</string>
     <string name="omnipod_reservoir_over50">Peste 50 U</string>
+    <string name="omnipod_pod_address">Adresă Pod</string>
+    <string name="omnipod_pod_expiry">Pod-ul expiră</string>
+    <string name="omnipod_pod_name_no_info">Nu există informații</string>
+    <string name="omnipod_pod_no_pod_connected">Niciun Pod conectat</string>
+    <string name="omnipod_pod_not_initalized">Neiniţializat</string>
+    <string name="omnipod_ack_short">Alerte de confirmare</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_pod_not_attached">Niciun Pod activ.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Verificarea comenzii a eşuat.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Gestionare Pod</string>
     <string name="omnipod_cmd_init_pod">Inițializare Pod</string>
     <string name="omnipod_cmd_deactivate_pod">Dezactivare Pod</string>
     <string name="omnipod_cmd_reset_pod">Resetare Pod</string>
     <string name="omnipod_cmd_pod_history">Istoric Pod</string>
+    <string name="omnipod_cmd_set_bolus">Setează bolusul</string>
+    <string name="omnipod_cmd_cancel_bolus">Anulați Bolus</string>
+    <string name="omnipod_cmd_set_tbr">Setează bazala temporară</string>
+    <string name="omnipod_cmd_get_pod_status">Obțineți Status Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Obțineți Informații Pod</string>
+    <string name="omnipod_cmd_set_time">Setare timp</string>
     <string name="omnipod_cmd_configure_alerts">Configurare alerte</string>
     <string name="omnipod_cmd_acknowledge_alerts">Confirmare alerte</string>
+    <string name="omnipod_cmd_suspend_delivery">Suspendați Livrarea</string>
+    <string name="omnipod_cmd_resume_delivery">Reluați livrarea</string>
+    <string name="omnipod_cmd_unknown_entry">Intrare necunoscută</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Rata: %1$.1f U, Durata: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Dacă apăsați <b>OK</b>, statusul Pod-ului va fi resetat forțat şi nu veți mai putea comunica cu Pod-ul. Faceți acest lucru numai dacă nu mai puteți comunica deloc cu Pod-ul. Daca mai puteți comunica cu Pod-ul, va rugam sa folosiți opțiunea <b>Dezactivare Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Istoricul Pod-ului nu este disponibil momentan.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Umpleţi Pod-ul</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nUmpleți noul Pod cu suficientă insulină pentru 3 zile.\n\nAr trebui sa auziți două bipuri de la Pod în timpul procesului de umplere. Acestea indică faptul că, cantitatea minimă de 85U a fost introdusă. Asigurați-vă ca ați golit complet seringa de umplere, chiar și după ce ați auzit două bipuri.\n\nDupă umplerea Pod-ului, vă rugăm să apăsați <b>Următorul</b>.\n\n<b>Notă:</b> Nu scoateți capacul transparent al acului in acest moment.</string>
     <string name="omnipod_init_pod_wizard_step2_title">Amorsare</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Încercare de împerechere cu noul Pod și amorsare.\n\nAtunci când toate etapele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> vă rugăm să țineți Pod-ul foarte aproape de RileyLink în timpul procesului.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Atașați Pod-ul</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPregătiți setul de infuzie. Scoateți capacul acului și suport adeziv și atașați Pod-ul la locul de infuzie.\n\nDacă, canula pare in neregulă, apăsați <b>Anulare</b> și aruncați Pod-ul.\n\nApăsați <b>Următorul</b> pentru a introduce canula și a începe livrarea bazalei.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Inserare canulă</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Încercare de programare inițială a ratelor bazale si de insertie a canulei.\n\nCând toate elementele sunt gata, puteți apăsa <b>Următorul</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Informații Pod</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod-ul este acum activ.\n\nRatele bazale au fost programate și canula a fost introdusă.\n\nVă rugăm să verificați că acul a fost introdus corect. Dacă considerați ca nu, înlocuiți Pod-ul.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Dezactivare Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Dezactivare Pod</string>
+    <string name="omnipod_init_pod_pair_pod">Împerechere Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Amorsare Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Umplere Canulă</string>
+    <string name="omnipod_init_pod_set_basal_profile">Setează profilul bazalelor</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Anulare livrare</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Dezactivare Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integrare cu pompa pentru Omnipod Dash.</string>
+    <string name="omnipod_alert_expiration">Pod-ul va expira în curând</string>
+    <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
+    <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
+    <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
+    <string name="comapareprofile">Comparați cu profilul curent</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 1a5f1a6a56..21cd13d98c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -6,8 +6,8 @@
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
     <string name="treatmentssafety_title">Безопасность терапии</string>
     <string name="treatmentssafety_maxbolus_title">Макс разрешенный болюс [U] ед.</string>
-    <string name="treatmentssafety_maxcarbs_title">макс разрешенные углеводы (г)</string>
-    <string name="nav_preferences">опции</string>
+    <string name="treatmentssafety_maxcarbs_title">Макс разрешенные углеводы (г)</string>
+    <string name="nav_preferences">Настройки</string>
     <string name="nav_refreshtreatments">Синхронизировать назначения с NS</string>
     <string name="nav_resetdb">обнулить базы</string>
     <string name="reset_db_confirm">Вы действительно хотите обнулить базы данных?</string>
@@ -1407,4 +1407,6 @@ Context | Edit Context</string>
     <string name="omnipod_bolus_failed_uncertain">Не удалось проверить правильность подачи болюса. Убедитесь, что Pod подает болюс или отмените его.</string>
     <string name="omnipod_rl_stats">Статистика RL</string>
     <string name="omnipod_read_pulse_log_short">Журнал Pulse </string>
+    <string name="comapareprofile">Сравнить с текущим профилем</string>
+    <string name="nav_profilehelper">Помощник профиля</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index f9ca56d06f..f69759bce9 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1405,4 +1405,6 @@
     <string name="omnipod_bolus_failed_uncertain">Nie je možné overiť, či bolo podávanie bolusu úspešné. Prosím overte, že váš Pod podáva bolus, alebo zrušte bolus.</string>
     <string name="omnipod_rl_stats">Štatistiky RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="comapareprofile">Porovnať s aktuálnym profilom</string>
+    <string name="nav_profilehelper">Pomocník s profilom</string>
 </resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 84c0484cdc..c03b8581ab 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Carbs: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Medir glucosa</string>
     <string name="careportal_announcement">Aviso</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 3f526625f6..bf1a679de7 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Gluc.: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Contrôle Glycémie</string>
     <string name="careportal_announcement">Notification</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 6c6a2fa917..3f5fc68692 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> CHO: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Controllo BG</string>
     <string name="careportal_announcement">Avviso</string>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index ad245b7265..43fb4ec971 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fE</b> Bol: <b>%3$.2fE</b> Bas: <b>%4$.2fE</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fE</b> Bol: <b>%3$.2fE</b> Bas: <b>%4$.2fE</b> Khd: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Controle</string>
     <string name="careportal_announcement">Mededeling</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index aa06e80fd8..137123324c 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -2,16 +2,40 @@
 <resources>
     <!--    General-->
     <string name="error">Eroare</string>
+    <string name="not_set_short">Nesetată</string>
+    <string name="profile_set_ok">Profilul bazalei a fost modificat în pompă</string>
+    <string name="invalidinput">Date de intrare incorecte</string>
+    <string name="tempbasaldeliveryerror">Eroare la livrare bazală temporară</string>
+    <string name="waitingforpump">Se așteaptă pompa</string>
+    <string name="connectingfor">Conectat de %1$d s</string>
+    <string name="bolusdelivering">Se livrează %1$.2fU</string>
     <string name="connecting">Se conectează</string>
     <string name="connected">Conectat</string>
     <string name="disconnected">Deconectat</string>
     <string name="disconnecting">Se deconectează</string>
+    <string name="androidaps_start">AndroidAPS a pornit</string>
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fU/h</string>
+    <string name="format_hours">%1$.2f h</string>
+    <string name="format_mins">%1$d min</string>
+    <string name="format_mins_short">%1$dm</string>
+    <string name="pumpbusy">Pompa face altă acțiune</string>
+    <string name="connectionerror">Eroare de conexiune cu pompa</string>
+    <string name="youareonallowedlimit">Ați atins limita permisă</string>
+    <string name="objectives">Obiective</string>
     <string name="close">Închide</string>
     <string name="please_wait">Așteptați…</string>
     <string name="reload">Reîncărcare</string>
+    <string name="stoppressed">STOP APĂSAT</string>
     <string name="stop">Stop</string>
+    <string name="invalidprofile">Profil invalid!!!</string>
+    <string name="noprofileset">NICIUN PROFIL SETAT</string>
+    <string name="date">Data</string>
+    <string name="units_label">Unități</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
     <string name="basal_label">Bazală</string>
     <string name="target_label">Țintă</string>
     <string name="initializing">Inițializare...</string>
@@ -19,14 +43,34 @@
     <string name="battery_label">Baterie</string>
     <string name="lastconnection_label">Ultima conexiune</string>
     <string name="lastbolus_label">Ultimul bolus</string>
+    <string name="tempbasal_label">Bazală temporară</string>
+    <string name="virtualpump_extendedbolus_label">Bolus extins</string>
+    <string name="reservoir_label">Rezervor</string>
+    <string name="pumphistory">Istoric pompă</string>
+    <string name="viewprofile">Afișează profilul</string>
+    <string name="eventtype">Tip eveniment</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Setări avansate</string>
+    <string name="bluetooth">Bluetooth</string>
     <!--    Constraints-->
+    <string name="pumplimit">limită pompă</string>
+    <string name="itmustbepositivevalue">trebuie să fie o valoare pozitivă</string>
+    <string name="limitingbolus">Se limitează bolusul la %1$.1f U datorită %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompa nu este inițializată, profilul nu este setat!</string>
     <!--    Dialogs-->
     <string name="confirmation">Confirmare</string>
     <string name="message">Mesaj</string>
     <string name="ok">OK</string>
     <string name="cancel">Renunță</string>
+    <string name="dismiss">RENUNȚĂ</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_enabled">Bluetooth-ul este dezactivat.</string>
+    <string name="location_not_found_title">Localizarea este dezactivată</string>
     <!--    DateUtil-->
+    <string name="minago">acum %1$dmin</string>
+    <string name="hoursago">%1$.1f h în urmă</string>
+    <string name="shorthour">h</string>
     <string name="days">zile</string>
     <string name="hours">ore</string>
     <string name="unit_second">secundă</string>
@@ -43,29 +87,63 @@
     <string name="shortday">z</string>
     <!--    Profile-->
     <string name="profile_per_unit">/U</string>
+    <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
+    <string name="noprofileselected">Niciun profil selectat</string>
     <!--    PumpType-->
     <!--    APSResult-->
+    <string name="let_temp_basal_run">Lasă să funcționeze bazala temporară</string>
     <string name="duration">Durată</string>
     <string name="reason">Motiv</string>
     <!--    ProfileSwitch-->
+    <string name="zerovalueinprofile">Profil invalid: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU</b> Carb: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
+    <string name="careportal_bgcheck">Verificare glicemie</string>
     <string name="careportal_announcement">Anunț</string>
     <string name="careportal_note">Notă</string>
     <string name="careportal_question">Întrebare</string>
     <string name="careportal_exercise">Activitate fizică</string>
     <string name="careportal_pumpsitechange">Schimbare loc pompă</string>
+    <string name="careportal_cgmsensorinsert">Inserare senzor</string>
+    <string name="careportal_cgmsensorstart">Start senzor</string>
+    <string name="careportal_insulincartridgechange">Schimbare cartuș insulină</string>
+    <string name="careportal_correctionbolus">Bolus de corecție</string>
+    <string name="careportal_tempbasalstart">Start bazală temporară</string>
+    <string name="careportal_tempbasalend">Sfârșit bazală temporară</string>
+    <string name="careportal_carbscorrection">Corecție de carbohidrați</string>
+    <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
+    <string name="careportal_temporarytarget">Ţintă temporară</string>
+    <string name="glucosetype_finger">Deget</string>
+    <string name="glucosetype_sensor">Senzor</string>
+    <string name="manual">Manual</string>
+    <string name="unknown">necunoscută</string>
     <!--    Command-->
     <!--    PumpEnactResult-->
+    <string name="comment">Comentariu</string>
+    <string name="success">Succes</string>
+    <string name="percent">Procent</string>
+    <string name="absolute">Absolut</string>
+    <string name="configbuilder_insulin">Insulină</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Se așteaptă rezultatul</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
+    <string name="cumulative_tdd">TDD cumulat</string>
+    <string name="expweight">TDD estimat exponențial</string>
     <string name="basalrate">Bazală</string>
     <string name="bolus">Bolus</string>
     <string name="tdd">TDD</string>
+    <string name="ratio">Rata</string>
+    <string name="amount_days"># Zile</string>
     <string name="weight">Greutate</string>
+    <string name="olddata_Message">Date vechi, apăsați \"REÎNCĂRCARE\"</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
 </resources>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 6e3bcb1b92..8a89ad5e3d 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d мин</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2fед</b>бол:<b>%3$.2fед</b>баз:<b>%4$.2fед</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2fед</b>бол:<b>%3$.2fед</b>баз:<b>%4$.2fед</b>гу:<b>%5$.0fг</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка ГК</string>
     <string name="careportal_announcement">Оовещение</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 6d94bd4433..641f005b3c 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Sach: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámenie</string>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
index 18b02bafb7..965fd0591b 100644
--- a/dana/src/main/res/values-ro-rRO/strings.xml
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -1,33 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="danars_nodeviceavailable">Niciun dispozitiv găsit până acum</string>
+    <string name="danars_pairingok">Conectare OK</string>
+    <string name="danars_pairingtimedout">Conectare nereușită</string>
+    <string name="danars_waitingforpairing">Se așteaptă conectarea la pompă</string>
     <string name="danarspump">DanaRS</string>
     <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integrare cu pompele DANA Diabcare RS</string>
+    <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
+    <string name="boluserrorcode">Solicitat: %1$.2fU Livrat: %2$.2fU Cod eroare: %3$s</string>
+    <string name="danar_valuenotsetproperly">Valoare setată incorect</string>
+    <string name="resetpairing">Resetați informațiile de împerechere?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCod: %4$02X</string>
+    <string name="danar_enableextendedbolus">Activează bolusuri extinse în pompă</string>
     <string name="overview_bolusprogress_delivered">Livrat</string>
     <string name="overview_bolusprogress_stoped">Oprit</string>
+    <string name="unsupportedfirmware">Soft pompă incompatibil</string>
+    <string name="pumperror">Eroare a pompei</string>
+    <string name="batterydischarged">Bateria pompei este descărcată</string>
     <string name="occlusion">Ocluzie</string>
     <string name="emptyreservoir">Rezervor gol</string>
+    <string name="basalmax">Maxim bazală</string>
+    <string name="dailymax">Maximum zilnic</string>
+    <string name="bloodsugarmeasurementalert">Alertă măsurare glicemie</string>
+    <string name="gettingpumpstatus">Se primește starea pompei</string>
+    <string name="gettingextendedbolusstatus">Se citește starea bolusului extins</string>
+    <string name="gettingbolusstatus">Se citește starea bolusului</string>
+    <string name="gettingtempbasalstatus">Se citește starea bazalei temporare</string>
+    <string name="gettingpumpsettings">Se citesc setările pompei</string>
+    <string name="gettingpumptime">Se citește ora pompei</string>
+    <string name="largetimedifftitle">Diferență majoră de timp</string>
+    <string name="startingbolus">Pornire livrare bolus</string>
     <string name="stoppingtempbasal">Se oprește bazala temporară</string>
     <string name="stoppingextendedbolus">Se oprește bolusul extins</string>
+    <string name="settingtempbasal">Se setează bazala temporară</string>
     <string name="wrongpassword">Parolă greșită</string>
     <string name="wrongpumppassword">Parola pompei greșită!</string>
     <string name="danar_history_alarm">Alarme</string>
+    <string name="danar_history_basalhours">Ore bazale</string>
     <string name="danar_history_bolus">Bolusuri</string>
     <string name="danar_history_carbohydrates">Carbohidrați</string>
+    <string name="danar_history_dailyinsulin">Insulină zilnică</string>
     <string name="danar_history_errors">Erori</string>
     <string name="danar_history_glucose">Glicemie</string>
     <string name="danar_history_refill">Reumplere</string>
     <string name="danar_history_syspend">Suspendare</string>
     <string name="danar_history_prime">Amorsare</string>
+    <string name="danar_useroptions">Opțiunile utilizatorului</string>
+    <string name="danar_buttonscroll">Buton derulare</string>
+    <string name="danar_beep">Sunet la apăsarea butonului</string>
     <string name="danar_pumpalarm">Alarmă</string>
     <string name="danar_pumpalarm_sound">Sunet</string>
     <string name="danar_pumpalarm_vibrate">Vibrație</string>
     <string name="danar_pumpalarm_both">Ambele</string>
+    <string name="danar_shutdown">Oprire [hours]</string>
     <string name="danar_saveuseroptions">Salvați opțiunile în pompă</string>
     <string name="description_pump_dana_r">Integrare cu pompele DANA Diabcare R</string>
     <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nu s-a găsit niciun adaptor bluetooth</string>
+    <string name="devicenotfound">Dispozitivul selectat nu a fost găsit</string>
     <string name="danarkoreanpump">DanaR din Coreea</string>
     <string name="danarpump">DanaR</string>
     <string name="danarv2pump">DanaRv2</string>
+    <string name="profile_set_failed">Setarea profilului bazalei a eșuat</string>
     <string name="danar_bluetooth_status">Status Bluetooth</string>
     <string name="danar_iob_label">IOB din pompă</string>
     <string name="basal_step">Pas bazală</string>
@@ -38,6 +73,11 @@
     <string name="timeformat24h">24h</string>
     <string name="option_on">Pornit</string>
     <string name="option_off">Oprit</string>
+    <string name="danar_bt_name_title">Dispozitive bluetooth DanaR</string>
+    <string name="danar_password_title">Parola pompei</string>
+    <string name="bolusspeed">Viteză bolusare</string>
+    <string name="selectedpump">Pompa selectată</string>
+    <string name="rs_loginsulinchange_title">Înregistrează schimbarea rezervorului</string>
     <string name="pin1">PIN1</string>
     <string name="pin2">PIN2</string>
     <string name="num1pin">1: (12 cifre)</string>
diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml
index 75a59a0d4f..6a55603392 100644
--- a/wear/src/main/res/values-ro-rRO/strings.xml
+++ b/wear/src/main/res/values-ro-rRO/strings.xml
@@ -4,13 +4,51 @@
     <string name="label_actions_activity">AAPS</string>
     <string name="label_xdrip">AAPS</string>
     <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_warning_sync">Nu există date!</string>
+    <string name="label_warning_old">Date vechi!</string>
     <string name="label_warning_sync_aaps">Sincronizare cu AAPS!</string>
     <string name="pref_on">Pornit</string>
     <string name="pref_off">Oprit</string>
+    <string name="pref_show_date">Arată data</string>
+    <string name="pref_show_iob">Arată IOB</string>
+    <string name="pref_show_cob">Arată COB</string>
+    <string name="pref_show_delta">Arată Delta</string>
+    <string name="pref_show_phone_battery">Arată baterie telefon</string>
+    <string name="pref_show_rig_battery">Arată Baterie Rig</string>
+    <string name="pref_show_basal_rate">Arată rata bazală</string>
+    <string name="pref_show_loop_status">Arată stare buclă închisă</string>
+    <string name="pref_show_bg">Arată glicemia</string>
+    <string name="pref_dark" comment="Enables dark visual theme">Întunecat</string>
+    <string name="pref_highlight_basals">Evidențiere rate bazale</string>
     <string name="pref_1_hour">1 oră</string>
     <string name="pref_2_hours">2 ore</string>
     <string name="pref_3_hours">3 ore</string>
     <string name="pref_4_hours">4 ore</string>
     <string name="pref_5_hours">5 ore</string>
     <string name="pref_default">Implicit</string>
+    <string name="pref_delta_granularity">Granularitate Delta (Steampunk)</string>
+    <string name="pref_version">Versiune:</string>
+    <string name="menu_tempt">ŢintăTemporară</string>
+    <string name="menu_bolus">Bolus</string>
+    <string name="menu_ecarb">eCarb</string>
+    <string name="menu_settings">Setări</string>
+    <string name="menu_status">Stare</string>
+    <string name="menu_default">Implicit</string>
+    <string name="action_start_min">start [min]</string>
+    <string name="action_confirm">CONFIRMARE</string>
+    <string name="action_status_pump">STARE POMPĂ</string>
+    <string name="action_status_loop">STARE BUCLĂ ÎNCHISĂ</string>
+    <string name="action_bolus">bolus</string>
+    <string name="status_pump">Pompă</string>
+    <string name="status_cpp">CPP</string>
+    <string name="status_tdd">TDD</string>
+    <string name="activity_carb">Carbohidrați</string>
+    <string name="activity_IOB">IOB</string>
+    <string name="unit_mg_dl">mg/dl</string>
+    <string name="unit_mmol_l">mmol/l</string>
+    <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
+    <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
+    <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">z</string>
+    <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
 </resources>

From 655c0d2b7dc2982b7a949253e01aca501d928850 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 14 Jul 2020 16:54:34 +0200
Subject: [PATCH 326/400] fix mgdl in profilehelper

---
 .../data/defaultProfile/DefaultProfile.kt          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 6cc396fba8..4ca60b3fb4 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -150,13 +150,13 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
 
     private fun singleValueArrayFromMmolToUnits(value: Double, sample: Array<Double>, units: String): JSONArray {
         val array = JSONArray()
-        array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value + sample[0],units)))
-        array.put(JSONObject().put("time", "06:00").put("value", Profile.fromMmolToUnits(value + sample[1],units)))
-        array.put(JSONObject().put("time", "09:00").put("value", Profile.fromMmolToUnits(value + sample[2],units)))
-        array.put(JSONObject().put("time", "11:00").put("value", Profile.fromMmolToUnits(value + sample[3],units)))
-        array.put(JSONObject().put("time", "14:00").put("value", Profile.fromMmolToUnits(value + sample[4],units)))
-        array.put(JSONObject().put("time", "16:00").put("value", Profile.fromMmolToUnits(value + sample[5],units)))
-        array.put(JSONObject().put("time", "19:00").put("value", Profile.fromMmolToUnits(value + sample[6],units)))
+        array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value + sample[0],units)).put("timeAsSeconds", 0 * 3600))
+        array.put(JSONObject().put("time", "06:00").put("value", Profile.fromMmolToUnits(value + sample[1],units)).put("timeAsSeconds", 6 * 3600))
+        array.put(JSONObject().put("time", "09:00").put("value", Profile.fromMmolToUnits(value + sample[2],units)).put("timeAsSeconds", 9 * 3600))
+        array.put(JSONObject().put("time", "11:00").put("value", Profile.fromMmolToUnits(value + sample[3],units)).put("timeAsSeconds", 11 * 3600))
+        array.put(JSONObject().put("time", "14:00").put("value", Profile.fromMmolToUnits(value + sample[4],units)).put("timeAsSeconds", 14 * 3600))
+        array.put(JSONObject().put("time", "16:00").put("value", Profile.fromMmolToUnits(value + sample[5],units)).put("timeAsSeconds", 16 * 3600))
+        array.put(JSONObject().put("time", "19:00").put("value", Profile.fromMmolToUnits(value + sample[6],units)).put("timeAsSeconds", 19 * 3600))
         return array
     }
 }
\ No newline at end of file

From 04bb3c35582f125919991e7627b99b906c56c2a7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 14 Jul 2020 17:03:25 +0200
Subject: [PATCH 327/400] string update

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f5c7f407a..5992070c5d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1710,7 +1710,7 @@
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
     <string name="comapareprofile">Compare profiles</string>
     <string name="nav_profilehelper">Profile helper</string>
-    <string name="motoldefaultprofile">Motol default profile</string>
+    <string name="motoldefaultprofile">Default profile</string>
     <string name="currentprofile">Current profile</string>
     <string name="availableprofile">Available profile</string>
     <string name="profiletype">Profile type</string>

From ee3f63c327bea7d544c9c7a1766810c063bb8778 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 15 Jul 2020 13:10:00 +0200
Subject: [PATCH 328/400] fix TBR U->% rounding

---
 .../main/java/info/nightscout/androidaps/db/TemporaryBasal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index d4f89fdd7e..660ec0ad0a 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -395,7 +395,7 @@ public class TemporaryBasal implements Interval, DbObjectBase {
         if (isFakeExtended) {
             return (int) ((profile.getBasal(time) + netExtendedRate) / profile.getBasal(time)) * 100;
         } else if (isAbsolute) {
-            return (int) (absoluteRate / profile.getBasal(time)) * 100;
+            return (int) (absoluteRate / profile.getBasal(time) * 100);
         } else {
             return percentRate;
         }

From 9ff3011514552c946b442f7adf32ec13172d03ff Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 15 Jul 2020 20:06:45 +0200
Subject: [PATCH 329/400] fix current location button

---
 .../plugins/general/automation/triggers/TriggerLocation.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
index a9f3c936d9..da1ebd4914 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
@@ -21,8 +21,8 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
     var lastMode = InputLocationMode.Mode.INSIDE
     private val buttonAction = Runnable {
         locationDataContainer.lastLocation?.let {
-            latitude.value = it.latitude
-            longitude.value = it.longitude
+            latitude.setValue(it.latitude)
+            longitude.setValue(it.longitude)
             aapsLogger.debug(LTag.AUTOMATION, String.format("Grabbed location: %f %f", latitude.value, longitude.value))
         }
     }

From 61c3391eb5d500e5354bd7ad1d5553e6cf8fae26 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Wed, 15 Jul 2020 21:15:49 +0200
Subject: [PATCH 330/400] Fix TBR icon even with TBR 100% set

---
 .../plugins/general/overview/OverviewFragment.kt       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 40318d0ca0..240a396d92 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -656,7 +656,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             // If the target is not the same as set in the profile then oref has overridden it
             val targetUsed = lastRun?.constraintsProcessed?.targetBG ?: 0.0
 
-            if (targetUsed != 0.0 && abs(profile.targetMgdl-targetUsed) > 0.01) {
+            if (targetUsed != 0.0 && abs(profile.targetMgdl - targetUsed) > 0.01) {
                 aapsLogger.debug("Adjusted target. Profile: ${profile.targetMgdl} APS: $targetUsed")
                 overview_temptarget?.text = Profile.toTargetRangeString(targetUsed, targetUsed, Constants.MGDL, units)
                 overview_temptarget?.setTextColor(resourceHelper.gc(R.color.ribbonTextWarning))
@@ -683,10 +683,10 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
             ?: resourceHelper.gc(R.color.defaulttextcolor))
 
-        if (activeTemp != null)
-            overview_basebasal_icon?.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low)
-        else
-            overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_no_tbr)
+        overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_no_tbr)
+        val percentRate = activeTemp?.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) ?:100
+        if (percentRate > 100) overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_tbr_high)
+        if (percentRate < 100) overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_tbr_low)
 
         // Extended bolus
         val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())

From 39b4eac60f0d7313bb42a99192d5edcf8c418fcf Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 15 Jul 2020 22:46:59 +0200
Subject: [PATCH 331/400] add delay to executing automations

---
 .../androidaps/plugins/general/automation/AutomationPlugin.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
index b67d270c8d..dff373058e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Handler
 import android.os.HandlerThread
+import android.os.SystemClock
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventBTChange
@@ -211,6 +212,7 @@ class AutomationPlugin @Inject constructor(
                         }
                     })
                 }
+                SystemClock.sleep(1100)
                 event.lastRun = DateUtil.now()
             }
         }

From 1015158e8b9dfb724627f3879821b22354a1dfe9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 15 Jul 2020 23:31:32 +0200
Subject: [PATCH 332/400] fix test

---
 .../data/defaultProfile/DefaultProfileTest.kt        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
index d2afc0d5f3..e97e63bafa 100644
--- a/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileTest.kt
@@ -13,18 +13,18 @@ class DefaultProfileTest : TestBase() {
 
     @Test
     fun profile() {
-        var p = DefaultProfile(injector).profile(5.0, 5.1 / 0.3, 0.0, Constants.MGDL)
-        assertEquals(0.150, p.getBasalTimeFromMidnight(0), 0.001)
+        var p = DefaultProfile(injector).profile(5.0, 5.1 / 0.3, 0.0, Constants.MMOL)
+        assertEquals(0.150, p!!.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(15.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(11.8, p.getIsfTimeFromMidnight(0), 0.001)
 
-        p = DefaultProfile(injector).profile(7.0, 10.0 / 0.4, 0.0, Constants.MGDL)
-        assertEquals(0.350, p.getBasalTimeFromMidnight(0), 0.001)
+        p = DefaultProfile(injector).profile(7.0, 10.0 / 0.4, 0.0, Constants.MMOL)
+        assertEquals(0.350, p!!.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(15.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(6.8, p.getIsfTimeFromMidnight(0), 0.001)
 
-        p = DefaultProfile(injector).profile(12.0, 25.0 / 0.5, 0.0, Constants.MGDL)
-        assertEquals(0.80, p.getBasalTimeFromMidnight(0), 0.001)
+        p = DefaultProfile(injector).profile(12.0, 25.0 / 0.5, 0.0, Constants.MMOL)
+        assertEquals(0.80, p!!.getBasalTimeFromMidnight(0), 0.001)
         assertEquals(10.0, p.getIcTimeFromMidnight(0), 0.001)
         assertEquals(2.2, p.getIsfTimeFromMidnight(0), 0.001)
     }

From e3cd61cffc47160badbac9c5eac584c464928fd9 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 16 Jul 2020 17:30:04 +0200
Subject: [PATCH 333/400] DPV profile

---
 .../activities/ProfileHelperActivity.kt       | 189 +++++++++---------
 .../res/layout/activity_profilehelper.xml     |  25 ++-
 app/src/main/res/menu/menu_profilehelper.xml  |   3 +
 app/src/main/res/values/strings.xml           |   4 +
 .../data/defaultProfile/DefaultProfile.kt     |   4 +-
 .../data/defaultProfile/DefaultProfileDPV.kt  |  67 +++++++
 .../info/nightscout/androidaps/db/TDD.java    |   8 +-
 .../main/res/layout/dialog_profileviewer.xml  |   6 +-
 core/src/main/res/values/strings.xml          |   4 +-
 9 files changed, 208 insertions(+), 102 deletions(-)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index 3f0155e515..df32da9a79 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -8,6 +8,7 @@ import android.widget.PopupMenu
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.data.defaultProfile.DefaultProfile
+import info.nightscout.androidaps.data.defaultProfile.DefaultProfileDPV
 import info.nightscout.androidaps.db.ProfileSwitch
 import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
@@ -34,6 +35,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
     @Inject lateinit var tddCalculator: TddCalculator
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var defaultProfile: DefaultProfile
+    @Inject lateinit var defaultProfileDPV: DefaultProfileDPV
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var rxBus: RxBusWrapper
     @Inject lateinit var dateUtil: DateUtil
@@ -42,33 +44,35 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
     enum class ProfileType {
         MOTOL_DEFAULT,
+        DPV_DEFAULT,
         CURRENT,
         AVAILABLE_PROFILE,
         PROFILE_SWITCH
     }
 
-    var tabSelected = 0
-    val typeSelected = arrayOf(ProfileType.MOTOL_DEFAULT, ProfileType.CURRENT)
+    private var tabSelected = 0
+    private val typeSelected = arrayOf(ProfileType.MOTOL_DEFAULT, ProfileType.CURRENT)
 
-    val ageUsed = arrayOf(15.0, 15.0)
-    val weightUsed = arrayOf(50.0, 50.0)
-    val tddUsed = arrayOf(50.0, 50.0)
+    private val ageUsed = arrayOf(15.0, 15.0)
+    private val weightUsed = arrayOf(0.0, 0.0)
+    private val tddUsed = arrayOf(0.0, 0.0)
+    private val pctUsed = arrayOf(32.0, 32.0)
 
-    lateinit var profileList: ArrayList<CharSequence>
-    val profileUsed = arrayOf(0, 0)
+    private lateinit var profileList: ArrayList<CharSequence>
+    private val profileUsed = arrayOf(0, 0)
 
-    lateinit var profileSwitch: List<ProfileSwitch>
-    val profileSwitchUsed = arrayOf(0, 0)
+    private lateinit var profileSwitch: List<ProfileSwitch>
+    private val profileSwitchUsed = arrayOf(0, 0)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_profilehelper)
 
         profilehelper_menu1.setOnClickListener {
-            switchTab(0)
+            switchTab(0, typeSelected[0])
         }
         profilehelper_menu2.setOnClickListener {
-            switchTab(1)
+            switchTab(1, typeSelected[1])
         }
 
         profilehelper_profiletype.setOnClickListener {
@@ -77,10 +81,11 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                 setOnMenuItemClickListener { item ->
                     profilehelper_profiletype.setText(item.title)
                     when (item.itemId) {
-                        R.id.menu_default       -> switchContent(ProfileType.MOTOL_DEFAULT)
-                        R.id.menu_current       -> switchContent(ProfileType.CURRENT)
-                        R.id.menu_available     -> switchContent(ProfileType.AVAILABLE_PROFILE)
-                        R.id.menu_profileswitch -> switchContent(ProfileType.PROFILE_SWITCH)
+                        R.id.menu_default       -> switchTab(tabSelected, ProfileType.MOTOL_DEFAULT)
+                        R.id.menu_default_dpv   -> switchTab(tabSelected, ProfileType.DPV_DEFAULT)
+                        R.id.menu_current       -> switchTab(tabSelected, ProfileType.CURRENT)
+                        R.id.menu_available     -> switchTab(tabSelected, ProfileType.AVAILABLE_PROFILE)
+                        R.id.menu_profileswitch -> switchTab(tabSelected, ProfileType.PROFILE_SWITCH)
                     }
                     true
                 }
@@ -121,20 +126,22 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
         }
 
         // Default profile
-
         profilehelper_copytolocalprofile.setOnClickListener {
-            val age = profilehelper_age.value
-            val weight = profilehelper_weight.value
-            val tdd = profilehelper_tdd.value
-            defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())?.let { profile ->
+            val age = ageUsed[tabSelected]
+            val weight = weightUsed[tabSelected]
+            val tdd = tddUsed[tabSelected]
+            val pct = pctUsed[tabSelected]
+            val profile = if (typeSelected[tabSelected] == ProfileType.MOTOL_DEFAULT) defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+            else defaultProfileDPV.profile(age, tdd, pct / 100.0, profileFunction.getUnits())
+            profile?.let {
                 OKDialog.showConfirmation(this, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile), Runnable {
-                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, profile, "DefaultProfile" + dateUtil.dateAndTimeAndSecondsString(dateUtil._now())))
+                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, it, "DefaultProfile" + dateUtil.dateAndTimeAndSecondsString(dateUtil._now())))
                     rxBus.send(EventLocalProfileChanged())
                 })
             }
         }
 
-        profilehelper_age.setParams(0.0, 1.0, 80.0, 1.0, DecimalFormat("0"), false, null)
+        profilehelper_age.setParams(0.0, 1.0, 18.0, 1.0, DecimalFormat("0"), false, null)
         profilehelper_weight.setParams(0.0, 0.0, 150.0, 1.0, DecimalFormat("0"), false, null, object : TextWatcher {
             override fun afterTextChanged(s: Editable) {}
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -150,6 +157,8 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             }
         })
 
+        profilehelper_basalpctfromtdd.setParams(32.0, 32.0, 37.0, 1.0, DecimalFormat("0"), false, null)
+
         profilehelper_tdds.text = tddCalculator.stats()
 
         // Current profile
@@ -157,26 +166,40 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
         // General
         profilehelper_compareprofile.setOnClickListener {
-            val age = profilehelper_age.value
-            val weight = profilehelper_weight.value
-            val tdd = profilehelper_tdd.value
-            if (typeSelected[0] == ProfileType.MOTOL_DEFAULT || typeSelected[1] == ProfileType.MOTOL_DEFAULT) {
-                if (age < 1 || age > 17) {
-                    ToastUtils.showToastInUiThread(this, R.string.invalidage)
-                    return@setOnClickListener
+            storeValues()
+            for (i in 0..1) {
+                if (typeSelected[i] == ProfileType.MOTOL_DEFAULT) {
+                    if (ageUsed[i] < 1 || ageUsed[i] > 18) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidage)
+                        return@setOnClickListener
+                    }
+                    if ((weightUsed[i] < 5 || weightUsed[i] > 150) && tddUsed[i] == 0.0) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                        return@setOnClickListener
+                    }
+                    if ((tddUsed[i] < 5 || tddUsed[i] > 150) && weightUsed[i] == 0.0) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                        return@setOnClickListener
+                    }
                 }
-                if ((weight < 5 || weight > 150) && tdd == 0.0) {
-                    ToastUtils.showToastInUiThread(this, R.string.invalidweight)
-                    return@setOnClickListener
-                }
-                if ((tdd < 5 || tdd > 150) && weight == 0.0) {
-                    ToastUtils.showToastInUiThread(this, R.string.invalidweight)
-                    return@setOnClickListener
+                if (typeSelected[i] == ProfileType.DPV_DEFAULT) {
+                    if (ageUsed[i] < 1 || ageUsed[i] > 18) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidage)
+                        return@setOnClickListener
+                    }
+                    if (tddUsed[i] < 5 || tddUsed[i] > 150) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidweight)
+                        return@setOnClickListener
+                    }
+                    if ((pctUsed[i] < 32 || pctUsed[i] > 37)) {
+                        ToastUtils.showToastInUiThread(this, R.string.invalidpct)
+                        return@setOnClickListener
+                    }
                 }
             }
 
-            getProfile(age, tdd, weight, 0)?.let { profile0 ->
-                getProfile(age, tdd, weight, 1)?.let { profile1 ->
+            getProfile(ageUsed[0], tddUsed[0], weightUsed[0], pctUsed[0] / 100.0, 0)?.let { profile0 ->
+                getProfile(ageUsed[1], tddUsed[1], weightUsed[1], pctUsed[1] / 100.0, 1)?.let { profile1 ->
                     ProfileViewerDialog().also { pvd ->
                         pvd.arguments = Bundle().also {
                             it.putLong("time", DateUtil.now())
@@ -184,7 +207,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                             it.putString("customProfile", profile0.data.toString())
                             it.putString("customProfile2", profile1.data.toString())
                             it.putString("customProfileUnits", profileFunction.getUnits())
-                            it.putString("customProfileName", getProfileName(age, tdd, weight, 0) + "\n" + getProfileName(age, tdd, weight, 1))
+                            it.putString("customProfileName", getProfileName(ageUsed[0], tddUsed[0], weightUsed[0], pctUsed[0] / 100.0, 0) + "\n" + getProfileName(ageUsed[1], tddUsed[1], weightUsed[1], pctUsed[1] / 100.0, 1))
                         }
                     }.show(supportFragmentManager, "ProfileViewDialog")
                     return@setOnClickListener
@@ -193,83 +216,71 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             ToastUtils.showToastInUiThread(this, R.string.invalidinput)
         }
 
-        switchTab(0)
+        switchTab(0, typeSelected[0], false)
     }
 
-    private fun getProfile(age: Double, tdd: Double, weight: Double, tab: Int): Profile? =
+    private fun getProfile(age: Double, tdd: Double, weight: Double, basalPct: Double, tab: Int): Profile? =
         when (typeSelected[tab]) {
             ProfileType.MOTOL_DEFAULT     -> defaultProfile.profile(age, tdd, weight, profileFunction.getUnits())
+            ProfileType.DPV_DEFAULT       -> defaultProfileDPV.profile(age, tdd, basalPct, profileFunction.getUnits())
             ProfileType.CURRENT           -> profileFunction.getProfile()?.convertToNonCustomizedProfile()
             ProfileType.AVAILABLE_PROFILE -> activePlugin.activeProfileInterface.profile?.getSpecificProfile(profileList[profileUsed[tab]].toString())
             ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].profileObject?.convertToNonCustomizedProfile()
         }
 
-    private fun getProfileName(age: Double, tdd: Double, weight: Double, tab: Int): String =
+    private fun getProfileName(age: Double, tdd: Double, weight: Double, basalSumPct: Double, tab: Int): String =
         when (typeSelected[tab]) {
             ProfileType.MOTOL_DEFAULT     -> if (tdd > 0) resourceHelper.gs(R.string.formatwithtdd, age, tdd) else resourceHelper.gs(R.string.formatwithweight, age, weight)
+            ProfileType.DPV_DEFAULT       -> resourceHelper.gs(R.string.formatwittddandpct, age, tdd, (basalSumPct * 100).toInt())
             ProfileType.CURRENT           -> profileFunction.getProfileName()
             ProfileType.AVAILABLE_PROFILE -> profileList[profileUsed[tab]].toString()
             ProfileType.PROFILE_SWITCH    -> profileSwitch[profileSwitchUsed[tab]].customizedName
         }
 
-    private fun switchTab(tab: Int) {
-        setBackgroundColorOnSelected(tab)
-        when (typeSelected[tab]) {
-            ProfileType.MOTOL_DEFAULT     -> {
-                ageUsed[tabSelected] = profilehelper_age.value
-                weightUsed[tabSelected] = profilehelper_weight.value
-                tddUsed[tabSelected] = profilehelper_tdd.value
-                profilehelper_profiletype.setText(resourceHelper.gs(R.string.motoldefaultprofile))
-            }
-
-            ProfileType.CURRENT           -> {
-                profilehelper_profiletype.setText(resourceHelper.gs(R.string.currentprofile))
-            }
-
-            ProfileType.AVAILABLE_PROFILE -> {
-                profilehelper_profiletype.setText(resourceHelper.gs(R.string.availableprofile))
-            }
-
-            ProfileType.PROFILE_SWITCH    -> {
-                profilehelper_profiletype.setText(resourceHelper.gs(R.string.careportal_profileswitch))
-            }
-        }
-        tabSelected = tab
-        switchContent(typeSelected[tabSelected])
+    private fun storeValues() {
+        ageUsed[tabSelected] = profilehelper_age.value
+        weightUsed[tabSelected] = profilehelper_weight.value
+        tddUsed[tabSelected] = profilehelper_tdd.value
+        pctUsed[tabSelected] = profilehelper_basalpctfromtdd.value
     }
 
-    private fun switchContent(newContent: ProfileType) {
-        profilehelper_default_profile.visibility = (newContent == ProfileType.MOTOL_DEFAULT).toVisibility()
+    private fun switchTab(tab: Int, newContent: ProfileType, storeOld: Boolean = true) {
+        setBackgroundColorOnSelected(tab)
+        // Store values for selected tab. listBox values are stored on selection change
+        if (storeOld) storeValues()
+
+        tabSelected = tab
+        typeSelected[tabSelected] = newContent
+
+        // show new content
+        profilehelper_profiletype.setText(
+            when (typeSelected[tabSelected]) {
+                ProfileType.MOTOL_DEFAULT     -> resourceHelper.gs(R.string.motoldefaultprofile)
+                ProfileType.DPV_DEFAULT       -> resourceHelper.gs(R.string.dpvdefaultprofile)
+                ProfileType.CURRENT           -> resourceHelper.gs(R.string.currentprofile)
+                ProfileType.AVAILABLE_PROFILE -> resourceHelper.gs(R.string.availableprofile)
+                ProfileType.PROFILE_SWITCH    -> resourceHelper.gs(R.string.careportal_profileswitch)
+            })
+        profilehelper_default_profile.visibility = (newContent == ProfileType.MOTOL_DEFAULT || newContent == ProfileType.DPV_DEFAULT).toVisibility()
         profilehelper_current_profile.visibility = (newContent == ProfileType.CURRENT).toVisibility()
         profilehelper_available_profile.visibility = (newContent == ProfileType.AVAILABLE_PROFILE).toVisibility()
         profilehelper_profile_switch.visibility = (newContent == ProfileType.PROFILE_SWITCH).toVisibility()
 
-        typeSelected[tabSelected] = newContent
-        when (newContent) {
-            ProfileType.MOTOL_DEFAULT     -> {
-                profilehelper_age.value = ageUsed[tabSelected]
-                profilehelper_weight.value = weightUsed[tabSelected]
-                profilehelper_tdd.value = tddUsed[tabSelected]
-            }
+        // restore selected values
+        profilehelper_age.value = ageUsed[tabSelected]
+        profilehelper_weight.value = weightUsed[tabSelected]
+        profilehelper_tdd.value = tddUsed[tabSelected]
+        profilehelper_basalpctfromtdd.value = pctUsed[tabSelected]
 
-            ProfileType.CURRENT           -> {
-            }
-
-            ProfileType.AVAILABLE_PROFILE -> {
-                if (profileList.size > 0)
-                    profilehelper_available_profile_list.setText(profileList[profileUsed[tabSelected]].toString())
-            }
-
-            ProfileType.PROFILE_SWITCH    -> {
-                if (profileSwitch.size > 0)
-                    profilehelper_profileswitch_list.setText(profileSwitch[profileSwitchUsed[tabSelected]].customizedName)
-            }
-        }
+        profilehelper_basalpctfromtdd_row.visibility = (newContent == ProfileType.DPV_DEFAULT).toVisibility()
+        if (profileList.isNotEmpty())
+            profilehelper_available_profile_list.setText(profileList[profileUsed[tabSelected]].toString())
+        if (profileSwitch.isNotEmpty())
+            profilehelper_profileswitch_list.setText(profileSwitch[profileSwitchUsed[tabSelected]].customizedName)
     }
 
     private fun setBackgroundColorOnSelected(tab: Int) {
         profilehelper_menu1.setBackgroundColor(resourceHelper.gc(if (tab == 1) R.color.defaultbackground else R.color.tabBgColorSelected))
         profilehelper_menu2.setBackgroundColor(resourceHelper.gc(if (tab == 0) R.color.defaultbackground else R.color.tabBgColorSelected))
     }
-
 }
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index 55f03f9f26..f7cee31409 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activities.SurveyActivity">
+    tools:context=".activities.ProfileHelperActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -142,6 +142,27 @@
 
                 </TableRow>
 
+                <TableRow
+                    android:id="@+id/profilehelper_basalpctfromtdd_row"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/profilehelper_basalpctfromtdd_label"
+                        android:layout_width="150dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:labelFor="@+id/profilehelper_basalpctfromtdd"
+                        android:text="@string/basalpctfromtdd_label"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+                    <info.nightscout.androidaps.utils.NumberPicker
+                        android:id="@+id/profilehelper_basalpctfromtdd"
+                        android:layout_width="130dp"
+                        android:layout_height="40dp" />
+
+                </TableRow>
+
             </TableLayout>
 
             <TextView
@@ -172,8 +193,6 @@
                 android:layout_width="150dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:labelFor="@+id/profilehelper_age"
-                android:text="@string/age"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         </LinearLayout>
diff --git a/app/src/main/res/menu/menu_profilehelper.xml b/app/src/main/res/menu/menu_profilehelper.xml
index ed73bb6f72..ca6e6cb9fc 100644
--- a/app/src/main/res/menu/menu_profilehelper.xml
+++ b/app/src/main/res/menu/menu_profilehelper.xml
@@ -4,6 +4,9 @@
     <item
         android:id="@+id/menu_default"
         android:title="@string/motoldefaultprofile" />
+    <item
+        android:id="@+id/menu_default_dpv"
+        android:title="@string/dpvdefaultprofile" />
     <item
         android:id="@+id/menu_current"
         android:title="@string/currentprofile" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5992070c5d..d1455826e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1480,6 +1480,7 @@
     <string name="nav_survey">Survey</string>
     <string name="invalidage">Invalid age entry</string>
     <string name="invalidweight">Invalid weight entry</string>
+    <string name="invalidpct">Invalid % entry</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Average</string>
     <string name="tir">TIR</string>
@@ -1715,6 +1716,9 @@
     <string name="availableprofile">Available profile</string>
     <string name="profiletype">Profile type</string>
     <string name="formatwithtdd">Age: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Age: %1$.0f TDD: %2$.0f U %3$d%%</string>
     <string name="formatwithweight">Age: %1$.0f Weight: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% of basal</string>
+    <string name="dpvdefaultprofile">DPV Default profile</string>
 
 </resources>
diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
index 4ca60b3fb4..f1a0375d2a 100644
--- a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfile.kt
@@ -33,14 +33,14 @@ class DefaultProfile @Inject constructor(val injector: HasAndroidInjector) {
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -3.0, 0.0, -1.0, -3.0, 0.0, -2.0)))
             val isf = Round.roundTo(170.0 / _tdd, 0.1)
             profile.put("sens", singleValueArrayFromMmolToUnits(isf, arrayOf(0.0, -1.0, -0.0, -0.0, -1.0, 0.0, -1.0),units))
-        } else if (age >= 12 && age < 18) {
+        } else if (age >= 12 && age <= 18) {
             val _tdd = if (tdd == 0.0) 1.0 * weight else tdd
             closest(twelveToSeventeen, _tdd * 0.5)?.let { array -> profile.put("basal", arrayToJson(array)) }
             val ic = Round.roundTo(500.0 / _tdd, 1.0)
             profile.put("carbratio", singleValueArray(ic, arrayOf(0.0, -1.0, 0.0, 0.0, -1.0, 0.0, -1.0)))
             val isf = Round.roundTo(100.0 / _tdd, 0.1)
             profile.put("sens", singleValueArrayFromMmolToUnits(isf, arrayOf(0.2, 0.0, 0.2, 0.2, 0.0, 0.2, 0.2),units))
-        } else if (age >= 18) {
+        } else if (age > 18) {
             return null
         }
         profile.put("dia", 5.0)
diff --git a/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt
new file mode 100644
index 0000000000..18195f9f8a
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/data/defaultProfile/DefaultProfileDPV.kt
@@ -0,0 +1,67 @@
+package info.nightscout.androidaps.data.defaultProfile
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.Profile
+import info.nightscout.androidaps.utils.Round
+import org.json.JSONArray
+import org.json.JSONObject
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DefaultProfileDPV @Inject constructor(val injector: HasAndroidInjector) {
+
+    var oneToFive = arrayOf(3.97, 3.61, 3.46, 3.70, 3.76, 3.87, 4.18, 4.01, 3.76, 3.54, 3.15, 2.80, 2.86, 3.21, 3.61, 3.97, 4.43, 4.96, 5.10, 5.50, 5.81, 6.14, 5.52, 5.10)
+    var sixToEleven = arrayOf(4.20, 4.27, 4.41, 4.62, 4.92, 5.09, 5.01, 4.47, 3.89, 3.33, 3.10, 2.91, 2.97, 3.08, 3.36, 3.93, 4.52, 4.76, 4.69, 4.63, 4.63, 4.47, 4.47, 4.31)
+    var twelveToEighteen = arrayOf(3.47, 3.80, 4.31, 4.95, 5.59, 6.11, 5.89, 5.11, 4.31, 3.78, 3.55, 3.39, 3.35, 3.39, 3.64, 3.97, 4.53, 4.59, 4.50, 4.00, 3.69, 3.39, 3.35, 3.35)
+
+    fun profile(age: Double, tdd: Double, basalSumPct: Double, units: String): Profile? {
+        val basalSum = tdd * basalSumPct
+        val profile = JSONObject()
+        if (age >= 1 && age < 6) {
+            profile.put("basal", arrayToJson(oneToFive, basalSum))
+            profile.put("carbratio", singleValueArray(0.0))
+            profile.put("sens", singleValueArrayFromMmolToUnits(0.0, units))
+        } else if (age >= 6 && age < 12) {
+            profile.put("basal", arrayToJson(sixToEleven, basalSum))
+            profile.put("carbratio", singleValueArray(0.0))
+            profile.put("sens", singleValueArrayFromMmolToUnits(0.0, units))
+        } else if (age >= 12 && age <= 18) {
+            profile.put("basal", arrayToJson(twelveToEighteen, basalSum))
+            profile.put("carbratio", singleValueArray(0.0))
+            profile.put("sens", singleValueArrayFromMmolToUnits(0.0, units))
+        } else if (age > 18) {
+            return null
+        }
+        profile.put("dia", 5.0)
+        profile.put("carbs_hr", 20) // not used
+        profile.put("delay", 5.0) // not used
+        profile.put("timezone", TimeZone.getDefault().getID())
+        profile.put("target_high", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
+        profile.put("target_low", JSONArray().put(JSONObject().put("time", "00:00").put("value", Profile.fromMgdlToUnits(108.0, units))))
+        profile.put("units", units)
+        return Profile(injector, profile, units)
+    }
+
+    private fun arrayToJson(b: Array<Double>, basalSum: Double): JSONArray {
+        val basals = JSONArray()
+        for (i in 0..23) {
+            val time = String.format(Locale.ENGLISH, "%02d:00", i)
+            basals.put(JSONObject().put("time", time).put("value", (b[i] * basalSum / 100.0).toString()).put("timeAsSeconds", i * 3600))
+        }
+        return basals
+    }
+
+    private fun singleValueArray(value: Double): JSONArray {
+        val array = JSONArray()
+        array.put(JSONObject().put("time", "00:00").put("value", value).put("timeAsSeconds", 0 * 3600))
+        return array
+    }
+
+    private fun singleValueArrayFromMmolToUnits(value: Double, units: String): JSONArray {
+        val array = JSONArray()
+        array.put(JSONObject().put("time", "00:00").put("value", Profile.fromMmolToUnits(value, units)).put("timeAsSeconds", 0 * 3600))
+        return array
+    }
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/db/TDD.java b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
index 5717abec74..f023c06f7f 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/TDD.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/TDD.java
@@ -59,15 +59,15 @@ public class TDD {
 
     public String toText(ResourceHelper resourceHelper, DateUtil dateUtil, boolean includeCarbs) {
         if (includeCarbs)
-            return resourceHelper.gs(R.string.tddwithcarbsformat, dateUtil.dateStringShort(date), total, bolus, basal, carbs);
+            return resourceHelper.gs(R.string.tddwithcarbsformat, dateUtil.dateStringShort(date), total, bolus, basal, basal / total * 100, carbs);
         else
-            return resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(date), total, bolus, basal);
+            return resourceHelper.gs(R.string.tddformat, dateUtil.dateStringShort(date), total, bolus, basal, basal / total * 100);
     }
 
     public String toText(ResourceHelper resourceHelper, int days, boolean includeCarbs) {
         if (includeCarbs)
-            return resourceHelper.gs(R.string.tddwithcarbsformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal, carbs);
+            return resourceHelper.gs(R.string.tddwithcarbsformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal, basal / total * 100, carbs);
         else
-            return resourceHelper.gs(R.string.tddformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal);
+            return resourceHelper.gs(R.string.tddformat, String.format(Locale.getDefault(), "%d ", days) + resourceHelper.gs(R.string.days), total, bolus, basal, basal / total * 100);
     }
 }
diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml
index feec6a1163..914cc8e71b 100644
--- a/core/src/main/res/layout/dialog_profileviewer.xml
+++ b/core/src/main/res/layout/dialog_profileviewer.xml
@@ -21,9 +21,10 @@
             android:padding="5dp">
 
             <ImageView
+                android:id="@+id/header_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:contentDescription="@string/carbs"
+                android:layout_centerVertical="true"
                 android:src="@drawable/ic_home_profile" />
 
             <TextView
@@ -31,11 +32,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
+                android:layout_centerHorizontal="true"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
-                android:text="@string/carbs"
                 android:textAlignment="center"
+                android:layout_toEndOf="@id/header_icon"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
         </RelativeLayout>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 93289388fb..8933eefc3d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -156,8 +156,8 @@
     <string name="mins">%1$dmin</string>
 
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Carbs: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> Carbs: <b>%6$.0fg</b>]]></string>
 
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Check</string>

From 9fe4b7682f991dbafa4a5b991b1c3de4b203f96b Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 12 Jul 2020 15:36:55 +0200
Subject: [PATCH 334/400] Add Compare Profile icon I used Color palet to align
 colors with ProfileViewerDialog

---
 .../main/res/drawable/ic_compare_profiles.xml | 12 +++++++++
 icons/compare_profiles.svg                    | 26 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 core/src/main/res/drawable/ic_compare_profiles.xml
 create mode 100644 icons/compare_profiles.svg

diff --git a/core/src/main/res/drawable/ic_compare_profiles.xml b/core/src/main/res/drawable/ic_compare_profiles.xml
new file mode 100644
index 0000000000..d63aae66b2
--- /dev/null
+++ b/core/src/main/res/drawable/ic_compare_profiles.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.307,8.927c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581l-1.789,-3.622c-0.387,-0.786 -1.675,-0.786 -2.061,0L7.743,7.563L3.746,8.145C3.313,8.207 2.953,8.511 2.818,8.927C2.683,9.343 2.795,9.8 3.109,10.105l2.894,2.819l-0.683,3.983c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133l3.576,-1.879l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C18.329,9.8 18.443,9.343 18.307,8.927zM17.252,9.488l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35L3.94,9.488C3.877,9.427 3.855,9.335 3.882,9.252s0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959l4.369,0.634c0.087,0.013 0.158,0.073 0.185,0.156S17.315,9.427 17.252,9.488z"
+      android:fillColor="@color/tempbasal"/>
+  <path
+      android:pathData="M21.182,11.032c-0.135,-0.417 -0.494,-0.72 -0.928,-0.783l-3.997,-0.581l-1.789,-3.622c-0.387,-0.786 -1.675,-0.786 -2.061,0l-1.789,3.622l-3.998,0.581c-0.432,0.063 -0.793,0.366 -0.928,0.783c-0.135,0.416 -0.023,0.873 0.291,1.178l2.894,2.819l-0.683,3.983c-0.074,0.432 0.103,0.868 0.457,1.125c0.2,0.146 0.437,0.22 0.676,0.22c0.183,0 0.367,-0.044 0.535,-0.133l3.576,-1.879l3.576,1.879c0.39,0.203 0.855,0.173 1.212,-0.087c0.353,-0.257 0.531,-0.694 0.456,-1.125l-0.683,-3.983l2.893,-2.819C21.204,11.905 21.318,11.448 21.182,11.032zM20.127,11.593l-3.16,3.081l0.746,4.35c0.014,0.087 -0.021,0.174 -0.092,0.225c-0.04,0.03 -0.087,0.044 -0.135,0.044c-0.036,0 -0.073,-0.008 -0.108,-0.027l-3.907,-2.053l-3.907,2.053c-0.075,0.044 -0.17,0.036 -0.242,-0.017c-0.07,-0.051 -0.106,-0.138 -0.091,-0.225l0.746,-4.35l-3.162,-3.081c-0.063,-0.061 -0.085,-0.153 -0.058,-0.236c0.027,-0.083 0.099,-0.143 0.185,-0.156l4.369,-0.634l1.954,-3.959c0.078,-0.158 0.334,-0.158 0.412,0l1.953,3.959L20,11.201c0.087,0.013 0.158,0.073 0.185,0.156S20.19,11.532 20.127,11.593z"
+      android:fillColor="@color/examinedProfile"/>
+</vector>
diff --git a/icons/compare_profiles.svg b/icons/compare_profiles.svg
new file mode 100644
index 0000000000..123653d167
--- /dev/null
+++ b/icons/compare_profiles.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="cp_x5F_compare_x5F_profile">
+	<rect display="none" width="24" height="24"/>
+    <path fill="#03A9F4" d="M18.307,8.927c-0.135-0.417-0.494-0.72-0.928-0.783l-3.997-0.581l-1.789-3.622
+        c-0.387-0.786-1.675-0.786-2.061,0L7.743,7.563L3.746,8.145C3.313,8.207,2.953,8.511,2.818,8.927
+        C2.683,9.343,2.795,9.8,3.109,10.105l2.894,2.819l-0.683,3.983c-0.074,0.432,0.103,0.868,0.457,1.125
+        c0.2,0.146,0.437,0.22,0.676,0.22c0.183,0,0.367-0.044,0.535-0.133l3.576-1.879l3.576,1.879c0.39,0.203,0.855,0.173,1.212-0.087
+        c0.353-0.257,0.531-0.694,0.456-1.125l-0.683-3.983l2.893-2.819C18.329,9.8,18.443,9.343,18.307,8.927z M17.252,9.488l-3.16,3.081
+        l0.746,4.35c0.014,0.087-0.021,0.174-0.092,0.225c-0.04,0.03-0.087,0.044-0.135,0.044c-0.036,0-0.073-0.008-0.108-0.027
+        l-3.907-2.053l-3.907,2.053c-0.075,0.044-0.17,0.036-0.242-0.017c-0.07-0.051-0.106-0.138-0.091-0.225l0.746-4.35L3.94,9.488
+        C3.877,9.427,3.855,9.335,3.882,9.252s0.099-0.143,0.185-0.156l4.369-0.634l1.954-3.959c0.078-0.158,0.334-0.158,0.412,0
+        l1.953,3.959l4.369,0.634c0.087,0.013,0.158,0.073,0.185,0.156S17.315,9.427,17.252,9.488z"/>
+    <path fill="#FF5555" d="M21.182,11.032c-0.135-0.417-0.494-0.72-0.928-0.783l-3.997-0.581l-1.789-3.622
+        c-0.387-0.786-1.675-0.786-2.061,0l-1.789,3.622l-3.998,0.581c-0.432,0.063-0.793,0.366-0.928,0.783
+        c-0.135,0.416-0.023,0.873,0.291,1.178l2.894,2.819l-0.683,3.983c-0.074,0.432,0.103,0.868,0.457,1.125
+        c0.2,0.146,0.437,0.22,0.676,0.22c0.183,0,0.367-0.044,0.535-0.133l3.576-1.879l3.576,1.879c0.39,0.203,0.855,0.173,1.212-0.087
+        c0.353-0.257,0.531-0.694,0.456-1.125l-0.683-3.983l2.893-2.819C21.204,11.905,21.318,11.448,21.182,11.032z M20.127,11.593
+        l-3.16,3.081l0.746,4.35c0.014,0.087-0.021,0.174-0.092,0.225c-0.04,0.03-0.087,0.044-0.135,0.044
+        c-0.036,0-0.073-0.008-0.108-0.027l-3.907-2.053l-3.907,2.053c-0.075,0.044-0.17,0.036-0.242-0.017
+        c-0.07-0.051-0.106-0.138-0.091-0.225l0.746-4.35l-3.162-3.081c-0.063-0.061-0.085-0.153-0.058-0.236
+        c0.027-0.083,0.099-0.143,0.185-0.156l4.369-0.634l1.954-3.959c0.078-0.158,0.334-0.158,0.412,0l1.953,3.959L20,11.201
+        c0.087,0.013,0.158,0.073,0.185,0.156S20.19,11.532,20.127,11.593z"/>
+</g>
+</svg>

From fc859acc6607a392d4e70ac9cbdbda9fc4ea13d0 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 17 Jul 2020 01:07:16 +0200
Subject: [PATCH 335/400] ProfileViewer Compare icon and colors Icon : change
 white single star with double blue and red stars Profile names colored
 according to profiles (blue and red)

---
 .../androidaps/dialogs/ProfileViewerDialog.kt         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 1fb90c7da3..9b642d1c53 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -97,6 +97,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
                 profile2 = Profile(injector, JSONObject(customProfileJson2), customProfileUnits)
                 profileName = customProfileName
+                header_icon.setImageResource(R.drawable.ic_compare_profiles)
                 date = ""
                 profileview_datelayout.visibility = View.GONE
             }
@@ -117,7 +118,8 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                 profile2?.let { profile2 ->
                     profileview_units.text = profile1.units
                     profileview_dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile1.dia, DecimalFormat("0.00"), resourceHelper.gs(R.string.shorthour)))
-                    profileview_activeprofile.text = profileName
+                    val profileNames =profileName!!.split("\n").toTypedArray()
+                    profileview_activeprofile.text = HtmlHelper.fromHtml(formatColors(profileNames[0], profileNames[1]))
                     profileview_date.text = date
                     profileview_ic.text = ics(profile1, profile2)
                     profileview_isf.text = isfs(profile1, profile2)
@@ -177,6 +179,13 @@ class ProfileViewerDialog : DaggerDialogFragment() {
         return s
     }
 
+    private fun formatColors(text1: String, text2: String): String {
+        var s = "<font color='${resourceHelper.gc(R.color.tempbasal)}'>$text1</font>"
+        s += "<BR/>"
+        s += "<font color='${resourceHelper.gc(R.color.examinedProfile)}'>$text2</font>"
+        return s
+    }
+
     private fun basals(profile1: Profile, profile2: Profile): Spanned {
         var prev1 = 0.0
         var prev2 = 0.0

From 507e04a30b968daa24e87b9d56bbb998842ac3a8 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 17 Jul 2020 01:09:30 +0200
Subject: [PATCH 336/400] Compare Profile icon and tab2 color Change tab 2
 color (to red) and Profile type label color (to red when tab 2 selected)

---
 .../nightscout/androidaps/activities/ProfileHelperActivity.kt | 4 +++-
 app/src/main/res/layout/activity_profilehelper.xml            | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index df32da9a79..749913c9a1 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.activities
 
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -251,6 +252,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
         tabSelected = tab
         typeSelected[tabSelected] = newContent
+        profilehelper_profiletype_title.setDefaultHintTextColor(ColorStateList.valueOf(resourceHelper.gc(if (tab == 0) R.color.tabBgColorSelected else R.color.examinedProfile)))
 
         // show new content
         profilehelper_profiletype.setText(
@@ -281,6 +283,6 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
     private fun setBackgroundColorOnSelected(tab: Int) {
         profilehelper_menu1.setBackgroundColor(resourceHelper.gc(if (tab == 1) R.color.defaultbackground else R.color.tabBgColorSelected))
-        profilehelper_menu2.setBackgroundColor(resourceHelper.gc(if (tab == 0) R.color.defaultbackground else R.color.tabBgColorSelected))
+        profilehelper_menu2.setBackgroundColor(resourceHelper.gc(if (tab == 0) R.color.defaultbackground else R.color.examinedProfile))
     }
 }
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index f7cee31409..effa56b112 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -17,7 +17,7 @@
             style="@style/ButtonMediumFontStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_auto_delta"
+            android:drawableStart="@drawable/ic_compare_profiles"
             android:text="@string/comapareprofile" />
 
         <LinearLayout
@@ -51,6 +51,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:id="@+id/profilehelper_profiletype_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/profiletype"

From 23cd1d9143209deeee80484b96144897ca420353 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Sat, 18 Jul 2020 15:18:25 +0100
Subject: [PATCH 337/400] - some minor changes on dependency (removed full
 path) - removed some logging - fixed DailyTotalsDTO toString - changed level
 of some logging

---
 .../dependencyInjection/ActivitiesModule.kt   |  2 +-
 .../dependencyInjection/FragmentsModule.kt    | 10 ++--
 .../dependencyInjection/MedtronicModule.kt    | 38 ++++++++-----
 .../dependencyInjection/PluginsModule.kt      |  2 +-
 .../dependencyInjection/ReceiversModule.kt    |  4 +-
 .../dependencyInjection/ServicesModule.kt     |  5 +-
 .../interfaces/DatabaseHelperInterface.kt     |  6 +-
 .../pump/common/utils/DateTimeUtil.java       |  2 -
 .../pump/medtronic/MedtronicFragment.kt       |  2 +-
 .../pump/medtronic/MedtronicPumpPlugin.java   | 43 +++++++++------
 .../comm/history/MedtronicHistoryDecoder.java |  6 +-
 .../medtronic/comm/ui/MedtronicUIComm.java    |  2 +-
 .../comm/ui/MedtronicUIPostprocessor.java     |  3 +-
 .../medtronic/data/dto/DailyTotalsDTO.java    | 55 +++++++++----------
 14 files changed, 97 insertions(+), 83 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index 8b3955ca8b..dda071f1d2 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -26,7 +26,7 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesInsightPairingInformationActivity(): InsightPairingInformationActivity
     @ContributesAndroidInjector abstract fun contributesLogSettingActivity(): LogSettingActivity
     @ContributesAndroidInjector abstract fun contributeMainActivity(): MainActivity
-    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
+    @ContributesAndroidInjector abstract fun contributesMedtronicHistoryActivity(): MedtronicHistoryActivity
     @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
index 46028b4161..cde5137ac9 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt
@@ -29,6 +29,8 @@ import info.nightscout.androidaps.plugins.insulin.InsulinFragment
 import info.nightscout.androidaps.plugins.profile.local.LocalProfileFragment
 import info.nightscout.androidaps.plugins.profile.ns.NSProfileFragment
 import info.nightscout.androidaps.plugins.pump.combo.ComboFragment
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
@@ -63,7 +65,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLocalInsightFragment(): LocalInsightFragment
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
-    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
     @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
@@ -106,7 +108,7 @@ abstract class FragmentsModule {
 
     @ContributesAndroidInjector abstract fun contributesPasswordCheck(): PasswordCheck
 
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusGeneralFragment
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusHistoryFragment
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusGeneral(): RileyLinkStatusGeneralFragment
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusHistoryFragment(): RileyLinkStatusHistoryFragment
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusDeviceMedtronic(): RileyLinkStatusDeviceMedtronic
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
index 454ef6800c..f813a6d49d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/MedtronicModule.kt
@@ -2,25 +2,33 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
 
 @Module
 @Suppress("unused")
 abstract class MedtronicModule {
-    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
-    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
-    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
-    @ContributesAndroidInjector abstract fun serviceTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTask
-    @ContributesAndroidInjector abstract fun pumpTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.PumpTask
-    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.DiscoverGattServicesTask
-    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.InitializePumpManagerTask
-    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
-    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
-    @ContributesAndroidInjector abstract fun radioResponseProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
-    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
-    @ContributesAndroidInjector abstract fun rfSpyProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
-    @ContributesAndroidInjector abstract fun sendAndListenProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
-    @ContributesAndroidInjector abstract fun setPreambleProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
-    @ContributesAndroidInjector abstract fun radioPacketProvider(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
+    @ContributesAndroidInjector abstract fun rileyLinkCommunicationManagerProvider(): RileyLinkCommunicationManager
+    @ContributesAndroidInjector abstract fun medtronicCommunicationManagerProvider(): MedtronicCommunicationManager
+    @ContributesAndroidInjector abstract fun medtronicUITaskProvider(): MedtronicUITask
+    @ContributesAndroidInjector abstract fun serviceTaskProvider(): ServiceTask
+    @ContributesAndroidInjector abstract fun pumpTaskProvider(): PumpTask
+    @ContributesAndroidInjector abstract fun discoverGattServicesTaskProvider(): DiscoverGattServicesTask
+    @ContributesAndroidInjector abstract fun initializePumpManagerTaskProvider(): InitializePumpManagerTask
+    @ContributesAndroidInjector abstract fun resetRileyLinkConfigurationTaskProvider(): ResetRileyLinkConfigurationTask
+    @ContributesAndroidInjector abstract fun wakeAndTuneTaskProvider(): WakeAndTuneTask
+    @ContributesAndroidInjector abstract fun radioResponseProvider(): RadioResponse
+    @ContributesAndroidInjector abstract fun rileyLinkBLEProvider(): RileyLinkBLE
+    @ContributesAndroidInjector abstract fun rfSpyProvider(): RFSpy
+    @ContributesAndroidInjector abstract fun sendAndListenProvider(): SendAndListen
+    @ContributesAndroidInjector abstract fun setPreambleProvider(): SetPreamble
+    @ContributesAndroidInjector abstract fun radioPacketProvider(): RadioPacket
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 40e2e91bd7..f179580a55 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -145,7 +145,7 @@ abstract class PluginsModule {
     @PumpDriver
     @IntoMap
     @IntKey(150)
-    abstract fun bindMedtronicPumpPlugin(plugin: info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin): PluginBase
+    abstract fun bindMedtronicPumpPlugin(plugin: MedtronicPumpPlugin): PluginBase
 
     @Binds
     @NotNSClient
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
index d92bc9262a..4c6e67608c 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -16,9 +16,9 @@ abstract class ReceiversModule {
     @ContributesAndroidInjector abstract fun contributesChargingStateReceiver(): ChargingStateReceiver
     @ContributesAndroidInjector abstract fun contributesDataReceiver(): DataReceiver
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBluetoothStateReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBluetoothStateReceiver(): RileyLinkBluetoothStateReceiver
     @ContributesAndroidInjector abstract fun contributesSmsReceiver(): SmsReceiver
     @ContributesAndroidInjector abstract fun contributesTimeDateOrTZChangeReceiver(): TimeDateOrTZChangeReceiver
     @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkBroadcastReceiver
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBroadcastReceiver(): RileyLinkBroadcastReceiver
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
index fbf47a9ed2..f961c3a863 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt
@@ -6,6 +6,7 @@ import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientServ
 import info.nightscout.androidaps.plugins.general.overview.notifications.DismissNotificationService
 import info.nightscout.androidaps.plugins.general.persistentNotification.DummyService
 import info.nightscout.androidaps.plugins.general.wear.wearintegration.WatchUpdaterService
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
@@ -27,7 +28,7 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesWatchUpdaterService(): WatchUpdaterService
     @ContributesAndroidInjector abstract fun contributesInsightAlertService(): InsightAlertService
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService
-    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
     @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
index 968b84a5ff..df90e03586 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt
@@ -1,11 +1,7 @@
 package info.nightscout.androidaps.interfaces
 
 import com.j256.ormlite.dao.CloseableIterator
-import info.nightscout.androidaps.db.BgReading
-import info.nightscout.androidaps.db.CareportalEvent
-import info.nightscout.androidaps.db.DanaRHistoryRecord
-import info.nightscout.androidaps.db.DbRequest
-import info.nightscout.androidaps.db.TDD
+import info.nightscout.androidaps.db.*
 
 interface DatabaseHelperInterface {
 
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
index 96063673da..32c1d36488 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
@@ -21,7 +21,6 @@ public class DateTimeUtil {
      * @param atechDateTime
      * @return
      */
-    @Deprecated // use joda instead
     public static LocalDateTime toLocalDateTime(long atechDateTime) {
         int year = (int) (atechDateTime / 10000000000L);
         atechDateTime -= year * 10000000000L;
@@ -56,7 +55,6 @@ public class DateTimeUtil {
      * @param atechDateTime
      * @return
      */
-    @Deprecated // use joda instead
     public static GregorianCalendar toGregorianCalendar(long atechDateTime) {
         int year = (int) (atechDateTime / 10000000000L);
         atechDateTime -= year * 10000000000L;
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 079ab51586..37712451bb 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -123,7 +123,7 @@ class MedtronicFragment : DaggerFragment() {
             .toObservable(EventRileyLinkDeviceStatusChange::class.java)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({
-                aapsLogger.debug(LTag.PUMP, "onStatusEvent(EventMedtronicDeviceStatusChange): $it")
+                aapsLogger.debug(LTag.PUMP, "onStatusEvent(EventRileyLinkDeviceStatusChange): $it")
                 setDeviceStatus()
             }, { fabricPrivacy.logException(it) })
         disposable += rxBus
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 9cd138f4d4..484ddba676 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -771,7 +771,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
             if ((clock.localDeviceTime.getYear() <= 2015) || (timeDiff <= 24 * 60 * 60)) {
 
-                aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Set time on pump." + timeDiff);
+                aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Set time on pump." , timeDiff);
 
                 rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.SetRealTimeClock);
 
@@ -781,13 +781,13 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 }
             } else {
                 if ((clock.localDeviceTime.getYear() > 2015)) {
-                    aapsLogger.error("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff={}]. Doing nothing." + timeDiff);
+                    aapsLogger.error("MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference over 24h requested [diff={} s]. Doing nothing.", timeDiff);
                     medtronicUtil.sendNotification(MedtronicNotificationType.TimeChangeOver24h, getResourceHelper(), rxBus);
                 }
             }
 
         } else {
-            aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Do nothing." + timeDiff);
+            aapsLogger.info(LTag.PUMP, "MedtronicPumpPlugin::checkTimeAndOptionallySetTime - Time difference is {} s. Do nothing.", timeDiff);
         }
 
         scheduleNextRefresh(MedtronicStatusRefreshType.PumpTime, 0);
@@ -1133,11 +1133,14 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
     private void readPumpHistoryLogic() {
 
+        boolean debugHistory = false;
+
         LocalDateTime targetDate = null;
 
         if (lastPumpHistoryEntry == null) {
 
-            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: null");
+            if (debugHistory)
+                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: null");
 
             Long lastPumpHistoryEntryTime = getLastPumpEntryTime();
 
@@ -1146,13 +1149,15 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
             medtronicHistoryData.setIsInInit(true);
 
             if (lastPumpHistoryEntryTime == 0L) {
-                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
-                        + targetDate);
+                if (debugHistory)
+                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: 0L - targetDate: "
+                            + targetDate);
                 targetDate = timeMinus36h;
             } else {
                 // LocalDateTime lastHistoryRecordTime = DateTimeUtil.toLocalDateTime(lastPumpHistoryEntryTime);
 
-                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate);
+                if (debugHistory)
+                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntryTime: " + lastPumpHistoryEntryTime + " - targetDate: " + targetDate);
 
                 medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntryTime);
 
@@ -1168,30 +1173,35 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
 
                 targetDate = (timeMinus36h.isAfter(lastHistoryRecordTime) ? timeMinus36h : lastHistoryRecordTime);
 
-                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): targetDate: " + targetDate);
+                if (debugHistory)
+                    aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): targetDate: " + targetDate);
             }
         } else {
-            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - " + medtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry));
+            if (debugHistory)
+                aapsLogger.debug(LTag.PUMP, getLogPrefix() + "readPumpHistoryLogic(): lastPumpHistoryEntry: not null - " + medtronicUtil.gsonInstance.toJson(lastPumpHistoryEntry));
             medtronicHistoryData.setIsInInit(false);
             // medtronicHistoryData.setLastHistoryRecordTime(lastPumpHistoryEntry.atechDateTime);
 
             // targetDate = lastPumpHistoryEntry.atechDateTime;
         }
 
-        aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
+        //aapsLogger.debug(LTag.PUMP, "HST: Target Date: " + targetDate);
 
         MedtronicUITask responseTask2 = rileyLinkMedtronicService.getMedtronicUIComm().executeCommand(MedtronicCommandType.GetHistoryData,
                 lastPumpHistoryEntry, targetDate);
 
-        aapsLogger.debug(LTag.PUMP, "HST: After task");
+        if (debugHistory)
+            aapsLogger.debug(LTag.PUMP, "HST: After task");
 
         PumpHistoryResult historyResult = (PumpHistoryResult) responseTask2.returnData;
 
-        aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString());
+        if (debugHistory)
+            aapsLogger.debug(LTag.PUMP, "HST: History Result: " + historyResult.toString());
 
         PumpHistoryEntry latestEntry = historyResult.getLatestEntry();
 
-        aapsLogger.debug(LTag.PUMP, getLogPrefix() + "Last entry: " + latestEntry);
+        if (debugHistory)
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "Last entry: " + latestEntry);
 
         if (latestEntry == null) // no new history to read
             return;
@@ -1199,7 +1209,8 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         this.lastPumpHistoryEntry = latestEntry;
         sp.putLong(MedtronicConst.Statistics.LastPumpHistoryEntry, latestEntry.atechDateTime);
 
-        aapsLogger.debug(LTag.PUMP, "HST: History: valid=" + historyResult.validEntries.size() + ", unprocessed=" + historyResult.unprocessedEntries.size());
+        if (debugHistory)
+            aapsLogger.debug(LTag.PUMP, "HST: History: valid=" + historyResult.validEntries.size() + ", unprocessed=" + historyResult.unprocessedEntries.size());
 
         this.medtronicHistoryData.addNewHistory(historyResult);
         this.medtronicHistoryData.filterNewEntries();
@@ -1221,11 +1232,9 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         // update to last entry
         // - save
         // - determine pump status
-
-        //
-
     }
 
+
     private Long getLastPumpEntryTime() {
         Long lastPumpEntryTime = sp.getLong(MedtronicConst.Statistics.LastPumpHistoryEntry, 0L);
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
index 450425b26c..a4335583a2 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/MedtronicHistoryDecoder.java
@@ -118,7 +118,7 @@ public abstract class MedtronicHistoryDecoder<T extends MedtronicHistoryEntry> i
             StringUtil.appendToStringBuilder(sb, "" + unknownEntry.getKey(), ", ");
         }
 
-        aapsLogger.error(LTag.PUMPCOMM, "STATISTICS OF PUMP DECODE");
+        aapsLogger.info(LTag.PUMPCOMM, "STATISTICS OF PUMP DECODE");
 
         if (unknownOpCodes.size() > 0) {
             aapsLogger.warn(LTag.PUMPCOMM, "Unknown Op Codes: {}", sb.toString());
@@ -137,9 +137,9 @@ public abstract class MedtronicHistoryDecoder<T extends MedtronicHistoryEntry> i
 
                 String spaces = StringUtils.repeat(" ", 14 - entry.getKey().name().length());
 
-                aapsLogger.error(LTag.PUMPCOMM, "    {}{} - {}. Elements: {}", entry.getKey().name(), spaces, entry.getValue().size(), sb.toString());
+                aapsLogger.info(LTag.PUMPCOMM, "    {}{} - {}. Elements: {}", entry.getKey().name(), spaces, entry.getValue().size(), sb.toString());
             } else {
-                aapsLogger.error(LTag.PUMPCOMM, "    {}             - {}", entry.getKey().name(), entry.getValue().size());
+                aapsLogger.info(LTag.PUMPCOMM, "    {}             - {}", entry.getKey().name(), entry.getValue().size());
             }
         }
     }
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
index f0731d2d8a..11fb6f849f 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIComm.java
@@ -34,7 +34,7 @@ public class MedtronicUIComm {
 
     public synchronized MedtronicUITask executeCommand(MedtronicCommandType commandType, Object... parameters) {
 
-        aapsLogger.warn(LTag.PUMP, "Execute Command: " + commandType.name());
+        aapsLogger.info(LTag.PUMP, "Execute Command: " + commandType.name());
 
         MedtronicUITask task = new MedtronicUITask(injector, commandType, parameters);
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
index 364337d019..6d71633bea 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/ui/MedtronicUIPostprocessor.java
@@ -161,7 +161,8 @@ public class MedtronicUIPostprocessor {
             // no postprocessing
 
             default:
-                aapsLogger.error(LTag.PUMP, "Post-processing not implemented for {}.", uiTask.commandType.name());
+                break;
+                //aapsLogger.error(LTag.PUMP, "Post-processing not implemented for {}.", uiTask.commandType.name());
 
         }
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
index 902686ff19..11bd57d017 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
@@ -205,36 +205,35 @@ public class DailyTotalsDTO {
         //LOG.debug("523: {}", toString());
     }
 
-
     @Override
     public String toString() {
-        return "DailyTotalsDTO [" +
-                "bgAvg=" + bgAvg +
-                ", bgLow=" + bgLow +
-                ", bgHigh=" + bgHigh +
-                ", bgCount=" + bgCount +
-                ", sensorAvg=" + sensorAvg +
-                ", sensorMin=" + sensorMin +
-                ", sensorMax=" + sensorMax +
-                ", sensorCalcCount=" + sensorCalcCount +
-                ", sensorDataCount=" + sensorDataCount +
-                ", insulinTotal=" + insulinTotal +
-                ", insulinBasal=" + insulinBasal +
-                ", insulinBolus=" + insulinBolus +
-                ", insulinCarbs=" + insulinCarbs +
-                ", bolusTotal=" + bolusTotal +
-                ", bolusFood=" + bolusFood +
-                ", bolusFoodAndCorr=" + bolusFoodAndCorr +
-                ", bolusCorrection=" + bolusCorrection +
-                ", bolusManual=" + bolusManual +
-                ", bolusCount=" + bolusCount +
-                ", bolusCountFoodOrCorr=" + bolusCountFoodOrCorr +
-                ", bolusCountFoodAndCorr=" + bolusCountFoodAndCorr +
-                ", bolusCountManual=" + bolusCountManual +
-                ", bolusCountFood=" + bolusCountFood +
-                ", bolusCountCorr=" + bolusCountCorr +
-                ", entry=" + entry +
-                ']';
+        return new ToStringBuilder(this)
+                .append("bgAvg", bgAvg)
+                .append("bgLow", bgLow)
+                .append("bgHigh", bgHigh)
+                .append("bgCount", bgCount)
+                .append("sensorAvg", sensorAvg)
+                .append("sensorMin", sensorMin)
+                .append("sensorMax", sensorMax)
+                .append("sensorCalcCount", sensorCalcCount)
+                .append("sensorDataCount", sensorDataCount)
+                .append("insulinTotal", insulinTotal)
+                .append("insulinBasal", insulinBasal)
+                .append("insulinBolus", insulinBolus)
+                .append("insulinCarbs", insulinCarbs)
+                .append("bolusTotal", bolusTotal)
+                .append("bolusFood", bolusFood)
+                .append("bolusFoodAndCorr", bolusFoodAndCorr)
+                .append("bolusCorrection", bolusCorrection)
+                .append("bolusManual", bolusManual)
+                .append("bolusCount", bolusCount)
+                .append("bolusCountFoodOrCorr", bolusCountFoodOrCorr)
+                .append("bolusCountFoodAndCorr", bolusCountFoodAndCorr)
+                .append("bolusCountManual", bolusCountManual)
+                .append("bolusCountFood", bolusCountFood)
+                .append("bolusCountCorr", bolusCountCorr)
+                .append("entry", entry)
+                .toString();
     }
 
     public void setTDD(TDD tdd) {

From c0b0d589960a0fddb2e56450a75da553b1c52d2f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 19 Jul 2020 17:49:47 +0200
Subject: [PATCH 338/400] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index b76376b3d2..ae885da9fe 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,4 @@
 dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
 
 
-[![Donate via PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Y4LHGJJESAVB8)
-
 ![BTC](https://bitit.io/assets/coins/icon-btc-1e5a37bc0eb730ac83130d7aa859052bd4b53ac3f86f99966627801f7b0410be.svg) 3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2

From 15586abe5265fc3cc702b6b9a9b48e2c490483dd Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 20 Jul 2020 12:33:35 +0200
Subject: [PATCH 339/400] fix AS calculation

---
 .../plugins/sensitivity/SensitivityOref1Plugin.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
index fec1b6d960..1283ef268a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
@@ -208,10 +208,10 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
             double basalOff = 0;
 
             if (pSensitive < 0) { // sensitive
-                basalOff = pSensitive * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
+                basalOff = pSensitive * (60.0 / 5) / sens;
                 sensResult += "Excess insulin sensitivity detected";
             } else if (pResistant > 0) { // resistant
-                basalOff = pResistant * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
+                basalOff = pResistant * (60.0 / 5) / sens;
                 sensResult += "Excess insulin resistance detected";
             } else {
                 sensResult += "Sensitivity normal";

From cbd0913a501ce7f20e99f257e19e7b4c21429d00 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 20 Jul 2020 12:56:18 +0200
Subject: [PATCH 340/400] New Crowdin updates (#2819)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations protection.xml (Polish)

* New translations strings.xml (Polish)

* New translations exam.xml (Polish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Czech)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)
---
 app/src/main/res/values-bg-rBG/strings.xml    |  10 +-
 app/src/main/res/values-cs-rCZ/strings.xml    |  14 +-
 app/src/main/res/values-de-rDE/strings.xml    |  13 +-
 app/src/main/res/values-es-rES/strings.xml    |   9 +-
 app/src/main/res/values-fr-rFR/strings.xml    |  14 +-
 app/src/main/res/values-it-rIT/strings.xml    |  14 +-
 app/src/main/res/values-ko-rKR/strings.xml    |   1 -
 app/src/main/res/values-lt-rLT/strings.xml    |  12 ++
 app/src/main/res/values-nl-rNL/strings.xml    |   2 -
 app/src/main/res/values-pl-rPL/exam.xml       |   3 +
 app/src/main/res/values-pl-rPL/protection.xml |   2 +
 app/src/main/res/values-pl-rPL/strings.xml    | 147 +++++++++++++++++-
 app/src/main/res/values-pt-rBR/strings.xml    |   1 -
 app/src/main/res/values-pt-rPT/strings.xml    |  14 +-
 app/src/main/res/values-ro-rRO/strings.xml    |   1 -
 app/src/main/res/values-ru-rRU/strings.xml    |  12 +-
 app/src/main/res/values-sk-rSK/strings.xml    |  10 +-
 app/src/main/res/values-sv-rSE/strings.xml    |   2 -
 core/src/main/res/values-bg-rBG/strings.xml   |   2 -
 core/src/main/res/values-cs-rCZ/strings.xml   |   4 +-
 core/src/main/res/values-de-rDE/strings.xml   |   4 +-
 core/src/main/res/values-es-rES/strings.xml   |   2 -
 core/src/main/res/values-fr-rFR/strings.xml   |   4 +-
 core/src/main/res/values-it-rIT/strings.xml   |   4 +-
 core/src/main/res/values-lt-rLT/strings.xml   |   4 +-
 core/src/main/res/values-nl-rNL/strings.xml   |   2 -
 core/src/main/res/values-pl-rPL/strings.xml   |  74 +++++++++
 core/src/main/res/values-pt-rPT/strings.xml   |   4 +-
 core/src/main/res/values-ro-rRO/strings.xml   |   2 -
 core/src/main/res/values-ru-rRU/strings.xml   |   4 +-
 core/src/main/res/values-sk-rSK/strings.xml   |   2 -
 core/src/main/res/values-sv-rSE/strings.xml   |   2 -
 dana/src/main/res/values-pl-rPL/strings.xml   | 122 ++++++++++++++-
 33 files changed, 467 insertions(+), 50 deletions(-)

diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 8293bacc5d..622ec2460d 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Клонирай</string>
     <string name="saveorresetchangesfirst">Първо запазете или се откажете от промените</string>
     <string name="deletecurrentprofile">Изтриване на текущия профил?</string>
-    <string name="copytolocalprofile">Създаване на нов локален профил от това превключване?</string>
+    <string name="copytolocalprofile">Желаете ли да създадете нов локален профил от този профил?</string>
     <string name="profilenamecontainsdot">Името на профила съдържа точка.\nТова не се поддържа от НС.\nПрофилът не е качен в НС.</string>
     <string name="low_mark_comment">Ниската граница на диапазона (графика)</string>
     <string name="high_mark_comment">Високата граница на диапазона (графика)</string>
@@ -1405,6 +1405,12 @@
     <string name="omnipod_bolus_failed_uncertain">Не може да се провери статус на болус. Моля, уверете се, че вашият под е стартирал болус или го отменете.</string>
     <string name="omnipod_rl_stats">Статистика на RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse лог</string>
-    <string name="comapareprofile">Сравни с текущия профил</string>
+    <string name="comapareprofile">Сравняване на профили</string>
     <string name="nav_profilehelper">Профил съветник</string>
+    <string name="motoldefaultprofile">Профил по подразбиране</string>
+    <string name="currentprofile">Текущ профил</string>
+    <string name="availableprofile">Наличен профил</string>
+    <string name="profiletype">Профил тип</string>
+    <string name="formatwithtdd">Възраст: %1$.0f TDD: %2$.0f Е</string>
+    <string name="formatwithweight">Възраст: %1$.0f Тегло: %2$.0f кг</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 0fa23656c6..4c6bb272a8 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Klonovat</string>
     <string name="saveorresetchangesfirst">Nejprve uložte nebo resetujte aktuální změny</string>
     <string name="deletecurrentprofile">Odstranit aktuální profil?</string>
-    <string name="copytolocalprofile">Chcete vytvořit nový lokální profil z tohoto přepnutí profilu?</string>
+    <string name="copytolocalprofile">Vytvořit z tohoto profilu nový místní profil?</string>
     <string name="profilenamecontainsdot">Název profilu obsahuje tečky.\nToto není v NS podporováno.\nProfil není přenesen do NS.</string>
     <string name="low_mark_comment">Spodní hodnota oblasti v rozsahu (pouze zobrazování)</string>
     <string name="high_mark_comment">Horní hodnota oblasti v rozsahu (pouze zobrazování)</string>
@@ -1237,6 +1237,7 @@
     <string name="nav_survey">Průzkum</string>
     <string name="invalidage">Neplatná položka věku</string>
     <string name="invalidweight">Neplatná položka váhy</string>
+    <string name="invalidpct">Neplatný vstup %</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Průměr</string>
     <string name="tir">Čas v rozsahu</string>
@@ -1405,6 +1406,15 @@
     <string name="omnipod_bolus_failed_uncertain">Nelze ověřit, zda byl bolus úspěšný. Ověřte prosím, zda Váš Pod dodává bolus nebo ho zrušte.</string>
     <string name="omnipod_rl_stats">Statistika RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
-    <string name="comapareprofile">Porovnat s aktuálním profilem</string>
+    <string name="comapareprofile">Porovnat profily</string>
     <string name="nav_profilehelper">Pomocník s profilem</string>
+    <string name="motoldefaultprofile">Výchozí profil</string>
+    <string name="currentprofile">Aktuální profil</string>
+    <string name="availableprofile">Dostupný profil</string>
+    <string name="profiletype">Typ profilu</string>
+    <string name="formatwithtdd">Věk: %1$.0f CDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Věk: %1$.0f CDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Věk: %1$.0f Hmotnost: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% bazálu</string>
+    <string name="dpvdefaultprofile">Výchozí profil DPV</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 32e3a40d82..5e18740785 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1224,7 +1224,7 @@ Unerwartetes Verhalten.</string>
     <string name="clone_label">Klonen</string>
     <string name="saveorresetchangesfirst">Speichere oder verwerfe die aktuellen Änderungen zuerst</string>
     <string name="deletecurrentprofile">Aktuelles Profil löschen?</string>
-    <string name="copytolocalprofile">Neues lokales Profil auf Basis dieses Profilwechsels erstellen?</string>
+    <string name="copytolocalprofile">Neues lokales Profil auf Basis dieses Profils erstellen?</string>
     <string name="profilenamecontainsdot">Profilname enthält Punkte.\nDies wird von NS nicht unterstützt.\nProfil wird nicht zu NS hochgeladen.</string>
     <string name="low_mark_comment">Unterer Wert des Zielbereichs (nur Anzeige)</string>
     <string name="high_mark_comment">Oberer Wert des Zielbereichs (nur Anzeige)</string>
@@ -1238,6 +1238,7 @@ Unerwartetes Verhalten.</string>
     <string name="nav_survey">Umfrage</string>
     <string name="invalidage">Ungültige Altersangabe</string>
     <string name="invalidweight">Ungültige Gewichtsangabe</string>
+    <string name="invalidpct">Ungültige % Eingabe</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Low: <b>%2$02d%%</b> In: <b>%3$02d%%</b> High: <b>%4$02d%%</b>]]></string>
     <string name="average">Durchschnitt</string>
     <string name="tir">TIR</string>
@@ -1407,5 +1408,15 @@ Mache das nur, wenn AAPS nicht mehr mit dem Pod kommunizieren kann. Wenn dies no
     <string name="omnipod_bolus_failed_uncertain">Erfolgreiche Bolusabgabe konnte nicht sicher ermittelt werden. Stelle sicher, dass der Pod Insulin abgibt oder brich den Bolus ab.</string>
     <string name="omnipod_rl_stats">RL Stats</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
+    <string name="comapareprofile">Profile vergleichen</string>
     <string name="nav_profilehelper">Profil-Helfer</string>
+    <string name="motoldefaultprofile">Standard-Profil</string>
+    <string name="currentprofile">Aktuelles Profil</string>
+    <string name="availableprofile">Verfügbares Profil</string>
+    <string name="profiletype">Profil-Typ</string>
+    <string name="formatwithtdd">Alter: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Alter: %1$.0f TDD: %2$.0f IE %3$d%%</string>
+    <string name="formatwithweight">Alter: %1$.0f Gewicht: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% der Basalrate</string>
+    <string name="dpvdefaultprofile">DPV-Standard-Profil</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 9ea50c32d0..60e9782a4c 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Clonar</string>
     <string name="saveorresetchangesfirst">Guardar o restablecer los cambios actuales primero</string>
     <string name="deletecurrentprofile">¿Eliminar el perfil actual?</string>
-    <string name="copytolocalprofile">¿Crear un nuevo perfil local a partir de este conmutador de perfil?</string>
+    <string name="copytolocalprofile">¿Crear un perfil local nuevo a partir de este perfil?</string>
     <string name="profilenamecontainsdot">El nombre de perfil contiene puntos.\nEsto no está soportado por NS.\nEl perfil no se carga en NS.</string>
     <string name="low_mark_comment">Valor inferior del área de rango (sólo visualización)</string>
     <string name="high_mark_comment">Valor superior al área de rango (sólo visualización)</string>
@@ -1405,6 +1405,11 @@
     <string name="omnipod_bolus_failed_uncertain">No se puede verificar si el bolo ha sido exitoso. Por favor verifique que su Pod está poniendo bolo o cancele el bolo.</string>
     <string name="omnipod_rl_stats">Estadísticas del RL</string>
     <string name="omnipod_read_pulse_log_short">Registro de pulso</string>
-    <string name="comapareprofile">Comparar con el perfil actual</string>
+    <string name="comapareprofile">Comparar perfiles</string>
     <string name="nav_profilehelper">Asistente de perfil</string>
+    <string name="currentprofile">Perfil actual</string>
+    <string name="availableprofile">Perfil disponible</string>
+    <string name="profiletype">Tipo de perfil</string>
+    <string name="formatwithtdd">Edad: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwithweight">Edad: %1$.0f Peso: %2$.0f kg</string>
 </resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 7e72ee4e5f..bf36876d6b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1224,7 +1224,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="clone_label">Dupliquer</string>
     <string name="saveorresetchangesfirst">Sauver ou réinitialiser les modifications actuelles en premier</string>
     <string name="deletecurrentprofile">Supprimer le profil actuel ?</string>
-    <string name="copytolocalprofile">Créer un nouveau profil local à partir de ce changement de profil ?</string>
+    <string name="copytolocalprofile">Créer un nouveau profil local à partir de ce profil ?</string>
     <string name="profilenamecontainsdot">Le nom du profil contient des points.\nCe n\'est pas pris en charge par NS.\nLe profil n\'est pas remonté dans NS.</string>
     <string name="low_mark_comment">Valeur inférieure dans la plage (affichage uniquement)</string>
     <string name="high_mark_comment">Valeur supérieure dans la plage (affichage uniquement)</string>
@@ -1238,6 +1238,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="nav_survey">Sondage</string>
     <string name="invalidage">Âge invalide</string>
     <string name="invalidweight">Poids invalide</string>
+    <string name="invalidpct">% saisi invalide</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Bas: <b>%2$02d%%</b> Cible: <b>%3$02d%%</b> Haut: <b>%4$02d%%</b>]]></string>
     <string name="average">Moyenne</string>
     <string name="tir">Cible Gly</string>
@@ -1406,6 +1407,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="omnipod_bolus_failed_uncertain">Impossible de vérifier si le bolus a réussi. Vérifiez que votre Pod délivre le bolus ou annulez le bolus.</string>
     <string name="omnipod_rl_stats">État RL</string>
     <string name="omnipod_read_pulse_log_short">Enreg. Pulse</string>
-    <string name="comapareprofile">Comparer avec le profil actuel</string>
+    <string name="comapareprofile">Comparer les profils</string>
     <string name="nav_profilehelper">Assistant Profil</string>
+    <string name="motoldefaultprofile">Profil par défaut</string>
+    <string name="currentprofile">Profil actuel</string>
+    <string name="availableprofile">Profil disponible</string>
+    <string name="profiletype">Type de profil</string>
+    <string name="formatwithtdd">Âge: %1$.0f DTI: %2$.0f U</string>
+    <string name="formatwittddandpct">Âge: %1$.0f DTI: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Âge: %1$.0f Poids: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% de basal</string>
+    <string name="dpvdefaultprofile">Profil par défaut DPV</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index ea0ba0fcb3..fcc302b530 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Clona</string>
     <string name="saveorresetchangesfirst">Salva o reimposta prima le modifiche correnti</string>
     <string name="deletecurrentprofile">Rimuovere il profilo corrente?</string>
-    <string name="copytolocalprofile">Creare nuovo profilo locale da questo cambio profilo?</string>
+    <string name="copytolocalprofile">Creare un nuovo profilo locale da questo profilo?</string>
     <string name="profilenamecontainsdot">Il nome profilo contiene dei punti.\nQuesto non è supportato da NS.\nIl profilo non viene caricato in NS.</string>
     <string name="low_mark_comment">Valore più basso per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
     <string name="high_mark_comment">Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\"</string>
@@ -1237,6 +1237,7 @@
     <string name="nav_survey">Sondaggio</string>
     <string name="invalidage">Inserimento età non valido</string>
     <string name="invalidweight">Inserimento peso non valido</string>
+    <string name="invalidpct">Inserimento % non valido</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Basso: <b>%2$02d%%</b> In: <b>%3$02d%%</b> Alto: <b>%4$02d%%</b>]]></string>
     <string name="average">Media</string>
     <string name="tir">TIR</string>
@@ -1405,6 +1406,15 @@
     <string name="omnipod_bolus_failed_uncertain">Impossibile verificare che il bolo sia riuscito. Verifica che il tuo pod stia erogando il bolo oppure cancellalo.</string>
     <string name="omnipod_rl_stats">Statistiche RL</string>
     <string name="omnipod_read_pulse_log_short">Log impulsi</string>
-    <string name="comapareprofile">Compara col profilo corrente</string>
+    <string name="comapareprofile">Compara profili</string>
     <string name="nav_profilehelper">Assistente profilo</string>
+    <string name="motoldefaultprofile">Profilo predefinito</string>
+    <string name="currentprofile">Profilo corrente</string>
+    <string name="availableprofile">Profilo disponibile</string>
+    <string name="profiletype">Tipo profilo</string>
+    <string name="formatwithtdd">Età: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Età: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Età: %1$.0f Peso: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% di basale</string>
+    <string name="dpvdefaultprofile">Profilo DPV predefinito</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 64d2780b01..b2b0e5affa 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1113,7 +1113,6 @@
     <string name="clone_label">복사</string>
     <string name="saveorresetchangesfirst">우선 현재 변경사항을을 저장하거나 재설정하세요</string>
     <string name="deletecurrentprofile">현재 프로파일을 삭제 하시겠습니까?</string>
-    <string name="copytolocalprofile">이 프로파일 변경을 기반으로 새 로컬 프로파일을 만드시겠습니까?</string>
     <string name="profilenamecontainsdot">프로파일명에 점을 포함하고 있습니다.\n이는 NS에서 지원하지 않습니다.\n프로파일이 NS에 업로드되지 않습니다.</string>
     <string name="low_mark_comment">혈당 정상범위의 하한값(표시 전용)</string>
     <string name="high_mark_comment">혈당 정상범위의 상한값(표시 전용)</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index e117fd3736..3a4999bb69 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1237,6 +1237,7 @@
     <string name="nav_survey">Apklausa</string>
     <string name="invalidage">Neteisingas amžiaus įrašas</string>
     <string name="invalidweight">Neteisingas svorio įrašas</string>
+    <string name="invalidpct">Netinkamas % įrašas</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Žemas: <b>%2$02d%%</b> Norma: <b>%3$02d%%</b> Aukštas: <b>%4$02d%%</b>]]></string>
     <string name="average">Vidutinis</string>
     <string name="tir">TIR (Laikas normos ribose)</string>
@@ -1405,4 +1406,15 @@
     <string name="omnipod_bolus_failed_uncertain">Neįmanoma patikrinti, ar bolusas suleistas sėkmingai. Patikrinkite, ar jūsų POD leidžia bolusą, arba bolusą atšaukite.</string>
     <string name="omnipod_rl_stats">RL statistika</string>
     <string name="omnipod_read_pulse_log_short">Pulse žurnalas</string>
+    <string name="comapareprofile">Palyginti profilius</string>
+    <string name="nav_profilehelper">Profilio pagalbininkas</string>
+    <string name="motoldefaultprofile">Numatytasis profilis</string>
+    <string name="currentprofile">Dabartinis profilis</string>
+    <string name="availableprofile">Galimas profilis</string>
+    <string name="profiletype">Profilio tipas</string>
+    <string name="formatwithtdd">Amžius: %1$.0f BPD: %2$.0f U</string>
+    <string name="formatwittddandpct">Amžius: %1$.0f BPD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Amžius: %1$.0f Svoris: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% bazės</string>
+    <string name="dpvdefaultprofile">Numatytasis profilis</string>
 </resources>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 1005731363..6257a7d4ee 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1223,7 +1223,6 @@
     <string name="clone_label">Dupliceren</string>
     <string name="saveorresetchangesfirst">Huidige wijzigingen eerst opslaan of ongedaan maken</string>
     <string name="deletecurrentprofile">Huidige profiel verwijderen?</string>
-    <string name="copytolocalprofile">Nieuw lokaal profiel maken op basis van deze profiel wissel?</string>
     <string name="profilenamecontainsdot">Profielnaam bevat punten.\nDit wordt niet ondersteund door NS.\nProfiel is niet geüpload naar NS.</string>
     <string name="low_mark_comment">Laagste waarde in bereik (alleen weergave)</string>
     <string name="high_mark_comment">Hoogste waarde in bereik (alleen weergave)</string>
@@ -1405,6 +1404,5 @@
     <string name="omnipod_bolus_failed_uncertain">Kan niet controleren of de bolus is geslaagd. Controleer of de Pod de bolus aan het toedienen is of annuleer de bolus.</string>
     <string name="omnipod_rl_stats">RL Statistieken</string>
     <string name="omnipod_read_pulse_log_short">Pulsen Log</string>
-    <string name="comapareprofile">Vergelijk met huidig profiel</string>
     <string name="nav_profilehelper">Profiel hulp</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/exam.xml b/app/src/main/res/values-pl-rPL/exam.xml
index fd3f73b858..b346bd076c 100644
--- a/app/src/main/res/values-pl-rPL/exam.xml
+++ b/app/src/main/res/values-pl-rPL/exam.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="dia_whatmeansdia">Co jest prawdą w przypadku DIA?</string>
+    <string name="dia_label_exam">Temat: Czas działania insuliny (DIA)</string>
     <string name="dia_minimumis3h">Wartość minimalna to 3 godziny.</string>
     <string name="dia_minimumis5h">Wartość minimalna to 5 godzin.</string>
     <string name="dia_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin</string>
@@ -121,6 +122,7 @@
     <string name="nsclient_looponiphone">Aplikacja Loop na iPhone\'a.</string>
     <string name="nsclient_spikeiphone">Aplikacja Spike na iPhone\'a.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
+    <string name="isf_label_exam">Temat: Współczynnik wrażliwości na insulinę (ISF)</string>
     <string name="isf_increasingvalue">Wyższe wartości ISF prowadzą do mniejszej ilości podanej insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
     <string name="isf_decreasingvalue">Niższe wartości ISF prowadzą do mniejszej dawki insuliny gdy AAPS koryguje wysoki poziom cukru.</string>
     <string name="isf_noeffect">Zmiana wartości ISF nie ma wpływu na ilość insuliny dostarczanej, gdy AAPS koryguje wysoki poziom cukru.</string>
@@ -128,6 +130,7 @@
     <string name="isf_profile">Zmiana wartości ISF w profilu wystarczy, aby zastosować zmianę.</string>
     <string name="isf_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u</string>
     <string name="isf_hint2">https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html</string>
+    <string name="ic_label_exam">Temat: Węglowodany na jednostkę Insuliny (IC)</string>
     <string name="ic_increasingvalue">Wyższe wartości ICprowadzą do mniejszej ilości insuliny dostarczonej do podanej ilości węglowodanów.</string>
     <string name="ic_decreasingvalue">Niższe wartości IC prowadzą do mniejszej ilości insuliny podanej do wprowadzonej ilości węglowodanów.</string>
     <string name="ic_noeffect">Załóżmy, że masz 0 COB. Zmiana IC doprowadzi do podania innej ilości insuliny w celu skorygowania twojej wartości BG.</string>
diff --git a/app/src/main/res/values-pl-rPL/protection.xml b/app/src/main/res/values-pl-rPL/protection.xml
index d2b1b43d2a..48652935ae 100644
--- a/app/src/main/res/values-pl-rPL/protection.xml
+++ b/app/src/main/res/values-pl-rPL/protection.xml
@@ -15,6 +15,8 @@
     <string name="noprotection">Bez ochrony</string>
     <string name="protection">Z ochroną</string>
     <string name="master_password_missing">Hasło główne nie jest ustawione!\n\nProszę ustawić swoje hasło główne w preferencjach (%1$s &#8594; %2$s)</string>
+    <string name="unsecure_fallback_biometric">Niezabezpieczona funkcja fallback</string>
+    <string name="unsecure_fallback_descriotion_biometric">Aby być skuteczna, biometryczna ochrona musi posiadać hasło typu master. \n\n Ustaw hasło typu master!</string>
     <string name="password_set">Hasło ustawione!</string>
     <string name="password_not_set">Hasło nie ustawione</string>
     <string name="password_not_changed">Hasło nie zostało zmienione</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 2242a82842..fbdaaf5521 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -126,10 +126,12 @@
     <string name="apsmode_title">Tryb APS</string>
     <string name="closedloop">Zamknięta pętla</string>
     <string name="openloop">Otwarta pętla</string>
+    <string name="lowglucosesuspend">Zawieszenie przy niskiej glikemii</string>
     <string name="disabledloop">Pętla wyłączona</string>
     <string name="disableloop">Wyłącz pętle</string>
     <string name="enableloop">Włącz pętle</string>
     <string name="openloop_newsuggestion">Dostępna nowa sugestia</string>
+    <string name="carbssuggestion">Sugestia węglowodanów</string>
     <string name="unsupportednsversion">Niewspierana wersja Nightscout</string>
     <string name="loopdisabled">PĘTLA WYLĄCZONA Z UWAGI NA OGRANICZENIA</string>
     <string name="treatments_wizard_basaliob_label">Bazowa IOB</string>
@@ -162,6 +164,7 @@
     <string name="filenotfound">Nie znaleziono pliku</string>
     <string name="nav_export">Eksportuj ustawienia</string>
     <string name="nav_import">Importuj ustawienia</string>
+    <string name="openapsma_maxbasal_title">Maksymalna wartość U/h tymczasowej bazy może być ustawiona na</string>
     <string name="openapsma_maxbasal_summary">Wartość określona jako Maksymalna Baza (max basal) w OpenAPS</string>
     <string name="openapsma_maxiob_title">Maksymalna bazowa IOB, którą OpenAPS może dostarczyć [U]</string>
     <string name="openapsma_maxiob_summary">Ta wartość jest nazywana Max IOB w OpenAPS\nTo jest maksymalna wartość insuliny w [U], którą APS może dostarczyć w danej chwili.</string>
@@ -250,6 +253,11 @@
     <string name="smscommunicator_loopisenabled">Pętla (Loop) jest włączona</string>
     <string name="valuelimitedto">%1$.2f ograniczone do %2$.2f</string>
     <string name="valueoutofrange">Wartość %1$s jest poza dopuszczalną granicą</string>
+    <string name="smscommunicator_pumpconnectwithcode">Aby podłączyć pompę odpowiedz kodem %1$s</string>
+    <string name="smscommunicator_pumpconnectfail">Połączenie z pompą nie powiodło się</string>
+    <string name="smscommunicator_pumpdisconnectwithcode">Aby odłączyć pompę na %1d minut odpowiedz kodem %2$s</string>
+    <string name="smscommunicator_pumpdisconnected">Pompa odłączona</string>
+    <string name="smscommunicator_reconnect">Pompa ponownie podłączona</string>
     <string name="smscommunicator_remotecommandnotallowed">Zdalne komendy nie są dozwolone</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolus zdalny niedostępny. Spróbuj ponownie później.</string>
     <string name="smscommunicator_basalreplywithcode">Aby rozpocząć bazę %1$.2fU/h przez %2$d min. odpowiedz kodem %3$s</string>
@@ -258,6 +266,9 @@
     <string name="smscommunicator_carbsreplywithcode">Aby wprowadzić %1$dg o %2$s odeślij w SMS kod %3$s</string>
     <string name="smscommunicator_basalpctreplywithcode">Aby rozpocząć bolus przedłużony %1$d%% przez %2$d min. odpowiedz kodem %3$s</string>
     <string name="smscommunicator_suspendreplywithcode">Aby wstrzymać pętle na %1$d minut odpowiedz kodem %2$s</string>
+    <string name="smscommunicator_loopresumereplywithcode">Aby wznowić pętlę odpowiedz kodem %1$s</string>
+    <string name="smscommunicator_loopenablereplywithcode">Aby włączyć pętlę odpowiedz kodem %1$s</string>
+    <string name="smscommunicator_loopdisablereplywithcode">Aby wyłączyć pętlę odpowiedz kodem %1$s</string>
     <string name="smscommunicator_tempbasalset">Tymczasowa baza %1$.2fU/h przez %2$d min rozpoczęta</string>
     <string name="smscommunicator_extendedset">Bolus przedłużony %1$.2fU na %2$d min. rozpoczęty pomyślnie</string>
     <string name="smscommunicator_carbsset">Pomyślnie wprowadzono %1$dg węglowodanów</string>
@@ -289,6 +300,7 @@
     <string name="primefill">Rozpocznij/Wypełnij</string>
     <string name="fillwarning">Proszę upewnij się, że ilość wypełnienia odpowiada ilości właściwej dla twojego wkłucia!</string>
     <string name="othersettings_title">Inne</string>
+    <string name="fillbolus_title">Rozpocznij/Wypełnij standardowe ilości insuliny</string>
     <string name="button1">Przycisk 1</string>
     <string name="button2">Przycisk 2</string>
     <string name="button3">Przycisk 3</string>
@@ -347,6 +359,7 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Wartość domyślna: 4 To jest drugi kluczowy współczynnik bezpieczeństwa OpenAPS, i druga wartość z “3x max dzienna; 4x aktualna”. To oznacza, że Twoja dawka bazowa niezależnie od maksymalnej bazy ustawionej na pompie nie może być większa niż ta ustawiona wartość razy twoja aktualna dawka bazowa. To ma na celu przestrzec ludzi przed ustawieniem zbyt wysokiej dawki maksymalnej przed zrozumieniem jak działa algorytm. Ponownie, wartość domyślna to 4x; większość ludzi nie będzie potrzebowała tego zmienić i raczej będą potrzebować dostosować inne ustawienia, jeśli czują, że zbliżają się do współczynnika bezpieczeństwa.</string>
     <string name="openapsama_autosens_max_summary">Wartość domyślna: 1.2\nTo jest mnożnik dla autosens (wkrótce autotune), ustawia 20%% maks. limit dla najwyższej wartości jaką autosens może przyjąć, co z kolei określa jak wysoko autosens może zwiększyć bazę, jak nisko może ustawić współczynnik wrażliwości insuliny ISF, i jak nisko może ustawić docelową wartość glikemii.</string>
     <string name="openapsama_autosens_min_summary">Wartość domyślna: 0.7\nDruga strona limitu bezpieczeństwa dla autosens, ustawia mnożnik minimalny dla wartości, do jakiej autosens może obniżyć bazę, i jak wysoko może ustawić ISF i wartość docelową BG.</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens dostosowuje również wartości docelowe</string>
     <string name="openapsama_autosens_adjusttargets_summary">Domyślnie włączone\nTa funkcja pozwala wpływać na zmianę wartości docelowe BG, wartości bazy i oraz współczynnika wrażliwości na insulinę ISF.</string>
     <string name="openapsama_bolussnooze_dia_divisor_summary">Wartość domyślna: 2\nBolus snooze jest uruchamiany po wykonaniu bolusa posiłkowego, tak by pętla nie przeciwdziałała niskim wartościom tymczasowym zaraz po posiłku. Jako przykład: wartość domyślna ustawiona jest 2; więc 3 godzinne DIA oznacza, że bolus snooze będzie stopniowo wycofany po 1.5 godziny (3DIA/2).</string>
     <string name="openapsama_min_5m_carbimpact_summary">Wartość domyślna: 3.0 (AMA) lub 8.0 (SMB). To jest ustawienie domyślnego wpływu wchłaniania węglowodanów w czasie 5 min. Wartością domyślną jest spodziewane 3mg/dl/5min. Ma to wpływ na szybkość zaniku COB, oraz jak duże wchłanianie węglowodanów będzie przyjęte do obliczeń przyszłych przewidywanych wartości BG, jeżeli BG obniża się bardziej niż w założono, lub nie wzrasta tak szybko jak się spodziewano.</string>
@@ -441,8 +454,14 @@
     <string name="statuslights_res_critical">Próg ostrzeżenia o krytycznym poziomie zbiornika [U]</string>
     <string name="statuslights_bat_warning">Próg ostrzeżenia o poziomie baterii [%]</string>
     <string name="statuslights_bat_critical">Próg ostrzeżenia o krytycznym poziomie baterii [%]</string>
+    <string name="prediction_shortname">PRED</string>
     <string name="iob">IOB</string>
     <string name="cob">COB</string>
+    <string name="basal_shortname">BAZ</string>
+    <string name="deviation_shortname">ODCH</string>
+    <string name="activity_shortname">AKT</string>
+    <string name="abs_insulin_shortname">ABS</string>
+    <string name="devslope_shortname">KRZOD</string>
     <string name="nav_about">O programie</string>
     <string name="smscommunicator_missingsmspermission">Brak uprawnień SMS</string>
     <string name="smscommunicator_missingphonestatepermission">Brak uprawnień do wykrywania stanu telefonu</string>
@@ -461,6 +480,8 @@
     <string name="doprofileswitch">Zmień profil</string>
     <string name="careportal_pbage_label">Czas baterii pompy</string>
     <string name="ns_alarmoptions">Opcje alarmu</string>
+    <string name="ns_alarms">Utwórz powiadomienia z alarmów NS</string>
+    <string name="ns_announcements">Utwórz powiadomienia z komunikatów NS</string>
     <string name="nsalarm_staledatavalue_label">Próg nieaktualne dane [min]</string>
     <string name="nsalarm_urgent_staledatavalue_label">Próg uwaga nieaktualne dane [min]</string>
     <string name="openapsama_autosens_period">Przedział czasowy dla autosens [h]</string>
@@ -541,6 +562,7 @@
     <string name="enable_missed_bg_readings_alert">Alarm, jeśli nie są odbierane odczyty BG</string>
     <string name="enable_pump_unreachable_alert">Alarm, gdy pompa jest nieosiągalna</string>
     <string name="pump_unreachable_threshold">Pompa nieosiągalna próg [min]</string>
+    <string name="enable_carbs_req_alert">Alarm gdy wymagane jest podanie węglowodanów</string>
     <string name="urgent_alarm">Pilny alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Apka Eversense (spatchowana)</string>
@@ -553,6 +575,8 @@
     <string name="smbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB</string>
     <string name="uamsmbmaxminutes">Maksymalna liczba minut UAM SMB</string>
     <string name="uamsmbmaxminutes_summary">Maks. ilość minut dawki bazowej do ograniczenia SMB dla UAM</string>
+    <string name="carbsReqThreshold">Minimalna sugestia węglowodanów (dosłodzenia)</string>
+    <string name="carbsReqThreshold_summary">Minimalna ilość węglowodanów, w gramach, niezbędna dla pokazania sugestii dosłodzenia. Sugestie dosłodzenia poniżej tej wartości będą ignorowane - powiadomienie nie będzie pokazywane.</string>
     <string name="dexcomg5_xdripupload_title">Prześlij dane BG do xDrip+</string>
     <string name="dexcomg5_xdripupload_summary">W xDrip+ wybierz źródło danych 640g/Eversense</string>
     <string name="nsclientbg">NSClient BG</string>
@@ -611,6 +635,8 @@
     <string name="extendedbolusdeliveryerror">Błąd dostarczania bolusa przedłużonego</string>
     <string name="insightpump_shortname">Sight</string>
     <string name="ago">temu</string>
+    <string name="set_neutral_temps_title">Ustawiaj neutralne bazy tymczasowe</string>
+    <string name="set_neutral_temps_summary">Jeśli ta opcja jest włączona, anuluje tymczasową wartość bazową przed końcem każdej godziny. Może to pomóc wyciszyć alarmy/wibracje związane z TBR występujące co godzinę w niektórych pompach.</string>
     <string name="enablesmbalways">Włącz SMB (Super Mikro Bolusy) zawsze</string>
     <string name="enablesmbalways_summary">Włącz SMB (Super Mikro Bolusy) zawsze, niezależnie od bolusów. Możliwe jedynie ze źródłem BG (poziomu cukru) z dobrym filtrowaniem, jak aplikacja G5</string>
     <string name="enablesmbaftercarbs">Włącz SMB po węglowodanach</string>
@@ -630,11 +656,17 @@
     <string name="insulin_increment_button_message">Ilość insuliny do dodania po wciśnięciu przycisku</string>
     <string name="error_starting_cgm">Nie można uruchomić aplikacji CGM. Upewnij się, że została zainstalowana.</string>
     <string name="overview_cgm">CGM</string>
+    <string name="ignore5m">Ignoruj 5 min</string>
+    <string name="ignore15m">Ignoruj 15 min</string>
+    <string name="ignore30m">Ignoruj 30 min</string>
+    <string name="required">wym</string>
     <string name="nav_historybrowser">Przegląd historii</string>
     <string name="wear_notifysmb_title">Powiadom na SMB</string>
     <string name="wear_notifysmb_summary">Pokaż SMB na zegarku jak bolus standardowy.</string>
     <string name="ns_create_announcements_from_errors_title">Twórz powiadomienia o błędach</string>
+    <string name="ns_create_announcements_from_carbs_req_title">Twórz powiadomienia z wymaganych dodatkowych węglowodanów (sugestii dosłodzenia)</string>
     <string name="ns_create_announcements_from_errors_summary">Twórz powiadomienia Nightscout o błędach i lokalnych alarmach (również widoczne w PortaluOpieki w ramach Leczenia)</string>
+    <string name="ns_create_announcements_from_carbs_req_summary">Twórz powiadomienia w Nighstcout na podstawie sugestii dosłodzenia</string>
     <string name="wear_predictions_summary">Pokaż prognozę poziomu na zegarku.</string>
     <string name="wear_predictions_title">Prognozy</string>
     <string name="data_choices">Wybór Danych</string>
@@ -764,6 +796,7 @@
     <string name="permission">Uprawnienia</string>
     <string name="askforpermission">Zapytaj o uprawnienia</string>
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
+    <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji dla zarządzania bluetoothem i identyfikacją Wi-Fi</string>
     <string name="needstoragepermission">Aplikacja wymaga dostępu do magazynu plików, aby móc przechować pliki logów</string>
     <string name="request">Żądanie</string>
     <string name="insulinsourcesetup">Skonfiguruj wtyczkę insuliny</string>
@@ -835,6 +868,10 @@
     <string name="log_alerts">Melduj ostrzeżenia</string>
     <string name="enable_tbr_emulation">Włącz emulację TBR</string>
     <string name="enable_tbr_emulation_summary">Użyj rozszerzonych bolusów zamiast TBR by ominąć limit 250%% bazy</string>
+    <string name="disable_vibration">Wyłącz wibracje przy ręcznym podawaniu bolusa</string>
+    <string name="disable_vibration_summary">Dotyczy bolusa i rozszerzonego bolusa (dostępne tylko z pompami Insight z firmware 3.x)</string>
+    <string name="disable_vibration_auto">Wyłącz wibracje przy automatycznym podawaniu bolusa</string>
+    <string name="disable_vibration_auto_summary">Dla SMB i Bazy Tymczasowej z emulacją TBR (tylko z firmware w wersji 3.x pompy Insight)</string>
     <string name="disconnect_delay">Opóźnienie rozłączenie [s]</string>
     <string name="serial_number">Numer seryjny</string>
     <string name="release_software_version">Wersja oprogramowania</string>
@@ -1187,12 +1224,13 @@
     <string name="clone_label">Sklonuj</string>
     <string name="saveorresetchangesfirst">Najpierw zapisz lub wycofaj bieżące zmiany</string>
     <string name="deletecurrentprofile">Skasować bieżący profil?</string>
-    <string name="copytolocalprofile">Utworzyć nowy profil lokalny na bazie wybranego profilu?</string>
+    <string name="copytolocalprofile">Utworzyć nowy profil lokalny z wybranego profilu?</string>
     <string name="profilenamecontainsdot">Nazwa profilu zawiera kropki.\nTo nie jest obsługiwane przez NS.\nProfil nie zostanie przesyłany do NS.</string>
     <string name="low_mark_comment">Dolna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="high_mark_comment">Górna wartość zakresu docelowego (tylko do wyświetlania)</string>
     <string name="reorder_label">Zmień kolejność</string>
     <string name="age">Wiek:</string>
+    <string name="weight_label">Waga:</string>
     <string name="id">ID:</string>
     <string name="submit">Wyślij</string>
     <string name="mostcommonprofile">Najczęściej używany profil:</string>
@@ -1256,17 +1294,124 @@
     <string name="statuslights">Wskaźniki stanu</string>
     <string name="statuslights_copy_ns">Kopiowanie ustawień z NS</string>
     <string name="copyexistingvalues">Czy skopiować ustawienia NS (jeśli istnieją)?</string>
+    <string name="classic_description">Motyw oryginalny</string>
+    <string name="buttonson_description">Przyciski są zawsze wyświetlane na dole ekranu</string>
+    <string name="largedisplay_description">Duży ekran</string>
+    <string name="skin">Motyw</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod">Integracja pompy Omnipod, wymaga RileyLink (z firmwarem 2.0 lub wyższym).</string>
     <!-- Omnipod Configuration -->
+    <string name="omnipod_config_beep_bolus_enabled">Sygnał dźwiękowy bolusa włączony</string>
+    <string name="omnipod_config_beep_basal_enabled">Sygnał dźwiękowy bazy włączony</string>
+    <string name="omnipod_config_beep_smb_enabled">Sygnał dźwiękowy SMB włączony</string>
+    <string name="omnipod_config_beep_tbr_enabled">Sygnał dźwiękowy TBR (tymczasowej dawk bazowej) włączony</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Włączone opcje debugowania PODów</string>
+    <string name="omnipod_config_timechange_enabled">Włączone wykrywanie stref czasowych</string>
     <!-- Omnipod - Fragment -->
+    <string name="omnipod_pod_mgmt">Pod Mgmt</string>
+    <string name="omnipod_pod_status">Status Pod</string>
+    <string name="omnipod_reservoir_left">%1$.2f U zostało</string>
+    <string name="omnipod_reservoir_over50">Ponad 50 U</string>
+    <string name="omnipod_pod_address">Adres Pod</string>
+    <string name="omnipod_pod_expiry">Pod traci ważność</string>
+    <string name="omnipod_pod_name_no_info">Brak informacji</string>
+    <string name="omnipod_pod_no_pod_connected">Pod nie podłączony</string>
+    <string name="omnipod_pod_not_initalized">Nie zainicjowany</string>
+    <string name="omnipod_pod_active_alerts">Aktywne alarmy Pod</string>
+    <string name="omnipod_ack_short">Alerty ack</string>
     <!-- Omnipod - Dialogs -->
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować Omnipod przed uruchomieniem tego działania.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operacja nie jest możliwa.\n\n Trzeba poczekać kilka minut, aż AAPS spróbuje ustawić profil pierwszy raz.</string>
+    <string name="omnipod_error_illegal_init_action_type">Niedozwolone działanie PodInitActionType: %1$s</string>
+    <string name="omnipod_error_pod_not_attached">Brak aktywnego Pod.</string>
+    <string name="omnipod_driver_error_setup_action_verification_failed">Nieudana weryfikacja polecenia.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">Wystąpił nieoczekiwany błąd. Proszę zgłosić! (typ: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Komunikacja nie powiodła się: odebrano niepoprawne parametry wejściowe.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Komunikacja nie powiodła się: przekroczono limit czasu.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Komunikacja nie powiodła się: wystąpił nieoczekiwany błąd. Proszę zgłosić!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Komunikacja nie powiodła się: weryfikacja integralności komunikatu nie powiodła się.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Komunikacja nie powiodła się: odebrano niepoprawny pakiet (komunikat) z Poda.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Komunikacja nie powiodła się: Pod jest w niewłaściwym stanie.</string>
+    <string name="omnipod_driver_error_invalid_response">Komunikacja nie powiodła się: odebrano niepoprawną odpowiedź (pakiet) z Poda.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną sekwencją liczb z Poda.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Komunikacja nie powiodła się: odebrano komunikat z niepoprawną adresacją z Poda.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Komunikacja nie powiodła się: nie powiodło się dekodowanie komunikatu z Poda.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Komunikacja nie powiodła się: nonce resync nie powiodło się.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Komunikacja nie powiodła się: nonce nie jest zsynchronizowane.</string>
+    <string name="omnipod_driver_error_not_enough_data">Komunikacja nie powiodła się: brak wystarczającej ilości danych odebranych z Poda.</string>
+    <string name="omnipod_driver_error_pod_fault">Błąd Pod. (%1$03d %2$s) został wykryty. Zdezaktywuj swój Pod i uruchom nowy.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Komunikacja nie powiodła się: Pod zwrócił odpowiedź o błędzie.</string>
     <!-- Omnipod - Pod Mgmt -->
+    <string name="omnipod_pod_mgmt_title">Zarządzanie Pod</string>
+    <string name="omnipod_cmd_init_pod">Uruchom Pod</string>
+    <string name="omnipod_cmd_deactivate_pod">Odłącz Pod</string>
+    <string name="omnipod_cmd_reset_pod">Resetuj Pod</string>
+    <string name="omnipod_cmd_pod_history">Historia Pod</string>
     <string name="omnipod_cmd_set_bolus">Podanie bolusa</string>
     <string name="omnipod_cmd_cancel_bolus">Anulowanie bolusa</string>
     <string name="omnipod_cmd_set_tbr">Ustaw tymczasową dawkę bazową</string>
+    <string name="omnipod_cmd_cancel_tbr">Anuluj tymczasową bazę (wewnętrznie przez sterownik)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Anuluj tymczasową bazę (wymuszone przez użytkownika)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Ustaw harmonogram Dawki bazowej</string>
+    <string name="omnipod_cmd_get_pod_status">Pobierz status Pod</string>
+    <string name="omnipod_cmd_get_pod_info">Pobierz informacje o Pod</string>
+    <string name="omnipod_cmd_set_time">Ustaw czas</string>
+    <string name="omnipod_cmd_configure_alerts">Konfigurowanie alertów</string>
+    <string name="omnipod_cmd_acknowledge_alerts">Potwierdź alerty</string>
+    <string name="omnipod_cmd_suspend_delivery">Wstrzymaj podawanie</string>
+    <string name="omnipod_cmd_resume_delivery">Wznów podawanie</string>
+    <string name="omnipod_cmd_unknown_entry">Nieznany Wpis</string>
+    <string name="omnipod_cmd_bolus_value">%1$.1f U</string>
+    <string name="omnipod_cmd_bolus_value_with_carbs">%1$.1f U, CH=%2$.1f g</string>
+    <string name="omnipod_cmd_tbr_value">Dawka: %1$.1f U, Czas: %2$d min</string>
+    <string name="omnipod_cmd_reset_pod_desc">Jeśli naciśniesz <b>OK</b>, stan Pod zostanie wyzerowany i nie będziesz mógł więcej komunikować się z tym Podem. Zrób to tylko wtedy, gdy nie możesz się z nim skmunikować. Jeśli nadal można komunikować się z Podem, skorzystaj z opcji <b>Odłącz Pod</b>.</string>
+    <string name="omnipod_cmd_pod_history_na">Historia Pod nie jest dostępna w tej chwili.</string>
+    <string name="omnipod_init_pod_wizard_step1_title">Napełnij Pod</string>
+    <string name="omnipod_init_pod_wizard_step1_desc">\nNapełnij nowego Poda z wystarczającą ilością insuliny przez 3 dni.\n\nNasłuchuj dwóch sygnałów dźwiękowych z Poda podczas procesu napełniania. Wskazują one, że minimalna ilość 85U została wypełniona. Należy upewnić się, że ampułkostrzykawka jest całkowicie pusta, nawet po odsłuchaniu dwóch sygnałów dźwiękowych.\n\nPo napełnieniu Poda, należy nacisnąć <b>Dalej</b>.\n\n<b>Uwaga:</b> nie usuwaj w tym czasie osłonki igłowej Poda.</string>
+    <string name="omnipod_init_pod_wizard_step2_title">Wypełnianie</string>
+    <string name="omnipod_init_pod_wizard_step2_action_header">Próba sparowania z nowym Podem i wypełnienia go.\n\nKiedy wszystkie elementy są sprawdzone, można nacisnąć <b>Następny</b>.\n\n<b>Uwaga:</b> prosimy o trzymanie w tym czasie Poda bardzo blisko RileyLink.</string>
+    <string name="omnipod_init_pod_wizard_step3_title">Przymocuj Poda</string>
+    <string name="omnipod_init_pod_wizard_step3_desc">\nPrzygotowanie miejsca do infuzji. Zdjąć osłonkę igły i zabezpieczenie plastra i przykleić Pod do skóry w miejscu wkłucia.\n\nJeśli kaniula odkleja się, proszę wcisnąć <b>Anuluj</b> i odczepić Pod.\n\nNaciśnij <b>Następny</b> w celu wprowadzenia kaniuli i rozpoczęcia podawania bazy.</string>
+    <string name="omnipod_init_pod_wizard_step4_title">Wprowadzanie kaniuli</string>
+    <string name="omnipod_init_pod_wizard_step4_action_header">Próba ustawienia początkowego planu bazowego i wprowadzeia kaniuli.\n\nKiedy wszystkie elementy są sprawdzane, można nacisnąć <b>Następny</b>.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_title">Informacje o Podzie</string>
+    <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod jest teraz aktywny.\n\nTwój plan dawki bazowej został zaprogramowany i wprowadzono kaniulę w miejsce wkłucia.\n\nSprawdź, czy kaniula została prawidłowo włożona i wymień swój Pod, jeśli czujesz, że nie.</string>
+    <string name="omnipod_remove_pod_wizard_step1_title">Odłącz Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nNaciśnij <b>Następny</b> w celu odłączenia Poda.\n\n<b>Uwaga:</b> To spowoduje zawieszenie wszystkich dostaw insuliny i dezaktywację Poda.</string>
+    <string name="omnipod_remove_pod_wizard_step2_title">Odłączanie Poda</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Deaktywacja Pod.\n\nKiedy wszystkie elementy są zaznaczone, możesz nacisnąć <b>Następna</b>.\n\n<b>Uwaga:</b> Jeśli deaktywacja w sposób ciągły nie powodzi się, należy nacisnąć <b>Anuluj</b> i użyć opcji <b>Reset Pod</b>, aby wymusić zresetowanie stanu Pod.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod odłączony.\n\nProszę odkleić Pod od ciała i wyrzucić go.</string>
+    <string name="omnipod_init_pod_pair_pod">Sparuj Pod</string>
+    <string name="omnipod_init_pod_prime_pod">Wypełnij Pod</string>
+    <string name="omnipod_init_pod_fill_cannula">Wypełnij kaniulę</string>
     <string name="omnipod_init_pod_set_basal_profile">Ustaw profil dawki bazowej</string>
+    <string name="omnipod_deactivate_pod_cancel_delivery">Anulowanie podawania</string>
+    <string name="omnipod_deactivate_pod_deactivate_pod">Odłącz Pod</string>
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
+    <string name="description_pump_omnipod_dash">Integracja pompy dla Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Zakończ przypomnienie parowania</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Zakończ przypomnienie o konfiguracji</string>
+    <string name="omnipod_alert_expiration">Pod wkrótce straci ważność</string>
+    <string name="omnipod_alert_expiration_advisory">Pod wkrótce straci ważność</string>
+    <string name="omnipod_alert_shutdown_imminent">Wyłączenie jest nieuchronne</string>
+    <string name="omnipod_alert_low_reservoir">Niski poziom w zbiorniku</string>
+    <string name="omnipod_alert_unknown_alert">Nieznany alarm</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Ustawienie profilu podstawowego mogło się nie powieść. Podawanie mogło zostać zawieszone! Odśwież status Pod.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Ustawienie bazy tymczasowej mogło się nie powieść. Jeśli była już uruchomiona baza tymczasowa, to mogła zostać odwołana! Odśwież status Pod.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Ustawienie czasu mogło się nie powieść. Podawanie mogło zostać zawieszone! Odśwież status Pod.</string>
+    <string name="omnipod_bolus_failed_uncertain">Nie można sprawdzić, czy podano bolus. Upewnij się, że Twój Pod podaje bolus lub odwołaj go.</string>
+    <string name="omnipod_rl_stats">Statystyki RL</string>
+    <string name="omnipod_read_pulse_log_short">Logi pulsów omnipod</string>
+    <string name="comapareprofile">Porównaj profile</string>
+    <string name="nav_profilehelper">Pomocnik profilu</string>
+    <string name="motoldefaultprofile">Profil domyślny</string>
+    <string name="currentprofile">Bieżący profil</string>
+    <string name="availableprofile">Dostępny profil</string>
+    <string name="profiletype">Typ profilu</string>
+    <string name="formatwithtdd">Wiek: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwithweight">Wiek: %1$.0f Waga: %2$.0f kg</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0069fdc11a..b7cbff5ccf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1178,7 +1178,6 @@
     <string name="target_short">ALV</string>
     <string name="saveorresetchangesfirst">Guardar ou repor as alterações atuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil atual?</string>
-    <string name="copytolocalprofile">Criar novo perfil local a partir desta troca de perfil?</string>
     <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não foi enviado para o NS.</string>
     <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 211f12e032..fe8fa28420 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Clone</string>
     <string name="saveorresetchangesfirst">Guardar ou repor as alterações actuais primeiro</string>
     <string name="deletecurrentprofile">Eliminar perfil actual?</string>
-    <string name="copytolocalprofile">Criar novo perfil local a partir desta troca de perfil?</string>
+    <string name="copytolocalprofile">Criar novo perfil local a partir deste perfil?</string>
     <string name="profilenamecontainsdot">Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não é enviado para o NS.</string>
     <string name="low_mark_comment">Valor mais baixo da área de intervalo (apenas exibição)</string>
     <string name="high_mark_comment">Valor mais alto da área de intervalo (apenas exibição)</string>
@@ -1237,6 +1237,7 @@
     <string name="nav_survey">Questionário</string>
     <string name="invalidage">Entrada de idade inválida</string>
     <string name="invalidweight">Entrada de peso inválida</string>
+    <string name="invalidpct">Entrada % inválida</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Dentro: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Média</string>
     <string name="tir">TIR</string>
@@ -1405,6 +1406,15 @@
     <string name="omnipod_bolus_failed_uncertain">Não é possível verificar se o bólus foi bem-sucedido. Por favor, verifique se o Pod está administrar ou cancelar o bólus.</string>
     <string name="omnipod_rl_stats">Estatísticas RL</string>
     <string name="omnipod_read_pulse_log_short">Registo de Pulse</string>
-    <string name="comapareprofile">Comparar com o perfil atual</string>
+    <string name="comapareprofile">Comparar Perfis</string>
     <string name="nav_profilehelper">Assistente de Perfil</string>
+    <string name="motoldefaultprofile">Perfil Padrão</string>
+    <string name="currentprofile">Perfil Actual</string>
+    <string name="availableprofile">Perfil Disponível</string>
+    <string name="profiletype">Tipo de Perfil</string>
+    <string name="formatwithtdd">Idade: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Idade: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Idade: %1$.0f Peso: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% de basal</string>
+    <string name="dpvdefaultprofile">Perfil Padrão DPV</string>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 9d03121acf..d3db306fff 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1330,5 +1330,4 @@
     <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
     <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
     <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
-    <string name="comapareprofile">Comparați cu profilul curent</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 21cd13d98c..5e2010173c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1239,6 +1239,7 @@ Context | Edit Context</string>
     <string name="nav_survey">Опрос</string>
     <string name="invalidage">Некорректное значение возраст</string>
     <string name="invalidweight">Некорректное значение вес</string>
+    <string name="invalidpct">Некорректный ввод %</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Низкий: <b>%2$02d%%</b> В целевом диапазоне: <b>%3$02d%%</b> Высокий: <b>%4$02d%%</b>]]></string>
     <string name="average">Средний</string>
     <string name="tir">Время в целевом диапазоне TIR</string>
@@ -1407,6 +1408,15 @@ Context | Edit Context</string>
     <string name="omnipod_bolus_failed_uncertain">Не удалось проверить правильность подачи болюса. Убедитесь, что Pod подает болюс или отмените его.</string>
     <string name="omnipod_rl_stats">Статистика RL</string>
     <string name="omnipod_read_pulse_log_short">Журнал Pulse </string>
-    <string name="comapareprofile">Сравнить с текущим профилем</string>
+    <string name="comapareprofile">Сравнить профили</string>
     <string name="nav_profilehelper">Помощник профиля</string>
+    <string name="motoldefaultprofile">Профиль по умолчанию</string>
+    <string name="currentprofile">Текущий профиль</string>
+    <string name="availableprofile">Доступные профили</string>
+    <string name="profiletype">Тип профиля</string>
+    <string name="formatwithtdd">Возраст: %1$.0f Суточная Потребность: %2$.0f ед</string>
+    <string name="formatwittddandpct">Возраст: %1$.0f Суточная Потребность: %2$.0f ед %3$d%%</string>
+    <string name="formatwithweight">Возраст: %1$.0f Вес: %2$.0f кг</string>
+    <string name="basalpctfromtdd_label">% базального</string>
+    <string name="dpvdefaultprofile">Значение для профиля по умолчанию</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index f69759bce9..cc194deba5 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1223,7 +1223,7 @@
     <string name="clone_label">Klonovať</string>
     <string name="saveorresetchangesfirst">Najskôr uložte, alebo resetujte aktuálne zmeny</string>
     <string name="deletecurrentprofile">Zmazať aktuálny profil?</string>
-    <string name="copytolocalprofile">Chcete vytvoriť nový lokálny profil z tohto prepnutia profilu?</string>
+    <string name="copytolocalprofile">Vytvoriť z tohoto profilu nový lokálny profil?</string>
     <string name="profilenamecontainsdot">Názov profilu obsahuje bodky.\nToto nie je podporované v NS.\nProfil nebude prenesený do NS.</string>
     <string name="low_mark_comment">Spodná hodnota v oblasti cieľového rozsahu (iba zobrazovanie)</string>
     <string name="high_mark_comment">Horná hodnota v oblasti cieľového rozsahu (iba zobrazovanie)</string>
@@ -1405,6 +1405,12 @@
     <string name="omnipod_bolus_failed_uncertain">Nie je možné overiť, či bolo podávanie bolusu úspešné. Prosím overte, že váš Pod podáva bolus, alebo zrušte bolus.</string>
     <string name="omnipod_rl_stats">Štatistiky RL</string>
     <string name="omnipod_read_pulse_log_short">Pulse Log</string>
-    <string name="comapareprofile">Porovnať s aktuálnym profilom</string>
+    <string name="comapareprofile">Porovnať profily</string>
     <string name="nav_profilehelper">Pomocník s profilom</string>
+    <string name="motoldefaultprofile">Predvolený profil</string>
+    <string name="currentprofile">Aktuálny profil</string>
+    <string name="availableprofile">Dostupný profil</string>
+    <string name="profiletype">Typ profilu</string>
+    <string name="formatwithtdd">Vek: %1$.0f CDD: %2$.0f U</string>
+    <string name="formatwithweight">Vek: %1$.0f Hmotnosť: %2$.0f kg</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b039d62802..9865cdb1e5 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1224,7 +1224,6 @@ Eversense-appen.</string>
     <string name="clone_label">Kopiera</string>
     <string name="saveorresetchangesfirst">Spara eller återställa aktuella ändringar först</string>
     <string name="deletecurrentprofile">Ta bort aktuell profil?</string>
-    <string name="copytolocalprofile">Vill du skapa en ny lokal profil från detta profilbyte?</string>
     <string name="profilenamecontainsdot">Profilnamnet innehåller punkter.\nDetta stöds inte av NS.\nProfil överförs inte till NS.</string>
     <string name="low_mark_comment">Nedre värdet för målområde (endast visning)</string>
     <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
@@ -1406,6 +1405,5 @@ Eversense-appen.</string>
     <string name="omnipod_bolus_failed_uncertain">Det går inte att verifiera om bolusen är slutförd. Verifiera att din pod leverarar bolus eller avsluta bolus.</string>
     <string name="omnipod_rl_stats">RL-statistik</string>
     <string name="omnipod_read_pulse_log_short">Pulslogg</string>
-    <string name="comapareprofile">Jämför med aktuell profil</string>
     <string name="nav_profilehelper">Profilguide</string>
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 1dc39354e4..c5dd9b89d9 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -122,8 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dмин</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ</b> Въгл: <b>%5$.0fгр</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка на КЗ</string>
     <string name="careportal_announcement">Известие</string>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index df2937d30b..b43fd3aa13 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d minut</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU(%5$.0f%%)</b> Sach.: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámení</string>
@@ -161,7 +163,7 @@
     <string name="waitingforpumpresult">Čekání na výsledek</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Požadováno %d g dodatečných sacharidů během %d minut</string>
+    <string name="carbsreq">Požadováno dalších %d g sacharidů během %d minut</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistiky</string>
     <string name="cumulative_tdd">Kumulativní CDD</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 98874eda3d..36897e9551 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d Min.</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> KH: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fIE(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fIE(%5$.0f%%)</b> KH: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BZ-Test</string>
     <string name="careportal_announcement">Ankündigung</string>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index c03b8581ab..84c0484cdc 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -122,8 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Carbs: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Medir glucosa</string>
     <string name="careportal_announcement">Aviso</string>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index bf1a679de7..969fa4cf78 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Gluc.: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> Gluc.: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Contrôle Glycémie</string>
     <string name="careportal_announcement">Notification</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 3f5fc68692..2f1699b202 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> CHO: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boli: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> CHO: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Controllo BG</string>
     <string name="careportal_announcement">Avviso</string>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index 543eb2f728..8ea2f2ec90 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Baz: <b>%4$.2fU</b> AV: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boluso: <b>%3$.2fU</b> Bazės: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Boluso: <b>%3$.2fU</b> Bazės: <b>%4$.2fU(%5$.0f%%)</b> AV: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">KG testas</string>
     <string name="careportal_announcement">Pranešimas</string>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index 43fb4ec971..ad245b7265 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -122,8 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fE</b> Bol: <b>%3$.2fE</b> Bas: <b>%4$.2fE</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fE</b> Bol: <b>%3$.2fE</b> Bas: <b>%4$.2fE</b> Khd: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG Controle</string>
     <string name="careportal_announcement">Mededeling</string>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 7693dc81f4..1973c05caa 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -20,6 +20,7 @@
     <string name="androidaps_start">AndroidAPS uruchomiony</string>
     <string name="formatinsulinunits">%1$.2fU</string>
     <string name="reservoirvalue">%1$.0f / %2$d U</string>
+    <string name="pump_basebasalrate">%1$.2fJ/g</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d min.</string>
     <string name="format_mins_short">%1$dm</string>
@@ -38,10 +39,61 @@
     <string name="noprofileset">NIE USTAWIONO PROFILU</string>
     <string name="date">Data</string>
     <string name="units_label">Jednostki</string>
+    <string name="dia_label">DIA</string>
+    <string name="ic_label">IC</string>
+    <string name="isf_label">ISF</string>
+    <string name="basal_label">Baza</string>
+    <string name="target_label">Cel</string>
+    <string name="initializing">Inicjuje ...</string>
+    <string name="serialnumber">Numer seryjny</string>
+    <string name="battery_label">Bateria</string>
+    <string name="lastconnection_label">Ostatnie połączenie</string>
+    <string name="lastbolus_label">Ostatni bolus</string>
+    <string name="dailyunits">Jednostki dzienne</string>
+    <string name="basebasalrate_label">Podstawowa dawka bazowa</string>
+    <string name="tempbasal_label">Baza tymczasowa</string>
+    <string name="virtualpump_extendedbolus_label">Bolus Przedłużony</string>
+    <string name="reservoir_label">Zbiornik</string>
+    <string name="pumphistory">Historia pompy</string>
+    <string name="viewprofile">Zobacz profil</string>
+    <string name="eventtype">Typ zdarzenia</string>
+    <string name="mgdl">mg/dl</string>
+    <string name="mmol">mmol/l</string>
+    <string name="advancedsettings_title">Ustawienia zaawansowane</string>
+    <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Wyłącza bluetooth telefonu na jedną sekundę, jeśli nie jest możliwe połączenie z pompą. Może to pomóc w niektórych telefonach, w których blokuje się bluetooth.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Ograniczam maks. dawkę bazową do %1$.2f U/h z uwagi na %2$s</string>
+    <string name="pumplimit">ograniczenie pompy</string>
+    <string name="limitingpercentrate">Ograniczam maksymalną wartość w procentach do %1$d%% z uwagi na %2$s</string>
+    <string name="itmustbepositivevalue">wartość musi być dodatnia</string>
+    <string name="limitingbolus">Ograniczam bolus do %1$.1f U z uwagi na %2$s</string>
+    <string name="pumpNotInitializedProfileNotSet">Pompa nie zainicjowana, profil nie ustawiony!</string>
     <!--    Dialogs-->
+    <string name="confirmation">Potwierdzenie</string>
+    <string name="message">Wiadomość</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Anuluj</string>
+    <string name="dismiss">ODRZUĆ</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">Bluetooth Low Energy nie jest obsługiwany.</string>
+    <string name="ble_not_enabled">Bluetooth nie jest włączony.</string>
+    <string name="location_not_found_title">Lokalizacja nie jest włączona</string>
+    <string name="location_not_found_message">Aby uruchomić odnajdywanie Bluetooth na nowszych urządzeniach, lokalizacja musi być uruchomiona. AAPS nie śledzi twojej lokalizacji więc po udanym parowaniu urządzenia Bluetooth można wyłączyć lokalizację.</string>
     <!--    DateUtil-->
+    <string name="minago">%1$dmin temu</string>
+    <string name="hoursago">%1$.1fh temu</string>
+    <string name="shorthour">h</string>
+    <string name="days">dni</string>
+    <string name="hours">godzin</string>
+    <string name="unit_second">sekunda</string>
+    <string name="unit_minute">minuta</string>
+    <string name="unit_hour">godzina</string>
+    <string name="unit_day">dzień</string>
+    <string name="unit_week">tydzień</string>
+    <string name="unit_seconds">sekund</string>
+    <string name="unit_minutes">minut</string>
     <string name="unit_hours">godzin</string>
     <string name="unit_days">dni</string>
     <string name="unit_weeks">tygodni</string>
@@ -68,6 +120,7 @@
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Nieprawidłowy profil: %1$s</string>
     <!--    Temptarget-->
+    <string name="mins">%1$dmin</string>
     <!--    TDD-->
     <!--    Translator-->
     <string name="careportal_bgcheck">Sprawdź BG</string>
@@ -101,7 +154,28 @@
     <string name="enacted">Wykonane</string>
     <string name="comment">Komentarz</string>
     <string name="success">Sukces</string>
+    <string name="percent">Procent</string>
+    <string name="absolute">Całkowity</string>
+    <string name="configbuilder_insulin">Insulina</string>
+    <string name="insulin_unit_shortname">U</string>
+    <string name="waitingforpumpresult">Oczekiwanie na wynik</string>
+    <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">Zalecane podanie %dg węglowodanów w przeciągu %d minut</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statystyki</string>
+    <string name="cumulative_tdd">Kumulatywna TDD (dawka dzienna)</string>
+    <string name="expweight">Ważona wykładniczo TDD</string>
+    <string name="basalrate">Baza</string>
+    <string name="bolus">Bolus</string>
+    <string name="tdd">TDD</string>
+    <string name="ratio">Stosunek</string>
+    <string name="amount_days"># Dni</string>
+    <string name="weight">Waga</string>
+    <string name="warning_Message">Możliwa niedokładność jeśli używasz bolusów do wypełnień!</string>
+    <string name="olddata_Message">Stare dane, naciśnij \"RELOAD\"</string>
+    <string name="tbb">Suma dzienna bazy (TBB)</string>
+    <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Wykrywanie czasu</string>
 </resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 6695a167f1..6f9016efbb 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Hidratos: <b>%5$.0fg</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU(%5$.0f%%)</b> Hidratos: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Verificar Glic</string>
     <string name="careportal_announcement">Anúncio</string>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index 137123324c..dd088ac088 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -101,8 +101,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU</b> Carb: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Verificare glicemie</string>
     <string name="careportal_announcement">Anunț</string>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 8a89ad5e3d..8f23ae951f 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -122,8 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$d мин</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2fед</b>бол:<b>%3$.2fед</b>баз:<b>%4$.2fед</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s</b>∑:<b>%2$.2fед</b>бол:<b>%3$.2fед</b>баз:<b>%4$.2fед</b>гу:<b>%5$.0fг</b>]]></string>
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fед</b>Бол:<b>%3$.2fед</b> Баз: <b>%4$.2fед(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s</b>∑: <b>%2$.2fU</b> Бол: <b>%3$.2fед</b> Баз: <b>%4$.2fед(%5$.0f%%)</b> ГУ: <b>%6$.0fг</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка ГК</string>
     <string name="careportal_announcement">Оовещение</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 641f005b3c..6d94bd4433 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -122,8 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> Sach: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámenie</string>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index 28f5c83b0a..f3e17082d4 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -122,8 +122,6 @@
     <!--    Temptarget-->
     <string name="mins">%1$d min</string>
     <!--    TDD-->
-    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b>]]></string>
-    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bol: <b>%3$.2fU</b> Bas: <b>%4$.2fU</b> KH: <b>%5$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">BG-kontroll</string>
     <string name="careportal_announcement">Meddelande</string>
diff --git a/dana/src/main/res/values-pl-rPL/strings.xml b/dana/src/main/res/values-pl-rPL/strings.xml
index 3ea04e700d..9f84c6cd35 100644
--- a/dana/src/main/res/values-pl-rPL/strings.xml
+++ b/dana/src/main/res/values-pl-rPL/strings.xml
@@ -1,2 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="danars_pairing">Parowanie</string>
+    <string name="danars_nodeviceavailable">Urządzenie nie zostało znalezione do tej pory</string>
+    <string name="danars_pairingok">Parowanie OK</string>
+    <string name="danars_pairingtimedout">Przekroczono limit czasu parowania</string>
+    <string name="danars_waitingforpairing">Oczekiwanie na pompę na sparowanie</string>
+    <string name="danarspump">DanaRS</string>
+    <string name="danarspump_shortname">Dana</string>
+    <string name="description_pump_dana_rs">Integracja z pompą DANA RS Diabecare</string>
+    <string name="maxbolusviolation">Przekroczenie ograniczenia maks. bolusa</string>
+    <string name="commanderror">Błąd polecenia</string>
+    <string name="speederror">Błąd prędkości</string>
+    <string name="insulinlimitviolation">Przekroczono limit insuliny</string>
+    <string name="boluserrorcode">Zadano: %1$.2fU Dostarczono: %2$.2fU Kod błędu: %3$s</string>
+    <string name="danar_valuenotsetproperly">Wartość ustawiona nieprawidłowo</string>
+    <string name="danar_setbasalstep001">Ustaw krok bazy na 0.01 U/h</string>
+    <string name="resetpairing">Zresetować sparowanie?</string>
+    <string name="dana_model">%1$s\nModel: %2$02X\nProtokół: %3$02X\nKod: %4$02X</string>
+    <string name="processinghistory">Przetwarzanie zdarzenia</string>
+    <string name="danar_enableextendedbolus">Uaktywnij bolusy przedłużone w pompie</string>
+    <string name="overview_bolusprogress_delivered">Dostarczone</string>
+    <string name="overview_bolusprogress_stoped">Zatrzymane</string>
+    <string name="unsupportedfirmware">Nieobsługiwane oprogramowanie pompy</string>
+    <string name="pumperror">Błąd pompy</string>
+    <string name="lowbattery">Niski stan baterii</string>
+    <string name="basalcompare">Dostarczanie mniej niż wstępnie ustawiona baza</string>
+    <string name="pumpshutdown">Wyłączenie pompy</string>
+    <string name="batterydischarged">Bateria pompy rozładowana</string>
+    <string name="occlusion">Zatkanie</string>
+    <string name="emptyreservoir">Pusty zasobnik</string>
+    <string name="checkshaft">Sprawdź śrubę tłoka</string>
+    <string name="basalmax">Max dawka bazowa</string>
+    <string name="dailymax">Limit dzienny</string>
+    <string name="bloodsugarmeasurementalert">Alarm pomiaru poziomu cukru</string>
+    <string name="remaininsulinalert">Pozostała ilość insuliny</string>
+    <string name="missedbolus">Pominięty bolus</string>
+    <string name="invalidpairing">Niepoprawne informacje o parowaniu. Żądanie nowego parowania</string>
+    <string name="gettingpumpstatus">Uzyskiwanie statusu pompy</string>
+    <string name="gettingextendedbolusstatus">Status otrzymywania bolusa przedłużonego</string>
+    <string name="gettingbolusstatus">Status otrzymywania bolusa</string>
+    <string name="gettingtempbasalstatus">Status otrzymywania tymczasowej bazy</string>
+    <string name="gettingpumpsettings">Otrzymywanie ustawień pompy</string>
+    <string name="gettingpumptime">Otrzymywanie czasu pompy</string>
+    <string name="largetimedifftitle">Duża Różnica Czasu</string>
+    <string name="largetimediff">Duża różnica czasu:\nCzas w pompie jest wyłączony przez więcej niż 1,5 godziny.\n. Ustaw czas ręcznie na pompie i upewnij się, że odczyt historii pompy nie powoduje błędu.\nJeśli to możliwe, usuń historię z pompy przed zmianą czasu lub wyłącz pętlę zamkniętą do jednego DIA po ostatnim nieprawidłowym wpisie dziennika, ale co najmniej jeden DIA od teraz.</string>
+    <string name="pairfirst">Proszę sparować swoją pompę z telefonem!</string>
+    <string name="approachingdailylimit">Zbliżam się do dziennego limitu insuliny</string>
+    <string name="startingbolus">Rozpoczynam podawanie bolusa</string>
+    <string name="waitingforestimatedbolusend">Oczekuję na zakończenie bolusa. Pozostało %1$d sec.</string>
+    <string name="stoppingtempbasal">Zatrzymywanie bazy tymczasowej</string>
+    <string name="settingextendedbolus">Ustawianie bolusa przedłużonego</string>
+    <string name="stoppingextendedbolus">Zatrzymywanie bolusa przedłużonego</string>
+    <string name="updatingbasalrates">Uaktualnianie dawek bazowych</string>
+    <string name="settingtempbasal">Ustawianie bazy tymczasowej</string>
+    <string name="waitingfortimesynchronization">Oczekiwanie na synchronizację czasu (%1$d sec)</string>
+    <string name="wrongpassword">Złe hasło</string>
+    <string name="wrongpumppassword">Błędne hasło pompy!</string>
+    <string name="danar_history_alarm">Alarmy</string>
+    <string name="danar_history_basalhours">Godziny Bazy</string>
+    <string name="danar_history_bolus">Bolusy</string>
+    <string name="danar_history_carbohydrates">Węglowodany</string>
+    <string name="danar_history_dailyinsulin">Insulina dzienna</string>
+    <string name="danar_history_errors">Błędy</string>
+    <string name="danar_history_glucose">Glukoza</string>
+    <string name="danar_history_refill">Napełnij</string>
+    <string name="danar_history_syspend">Wstrzymaj</string>
+    <string name="danar_history_prime">Wypełnianie</string>
+    <string name="danar_useroptions">Ustawienia użytkownika</string>
+    <string name="danar_timedisplay">Format wyświetlanego czasu</string>
+    <string name="danar_buttonscroll">Przycisk przewijania</string>
+    <string name="danar_beep">Dźwięk po przyciśnięciu przycisku</string>
+    <string name="danar_pumpalarm">Alarm</string>
+    <string name="danar_pumpalarm_sound">Dźwięk</string>
+    <string name="danar_pumpalarm_vibrate">Wibracja</string>
+    <string name="danar_pumpalarm_both">Obie opcje</string>
+    <string name="danar_screentimeout">LCD na czas [sekund]</string>
+    <string name="danar_backlight">Podświetlenie na czas [sekund]</string>
+    <string name="danar_glucoseunits">Jednostki glukozy</string>
+    <string name="danar_shutdown">Wyłączenie [godzin]</string>
+    <string name="danar_lowreservoir">Niska zawartość zbiornika [Jednostki]</string>
+    <string name="danar_saveuseroptions">Zapisz ustawienia w pompie</string>
+    <string name="description_pump_dana_r">Integracja z pompą DANA R Diabecare</string>
+    <string name="description_pump_dana_r_korean">Integracja z pompą DANA R Diabetes, wersja koreańska</string>
+    <string name="description_pump_dana_r_v2">Integracja z pompą DANA R Diabecare z oprogramowaniem v2</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="nobtadapter">Nie odnaleziono urządzenia bluetooth</string>
+    <string name="devicenotfound">Nie odnaleziono wybranego urządzenia</string>
+    <string name="danar_switchtouhmode">Zmień tryb z U/d na U/h w pompie</string>
+    <string name="danarkoreanpump">DanaR wersja Koreańska</string>
+    <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Poprawiono sterownik pompy</string>
+    <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Wyłącz tryb EasyUI w pompie</string>
+    <string name="profile_set_failed">Ustawienie profilu bazy nie powiodło się</string>
+    <string name="danar_bluetooth_status">Status Bluetooth</string>
+    <string name="danar_iob_label">IOB w pompie</string>
+    <string name="basal_step">Krok bazy</string>
+    <string name="bolus_step">Krok bolusa</string>
+    <string name="virtualpump_firmware_label">Firmware</string>
+    <string name="danar_pump_settings">Ustawienia pompy Dana</string>
+    <string name="timeformat12h">12h</string>
+    <string name="timeformat24h">24h</string>
+    <string name="option_on">Włącz</string>
+    <string name="option_off">Wyłącz</string>
+    <string name="danar_bt_name_title">Urządzenie Bluetooth DanaR</string>
+    <string name="danars_password_title">Hasło pompy (tylko v1)</string>
+    <string name="danar_password_title">Hasło pompy</string>
+    <string name="danar_useextended_title">Używaj przedłużonych bolusów dla &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Wizualizacja bolusa przedłużonego jako %%</string>
+    <string name="bolusspeed">Szybkość podawania bolusa</string>
+    <string name="selectedpump">Wybrana pompa</string>
+    <string name="rs_loginsulinchange_title">Zapisz zmianę zbiorniczka</string>
+    <string name="rs_loginsulinchange_summary">Dodaj zdarzenie \"Zmiana zasobnika insuliny\" do portalu opieki Nightscout, gdy wykryto je w historii pompy</string>
+    <string name="rs_logcanulachange_title">Zapisz zmianę wkłucia</string>
+    <string name="rs_logcanulachange_summary">Dodaj zdarzenie \"Zmiana miejsca wkłucia\" do portalu opieki Nightscout, gdy wykryto je w historii pompy</string>
+    <string name="pin1">PIN1</string>
+    <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Naciśnij OK na pompie\ni wpisz 2 wyświetlone numery\nUtrzymuj wyświetlacz pompy włączony poprzez naciskanie przycisku minus, aż do momentu zakończenia przepisywania kodu.</string>
+    <string name="num1pin">1: (12 cyfr)</string>
+    <string name="num2pin">2: (8 cyfr)</string>
+</resources>

From 05eee2ebb9cdb423b8a4b1868e0cdc6dff70a0ee Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 20 Jul 2020 13:28:07 +0200
Subject: [PATCH 341/400] fix user message time

---
 .../general/overview/notifications/NotificationUserMessage.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt
index 3d198dfc0b..43a2094ef0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/NotificationUserMessage.kt
@@ -6,6 +6,7 @@ class NotificationUserMessage  (text :String): Notification() {
         var hash = text.hashCode()
         if (hash < USERMESSAGE) hash += USERMESSAGE
         id = hash
+        date = System.currentTimeMillis()
         this.text = text
         level = URGENT
     }

From 38e2ae90d8e10ed62f599a79ce01fab439cf3224 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 20 Jul 2020 15:09:01 +0200
Subject: [PATCH 342/400] fix parsing RS password

---
 .../java/info/nightscout/androidaps/danars/services/BLEComm.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index e3e0bc4db0..1e0e5f088b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -554,7 +554,7 @@ class BLEComm @Inject internal constructor(
             val size = decryptedBuffer.size
             var pass: Int = (decryptedBuffer[size - 1].toInt() and 0x000000FF shl 8) + (decryptedBuffer[size - 2].toInt() and 0x000000FF)
             pass = pass xor 3463
-            danaPump.rsPassword = Integer.toHexString(pass)
+            danaPump.rsPassword = String.format("%04X", pass)
             aapsLogger.debug(LTag.PUMPBTCOMM, "Pump user password: " + danaPump.rsPassword)
             if (!danaPump.isRSPasswordOK) {
                 aapsLogger.error(LTag.PUMPBTCOMM, "Wrong pump password")

From 74ca36bb6e5803d99f9b243bb4c099e507a29433 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 21 Jul 2020 22:14:46 +0200
Subject: [PATCH 343/400] fix NPE

---
 .../general/maintenance/MaintenancePlugin.kt  | 44 +++++++++----------
 .../androidaps/db/CareportalEvent.java        |  1 +
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
index 9377b58992..86b1e71db6 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenancePlugin.kt
@@ -63,31 +63,31 @@ class MaintenancePlugin @Inject constructor(
     }
 
     //todo replace this with a call on startup of the application, specifically to remove
-// unnecessary garbage from the log exports
+    // unnecessary garbage from the log exports
     fun deleteLogs() {
-        val logDirectory = LoggerUtils.getLogDirectory()
-        val logDir = File(logDirectory)
-        val files = logDir.listFiles { _: File?, name: String ->
-            (name.startsWith("AndroidAPS")
-                && name.endsWith(".zip"))
-        }
-        Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
-        var delFiles = listOf(*files)
-        val amount = sp.getInt(R.string.key_logshipper_amount, 2)
-        val keepIndex = amount - 1
-        if (keepIndex < delFiles.size) {
-            delFiles = delFiles.subList(keepIndex, delFiles.size)
-            for (file in delFiles) {
-                file.delete()
+        LoggerUtils.getLogDirectory()?.let { logDirectory ->
+            val logDir = File(logDirectory)
+            val files = logDir.listFiles { _: File?, name: String ->
+                (name.startsWith("AndroidAPS") && name.endsWith(".zip"))
             }
-        }
-        val exportDir = File(logDirectory, "exports")
-        if (exportDir.exists()) {
-            val expFiles = exportDir.listFiles()
-            for (file in expFiles) {
-                file.delete()
+            Arrays.sort(files) { f1: File, f2: File -> f1.name.compareTo(f2.name) }
+            var delFiles = listOf(*files)
+            val amount = sp.getInt(R.string.key_logshipper_amount, 2)
+            val keepIndex = amount - 1
+            if (keepIndex < delFiles.size) {
+                delFiles = delFiles.subList(keepIndex, delFiles.size)
+                for (file in delFiles) {
+                    file.delete()
+                }
+            }
+            val exportDir = File(logDirectory, "exports")
+            if (exportDir.exists()) {
+                val expFiles = exportDir.listFiles()
+                for (file in expFiles) {
+                    file.delete()
+                }
+                exportDir.delete()
             }
-            exportDir.delete()
         }
     }
 
diff --git a/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
index 1300d0bbf9..80a72ada37 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/CareportalEvent.java
@@ -88,6 +88,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
     }
 
     public CareportalEvent(NSMbg mbg) {
+        this();
         date = mbg.date;
         eventType = MBG;
         json = mbg.json;

From 66a19cce229ea06794e58ff29b85199579ef4671 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 21 Jul 2020 22:24:13 +0200
Subject: [PATCH 344/400] remove unneeded variable

---
 .../plugins/sensitivity/AbstractSensitivityPlugin.kt        | 3 +--
 .../plugins/sensitivity/SensitivityAAPSPlugin.java          | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
index ced1bcd888..420451050b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
@@ -20,8 +20,7 @@ abstract class AbstractSensitivityPlugin(
     pluginDescription: PluginDescription,
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
-    resourceHelper:
-    ResourceHelper,
+    resourceHelper: ResourceHelper,
     val sp: SP
 ) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface {
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
index fc527bab94..9f81d9306e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityAAPSPlugin.java
@@ -36,7 +36,6 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 @Singleton
 public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
 
-    private SP sp;
     private ProfileFunction profileFunction;
     private DateUtil dateUtil;
 
@@ -57,7 +56,6 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
                         .description(R.string.description_sensitivity_aaps),
                 injector, aapsLogger, resourceHelper, sp
         );
-        this.sp = sp;
         this.profileFunction = profileFunction;
         this.dateUtil = dateUtil;
     }
@@ -66,12 +64,12 @@ public class SensitivityAAPSPlugin extends AbstractSensitivityPlugin {
     public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
         LongSparseArray<AutosensData> autosensDataTable = iobCobCalculatorPlugin.getAutosensDataTable();
 
-        String age = sp.getString(R.string.key_age, "");
+        String age = getSp().getString(R.string.key_age, "");
         int defaultHours = 24;
         if (age.equals(getResourceHelper().gs(R.string.key_adult))) defaultHours = 24;
         if (age.equals(getResourceHelper().gs(R.string.key_teenage))) defaultHours = 4;
         if (age.equals(getResourceHelper().gs(R.string.key_child))) defaultHours = 4;
-        int hoursForDetection = sp.getInt(R.string.key_openapsama_autosens_period, defaultHours);
+        int hoursForDetection = getSp().getInt(R.string.key_openapsama_autosens_period, defaultHours);
 
         Profile profile = profileFunction.getProfile();
 

From e04f029cc2c1ac0ae6b4782f824854cdfa11c93c Mon Sep 17 00:00:00 2001
From: robinsondan87 <robinsondan87@gmail.com>
Date: Wed, 22 Jul 2020 21:12:37 +0100
Subject: [PATCH 345/400] Update README.md

Update Wiki location to correct URL
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ae885da9fe..f762852a96 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # AndroidAPS
 
-* Check the wiki: http://wiki.androidaps.org
+* Check the wiki: https://androidaps.readthedocs.io
 *  Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
 
 [![Gitter](https://badges.gitter.im/MilosKozak/AndroidAPS.svg)](https://gitter.im/MilosKozak/AndroidAPS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

From 4068cd72ca0816146ffb636b63eba1bb7856480e Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Thu, 23 Jul 2020 12:59:42 +0200
Subject: [PATCH 346/400] Fix crash when preferences import list is opened for
 the second time (due to buggy implementation of ActivityResult and Contracts
 in early androidx)

* updated to newest version of fragments where bug is fixed
* catched exception and inform user with Toast
* refactor duplicated code in ImportExportPrefs
---
 app/build.gradle                                |  1 +
 .../general/maintenance/ImportExportPrefs.kt    | 17 ++++++++++-------
 build.gradle                                    |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8b9a0adc36..5e822b11cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -257,6 +257,7 @@ dependencies {
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.activity:activity-ktx:${activityVersion}"
+    implementation "androidx.fragment:fragment:${fragmentVersion}"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0'
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index 565b33b77b..b839e31bef 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -215,12 +215,7 @@ class ImportExportPrefs @Inject constructor(
 
     fun importSharedPreferences(fragment: Fragment) {
         fragment.activity?.let { fragmentAct ->
-            val callForPrefFile = fragmentAct.registerForActivityResult(PrefsFileContract()) {
-                it?.let {
-                    importSharedPreferences(fragmentAct, it)
-                }
-            }
-            callForPrefFile.launch(null)
+            importSharedPreferences(fragmentAct)
         }
     }
 
@@ -230,7 +225,15 @@ class ImportExportPrefs @Inject constructor(
                 importSharedPreferences(activity, it)
             }
         }
-        callForPrefFile.launch(null)
+
+        try {
+            callForPrefFile.launch(null)
+        } catch (e: IllegalArgumentException) {
+            // this exception happens on some early implementations of ActivityResult contracts
+            // when registered and called for the second time
+            ToastUtils.errorToast(activity, "Please go back to main screen and try again.")
+            log.error(TAG, "Internal android framework exception", e)
+        }
     }
 
     private fun importSharedPreferences(activity: Activity, importFile: PrefsFile) {
diff --git a/build.gradle b/build.gradle
index acf667df6d..89449cca58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         dagger_version = '2.28.1'
         coroutinesVersion = '1.3.7'
         activityVersion = '1.2.0-alpha06'
+        fragmentVersion = '1.3.0-alpha07'
         ormLiteVersion = "4.46"
     }
     repositories {

From 3d0c214f4433bc14b1c7670dcad5cedfdf0e154f Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Thu, 23 Jul 2020 13:33:15 +0200
Subject: [PATCH 347/400] Fix crash when user insist on exporting preferences
 while denying granting storage permission

* Handles IO errors and display toast about FS / permission errors
* Clarify text - storage permissions are needed not only for logs, but for export too
---
 .../plugins/general/maintenance/ImportExportPrefs.kt  | 11 +++++++++++
 app/src/main/res/values/strings.xml                   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index b839e31bef..f506abd0b8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -209,6 +209,17 @@ class ImportExportPrefs @Inject constructor(
             } catch (e: IOException) {
                 ToastUtils.errorToast(activity, e.message)
                 log.error(TAG, "Unhandled exception", e)
+            } catch (e: PrefFileNotFoundError) {
+                ToastUtils.Long.errorToast(activity, resourceHelper.gs(R.string.preferences_export_canceled)
+                    + "\n\n" + resourceHelper.gs(R.string.filenotfound)
+                    + ": " + e.message
+                    + "\n\n" + resourceHelper.gs(R.string.needstoragepermission))
+                log.error(TAG, "File system exception", e)
+            } catch (e: PrefIOError) {
+                ToastUtils.Long.errorToast(activity, resourceHelper.gs(R.string.preferences_export_canceled)
+                    + "\n\n" + resourceHelper.gs(R.string.needstoragepermission)
+                    + ": " + e.message)
+                log.error(TAG, "File system exception", e)
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1455826e4..c3c4e4e362 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -950,7 +950,7 @@
     <string name="askforpermission">Ask for permission</string>
     <string name="needsystemwindowpermission">Application needs system window permission for notifications</string>
     <string name="needlocationpermission">Application needs location permission for BT scan and WiFi identification</string>
-    <string name="needstoragepermission">Application needs storage permission to be able store log files</string>
+    <string name="needstoragepermission">Application needs storage permission to be able store log files and export settings</string>
     <string name="request">Request</string>
     <string name="insulinsourcesetup">Configure Insulin plugin</string>
     <string name="exit">Exit</string>

From 310c0b91379b42b9865511fc2538649662e017c3 Mon Sep 17 00:00:00 2001
From: Dominik Dzienia <dlvoy@users.noreply.github.com>
Date: Thu, 23 Jul 2020 13:41:14 +0200
Subject: [PATCH 348/400] Refactor hardcoded error messages to be translatable

---
 .../plugins/general/maintenance/ImportExportPrefs.kt          | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
index f506abd0b8..d90de7a086 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefs.kt
@@ -242,7 +242,7 @@ class ImportExportPrefs @Inject constructor(
         } catch (e: IllegalArgumentException) {
             // this exception happens on some early implementations of ActivityResult contracts
             // when registered and called for the second time
-            ToastUtils.errorToast(activity, "Please go back to main screen and try again.")
+            ToastUtils.errorToast(activity, resourceHelper.gs(R.string.goto_main_try_again))
             log.error(TAG, "Internal android framework exception", e)
         }
     }
@@ -281,7 +281,7 @@ class ImportExportPrefs @Inject constructor(
                         restartAppAfterImport(activity)
                     } else {
                         // for impossible imports it should not be called
-                        ToastUtils.errorToast(activity, "Cannot import preferences!")
+                        ToastUtils.errorToast(activity, resourceHelper.gs(R.string.preferences_import_impossible))
                     }
                 })
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3c4e4e362..644c7099aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,6 +206,8 @@
     <string name="password_preferences_decrypt_prompt">You will be asked for master password, which is needed to decrypt imported preferences.</string>
     <string name="preferences_export_canceled">Export canceled! Preferences were NOT exported!</string>
     <string name="preferences_import_canceled">Import canceled! Preferences were NOT imported!</string>
+    <string name="preferences_import_impossible">Cannot import preferences!</string>
+    <string name="goto_main_try_again">Please go back to main screen and try again.</string>
 
     <string name="preferences_import_list_title">Select file to import</string>
 

From c94452441fe6f18196fcd78d4f9bdeff5b9c7b1c Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 24 Jul 2020 01:10:16 +0200
Subject: [PATCH 349/400] New Line between each target in Compare Profile

---
 .../info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
index 9b642d1c53..45feff463c 100644
--- a/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
+++ b/core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
@@ -124,7 +124,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
                     profileview_ic.text = ics(profile1, profile2)
                     profileview_isf.text = isfs(profile1, profile2)
                     profileview_basal.text = basals(profile1, profile2)
-                    profileview_target.text = HtmlHelper.fromHtml(formatColors("", profile1.targetList + "<br>", profile2.targetList, ""))
+                    profileview_target.text = HtmlHelper.fromHtml(formatColors("", profile1.targetList.replace("\n","<br>") + "<br>", profile2.targetList.replace("\n","<br>"), ""))
                     basal_graph.show(profile1, profile2)
                 }
 

From 0a6cd80257311cfe42eb9488f6653628fe231872 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 07:47:54 +0200
Subject: [PATCH 350/400] fix keepalive

---
 .../info/nightscout/androidaps/receivers/KeepAliveReceiver.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
index b6705ac733..bd532dc462 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.kt
@@ -46,7 +46,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
     companion object {
         private val KEEP_ALIVE_MILLISECONDS = T.mins(5).msecs()
         private val STATUS_UPDATE_FREQUENCY = T.mins(15).msecs()
-        private val IOB_UPDATE_FREQUENCY = T.mins(5).msecs()
+        private val IOB_UPDATE_FREQUENCY_IN_MINS = 5L
 
         private var lastReadStatus: Long = 0
         private var lastRun: Long = 0
@@ -108,7 +108,7 @@ class KeepAliveReceiver : DaggerBroadcastReceiver() {
         else if (!loopPlugin.isEnabled() || iobCobCalculatorPlugin.actualBg() == null)
             shouldUploadStatus = true
         else if (DateUtil.isOlderThan(activePlugin.activeAPS.lastAPSRun, 5)) shouldUploadStatus = true
-        if (DateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY) && shouldUploadStatus) {
+        if (DateUtil.isOlderThan(lastIobUpload, IOB_UPDATE_FREQUENCY_IN_MINS) && shouldUploadStatus) {
             lastIobUpload = DateUtil.now()
             nsUpload.uploadDeviceStatus(loopPlugin, iobCobCalculatorPlugin, profileFunction, activePlugin.activePump, receiverStatusStore, BuildConfig.VERSION_NAME + "-" + BuildConfig.BUILDVERSION)
         }

From 6b676a1dfdacc8a1f8f4459befe640705c441eca Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 10:18:19 +0200
Subject: [PATCH 351/400] prevent NPE

---
 .../java/info/nightscout/androidaps/dialogs/WizardDialog.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index 23ddfcabd1..faf27af7b7 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -261,7 +261,7 @@ class WizardDialog : DaggerDialogFragment() {
 
     private fun calculateInsulin() {
         val profileStore = activePlugin.activeProfileInterface.profile
-        if (treatments_wizard_profile.selectedItem == null || profileStore == null)
+        if (treatments_wizard_profile?.selectedItem == null || profileStore == null)
             return  // not initialized yet
         var profileName = treatments_wizard_profile.selectedItem.toString()
         val specificProfile: Profile?

From d51a7c9461d33781411469d2d999773925628fcb Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 12:39:18 +0200
Subject: [PATCH 352/400] scheduleBgHistoryChange

---
 .../androidaps/db/DatabaseHelper.java         | 27 +++++++++++++++++--
 .../IobCobCalculatorPlugin.java               |  5 +++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 4d4c52df43..7ba9957ed8 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -97,6 +97,10 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static final ScheduledExecutorService bgWorker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledBgPost = null;
 
+    private static final ScheduledExecutorService bgHistoryWorker = Executors.newSingleThreadScheduledExecutor();
+    private static ScheduledFuture<?> scheduledBgHistoryPost = null;
+    private static long oldestBgHistoryChange = 0;
+
     private static final ScheduledExecutorService tempBasalsWorker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledTemBasalsPost = null;
 
@@ -387,8 +391,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 old.copyFrom(bgReading);
                 getDaoBgReadings().update(old);
                 aapsLogger.debug(LTag.DATABASE, "BG: Updating record from: " + from + " New data: " + old.toString());
-                rxBus.send(new EventNewHistoryBgData(old.date)); // trigger cache invalidation
-                scheduleBgChange(bgReading); // trigger new calculation
+                scheduleBgHistoryChange(old.date); // trigger cache invalidation
                 return false;
             }
         } catch (SQLException e) {
@@ -424,6 +427,26 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     }
 
+   private void scheduleBgHistoryChange(@Nullable final long timestamp) {
+        class PostRunnable implements Runnable {
+            public void run() {
+                aapsLogger.debug(LTag.DATABASE, "Firing EventNewBg");
+                rxBus.send(new EventNewHistoryBgData(oldestBgHistoryChange));
+                scheduledBgHistoryPost = null;
+                oldestBgHistoryChange = 0;
+            }
+        }
+        // prepare task for execution in 1 sec
+        // cancel waiting task to prevent sending multiple posts
+        if (scheduledBgHistoryPost != null)
+            scheduledBgHistoryPost.cancel(false);
+        Runnable task = new PostRunnable();
+        final int sec = 3;
+        if (oldestBgHistoryChange == 0 || oldestBgHistoryChange > timestamp) oldestBgHistoryChange = timestamp;
+       scheduledBgHistoryPost = bgHistoryWorker.schedule(task, sec, TimeUnit.SECONDS);
+
+    }
+
     public List<BgReading> getBgreadingsDataFromTime(long mills, boolean ascending) {
         try {
             Dao<BgReading, Long> daoBgreadings = getDaoBgReadings();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index 50a65dc689..fe0208ecd4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -210,7 +210,10 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         disposable.add(rxBus
                 .toObservable(EventNewHistoryBgData.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> newHistoryData(new EventNewHistoryData(event.getTimestamp()), true), fabricPrivacy::logException)
+                .subscribe(event -> {
+                    getAapsLogger().debug("XXXXXX " + event.toString());
+                    newHistoryData(new EventNewHistoryData(event.getTimestamp()), true);
+                }, fabricPrivacy::logException)
         );
     }
 

From 80f2467694e59e07cdca63181a17814a4a678e9f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 12:42:28 +0200
Subject: [PATCH 353/400] remove logging

---
 .../plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
index fe0208ecd4..50a65dc689 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.java
@@ -210,10 +210,7 @@ public class IobCobCalculatorPlugin extends PluginBase implements IobCobCalculat
         disposable.add(rxBus
                 .toObservable(EventNewHistoryBgData.class)
                 .observeOn(Schedulers.io())
-                .subscribe(event -> {
-                    getAapsLogger().debug("XXXXXX " + event.toString());
-                    newHistoryData(new EventNewHistoryData(event.getTimestamp()), true);
-                }, fabricPrivacy::logException)
+                .subscribe(event -> newHistoryData(new EventNewHistoryData(event.getTimestamp()), true), fabricPrivacy::logException)
         );
     }
 

From 7bf9b8d5885d247da6fece1907c91957b9c1ce55 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 13:00:11 +0200
Subject: [PATCH 354/400] better info in nsclient mode

---
 .../info/nightscout/androidaps/dialogs/InsulinDialog.kt    | 6 ++++++
 .../info/nightscout/androidaps/dialogs/TreatmentDialog.kt  | 7 +++++++
 .../info/nightscout/androidaps/utils/wizard/BolusWizard.kt | 4 ++++
 app/src/main/res/values/strings.xml                        | 2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index f06f563874..b5b3a8f252 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
@@ -45,6 +46,7 @@ class InsulinDialog : DialogFragmentWithDate() {
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var ctx: Context
+    @Inject lateinit var config: Config
 
     companion object {
         private const val PLUS1_DEFAULT = 0.5
@@ -88,6 +90,10 @@ class InsulinDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        if (config.NSCLIENT) {
+            overview_insulin_record_only.isChecked = true
+            overview_insulin_record_only.isEnabled = false
+        }
         val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
 
         overview_insulin_time.setParams(savedInstanceState?.getDouble("overview_insulin_time")
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index c5f4d1ec53..84663a1cfe 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -9,6 +9,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -25,6 +26,7 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.SafeParse
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import kotlinx.android.synthetic.main.dialog_insulin.*
 import kotlinx.android.synthetic.main.dialog_treatment.*
 import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
@@ -38,6 +40,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var ctx: Context
+    @Inject lateinit var config: Config
 
     private val textWatcher: TextWatcher = object : TextWatcher {
         override fun afterTextChanged(s: Editable) {}
@@ -75,6 +78,10 @@ class TreatmentDialog : DialogFragmentWithDate() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        if (config.NSCLIENT) {
+            overview_treatment_record_only.isChecked = true
+            overview_treatment_record_only.isEnabled = false
+        }
         val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
         val maxInsulin = constraintChecker.getMaxBolusAllowed().value()
         val pumpDescription = activePlugin.activePump.pumpDescription
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
index fffa175e07..2b0fb46022 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.text.Spanned
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.ErrorHelperActivity
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -49,6 +50,7 @@ class BolusWizard @Inject constructor(
     @Inject lateinit var commandQueue: CommandQueueProvider
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var iobCobCalculatorPlugin: IobCobCalculatorPlugin
+    @Inject lateinit var config: Config
 
     init {
         injector.androidInjector().inject(this)
@@ -293,6 +295,8 @@ class BolusWizard @Inject constructor(
         if (abs(insulinAfterConstraints - calculatedTotalInsulin) > pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) {
             actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarning, resourceHelper.gc(R.color.warning), calculatedTotalInsulin, insulinAfterConstraints))
         }
+        if (config.NSCLIENT)
+            actions.add("<font color='" + resourceHelper.gc(R.color.warning) + "'>" + resourceHelper.gs(R.string.bolusrecordedonly) + "</font>")
 
         return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 644c7099aa..5f200a45ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -809,7 +809,7 @@
     <string name="do_not_bolus_record_only">Do not bolus, record only</string>
     <string name="category">Category</string>
     <string name="subcategory">Subcategory</string>
-    <string name="bolusrecordedonly">Bolus will be recorded only</string>
+    <string name="bolusrecordedonly">Bolus will be recorded only (not delivered by pump)</string>
     <string name="ns_autobackfill_summary">Autobackfill missig BGs from NS</string>
     <string name="key_ns_autobackfill" translatable="false">ns_autobackfill</string>
     <string name="loop_smbsetbypump_label">SMB set by pump</string>

From bad7a584c6733c433e503d7ea521cb79759b458a Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 24 Jul 2020 13:30:19 +0200
Subject: [PATCH 355/400] cleanup nsclient settings

---
 .../dependencyInjection/PluginsModule.kt      |  2 +-
 .../general/overview/OverviewPlugin.kt        | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index f179580a55..c7033eec2d 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -190,7 +190,7 @@ abstract class PluginsModule {
     abstract fun bindLocalProfilePlugin(plugin: LocalProfilePlugin): PluginBase
 
     @Binds
-    @AllConfigs
+    @APS
     @IntoMap
     @IntKey(250)
     abstract fun bindAutomationPlugin(plugin: AutomationPlugin): PluginBase
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
index 219b56d025..668e7c7fc2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@@ -1,6 +1,9 @@
 package info.nightscout.androidaps.plugins.general.overview
 
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.PluginBase
@@ -26,7 +29,8 @@ class OverviewPlugin @Inject constructor(
     private val fabricPrivacy: FabricPrivacy,
     private val rxBus: RxBusWrapper,
     aapsLogger: AAPSLogger,
-    resourceHelper: ResourceHelper
+    resourceHelper: ResourceHelper,
+    private val config: Config
 ) : PluginBase(PluginDescription()
     .mainType(PluginType.GENERAL)
     .fragmentClass(OverviewFragment::class.qualifiedName)
@@ -64,4 +68,18 @@ class OverviewPlugin @Inject constructor(
         disposable.clear()
         super.onStop()
     }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+        super.preprocessPreferences(preferenceFragment)
+        if (config.NSCLIENT) {
+            (preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_cgm_button)) as SwitchPreference?)?.let {
+                it.isVisible = false
+                it.isEnabled = false
+            }
+            (preferenceFragment.findPreference(resourceHelper.gs(R.string.key_show_calibration_button)) as SwitchPreference?)?.let {
+                it.isVisible = false
+                it.isEnabled = false
+            }
+        }
+    }
 }

From 8e438f05fea83f7a8a91c274c97acaf27f539d69 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Sat, 25 Jul 2020 00:39:56 +0100
Subject: [PATCH 356/400] - some changes with package fixes

---
 .../activities/MyPreferenceFragment.kt        |  2 +-
 .../dependencyInjection/ActivitiesModule.kt   |  3 ++-
 .../plugins/pump/omnipod/OmnipodFragment.kt   | 10 +++++-----
 .../events/EventOmnipodDeviceStatusChange.kt  |  6 +++---
 .../sensitivity/AbstractSensitivityPlugin.kt  |  6 ++++--
 .../pump/medtronic/MedtronicFragment.kt       | 19 ++++++++++++-------
 .../pump/medtronic/ExampleUnitTest.java       | 17 -----------------
 .../plugins/pump/common/ExampleUnitTest.java  | 17 -----------------
 8 files changed, 27 insertions(+), 53 deletions(-)
 delete mode 100644 medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
 delete mode 100644 rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index 3b4965c605..fce062f89f 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -76,7 +76,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var insulinOrefFreePeakPlugin: InsulinOrefFreePeakPlugin
     @Inject lateinit var loopPlugin: LoopPlugin
     @Inject lateinit var localInsightPlugin: LocalInsightPlugin
-    @Inject lateinit var medtronicPumpPlugin: info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+    @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var nsClientPlugin: NSClientPlugin
     @Inject lateinit var openAPSAMAPlugin: OpenAPSAMAPlugin
     @Inject lateinit var openAPSSMBPlugin: OpenAPSSMBPlugin
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
index dda071f1d2..3c2e89b348 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImp
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
 import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingInformationActivity
@@ -30,7 +31,7 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesPreferencesActivity(): PreferencesActivity
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
     @ContributesAndroidInjector abstract fun contributesRileyLinkBLEScanActivity(): RileyLinkBLEScanActivity
     @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
     @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index 000d6651c6..5c3914de1f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -85,7 +85,7 @@ class OmnipodFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        omnipod_rl_status.text = resourceHelper.gs(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod))
+        omnipod_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.Omnipod))
 
         omnipod_pod_status.setTextColor(Color.WHITE)
         omnipod_pod_status.text = "{fa-bed}"
@@ -114,7 +114,7 @@ class OmnipodFragment : DaggerFragment() {
 
         omnipod_stats.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
-                startActivity(Intent(context, info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity::class.java))
+                startActivity(Intent(context, RileyLinkStatusActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
             }
@@ -211,12 +211,12 @@ class OmnipodFragment : DaggerFragment() {
 
         aapsLogger.info(LTag.PUMP, "setDeviceStatus: [pumpStatus={}]", omnipodPumpStatus)
 
-        val resourceId = omnipodPumpStatus.rileyLinkServiceState.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod)
+        val resourceId = omnipodPumpStatus.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.Omnipod)
         val rileyLinkError = omnipodPumpPlugin.rileyLinkService?.error
 
         omnipod_rl_status.text =
             when {
-                omnipodPumpStatus.rileyLinkServiceState == info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
                 omnipodPumpStatus.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
                 omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
                 omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
@@ -229,7 +229,7 @@ class OmnipodFragment : DaggerFragment() {
 
         omnipod_errors.text =
             omnipodPumpStatus.rileyLinkError?.let {
-                resourceHelper.gs(it.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.Omnipod))
+                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.Omnipod))
             } ?: "-"
 
         val driverState = omnipodUtil.getDriverState();
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
index 4100ee3a8c..db46550a05 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
@@ -11,14 +11,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionStat
  */
 class EventOmnipodDeviceStatusChange : Event {
 
-    var rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState? = null
-    var rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null
+    var rileyLinkServiceState: RileyLinkServiceState? = null
+    var rileyLinkError: RileyLinkError? = null
     var podSessionState: PodSessionState? = null
     var errorDescription: String? = null
     var podDeviceState: PodDeviceState? = null
 
     @JvmOverloads
-    constructor(rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState?, rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null) {
+    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError? = null) {
         this.rileyLinkServiceState = rileyLinkServiceState
         this.rileyLinkError = rileyLinkError
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
index ced1bcd888..50a2db2f66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/AbstractSensitivityPlugin.kt
@@ -21,10 +21,12 @@ abstract class AbstractSensitivityPlugin(
     injector: HasAndroidInjector,
     aapsLogger: AAPSLogger,
     resourceHelper:
-    ResourceHelper,
-    val sp: SP
+    ResourceHelper //,
+    //var sp: SP
 ) : PluginBase(pluginDescription, aapsLogger, resourceHelper, injector), SensitivityInterface {
 
+    lateinit var sp: SP
+
     abstract override fun detectSensitivity(plugin: IobCobCalculatorInterface, fromTime: Long, toTime: Long): AutosensResult
 
     fun fillResult(ratio: Double, carbsAbsorbed: Double, pastSensitivity: String,
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index 37712451bb..a4c8431e0e 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -24,6 +24,11 @@ import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDevic
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.common.events.EventRefreshButtonState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.events.EventQueueChanged
@@ -49,10 +54,10 @@ class MedtronicFragment : DaggerFragment() {
     @Inject lateinit var activePlugin: ActivePluginProvider
     @Inject lateinit var medtronicPumpPlugin: MedtronicPumpPlugin
     @Inject lateinit var warnColors: WarnColors
-    @Inject lateinit var rileyLinkUtil: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
+    @Inject lateinit var rileyLinkUtil: RileyLinkUtil
     @Inject lateinit var medtronicUtil: MedtronicUtil
     @Inject lateinit var medtronicPumpStatus: MedtronicPumpStatus
-    @Inject lateinit var rileyLinkServiceData: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData
+    @Inject lateinit var rileyLinkServiceData: RileyLinkServiceData
 
     private var disposable: CompositeDisposable = CompositeDisposable()
 
@@ -75,7 +80,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
-        medtronic_rl_status.text = resourceHelper.gs(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
+        medtronic_rl_status.text = resourceHelper.gs(RileyLinkServiceState.NotStarted.getResourceId(RileyLinkTargetDevice.MedtronicPump))
 
         medtronic_pump_status.setTextColor(Color.WHITE)
         medtronic_pump_status.text = "{fa-bed}"
@@ -104,7 +109,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_stats.setOnClickListener {
             if (medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
-                startActivity(Intent(context, info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity::class.java))
+                startActivity(Intent(context, RileyLinkStatusActivity::class.java))
             } else {
                 displayNotConfiguredDialog()
             }
@@ -167,11 +172,11 @@ class MedtronicFragment : DaggerFragment() {
 
     @Synchronized
     private fun setDeviceStatus() {
-        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump)
+        val resourceId = rileyLinkServiceData.rileyLinkServiceState.getResourceId(RileyLinkTargetDevice.MedtronicPump)
         val rileyLinkError = medtronicPumpPlugin.rileyLinkService?.error
         medtronic_rl_status.text =
             when {
-                rileyLinkServiceData.rileyLinkServiceState == info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
                 rileyLinkServiceData.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
                 rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
                 rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
@@ -181,7 +186,7 @@ class MedtronicFragment : DaggerFragment() {
 
         medtronic_errors.text =
             rileyLinkServiceData.rileyLinkError?.let {
-                resourceHelper.gs(it.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
+                resourceHelper.gs(it.getResourceId(RileyLinkTargetDevice.MedtronicPump))
             } ?: "-"
 
         when (medtronicPumpStatus.pumpDeviceState) {
diff --git a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
deleted file mode 100644
index 98bc082706..0000000000
--- a/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.medtronic;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java
deleted file mode 100644
index 9c4318ff41..0000000000
--- a/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.common;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file

From 1edef7fb4e7f7f5b2034f75a4e9279839a280c67 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 26 Jul 2020 11:11:14 +0200
Subject: [PATCH 357/400] prevent stack overflow

---
 .../receivers/TimeDateOrTZChangeReceiver.kt   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
index 55a186fc9f..de7249b938 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
@@ -7,6 +7,7 @@ import dagger.android.DaggerBroadcastReceiver
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.PumpInterface
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.BundleLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.utils.TimeChangeType
 import java.util.*
@@ -38,37 +39,38 @@ class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() {
         val action = intent.action
         val activePump: PumpInterface = activePlugin.activePump
 
-        aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Date, Time and/or TimeZone changed. [action={}]", action)
-        try {
-            aapsLogger.debug(LTag.PUMP, "TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent))
-        } catch (ignored : Exception) {}
+        aapsLogger.debug(LTag.PUMP, "TimeDateOrTZChangeReceiver::Date, Time and/or TimeZone changed. [action={}]", action)
+        aapsLogger.debug(LTag.PUMP, "TimeDateOrTZChangeReceiver::Intent::{}", BundleLogger.log(intent.extras))
 
         when {
             action == null                           -> {
-                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.")
+                aapsLogger.error(LTag.PUMP, "TimeDateOrTZChangeReceiver::Action is null. Exiting.")
             }
+
             Intent.ACTION_TIMEZONE_CHANGED == action -> {
-                aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
+                aapsLogger.info(LTag.PUMP, "TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
                 activePump.timezoneOrDSTChanged(TimeChangeType.TimezoneChange)
             }
+
             Intent.ACTION_TIME_CHANGED == action     -> {
                 val currentDst = calculateDST()
                 if (currentDst == isDST) {
-                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
+                    aapsLogger.info(LTag.PUMP, "TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
                     activePump.timezoneOrDSTChanged(TimeChangeType.ManualTimeChange)
                 } else {
                     if (currentDst) {
-                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
+                        aapsLogger.info(LTag.PUMP, "TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
                         activePump.timezoneOrDSTChanged(TimeChangeType.DST_Started)
                     } else {
-                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
+                        aapsLogger.info(LTag.PUMP, "TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
                         activePump.timezoneOrDSTChanged(TimeChangeType.DST_Ended)
                     }
                 }
                 isDST = currentDst
             }
+
             else                                     -> {
-                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
+                aapsLogger.error(LTag.PUMP, "TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
             }
         }
     }

From 007df3aab33c6b6b70bcd2a3e0df810c786101a1 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 26 Jul 2020 12:56:47 +0200
Subject: [PATCH 358/400] make SMB prefs more clear

---
 .../activities/MyPreferenceFragment.kt        | 11 ++++--
 .../aps/openAPSSMB/OpenAPSSMBPlugin.java      | 38 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml/pref_openapssmb.xml      | 28 +++++++-------
 4 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index fce062f89f..e01ea6da78 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -185,9 +185,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(maintenancePlugin, rootKey)
         }
         initSummary(preferenceScreen, pluginId != -1)
-        for (plugin in pluginStore.plugins) {
-            plugin.preprocessPreferences(this)
-        }
+        preprocessPreferences()
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
@@ -212,6 +210,13 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
         checkForBiometricFallback(key)
 
         updatePrefSummary(findPreference(key))
+        preprocessPreferences()
+    }
+
+    private fun preprocessPreferences() {
+        for (plugin in pluginStore.plugins) {
+            plugin.preprocessPreferences(this)
+        }
     }
 
     private fun checkForBiometricFallback(key: String) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index 6da05d9075..71b726d622 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -2,6 +2,9 @@ package info.nightscout.androidaps.plugins.aps.openAPSSMB;
 
 import android.content.Context;
 
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONException;
 
@@ -42,6 +45,7 @@ import info.nightscout.androidaps.utils.HardLimits;
 import info.nightscout.androidaps.utils.Profiler;
 import info.nightscout.androidaps.utils.Round;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 @Singleton
 public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, ConstraintsInterface {
@@ -56,6 +60,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
     private final HardLimits hardLimits;
     private final Profiler profiler;
     private final FabricPrivacy fabricPrivacy;
+    private final SP sp;
 
     // last values
     DetermineBasalAdapterSMBJS lastDetermineBasalAdapterSMBJS = null;
@@ -77,7 +82,8 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
             IobCobCalculatorPlugin iobCobCalculatorPlugin,
             HardLimits hardLimits,
             Profiler profiler,
-            FabricPrivacy fabricPrivacy
+            FabricPrivacy fabricPrivacy,
+            SP sp
     ) {
         super(new PluginDescription()
                         .mainType(PluginType.APS)
@@ -100,6 +106,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         this.hardLimits = hardLimits;
         this.profiler = profiler;
         this.fabricPrivacy = fabricPrivacy;
+        this.sp = sp;
     }
 
     @Override
@@ -119,6 +126,25 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         return pump.getPumpDescription().isTempBasalCapable;
     }
 
+    @Override
+    public void preprocessPreferences(PreferenceFragmentCompat preferenceFragment) {
+        super.preprocessPreferences(preferenceFragment);
+        boolean smbAlwaysEnabled = sp.getBoolean(R.string.key_enableSMB_always, false);
+
+        SwitchPreference withCOB = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_enableSMB_with_COB));
+        if (withCOB != null) {
+            withCOB.setVisible(!smbAlwaysEnabled);
+        }
+        SwitchPreference withTempTarget = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_enableSMB_with_temptarget));
+        if (withTempTarget != null) {
+            withTempTarget.setVisible(!smbAlwaysEnabled);
+        }
+        SwitchPreference afterCarbs = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_enableSMB_after_carbs));
+        if (afterCarbs != null) {
+            afterCarbs.setVisible(!smbAlwaysEnabled);
+        }
+    }
+
     @Override
     public APSResult getLastAPSResult() {
         return lastAPSResult;
@@ -174,7 +200,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         long startPart = System.currentTimeMillis();
 
         MealData mealData = iobCobCalculatorPlugin.getMealData();
-       profiler.log(LTag.APS, "getMealData()", startPart);
+        profiler.log(LTag.APS, "getMealData()", startPart);
 
         Constraint<Double> maxIOBAllowedConstraint = constraintChecker.getMaxIOBAllowed();
         inputConstraints.copyReasons(maxIOBAllowedConstraint);
@@ -219,7 +245,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         }
 
         IobTotal[] iobArray = iobCobCalculatorPlugin.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget);
-       profiler.log(LTag.APS, "calculateIobArrayInDia()", startPart);
+        profiler.log(LTag.APS, "calculateIobArrayInDia()", startPart);
 
         startPart = System.currentTimeMillis();
         Constraint<Boolean> smbAllowed = new Constraint<>(!tempBasalFallback);
@@ -234,8 +260,8 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         constraintChecker.isUAMEnabled(uam);
         inputConstraints.copyReasons(uam);
 
-       profiler.log(LTag.APS, "detectSensitivityandCarbAbsorption()", startPart);
-       profiler.log(LTag.APS, "SMB data gathering", start);
+        profiler.log(LTag.APS, "detectSensitivityandCarbAbsorption()", startPart);
+        profiler.log(LTag.APS, "SMB data gathering", start);
 
         start = System.currentTimeMillis();
         try {
@@ -254,7 +280,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
         long now = System.currentTimeMillis();
 
         DetermineBasalResultSMB determineBasalResultSMB = determineBasalAdapterSMBJS.invoke();
-       profiler.log(LTag.APS, "SMB calculation", start);
+        profiler.log(LTag.APS, "SMB calculation", start);
         if (determineBasalResultSMB == null) {
             getAapsLogger().error(LTag.APS, "SMB calculation returned null");
             lastDetermineBasalAdapterSMBJS = null;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f200a45ad..055194017d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -761,7 +761,7 @@
     <string name="enablesmbwithtemptarget">Enable SMB with temp targets</string>
     <string name="enablesmbwithtemptarget_summary">Enable SMB when there is temp target active (eating soon, exercise)</string>
     <string name="enablesmbwithhightemptarget">Enable SMB with high temp targets</string>
-    <string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise)</string>
+    <string name="enablesmbwithhightemptarget_summary">Enable SMB when there is high temp target active (exercise, above 100 mg/dl or 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Carbs</string>
     <string name="overview_buttons_selection">Buttons</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index f30107ea15..9123bb66d3 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -38,20 +38,6 @@
             android:summary="@string/enablesmb_summary"
             android:title="@string/enablesmb" />
 
-        <SwitchPreference
-            android:defaultValue="false"
-            android:dependency="@string/key_use_smb"
-            android:key="@string/key_enableSMB_with_COB"
-            android:summary="@string/enablesmbwithcob_summary"
-            android:title="@string/enablesmbwithcob" />
-
-        <SwitchPreference
-            android:defaultValue="false"
-            android:dependency="@string/key_use_smb"
-            android:key="@string/key_enableSMB_with_temptarget"
-            android:summary="@string/enablesmbwithtemptarget_summary"
-            android:title="@string/enablesmbwithtemptarget" />
-
         <SwitchPreference
             android:defaultValue="false"
             android:dependency="@string/key_use_smb"
@@ -66,6 +52,20 @@
             android:summary="@string/enablesmbalways_summary"
             android:title="@string/enablesmbalways" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="@string/key_use_smb"
+            android:key="@string/key_enableSMB_with_COB"
+            android:summary="@string/enablesmbwithcob_summary"
+            android:title="@string/enablesmbwithcob" />
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="@string/key_use_smb"
+            android:key="@string/key_enableSMB_with_temptarget"
+            android:summary="@string/enablesmbwithtemptarget_summary"
+            android:title="@string/enablesmbwithtemptarget" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:dependency="@string/key_use_smb"

From 6ad35510f32a9ea23f8e1b0aa85ae6969adc26dc Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Sun, 26 Jul 2020 14:36:00 +0100
Subject: [PATCH 359/400] - moved tests - some other minor changes

---
 .../events/EventOmnipodDeviceStatusChange.kt  | 10 +++------
 app/src/main/jniLibs/README.md                |  1 -
 .../comm/MedtronicConverterUTest.java         |  0
 .../comm/MedtronicHistoryDataUTest.java       |  0
 .../MedtronicPumpHistoryDecoderUTest.java     |  0
 .../history/pump/PumpHistoryEntryUTest.java   |  0
 .../medtronic/data/dto/BasalProfileUTest.java |  0
 .../EventRileyLinkDeviceStatusChange.kt       | 22 ++++++++++++-------
 .../ble/RFToolsParametrizedUTest.java         |  0
 .../common/hw/rileylink/ble/RFToolsUTest.java |  0
 10 files changed, 17 insertions(+), 16 deletions(-)
 rename {app => medtronic}/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java (100%)
 rename {app => medtronic}/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java (100%)
 rename {app => medtronic}/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java (100%)
 rename {app => medtronic}/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java (100%)
 rename {app => medtronic}/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java (100%)
 rename {app => rileylink}/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java (100%)
 rename {app => rileylink}/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java (100%)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
index db46550a05..b87dbdb08c 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
@@ -1,6 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.events
 
 import info.nightscout.androidaps.events.Event
+import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodDeviceState
@@ -9,18 +10,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionStat
 /**
  * Created by andy on 4.8.2019
  */
-class EventOmnipodDeviceStatusChange : Event {
+class EventOmnipodDeviceStatusChange : EventRileyLinkDeviceStatusChange {
 
-    var rileyLinkServiceState: RileyLinkServiceState? = null
-    var rileyLinkError: RileyLinkError? = null
     var podSessionState: PodSessionState? = null
-    var errorDescription: String? = null
     var podDeviceState: PodDeviceState? = null
 
     @JvmOverloads
-    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError? = null) {
-        this.rileyLinkServiceState = rileyLinkServiceState
-        this.rileyLinkError = rileyLinkError
+    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError? = null) : super(rileyLinkServiceState, rileyLinkError) {
     }
 
     constructor(podSessionState: PodSessionState?) {
diff --git a/app/src/main/jniLibs/README.md b/app/src/main/jniLibs/README.md
index 7041df4e10..e69de29bb2 100644
--- a/app/src/main/jniLibs/README.md
+++ b/app/src/main/jniLibs/README.md
@@ -1 +0,0 @@
-# danars-support-lib
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicConverterUTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicHistoryDataUTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoderUTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryUTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java b/medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
rename to medtronic/src/test/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfileUTest.java
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
index f9846bbb05..b3425d14a5 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/events/EventRileyLinkDeviceStatusChange.kt
@@ -2,26 +2,32 @@ package info.nightscout.androidaps.plugins.pump.common.events
 
 import info.nightscout.androidaps.events.Event
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
 
-class EventRileyLinkDeviceStatusChange : Event {
+open class EventRileyLinkDeviceStatusChange : Event {
 
-    private var rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState? = null
-    private var rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError? = null
+    var rileyLinkServiceState: RileyLinkServiceState? = null
+    var rileyLinkError: RileyLinkError? = null
 
-    private var pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState? = null
-    private var errorDescription: String? = null
+    var pumpDeviceState: PumpDeviceState? = null
+    var errorDescription: String? = null
+
+    constructor() {
+
+    }
 
 
-    constructor(rileyLinkServiceState: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState?, rileyLinkError: info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError?) {
+    constructor(rileyLinkServiceState: RileyLinkServiceState?, rileyLinkError: RileyLinkError?) {
         this.rileyLinkServiceState = rileyLinkServiceState
         this.rileyLinkError = rileyLinkError
     }
 
-    constructor(pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState?) {
+    constructor(pumpDeviceState: PumpDeviceState?) {
         this.pumpDeviceState = pumpDeviceState
     }
 
-    constructor(pumpDeviceState: info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState?, errorDescription: String?) {
+    constructor(pumpDeviceState: PumpDeviceState?, errorDescription: String?) {
         this.pumpDeviceState = pumpDeviceState
         this.errorDescription = errorDescription
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java
rename to rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsParametrizedUTest.java
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java b/rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java
similarity index 100%
rename from app/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java
rename to rileylink/src/test/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFToolsUTest.java

From b7221aa2861ed70281155ca71d76add899e436f3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 27 Jul 2020 15:21:36 +0200
Subject: [PATCH 360/400] prevent missing pump status in NS

---
 .../androidaps/plugins/pump/common/PumpPluginAbstract.java      | 2 +-
 .../info/nightscout/androidaps/danar/AbstractDanaRPlugin.java   | 2 +-
 .../main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
index 6227d2ea2a..b16031a14f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
@@ -326,7 +326,7 @@ public abstract class PumpPluginAbstract extends PumpPluginBase implements PumpI
     @NonNull @Override
     public JSONObject getJSONStatus(Profile profile, String profileName, String version) {
 
-        if ((getPumpStatusData().lastConnection + 5 * 60 * 1000L) < System.currentTimeMillis()) {
+        if ((getPumpStatusData().lastConnection + 60 * 60 * 1000L) < System.currentTimeMillis()) {
             return new JSONObject();
         }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
index df191419c1..f048c101ff 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java
@@ -370,7 +370,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
     public JSONObject getJSONStatus(Profile profile, String profilename, String version) {
         DanaPump pump = danaPump;
         long now = System.currentTimeMillis();
-        if (pump.getLastConnection() + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (pump.getLastConnection() + 60 * 60 * 1000L < System.currentTimeMillis()) {
             return new JSONObject();
         }
         JSONObject pumpjson = new JSONObject();
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index 7619c7515a..291f2d3b9b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -567,7 +567,7 @@ class DanaRSPlugin @Inject constructor(
 
     override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
         val now = System.currentTimeMillis()
-        if (danaPump.lastConnection + 5 * 60 * 1000L < System.currentTimeMillis()) {
+        if (danaPump.lastConnection + 60 * 60 * 1000L < System.currentTimeMillis()) {
             return JSONObject()
         }
         val pumpJson = JSONObject()

From 400e9399a5a1f422b4652778ef14c01518173abc Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 27 Jul 2020 21:11:57 +0200
Subject: [PATCH 361/400] MinutesNumberPicker

---
 .../androidaps/dialogs/ExtendedBolusDialog.kt |   2 +-
 .../androidaps/dialogs/TempBasalDialog.kt     |   2 +-
 .../general/automation/elements/InputBg.kt    |   2 +-
 .../general/automation/elements/InputDelta.kt |   2 +-
 .../automation/elements/InputDouble.kt        |   2 +-
 .../automation/elements/InputDuration.kt      |  12 +-
 .../automation/elements/InputInsulin.kt       |   2 +-
 .../automation/elements/InputPercent.kt       |   2 +-
 .../automation/elements/InputTempTarget.kt    |   2 +-
 .../elements/SWEditNumberWithUnits.kt         |   2 +-
 .../utils/NumberPickerVertical.java           |  21 +-
 .../androidaps/utils/TimeListEdit.java        |   6 +-
 .../res/layout/activity_profilehelper.xml     |   8 +-
 .../careportal_newnstreatment_dialog.xml      | 576 ------------------
 .../main/res/layout/dialog_calibration.xml    |   2 +-
 app/src/main/res/layout/dialog_carbs.xml      |   6 +-
 app/src/main/res/layout/dialog_care.xml       |   4 +-
 .../main/res/layout/dialog_extendedbolus.xml  |   4 +-
 app/src/main/res/layout/dialog_fill.xml       |   2 +-
 app/src/main/res/layout/dialog_insulin.xml    |   4 +-
 .../main/res/layout/dialog_profileswitch.xml  |   6 +-
 app/src/main/res/layout/dialog_tempbasal.xml  |   6 +-
 app/src/main/res/layout/dialog_temptarget.xml |   4 +-
 app/src/main/res/layout/dialog_treatment.xml  |   4 +-
 app/src/main/res/layout/dialog_wizard.xml     |   8 +-
 .../main/res/layout/localprofile_fragment.xml |   2 +-
 .../main/res/layout/timelistedit_element.xml  |   4 +-
 .../{ => ui}/DigitsKeyListenerWithComma.java  |   2 +-
 .../utils/ui/MinutesNumberPicker.kt           |  33 +
 .../utils/{ => ui}/NumberPicker.java          |  30 +-
 core/src/main/res/values/strings.xml          |   1 +
 .../layout/danar_user_options_activity.xml    |   8 +-
 32 files changed, 113 insertions(+), 658 deletions(-)
 delete mode 100644 app/src/main/res/layout/careportal_newnstreatment_dialog.xml
 rename core/src/main/java/info/nightscout/androidaps/utils/{ => ui}/DigitsKeyListenerWithComma.java (99%)
 create mode 100644 core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt
 rename core/src/main/java/info/nightscout/androidaps/utils/{ => ui}/NumberPicker.java (90%)

diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
index 62da94d3ff..02e46e5c17 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
@@ -62,7 +62,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
 
     override fun submit(): Boolean {
         val insulin = SafeParse.stringToDouble(actions_extendedbolus_insulin.text)
-        val durationInMinutes = SafeParse.stringToInt(actions_extendedbolus_duration.text)
+        val durationInMinutes = actions_extendedbolus_duration.value.toInt()
         val actions: LinkedList<String> = LinkedList()
         val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
         actions.add(resourceHelper.gs(R.string.formatinsulinunits, insulinAfterConstraint))
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index 14f0897cc5..7ab5850f87 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -83,7 +83,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
     override fun submit(): Boolean {
         var percent = 0
         var absolute = 0.0
-        val durationInMinutes = SafeParse.stringToInt(actions_tempbasal_duration.text)
+        val durationInMinutes = actions_tempbasal_duration.value.toInt()
         val profile = profileFunction.getProfile() ?: return false
         val actions: LinkedList<String> = LinkedList()
         if (isPercentPump) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
index f81ef07bb8..24b48e0fb7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputBg.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
index e7624a98c7..46b696eaec 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDelta.kt
@@ -9,7 +9,7 @@ import android.widget.Spinner
 import androidx.annotation.StringRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.text.DecimalFormat
 import java.util.*
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
index 7824b51960..566315b9eb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDouble.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputDouble(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
index cab16d2502..08647735cd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputDuration.kt
@@ -3,7 +3,8 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.MinutesNumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputDuration(injector: HasAndroidInjector) : Element(injector) {
@@ -20,11 +21,14 @@ class InputDuration(injector: HasAndroidInjector) : Element(injector) {
     var value: Int = 0
 
     override fun addToLayout(root: LinearLayout) {
-        val numberPicker = NumberPicker(root.context, null)
-        if (unit == TimeUnit.MINUTES)
+        val numberPicker : NumberPicker
+        if (unit == TimeUnit.MINUTES) {
+            numberPicker = MinutesNumberPicker(root.context, null)
             numberPicker.setParams(0.0, 0.0, 24 * 60.0, 10.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
-        else
+        } else {
+            numberPicker = NumberPicker(root.context, null)
             numberPicker.setParams(0.0, 0.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(R.id.ok))
+        }
         numberPicker.value = value.toDouble()
         numberPicker.setOnValueChangedListener { value: Double -> this.value = value.toInt() }
         root.addView(numberPicker)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
index f822a971f4..0903824a94 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputInsulin.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputInsulin(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
index 7b1f739ed7..05524abc40 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercent.kt
@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.general.automation.elements
 import android.widget.LinearLayout
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 
 class InputPercent(injector: HasAndroidInjector) : Element(injector) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
index 8208e7e687..4f58be8167 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputTempTarget.kt
@@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import java.text.DecimalFormat
 import javax.inject.Inject
 
diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
index 978455a4ae..2d49eb3a97 100644
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/elements/SWEditNumberWithUnits.kt
@@ -11,7 +11,7 @@ import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.data.Profile
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.setupwizard.SWNumberValidator
-import info.nightscout.androidaps.utils.NumberPicker
+import info.nightscout.androidaps.utils.ui.NumberPicker
 import info.nightscout.androidaps.utils.SafeParse
 import java.text.DecimalFormat
 import javax.inject.Inject
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
index f09f562d25..5244c5c4ce 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/NumberPickerVertical.java
@@ -1,30 +1,11 @@
 package info.nightscout.androidaps.utils;
 
 import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.AttributeSet;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.NumberFormat;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.utils.ui.NumberPicker;
 
 /**
  * Created by mike on 28.06.2016.
diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
index 7010a82c12..1440a65c21 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java
@@ -13,24 +13,20 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.core.widget.TextViewCompat;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.utils.ui.NumberPicker;
 
 /**
  * Created by mike on 29.12.2016.
diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml
index effa56b112..310a4c566d 100644
--- a/app/src/main/res/layout/activity_profilehelper.xml
+++ b/app/src/main/res/layout/activity_profilehelper.xml
@@ -94,7 +94,7 @@
                         android:text="@string/age"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_age"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -115,7 +115,7 @@
                         android:text="@string/tdd_total"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_tdd"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -136,7 +136,7 @@
                         android:text="@string/weight_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_weight"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
@@ -157,7 +157,7 @@
                         android:text="@string/basalpctfromtdd_label"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-                    <info.nightscout.androidaps.utils.NumberPicker
+                    <info.nightscout.androidaps.utils.ui.NumberPicker
                         android:id="@+id/profilehelper_basalpctfromtdd"
                         android:layout_width="130dp"
                         android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml b/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
deleted file mode 100644
index a501e70a77..0000000000
--- a/app/src/main/res/layout/careportal_newnstreatment_dialog.xml
+++ /dev/null
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:focusableInTouchMode="true"
-    android:minWidth="300dp"
-    android:orientation="vertical"
-    android:padding="10dp">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/careportal_newnstreatment_eventtype"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:paddingBottom="10dp"
-                android:text="Temp target"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_bg_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/treatments_wizard_bg_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_bginput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_bgunits"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="mg/dl"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_bgsource_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:orientation="vertical">
-
-                <RadioGroup
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginRight="20dp"
-                    android:orientation="horizontal">
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_meter"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="false"
-                        android:text="@string/careportal_newnstreatment_meter" />
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_sensor"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="true"
-                        android:text="@string/careportal_newnstreatment_sensor" />
-
-                    <RadioButton
-                        android:id="@+id/careportal_newnstreatment_other"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/careportal_newnstreatment_other" />
-                </RadioGroup>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_carbs_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/treatments_wizard_carbs_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_carbsinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="g"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_insulin_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_insulin_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_insulininput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="U"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_split_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_split_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_splitinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_temptarget_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/reason"
-                        android:width="120dp"
-                        android:padding="10dp"
-                        android:textAppearance="@android:style/TextAppearance.Material.Small"
-                        android:layout_gravity="center_vertical"
-                        android:textStyle="bold" />
-
-                    <Spinner
-                        android:id="@+id/careportal_newnstreatment_temptarget_reason"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/target_label"
-                        android:width="120dp"
-                        android:padding="10dp"
-                        android:textAppearance="@android:style/TextAppearance.Material.Small"
-                        android:layout_gravity="center_vertical"
-                        android:textStyle="bold" />
-
-                    <info.nightscout.androidaps.utils.NumberPicker
-                        android:id="@+id/careportal_newnstreatment_temptarget"
-                        android:layout_width="130dp"
-                        android:layout_height="40dp"
-                        android:layout_gravity="center_vertical" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_duration_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_duration_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_durationinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="min"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_percent_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_percent_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_percentinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_absolute_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_absolute_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_absoluteinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="U/h"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_carbtime_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_carbtime_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_carbtimeinput"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="min"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_profile_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_profile_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <Spinner
-                    android:id="@+id/careportal_newnstreatment_profile"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_gravity="center_vertical" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_reuse_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text=""
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <Button
-                    android:id="@+id/careportal_newnstreatment_reusebutton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/reuse"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text=" "
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_percentage_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_percentage_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_percentage"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="%"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-           <LinearLayout
-                android:id="@+id/careportal_newnstreatment_timeshift_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_timeshift_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <info.nightscout.androidaps.utils.NumberPicker
-                    android:id="@+id/careportal_newnstreatment_timeshift"
-                    android:layout_width="130dp"
-                    android:layout_height="40dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:minWidth="45dp"
-                    android:paddingLeft="5dp"
-                    android:text="h"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-            </LinearLayout>
-
-           <LinearLayout
-               android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/careportal_newnstreatment_notes_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-                <EditText
-                    android:id="@+id/careportal_newnstreatment_notes"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:width="180dp"
-                    android:inputType="text" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/careportal_newnstreatment_eventtime_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:width="120dp"
-                    android:padding="10dp"
-                    android:text="@string/event_time_label"
-                    android:textAppearance="@android:style/TextAppearance.Material.Small"
-                    android:textStyle="bold" />
-
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_eventdate"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:text="2017/05/05" />
-
-                <TextView
-                    android:id="@+id/careportal_newnstreatment_eventtime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:padding="10dp"
-                    android:text="08:20pm" />
-
-            </LinearLayout>
-
-            <include layout="@layout/okcancel" />
-
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 5cf87640eb..5b298a0db5 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -66,7 +66,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_calibration_bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 1a4d722517..3274cc08b7 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -89,7 +89,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_carbs_time"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -122,7 +122,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_carbs_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -155,7 +155,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_carbs_carbs"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index c4c5ad59ca..d6987d6922 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -94,7 +94,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_care_bg"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -129,7 +129,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_care_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 4fde69c44b..2d80b4ab32 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -61,7 +61,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_extendedbolus_insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -94,7 +94,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_extendedbolus_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index 48f60b7a1c..9cd88f525a 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -82,7 +82,7 @@
                 android:text="@string/overview_insulin_label"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/fill_insulinamount"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index 93ec2d96d3..cfcf957761 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -84,7 +84,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_insulin_time"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -117,7 +117,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_insulin_amount"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index ab8efe79cd..01de170277 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -62,7 +62,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_profileswitch_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -154,7 +154,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_profileswitch_percentage"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -187,7 +187,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_profileswitch_timeshift"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 26b8e08487..cf0dc627fd 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -62,7 +62,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_tempbasal_basalpercentinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -96,7 +96,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/actions_tempbasal_basalabsoluteinput"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -129,7 +129,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/actions_tempbasal_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 9eb1ef968c..30912b4a1d 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -85,7 +85,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_temptarget_temptarget"
                 android:layout_width="130dp"
                 android:layout_height="40dp"
@@ -120,7 +120,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
                 android:id="@+id/overview_temptarget_duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index 418edb5623..662df3e91f 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -76,7 +76,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_treatment_insulin"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
@@ -109,7 +109,7 @@
                 android:textAppearance="@android:style/TextAppearance.Material.Small"
                 android:textStyle="bold" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/overview_treatment_carbs"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index e23cf759de..7a6e70e066 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -65,7 +65,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_bg_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp" />
@@ -95,7 +95,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_carbs_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -126,7 +126,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_correction_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
@@ -156,7 +156,7 @@
                     android:textAppearance="@android:style/TextAppearance.Material.Small"
                     android:textStyle="bold" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/treatments_wizard_carb_time_input"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/localprofile_fragment.xml b/app/src/main/res/layout/localprofile_fragment.xml
index 008af1e032..2bba675168 100644
--- a/app/src/main/res/layout/localprofile_fragment.xml
+++ b/app/src/main/res/layout/localprofile_fragment.xml
@@ -198,7 +198,7 @@
                     android:text="@string/dia"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <info.nightscout.androidaps.utils.NumberPicker
+                <info.nightscout.androidaps.utils.ui.NumberPicker
                     android:id="@+id/localprofile_dia"
                     android:layout_width="130dp"
                     android:layout_height="40dp"
diff --git a/app/src/main/res/layout/timelistedit_element.xml b/app/src/main/res/layout/timelistedit_element.xml
index 07c64a5ea4..9d852aefa6 100644
--- a/app/src/main/res/layout/timelistedit_element.xml
+++ b/app/src/main/res/layout/timelistedit_element.xml
@@ -19,13 +19,13 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <info.nightscout.androidaps.utils.NumberPicker
+        <info.nightscout.androidaps.utils.ui.NumberPicker
             android:id="@+id/timelistedit_edit1"
             android:layout_width="130dp"
             android:layout_height="40dp"
             android:layout_marginRight="5dp" />
 
-        <info.nightscout.androidaps.utils.NumberPicker
+        <info.nightscout.androidaps.utils.ui.NumberPicker
             android:id="@+id/timelistedit_edit2"
             android:layout_width="130dp"
             android:layout_height="40dp" />
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java b/core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
similarity index 99%
rename from core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
index a84ccd61a2..6a3189c287 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/DigitsKeyListenerWithComma.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/DigitsKeyListenerWithComma.java
@@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
 import android.text.InputType;
 import android.text.SpannableStringBuilder;
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt b/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt
new file mode 100644
index 0000000000..d00a91104a
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/MinutesNumberPicker.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.utils.ui
+
+import android.content.Context
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.util.Log
+import android.view.View.OnFocusChangeListener
+import android.widget.Button
+import info.nightscout.androidaps.core.R
+import java.text.DecimalFormat
+
+class MinutesNumberPicker constructor(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) {
+
+    fun setParams(initValue: Double, minValue: Double, maxValue: Double, step: Double, allowZero: Boolean, okButton: Button? = null, textWatcher: TextWatcher? = null) {
+        super.setParams(initValue, minValue, maxValue, step, null, allowZero, okButton)
+    }
+
+    override fun updateEditText() {
+        if (value == 0.0 && !allowZero) editText.setText("")
+        else {
+            if (focused) editText.setText(DecimalFormat("0").format(value))
+            else {
+                val hours = (value / 60).toInt()
+                val minutes = (value - hours * 60).toInt()
+                val formatted =
+                    if (hours != 0) String.format(context.getString(R.string.format_hour_minute), hours, minutes)
+                    else DecimalFormat("0").format(value)
+                editText.setText(formatted)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
similarity index 90%
rename from core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
rename to core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
index c9973579ed..da5bf0ab92 100644
--- a/core/src/main/java/info/nightscout/androidaps/utils/NumberPicker.java
+++ b/core/src/main/java/info/nightscout/androidaps/utils/ui/NumberPicker.java
@@ -1,5 +1,6 @@
-package info.nightscout.androidaps.utils;
+package info.nightscout.androidaps.utils.ui;
 
+import android.app.Service;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
@@ -10,6 +11,7 @@ import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -20,6 +22,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import info.nightscout.androidaps.core.R;
+import info.nightscout.androidaps.utils.SafeParse;
+import info.nightscout.androidaps.utils.ToastUtils;
 
 /**
  * Created by mike on 28.06.2016.
@@ -39,12 +43,14 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     Double minValue = 0d;
     Double maxValue = 1d;
     Double step = 1d;
-    NumberFormat formater;
+    NumberFormat formatter;
     boolean allowZero = false;
     TextWatcher textWatcher = null;
 
     Button okButton = null;
 
+    protected Boolean focused = false;
+
     private Handler mHandler;
     private ScheduledExecutorService mUpdater;
     private OnValueChangedListener mOnValueChangedListener;
@@ -93,7 +99,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         LayoutInflater.from(context).inflate(R.layout.number_picker_layout, this, true);
     }
 
-    private void initialize(Context context) {
+    protected void initialize(Context context) {
         // set layout view
         inflate(context);
 
@@ -136,7 +142,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
 
             @Override
             public void afterTextChanged(Editable s) {
-                value = SafeParse.stringToDouble(editText.getText().toString());
+                if (focused) value = SafeParse.stringToDouble(editText.getText().toString());
                 callValueChangedListener();
                 if (okButton != null) {
                     if (value > maxValue || value < minValue)
@@ -146,6 +152,13 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
                 }
             }
         });
+
+        editText.setOnFocusChangeListener(new OnFocusChangeListener() {
+            @Override public void onFocusChange(View v, boolean hasFocus) {
+                focused = hasFocus;
+                updateEditText();
+            }
+        });
     }
 
     @Override
@@ -196,7 +209,7 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         this.minValue = minValue;
         this.maxValue = maxValue;
         this.step = step;
-        this.formater = formater;
+        this.formatter = formater;
         this.allowZero = allowZero;
         callValueChangedListener();
         this.okButton = okButton;
@@ -254,11 +267,11 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
         updateEditText();
     }
 
-    private void updateEditText() {
+    protected void updateEditText() {
         if (value == 0d && !allowZero)
             editText.setText("");
         else
-            editText.setText(formater.format(value));
+            editText.setText(formatter.format(value));
     }
 
     private void callValueChangedListener() {
@@ -286,6 +299,9 @@ public class NumberPicker extends LinearLayout implements View.OnKeyListener,
     @Override
     public void onClick(View v) {
         if (mUpdater == null) {
+            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Service.INPUT_METHOD_SERVICE);
+            imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+            editText.clearFocus();
             if (v == plusButton) {
                 inc(1);
             } else {
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 8933eefc3d..f07d0d2129 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -220,5 +220,6 @@
 
     <!--    Ntp-->
     <string name="timedetection">Time detection</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 
 </resources>
\ No newline at end of file
diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml
index 9996fa93d0..94f23c5f96 100644
--- a/dana/src/main/res/layout/danar_user_options_activity.xml
+++ b/dana/src/main/res/layout/danar_user_options_activity.xml
@@ -175,7 +175,7 @@
                 android:text="@string/danar_screentimeout"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_screentimeout"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -212,7 +212,7 @@
                 android:text="@string/danar_backlight"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_backlight"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -268,7 +268,7 @@
                 android:text="@string/danar_shutdown"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_shutdown"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
@@ -305,7 +305,7 @@
                 android:text="@string/danar_lowreservoir"
                 android:textSize="14sp" />
 
-            <info.nightscout.androidaps.utils.NumberPicker
+            <info.nightscout.androidaps.utils.ui.NumberPicker
                 android:id="@+id/danar_lowreservoir"
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"

From ed969300eff801ff17916827ca284419441ccb7e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 27 Jul 2020 22:27:47 +0200
Subject: [PATCH 362/400] fix tests

---
 .../androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java     | 2 +-
 .../nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
index 71b726d622..3e54eb8a3a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.java
@@ -127,7 +127,7 @@ public class OpenAPSSMBPlugin extends PluginBase implements APSInterface, Constr
     }
 
     @Override
-    public void preprocessPreferences(PreferenceFragmentCompat preferenceFragment) {
+    public void preprocessPreferences(@NotNull PreferenceFragmentCompat preferenceFragment) {
         super.preprocessPreferences(preferenceFragment);
         boolean smbAlwaysEnabled = sp.getBoolean(R.string.key_enableSMB_always, false);
 
diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 9956d09295..340fda178a 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -120,7 +120,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         danaRPlugin = DanaRPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, rxBus, context, resourceHelper, constraintChecker, profileFunction, activePluginProvider, sp, commandQueue, danaPump, detailedBolusInfoStorage, fabricPrivacy, dateUtil)
         insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsPlugin, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, Config(), dateUtil)
-        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
+        openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy, sp)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, treatmentsPlugin, iobCobCalculatorPlugin, hardLimits, profiler, fabricPrivacy)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, buildHelper, treatmentsPlugin, Config())
         val constraintsPluginsList = ArrayList<PluginBase?>()

From b9169a199e0e658432b8fc37409441c8ff298f88 Mon Sep 17 00:00:00 2001
From: Bluefox <dogafox@gmail.com>
Date: Tue, 28 Jul 2020 12:32:57 +0200
Subject: [PATCH 363/400] Fix too long number in "Accept new temp basal"

Sometimes we have reason as: COB: 14.79999999999999995 what looks not so good.
---
 app/src/main/assets/OpenAPSSMB/determine-basal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index 5e9238713f..137ceca541 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -801,7 +801,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
 
     rT.COB=meal_data.mealCOB;
     rT.IOB=iob_data.iob;
-    rT.reason="COB: " + meal_data.mealCOB + ", Dev: " + convert_bg(deviation, profile) + ", BGI: " + convert_bg(bgi, profile) + ", ISF: " + convert_bg(sens, profile) + ", CR: " + round(profile.carb_ratio, 2) + ", Target: " + convert_bg(target_bg, profile) + ", minPredBG " + convert_bg(minPredBG, profile) + ", minGuardBG " + convert_bg(minGuardBG, profile) + ", IOBpredBG " + convert_bg(lastIOBpredBG, profile);
+    rT.reason="COB: " + round(meal_data.mealCOB, 1) + ", Dev: " + convert_bg(deviation, profile) + ", BGI: " + convert_bg(bgi, profile) + ", ISF: " + convert_bg(sens, profile) + ", CR: " + round(profile.carb_ratio, 2) + ", Target: " + convert_bg(target_bg, profile) + ", minPredBG " + convert_bg(minPredBG, profile) + ", minGuardBG " + convert_bg(minGuardBG, profile) + ", IOBpredBG " + convert_bg(lastIOBpredBG, profile);
     if (lastCOBpredBG > 0) {
         rT.reason += ", COBpredBG " + convert_bg(lastCOBpredBG, profile);
     }

From ba4f599242d7bcb145ba9f01bb4ecf8ec7c2d5d0 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 28 Jul 2020 13:51:03 +0200
Subject: [PATCH 364/400] include EB in statistics

---
 .../nightscout/androidaps/utils/stats/TddCalculator.kt     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
index 1f8338f7d8..6cecfa4f73 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt
@@ -65,6 +65,13 @@ class TddCalculator @Inject constructor(
             val profile = profileFunction.getProfile(t) ?: continue
             val absoluteRate = tbr?.tempBasalConvertedToAbsolute(t, profile) ?: profile.getBasal(t)
             tdd.basal += absoluteRate / 60.0 * 5.0
+
+            if (!activePlugin.getActivePump().isFakingTempsByExtendedBoluses()) {
+                // they are not included in TBRs
+                val eb = getExtendedBolusFromHistory(t)
+                val absoluteEbRate = eb?.absoluteRate() ?: 0.0
+                tdd.bolus += absoluteEbRate / 60.0 * 5.0
+            }
             result.put(midnight, tdd)
         }
         for (i in 0 until result.size()) {

From 3fa790307684278a53677da26750965cde2cb8c4 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 28 Jul 2020 22:33:34 +0200
Subject: [PATCH 365/400] New Crowdin updates (#2838)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations exam.xml (Italian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Romanian)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (French)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (German)

* New translations strings.xml (Italian)

* New translations strings.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Italian)
---
 app/src/main/res/values-af-rZA/strings.xml  |  3 -
 app/src/main/res/values-bg-rBG/strings.xml  | 12 ++-
 app/src/main/res/values-cs-rCZ/strings.xml  |  8 +-
 app/src/main/res/values-de-rDE/strings.xml  |  8 +-
 app/src/main/res/values-el-rGR/strings.xml  |  3 -
 app/src/main/res/values-es-rES/strings.xml  |  3 -
 app/src/main/res/values-fr-rFR/strings.xml  |  8 +-
 app/src/main/res/values-it-rIT/exam.xml     |  2 +-
 app/src/main/res/values-it-rIT/strings.xml  | 24 +++---
 app/src/main/res/values-ko-rKR/strings.xml  |  3 -
 app/src/main/res/values-lt-rLT/strings.xml  |  3 -
 app/src/main/res/values-nl-rNL/strings.xml  |  3 -
 app/src/main/res/values-pl-rPL/strings.xml  |  3 -
 app/src/main/res/values-pt-rBR/strings.xml  |  3 -
 app/src/main/res/values-pt-rPT/strings.xml  |  8 +-
 app/src/main/res/values-ro-rRO/strings.xml  | 94 ++++++++++++++++++++-
 app/src/main/res/values-ru-rRU/strings.xml  |  3 -
 app/src/main/res/values-sk-rSK/strings.xml  | 12 ++-
 app/src/main/res/values-sv-rSE/strings.xml  |  3 -
 app/src/main/res/values-tr-rTR/strings.xml  |  3 -
 app/src/main/res/values-zh-rCN/strings.xml  |  3 -
 core/src/main/res/values-bg-rBG/strings.xml |  1 +
 core/src/main/res/values-cs-rCZ/strings.xml |  1 +
 core/src/main/res/values-de-rDE/strings.xml |  2 +-
 core/src/main/res/values-it-rIT/strings.xml |  1 +
 core/src/main/res/values-pt-rPT/strings.xml |  1 +
 core/src/main/res/values-ro-rRO/strings.xml | 38 +++++++++
 core/src/main/res/values-sk-rSK/strings.xml |  3 +
 dana/src/main/res/values-ro-rRO/strings.xml | 37 ++++++++
 wear/src/main/res/values-ro-rRO/strings.xml | 55 ++++++++++++
 30 files changed, 281 insertions(+), 70 deletions(-)

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index c9b6fb57fd..585fb26204 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -528,7 +528,6 @@
     <string name="enablesmbwithtemptarget">Aktiveer SMB met tydelike doelwitte</string>
     <string name="enablesmbwithtemptarget_summary">Aktiveer SMB wanneer daar tydelike doelwitte aktief is (eetgou, oefen)</string>
     <string name="enablesmbwithhightemptarget">Aktiveer SMB met hoë tydelike doelwitte</string>
-    <string name="enablesmbwithhightemptarget_summary">Aktiveer SMB as daar hoë tydelike doelwitte aktief is (oefening)</string>
     <string name="overview_insulin_label">Insulien</string>
     <string name="overview_carbs_label">Karbs</string>
     <string name="overview_buttons_selection">Knoppies</string>
@@ -556,7 +555,6 @@
     <string name="do_not_bolus_record_only">Moet nie bolus. Rekord alleen</string>
     <string name="category">Kategorie</string>
     <string name="subcategory">Subkategorie</string>
-    <string name="bolusrecordedonly">Bolus sal slegs opgeneem word</string>
     <string name="ns_autobackfill_summary">Autobackfill vermiste BGs vanaf NS</string>
     <string name="loop_smbsetbypump_label">SMB gestel deur pomp</string>
     <string name="overview_show_activity">Aktiwiteit</string>
@@ -670,7 +668,6 @@
     <string name="startobjective">Begin jou eerste doelwit</string>
     <string name="permission">Toestemming</string>
     <string name="askforpermission">Vra vir toestemming</string>
-    <string name="needstoragepermission">Toepassing benodig stoor toestemming om log leers te skryf</string>
     <string name="request">Versoek</string>
     <string name="insulinsourcesetup">Konfigureer insulien plugin</string>
     <string name="exit">Uitgang</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 622ec2460d..877058d8e8 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Парола, която е била използвана за криптиране на експортираните настройки.</string>
     <string name="preferences_export_canceled">Експорт неуспешен! Настройките не са експортирани!</string>
     <string name="preferences_import_canceled">Импорт неуспешен! Настройките не са импортирани!</string>
+    <string name="preferences_import_impossible">Импортирането неуспешно!</string>
+    <string name="goto_main_try_again">Моля, върнете се на началния екран и опитайте отново.</string>
     <string name="preferences_import_list_title">Изберете файл</string>
     <string name="check_preferences_before_import">Моля, проверете насстройките преди импортирането:</string>
     <string name="check_preferences_cannot_import">Настройите не могат да бъдат импортирани!</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Разреши SMB с временни цели</string>
     <string name="enablesmbwithtemptarget_summary">Разрешава SMB, когато има активна временна цел на КЗ</string>
     <string name="enablesmbwithhightemptarget">Разреши SMB с по-високи временни цели на КЗ</string>
-    <string name="enablesmbwithhightemptarget_summary">Разрешава SMB когато има активна по-висока временна цел </string>
+    <string name="enablesmbwithhightemptarget_summary">Активирайте SMB, когато има висока временна цел (опитайте с над 100 мг/дл или 5,5 ммол/л)</string>
     <string name="overview_insulin_label">Инсулин</string>
     <string name="overview_carbs_label">Въглехидрати</string>
     <string name="overview_buttons_selection">Бутони</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">Не стартирай болус, а само запиши в базата данни</string>
     <string name="category">Категория</string>
     <string name="subcategory">Подкатегория</string>
-    <string name="bolusrecordedonly">Болусът ще бъде само записан</string>
+    <string name="bolusrecordedonly">Болус само ще се запише (няма да се стартира в помпа)</string>
     <string name="ns_autobackfill_summary">Допълни липсващи данни за КЗ от Nightscout</string>
     <string name="loop_smbsetbypump_label">SMB в помпата</string>
     <string name="overview_show_activity">Активност</string>
@@ -796,7 +798,7 @@
     <string name="askforpermission">Питане за разрешение</string>
     <string name="needsystemwindowpermission">ААПС изисква разрешение за да може да Ви уведомява</string>
     <string name="needlocationpermission">Приложение се нуждае от достъп до местоположението Ви за сканиране и WiFi идентификация</string>
-    <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове</string>
+    <string name="needstoragepermission">Приложението се нуждае от разрешение да съхранява данни за да може съхранява лог файлове и експортира настройки</string>
     <string name="request">Искане</string>
     <string name="insulinsourcesetup">Конфигуриране на модула за Инсулин</string>
     <string name="exit">Изход</string>
@@ -1237,6 +1239,7 @@
     <string name="nav_survey">Проучване</string>
     <string name="invalidage">Невалидна възраст</string>
     <string name="invalidweight">Невалидно тегло</string>
+    <string name="invalidpct">Невалидна стойност в %</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Ниски: <b>%2$02d%%</b> В: <b>%3$02d%%</b> Вис: <b>%4$02d%%</b>]]></string>
     <string name="average">Средно</string>
     <string name="tir">Време в границите</string>
@@ -1412,5 +1415,8 @@
     <string name="availableprofile">Наличен профил</string>
     <string name="profiletype">Профил тип</string>
     <string name="formatwithtdd">Възраст: %1$.0f TDD: %2$.0f Е</string>
+    <string name="formatwittddandpct">Възраст: %1$.0f TDD: %2$.0f Е %3$d%% </string>
     <string name="formatwithweight">Възраст: %1$.0f Тегло: %2$.0f кг</string>
+    <string name="basalpctfromtdd_label">% от базата</string>
+    <string name="dpvdefaultprofile">Профил по подразбиране</string>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 4c6bb272a8..6825f4e840 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Zobrazí se výzva k zadání hlavního hesla, které bude použito k dešifrování importovaných předvoleb.</string>
     <string name="preferences_export_canceled">Export zrušen! Předvolby NEBYLY exportovány!</string>
     <string name="preferences_import_canceled">Import zrušen! Předvolby NEBYLY importovány!</string>
+    <string name="preferences_import_impossible">Nelze naimportovat nastavení!</string>
+    <string name="goto_main_try_again">Prosím vraťte se zpět na hlavní obrazovku a zkuste to znovu.</string>
     <string name="preferences_import_list_title">Vyberte soubor, který chcete importovat</string>
     <string name="check_preferences_before_import">Před importem zkontrolujte předvolby:</string>
     <string name="check_preferences_cannot_import">Předvolby nelze importovat!</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Povolit SMB s dočasnými cíli</string>
     <string name="enablesmbwithtemptarget_summary">Povolit SMB, pokud je aktivní dočasný cíl (aktivita, blížící se jídlo)</string>
     <string name="enablesmbwithhightemptarget">Povolit SMB s vysokými dočasnými cíli</string>
-    <string name="enablesmbwithhightemptarget_summary">Povolit SMB, pokud je aktivní vysoký dočasný cíl (aktivita)</string>
+    <string name="enablesmbwithhightemptarget_summary">Povolit SMB, je-li aktivní vysoký cíl (cvičení, vyšší než 100 mg/dl nebo 5, 5 mmol/l)</string>
     <string name="overview_insulin_label">Inzulín</string>
     <string name="overview_carbs_label">Sacharidy</string>
     <string name="overview_buttons_selection">Tlačítka</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">Nepouštět bolus, jen zaznamenat</string>
     <string name="category">Kategorie</string>
     <string name="subcategory">Podkategorie</string>
-    <string name="bolusrecordedonly">Bolus bude pouze zaznamenán</string>
+    <string name="bolusrecordedonly">Bolus nebude pumpou vydán, pouze zaznamenán</string>
     <string name="ns_autobackfill_summary">Automaticky doplňovat chybějící glykémie z NS</string>
     <string name="loop_smbsetbypump_label">SMB provedené pumpou</string>
     <string name="overview_show_activity">Aktivita</string>
@@ -796,7 +798,7 @@
     <string name="askforpermission">Získat povolení</string>
     <string name="needsystemwindowpermission">Pro oznámení vyžaduje aplikace oprávnění systémového okna</string>
     <string name="needlocationpermission">Aplikace potřebuje oprávnění k přístupu k poloze kvůli skenování BT a WiFi identifikaci</string>
-    <string name="needstoragepermission">Aplikace vyžaduje přístup k úložišti, aby mohla ukládat logy</string>
+    <string name="needstoragepermission">Aby bylo možné nahrávat logy a exportovat nastavení, je nutné pro aplikaci povolit oprávnění přístupu k úložišti</string>
     <string name="request">Požadavek</string>
     <string name="insulinsourcesetup">Nastavení inzulínu</string>
     <string name="exit">Konec</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 5e18740785..032137f0a8 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die importierten Einstellungen entschlüsselt.</string>
     <string name="preferences_export_canceled">Export abgebrochen! Einstellungen wurden NICHT exportiert!</string>
     <string name="preferences_import_canceled">Import abgebrochen! Einstellungen wurden NICHT importiert!</string>
+    <string name="preferences_import_impossible">Einstellungen können nicht importiert werden!</string>
+    <string name="goto_main_try_again">Bitte gehe zurück zur Startseite und versuche es erneut.</string>
     <string name="preferences_import_list_title">Wähle die zu importierende Datei</string>
     <string name="check_preferences_before_import">Überprüfe die Einstellungen vor dem Import:</string>
     <string name="check_preferences_cannot_import">Einstellungen können nicht importiert werden!</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Aktiviere SMB bei aktiven temporären Zielen</string>
     <string name="enablesmbwithtemptarget_summary">Aktiviere SMB, wenn ein temporäres Ziel aktiv ist (bald essen, Aktivität)</string>
     <string name="enablesmbwithhightemptarget">Aktiviere SMB bei temporären Zielen oberhalb des regulären Ziels</string>
-    <string name="enablesmbwithhightemptarget_summary">Aktiviere SMB bei temporären Zielen oberhalb des regulären Ziels (Aktivität).</string>
+    <string name="enablesmbwithhightemptarget_summary">Aktiviere SMB bei hohen temporären Zielen (Sport, über 100 mg/dl bzw. 5,5 mmol/L)</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Kohlenhydrate</string>
     <string name="overview_buttons_selection">Schaltflächen</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">Bolus nur erfassen</string>
     <string name="category">Kategorie</string>
     <string name="subcategory">Unterkategorie</string>
-    <string name="bolusrecordedonly">Bolus wird nur erfasst.</string>
+    <string name="bolusrecordedonly">Bolus wird nur aufgezeichnet (Pumpe gibt kein Insulin ab!)</string>
     <string name="ns_autobackfill_summary">Lade fehlende Blutzuckerwerte automatisch aus Nightscout nach.</string>
     <string name="loop_smbsetbypump_label">SMB von der Pumpe abgegeben</string>
     <string name="overview_show_activity">Aktivität</string>
@@ -796,7 +798,7 @@
     <string name="askforpermission">Nach Berechtigung fragen</string>
     <string name="needsystemwindowpermission">Die App benötigt die Systemberechtigung für App-Benachrichtigungen</string>
     <string name="needlocationpermission">Die App benötigt die Berechtigung für den Standort, um Bluetooth und WLAN nutzen zu können</string>
-    <string name="needstoragepermission">AndroidAPS benötigt Zugriff auf den Speicher, um Log-Dateien speichern zu können.</string>
+    <string name="needstoragepermission">Die App benötigt Zugriffsrechte für den Speicher um Log-Dateien zu sichern und die Einstellungen zu exportieren.</string>
     <string name="request">Anfordern</string>
     <string name="insulinsourcesetup">Insulin-Plugin konfigurieren</string>
     <string name="exit">Verlassen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 02d5bb7ce8..0595f9aca8 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -534,7 +534,6 @@
     <string name="enablesmbwithtemptarget">Ενεργοποίηση SMB με προσωρινούς στόχους</string>
     <string name="enablesmbwithtemptarget_summary">Ενεργοποίηση του SMB όταν υπάρχει ενεργός προσωρινός στόχος (τρώω σύντομα, άσκηση)</string>
     <string name="enablesmbwithhightemptarget">Ενεργοποίηση SMB με υψηλούς προσωρινούς στόχους</string>
-    <string name="enablesmbwithhightemptarget_summary">Ενεργοποίηση SMB όταν υπάρχει ενεργός υψηλός προσωρινός στόχος (άσκηση)</string>
     <string name="overview_insulin_label">Ινσουλίνη</string>
     <string name="overview_carbs_label">Υδατάνθρακες</string>
     <string name="overview_buttons_selection">Πλήκτρα</string>
@@ -562,7 +561,6 @@
     <string name="do_not_bolus_record_only">Μην κάνετε bolus, μόνο να καταγράφετε</string>
     <string name="category">Κατηγορία</string>
     <string name="subcategory">Υποκατηγορία</string>
-    <string name="bolusrecordedonly">Το bolus θα εγγραφεί μόνο</string>
     <string name="ns_autobackfill_summary">Συμπληρώνεται αυτόματα η BG που λείπει από το NS</string>
     <string name="loop_smbsetbypump_label">Το SMB ρυθμίστηκε από την αντλία</string>
     <string name="overview_show_activity">Δραστηριότητα</string>
@@ -677,7 +675,6 @@
     <string name="startobjective">Ξεκινήστε τον πρώτο στόχο</string>
     <string name="permission">Άδεια</string>
     <string name="askforpermission">Ζητείστε άδεια</string>
-    <string name="needstoragepermission">Η εφαρμογή απαιτεί πρόσβαση στη μνήμη για την αποθήκευση αρχείων καταγραφής</string>
     <string name="request">Αίτημα</string>
     <string name="insulinsourcesetup">Ρυθμίστε την προσθήκη ινσουλίνης</string>
     <string name="exit">Έξοδος</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 60e9782a4c..fc33093c61 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -645,7 +645,6 @@
     <string name="enablesmbwithtemptarget">Habilitar SMB con Objetivos Temporales</string>
     <string name="enablesmbwithtemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) activo (ComerPronto, Actividad)</string>
     <string name="enablesmbwithhightemptarget">Habilitar SMB con Objetivo Temporal Alto</string>
-    <string name="enablesmbwithhightemptarget_summary">Habilitar SMB cuando hay un Objetivo Temporal (TT) ALTO  activo (Actividad)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carbohidratos</string>
     <string name="overview_buttons_selection">Botones</string>
@@ -679,7 +678,6 @@
     <string name="do_not_bolus_record_only">No administrar Bolo, solo anotar</string>
     <string name="category">Categoría</string>
     <string name="subcategory">Subcategoría</string>
-    <string name="bolusrecordedonly">El Bolo sólo será anotado</string>
     <string name="ns_autobackfill_summary">Rellenar BGs perdidos desde NS</string>
     <string name="loop_smbsetbypump_label">SMB administrado por bomba</string>
     <string name="overview_show_activity">Actividad</string>
@@ -796,7 +794,6 @@
     <string name="askforpermission">Pedir permiso</string>
     <string name="needsystemwindowpermission">La aplicación necesita permiso de ventana del sistema para las notificaciones</string>
     <string name="needlocationpermission">La aplicación necesita permiso de ubicación para la exploración de BT e identificación de WiFi</string>
-    <string name="needstoragepermission">La aplicación necesita permiso para guardar los logs</string>
     <string name="request">Solicitar</string>
     <string name="insulinsourcesetup">Configurar complemento de insulina</string>
     <string name="exit">Salir</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index bf36876d6b..cd7096a57b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Le mot de passe principal vous sera demandé pour décrypter les préférences exportées.</string>
     <string name="preferences_export_canceled">Export annulé ! Les préférences n\'ont PAS été exportées !</string>
     <string name="preferences_import_canceled">Import annulé ! Les préférences n\'ont PAS été importées !</string>
+    <string name="preferences_import_impossible">Impossible d\'importer les préférences !</string>
+    <string name="goto_main_try_again">Veuillez retourner à l\'écran principal et réessayer.</string>
     <string name="preferences_import_list_title">Sélectionner le fichier à importer</string>
     <string name="check_preferences_before_import">Vérifiez les préférences avant d\'importer :</string>
     <string name="check_preferences_cannot_import">Les préférences ne peuvent pas être importées !</string>
@@ -646,7 +648,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="enablesmbwithtemptarget">Activer SMB avec les cibles temporaires</string>
     <string name="enablesmbwithtemptarget_summary">Activer SMB lorsqu\'il y a une cible temporaire active (repas imminent, exercise)</string>
     <string name="enablesmbwithhightemptarget">Activer SMB avec cibles temp. hautes</string>
-    <string name="enablesmbwithhightemptarget_summary">Activer SMB lorsqu\'il y a une cible temporaire haute (activités, exercice,..)</string>
+    <string name="enablesmbwithhightemptarget_summary">Activer les SMB quand il y a une cible temp haute active (exercise, au dessus de 100 mg/dl ou 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insuline</string>
     <string name="overview_carbs_label">Glucides</string>
     <string name="overview_buttons_selection">Boutons</string>
@@ -680,7 +682,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="do_not_bolus_record_only">Ne pas administrer de bolus, enregistrer uniquement</string>
     <string name="category">Catégorie</string>
     <string name="subcategory">Sous-catégorie</string>
-    <string name="bolusrecordedonly">Le bolus sera seulement enregistré</string>
+    <string name="bolusrecordedonly">Les bolus seront seulement enregistrés (pas délivrés par la pompe)</string>
     <string name="ns_autobackfill_summary">Remplissage automatique des glycémies manquantes en utilisant NS</string>
     <string name="loop_smbsetbypump_label">SMB défini par la pompe</string>
     <string name="overview_show_activity">Activité</string>
@@ -797,7 +799,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="askforpermission">Demande d\'autorisation</string>
     <string name="needsystemwindowpermission">L\'application a besoin de l\'autorisation d\'accès à la fenêtre système pour les notifications</string>
     <string name="needlocationpermission">L\'application a besoin de l\'autorisation de localisation pour l\'analyse BT et l\'identification WiFi</string>
-    <string name="needstoragepermission">L\'application requiert une autorisation de stockage de données afin de pouvoir sauvegarder les fichiers journaux</string>
+    <string name="needstoragepermission">L\'application a besoin d\'une autorisation de stockage pour pouvoir stocker les fichiers journaux et les paramètres d\'exportation</string>
     <string name="request">Demande</string>
     <string name="insulinsourcesetup">Configurer le plugin d\'insuline</string>
     <string name="exit">Quitter</string>
diff --git a/app/src/main/res/values-it-rIT/exam.xml b/app/src/main/res/values-it-rIT/exam.xml
index 34cc88ff23..ee7e7dc4d6 100644
--- a/app/src/main/res/values-it-rIT/exam.xml
+++ b/app/src/main/res/values-it-rIT/exam.xml
@@ -25,7 +25,7 @@
     <string name="objectives_label">Argomento: impostazioni di AndroidAPS</string>
     <string name="objectives_howtosave">Quali sono le migliori pratiche per il backup delle impostazioni?</string>
     <string name="objectives_exportsettings">Esportarle localmente dal menu Manutenzione.</string>
-    <string name="objectives_storeelsewhere">Salvare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
+    <string name="objectives_storeelsewhere">Memorizzare il file esportato in un altro posto come l\'email, Dropbox, Google drive…</string>
     <string name="objectives_doexportonstart">Esportarle subito dopo l\'installazione di AAPS.</string>
     <string name="objectives_doexportafterchange">Esportarle dopo aver fatto modifiche d\'impostazione.</string>
     <string name="objectives_doexportafterobjective">Esportarle dopo il completamento di un obiettivo.</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index fcc302b530..dba67ec9a7 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -14,7 +14,7 @@
     <string name="nav_exit">Esci</string>
     <string name="ns_sync_use_absolute_title">Utilizza sempre valori basali assoluti</string>
     <string name="alert_dialog_storage_permission_text">Per favore riavvia il tuo telefono oppure fai ripartire AndroidAPS dalle impostazioni di sistema \naltrimenti Android APS non farà il log (è importante monitorare e verificare che gli algoritmi stiano funzionando correttamente)!</string>
-    <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione della batteria: potrebbero verificarsi problemi di prestazioni.</string>
+    <string name="alert_dialog_permission_battery_optimization_failed">Questo dispositivo non sembra supportare la whitelist dell\'ottimizzazione batteria: potrebbero verificarsi problemi di prestazioni.</string>
     <string name="description_actions">Alcuni tasti per accedere rapidamente alle funzioni comuni</string>
     <string name="description_config_builder">Utilizzato per configurare i plugin attivi</string>
     <string name="description_objectives">Programma di apprendimento</string>
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Ti verrà chiesta la password master, che è necessaria per decrittare le preferenze importate.</string>
     <string name="preferences_export_canceled">Esportazione annullata! Le preferenze NON sono state esportate!</string>
     <string name="preferences_import_canceled">Importazione annullata! Le preferenze NON sono state importate!</string>
+    <string name="preferences_import_impossible">Impossibile importare le preferenze!</string>
+    <string name="goto_main_try_again">Torna alla schermata principale e riprova.</string>
     <string name="preferences_import_list_title">Seleziona il file da importare</string>
     <string name="check_preferences_before_import">Verifica le preferenze prima dell\'importazione:</string>
     <string name="check_preferences_cannot_import">Le preferenze non possono essere importate!</string>
@@ -393,7 +395,7 @@
     <string name="status">Stato:</string>
     <string name="paused">In pausa</string>
     <string name="clearlog">Cancella log</string>
-    <string name="nowritepermission">NSCLIENT non ha il permesso di scrittura. API secret errato?</string>
+    <string name="nowritepermission">NSCLIENT non ha l\'autorizzazione di scrittura. API secret errato?</string>
     <string name="wear_settings">Impostazioni smartwatch</string>
     <string name="wear_detailedIOB_title">Mostra IOB dettagliato</string>
     <string name="wear_detailedIOB_summary">Dividi IOB in bolo e basale sulla watchface</string>
@@ -592,7 +594,7 @@
     <string name="overview_editquickwizard_usetemptarget">Calcolo target temporaneo</string>
     <string name="loopenabled">Loop abilitato</string>
     <string name="apsselected">APS selezionato</string>
-    <string name="nsclienthaswritepermission">NSClient ha il permesso di scrittura</string>
+    <string name="nsclienthaswritepermission">NSClient ha l\'autorizzazione di scrittura</string>
     <string name="closedmodeenabled">Modalità chiusa abilitata</string>
     <string name="maxiobset">Max IOB impostata correttamente</string>
     <string name="hasbgdata">BG disponibile da sorgente selezionata</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Abilita SMB con target temporanei</string>
     <string name="enablesmbwithtemptarget_summary">Abilita SMB quando è attivo un target temporaneo (pasto a breve, attività fisica)</string>
     <string name="enablesmbwithhightemptarget">Abilita SMB con target temporanei \"alti\"</string>
-    <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando è attivo un target temporaneo \"alto\"</string>
+    <string name="enablesmbwithhightemptarget_summary">Abilita SMB quando è attivo un target temporaneo \"alto\" (attività fisica, sopra 100 mg/dl o 5.5 mmol/l)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">CHO</string>
     <string name="overview_buttons_selection">Tasti</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">No bolo, solo record</string>
     <string name="category">Categoria</string>
     <string name="subcategory">Sottocategoria</string>
-    <string name="bolusrecordedonly">Il bolo sarà solo registrato</string>
+    <string name="bolusrecordedonly">Il bolo sarà solo registrato (non erogato dal micro)</string>
     <string name="ns_autobackfill_summary">Riempimento automatico glicemie mancanti da NS</string>
     <string name="loop_smbsetbypump_label">SMB impostato dal micro</string>
     <string name="overview_show_activity">Attività</string>
@@ -792,11 +794,11 @@
     <string name="setupwizard_profile_description">Seleziona il tipo di profilo. Se il paziente è un bambino dovresti utilizzare il profilo di NS. Se non c\'è nessuno a seguirti su Nightscout probabilmente preferirai il profilo locale. Ricorda che stai solo selezionando la sorgente del profilo. Per utilizzarlo devi attivarlo tramite l\'esecuzione del comando \"Cambio profilo\"</string>
     <string name="setupwizard_aps_description">Seleziona uno degli algoritmi disponibili. Sono ordinati dal più vecchio al più recente. L\'algoritmo più recente è solitamente più potente e più aggressivo. Pertanto, se sei un nuovo utente, probabilmente dovresti iniziare con AMA e non con l\'ultimo. Non dimenticare di leggere la documentazione di OpenAPS e di configurarlo prima dell\'uso.</string>
     <string name="startobjective">Avvia il tuo primo obiettivo</string>
-    <string name="permission">Permesso</string>
-    <string name="askforpermission">Chiedi il permesso</string>
-    <string name="needsystemwindowpermission">L\'applicazione richiede il permesso finestra di sistema per le notifiche</string>
+    <string name="permission">Autorizzazione</string>
+    <string name="askforpermission">Chiedi l\'autorizzazione</string>
+    <string name="needsystemwindowpermission">L\'applicazione richiede l\'autorizzazione \"finestra di sistema\" per le notifiche</string>
     <string name="needlocationpermission">L\'applicazione richiede l\'accesso alla posizione per la scansione bluetooth e l\'identificazione WiFi</string>
-    <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per salvare i file di log</string>
+    <string name="needstoragepermission">L\'applicazione richiede l\'accesso alla memoria per memorizzare i file di log ed esportare le impostazioni</string>
     <string name="request">Richiesta</string>
     <string name="insulinsourcesetup">Configura il plugin Insulina</string>
     <string name="exit">Esci</string>
@@ -820,7 +822,7 @@
     <string name="combo_invalid_setup">Configurazione micro non valida, controlla la documentazione e verifica che il menu Quick Info sia denominato QUICK INFO utilizzando \"360 configuration software\".</string>
     <string name="custom">Personalizzato</string>
     <string name="careportal_removestartedevents">Rimuovi gli eventi \"AndroidAPS avviato\"</string>
-    <string name="storedsettingsfound">Trovate impostazioni salvate</string>
+    <string name="storedsettingsfound">Trovate impostazioni memorizzate</string>
     <string name="allow_hardware_pump_text">Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento.</string>
     <string name="error_adding_treatment_title">Dati trattamento incompleti</string>
     <string name="maintenance_settings">Impostazioni manutenzione</string>
@@ -999,7 +1001,7 @@
     <string name="running_invalid_version">Abbiamo rilevato che stai eseguendo una versione non valida. Loop disabilitato!</string>
     <string name="old_version">versione datata</string>
     <string name="very_old_version">versione molto datata</string>
-    <string name="new_version_warning">Nuova versione disponibile per almeno %1$d giorni! Ritorno a LGS dopo %2$d giorni, disattivazione del loop dopo %3$d giorni</string>
+    <string name="new_version_warning">Nuova versione disponibile da almeno %1$d giorni! Ritorno a LGS dopo %2$d giorni, disattivazione del loop dopo %3$d giorni</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Dexcom app (modificata)</string>
     <string name="dexcom_short">DXCM</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index b2b0e5affa..2a7b6512dd 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -557,7 +557,6 @@
     <string name="enablesmbwithtemptarget">임시 목표에서 SMB 사용하기</string>
     <string name="enablesmbwithtemptarget_summary">활성화된 임시 목표(식사직전, 운동)가 있으면 SMB를 사용합니다.</string>
     <string name="enablesmbwithhightemptarget">높은 임시 목표에서 SMB 사용하기</string>
-    <string name="enablesmbwithhightemptarget_summary">활성화된 높은 임시 목표(운동)가 있으면 SMB를 사용합니다.</string>
     <string name="overview_insulin_label">인슐린</string>
     <string name="overview_carbs_label">탄수화물</string>
     <string name="overview_buttons_selection">버튼</string>
@@ -585,7 +584,6 @@
     <string name="do_not_bolus_record_only">실제 Bolus 주입않고, 기록만 하기</string>
     <string name="category">분류</string>
     <string name="subcategory">하위 분류</string>
-    <string name="bolusrecordedonly">Bolus가 기록만 됩니다.</string>
     <string name="ns_autobackfill_summary">NS에서 누락된 혈당이 자동으로 채워집니다.</string>
     <string name="loop_smbsetbypump_label">펌프에 의한 SMB 설정</string>
     <string name="overview_show_activity">활동</string>
@@ -701,7 +699,6 @@
     <string name="permission">권한</string>
     <string name="askforpermission">권한 요청하기</string>
     <string name="needsystemwindowpermission">알림에 대한 시스템 창 권한이 필요합니다</string>
-    <string name="needstoragepermission">로그 파일을 저장하기 위해 저장공간 권한이 필요로 합니다.</string>
     <string name="request">요청</string>
     <string name="insulinsourcesetup">인슐린 플러그인 설정하기</string>
     <string name="exit">종료</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 3a4999bb69..ecf21771c3 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -645,7 +645,6 @@
     <string name="enablesmbwithtemptarget">Įjungti SMB su laikinais tikslais</string>
     <string name="enablesmbwithtemptarget_summary">Įjungti SMB, kai laikinas tikslas aktyvuotas (Netrukus valgysiu, Aktyvumas)</string>
     <string name="enablesmbwithhightemptarget">Įjungti SMB su intensyviais laikinais tikslais</string>
-    <string name="enablesmbwithhightemptarget_summary">Įjungti SMB, kai intensyvūs laikini tikslai yra aktyvūs (sportuosite)</string>
     <string name="overview_insulin_label">Insulinas</string>
     <string name="overview_carbs_label">AV</string>
     <string name="overview_buttons_selection">Mygtukai</string>
@@ -679,7 +678,6 @@
     <string name="do_not_bolus_record_only">Boluso nesuleisti, tik įrašyti</string>
     <string name="category">Kategorija</string>
     <string name="subcategory">Subkategorija</string>
-    <string name="bolusrecordedonly">Bolusas bus tik įrašytas</string>
     <string name="ns_autobackfill_summary">Automatiškai atstatyti trūkstamus KG duomenis iš NS</string>
     <string name="loop_smbsetbypump_label">SMB nustatyta iš pompos</string>
     <string name="overview_show_activity">Aktyvumas</string>
@@ -796,7 +794,6 @@
     <string name="askforpermission">Prašyti leidimo</string>
     <string name="needsystemwindowpermission">Norint gauti pranešimus, programai reikalingas sisteminio lango leidimas</string>
     <string name="needlocationpermission">Programai reikia vietos nustatymo leidimo, kad būtų galima naudoti Bluetooth ir WiFi</string>
-    <string name="needstoragepermission">Aplikacijai reikia leidimo prieigai prie saugyklos, kad galėtų išsaugoti žurnalo įrašus</string>
     <string name="request">Užklausa</string>
     <string name="insulinsourcesetup">Konfigūruoti insulino įskiepį</string>
     <string name="exit">Išeiti</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 6257a7d4ee..7b56429f33 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -645,7 +645,6 @@
     <string name="enablesmbwithtemptarget">Gebruik SMB met tijdelijke streefdoelen</string>
     <string name="enablesmbwithtemptarget_summary">Gebruik SMB bij een actief tijdelijk streefdoel (eet binnenkort, activiteit)</string>
     <string name="enablesmbwithhightemptarget">Gebruik SMB met een hoog tijdelijk streefdoel</string>
-    <string name="enablesmbwithhightemptarget_summary">Gebruik SMB tijdens een verhoogd tijdelijk doel (Inspanningen)</string>
     <string name="overview_insulin_label">Insuline</string>
     <string name="overview_carbs_label">Koolhydraten</string>
     <string name="overview_buttons_selection">Knoppen</string>
@@ -679,7 +678,6 @@
     <string name="do_not_bolus_record_only">Geen bolus toedienen enkel in behandelingen zetten</string>
     <string name="category">Categorie</string>
     <string name="subcategory">Subcategorie</string>
-    <string name="bolusrecordedonly">Bolus zal enkel opgeslagen worden</string>
     <string name="ns_autobackfill_summary">Automatische onbekende BGs aanvullen van NS</string>
     <string name="loop_smbsetbypump_label">SMB op de pomp ingesteld</string>
     <string name="overview_show_activity">Activiteit</string>
@@ -796,7 +794,6 @@
     <string name="askforpermission">Vragen om toestemming</string>
     <string name="needsystemwindowpermission">Toepassing vereist systeemvenstermachtiging voor meldingen</string>
     <string name="needlocationpermission">App heeft locatie toestemming nodig voor Bluetooth scan en WiFi identificatie</string>
-    <string name="needstoragepermission">Applicatie heeft toestemming nodig om log bestanden op te kunnen slaan</string>
     <string name="request">Verzoek</string>
     <string name="insulinsourcesetup">Gevoeligheid plugin configureren</string>
     <string name="exit">Afsluiten</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index fbdaaf5521..adae717203 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -646,7 +646,6 @@
     <string name="enablesmbwithtemptarget">Włącz SMB z tymczasowym poziomem docelowym (TT)</string>
     <string name="enablesmbwithtemptarget_summary">Włącz SMB gdy tymczasowy poziom docelowy (TT) jest aktywny (TT WkrótcePosiłek, TT ćwiczenia)</string>
     <string name="enablesmbwithhightemptarget">Włącz SMB z wysokim tymczasowym poziomem docelowym</string>
-    <string name="enablesmbwithhightemptarget_summary">Włącz SMB gdy wysoki tymczasowy poziom docelowy jest aktywny (TT ćwiczenia)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Węglowod.</string>
     <string name="overview_buttons_selection">Przyciski</string>
@@ -680,7 +679,6 @@
     <string name="do_not_bolus_record_only">Nie podawaj bolusa, tylko zapisz rekord</string>
     <string name="category">Kategoria</string>
     <string name="subcategory">Podkategoria</string>
-    <string name="bolusrecordedonly">Bolus zostanie tylko zapisany w rekordach</string>
     <string name="ns_autobackfill_summary">Automatycznie wypełnij brakujące BG z NS</string>
     <string name="loop_smbsetbypump_label">SMB ustawiony przez pompę</string>
     <string name="overview_show_activity">Aktywność</string>
@@ -797,7 +795,6 @@
     <string name="askforpermission">Zapytaj o uprawnienia</string>
     <string name="needsystemwindowpermission">Aplikacja wymaga uprawnienia systemowego okna dla powiadomień</string>
     <string name="needlocationpermission">Aplikacja wymaga dostępu do lokalizacji dla zarządzania bluetoothem i identyfikacją Wi-Fi</string>
-    <string name="needstoragepermission">Aplikacja wymaga dostępu do magazynu plików, aby móc przechować pliki logów</string>
     <string name="request">Żądanie</string>
     <string name="insulinsourcesetup">Skonfiguruj wtyczkę insuliny</string>
     <string name="exit">Wyjście</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b7cbff5ccf..0715e9d177 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -615,7 +615,6 @@
     <string name="enablesmbwithtemptarget">SMB activo com valores alvo temporários</string>
     <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
     <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
-    <string name="enablesmbwithhightemptarget_summary">SMB activo com alvos temporários elevados em curso (exercicio)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Carbos</string>
     <string name="overview_buttons_selection">Botões</string>
@@ -646,7 +645,6 @@
     <string name="do_not_bolus_record_only">Sem bólus, registar apenas</string>
     <string name="category">Categoria</string>
     <string name="subcategory">Subcategoria</string>
-    <string name="bolusrecordedonly">O bolus apenas será gravado</string>
     <string name="ns_autobackfill_summary">Preencher glicemias em falta com NS</string>
     <string name="loop_smbsetbypump_label">SMB definido pela bomba</string>
     <string name="overview_show_activity">Atividade</string>
@@ -762,7 +760,6 @@
     <string name="permission">Permissão</string>
     <string name="askforpermission">Pedir permissão</string>
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
-    <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
     <string name="exit">Sair</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index fe8fa28420..94e1553640 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas.</string>
     <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
     <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
+    <string name="preferences_import_impossible">Não é possível importar as preferências!</string>
+    <string name="goto_main_try_again">Por favor, volte ao ecrã principal e tente novamente.</string>
     <string name="preferences_import_list_title">Seleccione o ficheiro para importação</string>
     <string name="check_preferences_before_import">Por favor, verifique as preferências antes da importação:</string>
     <string name="check_preferences_cannot_import">Preferências não podem ser importadas!</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">SMB activo com valores alvo temporários</string>
     <string name="enablesmbwithtemptarget_summary">SMB activo quando há valor alvo temporário activo (exercício, etc)</string>
     <string name="enablesmbwithhightemptarget">SMB activo com alvos temporários elevados</string>
-    <string name="enablesmbwithhightemptarget_summary">SMB activo com alvos temporários elevados em curso (exercicio)</string>
+    <string name="enablesmbwithhightemptarget_summary">Activar SMB quando há alvo temporário elevado activo (exercício, acima de 100 mg/dl ou 5,5 mmol/l)</string>
     <string name="overview_insulin_label">Insulina</string>
     <string name="overview_carbs_label">Hidratos</string>
     <string name="overview_buttons_selection">Botões</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">Sem bólus, registar apenas</string>
     <string name="category">Categoria</string>
     <string name="subcategory">Subcategoria</string>
-    <string name="bolusrecordedonly">O bolus apenas será gravado</string>
+    <string name="bolusrecordedonly">Bólus será registado apenas (não administrado pela bomba)</string>
     <string name="ns_autobackfill_summary">Preencher glicemias em falta com NS</string>
     <string name="loop_smbsetbypump_label">SMB definido pela bomba</string>
     <string name="overview_show_activity">Actividade</string>
@@ -796,7 +798,7 @@
     <string name="askforpermission">Pedir permissão</string>
     <string name="needsystemwindowpermission">Aplicação precisa de permissão de janela do sistema para notificações</string>
     <string name="needlocationpermission">Aplicação necessita de permissão de localização para pesquisa Bluetooth e identificação Wi-Fi</string>
-    <string name="needstoragepermission">Aplicação necessita da permissão de armazenamento para ser capaz de armazenar ficheiros de registo</string>
+    <string name="needstoragepermission">Aplicação precisa da permissão de armazenamento para poder armazenar ficheiros de registo e exportar configurações</string>
     <string name="request">Pedido</string>
     <string name="insulinsourcesetup">Configurar plugin Insulina</string>
     <string name="exit">Sair</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index d3db306fff..7b45c672a3 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Vi se va solicita parola principală, care este necesară pentru a decripta setările importate.</string>
     <string name="preferences_export_canceled">Exportarea a eșuat! Preferințele NU au fost exportate!</string>
     <string name="preferences_import_canceled">Importarea a eșuat! Preferințele NU au fost importate!</string>
+    <string name="preferences_import_impossible">Nu se pot prelua setările!</string>
+    <string name="goto_main_try_again">Mergeți la ecranul principal și încercați din nou.</string>
     <string name="preferences_import_list_title">Selectați fișierul pentru import</string>
     <string name="check_preferences_before_import">Verificați preferințele înainte de a le importa:</string>
     <string name="check_preferences_cannot_import">Preferințele nu pot fi importate!</string>
@@ -300,6 +302,7 @@
     <string name="primefill">Pregătire/umplere</string>
     <string name="fillwarning">Asigurați-vă că aveți cantitatea specificată de instrucțiunile setului de infuzie!</string>
     <string name="othersettings_title">Alte</string>
+    <string name="fillbolus_title">Umplere/Amorsare folosind cantitățile standard de insulină</string>
     <string name="button1">Buton 1</string>
     <string name="button2">Buton 2</string>
     <string name="button3">Buton 3</string>
@@ -644,7 +647,6 @@
     <string name="enablesmbwithtemptarget">Activează SMB cu ținte temporare</string>
     <string name="enablesmbwithtemptarget_summary">Activează SMB chiar atunci când este o țintă temporară activă (mâncare in curând, exerciții fizice)</string>
     <string name="enablesmbwithhightemptarget">Activează SMB cu ținte temporare mari</string>
-    <string name="enablesmbwithhightemptarget_summary">Activează SMB atunci când există o țintă temporară mare activă (exerciții fizice)</string>
     <string name="overview_insulin_label">Insulină</string>
     <string name="overview_carbs_label">Carbohidrați</string>
     <string name="overview_buttons_selection">Butoane</string>
@@ -678,7 +680,7 @@
     <string name="do_not_bolus_record_only">Nu bolusa, doar înregistrează</string>
     <string name="category">Categorie</string>
     <string name="subcategory">Subcategorie</string>
-    <string name="bolusrecordedonly">Bolusul se va înregistra doar</string>
+    <string name="bolusrecordedonly">Bolusul va fi doar consemnat (nu va fi livrat de pompă)</string>
     <string name="ns_autobackfill_summary">Autocompletează valorile glicemiei lipsă din NS</string>
     <string name="loop_smbsetbypump_label">SMB setat de pompă</string>
     <string name="overview_show_activity">Activitate</string>
@@ -795,7 +797,7 @@
     <string name="askforpermission">Solicitați permisiunea</string>
     <string name="needsystemwindowpermission">Aplicația are nevoie de permisiune la fereastra sistemului pentru a afișa notificări</string>
     <string name="needlocationpermission">Aplicația are nevoie sa acceseze locația pentru scanare Bluetooth și identificare WiFi</string>
-    <string name="needstoragepermission">Aplicația necesită permisiune de acces la mediul de stocare pentru a putea înregistra jurnalele</string>
+    <string name="needstoragepermission">Aplicația are nevoie de permisiunea de a accesa unitatea de stocare pentru a scrie fișierele registru și pentru a exporta setările</string>
     <string name="request">Cerință</string>
     <string name="insulinsourcesetup">Configurați plugin insulină</string>
     <string name="exit">Ieșire</string>
@@ -823,6 +825,7 @@
     <string name="allow_hardware_pump_text">Atenție: Dacă activați și conectați o pompă fizică, AndroidAPS va copia setările bazalelor din profilurile din aplicație în pompă, suprascriindu-le pe cele existente deja în pompă. Asigurați-vă că aveți setările corecte ale bazalelor în AndroidAPS. Dacă aveți dubii sau nu doriți suprascrierea setărilor bazalelor existente în pompă, apăsați butonul de anulare și repetați acțiunea mai târziu.</string>
     <string name="error_adding_treatment_title">Date incomplete despre tratament</string>
     <string name="maintenance_settings">Setări de întreținere</string>
+    <string name="maintenance_email">Destinatar email</string>
     <string name="maintenance_encrypt_exported_prefs">Criptează setările exportate</string>
     <string name="maintenance_amount">Nr de loguri de trimis</string>
     <string name="maintenance">Mentenanță</string>
@@ -868,6 +871,7 @@
     <string name="disable_vibration">Dezactivează vibrațiile la livrarea manuală de bolus</string>
     <string name="disable_vibration_summary">Pentru bolus și bolus extins (valabil doar cu modelul Insight firmware 3.x)</string>
     <string name="disable_vibration_auto">Dezactivați vibrațiile la livrarea automată de bolus</string>
+    <string name="disable_vibration_auto_summary">Pentru SMB şi Bazale Temporare cu emulare de TBR (disponibil doar cu Insight firmware 3.x)</string>
     <string name="disconnect_delay">Întârziere a deconectării [s]</string>
     <string name="serial_number">Număr de serie</string>
     <string name="release_software_version">Versiunea de software</string>
@@ -972,6 +976,8 @@
     <string name="tidepool_upload_tbr">Înregistrează bazalele temporare</string>
     <string name="tidepool_upload_profile">Înregistrează schimbările de profil, țintele temporare</string>
     <string name="tidepool_upload_bg">Înregistrează testările de glicemie</string>
+    <string name="dst_in_24h_warning">Schimbare oră vară/iarnă în mai puțin de 24h</string>
+    <string name="dst_loop_disabled_warning">Schimbare oră vară/iarnă în mai puțin de 3 ore - buclă închisă dezactivată</string>
     <string name="storage">restricție de stocare internă</string>
     <string name="diskfull">Eliberați cel puțin %1$d MB din spațiunl de stocare al telefonlui! Buclă dezactivată!</string>
     <string name="wrongformat">Format greșit</string>
@@ -994,6 +1000,7 @@
     <string name="running_invalid_version">S-a detectat rularea unei versiuni invalide. Buclă dezactivată!</string>
     <string name="old_version">versiune veche</string>
     <string name="very_old_version">versiune foarte veche</string>
+    <string name="new_version_warning">O versiune nouă este disponibilă de cel puțin %1$d zile! Reveniți la LGS după %2$d zile, bucla închisă va fi dezactivată după %3$d zile</string>
     <string name="twohours">2h</string>
     <string name="dexcom_app_patched">Aplicația Dexcom (modificată)</string>
     <string name="dexcom_short">DXCM</string>
@@ -1008,6 +1015,8 @@
     <string name="exists">există</string>
     <string name="notexists">nu există</string>
     <string name="temptargetcompared">Țintă temporară %1$s</string>
+    <string name="btdevicecompared">Conexiune Bluetooth cu dispozitivul %1$s %2$s</string>
+    <string name="btdevice">Conexiune la dispozitivul Bluetooth </string>
     <string name="wifissidcompared">WiFi SSID %1$s %2$s</string>
     <string name="autosenscompared">Autosens %1$s %2$s %%</string>
     <string name="autosenslabel">Autosens %</string>
@@ -1022,12 +1031,18 @@
     <string name="name_short">Nume:</string>
     <string name="locationis">%1$s %2$s</string>
     <string name="location_mode">Când </string>
+    <string name="location_inside">Când sunteți în interiorul zonei</string>
+    <string name="location_outside">Când sunteți în afara zonei</string>
+    <string name="location_going_in">Când intrați în zona numită</string>
+    <string name="location_going_out">Când părăsiți zona numită</string>
     <string name="lastboluslabel">Ultimul bolus</string>
     <string name="lastboluscompared">Ultimul bolus acum %1$s %2$s min</string>
     <string name="triggercoblabel">COB</string>
     <string name="cobcompared">COB %1$s %2$.0f</string>
     <string name="taskname">Numele acțiunii</string>
     <string name="edit_short">EDITARE</string>
+    <string name="please_choose_an_action_type">Selectați tipul de acțiune</string>
+    <string name="please_choose_a_trigger_type">Selectați un tip de factor declanșator</string>
     <string name="triggers">Declanșatori:</string>
     <string name="remove_label">ȘTERGE</string>
     <string name="preconditions">Condiții pre-existente:</string>
@@ -1057,6 +1072,7 @@
     <string name="medtronic_pump_battery_lithium">Litiu (Afișare extinsă)</string>
     <string name="medtronic_pump_battery_nizn">NiZn (Afișare extinsă)</string>
     <string name="medtronic_pump_battery_nimh">NiMH (Afișare extinsă)</string>
+    <string name="medtronic_bolus_debugging">Depanare Bolus/Tratamente</string>
     <!-- RL BLE Scanning -->
     <string name="rileylink_scanner_scan_scan">SCAN</string>
     <string name="rileylink_scanner_scan_stop">STOP</string>
@@ -1116,6 +1132,7 @@
     <string name="medtronic_error_pump_frequency_invalid">Frecvența pompei nesuportată.</string>
     <string name="medtronic_error_rileylink_address_invalid">Adresa RileyLink invalidă.</string>
     <string name="medtronic_error_pump_type_set_differs_from_detected">Tipul de pompă detectat nu corespunde cu cel configurat.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Setările de profil/șablon bazale nu sunt activate în pompă. Vă rugăm să le activați din pompă.</string>
     <string name="medtronic_error_pump_incorrect_basal_profile_selected">Tipul de profil bazal setat în pompă este incorect (trebuie să fie STD).</string>
     <string name="medtronic_error_pump_wrong_tbr_type_set">Tip incorect de RBT setat în pompă (trebuie să fie Absolut).</string>
     <string name="medtronic_error_pump_wrong_max_bolus_set">Bolus maxim setat incorect în pompă (trebuie să fie %1$.2f).</string>
@@ -1166,6 +1183,7 @@
     <string name="automation_trigger_pump_last_connection_description">Ultima conexiune la pompă [minute în urmă]</string>
     <string name="automation_trigger_pump_last_connection_compared">Ultima conexiune la pompă %1$s %2$s minute în urmă</string>
     <string name="sendsmsactionlabel">Trimite SMS: %1$s</string>
+    <string name="sendsmsactiondescription">Trimite SMS către toate numerele</string>
     <string name="sendsmsactiontext">Trimite SMS cu text</string>
     <string name="insulinFromCob"><![CDATA[COB vs IOB: <font color=\'%1$s\'>%2$+.2fU</font>]]></string>
     <string name="bolusconstraintappliedwarning"><![CDATA[<font color=\'%1$s\'>Restricție de bolus aplicată: %2$.2fU la %3$.2fU</font>]]></string>
@@ -1188,29 +1206,50 @@
     <string name="profile_name">Nume profil:</string>
     <string name="selected_profile">Selectat:</string>
     <string name="unitsnosemicolon">Unități</string>
+    <string name="doyouwantswitchprofile">Doriți să schimbați profilul și să renunțați la modificările făcute profilului curent?</string>
     <string name="format_carbs">%1$dg</string>
     <string name="common_on">Pornit</string>
     <string name="common_off">Oprit</string>
+    <string name="objectives_button_unfinish">Șterge starea \"Terminat\"</string>
+    <string name="objectives_button_unstart">Șterge starea \"Început\"</string>
+    <string name="doyouwantresetstart">Doriți să reîncepeți obiectivul? Vă puteți pierde progresul.</string>
+    <string name="time_or_timezone_change">Schimbare oră și/sau fus orar în pompă</string>
     <string name="nopumpselected">Nicio pompă selectată</string>
+    <string name="setupwizard_units_prompt">Selectați unitățile în care doriți să afișați valorile</string>
+    <string name="ns_ploadlocalprofile">Transmiteți modificările profilului local către NS</string>
     <string name="dia_short">DIA</string>
     <string name="ic_short">IC</string>
     <string name="isf_short">ISF</string>
     <string name="target_short">TARG</string>
     <string name="clone_label">Clonează</string>
+    <string name="saveorresetchangesfirst">Salvează sau resetează modificările curente mai întâi</string>
     <string name="deletecurrentprofile">Ştergeţi profilul curent?</string>
+    <string name="copytolocalprofile">Creați un profil local nou pe baza acestui profil?</string>
+    <string name="profilenamecontainsdot">Numele profilului conține puncte.\nAcest lucru nu este permis de NS.\nProfilul nu a fost înregistrat în NS.</string>
+    <string name="low_mark_comment">Valoarea inferioară a intervalului țintă (doar afișare)</string>
+    <string name="high_mark_comment">Valoarea superioară a intervalului țintă (doar afișare)</string>
     <string name="reorder_label">Reordonează</string>
     <string name="age">Vârstă:</string>
     <string name="weight_label">Greutate:</string>
     <string name="id">ID:</string>
     <string name="submit">Trimiteți</string>
+    <string name="mostcommonprofile">Cel mai frecvent profil:</string>
+    <string name="survey_comment">Notă: Doar datele vizibile pe acest ecran vor fi încărcate în mod anonim. ID-ul este alocat acestei instalări de AndroidAPS. Puteți trimite date din nou dacă profilul dumneavoastră principal se modifică, dar lăsați-l să ruleze cel puțin o săptămână pentru ca rezultatul să fie vizibil în interval de timp. Ajutorul dvs. este binevenit.</string>
+    <string name="nav_survey">Sondaj</string>
     <string name="invalidage">Valoare vârstă invalidă</string>
     <string name="invalidweight">Valoare greutate invalidă</string>
+    <string name="invalidpct">Intrare % invalidă</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Hipo: <b>%2$02d%%</b> Normal: <b>%3$02d%%</b> Hiper: <b>%4$02d%%</b>]]></string>
     <string name="average">Medie</string>
     <string name="tir">Timp în țintă</string>
+    <string name="activitymonitor">Monitorizare activitate</string>
+    <string name="doyouwantresetstats">Doriți să resetați statisticile de activitate?</string>
     <string name="statistics">Statistici</string>
+    <string name="randombg">Glicemie aleatoare</string>
+    <string name="description_source_randombg">Generare glicemie aleator (doar mod Demo)</string>
     <string name="randombg_short">Glicemie</string>
     <string name="tools">Instrumente</string>
+    <string name="show_calculation">Arată calculul</string>
     <string name="automation_event">Eveniment automatizare</string>
     <string name="alreadyset">Deja setat</string>
     <string name="clearqueueconfirm">Ștergeți coada? Toate datele din coadă vor fi pierdute!</string>
@@ -1267,6 +1306,9 @@
     <string name="omnipod_config_beep_bolus_enabled">Bip pentru Bolus Activat</string>
     <string name="omnipod_config_beep_basal_enabled">Bip pentru Bazală Activat</string>
     <string name="omnipod_config_beep_smb_enabled">Bip pentru SMB Activat</string>
+    <string name="omnipod_config_beep_tbr_enabled">Bip pentru TBR Activat</string>
+    <string name="omnipod_config_pod_debugging_options_enabled">Opțiuni de depanare Pod Activate</string>
+    <string name="omnipod_config_timechange_enabled">Detectare DST/fus orar activată</string>
     <!-- Omnipod - Fragment -->
     <string name="omnipod_pod_mgmt">Pod Mgmt</string>
     <string name="omnipod_pod_status">Status Pod</string>
@@ -1277,12 +1319,32 @@
     <string name="omnipod_pod_name_no_info">Nu există informații</string>
     <string name="omnipod_pod_no_pod_connected">Niciun Pod conectat</string>
     <string name="omnipod_pod_not_initalized">Neiniţializat</string>
+    <string name="omnipod_pod_active_alerts">Alerte pod active</string>
     <string name="omnipod_ack_short">Alerte de confirmare</string>
     <!-- Omnipod - Dialogs -->
     <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <!-- Omnipod - Error -->
+    <string name="omnipod_error_operation_not_possible_no_configuration">Operațiunea nu este posibilă.\n\nTrebuie să configuraţi Omnipod înainte de a putea efectua această operațiune.</string>
+    <string name="omnipod_error_operation_not_possible_no_profile">Operaţiunea nu este posibilă.\n\n Trebuie să aşteptaţi câteva minute până când AAPS încearcă să seteze profilul pentru prima dată.</string>
+    <string name="omnipod_error_illegal_init_action_type">Acțiune PodInitActionType ilegala: %1$s</string>
     <string name="omnipod_error_pod_not_attached">Niciun Pod activ.</string>
     <string name="omnipod_driver_error_setup_action_verification_failed">Verificarea comenzii a eşuat.</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">A apărut o eroare neașteptată. Vă rugăm să o raportați! (tip: %1$s).</string>
+    <string name="omnipod_driver_error_invalid_parameters">Comunicarea a eșuat: s-au primit parametri de intrare incorecți.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Comunicarea a eșuat: timpul a expirat.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Comunicarea a eşuat: a apărut o eroare neaşteptată. Vă rugăm să o raportaţi!</string>
+    <string name="omnipod_driver_error_crc_mismatch">Comunicarea a eşuat: verificarea integrităţii mesajului a eşuat.</string>
+    <string name="omnipod_driver_error_invalid_packet_type">Comunicarea a eşuat: a fost primit un pachet invalid de la Pod.</string>
+    <string name="omnipod_driver_error_invalid_progress_state">Comunicarea a eșuat: Pod-ul este într-o stare incorectă.</string>
+    <string name="omnipod_driver_error_invalid_response">Comunicarea a eșuat: s-a primit un răspuns incorect de la Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Comunicarea a eșuat: s-a primit un mesaj cu un număr de secvență invalid de la Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Comunicarea a eșuat: s-a primit un mesaj cu o adresă invalidă de la Pod.</string>
+    <string name="omnipod_driver_error_message_decoding_failed">Comunicarea a eșuat: nu s-a reușit decodarea mesajului de la Pod.</string>
+    <string name="omnipod_driver_error_nonce_resync_failed">Comunicarea a eșuat: resincronizarea nonce nu a reușit.</string>
+    <string name="omnipod_driver_error_nonce_out_of_sync">Comunicarea a eșuat: nonce nu poate fi sincronizată.</string>
+    <string name="omnipod_driver_error_not_enough_data">Comunicarea a eşuat: nu s-au primit suficiente date de la Pod.</string>
+    <string name="omnipod_driver_error_pod_fault">A fost detectată o eroare a Pod-ului (%1$03d %2$s). Vă rugăm să îl dezactivați pe acesta și să porniți unul nou.</string>
+    <string name="omnipod_driver_error_pod_returned_error_response">Comunicarea a eșuat: Pod-ul a returnat un răspuns de eroare.</string>
     <!-- Omnipod - Pod Mgmt -->
     <string name="omnipod_pod_mgmt_title">Gestionare Pod</string>
     <string name="omnipod_cmd_init_pod">Inițializare Pod</string>
@@ -1292,6 +1354,9 @@
     <string name="omnipod_cmd_set_bolus">Setează bolusul</string>
     <string name="omnipod_cmd_cancel_bolus">Anulați Bolus</string>
     <string name="omnipod_cmd_set_tbr">Setează bazala temporară</string>
+    <string name="omnipod_cmd_cancel_tbr">Anulați bazală temporară (la nivel intern de către driver)</string>
+    <string name="omnipod_cmd_cancel_tbr_forced">Anulați bazală temporară (impus de către utilizator)</string>
+    <string name="omnipod_cmd_set_basal_schedule">Programați ratele bazale</string>
     <string name="omnipod_cmd_get_pod_status">Obțineți Status Pod</string>
     <string name="omnipod_cmd_get_pod_info">Obțineți Informații Pod</string>
     <string name="omnipod_cmd_set_time">Setare timp</string>
@@ -1316,7 +1381,10 @@
     <string name="omnipod_init_pod_wizard_pod_info_title">Informații Pod</string>
     <string name="omnipod_init_pod_wizard_pod_info_init_pod_description">\nPod-ul este acum activ.\n\nRatele bazale au fost programate și canula a fost introdusă.\n\nVă rugăm să verificați că acul a fost introdus corect. Dacă considerați ca nu, înlocuiți Pod-ul.</string>
     <string name="omnipod_remove_pod_wizard_step1_title">Dezactivare Pod</string>
+    <string name="omnipod_remove_pod_wizard_step1_desc">\nApăsați <b>Următorul</b> pentru a dezactiva Pod-ul.\n\n<b>Notă:</b> Acest lucru va suspenda orice livrare de insulină și va dezactiva Pod-ul.</string>
     <string name="omnipod_remove_pod_wizard_step2_title">Dezactivare Pod</string>
+    <string name="omnipod_remove_pod_wizard_step2_action_header">Dezactivare Pod.\n\nAtunci când toate elementele sunt gata, puteți apăsa <b>Următorul</b>.\n\n<b>Notă:</b> Dacă dezactivarea eșuează continuu, vă rugăm să apăsați <b>Anulează</b> și folosiți opțiunea <b>Resetare Pod</b> pentru a forța resetarea Pod-ului.</string>
+    <string name="omnipod_init_pod_wizard_pod_info_remove_pod_description">Pod dezactivat.\n\nScoateți Pod-ul și aruncați-l.</string>
     <string name="omnipod_init_pod_pair_pod">Împerechere Pod</string>
     <string name="omnipod_init_pod_prime_pod">Amorsare Pod</string>
     <string name="omnipod_init_pod_fill_cannula">Umplere Canulă</string>
@@ -1326,8 +1394,28 @@
     <!-- Omnipod Dash -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod_dash">Integrare cu pompa pentru Omnipod Dash.</string>
+    <string name="omnipod_alert_finish_pairing_reminder">Finalizare memento împerechere</string>
+    <string name="omnipod_alert_finish_setup_reminder_reminder">Finalizare memento setare</string>
     <string name="omnipod_alert_expiration">Pod-ul va expira în curând</string>
     <string name="omnipod_alert_expiration_advisory">Pod-ul va expira în curând</string>
     <string name="omnipod_alert_shutdown_imminent">Oprirea este iminentă</string>
+    <string name="omnipod_alert_low_reservoir">Nivel rezervor scăzut</string>
     <string name="omnipod_alert_unknown_alert">Alertă necunoscută</string>
+    <string name="omnipod_error_set_basal_failed_uncertain">Setarea ratelor bazale s-ar putea să fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reactualizați starea Pod-ului.</string>
+    <string name="omnipod_error_set_temp_basal_failed_uncertain">Setarea ratelor bazale temporare s-ar putea să fi eșuat. Dacă a existat o bazală temporară în livrare, aceasta ar putea fi fost anulată! Vă rugăm să reactualizați starea Pod-ului.</string>
+    <string name="omnipod_error_set_time_failed_uncertain">Setarea datei și orei s-ar putea să fi eșuat. Livrarea ar putea fi suspendată! Vă rugăm să reactualizați starea Pod-ului.</string>
+    <string name="omnipod_bolus_failed_uncertain">Nu se poate verifica dacă bolusul a reușit. Verificați dacă Pod livrează ceva sau anulați bolusul.</string>
+    <string name="omnipod_rl_stats">Statistici RL</string>
+    <string name="omnipod_read_pulse_log_short">Jurnal Puls</string>
+    <string name="comapareprofile">Compară profilurile</string>
+    <string name="nav_profilehelper">Ajutor profil</string>
+    <string name="motoldefaultprofile">Profil implicit</string>
+    <string name="currentprofile">Profil curent</string>
+    <string name="availableprofile">Profil disponibil</string>
+    <string name="profiletype">Tip profil</string>
+    <string name="formatwithtdd">Vârstă: %1$.0f TDD: %2$.0f kg</string>
+    <string name="formatwittddandpct">Vârstă: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Vârstă: %1$.0f Greutate: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% din bazală</string>
+    <string name="dpvdefaultprofile">Profil implicit DPV</string>
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 5e2010173c..88a32efdae 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -645,7 +645,6 @@
     <string name="enablesmbwithtemptarget">Включить супер микро болюс SMB с временными целями</string>
     <string name="enablesmbwithtemptarget_summary">Включить супер микро болюс SMB при активной временной цели (близкий прием пищи, нагрузка)</string>
     <string name="enablesmbwithhightemptarget">Включить супер микро болюс SMB с высокими значениями временных целей</string>
-    <string name="enablesmbwithhightemptarget_summary">Включить супер микро болюс SMB при высоком значении действующей временной цели (нагрузка)</string>
     <string name="overview_insulin_label">Инсулин</string>
     <string name="overview_carbs_label">Кол-во углеводов</string>
     <string name="overview_buttons_selection">Кнопки</string>
@@ -679,7 +678,6 @@
     <string name="do_not_bolus_record_only">Не подавать болюс, только внести запись</string>
     <string name="category">Категория</string>
     <string name="subcategory">Подкатегория</string>
-    <string name="bolusrecordedonly">Болюс будет только записан</string>
     <string name="ns_autobackfill_summary">Заполнять пропущенные данные из NS</string>
     <string name="loop_smbsetbypump_label">Супер микро болюс SMB задан помпой</string>
     <string name="overview_show_activity">Нагрузка</string>
@@ -798,7 +796,6 @@ Context | Edit Context</string>
     <string name="askforpermission">Запросить права доступа</string>
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложению требуется разрешение на доступ к местоположению для сканирования BT и идентификации WiFi</string>
-    <string name="needstoragepermission">Приложение нуждается в разрешении доступа к хранению данных для хранения лог-файлов</string>
     <string name="request">Запрос</string>
     <string name="insulinsourcesetup">Настроить плагин инсулина</string>
     <string name="exit">Выход</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index cc194deba5..bbd36a5729 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie importovaných nastavení.</string>
     <string name="preferences_export_canceled">Export zrušený! Nastavenia neboli exportované!</string>
     <string name="preferences_import_canceled">Import zrušený! Nastavenia neboli importované!</string>
+    <string name="preferences_import_impossible">Nastavenia sa nedajú importovať!</string>
+    <string name="goto_main_try_again">Prosím, vráťte se späť na hlavnú obrazovku a skúste to znovu.</string>
     <string name="preferences_import_list_title">Vyberte súbor, ktorý chcete importovať</string>
     <string name="check_preferences_before_import">Prosím skontrolujte nastavenia predtým, ako importujete:</string>
     <string name="check_preferences_cannot_import">Nastavenia nemôžu byť importované!</string>
@@ -645,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Povoliť SMB s dočasnými cieľmi</string>
     <string name="enablesmbwithtemptarget_summary">Povoliť SMB, pokiaľ je aktívny dočasný cieľ (aktivita, blížiace sa jedlo)</string>
     <string name="enablesmbwithhightemptarget">Povoliť SMB s vysokými dočasnými cieľmi</string>
-    <string name="enablesmbwithhightemptarget_summary">Povoliť SMB, pokiaľ je aktívny vysoký dočasný cieľ (aktivita)</string>
+    <string name="enablesmbwithhightemptarget_summary">Povoliť SMB, ak je aktívny vysoký cieľ (cvičenie, vyšší ako 5,5 mmol/l)</string>
     <string name="overview_insulin_label">Inzulín</string>
     <string name="overview_carbs_label">Sacharidy</string>
     <string name="overview_buttons_selection">Tlačidlá</string>
@@ -679,7 +681,7 @@
     <string name="do_not_bolus_record_only">Nepodať bolus, iba zaznamenať</string>
     <string name="category">Kategória</string>
     <string name="subcategory">Podkategória</string>
-    <string name="bolusrecordedonly">Bolus bude iba zaznamenaný</string>
+    <string name="bolusrecordedonly">Bolus bude iba zaznamenaný (nie pumpou vydaný)</string>
     <string name="ns_autobackfill_summary">Automaticky doplňovať chýbajúcu glykémiu z NS</string>
     <string name="loop_smbsetbypump_label">SMB podané pumpou</string>
     <string name="overview_show_activity">Aktivita</string>
@@ -796,7 +798,7 @@
     <string name="askforpermission">Vyžiadať si povolenie</string>
     <string name="needsystemwindowpermission">Aplikácia vyžaduje pre oznámenia systémové oprávnenie</string>
     <string name="needlocationpermission">Aplikácia vyžaduje oprávnenie polohy, pre vyhľadávanie BT a identifikáciu WiFi</string>
-    <string name="needstoragepermission">Aplikácia vyžaduje prístup k úložisku, aby mohla ukladať logy</string>
+    <string name="needstoragepermission">Aby bolo možné nahrávať logy a exportovať nastavenia, je nutné pre aplikáciu povoliť oprávnenie prístupu k úložisku</string>
     <string name="request">Požiadavka</string>
     <string name="insulinsourcesetup">Nastavenie inzulínového modulu</string>
     <string name="exit">Koniec</string>
@@ -1237,6 +1239,7 @@
     <string name="nav_survey">Prieskum</string>
     <string name="invalidage">Neplatný záznam veku</string>
     <string name="invalidweight">Neplatný záznam váhy</string>
+    <string name="invalidpct">Neplatný vstup %</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Pod: <b>%2$02d%%</b> V: <b>%3$02d%%</b> Nad: <b>%4$02d%%</b>]]></string>
     <string name="average">Priemer</string>
     <string name="tir">Čas v rozsahu</string>
@@ -1412,5 +1415,8 @@
     <string name="availableprofile">Dostupný profil</string>
     <string name="profiletype">Typ profilu</string>
     <string name="formatwithtdd">Vek: %1$.0f CDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Vek: %1$.0f CDD: %2$.0f JI %3$d%%</string>
     <string name="formatwithweight">Vek: %1$.0f Hmotnosť: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% bazálu</string>
+    <string name="dpvdefaultprofile">Predvolený DPV profil</string>
 </resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9865cdb1e5..9b80583bf0 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -646,7 +646,6 @@ Eversense-appen.</string>
     <string name="enablesmbwithtemptarget">Använd SMB vid temp målvärde</string>
     <string name="enablesmbwithtemptarget_summary">Använd SMB när temp mål är satt, t ex Äta snart eller Träning</string>
     <string name="enablesmbwithhightemptarget">Använd SMB vid högt målvärde</string>
-    <string name="enablesmbwithhightemptarget_summary">Använd SMB även när ett högt temp målvärde är satt (över 5,5 mmol)</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Kolhydrater</string>
     <string name="overview_buttons_selection">Knappar</string>
@@ -680,7 +679,6 @@ Eversense-appen.</string>
     <string name="do_not_bolus_record_only">Ge ingen bolus, logga bara</string>
     <string name="category">Kategori</string>
     <string name="subcategory">Underkategori</string>
-    <string name="bolusrecordedonly">Bolusen sparas bara i loggboken</string>
     <string name="ns_autobackfill_summary">Hämta saknad BG-data från Nightscout</string>
     <string name="loop_smbsetbypump_label">SMB satt i pump</string>
     <string name="overview_show_activity">Insulinaktivitet (5m)</string>
@@ -797,7 +795,6 @@ Eversense-appen.</string>
     <string name="askforpermission">Be om behörighet</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver platsåtkomst för bluetooth- och WiFi-identifiering</string>
-    <string name="needstoragepermission">Appen behöver behörighet att använda Lagring för att kunna spara loggfiler</string>
     <string name="request">Begäran</string>
     <string name="insulinsourcesetup">Konfigurera insticksprogram för insulin</string>
     <string name="exit">Avsluta</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e3da965f38..d4c4f01ee6 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -498,7 +498,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="enablesmbwithtemptarget">Geçici hedeflerle SMB\'yi (Super Micro Bolus) etkinleştir</string>
     <string name="enablesmbwithtemptarget_summary">Geçici hedef aktif olduğunda SMB\'yi etkinleştir (yakında yeme, egzersiz)</string>
     <string name="enablesmbwithhightemptarget">Yüksek geçici bazal oran hedefleriyle SMB\'yi etkinleştir</string>
-    <string name="enablesmbwithhightemptarget_summary">Yüksek geçici bazal oran hedef etkin olduğunda SMB\'yi etkinleştirin (egzersiz)</string>
     <string name="overview_insulin_label">İnsülin</string>
     <string name="overview_carbs_label">Karbonhidrat</string>
     <string name="overview_buttons_selection">Tuşlar</string>
@@ -524,7 +523,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="do_not_bolus_record_only">Bolusu sadece kayıt altına al</string>
     <string name="category">Kategori</string>
     <string name="subcategory">Alt kategori</string>
-    <string name="bolusrecordedonly">Bolus sadece kaydedilecek</string>
     <string name="ns_autobackfill_summary">Nightscout\'tan eksik kan şekeri değerlerini otomatik olarak yükleyin</string>
     <string name="loop_smbsetbypump_label">SMB (Supermicroboluses) pompa tarafından verildi</string>
     <string name="overview_show_sensitivity">Duyarlılık</string>
@@ -637,7 +635,6 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="startobjective">İlk hedefinize başlayın</string>
     <string name="permission">Yetki</string>
     <string name="askforpermission">İzin için sorunuz</string>
-    <string name="needstoragepermission">Uygulama, log dosyalarını depolayabilmek için depolama izni gerektiriyor</string>
     <string name="request">İstek</string>
     <string name="insulinsourcesetup">İnsülin eklentisini yapılandır</string>
     <string name="exit">Çıkış</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f566195d3e..de8e50b729 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -525,7 +525,6 @@
     <string name="enablesmbwithtemptarget">启用带有临时目标的SMB</string>
     <string name="enablesmbwithtemptarget_summary">当临时目标处于活动状态时启用 SMB (很快吃饭, 运动)</string>
     <string name="enablesmbwithhightemptarget">启用具有高临时目标的 SMB</string>
-    <string name="enablesmbwithhightemptarget_summary">当临时目标处于活动状态（锻炼）时启用SMB</string>
     <string name="overview_insulin_label">胰岛素</string>
     <string name="overview_carbs_label">碳水</string>
     <string name="overview_buttons_selection">按钮</string>
@@ -553,7 +552,6 @@
     <string name="do_not_bolus_record_only">不打大剂量，只记录</string>
     <string name="category">类别</string>
     <string name="subcategory">子类别</string>
-    <string name="bolusrecordedonly">大剂量将仅被记录</string>
     <string name="ns_autobackfill_summary">Autobackfill 现在无法从NS获取血糖</string>
     <string name="loop_smbsetbypump_label">通过泵设置SMB微型大剂量</string>
     <string name="overview_show_activity">活动</string>
@@ -667,7 +665,6 @@
     <string name="startobjective">开始你的第一个目标</string>
     <string name="permission">权限</string>
     <string name="askforpermission">请求权限</string>
-    <string name="needstoragepermission">应用程序需要存储权限才能存储日志文件</string>
     <string name="request">请求</string>
     <string name="insulinsourcesetup">配置胰岛素插件</string>
     <string name="exit">退出</string>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index c5dd9b89d9..cfc0c66552 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -178,4 +178,5 @@
     <string name="tbb2">ОБИ * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Засичане на времето</string>
+    <string name="format_hour_minute">%1$dч:%2$dм</string>
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index b43fd3aa13..95f919a313 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -180,4 +180,5 @@
     <string name="tbb2">CZB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Detekce času</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 </resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 36897e9551..dba64be545 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -163,7 +163,7 @@
     <string name="waitingforpumpresult">Auf Pumpenergebnis warten</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
-    <string name="carbsreq">Innerhalb der nächsten %d Minuten werden %dg zusätzliche Kohlenhydrate benötigt</string>
+    <string name="carbsreq">%dg Kohlenhydrate sollten innerhalb von %d Minuten aufgenommen werden</string>
     <!--    TDDStatsActivity-->
     <string name="stats">Statistik</string>
     <string name="cumulative_tdd">Kumulative TDD</string>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 2f1699b202..ec89044e9b 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -180,4 +180,5 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Rilevamento tempo</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 </resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 6f9016efbb..8ac8977e20 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -180,4 +180,5 @@
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Detecção de tempo</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 </resources>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index dd088ac088..e5fc169564 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="pairing">Împerechere</string>
     <!--    General-->
     <string name="error">Eroare</string>
     <string name="not_set_short">Nesetată</string>
+    <string name="failedupdatebasalprofile">Actualizarea profilului bazalei a eșuat</string>
     <string name="profile_set_ok">Profilul bazalei a fost modificat în pompă</string>
     <string name="invalidinput">Date de intrare incorecte</string>
     <string name="tempbasaldeliveryerror">Eroare la livrare bazală temporară</string>
+    <string name="goingtodeliver">Se vor livra %1$.2fU</string>
     <string name="waitingforpump">Se așteaptă pompa</string>
     <string name="connectingfor">Conectat de %1$d s</string>
     <string name="bolusdelivering">Se livrează %1$.2fU</string>
+    <string name="handshaking">Împerechere</string>
     <string name="connecting">Se conectează</string>
     <string name="connected">Conectat</string>
     <string name="disconnected">Deconectat</string>
@@ -26,9 +30,11 @@
     <string name="objectives">Obiective</string>
     <string name="close">Închide</string>
     <string name="please_wait">Așteptați…</string>
+    <string name="mute">Liniște</string>
     <string name="reload">Reîncărcare</string>
     <string name="stoppressed">STOP APĂSAT</string>
     <string name="stop">Stop</string>
+    <string name="carbs">Carbohidrați</string>
     <string name="invalidprofile">Profil invalid!!!</string>
     <string name="noprofileset">NICIUN PROFIL SETAT</string>
     <string name="date">Data</string>
@@ -43,6 +49,8 @@
     <string name="battery_label">Baterie</string>
     <string name="lastconnection_label">Ultima conexiune</string>
     <string name="lastbolus_label">Ultimul bolus</string>
+    <string name="dailyunits">Unități zilnic</string>
+    <string name="basebasalrate_label">Rată bazală implicită</string>
     <string name="tempbasal_label">Bazală temporară</string>
     <string name="virtualpump_extendedbolus_label">Bolus extins</string>
     <string name="reservoir_label">Rezervor</string>
@@ -53,8 +61,12 @@
     <string name="mmol">mmol/l</string>
     <string name="advancedsettings_title">Setări avansate</string>
     <string name="bluetooth">Bluetooth</string>
+    <string name="btwatchdog_title">BT Watchdog</string>
+    <string name="btwatchdog_summary">Oprește bluetooth-ul telefonului pentru o secundă dacă nu se poate conecta la pompă. Aceasta poate ajuta în cazul telefoanelor cu bluetooth incompatitibil.</string>
     <!--    Constraints-->
+    <string name="limitingbasalratio">Se limitează maximul ratei bazale la %1$.2f U/o datorită %2$s</string>
     <string name="pumplimit">limită pompă</string>
+    <string name="limitingpercentrate">Se limitează procentul ratei maxime la %1$d%% datorită %2$s</string>
     <string name="itmustbepositivevalue">trebuie să fie o valoare pozitivă</string>
     <string name="limitingbolus">Se limitează bolusul la %1$.1f U datorită %2$s</string>
     <string name="pumpNotInitializedProfileNotSet">Pompa nu este inițializată, profilul nu este setat!</string>
@@ -65,8 +77,10 @@
     <string name="cancel">Renunță</string>
     <string name="dismiss">RENUNȚĂ</string>
     <!--    BlePreCheck-->
+    <string name="ble_not_supported">BLE nu este suportat.</string>
     <string name="ble_not_enabled">Bluetooth-ul este dezactivat.</string>
     <string name="location_not_found_title">Localizarea este dezactivată</string>
+    <string name="location_not_found_message">Pentru a putea căuta dispozitive Bluetooth noi, trebuie să activați localizarea. AAPS nu folosește datele dumneavoastră de localizare și acestea pot fi dezactivate după stabilirea conexiunii cu pompa.</string>
     <!--    DateUtil-->
     <string name="minago">acum %1$dmin</string>
     <string name="hoursago">%1$.1f h în urmă</string>
@@ -86,21 +100,31 @@
     <string name="shortminute">min</string>
     <string name="shortday">z</string>
     <!--    Profile-->
+    <string name="basalprofilenotaligned">Valori bazale nesincronizate cu ora: %1$s</string>
+    <string name="minimalbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea minimă posibilă: %1$s</string>
+    <string name="maximumbasalvaluereplaced">Valoarea bazalei a fost înlocuită cu valoarea maximă posibilă: %1$s</string>
     <string name="profile_per_unit">/U</string>
     <string name="profile_ins_units_per_hour">U/h</string>
     <string name="profile_carbs_per_unit">g/U</string>
     <!--    ProfileFunction-->
     <string name="noprofileselected">Niciun profil selectat</string>
     <!--    PumpType-->
+    <string name="def_extended_note">* Pompa virtuală acceptă doar valori specifice ca și incremente, nu și intervale de valori.
+* Doar valorile specifice, nu şi intervalele de valori sunt suportate ca şi incremente în pompa virtuală.</string>
     <!--    APSResult-->
+    <string name="canceltemp">Anulează bazala temporară</string>
     <string name="let_temp_basal_run">Lasă să funcționeze bazala temporară</string>
+    <string name="rate">Rată</string>
     <string name="duration">Durată</string>
     <string name="reason">Motiv</string>
+    <string name="nochangerequested">Nu este solicitată nicio schimbare</string>
     <!--    ProfileSwitch-->
     <string name="zerovalueinprofile">Profil invalid: %1$s</string>
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fU</b> Bolus: <b>%3$.2fU</b> Bazal: <b>%4$.2fU(%5$.0f%%)</b> CH: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Verificare glicemie</string>
     <string name="careportal_announcement">Anunț</string>
@@ -111,18 +135,26 @@
     <string name="careportal_cgmsensorinsert">Inserare senzor</string>
     <string name="careportal_cgmsensorstart">Start senzor</string>
     <string name="careportal_insulincartridgechange">Schimbare cartuș insulină</string>
+    <string name="careportal_profileswitch">Schimbare de profil</string>
+    <string name="careportal_snackbolus">Bolus Gustare</string>
+    <string name="careportal_mealbolus">Bolus Masă</string>
     <string name="careportal_correctionbolus">Bolus de corecție</string>
+    <string name="careportal_combobolus">Bolus combo</string>
     <string name="careportal_tempbasalstart">Start bazală temporară</string>
     <string name="careportal_tempbasalend">Sfârșit bazală temporară</string>
     <string name="careportal_carbscorrection">Corecție de carbohidrați</string>
+    <string name="careportal_openapsoffline">OpenAPS Offline</string>
     <string name="careportal_pumpbatterychange">Schimbare baterie pompă</string>
     <string name="careportal_temporarytarget">Ţintă temporară</string>
+    <string name="careportal_temporarytargetcancel">Oprire ţintă temporară</string>
     <string name="glucosetype_finger">Deget</string>
     <string name="glucosetype_sensor">Senzor</string>
     <string name="manual">Manual</string>
     <string name="unknown">necunoscută</string>
     <!--    Command-->
+    <string name="connectiontimedout">Conectare eșuată</string>
     <!--    PumpEnactResult-->
+    <string name="enacted">Executat</string>
     <string name="comment">Comentariu</string>
     <string name="success">Succes</string>
     <string name="percent">Procent</string>
@@ -132,7 +164,9 @@
     <string name="waitingforpumpresult">Se așteaptă rezultatul</string>
     <string name="smb_shortname">SMB</string>
     <!--    CarbsReq-->
+    <string name="carbsreq">%dg carbohidrați suplimentari necesari în %d minute</string>
     <!--    TDDStatsActivity-->
+    <string name="stats">Statistici</string>
     <string name="cumulative_tdd">TDD cumulat</string>
     <string name="expweight">TDD estimat exponențial</string>
     <string name="basalrate">Bazală</string>
@@ -141,7 +175,11 @@
     <string name="ratio">Rata</string>
     <string name="amount_days"># Zile</string>
     <string name="weight">Greutate</string>
+    <string name="warning_Message">Posibil fără acuratețe bună dacă folosiți bolus de insulină pentru amorsare/umplere!</string>
     <string name="olddata_Message">Date vechi, apăsați \"REÎNCĂRCARE\"</string>
+    <string name="tbb">Total bazală implicită</string>
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
+    <string name="timedetection">Detectare timp</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 </resources>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 6d94bd4433..c6ddf0f746 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dmin</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fJI</b> Bol: <b>%3$.2fJI</b> Baz: <b>%4$.2fJI(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fJI</b> Bol: <b>%3$.2fJI</b> Baz: <b>%4$.2fJI(%5$.0f%%)</b> Sach.: <b>%6$.0fg</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Kontrola glykémie</string>
     <string name="careportal_announcement">Oznámenie</string>
@@ -178,4 +180,5 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Detekcia času</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
 </resources>
diff --git a/dana/src/main/res/values-ro-rRO/strings.xml b/dana/src/main/res/values-ro-rRO/strings.xml
index 965fd0591b..c75c37a78f 100644
--- a/dana/src/main/res/values-ro-rRO/strings.xml
+++ b/dana/src/main/res/values-ro-rRO/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="danars_pairing">Împerechere</string>
     <string name="danars_nodeviceavailable">Niciun dispozitiv găsit până acum</string>
     <string name="danars_pairingok">Conectare OK</string>
     <string name="danars_pairingtimedout">Conectare nereușită</string>
@@ -8,21 +9,33 @@
     <string name="danarspump_shortname">Dana</string>
     <string name="description_pump_dana_rs">Integrare cu pompele DANA Diabcare RS</string>
     <string name="maxbolusviolation">Încălcare a valorii maxime a bolusului</string>
+    <string name="commanderror">Eroare de comandă</string>
+    <string name="speederror">Eroare de viteză</string>
+    <string name="insulinlimitviolation">Încălcare a limitării cantităţii de insulină</string>
     <string name="boluserrorcode">Solicitat: %1$.2fU Livrat: %2$.2fU Cod eroare: %3$s</string>
     <string name="danar_valuenotsetproperly">Valoare setată incorect</string>
+    <string name="danar_setbasalstep001">Setare pas bazală la 0.01 U/h</string>
     <string name="resetpairing">Resetați informațiile de împerechere?</string>
     <string name="dana_model">%1$s\nModel: %2$02X\nProtocol: %3$02X\nCod: %4$02X</string>
+    <string name="processinghistory">Se procesează activitatea</string>
     <string name="danar_enableextendedbolus">Activează bolusuri extinse în pompă</string>
     <string name="overview_bolusprogress_delivered">Livrat</string>
     <string name="overview_bolusprogress_stoped">Oprit</string>
     <string name="unsupportedfirmware">Soft pompă incompatibil</string>
     <string name="pumperror">Eroare a pompei</string>
+    <string name="lowbattery">Baterie aproape descărcată</string>
+    <string name="basalcompare">Se livrează mai puțin decât rata bazală curentă</string>
+    <string name="pumpshutdown">Oprire pompă</string>
     <string name="batterydischarged">Bateria pompei este descărcată</string>
     <string name="occlusion">Ocluzie</string>
     <string name="emptyreservoir">Rezervor gol</string>
+    <string name="checkshaft">Verificați canula</string>
     <string name="basalmax">Maxim bazală</string>
     <string name="dailymax">Maximum zilnic</string>
     <string name="bloodsugarmeasurementalert">Alertă măsurare glicemie</string>
+    <string name="remaininsulinalert">Nivel insulină disponibilă</string>
+    <string name="missedbolus">Bolus pierdut</string>
+    <string name="invalidpairing">Informații de împerechere invalide. Cerere de împerechere nouă</string>
     <string name="gettingpumpstatus">Se primește starea pompei</string>
     <string name="gettingextendedbolusstatus">Se citește starea bolusului extins</string>
     <string name="gettingbolusstatus">Se citește starea bolusului</string>
@@ -30,10 +43,17 @@
     <string name="gettingpumpsettings">Se citesc setările pompei</string>
     <string name="gettingpumptime">Se citește ora pompei</string>
     <string name="largetimedifftitle">Diferență majoră de timp</string>
+    <string name="largetimediff">Diferență majoră de timp:\nOra din pompă este diferită cu mai multe de 1.5 ore.\nPotriviți manual ora din pompă și asigurați-vă că sincronizarea cu datele istorice din pompă nu va produce un comportament neașteptat.\nDacă este posibil, ștergeți istoricul pompei înaintea modificării orei și inactivați bucla închisă pentru un interval DIA după ultima intrare istorică cu timp greșit, dar minim o DIA de acum încolo.</string>
+    <string name="pairfirst">Vă rog să împerecheați pompa cu telefonul!</string>
+    <string name="approachingdailylimit">Se apropie limita zilnică de insulină</string>
     <string name="startingbolus">Pornire livrare bolus</string>
+    <string name="waitingforestimatedbolusend">Se așteaptă terminarea bolusării. Mai sunt %1$d secunde.</string>
     <string name="stoppingtempbasal">Se oprește bazala temporară</string>
+    <string name="settingextendedbolus">Se pornește bolusul extins</string>
     <string name="stoppingextendedbolus">Se oprește bolusul extins</string>
+    <string name="updatingbasalrates">Se actualizează ratele bazale</string>
     <string name="settingtempbasal">Se setează bazala temporară</string>
+    <string name="waitingfortimesynchronization">Se așteaptă o sincronizare a timpului (%1$d s)</string>
     <string name="wrongpassword">Parolă greșită</string>
     <string name="wrongpumppassword">Parola pompei greșită!</string>
     <string name="danar_history_alarm">Alarme</string>
@@ -47,21 +67,31 @@
     <string name="danar_history_syspend">Suspendare</string>
     <string name="danar_history_prime">Amorsare</string>
     <string name="danar_useroptions">Opțiunile utilizatorului</string>
+    <string name="danar_timedisplay">Formatul de afișare a timpului</string>
     <string name="danar_buttonscroll">Buton derulare</string>
     <string name="danar_beep">Sunet la apăsarea butonului</string>
     <string name="danar_pumpalarm">Alarmă</string>
     <string name="danar_pumpalarm_sound">Sunet</string>
     <string name="danar_pumpalarm_vibrate">Vibrație</string>
     <string name="danar_pumpalarm_both">Ambele</string>
+    <string name="danar_screentimeout">Timp stingere ecran [seconds]</string>
+    <string name="danar_backlight">Timp lumină de fundal [seconds]</string>
+    <string name="danar_glucoseunits">Unități glicemie</string>
     <string name="danar_shutdown">Oprire [hours]</string>
+    <string name="danar_lowreservoir">Rezervor aproape gol [Units]</string>
     <string name="danar_saveuseroptions">Salvați opțiunile în pompă</string>
     <string name="description_pump_dana_r">Integrare cu pompele DANA Diabcare R</string>
+    <string name="description_pump_dana_r_korean">Integrare cu pompele DANA Diabcare R coreene</string>
+    <string name="description_pump_dana_r_v2">Integrare cu pompele DANA Diabcare R cu firmware upgradat</string>
     <string name="danarpump_shortname">DANA</string>
     <string name="nobtadapter">Nu s-a găsit niciun adaptor bluetooth</string>
     <string name="devicenotfound">Dispozitivul selectat nu a fost găsit</string>
+    <string name="danar_switchtouhmode">Schimbă din modul U/z în U/h în pompă</string>
     <string name="danarkoreanpump">DanaR din Coreea</string>
     <string name="danarpump">DanaR</string>
+    <string name="pumpdrivercorrected">Driver pompă corectat</string>
     <string name="danarv2pump">DanaRv2</string>
+    <string name="danar_disableeasymode">Dezactivează modul EasyUI în pompă</string>
     <string name="profile_set_failed">Setarea profilului bazalei a eșuat</string>
     <string name="danar_bluetooth_status">Status Bluetooth</string>
     <string name="danar_iob_label">IOB din pompă</string>
@@ -74,12 +104,19 @@
     <string name="option_on">Pornit</string>
     <string name="option_off">Oprit</string>
     <string name="danar_bt_name_title">Dispozitive bluetooth DanaR</string>
+    <string name="danars_password_title">Parolă pompă (numai versiunea 1)</string>
     <string name="danar_password_title">Parola pompei</string>
+    <string name="danar_useextended_title">Folosiți bolusuri extinse pentru &gt;200%%</string>
+    <string name="danar_visualizeextendedaspercentage_title">Afișati bolusul extins ca %%</string>
     <string name="bolusspeed">Viteză bolusare</string>
     <string name="selectedpump">Pompa selectată</string>
     <string name="rs_loginsulinchange_title">Înregistrează schimbarea rezervorului</string>
+    <string name="rs_loginsulinchange_summary">Adăugare eveniment \"Schimbare insulină\" în NS/Careportal când este detectat în istoric</string>
+    <string name="rs_logcanulachange_title">Înregistrează schimbarea canulei</string>
+    <string name="rs_logcanulachange_summary">Adăugare eveniment \"Schimbare set\" în portal de îngrijire când este detectat în istoric</string>
     <string name="pin1">PIN1</string>
     <string name="pin2">PIN2</string>
+    <string name="press_ok_on_the_pump">Apăsaţi OK pe pompă\nşi introduceţi cele 2 numere afişate\nPăstraţi ecranul pompei ACTIV apăsând butonul minus până când terminați introducerea codului.</string>
     <string name="num1pin">1: (12 cifre)</string>
     <string name="num2pin">2: (8 cifre)</string>
 </resources>
diff --git a/wear/src/main/res/values-ro-rRO/strings.xml b/wear/src/main/res/values-ro-rRO/strings.xml
index 6a55603392..b4b847865f 100644
--- a/wear/src/main/res/values-ro-rRO/strings.xml
+++ b/wear/src/main/res/values-ro-rRO/strings.xml
@@ -3,52 +3,107 @@
     <string name="app_name">AAPS</string>
     <string name="label_actions_activity">AAPS</string>
     <string name="label_xdrip">AAPS</string>
+    <string name="label_xdrip_large">AAPS(Mare)</string>
+    <string name="label_xdrip_big_chart">AAPS(GraficMare)</string>
+    <string name="label_xdrip_no_chart">AAPS(FărăGrafic)</string>
+    <string name="label_xdrip_circle">AAPS(Cerc)</string>
     <string name="label_xdrip_v2">AAPSv2</string>
+    <string name="label_xdrip_cockpit">AAPS(Bord)</string>
+    <string name="label_xdrip_steampunk">AAPS (Steampunk)</string>
     <string name="label_warning_sync">Nu există date!</string>
     <string name="label_warning_old">Date vechi!</string>
+    <string name="label_warning_since">De acum %1$s</string>
     <string name="label_warning_sync_aaps">Sincronizare cu AAPS!</string>
+    <string name="msg_warning_sync">Nu au fost primite date de acum %1$s! Verificați că AAPS pe telefon trimite date către ceas</string>
+    <string name="msg_warning_old">Datele AAPS sunt vechi de %1$s! Verificați senzorul, xDrip+, NS, configurația AAPS sau altele!</string>
     <string name="pref_on">Pornit</string>
     <string name="pref_off">Oprit</string>
+    <string name="pref_vibrate_on_bolus">Vibrare la Bolus</string>
+    <string name="pref_units_for_actions">Unităţi pentru Acţiuni</string>
     <string name="pref_show_date">Arată data</string>
     <string name="pref_show_iob">Arată IOB</string>
     <string name="pref_show_cob">Arată COB</string>
     <string name="pref_show_delta">Arată Delta</string>
+    <string name="pref_show_avgdelta">Arată AvgDelta</string>
     <string name="pref_show_phone_battery">Arată baterie telefon</string>
     <string name="pref_show_rig_battery">Arată Baterie Rig</string>
     <string name="pref_show_basal_rate">Arată rata bazală</string>
     <string name="pref_show_loop_status">Arată stare buclă închisă</string>
     <string name="pref_show_bg">Arată glicemia</string>
+    <string name="pref_show_direction_arrow">Arată săgeată pentru evoluție</string>
+    <string name="pref_show_ago">Afişare în urmă</string>
     <string name="pref_dark" comment="Enables dark visual theme">Întunecat</string>
     <string name="pref_highlight_basals">Evidențiere rate bazale</string>
+    <string name="pref_matching_divider" comment="To make divider match its background with background of whole watchface">Potrivire divider</string>
+    <string name="pref_chart_timeframe">Grafic Timp</string>
     <string name="pref_1_hour">1 oră</string>
     <string name="pref_2_hours">2 ore</string>
     <string name="pref_3_hours">3 ore</string>
     <string name="pref_4_hours">4 ore</string>
     <string name="pref_5_hours">5 ore</string>
+    <string name="pref_input_design">Design de intrare</string>
     <string name="pref_default">Implicit</string>
+    <string name="pref_quick_righty">Drepta rapid</string>
+    <string name="pref_quick_lefty">Stânga rapid</string>
+    <string name="pref_modern_sparse">Distanță modernă</string>
     <string name="pref_delta_granularity">Granularitate Delta (Steampunk)</string>
+    <string name="pref_low">Mic</string>
+    <string name="pref_medium">Mediu</string>
+    <string name="pref_high">Mare</string>
+    <string name="pref_auto">Auto</string>
+    <string name="pref_big_numbers">Numere Mari</string>
+    <string name="pref_ring_history">Inel istoric</string>
+    <string name="pref_light_ring_history">Inel istoric simplu</string>
+    <string name="pref_animations">Animații</string>
+    <string name="pref_wizard_in_menu">Asistent în meniu</string>
+    <string name="pref_prime_in_menu">Amorsare în meniu</string>
+    <string name="pref_single_target">Țintă unică</string>
+    <string name="pref_wizard_percentage">Procent asistent</string>
+    <string name="pref_complication_tap_action">Acţiuni pentru complicaţii</string>
+    <string name="pref_unicode_in_complications">Unicode în complicații</string>
     <string name="pref_version">Versiune:</string>
     <string name="menu_tempt">ŢintăTemporară</string>
+    <string name="menu_wizard">Asistent</string>
     <string name="menu_bolus">Bolus</string>
     <string name="menu_ecarb">eCarb</string>
     <string name="menu_settings">Setări</string>
     <string name="menu_status">Stare</string>
+    <string name="menu_prime_fill">Amorsare/Umplere</string>
+    <string name="menu_none">Nimic</string>
     <string name="menu_default">Implicit</string>
+    <string name="menu_menu">Meniu</string>
+    <string name="action_duration">durată</string>
+    <string name="action_target" comment="In temp target menu, single target value">țintă</string>
+    <string name="action_low" comment="In temp target menu, lower value from range">hipo</string>
+    <string name="action_high" comment="In temp target menu, higher value from range">hiper</string>
+    <string name="action_carbs">carbohidrați</string>
+    <string name="action_percentage">procentaj</string>
     <string name="action_start_min">start [min]</string>
+    <string name="action_duration_h">durată [h]</string>
+    <string name="action_insulin">insulină</string>
+    <string name="action_preset_1">Presetare 1</string>
+    <string name="action_preset_2">Presetare 2</string>
+    <string name="action_preset_3">Presetare 3</string>
+    <string name="action_free_amount" comment="In prime/fill menu, allows to enter any amount to be used for priming/filling">Cantitate liberă</string>
     <string name="action_confirm">CONFIRMARE</string>
     <string name="action_status_pump">STARE POMPĂ</string>
     <string name="action_status_loop">STARE BUCLĂ ÎNCHISĂ</string>
+    <string name="action_timeshift">timp</string>
+    <string name="action_tdd_weighted">TDD ponderat</string>
     <string name="action_bolus">bolus</string>
     <string name="status_pump">Pompă</string>
+    <string name="status_loop">Buclă</string>
     <string name="status_cpp">CPP</string>
     <string name="status_tdd">TDD</string>
     <string name="activity_carb">Carbohidrați</string>
     <string name="activity_IOB">IOB</string>
+    <string name="activity_no_status">niciun status</string>
     <string name="unit_mg_dl">mg/dl</string>
     <string name="unit_mmol_l">mmol/l</string>
     <string name="unit_g" comment="Shortcut for ISO unit: gram">g</string>
     <string name="unit_u" comment="Shortcut for: insulin Unit">U</string>
     <string name="unit_u_p_h" comment="Shortcut for: insulin Unit per Hour">U/h</string>
+    <string name="unit_h" comment="One letter shortcut for: Hour" maxLength="1">h</string>
     <string name="unit_d" comment="One letter shortcut for: Day" maxLength="1">z</string>
     <string name="unit_w" comment="One letter shortcut for: Week" maxLength="1">s</string>
 </resources>

From 3d7f2c59801aefeb9d64f90d9445af8a06a0d198 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 28 Jul 2020 23:49:21 +0200
Subject: [PATCH 366/400] Gradle 6.1.1

---
 app/build.gradle                         | 7 +++++--
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 wear/build.gradle                        | 9 ++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5e822b11cc..dcbdde7f9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,10 +1,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
 
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.hiya:jacoco-android:0.2'
     }
 }
 apply plugin: 'com.android.application'
@@ -12,7 +14,8 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'jacoco-android'
+//apply plugin: 'jacoco-android'
+apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.google.firebase.crashlytics'
 
 jacoco {
diff --git a/build.gradle b/build.gradle
index 89449cca58..aeeb75768d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dc6471224f..99c53485da 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 29 21:28:06 CET 2020
+#Tue Jul 28 23:15:57 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/wear/build.gradle b/wear/build.gradle
index 94441d025d..2443fd17c8 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,14 +1,17 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
 
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.hiya:jacoco-android:0.2'
     }
 }
 apply plugin: 'com.android.application'
-apply plugin: 'jacoco-android'
+//apply plugin: 'jacoco-android'
+apply plugin: 'com.hiya.jacoco-android'
 
 jacoco {
     toolVersion = "0.8.3"
@@ -125,7 +128,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.json:json:20200518'
-    testImplementation ("org.mockito:mockito-core:2.8.47") {
+    testImplementation("org.mockito:mockito-core:2.8.47") {
         exclude group: 'net.bytebuddy', module: 'byte-buddy'
         exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
         exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'

From 2fbd0296c9d839ee3a0fc7d4eeade59079d2aa35 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 28 Jul 2020 23:56:22 +0200
Subject: [PATCH 367/400] build-tools-29.0.2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 165a1eff9a..d08c3bf279 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-28.0.3
+  - build-tools-29.0.2
   - android-28
   - extra-google-m2repository
   - extra-android-m2repository

From 3c7fa97eb4985025e5c9103bc1ca731c7c094ef9 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Fri, 31 Jul 2020 11:17:15 +0100
Subject: [PATCH 368/400] - changed manifests

---
 medtronic/src/main/AndroidManifest.xml | 15 ++++++++++++++-
 rileylink/src/main/AndroidManifest.xml |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/medtronic/src/main/AndroidManifest.xml b/medtronic/src/main/AndroidManifest.xml
index 35ba1d4ce4..ef3ab38a46 100644
--- a/medtronic/src/main/AndroidManifest.xml
+++ b/medtronic/src/main/AndroidManifest.xml
@@ -1,2 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.plugins.pump.medtronic" />
+    package="info.nightscout.androidaps.plugins.pump.medtronic">
+
+    <application>
+        <service
+            android:name=".service.RileyLinkMedtronicService"
+            android:enabled="true"
+            android:exported="true" />
+
+        <activity android:name=".dialog.MedtronicHistoryActivity" />
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+    </application>
+
+</manifest>
diff --git a/rileylink/src/main/AndroidManifest.xml b/rileylink/src/main/AndroidManifest.xml
index 280768811b..c603e9e7ef 100644
--- a/rileylink/src/main/AndroidManifest.xml
+++ b/rileylink/src/main/AndroidManifest.xml
@@ -3,6 +3,9 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application>
         <activity android:name=".dialog.RileyLinkBLEScanActivity">

From 557568b3537dc95d4e7e6cab5b61bcf196b6d5d0 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Fri, 31 Jul 2020 16:39:56 +0100
Subject: [PATCH 369/400] - fixed some cosmetical changes - fixed problem with
 initialization, now MDT is initialized at once

---
 .../plugins/pump/omnipod/OmnipodFragment.kt   |  8 ++---
 .../pump/medtronic/MedtronicFragment.kt       | 30 +++++++++----------
 .../pump/medtronic/MedtronicPumpPlugin.java   |  3 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
index 5c3914de1f..09e80f50d5 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
@@ -217,10 +217,10 @@ class OmnipodFragment : DaggerFragment() {
         omnipod_rl_status.text =
             when {
                 omnipodPumpStatus.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
-                else                                                                                                                                         -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isConnecting                             -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError == null        -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                omnipodPumpStatus.rileyLinkServiceState.isError && rileyLinkError != null        -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                else                                                                             -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
             }
         omnipod_rl_status.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index a4c8431e0e..cb1e246e0e 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -16,6 +16,7 @@ import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.MedtronicHistoryActivity
@@ -46,7 +47,6 @@ import javax.inject.Inject
 
 class MedtronicFragment : DaggerFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
-    //@Inject lateinit var mainApp: MainApp
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var rxBus: RxBusWrapper
@@ -176,11 +176,11 @@ class MedtronicFragment : DaggerFragment() {
         val rileyLinkError = medtronicPumpPlugin.rileyLinkService?.error
         medtronic_rl_status.text =
             when {
-                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted -> resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isConnecting                                                                                         -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
-                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null                                                                    -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice.MedtronicPump))
-                else                                                                                                                                            -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState == RileyLinkServiceState.NotStarted   -> resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isConnecting                          -> "{fa-bluetooth-b spin}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError == null     -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
+                rileyLinkServiceData.rileyLinkServiceState.isError && rileyLinkError != null     -> "{fa-bluetooth-b}   " + resourceHelper.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump))
+                else                                                                             -> "{fa-bluetooth-b}   " + resourceHelper.gs(resourceId)
             }
         medtronic_rl_status.setTextColor(if (rileyLinkError != null) Color.RED else Color.WHITE)
 
@@ -191,15 +191,15 @@ class MedtronicFragment : DaggerFragment() {
 
         when (medtronicPumpStatus.pumpDeviceState) {
             null,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.Sleeping             -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.NeverContacted,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.WakingUp,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.PumpUnreachable,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.ErrorWhenCommunicating,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.TimeoutWhenCommunicating,
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
+            PumpDeviceState.Sleeping             -> medtronic_pump_status.text = "{fa-bed}   " // + pumpStatus.pumpDeviceState.name());
+            PumpDeviceState.NeverContacted,
+            PumpDeviceState.WakingUp,
+            PumpDeviceState.PumpUnreachable,
+            PumpDeviceState.ErrorWhenCommunicating,
+            PumpDeviceState.TimeoutWhenCommunicating,
+            PumpDeviceState.InvalidConfiguration -> medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
 
-            info.nightscout.androidaps.plugins.pump.common.defs.PumpDeviceState.Active               -> {
+            PumpDeviceState.Active               -> {
                 val cmd = medtronicUtil.getCurrentCommand()
                 if (cmd == null)
                     medtronic_pump_status.text = " " + resourceHelper.gs(medtronicPumpStatus.pumpDeviceState.resourceId)
@@ -218,7 +218,7 @@ class MedtronicFragment : DaggerFragment() {
                 }
             }
 
-            else                                 -> aapsLogger.warn(LTag.PUMP, "Unknown pump state: " + medtronicPumpStatus.pumpDeviceState)
+            else   -> aapsLogger.warn(LTag.PUMP, "Unknown pump state: " + medtronicPumpStatus.pumpDeviceState)
         }
 
         val status = commandQueue.spannedStatus()
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
index 484ddba676..38fa9f1365 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.java
@@ -174,6 +174,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
                 aapsLogger.debug(LTag.PUMP, "RileyLinkMedtronicService is connected");
                 RileyLinkMedtronicService.LocalBinder mLocalBinder = (RileyLinkMedtronicService.LocalBinder) service;
                 rileyLinkMedtronicService = mLocalBinder.getServiceInstance();
+                rileyLinkMedtronicService.verifyConfiguration();
 
                 new Thread(() -> {
 
@@ -217,7 +218,7 @@ public class MedtronicPumpPlugin extends PumpPluginAbstract implements PumpInter
         medtronicPumpStatus.lastDataTime = medtronicPumpStatus.lastConnection;
         medtronicPumpStatus.previousConnection = medtronicPumpStatus.lastConnection;
 
-        if (rileyLinkMedtronicService != null) rileyLinkMedtronicService.verifyConfiguration();
+        //if (rileyLinkMedtronicService != null) rileyLinkMedtronicService.verifyConfiguration();
 
         aapsLogger.debug(LTag.PUMP, "initPumpStatusData: " + this.medtronicPumpStatus);
 

From 05bfbc4807cf3720fe9988c07b17f183c96d977f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 31 Jul 2020 21:12:24 +0200
Subject: [PATCH 370/400] Update Crowdin configuration file

---
 crowdin.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crowdin.yml b/crowdin.yml
index c05ac5906a..6069f66394 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -17,3 +17,7 @@ files:
     translation: /core/src/main/res/values-%android_code%/strings.xml
   - source: /dana/src/main/res/values/strings.xml
     translation: /dana/src/main/res/values-%android_code%/strings.xml
+  - source: /medtronic/src/main/res/values/strings.xml
+    translation: /medtronic/src/main/res/values-%android_code%/strings.xml
+  - source: /rileylink/src/main/res/values/strings.xml
+    translation: /rileylink/src/main/res/values-%android_code%/strings.xml

From ead863be4235137be4c5330788b1cf9137c8d970 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 1 Aug 2020 11:57:43 +0200
Subject: [PATCH 371/400] New Crowdin updates (#2863)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Korean)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Welsh)

* New translations strings.xml (Welsh)

* New translations strings.xml (Welsh)

* New translations strings.xml (Croatian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Croatian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Korean)

* New translations strings.xml (Romanian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations strings.xml (Arabic)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Czech)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Korean)

* New translations strings.xml (Irish)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Irish)

* New translations strings.xml (Irish)

* New translations strings.xml (German)

* New translations strings.xml (Finnish)

* New translations strings.xml (Finnish)

* New translations strings.xml (Finnish)

* New translations strings.xml (Finnish)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Welsh)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Greek)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (German)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Russian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Polish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Romanian)
---
 app/src/main/res/values-af-rZA/strings.xml    | 134 ++---------------
 app/src/main/res/values-ar-rSA/strings.xml    |  13 +-
 app/src/main/res/values-bg-rBG/strings.xml    | 140 ++---------------
 app/src/main/res/values-cs-rCZ/strings.xml    | 142 ++----------------
 app/src/main/res/values-cy-rGB/strings.xml    |  13 +-
 app/src/main/res/values-de-rDE/strings.xml    | 140 ++---------------
 app/src/main/res/values-el-rGR/strings.xml    | 135 ++---------------
 app/src/main/res/values-es-rES/strings.xml    | 140 ++---------------
 app/src/main/res/values-fi-rFI/strings.xml    |  13 +-
 app/src/main/res/values-fr-rFR/strings.xml    | 140 ++---------------
 app/src/main/res/values-ga-rIE/strings.xml    |  13 +-
 app/src/main/res/values-hr-rHR/strings.xml    |  13 +-
 app/src/main/res/values-it-rIT/strings.xml    | 140 ++---------------
 app/src/main/res/values-iw-rIL/strings.xml    |  13 +-
 app/src/main/res/values-ko-rKR/strings.xml    | 138 ++---------------
 app/src/main/res/values-lt-rLT/strings.xml    | 140 ++---------------
 app/src/main/res/values-nl-rNL/strings.xml    | 140 ++---------------
 app/src/main/res/values-pl-rPL/strings.xml    | 140 ++---------------
 app/src/main/res/values-pt-rBR/strings.xml    | 140 ++---------------
 app/src/main/res/values-pt-rPT/strings.xml    | 140 ++---------------
 app/src/main/res/values-ro-rRO/strings.xml    | 141 ++---------------
 app/src/main/res/values-ru-rRU/strings.xml    | 140 ++---------------
 app/src/main/res/values-sk-rSK/strings.xml    | 140 ++---------------
 app/src/main/res/values-sl-rSI/strings.xml    |  13 +-
 app/src/main/res/values-sv-rSE/strings.xml    | 140 ++---------------
 app/src/main/res/values-tr-rTR/strings.xml    |  13 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  13 +-
 core/src/main/res/values-af-rZA/strings.xml   |  24 +++
 core/src/main/res/values-ar-rSA/strings.xml   |  23 +++
 core/src/main/res/values-bg-rBG/strings.xml   |  26 ++++
 core/src/main/res/values-cs-rCZ/strings.xml   |  44 ++++++
 core/src/main/res/values-cy-rGB/strings.xml   |  23 +++
 core/src/main/res/values-de-rDE/strings.xml   |  24 +++
 core/src/main/res/values-el-rGR/strings.xml   |  24 +++
 core/src/main/res/values-es-rES/strings.xml   |  24 +++
 core/src/main/res/values-fi-rFI/strings.xml   |  23 +++
 core/src/main/res/values-fr-rFR/strings.xml   |  24 +++
 core/src/main/res/values-ga-rIE/strings.xml   |  23 +++
 core/src/main/res/values-hr-rHR/strings.xml   |  23 +++
 core/src/main/res/values-it-rIT/strings.xml   |  24 +++
 core/src/main/res/values-iw-rIL/strings.xml   |  23 +++
 core/src/main/res/values-ko-rKR/strings.xml   |  24 +++
 core/src/main/res/values-lt-rLT/strings.xml   |  24 +++
 core/src/main/res/values-nl-rNL/strings.xml   |  24 +++
 core/src/main/res/values-pl-rPL/strings.xml   |  24 +++
 core/src/main/res/values-pt-rBR/strings.xml   |  24 +++
 core/src/main/res/values-pt-rPT/strings.xml   |  24 +++
 core/src/main/res/values-ro-rRO/strings.xml   |  44 ++++++
 core/src/main/res/values-ru-rRU/strings.xml   |  24 +++
 core/src/main/res/values-sk-rSK/strings.xml   |  24 +++
 core/src/main/res/values-sl-rSI/strings.xml   |  23 +++
 core/src/main/res/values-sv-rSE/strings.xml   |  24 +++
 core/src/main/res/values-tr-rTR/strings.xml   |  23 +++
 core/src/main/res/values-zh-rCN/strings.xml   |  24 +++
 .../src/main/res/values-af-rZA/strings.xml    |  72 +++++++++
 .../src/main/res/values-ar-rSA/strings.xml    |  17 +++
 .../src/main/res/values-bg-rBG/strings.xml    |  75 +++++++++
 .../src/main/res/values-cs-rCZ/strings.xml    |  84 +++++++++++
 .../src/main/res/values-cy-rGB/strings.xml    |  17 +++
 .../src/main/res/values-de-rDE/strings.xml    |  75 +++++++++
 .../src/main/res/values-el-rGR/strings.xml    |  71 +++++++++
 .../src/main/res/values-es-rES/strings.xml    |  76 ++++++++++
 .../src/main/res/values-fi-rFI/strings.xml    |  17 +++
 .../src/main/res/values-fr-rFR/strings.xml    |  76 ++++++++++
 .../src/main/res/values-ga-rIE/strings.xml    |  17 +++
 .../src/main/res/values-hr-rHR/strings.xml    |  17 +++
 .../src/main/res/values-it-rIT/strings.xml    |  75 +++++++++
 .../src/main/res/values-iw-rIL/strings.xml    |  17 +++
 .../src/main/res/values-ko-rKR/strings.xml    |  76 ++++++++++
 .../src/main/res/values-lt-rLT/strings.xml    |  76 ++++++++++
 .../src/main/res/values-nl-rNL/strings.xml    |  77 ++++++++++
 .../src/main/res/values-pl-rPL/strings.xml    |  75 +++++++++
 .../src/main/res/values-pt-rBR/strings.xml    |  75 +++++++++
 .../src/main/res/values-pt-rPT/strings.xml    |  75 +++++++++
 .../src/main/res/values-ro-rRO/strings.xml    |  84 +++++++++++
 .../src/main/res/values-ru-rRU/strings.xml    |  76 ++++++++++
 .../src/main/res/values-sk-rSK/strings.xml    |  75 +++++++++
 .../src/main/res/values-sl-rSI/strings.xml    |  17 +++
 .../src/main/res/values-sv-rSE/strings.xml    |  75 +++++++++
 .../src/main/res/values-tr-rTR/strings.xml    |  18 +++
 .../src/main/res/values-zh-rCN/strings.xml    |  74 +++++++++
 .../src/main/res/values-af-rZA/strings.xml    |  53 +++++++
 .../src/main/res/values-ar-rSA/strings.xml    |  12 ++
 .../src/main/res/values-bg-rBG/strings.xml    |  55 +++++++
 .../src/main/res/values-cs-rCZ/strings.xml    |  71 +++++++++
 .../src/main/res/values-cy-rGB/strings.xml    |  12 ++
 .../src/main/res/values-de-rDE/strings.xml    |  54 +++++++
 .../src/main/res/values-el-rGR/strings.xml    |  54 +++++++
 .../src/main/res/values-es-rES/strings.xml    |  54 +++++++
 .../src/main/res/values-fi-rFI/strings.xml    |  12 ++
 .../src/main/res/values-fr-rFR/strings.xml    |  55 +++++++
 .../src/main/res/values-ga-rIE/strings.xml    |  12 ++
 .../src/main/res/values-hr-rHR/strings.xml    |  12 ++
 .../src/main/res/values-it-rIT/strings.xml    |  54 +++++++
 .../src/main/res/values-iw-rIL/strings.xml    |  12 ++
 .../src/main/res/values-ko-rKR/strings.xml    |  54 +++++++
 .../src/main/res/values-lt-rLT/strings.xml    |  54 +++++++
 .../src/main/res/values-nl-rNL/strings.xml    |  54 +++++++
 .../src/main/res/values-pl-rPL/strings.xml    |  54 +++++++
 .../src/main/res/values-pt-rBR/strings.xml    |  55 +++++++
 .../src/main/res/values-pt-rPT/strings.xml    |  54 +++++++
 .../src/main/res/values-ro-rRO/strings.xml    |  69 +++++++++
 .../src/main/res/values-ru-rRU/strings.xml    |  55 +++++++
 .../src/main/res/values-sk-rSK/strings.xml    |  54 +++++++
 .../src/main/res/values-sl-rSI/strings.xml    |  12 ++
 .../src/main/res/values-sv-rSE/strings.xml    |  54 +++++++
 .../src/main/res/values-tr-rTR/strings.xml    |  12 ++
 .../src/main/res/values-zh-rCN/strings.xml    |  54 +++++++
 108 files changed, 3591 insertions(+), 2454 deletions(-)
 create mode 100644 medtronic/src/main/res/values-af-rZA/strings.xml
 create mode 100644 medtronic/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 medtronic/src/main/res/values-bg-rBG/strings.xml
 create mode 100644 medtronic/src/main/res/values-cs-rCZ/strings.xml
 create mode 100644 medtronic/src/main/res/values-cy-rGB/strings.xml
 create mode 100644 medtronic/src/main/res/values-de-rDE/strings.xml
 create mode 100644 medtronic/src/main/res/values-el-rGR/strings.xml
 create mode 100644 medtronic/src/main/res/values-es-rES/strings.xml
 create mode 100644 medtronic/src/main/res/values-fi-rFI/strings.xml
 create mode 100644 medtronic/src/main/res/values-fr-rFR/strings.xml
 create mode 100644 medtronic/src/main/res/values-ga-rIE/strings.xml
 create mode 100644 medtronic/src/main/res/values-hr-rHR/strings.xml
 create mode 100644 medtronic/src/main/res/values-it-rIT/strings.xml
 create mode 100644 medtronic/src/main/res/values-iw-rIL/strings.xml
 create mode 100644 medtronic/src/main/res/values-ko-rKR/strings.xml
 create mode 100644 medtronic/src/main/res/values-lt-rLT/strings.xml
 create mode 100644 medtronic/src/main/res/values-nl-rNL/strings.xml
 create mode 100644 medtronic/src/main/res/values-pl-rPL/strings.xml
 create mode 100644 medtronic/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 medtronic/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 medtronic/src/main/res/values-ro-rRO/strings.xml
 create mode 100644 medtronic/src/main/res/values-ru-rRU/strings.xml
 create mode 100644 medtronic/src/main/res/values-sk-rSK/strings.xml
 create mode 100644 medtronic/src/main/res/values-sl-rSI/strings.xml
 create mode 100644 medtronic/src/main/res/values-sv-rSE/strings.xml
 create mode 100644 medtronic/src/main/res/values-tr-rTR/strings.xml
 create mode 100644 medtronic/src/main/res/values-zh-rCN/strings.xml
 create mode 100644 rileylink/src/main/res/values-af-rZA/strings.xml
 create mode 100644 rileylink/src/main/res/values-ar-rSA/strings.xml
 create mode 100644 rileylink/src/main/res/values-bg-rBG/strings.xml
 create mode 100644 rileylink/src/main/res/values-cs-rCZ/strings.xml
 create mode 100644 rileylink/src/main/res/values-cy-rGB/strings.xml
 create mode 100644 rileylink/src/main/res/values-de-rDE/strings.xml
 create mode 100644 rileylink/src/main/res/values-el-rGR/strings.xml
 create mode 100644 rileylink/src/main/res/values-es-rES/strings.xml
 create mode 100644 rileylink/src/main/res/values-fi-rFI/strings.xml
 create mode 100644 rileylink/src/main/res/values-fr-rFR/strings.xml
 create mode 100644 rileylink/src/main/res/values-ga-rIE/strings.xml
 create mode 100644 rileylink/src/main/res/values-hr-rHR/strings.xml
 create mode 100644 rileylink/src/main/res/values-it-rIT/strings.xml
 create mode 100644 rileylink/src/main/res/values-iw-rIL/strings.xml
 create mode 100644 rileylink/src/main/res/values-ko-rKR/strings.xml
 create mode 100644 rileylink/src/main/res/values-lt-rLT/strings.xml
 create mode 100644 rileylink/src/main/res/values-nl-rNL/strings.xml
 create mode 100644 rileylink/src/main/res/values-pl-rPL/strings.xml
 create mode 100644 rileylink/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 rileylink/src/main/res/values-pt-rPT/strings.xml
 create mode 100644 rileylink/src/main/res/values-ro-rRO/strings.xml
 create mode 100644 rileylink/src/main/res/values-ru-rRU/strings.xml
 create mode 100644 rileylink/src/main/res/values-sk-rSK/strings.xml
 create mode 100644 rileylink/src/main/res/values-sl-rSI/strings.xml
 create mode 100644 rileylink/src/main/res/values-sv-rSE/strings.xml
 create mode 100644 rileylink/src/main/res/values-tr-rTR/strings.xml
 create mode 100644 rileylink/src/main/res/values-zh-rCN/strings.xml

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 585fb26204..71a0a1debb 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -892,131 +892,6 @@
     <string name="triggers">Snellers:</string>
     <string name="remove_label">VERWYDER</string>
     <string name="preconditions">Vereistes:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operasie nie ondersteun deur pomp en/of drywer.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Pomp integrasie vir Medtronic vereis RileyLink en spesifieke modelle</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Pomp Reeks Nommer</string>
-    <string name="medtronic_pump_type">Pomp Tipe</string>
-    <string name="medtronic_pump_frequency">Pomp Frekwensie</string>
-    <string name="medtronic_pump_bolus_delay">Wagtyd voor Bolus begin (s)</string>
-    <string name="medtronic_pump_max_bolus">Maks Bolus op Pomp (U)</string>
-    <string name="medtronic_pump_max_basal">Maks Basale op Pomp (U/h)</string>
-    <string name="medtronic_pump_encoding">Medtronic Enkodering</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Wêreldwyd (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Sagteware 4b6b Enkodeerding</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardeware 4b6b Enkodeerding</string>
-    <string name="medtronic_custom_action_wake_and_tune">Wek en stel in</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Vee Bolus Blok</string>
-    <string name="medtronic_custom_action_reset_rileylink">Herstel RileyLink Konfig</string>
-    <string name="medtronic_pump_battery_select">Battery Tipe(Krag Oorsig)</string>
-    <string name="medtronic_pump_battery_no">Nie gekies (Eenvoudige oorsig)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaliese (Uitgebreide modus)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (Uitgebreide modus)</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SKAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Verkose</string>
-    <string name="rileylink_scanner_title">RileyLink Skan</string>
-    <string name="location_yes">Aktiveer</string>
-    <string name="location_no">Nee</string>
-    <string name="rileylink_scanner_scanning">Skandeer</string>
-    <string name="rileylink_scanner_scanning_finished">Skandering voltooi</string>
-    <string name="rileylink_scanner_scanning_error">Skaderings fout: %1$d</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Instellings</string>
-    <string name="rileylink_settings_tab2">Geskiedenis</string>
-    <string name="rileylink_status">RileyLink Status</string>
-    <string name="medtronic_pump_status">Pomp Status</string>
-    <string name="title_activity_rileylink_settings">RileyLink Instellings</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Adres opgestel</string>
-    <string name="rileylink_connected_device">Gekoppelde toestel</string>
-    <string name="rileylink_connection_status">Verbindingstatus</string>
-    <string name="rileylink_connection_error">Verbindingsfout</string>
-    <string name="rileylink_device">Toestel</string>
-    <string name="rileylink_device_type">Toestel Tipe</string>
-    <string name="rileylink_device_model">Toestel Model</string>
-    <string name="rileylink_last_used_frequency">Laaste gebruik frekwensie</string>
-    <string name="rileylink_last_device_contact">Laaste toestel verbinding</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth Inisiasie…</string>
-    <string name="rileylink_state_bt_error">Bluetooth Fout</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Gereed</string>
-    <string name="rileylink_state_not_started">Nie Begin</string>
-    <string name="rileylink_state_rl_init">RileyLink inisiasie…</string>
-    <string name="rileylink_state_rl_error">RileyLink Fout</string>
-    <string name="rileylink_state_pc_error">Probleel om met pomp te praat</string>
-    <string name="rileylink_state_connected">Gekoppel</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Toestel is nie RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink onverkry</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth afgeskakel</string>
-    <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Toestel</string>
-    <string name="rileylink_error_tuneup_failed">Opstel het gefaal</string>
-    <string name="rileylink_error_pump_unreachable">Pomp onbereikbaar</string>
-    <string name="rileylink_error_pod_unreachable">Pod onbereikbaar</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Foute</string>
-    <string name="medtronic_error_serial_not_set">Reeksno # nie gestel.</string>
-    <string name="medtronic_error_serial_invalid">Reeksno # is ongeldig.</string>
-    <string name="medtronic_error_pump_type_not_set">Pomp tipe nie gestel.</string>
-    <string name="medtronic_error_pump_type_invalid">Pomp tipe word nie ondersteun nie.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Pomp frekwensie nie gestel.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Pomp frekwensie word nie ondersteun.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adres ongeldig.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Pomp tipe bespeur en is nie dieselfde as gestelde.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basale profiel is verkeerd op pomp (moet STD wees).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde TBR op pomp (Moet Absoluut wees).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Maks Bolus gestel op Pomp(moet %1$.2f wees).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Maks Basale op Pomp (moet %1$.2f %1$.2f wees),.</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operasie nie moontlik.\n\n Jy moet jou Medtronic pomp opstel voordat jy die operasie kan gebruik.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Oor 24h Tyd was versoek.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basale</string>
-    <string name="medtronic_history_group_configuration">Konfigurasies</string>
-    <string name="medtronic_history_group_notification">Kennisgewings</string>
-    <string name="medtronic_history_group_statistic">Statistiek</string>
-    <string name="medtronic_history_group_unknown">Onbekend</string>
-    <string name="medtronic_history_group_all">Alle</string>
-    <string name="medtronic_pump_history">Medtronic Pomp Geskiedenis</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nooit gekontak nie</string>
-    <string name="medtronic_pump_status_waking_up">Besig om te wek</string>
-    <string name="medtronic_pump_status_error_comm">Fout met kommunikasie</string>
-    <string name="medtronic_pump_status_timeout_comm">Te lank op kommunikasie gewag</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pomp onbeskikbaar</string>
-    <string name="medtronic_pump_status_invalid_config">Ongeldige konfigirasie</string>
-    <string name="medtronic_pump_status_active">Aktief</string>
-    <string name="medtronic_pump_status_sleeping">Slaap</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">U het Bolus gekanselleer nadat dit reeds gestel was op pomp. Aangesien Medtronic pomp nie kansellasie ondesteun sal jy dit self moet kanselleer. Sit pomp in Suspend en hervat(Resume) (as jy steeds wil kanselleer). Spplikasie sal die verandering sppor op volgende opdatering in minder as 5 minute.</string>
-    <string name="medtronic_cmd_cant_read_tbr">Kon nie huidige TBR lees.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kon nie TBR kanselleer. Operasie is gestaak.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Profiel stel gefaal want die patroon het \'n te groot basale koers: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus kon nie gelewer word nie.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus kon nie gelewer word nie, want beskikbare insulin (%1$.2f) is mider as bolus versoek(%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR Kon nie stel.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Kon nie huidige TBR staak.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basale profiel kon nie stel.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profiel is dieselfde, so dit is so gelos.</string>
-    <string name="medtronic_cmd_desc_get_history">Verkry Geskiedenis - Bladsy %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Verkry Geskiedenis - Bladsy %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Kry Pomp Tyd</string>
-    <string name="medtronic_cmd_desc_get_settings">Verkry Instellings</string>
-    <string name="medtronic_cmd_desc_get_model">Kry Pomp Model</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Kry Basale Profiel</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Stel Basale Profiel</string>
-    <string name="medtronic_cmd_desc_get_tbr">Verkry Tydelike Basale</string>
-    <string name="medtronic_cmd_desc_set_tbr">Stel Tydelike Basale</string>
-    <string name="medtronic_cmd_desc_set_bolus">Stel Bolus</string>
     <string name="profilename">Verander profiel na</string>
     <string name="changengetoprofilename">Verander profiel na %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Laaste konneksie na pomp</string>
@@ -1038,6 +913,15 @@
     <string name="boluswizard">Bolus slimjan</string>
     <string name="unit_minute_short">min</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nooit gekontak nie</string>
+    <string name="medtronic_pump_status_waking_up">Besig om te wek</string>
+    <string name="medtronic_pump_status_error_comm">Fout met kommunikasie</string>
+    <string name="medtronic_pump_status_timeout_comm">Te lank op kommunikasie gewag</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pomp onbeskikbaar</string>
+    <string name="medtronic_pump_status_invalid_config">Ongeldige konfigirasie</string>
+    <string name="medtronic_pump_status_active">Aktief</string>
+    <string name="medtronic_pump_status_sleeping">Slaap</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 70cc9c5d48..2578fce6a9 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -4,19 +4,8 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 877058d8e8..fdcfa21a10 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1047,137 +1047,6 @@
     <string name="triggers">Активиращи условия:</string>
     <string name="remove_label">ИЗТРИИ</string>
     <string name="preconditions">Предварителни условия:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Неподдържана операция.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Поддръжка на помпи Медтроник (специфични модели), изисква RileyLink устройство</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Сериен номер на помпа</string>
-    <string name="medtronic_pump_type">Тип помпа</string>
-    <string name="medtronic_pump_frequency">Честота на помпата</string>
-    <string name="medtronic_pump_bolus_delay">Изчакване преди старт на болус (сек)</string>
-    <string name="medtronic_pump_max_bolus">Макс болус в помпата (Е)</string>
-    <string name="medtronic_pump_max_basal">Максимален базал в помпата (Е/ч)</string>
-    <string name="medtronic_pump_encoding">Медтроник коодиране</string>
-    <string name="medtronic_pump_frequency_us_ca">САЩ &amp; Канада (916 Mhz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Останалата част от света (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Софтуерно 4b6b кодиране</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Хардуерно 4b6b кодиране</string>
-    <string name="medtronic_custom_action_wake_and_tune">Събуди и настрой</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Изчисти Bolus Block</string>
-    <string name="medtronic_custom_action_reset_rileylink">Изчисти RileyLink конфигурацията</string>
-    <string name="medtronic_pump_battery_select">Тип батерия (напреднали)</string>
-    <string name="medtronic_pump_battery_no">Не е избрано (общ)</string>
-    <string name="medtronic_pump_battery_alkaline">Алкални</string>
-    <string name="medtronic_pump_battery_lithium">Литиева</string>
-    <string name="medtronic_pump_battery_nizn">NiZn батерия</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (батерия)</string>
-    <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">СКАНИРАЙ</string>
-    <string name="rileylink_scanner_scan_stop">СТОП</string>
-    <string name="rileylink_scanner_selected_device">Избрано</string>
-    <string name="rileylink_scanner_title">RileyLink скенер</string>
-    <string name="location_yes">Разреши</string>
-    <string name="location_no">Не</string>
-    <string name="rileylink_scanner_scanning">Сканиране</string>
-    <string name="rileylink_scanner_scanning_finished">Завършено сканиране</string>
-    <string name="rileylink_scanner_scanning_error">Грешка при сканиране: %1$d</string>
-    <string name="common_never">Никога</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Настройки</string>
-    <string name="rileylink_settings_tab2">История</string>
-    <string name="rileylink_status">RileyLink статус</string>
-    <string name="medtronic_pump_status">Статус на помпата</string>
-    <string name="title_activity_rileylink_settings">RileyLink настройки</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Конфигуриран адрес</string>
-    <string name="rileylink_connected_device">Свързано устройство</string>
-    <string name="rileylink_connection_status">Състояние на връзката</string>
-    <string name="rileylink_connection_error">Грешка при свързване</string>
-    <string name="rileylink_device">Устройство</string>
-    <string name="rileylink_device_type">Тип на устройството</string>
-    <string name="rileylink_device_model">Модел</string>
-    <string name="rileylink_last_used_frequency">Последна честота</string>
-    <string name="rileylink_last_device_contact">Последно устройство</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth стартиране…</string>
-    <string name="rileylink_state_bt_error">Bluetooth грешка</string>
-    <string name="rileylink_state_bt_ready">Bluetooth готов</string>
-    <string name="rileylink_state_not_started">Не е стартиран</string>
-    <string name="rileylink_state_rl_init">RileyLink стартиране…</string>
-    <string name="rileylink_state_rl_error">RileyLink грешка</string>
-    <string name="rileylink_state_pc_tune_up">Настройка на RileyLink и помпа</string>
-    <string name="rileylink_state_pc_error">Проблем при връзка с помпата</string>
-    <string name="rileylink_state_connected">Свързан</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Устройството не е RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink недостъпен</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth е изключен</string>
-    <string name="rileylink_error_no_bt_adapter">Няма Bluetooth адаптер</string>
-    <string name="rileylink_error_tuneup_failed">Настройката се провали</string>
-    <string name="rileylink_error_pump_unreachable">Помпата е недостъпна</string>
-    <string name="rileylink_error_pod_unreachable">Pod е недостъпen</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronic помпа</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Грешки</string>
-    <string name="medtronic_error_serial_not_set">Сериен номер не е зададен.</string>
-    <string name="medtronic_error_serial_invalid">Грешен сериен номер.</string>
-    <string name="medtronic_error_pump_type_not_set">Тип помпа не е зададен.</string>
-    <string name="medtronic_error_pump_type_invalid">Този тип помпа не се поддържа.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Честота на помпата не е зададена.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Честотата не се поддържа.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Откритата помпа не е идентична с кокнфигурираната.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базалните профили/настройки не са позволен в помпата. Включванете го от настройките на помпата.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базалния профил в помпата е грешен (трябва да е STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Грешен тип TBR в помпата ( трябва да е Absolute).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Грешен максимален болус в помпата ( трябвба да е %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Грешен макс мазал в помпата (трябва да е %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате поомпата, преди да използвате тази операция,.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Желаната промяна на времето е повече от 24ч.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Базали</string>
-    <string name="medtronic_history_group_configuration">Конфигурации</string>
-    <string name="medtronic_history_group_notification">Известия</string>
-    <string name="medtronic_history_group_statistic">Статистики</string>
-    <string name="medtronic_history_group_unknown">Неизвестни</string>
-    <string name="medtronic_history_group_all">Всички</string>
-    <string name="medtronic_pump_history">История на помпата</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Никога не сме се свързвали</string>
-    <string name="medtronic_pump_status_waking_up">Събуждане</string>
-    <string name="medtronic_pump_status_error_comm">Грешка в комуникацията</string>
-    <string name="medtronic_pump_status_timeout_comm">Изтичане на времето за връзка</string>
-    <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
-    <string name="medtronic_pump_status_invalid_config">Грешна конфигурация</string>
-    <string name="medtronic_pump_status_active">Активна</string>
-    <string name="medtronic_pump_status_sleeping">Спинка си</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Отказали сте болус след като е бил изпратен към помпата. Помпите Медтроник не го поддържат и ще трябва да го направите ръчно. Пуснете Suspend mode и след това Resume (ако оше искате да го откажете). Апликацията ще покаже промените след около 5 мин.</string>
-    <string name="medtronic_cmd_cant_read_tbr">Не може да бъде прочетен вр. базал.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Не може да бъде изключен вр. базал. Операцията е спряна.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Смяната на профила е невъзможна, поради твърде голям размер: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Болус не може да бъде стартиран.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Болусът не може да бъде стартиран понеже в резервоара има %1$.2f Е, а желаният болус е %2$.2f Е.</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Временен базал не може да бъде стартиран.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Не може да бъде изключен вр. базал.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Профилът не може да бъде приложен.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Профилът е идентичен.</string>
-    <string name="medtronic_cmd_desc_get_history">Вземи история - стр %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Вземи история - стр %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Вземи времето на помпата</string>
-    <string name="medtronic_cmd_desc_get_settings">Вземи настройките на помпата</string>
-    <string name="medtronic_cmd_desc_get_model">Вземи модел на помпата</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Вземи базален профил от помпата</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Приложи базалният профил</string>
-    <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
-    <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
-    <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
     <string name="profilename">Смени профила на</string>
     <string name="changengetoprofilename">Смени профила на %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Последно свързване към помпа</string>
@@ -1300,6 +1169,15 @@
     <string name="buttonson_description">Бутоните винаги се показват на дъното на екрана.</string>
     <string name="largedisplay_description">Голям екран</string>
     <string name="skin">Тема</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Никога не сме се свързвали</string>
+    <string name="medtronic_pump_status_waking_up">Събуждане</string>
+    <string name="medtronic_pump_status_error_comm">Грешка в комуникацията</string>
+    <string name="medtronic_pump_status_timeout_comm">Изтичане на времето за връзка</string>
+    <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
+    <string name="medtronic_pump_status_invalid_config">Грешна конфигурация</string>
+    <string name="medtronic_pump_status_active">Активна</string>
+    <string name="medtronic_pump_status_sleeping">Спинка си</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Интеграция на помпата Omnipod, изисква RileyLink устройство (с фърмуер минимум 2.0 ) .</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 6825f4e840..02dcce8bae 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -647,7 +647,7 @@
     <string name="enablesmbwithtemptarget">Povolit SMB s dočasnými cíli</string>
     <string name="enablesmbwithtemptarget_summary">Povolit SMB, pokud je aktivní dočasný cíl (aktivita, blížící se jídlo)</string>
     <string name="enablesmbwithhightemptarget">Povolit SMB s vysokými dočasnými cíli</string>
-    <string name="enablesmbwithhightemptarget_summary">Povolit SMB, je-li aktivní vysoký cíl (cvičení, vyšší než 100 mg/dl nebo 5, 5 mmol/l)</string>
+    <string name="enablesmbwithhightemptarget_summary">Povolit SMB, je-li aktivní vysoký cíl (cvičení, vyšší než 100 mg/dl nebo 5,5 mmol/l)</string>
     <string name="overview_insulin_label">Inzulín</string>
     <string name="overview_carbs_label">Sacharidy</string>
     <string name="overview_buttons_selection">Tlačítka</string>
@@ -1047,137 +1047,6 @@
     <string name="triggers">Podmínky:</string>
     <string name="remove_label">ODSTRANIT</string>
     <string name="preconditions">Nutné podmínky:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operace není podporována pumpou a/nebo ovladačem.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operace prozatím pumpou nepodporována.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integrace pump Medtronic, vyžaduje zařízení RileyLink a konkrétní model pumpy</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Sériové číslo pumpy</string>
-    <string name="medtronic_pump_type">Typ pumpy</string>
-    <string name="medtronic_pump_frequency">Frekvence pumpy</string>
-    <string name="medtronic_pump_bolus_delay">Prodleva před spuštěním bolusu (s)</string>
-    <string name="medtronic_pump_max_bolus">Max. bolus na pumpě (U)</string>
-    <string name="medtronic_pump_max_basal">Max. bazál na pumpě (U)</string>
-    <string name="medtronic_pump_encoding">Kódováni Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Celosvětové (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Encoding</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Encoding</string>
-    <string name="medtronic_custom_action_wake_and_tune">Probuzení a spojování</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Vymazat blokování bolusu</string>
-    <string name="medtronic_custom_action_reset_rileylink">Resetovat konfiguraci RileyLinku</string>
-    <string name="medtronic_pump_battery_select">Typ baterie (Zobrazení napájení)</string>
-    <string name="medtronic_pump_battery_no">Nevybráno (Jednoduché)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkalické (Rozšířené)</string>
-    <string name="medtronic_pump_battery_lithium">Lithiové (Rozšířené)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Rozšířené)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Rozšířené)</string>
-    <string name="medtronic_bolus_debugging">Bolus/Ošetření ladění</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">VYHLEDAT</string>
-    <string name="rileylink_scanner_scan_stop">ZASTAVIT</string>
-    <string name="rileylink_scanner_selected_device">Vybráno</string>
-    <string name="rileylink_scanner_title">Vyhledávání RileyLinku</string>
-    <string name="location_yes">Povolit</string>
-    <string name="location_no">Ne</string>
-    <string name="rileylink_scanner_scanning">Vyhledávání</string>
-    <string name="rileylink_scanner_scanning_finished">Vyhledávání dokončeno</string>
-    <string name="rileylink_scanner_scanning_error">Chyba při vyhledávání: %1$d</string>
-    <string name="common_never">Nikdy</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Nastavení</string>
-    <string name="rileylink_settings_tab2">Historie</string>
-    <string name="rileylink_status">Status RileyLink</string>
-    <string name="medtronic_pump_status">Stav pumpy</string>
-    <string name="title_activity_rileylink_settings">Nastavení RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Nastavená adresa</string>
-    <string name="rileylink_connected_device">Připojené zařízení</string>
-    <string name="rileylink_connection_status">Stav připojení</string>
-    <string name="rileylink_connection_error">Chyba spojení</string>
-    <string name="rileylink_device">Zařízení</string>
-    <string name="rileylink_device_type">Typ zařízení</string>
-    <string name="rileylink_device_model">Model zařízení</string>
-    <string name="rileylink_last_used_frequency">Poslední použitá frekvence</string>
-    <string name="rileylink_last_device_contact">Poslední spojení se zařízením</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth se incializuje…</string>
-    <string name="rileylink_state_bt_error">Chyba Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth připraven</string>
-    <string name="rileylink_state_not_started">Nezahájeno</string>
-    <string name="rileylink_state_rl_init">RileyLink inicializace…</string>
-    <string name="rileylink_state_rl_error">Chyba RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Spojování RileyLinku a pumpy</string>
-    <string name="rileylink_state_pc_error">Problém připojení k pumpě</string>
-    <string name="rileylink_state_connected">Připojeno</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Zařízení není RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink nedostupný</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth je zakázáno</string>
-    <string name="rileylink_error_no_bt_adapter">Žádný Bluetooth adaptér</string>
-    <string name="rileylink_error_tuneup_failed">Spojování selhalo</string>
-    <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
-    <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Chyby</string>
-    <string name="medtronic_error_serial_not_set">Sériové číslo nenastaveno.</string>
-    <string name="medtronic_error_serial_invalid">Sériové číslo neplatné.</string>
-    <string name="medtronic_error_pump_type_not_set">Nenastaven typ pumpy.</string>
-    <string name="medtronic_error_pump_type_invalid">Nepodporovaný typ pumpy.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Nenastavená frekvence pumpy.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvence pumpy.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Chybná adresa RileyLinku.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Detekovaná pumpa je jiného typu než nakonfigurovaná.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavení bazálních profilů/vzorů není na pumpě povoleno. Povolte je na pumpě.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazální profil na pumpě je chybný (musí být STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpě (musí být absolutní).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpě (musí být %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Chybný max. bazál na pumpě (musí být %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat pumpu, než bude možné tuto funkci použít.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Požadována změna času větší než 24 h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Bazály</string>
-    <string name="medtronic_history_group_configuration">Konfigurace</string>
-    <string name="medtronic_history_group_notification">Oznámení</string>
-    <string name="medtronic_history_group_statistic">Statistika</string>
-    <string name="medtronic_history_group_unknown">Neznámé</string>
-    <string name="medtronic_history_group_all">Vše</string>
-    <string name="medtronic_pump_history">Historie Medtronic pumpy</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nikdy nekontaktováno</string>
-    <string name="medtronic_pump_status_waking_up">Probouzení</string>
-    <string name="medtronic_pump_status_error_comm">Chyba komunikace</string>
-    <string name="medtronic_pump_status_timeout_comm">Vypršel časový limit komunikace</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurace</string>
-    <string name="medtronic_pump_status_active">Aktivní</string>
-    <string name="medtronic_pump_status_sleeping">Spící</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Zrušili jste bolus potom, co byl nastaven na pumpě. Protože Medtronic nepodporuje zrušení bolusu, musíte ho zrušit ručně. Pozastavte pumpu a znovu spusťte. Aplikace detekuje změnu při příštím připojení (do 5 min).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Nelze načíst současný dočasný bazál.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nelze zastavit současný dočasný bazál. Ukončuji operaci.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Nastavení profilu selhalo, protože následující vzorec má příliš velké bazály: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus nemohl být odeslán.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nebylo možné vydat, protože dostupné množství inzulinu (%1$.2f) je menší než požadovaný bolus (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Dočasný bazál nemohl být nastaven.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Současný dočasný bazál nemohl být zrušen.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazální profil nemohl být nastaven.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazální profil je stejný, takže nebude znovu nastaven.</string>
-    <string name="medtronic_cmd_desc_get_history">Načítání historie - Strana %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Načítání historie - Strana %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Načítání času pumpy</string>
-    <string name="medtronic_cmd_desc_get_settings">Načítání nastavení</string>
-    <string name="medtronic_cmd_desc_get_model">Načítání modelu</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Načítání profilu</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Nastavování profilu</string>
-    <string name="medtronic_cmd_desc_get_tbr">Načítání dočasného bazálu</string>
-    <string name="medtronic_cmd_desc_set_tbr">Nastavování dočasného bazálu</string>
-    <string name="medtronic_cmd_desc_set_bolus">Nastavování bolusu</string>
     <string name="profilename">Změna profilu na</string>
     <string name="changengetoprofilename">Změna profilu na %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Poslední připojení k pumpě</string>
@@ -1300,6 +1169,15 @@
     <string name="buttonson_description">Tlačítka jsou vždy zobrazena v dolní části obrazovky</string>
     <string name="largedisplay_description">Velký displej</string>
     <string name="skin">Vzhled</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nikdy nekontaktováno</string>
+    <string name="medtronic_pump_status_waking_up">Probouzení</string>
+    <string name="medtronic_pump_status_error_comm">Chyba komunikace</string>
+    <string name="medtronic_pump_status_timeout_comm">Vypršel časový limit komunikace</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurace</string>
+    <string name="medtronic_pump_status_active">Aktivní</string>
+    <string name="medtronic_pump_status_sleeping">Spící</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integrace pumpy pro Omnipod, vyžaduje zařízení RileyLink (s firmwarem alespoň 2.0).</string>
diff --git a/app/src/main/res/values-cy-rGB/strings.xml b/app/src/main/res/values-cy-rGB/strings.xml
index 70cc9c5d48..2578fce6a9 100644
--- a/app/src/main/res/values-cy-rGB/strings.xml
+++ b/app/src/main/res/values-cy-rGB/strings.xml
@@ -4,19 +4,8 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 032137f0a8..47d0631c37 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1048,137 +1048,6 @@ Unerwartetes Verhalten.</string>
     <string name="triggers">Auslöser:</string>
     <string name="remove_label">ENTFERNEN</string>
     <string name="preconditions">Voraussetzung:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operation nicht durch Pumpe und/oder Treiber unterstützt.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Pumpenintegration für Medtronic, benötigt RileyLink und ein spezielles Pumpenmodell</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Seriennummer der Pumpe</string>
-    <string name="medtronic_pump_type">Pumpentyp</string>
-    <string name="medtronic_pump_frequency">Pumpenfrequenz</string>
-    <string name="medtronic_pump_bolus_delay">Verzögerung vor dem Start des Bolus (sek.)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolus in der Pumpe (IE)</string>
-    <string name="medtronic_pump_max_basal">Max Basal in der Pumpe (IE/h)</string>
-    <string name="medtronic_pump_encoding">Medtronic Enkodierung</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Weltweit (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Codierung</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Codierung</string>
-    <string name="medtronic_custom_action_wake_and_tune">Aufwachen und anpassen</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Bolus Block löschen</string>
-    <string name="medtronic_custom_action_reset_rileylink">RileyLink-Konfiguration zurücksetzen</string>
-    <string name="medtronic_pump_battery_select">Akkutyp (Power View)</string>
-    <string name="medtronic_pump_battery_no">Nicht ausgewählt (Einfache Ansicht)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaline Batterie (erweiterte Ansicht)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium Batterie (erweiterte Ansicht)</string>
-    <string name="medtronic_pump_battery_nizn">Nickel-Zink-Akku (erweiterte Ansicht)</string>
-    <string name="medtronic_pump_battery_nimh">Nickel-Zink-Akku (erweiterte Ansicht)</string>
-    <string name="medtronic_bolus_debugging">Fehlersuche Bolus/Behandlungen</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCANNEN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Ausgewählt</string>
-    <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="location_yes">Aktivieren</string>
-    <string name="location_no">Nein</string>
-    <string name="rileylink_scanner_scanning">Scannt</string>
-    <string name="rileylink_scanner_scanning_finished">Scannen abgeschlossen</string>
-    <string name="rileylink_scanner_scanning_error">Scanfehler: %1$d</string>
-    <string name="common_never">Nie</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Einstellungen</string>
-    <string name="rileylink_settings_tab2">Verlauf</string>
-    <string name="rileylink_status">RileyLink Status</string>
-    <string name="medtronic_pump_status">Pumpen-Status</string>
-    <string name="title_activity_rileylink_settings">RileyLink Einstellungen</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Konfigurierte Adresse</string>
-    <string name="rileylink_connected_device">Verbundenes Gerät</string>
-    <string name="rileylink_connection_status">Verbindungsstatus</string>
-    <string name="rileylink_connection_error">Verbindungsfehler</string>
-    <string name="rileylink_device">Gerät</string>
-    <string name="rileylink_device_type">Geräte-Typ</string>
-    <string name="rileylink_device_model">Gerätemodell</string>
-    <string name="rileylink_last_used_frequency">Zuletzt verwendete Frequenz</string>
-    <string name="rileylink_last_device_contact">Letzter Gerätekontakt</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Initialisiere Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Bluetooth-Fehler</string>
-    <string name="rileylink_state_bt_ready">Bluetooth bereit</string>
-    <string name="rileylink_state_not_started">Nicht gestartet</string>
-    <string name="rileylink_state_rl_init">RileyLink Initialisierung…</string>
-    <string name="rileylink_state_rl_error">RileyLink Fehler</string>
-    <string name="rileylink_state_pc_tune_up">RileyLink und Pumpe einstellen</string>
-    <string name="rileylink_state_pc_error">Problem beim Verbinden mit Pumpe</string>
-    <string name="rileylink_state_connected">Verbunden</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Gerät ist kein RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink nicht erreichbar</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth ist deaktiviert</string>
-    <string name="rileylink_error_no_bt_adapter">Kein Bluetooth-Adapter</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp fehlgeschlagen</string>
-    <string name="rileylink_error_pump_unreachable">Pumpe ist nicht erreichbar</string>
-    <string name="rileylink_error_pod_unreachable">Pod nicht erreichbar</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronic Pumpe</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Fehler</string>
-    <string name="medtronic_error_serial_not_set">Seriennummer nicht angegeben.</string>
-    <string name="medtronic_error_serial_invalid">Seriennummer ungültig.</string>
-    <string name="medtronic_error_pump_type_not_set">Pumpenart nicht angegeben.</string>
-    <string name="medtronic_error_pump_type_invalid">Pumptyp nicht unterstützt.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Pumpen-Frequenz nicht angegeben.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Pumpen-Frequenz nicht unterstützt.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adresse ungültig.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Erkannter Pumpentyp entspricht nicht dem eingestellen Pumpentyp.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Einstellung für Basalprofile/-muster ist auf der Pumpe nicht aktiviert. Aktiviere es auf der Pumpe.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Das eingestellte Basalprofl der Pumpe ist falsch (muss STD sein).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Falscher TBR-Typ auf der Pumpe (muss \"Absolut\" sein).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Falscher Max-Bolus auf Pumpe eingestellt (muss %1$.2f sein).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Falsche Max-Basal auf Pumpe eingestellt (muss %1$.2f sein).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operation ist nicht möglich.\n\n Du musst zuerst die Medtronic Pumpe konfigurieren, bevor Du diese Operation verwenden kannst.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Mehr als 24h Zeitänderung wurde eingestellt.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basal</string>
-    <string name="medtronic_history_group_configuration">Einstellungen</string>
-    <string name="medtronic_history_group_notification">Benachrichtigungen</string>
-    <string name="medtronic_history_group_statistic">Statistiken</string>
-    <string name="medtronic_history_group_unknown">Unbekannte</string>
-    <string name="medtronic_history_group_all">Alle</string>
-    <string name="medtronic_pump_history">Medtronic Pumpenverlauf</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nie verbunden</string>
-    <string name="medtronic_pump_status_waking_up">Aufwecken</string>
-    <string name="medtronic_pump_status_error_comm">Fehler bei der Kommunikation</string>
-    <string name="medtronic_pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpe ist nicht erreichbar</string>
-    <string name="medtronic_pump_status_invalid_config">Ungültige Einstellung</string>
-    <string name="medtronic_pump_status_active">Aktiv</string>
-    <string name="medtronic_pump_status_sleeping">Schläft</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Du hast den Bolus abgebrochen nachdem er bereits an die Pumpe übermittelt war. Da Medtronic-Pumpen den Abbrechen-Befehl nicht unterstützen, musst du den Bolus manuell abbrechen. Versetze die Pumpe in den Suspend-Modus und gehe dann auf Fortsetzen (wenn Du den Bolus nach wie vor abbrechen möchtest). Die App wird die Änderungen beim nächsten Update (weniger als 5 Minuten) anzeigen.</string>
-    <string name="medtronic_cmd_cant_read_tbr">Aktuelle TBR konnte nicht gelesen werden.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Aktuelle TBR konnte nicht gestoppt werden. Funktion unterbrochen.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Einstellen des Profils fehlgeschlagen weil folgende Basal-Raten zu hoch sind: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus konnte nicht abgegeben werden.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Der Bolus konnte nicht abgegeben werden, da weniger Insulin zur Verfügung steht (%1$.2f) als für den Bolus benötigt wird (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR konnte nicht eingestellt werden.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Konnte die aktuelle TBR nicht abbrechen.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basalprofil konnte nicht eingestellt werden.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basalprofil, unverändert wird nicht erneut eingestellt.</string>
-    <string name="medtronic_cmd_desc_get_history">Hole Verlauf - Seite %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Hole Verlauf - Seite %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Hole Pumpen-Zeit</string>
-    <string name="medtronic_cmd_desc_get_settings">Hole Einstellungen</string>
-    <string name="medtronic_cmd_desc_get_model">Hole Pumpenmodel</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Hole Basal-Profil</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Setzte Basal-Profil</string>
-    <string name="medtronic_cmd_desc_get_tbr">Hole Temporäre Basalraten</string>
-    <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
-    <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</string>
     <string name="profilename">Profil wechseln zu</string>
     <string name="changengetoprofilename">Profil wechseln zu %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Letzte Verbindung zur Pumpe</string>
@@ -1301,6 +1170,15 @@ Unerwartetes Verhalten.</string>
     <string name="buttonson_description">Schaltflächen werden immer am unteren Rand des Bildschirms angezeigt</string>
     <string name="largedisplay_description">Großer Bildschirm</string>
     <string name="skin">Erscheinungsbild</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nie verbunden</string>
+    <string name="medtronic_pump_status_waking_up">Aufwecken</string>
+    <string name="medtronic_pump_status_error_comm">Fehler bei der Kommunikation</string>
+    <string name="medtronic_pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpe ist nicht erreichbar</string>
+    <string name="medtronic_pump_status_invalid_config">Ungültige Einstellung</string>
+    <string name="medtronic_pump_status_active">Aktiv</string>
+    <string name="medtronic_pump_status_sleeping">Schläft</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Um den Omnipod nutzen zu können, brauchst Du einen RileyLink (mind. Firmware 2.0).</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 0595f9aca8..0410c5b8d7 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -900,132 +900,6 @@
     <string name="triggers">Ενεργοποιήσεις:</string>
     <string name="remove_label">ΜΕΤΑΚΙΝΗΣΗ</string>
     <string name="preconditions">Προϋποθέσεις:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Η λειτουργία δεν υποστηρίζεται από την αντλία ή/και οδηγό.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Η λειτουργία δεν υποστηρίζεται ΑΚΟΜΑ από την αντλία.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Η ολοκλήρωση της αντλίας για τη Medtronic, απαιτεί τη συσκευή RileyLink και το συγκεκριμένο μοντέλο αντλίας</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Σειριακός Αριθμός Αντλίας</string>
-    <string name="medtronic_pump_type">Τύπος Αντλίας</string>
-    <string name="medtronic_pump_frequency">Συχνότητα Αντλίας</string>
-    <string name="medtronic_pump_bolus_delay">Η καθυστέρηση πριν το bolus ξεκίνησε (s)</string>
-    <string name="medtronic_pump_max_bolus">Μέγιστο Bolus στην αντλία (U)</string>
-    <string name="medtronic_pump_max_basal">Μέγιστος Βασικός στην αντλία (U/h)</string>
-    <string name="medtronic_pump_encoding">Αποκωδικοποίηση Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Παγκοσμίως (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Κωδικοποίηση λογισμικού 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Κωδικοποίηση hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Wake and Tune Up</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Καθαρισμός Bolus Block</string>
-    <string name="medtronic_custom_action_reset_rileylink">Επαναφορά Ρυθμίσεων RileyLink</string>
-    <string name="medtronic_pump_battery_select">Τύπος Μπαταρίας (Power View)</string>
-    <string name="medtronic_pump_battery_no">Μη επιλεγμένη (Simple View)</string>
-    <string name="medtronic_pump_battery_alkaline">Αλκαλική (Extended view)</string>
-    <string name="medtronic_pump_battery_lithium">Λιθίου (Extended view)</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Επιλεγμένο</string>
-    <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="location_yes">Ενεργοποίηση</string>
-    <string name="location_no">Όχι</string>
-    <string name="rileylink_scanner_scanning">Σάρωση</string>
-    <string name="rileylink_scanner_scanning_finished">Η σάρωση ολοκληρώθηκε</string>
-    <string name="rileylink_scanner_scanning_error">Λάθος σάρωσης: %1$d</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Ρυθμίσεις</string>
-    <string name="rileylink_settings_tab2">Ιστορικό</string>
-    <string name="rileylink_status">Κατάσταση RileyLink</string>
-    <string name="medtronic_pump_status">Κατάσταση Αντλίας</string>
-    <string name="title_activity_rileylink_settings">Ρυθμίσεις RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Διαμορφωμένη Διεύθυνση</string>
-    <string name="rileylink_connected_device">Συνδεδεμένες συσκευές</string>
-    <string name="rileylink_connection_status">Κατάσταση Σύνδεσης</string>
-    <string name="rileylink_connection_error">Σφάλμα σύνδεσης</string>
-    <string name="rileylink_device">Συσκευή</string>
-    <string name="rileylink_device_type">Τύπος Συσκευής</string>
-    <string name="rileylink_device_model">Μοντέλο συσκευής</string>
-    <string name="rileylink_last_used_frequency">Τελευταία χρησιμοποιημένη συχνότητα</string>
-    <string name="rileylink_last_device_contact">Τελευταία επαφή συσκευής</string>
-    <string name="rileylink_firmware_version">Έκδοση RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Επαναφορά Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Σφάλμα Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Έτοιμο</string>
-    <string name="rileylink_state_not_started">Δεν ξεκίνησε</string>
-    <string name="rileylink_state_rl_init">Αρχικοποίηση του RileyLink…</string>
-    <string name="rileylink_state_rl_error">RileyLink Σφάλμα</string>
-    <string name="rileylink_state_pc_tune_up">Συντονισμός RileyLink και Αντλίας</string>
-    <string name="rileylink_state_pc_error">Πρόβλημα σύνδεσης με την Αντλία</string>
-    <string name="rileylink_state_connected">Συνδέθηκε</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Η συσκευή δεν είναι RileyLink</string>
-    <string name="rileylink_error_unreachable">Το RileyLink μη προσπελάσιμο</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth απενεργοποιημένο</string>
-    <string name="rileylink_error_no_bt_adapter">Δεν υπάρχει προσαρμογέας Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp απέτυχε</string>
-    <string name="rileylink_error_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
-    <string name="rileylink_error_pod_unreachable">Το Pod δεν είναι διαθέσιμο</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Αντλία Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Σφάλματα</string>
-    <string name="medtronic_error_serial_not_set">Δεν ορίστηκε # Serial.</string>
-    <string name="medtronic_error_serial_invalid">Serial # μη έγκυρο.</string>
-    <string name="medtronic_error_pump_type_not_set">Δεν ορίστηκε Τύπος Αντλίας.</string>
-    <string name="medtronic_error_pump_type_invalid">Τύπος Αντλίας δεν υποστηρίζεται.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Δεν ορίστηκε Συχνότητα Αντλίας.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Συχνότητα Αντλίας δεν υποστηρίζεται.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Διεύθυνση RileyLink μη έγκυρη.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Ο τύπος αντλίας που ανιχνεύτηκε δεν είναι ο ίδιος με αυτόν που ορίστηκε.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Το βασικό προφίλ που ορίστηκε στην αντλία είναι λάθoς (πρέπει να είναι STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Λάθος τύπος TBR ορίστηκε στην αντλία (πρέπει να είναι Absolute).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Λάθος μέγιστο bolus ορίστηκε στην αντλία (πρέπει να είναι %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Λάθος μέγιστο Βασικού ορίστηκε στην αντλία (πρέπει να είναι %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Λειτουργία δεν είναι δυνατή. \n\n Χρειάζεται να ρυθμίσετε την αντλία Medtronic πρώτα, προτού να μπορέσετε να χρησιμοποιήσετε αυτή την λειτουργία.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Απαιτήθηκε αλλαγή ώρας πάνω από 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Βασικοί</string>
-    <string name="medtronic_history_group_configuration">Ρύθμιση παραμέτρων</string>
-    <string name="medtronic_history_group_notification">Ειδοποιήσεις</string>
-    <string name="medtronic_history_group_statistic">Στατιστικά</string>
-    <string name="medtronic_history_group_unknown">Άγνωστα</string>
-    <string name="medtronic_history_group_all">Όλα</string>
-    <string name="medtronic_pump_history">Ιστορικό Αντλίας Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Ποτέ δεν επικοινωνήσατε</string>
-    <string name="medtronic_pump_status_waking_up">Ξύπνημα</string>
-    <string name="medtronic_pump_status_error_comm">Σφάλμα με επικοινωνία</string>
-    <string name="medtronic_pump_status_timeout_comm">Λήξη χρόνου επικοινωνίας</string>
-    <string name="medtronic_pump_status_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
-    <string name="medtronic_pump_status_invalid_config">Μη έγκυρη παραμετροποίηση</string>
-    <string name="medtronic_pump_status_active">Ενεργή</string>
-    <string name="medtronic_pump_status_sleeping">Sleeping</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Ακυρώσατε τον Bolus, αφού είχε ήδη σταλεί στην αντλία. Επειδή η αντλία Medtronic δεν υποστηρίζει ακύρωση, θα χρειαστεί να ακυρωθεί χειροκίνητα. Βάλτε την αντλία σε αναστολή λειτουργίας και μετά κάντε Συνέχιση (αν θέλετε να ακυρώσετε ακόμα). Η εφαρμογή θα πάρει τις αλλαγές, στην επόμενη ενημέρωση (σε λιγότερο από 5 λεπτά).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Αδυναμία ανάγνωσης τρέχοντος TBR.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Αδυναμία ακύρωσης τρέχοντος TBR. Αναστολή λειτουργίας.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Η δημιουργία προφίλ απέτυχε, επειδή ακολουθώντας πρότυπα, έχετε υπερβολικά μεγάλο βασικό ρυθμό: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Το Bolus δεν μπορεί να χορηγηθεί.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Το Bolus δεν μπορεί να παραδοθεί διότι η διαθέσιμη ποσότητα ινσουλίνης (%1$.2f) είναι μικρότερη από αυτήν που ζητείται (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR δεν μπορεί να μπει.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Αδυναμία ακύρωσης τρέχοντος TBR.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Το Βασικό Προφίλ δεν μπορεί να τοποθετηθεί.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Το Βασικό Προφίλ είναι ίδιο, οπότε δεν θα μπει ξανά.</string>
-    <string name="medtronic_cmd_desc_get_history">Βλέπε Ιστορικό - Σελίδα %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Βλέπε Ιστορικό - Σελίδα %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Πάρτε Ώρα Αντλίας</string>
-    <string name="medtronic_cmd_desc_get_settings">Λάβετε ρυθμίσεις</string>
-    <string name="medtronic_cmd_desc_get_model">Λάβετε Μοντέλο Αντλίας</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Λάβετε Βασικό Προφίλ</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Βάλτε Βασικό Προφίλ</string>
-    <string name="medtronic_cmd_desc_get_tbr">Λάβετε Προσωρινό Ρυθμό</string>
-    <string name="medtronic_cmd_desc_set_tbr">Βάλτε Προσωρινό Ρυθμό</string>
-    <string name="medtronic_cmd_desc_set_bolus">Βάλτε Bolus</string>
     <string name="profilename">Αλλαγή προφίλ σε</string>
     <string name="changengetoprofilename">Αλλαγή προφίλ σε %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Τελευταία σύνδεση με αντλία</string>
@@ -1053,6 +927,15 @@
     <string name="unit_minute_short">min</string>
     <string name="format_carbs">%1$dg</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Ποτέ δεν επικοινωνήσατε</string>
+    <string name="medtronic_pump_status_waking_up">Ξύπνημα</string>
+    <string name="medtronic_pump_status_error_comm">Σφάλμα με επικοινωνία</string>
+    <string name="medtronic_pump_status_timeout_comm">Λήξη χρόνου επικοινωνίας</string>
+    <string name="medtronic_pump_status_pump_unreachable">Η αντλία δεν είναι διαθέσιμη</string>
+    <string name="medtronic_pump_status_invalid_config">Μη έγκυρη παραμετροποίηση</string>
+    <string name="medtronic_pump_status_active">Ενεργή</string>
+    <string name="medtronic_pump_status_sleeping">Sleeping</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index fc33093c61..08d7d3de0b 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1042,137 +1042,6 @@
     <string name="triggers">Activadores:</string>
     <string name="remove_label">ELIMINAR</string>
     <string name="preconditions">Precondiciones:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operación no soportada por bomba y/o controlador.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integración de Bomba para Medtronic, requiere dispositivo RileyLink y modelo específico de Bomba</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Número de serie de la Infusora</string>
-    <string name="medtronic_pump_type">Tipo de Infusora</string>
-    <string name="medtronic_pump_frequency">Frecuencia de la Infusora Medtronic</string>
-    <string name="medtronic_pump_bolus_delay">Retraso antes de que el bolo se inicie (s)</string>
-    <string name="medtronic_pump_max_bolus">Bolo máximo en infusora (U)</string>
-    <string name="medtronic_pump_max_basal">Máxima Basal en Infusora (U/h)</string>
-    <string name="medtronic_pump_encoding">Codificación de Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canadá (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">A nivel mundial (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Codificación de software 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificación de hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Encender y ajustar</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Borrar el bloque de bolo</string>
-    <string name="medtronic_custom_action_reset_rileylink">Restablecer configuración de RileyLink</string>
-    <string name="medtronic_pump_battery_select">Tipo de batería (Vista de energía)</string>
-    <string name="medtronic_pump_battery_no">No seleccionado (Vista simple)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcalina (vista extendida)</string>
-    <string name="medtronic_pump_battery_lithium">Litio (vista extendida)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (vista ampliada)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (vista extendida)</string>
-    <string name="medtronic_bolus_debugging">Bolos/Depuración de Tratamientos</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">ESCANEAR</string>
-    <string name="rileylink_scanner_scan_stop">DETENER</string>
-    <string name="rileylink_scanner_selected_device">Seleccionado</string>
-    <string name="rileylink_scanner_title">Escaneo de RileyLink</string>
-    <string name="location_yes">Habilitar</string>
-    <string name="location_no">No</string>
-    <string name="rileylink_scanner_scanning">Buscando</string>
-    <string name="rileylink_scanner_scanning_finished">Búsqueda Finalizada</string>
-    <string name="rileylink_scanner_scanning_error">Error de escaneo: %1$d</string>
-    <string name="common_never">Nunca</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Configuración</string>
-    <string name="rileylink_settings_tab2">Historico</string>
-    <string name="rileylink_status">Estado RileyLink</string>
-    <string name="medtronic_pump_status">Estado de Infusora</string>
-    <string name="title_activity_rileylink_settings">Ajustes de RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Dirección configurada</string>
-    <string name="rileylink_connected_device">Dispositivo conectado</string>
-    <string name="rileylink_connection_status">Estado de la conexión</string>
-    <string name="rileylink_connection_error">Error de conexión</string>
-    <string name="rileylink_device">Dispositivo</string>
-    <string name="rileylink_device_type">Tipo de dispositivo</string>
-    <string name="rileylink_device_model">Modelo del dispositivo</string>
-    <string name="rileylink_last_used_frequency">Última frecuencia usada</string>
-    <string name="rileylink_last_device_contact">Último contacto del dispositivo</string>
-    <string name="rileylink_firmware_version">Firmware RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Inicializando Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Error Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth listo</string>
-    <string name="rileylink_state_not_started">No iniciado</string>
-    <string name="rileylink_state_rl_init">Inicialización de RileyLink…</string>
-    <string name="rileylink_state_rl_error">Error de RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Configurando RileyLink y la bomba</string>
-    <string name="rileylink_state_pc_error">Problema al conectar con la infusora</string>
-    <string name="rileylink_state_connected">Conectado</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">El dispositivo no es un RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink no accesible</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth está desactivado</string>
-    <string name="rileylink_error_no_bt_adapter">No hay adaptador Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">Error al configurar</string>
-    <string name="rileylink_error_pump_unreachable">Infusora no alcanzable</string>
-    <string name="rileylink_error_pod_unreachable">Infusora no alcanzable</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Infusora Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Errores</string>
-    <string name="medtronic_error_serial_not_set">Nº serie no establecido.</string>
-    <string name="medtronic_error_serial_invalid">Número de serie no válido.</string>
-    <string name="medtronic_error_pump_type_not_set">Tipo de infusora no establecido.</string>
-    <string name="medtronic_error_pump_type_invalid">Tipo de infusora no soportado.</string>
-    <string name="medtronic_error_pump_frequency_not_set">No se ha establecido la frecuencia de la infusora.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Frecuencia de la infusora no soportada.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Dirección de RileyLink no válida.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">El tipo de infusora detectado no es el mismo que el tipo configurado.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Los perfiles de basal/valor de los patrones no están activados en la bomba. Actívalos en la bomba.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">El perfil basal establecido en la infusora es incorrecto (debe ser estándar).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo incorrecto de basal temporal en la infusora (debe ser Absoluto).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Valor máximo incorrecto configurado en la infusora (debe ser %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Error en el valor máximo de basal configurado en la infusora (debe ser %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">La operación no es posible.\n\n Necesitas configurar primero la infusora Medtronic, antes de poder usar esta operación.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Se ha solicitado un cambio de hora de más de 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Dosis Basales</string>
-    <string name="medtronic_history_group_configuration">Ajustes</string>
-    <string name="medtronic_history_group_notification">Notificaciones</string>
-    <string name="medtronic_history_group_statistic">Estadísticas</string>
-    <string name="medtronic_history_group_unknown">Desconocido/a</string>
-    <string name="medtronic_history_group_all">Todos</string>
-    <string name="medtronic_pump_history">Historial de la infusora Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nunca conectados</string>
-    <string name="medtronic_pump_status_waking_up">En fase de inicio</string>
-    <string name="medtronic_pump_status_error_comm">Error con la comunicación</string>
-    <string name="medtronic_pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
-    <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
-    <string name="medtronic_pump_status_invalid_config">Configuración no válida</string>
-    <string name="medtronic_pump_status_active">Activo</string>
-    <string name="medtronic_pump_status_sleeping">Suspendida</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Has cancelado el bolo después de que ya estaba enviado a la infusora. Debido a que la infusora Medtronic no soporta comando cancelar, tendrás que cancelarlo manualmente. Pon la infusora en modo suspender y luego reinicia (si todavía quieres cancelar). La aplicación recogerá los cambios en la próxima actualización (en menos de 5 minutos).</string>
-    <string name="medtronic_cmd_cant_read_tbr">No se pudo leer la basal temporal actual.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">No se pudo cancelar la basal temporal actual. Detener la operación.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">El perfil no se pudo activar debido a que los siguientes patrones tienen una basal demasiado grande: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">No se pudo entregar el bolo.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">El bolo no pudo ser entregado porque la cantidad de insulina disponible (%1$.2f) es inferior al bolo solicitado (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">La basal temporal no se ha podido activar.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">No se pudo cancelar la basal temporal actual.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">No se pudo establecer el perfil de basal.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">El perfil basal es el mismo, por lo que no será establecido de nuevo.</string>
-    <string name="medtronic_cmd_desc_get_history">Recuperar el historial - Página %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Recuperar el historial - Página %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Obtener la hora de la infusora</string>
-    <string name="medtronic_cmd_desc_get_settings">Obtener la configuración</string>
-    <string name="medtronic_cmd_desc_get_model">Obtener el modelo de la infusora</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Obtener el perfil basal</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Establecer el perfil basal</string>
-    <string name="medtronic_cmd_desc_get_tbr">Obtener la basal temporal</string>
-    <string name="medtronic_cmd_desc_set_tbr">Establecer la basal temporal</string>
-    <string name="medtronic_cmd_desc_set_bolus">Fijar Bolo</string>
     <string name="profilename">Cambiar perfil a</string>
     <string name="changengetoprofilename">Cambiar perfil a %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Última conexión con la bomba</string>
@@ -1294,6 +1163,15 @@
     <string name="buttonson_description">Los botones siempre se muestran en la parte inferior de la pantalla</string>
     <string name="largedisplay_description">Pantalla grande</string>
     <string name="skin">Tema</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nunca conectados</string>
+    <string name="medtronic_pump_status_waking_up">En fase de inicio</string>
+    <string name="medtronic_pump_status_error_comm">Error con la comunicación</string>
+    <string name="medtronic_pump_status_timeout_comm">Tiempo de espera en la comunicación</string>
+    <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
+    <string name="medtronic_pump_status_invalid_config">Configuración no válida</string>
+    <string name="medtronic_pump_status_active">Activo</string>
+    <string name="medtronic_pump_status_sleeping">Suspendida</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">La integración de la bomba para Omnipod requiere el dispositivo RileyLink (con al menos 2,0 firmware).</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 70cc9c5d48..2578fce6a9 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -4,19 +4,8 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index cd7096a57b..32c5712945 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1048,137 +1048,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="triggers">Déclencheurs :</string>
     <string name="remove_label">SUPPRIMER</string>
     <string name="preconditions">Conditions préalables :</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Opération non prise en charge par la pompe et/ou le pilote.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Opération non ENCORE supportée par la pompe.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">L\'intégration de la pompe Medtronic nécessite un appareil RileyLink et un modèle de pompe spécifique</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Numéro de série de pompe</string>
-    <string name="medtronic_pump_type">Type de pompe</string>
-    <string name="medtronic_pump_frequency">Fréquence de pompe</string>
-    <string name="medtronic_pump_bolus_delay">Délai avant le début du Bolus (s)</string>
-    <string name="medtronic_pump_max_bolus">Bolus Max sur Pompe (U)</string>
-    <string name="medtronic_pump_max_basal">Basal Max sur Pompe (U/h)</string>
-    <string name="medtronic_pump_encoding">Encodage Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Encodage logiciel 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Encodage matériel 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Réveil et Réglage</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Effacer le bloc Bolus</string>
-    <string name="medtronic_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
-    <string name="medtronic_pump_battery_select">Type de batterie (vue d\'alimentation)</string>
-    <string name="medtronic_pump_battery_no">Non sélectionné (vue simple)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcaline (vue étendue)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (vue étendue)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (vue étendue)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (vue Étendue)</string>
-    <string name="medtronic_bolus_debugging">Débogage de Bolus/Traitements</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCANNER</string>
-    <string name="rileylink_scanner_scan_stop">ARRÊT</string>
-    <string name="rileylink_scanner_selected_device">Sélectionné</string>
-    <string name="rileylink_scanner_title">Scanner RileyLink</string>
-    <string name="location_yes">Activer</string>
-    <string name="location_no">Non</string>
-    <string name="rileylink_scanner_scanning">Recherche en cours</string>
-    <string name="rileylink_scanner_scanning_finished">Recherche finie</string>
-    <string name="rileylink_scanner_scanning_error">Erreur de recherche : %1$d</string>
-    <string name="common_never">Jamais</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Paramètres</string>
-    <string name="rileylink_settings_tab2">Historique</string>
-    <string name="rileylink_status">État du RileyLink</string>
-    <string name="medtronic_pump_status">État de la pompe</string>
-    <string name="title_activity_rileylink_settings">Paramètres RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Adresse configurée</string>
-    <string name="rileylink_connected_device">Appareil connecté</string>
-    <string name="rileylink_connection_status">État de la connexion</string>
-    <string name="rileylink_connection_error">Erreur de Connexion</string>
-    <string name="rileylink_device">Appareil</string>
-    <string name="rileylink_device_type">Type d\'appareil</string>
-    <string name="rileylink_device_model">Modèle d’appareil</string>
-    <string name="rileylink_last_used_frequency">Dernière fréquence utilisée</string>
-    <string name="rileylink_last_device_contact">Dernier contact appareil</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Initialisation Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Erreur Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Prêt</string>
-    <string name="rileylink_state_not_started">Non démarré</string>
-    <string name="rileylink_state_rl_init">Initialisation du RileyLink…</string>
-    <string name="rileylink_state_rl_error">Erreur RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Association du RileyLink et de la Pompe</string>
-    <string name="rileylink_state_pc_error">Problème communication avec la pompe</string>
-    <string name="rileylink_state_connected">Connecté</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">L\'appareil n\'est pas RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink non accessible</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth est désactivé</string>
-    <string name="rileylink_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
-    <string name="rileylink_error_pump_unreachable">Pompe hors de portée</string>
-    <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pompe Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Erreurs</string>
-    <string name="medtronic_error_serial_not_set">Numéro de série non défini.</string>
-    <string name="medtronic_error_serial_invalid">Numéro de série invalide.</string>
-    <string name="medtronic_error_pump_type_not_set">Type de pompe non défini.</string>
-    <string name="medtronic_error_pump_type_invalid">Type de pompe non pris en charge.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Fréquence de pompe non définie.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Fréquence de pompe non pris en charge.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Adresse RileyLink invalide.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Le type de pompe détecté n\'est pas le même que le type configuré.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Le réglage des profils de basal n\'est pas activé sur la pompe. Activez-le sur la pompe.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Le profil Basal défini sur la pompe est incorrect (doit être STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Mauvais type DBT (TBR) réglé sur la pompe (doit être Absolu).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">L\'opération n\'est pas possible.\n\n Vous devez d\'abord configurer la pompe Medtronic avant de pouvoir utiliser cette fonction.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Un changement de temps de plus de 24h a été demandé.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basals</string>
-    <string name="medtronic_history_group_configuration">Configurations</string>
-    <string name="medtronic_history_group_notification">Notifications</string>
-    <string name="medtronic_history_group_statistic">Statistiques</string>
-    <string name="medtronic_history_group_unknown">Inconnus</string>
-    <string name="medtronic_history_group_all">Tous</string>
-    <string name="medtronic_pump_history">Historique de la pompe Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Jamais contacté</string>
-    <string name="medtronic_pump_status_waking_up">Réveil en cours</string>
-    <string name="medtronic_pump_status_error_comm">Erreur de communication</string>
-    <string name="medtronic_pump_status_timeout_comm">Expiration du délai d\'attente en communication</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompe hors de portée</string>
-    <string name="medtronic_pump_status_invalid_config">Configuration non valable</string>
-    <string name="medtronic_pump_status_active">Activé</string>
-    <string name="medtronic_pump_status_sleeping">En veille</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Vous avez annulé le Bolus, après avoir déjà été envoyé vers la pompe. Puisque la pompe Medtronic n\'accepte pas d\'annulation, vous devrez l\'annuler manuellement. Mettez la pompe en mode Suspendre et puis faites le Reprendre (si vous voulez encore annuler). L\'application va récupérer ces modifications à la prochaine mise à jour (en moins de 5 minutes).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Impossible de lire le DBT (TBR) actuel.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossible d\'annuler le DBT (TBR) actuel. Arrêt de l\'opération.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Le nouveau profil a échoué car le taux basal suivant est trop élevé : %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Le Bolus n\'a pas pu être délivré.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Le Bolus n\'a pas pu être délivré, car la quantité d\'insuline disponible (%1$.2f) est inférieure à celle requise (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT n\'a pas pu être défini.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Impossible d\'annuler le DBT actuel.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Le profil Basal n\'a pas pu être défini.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Le profil Basal est le même, donc il ne sera pas redéfini.</string>
-    <string name="medtronic_cmd_desc_get_history">Obtenir l\'historique - Page %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Obtenir l\'historique - Page %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Obtenir l\'heure de la pompe</string>
-    <string name="medtronic_cmd_desc_get_settings">Obtenir les paramètres</string>
-    <string name="medtronic_cmd_desc_get_model">Obtenir le modèle de pompe</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Obtenir le profil Basal</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Obtenir le profil Basal</string>
-    <string name="medtronic_cmd_desc_get_tbr">Obtenir le Basal Temporaire</string>
-    <string name="medtronic_cmd_desc_set_tbr">Définir le Basal Temporaire</string>
-    <string name="medtronic_cmd_desc_set_bolus">Définir le Bolus</string>
     <string name="profilename">Remplacer le profil par</string>
     <string name="changengetoprofilename">Remplacer le profil par %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Dernière connexion à la pompe</string>
@@ -1301,6 +1170,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="buttonson_description">Les boutons sont toujours affichés en bas de l\'écran</string>
     <string name="largedisplay_description">Grand écran</string>
     <string name="skin">Thème</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Jamais contacté</string>
+    <string name="medtronic_pump_status_waking_up">Réveil en cours</string>
+    <string name="medtronic_pump_status_error_comm">Erreur de communication</string>
+    <string name="medtronic_pump_status_timeout_comm">Expiration du délai d\'attente en communication</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompe hors de portée</string>
+    <string name="medtronic_pump_status_invalid_config">Configuration non valable</string>
+    <string name="medtronic_pump_status_active">Activé</string>
+    <string name="medtronic_pump_status_sleeping">En veille</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">L\'intégration de la pompe Omnipod nécessite un boitier RileyLink (avec au minimum un firmware 2.0).</string>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index d862204934..94dbab337b 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -16,19 +16,8 @@
     <string name="cob">COB</string>
     <string name="careportal_pbage_label_short">PBAGE</string>
     <string name="openaps_short">OAPS</string>
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 70cc9c5d48..2578fce6a9 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -4,19 +4,8 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index dba67ec9a7..9774baeb2d 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1047,137 +1047,6 @@
     <string name="triggers">Trigger:</string>
     <string name="remove_label">RIMUOVI</string>
     <string name="preconditions">Presupposti:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal micro e/o dal driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integrazione del microinfusore Medtronic, richiede un dispositivo RileyLink e uno specifico modello di microinfusore</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Numero seriale micro</string>
-    <string name="medtronic_pump_type">Tipo micro</string>
-    <string name="medtronic_pump_frequency">Frequenza micro</string>
-    <string name="medtronic_pump_bolus_delay">Ritardo prima che il Bolo sia avviato (s)</string>
-    <string name="medtronic_pump_max_bolus">Max bolo su micro (U)</string>
-    <string name="medtronic_pump_max_basal">Max basale su micro (U/h)</string>
-    <string name="medtronic_pump_encoding">Codifica Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Globale (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Codifica Software 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Codifica Hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Risveglio e Sintonizzazione</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Cancella blocco bolo</string>
-    <string name="medtronic_custom_action_reset_rileylink">Reset Configurazione RileyLink</string>
-    <string name="medtronic_pump_battery_select">Tipo batteria (Power view)</string>
-    <string name="medtronic_pump_battery_no">Non selezionato (Simple view)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcalina (Extended view)</string>
-    <string name="medtronic_pump_battery_lithium">Litio (Extended view)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
-    <string name="medtronic_bolus_debugging">Debug Bolo/Trattamenti</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Selezionato</string>
-    <string name="rileylink_scanner_title">Scansione RileyLink</string>
-    <string name="location_yes">Abilita</string>
-    <string name="location_no">No</string>
-    <string name="rileylink_scanner_scanning">Scansione</string>
-    <string name="rileylink_scanner_scanning_finished">Scansione terminata</string>
-    <string name="rileylink_scanner_scanning_error">Errore scansione: %1$d</string>
-    <string name="common_never">Mai</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Impostazioni</string>
-    <string name="rileylink_settings_tab2">Storico</string>
-    <string name="rileylink_status">Stato RileyLink</string>
-    <string name="medtronic_pump_status">Stato micro</string>
-    <string name="title_activity_rileylink_settings">Impostazioni RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Indirizzo configurato</string>
-    <string name="rileylink_connected_device">Dispositivo connesso</string>
-    <string name="rileylink_connection_status">Stato connessione</string>
-    <string name="rileylink_connection_error">Errore connessione</string>
-    <string name="rileylink_device">Dispositivo</string>
-    <string name="rileylink_device_type">Tipo dispositivo</string>
-    <string name="rileylink_device_model">Modello dispositivo</string>
-    <string name="rileylink_last_used_frequency">Ultima frequenza utilizzata</string>
-    <string name="rileylink_last_device_contact">Ultimo contatto dispositivo</string>
-    <string name="rileylink_firmware_version">RL firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Inizializzazione bluetooth…</string>
-    <string name="rileylink_state_bt_error">Errore bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth pronto</string>
-    <string name="rileylink_state_not_started">Non avviato</string>
-    <string name="rileylink_state_rl_init">Inializzazione RileyLink…</string>
-    <string name="rileylink_state_rl_error">Errore RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Sintonizzazione RileyLink e micro</string>
-    <string name="rileylink_state_pc_error">Problema di connessione al micro</string>
-    <string name="rileylink_state_connected">Connesso</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Il dispositivo non è RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink non raggiungibile</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth disabilitato</string>
-    <string name="rileylink_error_no_bt_adapter">Nessun adattatore bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">Sintonizzazione fallita</string>
-    <string name="rileylink_error_pump_unreachable">Micro irraggiungibile</string>
-    <string name="rileylink_error_pod_unreachable">Pod irraggiungibile</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Micro Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Errori</string>
-    <string name="medtronic_error_serial_not_set"># seriale non impostato.</string>
-    <string name="medtronic_error_serial_invalid"># seriale non valido.</string>
-    <string name="medtronic_error_pump_type_not_set">Tipo micro non impostato.</string>
-    <string name="medtronic_error_pump_type_invalid">Tipo micro non supportato.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Frequenza micro non impostata.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Frequenza micro non supportata.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Il tipo di micro rilevato non è uguale al tipo configurato.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">L\'impostazione di modelli/profili basali non è abilitata sul micro. Abilitala sul micro.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato sul micro non è corretto (deve essere STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato sul micro (deve essere Assoluto).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato sul micro (deve essere %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata sul micro (deve essere %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operazione non possibile.\n\n Devi prima configurare il micro Medtronic.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica oraria di oltre 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basali</string>
-    <string name="medtronic_history_group_configuration">Configurazioni</string>
-    <string name="medtronic_history_group_notification">Notifiche</string>
-    <string name="medtronic_history_group_statistic">Statistiche</string>
-    <string name="medtronic_history_group_unknown">Sconosciuti</string>
-    <string name="medtronic_history_group_all">Tutto</string>
-    <string name="medtronic_pump_history">Storico micro Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Mai connesso</string>
-    <string name="medtronic_pump_status_waking_up">Risveglio</string>
-    <string name="medtronic_pump_status_error_comm">Errore nella comunicazione</string>
-    <string name="medtronic_pump_status_timeout_comm">Timeout della comunicazione</string>
-    <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
-    <string name="medtronic_pump_status_invalid_config">Configurazione non valida</string>
-    <string name="medtronic_pump_status_active">Attivo</string>
-    <string name="medtronic_pump_status_sleeping">In sospensione</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Hai cancellato il bolo, dopo che era già stato impostato sul micro. Dal momento che il micro Medtronic non supporta la cancellazione, avrai bisogno di cancellare il bolo manualmente. Metti il micro in modalità sospensione e poi fallo ripartire (se vuoi ancora cancellare il bolo). L\'applicazione rileverà le modifiche al prossimo aggiornamento (in meno di 5 minuti).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Impossibile leggere il TBR corrente.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossibile cancellare il TBR corrente. Arresto dell\'operazione.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Impostazione del profilo fallita. A causa dei seguenti pattern, hai una velocità basale troppo grande: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Il bolo non può essere erogato.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Il bolo non può essere erogato perché la quantità di insulina disponibile (%1$.2f) è inferiore al bolo richiesto (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Il TBR non può essere impostato.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Impossibile cancellare il TBR corrente.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Il profilo basale non può essere impostato.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Il profilo basale è lo stesso, non sarà impostato di nuovo.</string>
-    <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
-    <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
-    <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Imposta profilo basale</string>
-    <string name="medtronic_cmd_desc_get_tbr">Ottieni basale temporanea</string>
-    <string name="medtronic_cmd_desc_set_tbr">Imposta basale temporanea</string>
-    <string name="medtronic_cmd_desc_set_bolus">Imposta bolo</string>
     <string name="profilename">Cambia profilo in</string>
     <string name="changengetoprofilename">Cambia profilo in %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Ultima connessione al micro</string>
@@ -1300,6 +1169,15 @@
     <string name="buttonson_description">I tasti vengono sempre visualizzati nella parte inferiore dello schermo</string>
     <string name="largedisplay_description">Visualizzazione ampia</string>
     <string name="skin">Tema</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Mai connesso</string>
+    <string name="medtronic_pump_status_waking_up">Risveglio</string>
+    <string name="medtronic_pump_status_error_comm">Errore nella comunicazione</string>
+    <string name="medtronic_pump_status_timeout_comm">Timeout della comunicazione</string>
+    <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
+    <string name="medtronic_pump_status_invalid_config">Configurazione non valida</string>
+    <string name="medtronic_pump_status_active">Attivo</string>
+    <string name="medtronic_pump_status_sleeping">In sospensione</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integrazione del microinfusore Omnipod, richiede un dispositivo RileyLink (con almeno il firmware 2.0).</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index c11f8ba5f6..d887a2593b 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -11,19 +11,8 @@
     <string name="description_loop">להפעיל או לכבות את הלולאה.</string>
     <string name="description_ns_client">מסנכרן את הנתונים שלך עם Nightscout</string>
     <string name="description_profile_nightscout">יבא פרופיל מ- Nightscout</string>
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 2a7b6512dd..92b135a30c 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -935,135 +935,6 @@
     <string name="triggers">트리거:</string>
     <string name="remove_label">삭제</string>
     <string name="preconditions">전제 조건:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">펌프 및/또는 드라이버가 작동을 지원하지 않습니다.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">펌프에서 지원되지 않는 작동.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">메드트로닉 펌프 연동에는 RileyLink와 특정 펌프 모델이 필요합니다.</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">펌프 일련번호</string>
-    <string name="medtronic_pump_type">펌프 타입</string>
-    <string name="medtronic_pump_frequency">펌프 주파수</string>
-    <string name="medtronic_pump_bolus_delay">Bolus 시작전 지연시간(초)</string>
-    <string name="medtronic_pump_max_bolus">펌프의 최대 Bolus(U)</string>
-    <string name="medtronic_pump_max_basal">펌프의 최대 Basal(U/h)</string>
-    <string name="medtronic_pump_encoding">메드트로닉 인코딩</string>
-    <string name="medtronic_pump_frequency_us_ca">미국 &amp; 캐나다(916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">타국가(868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">소프트웨어 4b6b 인코딩</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">하드웨어 4b6b 인코딩</string>
-    <string name="medtronic_custom_action_wake_and_tune">켜기 및 튜닝</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Bolus 블록 삭제</string>
-    <string name="medtronic_custom_action_reset_rileylink">RileyLink 구성 재설정</string>
-    <string name="medtronic_pump_battery_select">배터리 타입(파워뷰)</string>
-    <string name="medtronic_pump_battery_no">선택되지 않음(심플뷰)</string>
-    <string name="medtronic_pump_battery_alkaline">알카라인(확장뷰)</string>
-    <string name="medtronic_pump_battery_lithium">리튬(확장뷰)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (확장 뷰)</string>
-    <string name="medtronic_bolus_debugging">Bolus/관리 디버깅</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">스캔</string>
-    <string name="rileylink_scanner_scan_stop">중지</string>
-    <string name="rileylink_scanner_selected_device">선택됨</string>
-    <string name="rileylink_scanner_title">RileyLink 스캔</string>
-    <string name="location_yes">활성화</string>
-    <string name="location_no">아니오</string>
-    <string name="rileylink_scanner_scanning">스캔중</string>
-    <string name="rileylink_scanner_scanning_finished">스캔 완료</string>
-    <string name="rileylink_scanner_scanning_error">스캔 에러: %1$d</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">설정</string>
-    <string name="rileylink_settings_tab2">이력</string>
-    <string name="rileylink_status">RileyLink 상태</string>
-    <string name="medtronic_pump_status">펌프 상태</string>
-    <string name="title_activity_rileylink_settings">RileyLink 설정</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">구성된 주소</string>
-    <string name="rileylink_connected_device">연결된 장치</string>
-    <string name="rileylink_connection_status">연결상태</string>
-    <string name="rileylink_connection_error">연결에러</string>
-    <string name="rileylink_device">장치</string>
-    <string name="rileylink_device_type">장치타입</string>
-    <string name="rileylink_device_model">장치모델</string>
-    <string name="rileylink_last_used_frequency">최근사용 주파수</string>
-    <string name="rileylink_last_device_contact">최근장치연결</string>
-    <string name="rileylink_firmware_version">RL 펌웨어</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">블루투스 초기화중...</string>
-    <string name="rileylink_state_bt_error">블루투스 에러</string>
-    <string name="rileylink_state_bt_ready">블루투스 준비</string>
-    <string name="rileylink_state_not_started">시작되지 않았습니다.</string>
-    <string name="rileylink_state_rl_init">RileyLink 초기화…</string>
-    <string name="rileylink_state_rl_error">RileyLink 에러</string>
-    <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
-    <string name="rileylink_state_pc_error">펌프 연결 문제</string>
-    <string name="rileylink_state_connected">연결됨</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">장치가 RileyLink가 아닙니다.</string>
-    <string name="rileylink_error_unreachable">RileyLink에 연결할 수 없음</string>
-    <string name="rileylink_error_bt_disabled">블루투스 비활성</string>
-    <string name="rileylink_error_no_bt_adapter">블루투스 어댑터 없음</string>
-    <string name="rileylink_error_tuneup_failed">튜닝 실패</string>
-    <string name="rileylink_error_pump_unreachable">펌프에 연결할 수 없습니다.</string>
-    <string name="rileylink_error_pod_unreachable">포드에 연결할 수 없습니다.</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">메드트로닉 펌프</string>
-    <string name="rileylink_target_device_omnipod">옴니포드</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">에러</string>
-    <string name="medtronic_error_serial_not_set">일련번호 # 설정되지 않음</string>
-    <string name="medtronic_error_serial_invalid">일련번호 # 유효하지않음.</string>
-    <string name="medtronic_error_pump_type_not_set">펌프 타입이 설정되지 않았습니다.</string>
-    <string name="medtronic_error_pump_type_invalid">지원되지 않는 펌프 타입입니다.</string>
-    <string name="medtronic_error_pump_frequency_not_set">펌프 주파수가 설정되지 않았습니다.</string>
-    <string name="medtronic_error_pump_frequency_invalid">지원되지 않는 펌프 주파수입니다.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink 주소가 유효하지 않습니다.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">감지된 펌프타입이 설정된 타입과 다릅니다.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal 프로파일/패턴 설정이 펌프에서 활성화되지 않았습니다. 펌프에서 활성화해주세요.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">펌프에 설정된 Basal 프로파일이 올바르지 않습니다 (STD 이어야 합니다).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">펌프에 잘못된 TBR 유형이 설정되었습니다 (절대값이어야합니다).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">펌프에 잘못된 최대 Bolus가 설정되었습니다 (%1$.2f 이어야 합니다.).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">펌프에 잘못된 최대 Basal이 설정되었습니다 (%1$.2f 이어야 합니다).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">작업이 불가능합니다.\n\n이 작업을 사용하려면 우선 메드트로닉 펌프를 구성해야합니다.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">24시간 이상의 시간 변경이 요청되었습니다.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basal</string>
-    <string name="medtronic_history_group_configuration">환경설정</string>
-    <string name="medtronic_history_group_notification">알림</string>
-    <string name="medtronic_history_group_statistic">통계</string>
-    <string name="medtronic_history_group_unknown">알수없음</string>
-    <string name="medtronic_history_group_all">모든</string>
-    <string name="medtronic_pump_history">메드트로닉 펌프 이력</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">연결되지 않은</string>
-    <string name="medtronic_pump_status_waking_up">시작중</string>
-    <string name="medtronic_pump_status_error_comm">연결오류</string>
-    <string name="medtronic_pump_status_timeout_comm">연결시간초과</string>
-    <string name="medtronic_pump_status_pump_unreachable">펌프에 연결할 수 없습니다</string>
-    <string name="medtronic_pump_status_invalid_config">유효하지 않은 설정</string>
-    <string name="medtronic_pump_status_active">활성</string>
-    <string name="medtronic_pump_status_sleeping">대기</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">펌프에서 이미 설정된 Bolus를 취소했습니다. 메드트로닉 펌프는 취소를 지원하지 않으므로 수동으로 취소해야합니다. (여전히 취소하길 원한다면) 펌프를 일시 중단 모드로 전환 한 다음 다시 시작하십시오. 다음 업데이트시 (5 분 이내에) 변경 사항을 적용합니다.</string>
-    <string name="medtronic_cmd_cant_read_tbr">현재 TBR을 읽을 수 없습니다.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">현재 TBR을 취소할 수 없습니다. 작동을 중지합니다.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Basal이 너무 높아서 프로파일 설정이 실패했습니다 : %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus가 주입되지 않았습니다.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">사용 가능한 인슐린양(%1$.2f)이 요청된 Bolus(%2$.2f)보다 작기 때문에 Bolus를 주입할 수 없습니다.</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR 이 설정될 수 없습니다.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">현재 TBR을 취소할 수 없습니다.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basal 프로파일을 설정할 수 없습니다.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">동일한 Basal 프로파일이라 다시 설정하지 않습니다.</string>
-    <string name="medtronic_cmd_desc_get_history">이력 받기 - 페이지 %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">이력 받기 - 페이지 %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">펌프 시간 받기</string>
-    <string name="medtronic_cmd_desc_get_settings">설정 받기</string>
-    <string name="medtronic_cmd_desc_get_model">펌프 모델 받기</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Basal 프로파일 받기</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Basal 프로파일 설정</string>
-    <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
-    <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
-    <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
     <string name="profilename">프로파일을 변경</string>
     <string name="changengetoprofilename">프로파일을 %1$s으로 변경</string>
     <string name="automation_trigger_pump_last_connection_label">펌프와의 마지막 연결</string>
@@ -1147,6 +1018,15 @@
     <string name="loop_tbrrequest_time_label">임시 Basal 요청시간</string>
     <string name="loop_tbrexecution_time_label">임시 Basal 실행시간</string>
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">연결되지 않은</string>
+    <string name="medtronic_pump_status_waking_up">시작중</string>
+    <string name="medtronic_pump_status_error_comm">연결오류</string>
+    <string name="medtronic_pump_status_timeout_comm">연결시간초과</string>
+    <string name="medtronic_pump_status_pump_unreachable">펌프에 연결할 수 없습니다</string>
+    <string name="medtronic_pump_status_invalid_config">유효하지 않은 설정</string>
+    <string name="medtronic_pump_status_active">활성</string>
+    <string name="medtronic_pump_status_sleeping">대기</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index ecf21771c3..c9d1071b97 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -1042,137 +1042,6 @@
     <string name="triggers">Sąlygos:</string>
     <string name="remove_label">PAŠALINTI</string>
     <string name="preconditions">Išankstinės sąlygos:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Pompa ir/ar jos valdiklis nepalaiko operacijos.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Pompa dar nepalaiko operacijos.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integracija su Medronic pompa reikalauja RileyLink įrenginio ir specialaus pompos modelio</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Pompos serijos Nr.</string>
-    <string name="medtronic_pump_type">Pompos tipas</string>
-    <string name="medtronic_pump_frequency">Pompos dažnis</string>
-    <string name="medtronic_pump_bolus_delay">Užlaikymas prieš Boluso suleidimą (s)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolusas pompoje (vv)</string>
-    <string name="medtronic_pump_max_basal">Maks val. bazė pompoje (vv/val)</string>
-    <string name="medtronic_pump_encoding">Medronic kodavimas</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Pasaulinis (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Programinis kodavimas 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Įrangos kodavimas 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Pažadinti ir nustatyti</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Išvalyti Boluso bloką</string>
-    <string name="medtronic_custom_action_reset_rileylink">Išvalyti RileyLink nustatymus</string>
-    <string name="medtronic_pump_battery_select">Baterijos tipas (pagal galią)</string>
-    <string name="medtronic_pump_battery_no">Nepasirinkta (paprastas vaizdas)</string>
-    <string name="medtronic_pump_battery_alkaline">Šarminė (išplėstinis vaizdas)</string>
-    <string name="medtronic_pump_battery_lithium">Ličio (išplėstinis vaizdas)</string>
-    <string name="medtronic_pump_battery_nizn">Šarminė (išplėstinis vaizdas)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (išplėstinis vaizdas)</string>
-    <string name="medtronic_bolus_debugging">Boluso/Terapijos Derinimas</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SKENAVIMAS</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Parinkta</string>
-    <string name="rileylink_scanner_title">RileyLink skanavimas</string>
-    <string name="location_yes">Įjungti</string>
-    <string name="location_no">Ne</string>
-    <string name="rileylink_scanner_scanning">Skanuojama</string>
-    <string name="rileylink_scanner_scanning_finished">Skanavimas baigtas</string>
-    <string name="rileylink_scanner_scanning_error">Skanavimo klaida: %1$d</string>
-    <string name="common_never">Niekada</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Parametrai</string>
-    <string name="rileylink_settings_tab2">Istorija</string>
-    <string name="rileylink_status">RileyLink statusas</string>
-    <string name="medtronic_pump_status">Pompos statusas</string>
-    <string name="title_activity_rileylink_settings">RileyLink parametrai</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Nustatytas adresas</string>
-    <string name="rileylink_connected_device">Prijungtas įrenginys</string>
-    <string name="rileylink_connection_status">Ryšio būsena</string>
-    <string name="rileylink_connection_error">Prisijungimo klaida</string>
-    <string name="rileylink_device">Įrenginys</string>
-    <string name="rileylink_device_type">Įrenginio tipas</string>
-    <string name="rileylink_device_model">Įrenginio modelis</string>
-    <string name="rileylink_last_used_frequency">Paskutinis naudotas dažnis</string>
-    <string name="rileylink_last_device_contact">Paskutinis įrenginio kontaktas</string>
-    <string name="rileylink_firmware_version">RL Programinė įranga</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Inicijuojamas Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Bluetooth klaida</string>
-    <string name="rileylink_state_bt_ready">Bluetooth paruošta</string>
-    <string name="rileylink_state_not_started">Nepradėta</string>
-    <string name="rileylink_state_rl_init">RileyLink inicijavimas…</string>
-    <string name="rileylink_state_rl_error">RileyLink klaida</string>
-    <string name="rileylink_state_pc_tune_up">RileyLink ir Pompos suderinimas</string>
-    <string name="rileylink_state_pc_error">Sujungimo su pompa problema</string>
-    <string name="rileylink_state_connected">Prisijungta</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Įrenginys nėra RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink nepasiekiama</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth išjungtas</string>
-    <string name="rileylink_error_no_bt_adapter">Nėra Bluetooth adapterio</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp klaida</string>
-    <string name="rileylink_error_pump_unreachable">Pompa nepasiekiama</string>
-    <string name="rileylink_error_pod_unreachable">Pod nepasiekiamas</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Klaidos</string>
-    <string name="medtronic_error_serial_not_set">Serijos Nr. nenustatytas.</string>
-    <string name="medtronic_error_serial_invalid">Serijos Nr. neteisingas.</string>
-    <string name="medtronic_error_pump_type_not_set">Nenustatytas pompos tipas.</string>
-    <string name="medtronic_error_pump_type_invalid">Nepalaikomas pompos tipas.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Nenustatytas pompos dažnis.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Nepalaikomas pompos dažnis.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink adresas neteisingas.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Aptiktas pompos tipas neatitinka nustatymų.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazės profilis / nustatymas pompoje nėra įgalintas. Įgalinkite jį pompoje.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Pompoje nustatytas neteisingas bazės profilis (turi būti STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Pompoje nustatytas neteisingas laikinos bazės tipas (turi būti absoliutus).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Pompoje nustatytas neteisingas Max Bolusas (turi būti %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Pompoje nustatyta neteisinga Maks val. bazė (turi būti %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operacija negalima. \n\n Pirmiausia turite sukonfigūruoti Medronic pompą prieš atliekant šią operaciją.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Laiko pokytis didesnis nei 24 val.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Bazė</string>
-    <string name="medtronic_history_group_configuration">Nustatymai</string>
-    <string name="medtronic_history_group_notification">Pranešimai</string>
-    <string name="medtronic_history_group_statistic">Statistika</string>
-    <string name="medtronic_history_group_unknown">Nežinoma</string>
-    <string name="medtronic_history_group_all">Visi</string>
-    <string name="medtronic_pump_history">Medronic pompos istorija</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Niekada nebuvo sujungta</string>
-    <string name="medtronic_pump_status_waking_up">Pažadinimas</string>
-    <string name="medtronic_pump_status_error_comm">Ryšio klaida</string>
-    <string name="medtronic_pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompa nepasiekiama</string>
-    <string name="medtronic_pump_status_invalid_config">Neteisinga konfigūracija</string>
-    <string name="medtronic_pump_status_active">Aktyvi</string>
-    <string name="medtronic_pump_status_sleeping">Užmigusi</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Atšaukėte bolusą, kuris jau buvo nustatytas pompoje. Medronic pompa nepalaiko šio atšaukimo, todėl turite jį atšaukti rankiniu būdu. Sustabdykite pompą ir vėl ją paleiskite (jei vis dar norite atšaukti bolusą). Aplikacija perims pokyčius su kitu atnaujinimu (per mažiau nei 5 minutes).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Negalima sužinoti dabartinės laikinos bazės.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Negalima atšaukti dabartinės laikinos bazės. Operacija stabdoma.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Profilio nustatymas nepavyko dėl per didelės nustatytos bazės: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolusas nesuleistas.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolusas nesuleistas, nes turimas insulino kiekis (%1$.2f) yra mažesnis, nei nustatytas Bolusas (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Laikina bazė nenustatyta.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Negalima atšaukti dabartinės laikinos bazės.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazės profilis nenustatytas.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazės profilis toks pat, todėl nenustatomas pakartotinai.</string>
-    <string name="medtronic_cmd_desc_get_history">Gauti istoriją - Lapas %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Gauti istoriją - Lapas %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Gauti pompos laiką</string>
-    <string name="medtronic_cmd_desc_get_settings">Gauti parametrus</string>
-    <string name="medtronic_cmd_desc_get_model">Gauti pompos modelį</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Gauti bazės profilį</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Nustatyti bazės profilį</string>
-    <string name="medtronic_cmd_desc_get_tbr">Gauti laikiną bazę</string>
-    <string name="medtronic_cmd_desc_set_tbr">Nustatyti laikiną bazę</string>
-    <string name="medtronic_cmd_desc_set_bolus">Nustatyti bolusą</string>
     <string name="profilename">Pakeisti profilį</string>
     <string name="changengetoprofilename">Pakeisti profilį %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Paskutinis prisijungimas prie pompos</string>
@@ -1295,6 +1164,15 @@
     <string name="buttonson_description">Mygtukai visada rodomi ekrano apačioje</string>
     <string name="largedisplay_description">Didelis ekranas</string>
     <string name="skin">Išvaizda</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Niekada nebuvo sujungta</string>
+    <string name="medtronic_pump_status_waking_up">Pažadinimas</string>
+    <string name="medtronic_pump_status_error_comm">Ryšio klaida</string>
+    <string name="medtronic_pump_status_timeout_comm">Ryšiui skirtas laikas baigėsi</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompa nepasiekiama</string>
+    <string name="medtronic_pump_status_invalid_config">Neteisinga konfigūracija</string>
+    <string name="medtronic_pump_status_active">Aktyvi</string>
+    <string name="medtronic_pump_status_sleeping">Užmigusi</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Omnipod pompos integracijai reikalingas RileyLink (programinės įrangos versija ne mažiau 2.0).</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 7b56429f33..38ad09a378 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1042,137 +1042,6 @@
     <string name="triggers">Triggers:</string>
     <string name="remove_label">VERWIJDER</string>
     <string name="preconditions">Voorwaarden:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Bewerking niet ondersteund door pomp en/of driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operatie NU nog niet ondersteund door pomp.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Pomp integratie voor Medtronic, vereist RileyLink-apparaatje en geschikte versie en model pomp</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Serienummer van de pomp</string>
-    <string name="medtronic_pump_type">Pomp Type</string>
-    <string name="medtronic_pump_frequency">Pomp Frequentie</string>
-    <string name="medtronic_pump_bolus_delay">Vertraging voordat Bolus wordt gestart (s)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolus op Pomp (E)</string>
-    <string name="medtronic_pump_max_basal">Max Basaal op Pomp (E/u)</string>
-    <string name="medtronic_pump_encoding">Medtronic Codering</string>
-    <string name="medtronic_pump_frequency_us_ca">VS &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Wereldwijd (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Codering</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Codering</string>
-    <string name="medtronic_custom_action_wake_and_tune">Ontwaak en maak verbinding</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Bolus Blok wissen</string>
-    <string name="medtronic_custom_action_reset_rileylink">Reset RileyLink Configuratie</string>
-    <string name="medtronic_pump_battery_select">Batterij type (batterij weergave)</string>
-    <string name="medtronic_pump_battery_no">Niet geselecteerd (Eenvoudige weergave)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaline (uitgebreide weergave)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (uitgebreide weergave)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (uitgebreide weergave)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Uitgebreide weergave)</string>
-    <string name="medtronic_bolus_debugging">Bolus/Behandelingen Debuggen</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Geselecteerd</string>
-    <string name="rileylink_scanner_title">RileyLink Scan</string>
-    <string name="location_yes">Inschakelen</string>
-    <string name="location_no">Nee</string>
-    <string name="rileylink_scanner_scanning">Scannen</string>
-    <string name="rileylink_scanner_scanning_finished">Scannen voltooid</string>
-    <string name="rileylink_scanner_scanning_error">Scanfout: %1$d</string>
-    <string name="common_never">Nooit</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Instellingen</string>
-    <string name="rileylink_settings_tab2">Geschiedenis</string>
-    <string name="rileylink_status">RileyLink Status</string>
-    <string name="medtronic_pump_status">Pompstatus</string>
-    <string name="title_activity_rileylink_settings">RileyLink Instellingen</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Geconfigureerd Adres</string>
-    <string name="rileylink_connected_device">Aangesloten Apparaat</string>
-    <string name="rileylink_connection_status">Verbinding Status</string>
-    <string name="rileylink_connection_error">Verbindingsfout</string>
-    <string name="rileylink_device">Apparaat</string>
-    <string name="rileylink_device_type">Apparaat type</string>
-    <string name="rileylink_device_model">Apparaat model</string>
-    <string name="rileylink_last_used_frequency">Laatst gebruikte frequentie</string>
-    <string name="rileylink_last_device_contact">Laatste contact met apparaat</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth initialiseren…</string>
-    <string name="rileylink_state_bt_error">Bluetooth fout</string>
-    <string name="rileylink_state_bt_ready">Bluetooth gekoppeld</string>
-    <string name="rileylink_state_not_started">Niet gestart</string>
-    <string name="rileylink_state_rl_init">RileyLink initialiseren…</string>
-    <string name="rileylink_state_rl_error">RileyLink fout</string>
-    <string name="rileylink_state_pc_tune_up">Tuning van RileyLink en Pomp</string>
-    <string name="rileylink_state_pc_error">Probleem tijdens verbinden met de pomp</string>
-    <string name="rileylink_state_connected">Verbonden</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Apparaat is geen RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink onbereikbaar</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth is uitgeschakeld</string>
-    <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Adapter</string>
-    <string name="rileylink_error_tuneup_failed">Verbinding maken mislukt</string>
-    <string name="rileylink_error_pump_unreachable">Pomp niet bereikbaar</string>
-    <string name="rileylink_error_pod_unreachable">Pod niet bereikbaar</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Foutmeldingen</string>
-    <string name="medtronic_error_serial_not_set">Serie# niet ingesteld.</string>
-    <string name="medtronic_error_serial_invalid">Serie# ongeldig.</string>
-    <string name="medtronic_error_pump_type_not_set">Pomp type niet ingesteld.</string>
-    <string name="medtronic_error_pump_type_invalid">Pomp type niet ondersteund.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Pomp frequentie niet ingesteld.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Pomp frequentie niet ondersteund.</string>
-    <string name="medtronic_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Gedetecteerde pomp type komt niet overeen met ingestelde pomp type.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">De instelling voor basaalprofielen/patronen is niet ingeschakeld op de pomp. Schakel het in op de pomp.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basaalprofiel ingesteld op pomp is onjuist (moet STD zijn).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde Tijdelijk Basaal-type ingesteld op pomp (moet Insulinesnelh (E/H) zijn).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Max Bolus ingesteld op pomp (moet %1$.2f zijn).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Max Basaal ingesteld op pomp (moet %1$.2f zijn).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\n Je moet eerst Medtronic Pomp ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Meer dan 24u tijd gevraagd.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basaalstanden</string>
-    <string name="medtronic_history_group_configuration">Instellingen</string>
-    <string name="medtronic_history_group_notification">Meldingen</string>
-    <string name="medtronic_history_group_statistic">Statistieken</string>
-    <string name="medtronic_history_group_unknown">Onbekend</string>
-    <string name="medtronic_history_group_all">Alle</string>
-    <string name="medtronic_pump_history">Medtronic Pomp Geschiedenis</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nooit verbonden</string>
-    <string name="medtronic_pump_status_waking_up">Ontwaken</string>
-    <string name="medtronic_pump_status_error_comm">Communicatiefout</string>
-    <string name="medtronic_pump_status_timeout_comm">Time-out op de communicatie</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
-    <string name="medtronic_pump_status_invalid_config">Ongeldige configuratie</string>
-    <string name="medtronic_pump_status_active">Actief</string>
-    <string name="medtronic_pump_status_sleeping">Slapend</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">U heeft de Bolus geannuleerd nadat deze werd ingesteld op de Pomp. Aangezien de Medtronic Pump geen ondersteuning biedt voor automatische annulering moet u dit handmatig doen. Zet de Pump daartoe in de Suspend modus en kies vervolgens voor Hervatten (als u nog wilt annuleren). De applicatie zal de wijzigingen oppakken bij de volgende update (in minder dan 5 minuten).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Kan huidige TBR niet lezen.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kan huidige TBR niet annuleren. Bewerking wordt gestopt.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Profiel instellen mislukt omdat de volgende patronen een te groot basaal hebben: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus kon niet worden afgeleverd.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus kon niet worden uitgevoerd omdat de hoeveelheid beschikbare insuline (%1$.2f) niet voldoende is voor de bolus (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR kon niet worden ingesteld.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Kan huidige TBR niet annuleren.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basaal profiel kon niet worden ingesteld.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profiel is hetzelfde, dus het zal niet opnieuw worden ingesteld.</string>
-    <string name="medtronic_cmd_desc_get_history">Ophalen Geschiedenis - Pagina %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Ophalen Geschiedenis - Pagina %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Haal Pomp Tijd op</string>
-    <string name="medtronic_cmd_desc_get_settings">Ophalen Instellingen</string>
-    <string name="medtronic_cmd_desc_get_model">Ophalen Pomp Model</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Ophalen Basaal Profiel</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Instellen Basaal Profiel</string>
-    <string name="medtronic_cmd_desc_get_tbr">Ophalen Tijdelijke Basaal</string>
-    <string name="medtronic_cmd_desc_set_tbr">Instellen Tijdelijke Basaal</string>
-    <string name="medtronic_cmd_desc_set_bolus">Instellen Bolus</string>
     <string name="profilename">Wijzig profiel naar</string>
     <string name="changengetoprofilename">Wijzig profiel in %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Laatste verbinding met pomp</string>
@@ -1293,6 +1162,15 @@
     <string name="buttonson_description">Knoppen worden altijd weergegeven aan de onderkant van het scherm</string>
     <string name="largedisplay_description">Groot scherm</string>
     <string name="skin">Skin</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nooit verbonden</string>
+    <string name="medtronic_pump_status_waking_up">Ontwaken</string>
+    <string name="medtronic_pump_status_error_comm">Communicatiefout</string>
+    <string name="medtronic_pump_status_timeout_comm">Time-out op de communicatie</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
+    <string name="medtronic_pump_status_invalid_config">Ongeldige configuratie</string>
+    <string name="medtronic_pump_status_active">Actief</string>
+    <string name="medtronic_pump_status_sleeping">Slapend</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Pomp integratie voor Omnipod, vereist RileyLink (met firmware 2.0 of hoger).</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index adae717203..1f83406ce9 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1043,137 +1043,6 @@
     <string name="triggers">Wyzwalacz:</string>
     <string name="remove_label">USUŃ</string>
     <string name="preconditions">Warunki wstępne:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operacja nie jest wspierana przez pompę i/lub sterownik pompy.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operacja nie jest JESZCZE wspierana przez pompę.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integracja pompy Medtronic wymaga urządzenia RileyLink i odpowiedniego modelu pompy</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Numer seryjny pompy</string>
-    <string name="medtronic_pump_type">Typ pompy</string>
-    <string name="medtronic_pump_frequency">Częstotliwość pompy</string>
-    <string name="medtronic_pump_bolus_delay">Opóźnienie przed rozpoczęciem bolusa(s)</string>
-    <string name="medtronic_pump_max_bolus">Max bolus w pompie (U)</string>
-    <string name="medtronic_pump_max_basal">Max dawka bazowa w pompie (U/h)</string>
-    <string name="medtronic_pump_encoding">Kodowanie Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Reszta świata (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Kodowanie oprogramowania 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Kodowanie urządzenia 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Wzbudź i dostrój</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Wyczyść blok bolusa</string>
-    <string name="medtronic_custom_action_reset_rileylink">Przywróć konfigurację RileyLink</string>
-    <string name="medtronic_pump_battery_select">Typ baterii (podgląd mocy)</string>
-    <string name="medtronic_pump_battery_no">Nie wybrany (widok prosty)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaliczne (widok rozszerzony)</string>
-    <string name="medtronic_pump_battery_lithium">Litowe (widok rozszerzony)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (widok rozszerzony)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (widok rozszerzony)</string>
-    <string name="medtronic_bolus_debugging">Bolus/Leczenie - debugowanie</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SKANUJ</string>
-    <string name="rileylink_scanner_scan_stop">ZATRZYMAJ</string>
-    <string name="rileylink_scanner_selected_device">Wybrany</string>
-    <string name="rileylink_scanner_title">Skan RileyLink</string>
-    <string name="location_yes">Uruchom</string>
-    <string name="location_no">Nie</string>
-    <string name="rileylink_scanner_scanning">Skanowanie</string>
-    <string name="rileylink_scanner_scanning_finished">Skanowanie zakończono</string>
-    <string name="rileylink_scanner_scanning_error">Błąd skanowania: %1$d</string>
-    <string name="common_never">Nigdy</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Ustawienia</string>
-    <string name="rileylink_settings_tab2">Historia</string>
-    <string name="rileylink_status">Stan RileyLink</string>
-    <string name="medtronic_pump_status">Stan pompy</string>
-    <string name="title_activity_rileylink_settings">Ustawienia RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Ustawiony adres</string>
-    <string name="rileylink_connected_device">Połączone urządzenie</string>
-    <string name="rileylink_connection_status">Status połączenia</string>
-    <string name="rileylink_connection_error">Błąd połączenia</string>
-    <string name="rileylink_device">Urządzenie</string>
-    <string name="rileylink_device_type">Typ urządzenia</string>
-    <string name="rileylink_device_model">Model urządzenia</string>
-    <string name="rileylink_last_used_frequency">Ostatnio używana częstotliwość</string>
-    <string name="rileylink_last_device_contact">Ostatnie połączenie z urządzeniem</string>
-    <string name="rileylink_firmware_version">Oprogramowanie RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Uruchamianie Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Błąd Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth gotowy</string>
-    <string name="rileylink_state_not_started">Nie rozpoczęto</string>
-    <string name="rileylink_state_rl_init">Uruchamianie RileyLink…</string>
-    <string name="rileylink_state_rl_error">Błąd RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Dostrojenie RileyLink i pompy</string>
-    <string name="rileylink_state_pc_error">Problem z połączeniem z pompą</string>
-    <string name="rileylink_state_connected">Połączono</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Urządzenie to nie RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink nie osiągalny</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth wyłączony</string>
-    <string name="rileylink_error_no_bt_adapter">Brak modułu Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">Dostrojenie nie powiodło się</string>
-    <string name="rileylink_error_pump_unreachable">Pompa nieosiągalna</string>
-    <string name="rileylink_error_pod_unreachable">Pod nieosiągalny</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Błędy</string>
-    <string name="medtronic_error_serial_not_set">Numer seryjny # nie ustawiony.</string>
-    <string name="medtronic_error_serial_invalid">Numer seryjny # nieprawidłowy.</string>
-    <string name="medtronic_error_pump_type_not_set">Tyo pompy nie ustawiony.</string>
-    <string name="medtronic_error_pump_type_invalid">Typ pompy nie obsługiwany.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Częstotliwość pompy nie ustawiona.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Częstotliwość pompy nie wspierana.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Adres RileyLink niewłaściwy.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Wykryty typ pompy jest inny niż ustawiony.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Ustawienia bazy/ wzorców nie są włączone w pompie. Włącz je na pompie.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Profil bazowy ustawiony na pompie nie jest właściwy (musi być STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Ustawiony na pompie typ dawki tymczasowej jest niewłaściwy (musi być całkowity - Absolute).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Ustawiony na pompie typ Bolus Maksymalny jest niewłaściwy (musi być %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Ustawiony na pompie typ Bolus Maksymalny jest niewłaściwy (musi być %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować pompę Medtronic Pump, przed uruchomieniem tego działania.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Wymagana jest zmiana ustawień czasu na 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Dawki bazowe</string>
-    <string name="medtronic_history_group_configuration">Ustawienia</string>
-    <string name="medtronic_history_group_notification">Powiadomienia</string>
-    <string name="medtronic_history_group_statistic">Statystyki</string>
-    <string name="medtronic_history_group_unknown">Nieznane</string>
-    <string name="medtronic_history_group_all">Wszystko</string>
-    <string name="medtronic_pump_history">Historia pompy Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nigdy nie połączona</string>
-    <string name="medtronic_pump_status_waking_up">Wybudzanie</string>
-    <string name="medtronic_pump_status_error_comm">Błąd komunikacji</string>
-    <string name="medtronic_pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompa nieosiągalna</string>
-    <string name="medtronic_pump_status_invalid_config">Nieprawidłowe ustawienia</string>
-    <string name="medtronic_pump_status_active">Aktywna</string>
-    <string name="medtronic_pump_status_sleeping">Uśpiona</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Anulowałeś bolus po jego ustawieniu na pompie. Ponieważ pompa Medtronic nie wspiera polecenia anuluj, musisz wprowadzić zmianę ręcznie. Wprowadź pompę w stan zawieszenia, a następnie przywróć jej działanie (jeżeli wciąż chcesz anulować). Aplikacja pobierze zmiany przy następnym uaktualnieniu (poniżej 5 minut).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Nie udało się odczytać aktualnej dawki tymczasowej (TBR).</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nie udało się anulować aktualnej dawki tymczasowej (TBR). Operacja zatrzymania.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Ustawienia Profilu nie powiodły się ponieważ następująca wartość jest za duża: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Nie udało się dostarczyć bolusa.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nie mógł być dostarczony ponieważ Ilość dostępnej insuliny (%1$.2f) jest mniejsza niż wymagany bolus (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Nie udało się ustawić dawki tymczasowej (TBR).</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Nie udało się anulować bazy tymczasowej (TBR).</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Profil bazy nie został ustawiony.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Profil bazy jest taki sam, więc nie ustawiono ponownie.</string>
-    <string name="medtronic_cmd_desc_get_history">Pobierz historię - strona %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Pobierz historię - strona %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Pobierz czas pompy</string>
-    <string name="medtronic_cmd_desc_get_settings">Pobierz ustawienia</string>
-    <string name="medtronic_cmd_desc_get_model">Pobierz model pompy</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Pobierz profil dawki bazowej</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Ustaw profil dawki bazowej</string>
-    <string name="medtronic_cmd_desc_get_tbr">Pobierz tymczasową dawkę bazową</string>
-    <string name="medtronic_cmd_desc_set_tbr">Ustaw tymczasową dawkę bazową</string>
-    <string name="medtronic_cmd_desc_set_bolus">Ustaw bolus</string>
     <string name="profilename">Zmień profil na</string>
     <string name="changengetoprofilename">Zmień profil na %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Ostatnie połączenie z pompą</string>
@@ -1295,6 +1164,15 @@
     <string name="buttonson_description">Przyciski są zawsze wyświetlane na dole ekranu</string>
     <string name="largedisplay_description">Duży ekran</string>
     <string name="skin">Motyw</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nigdy nie połączona</string>
+    <string name="medtronic_pump_status_waking_up">Wybudzanie</string>
+    <string name="medtronic_pump_status_error_comm">Błąd komunikacji</string>
+    <string name="medtronic_pump_status_timeout_comm">Przekroczony limit czasu połączenia</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompa nieosiągalna</string>
+    <string name="medtronic_pump_status_invalid_config">Nieprawidłowe ustawienia</string>
+    <string name="medtronic_pump_status_active">Aktywna</string>
+    <string name="medtronic_pump_status_sleeping">Uśpiona</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integracja pompy Omnipod, wymaga RileyLink (z firmwarem 2.0 lub wyższym).</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 0715e9d177..572d9e3cb8 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1004,137 +1004,6 @@
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integração de Bombas Medtronic, requer o dispositivo RileyLink e o Modelo de Bomba específico</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Número de série da Bomba</string>
-    <string name="medtronic_pump_type">Tipo de Bomba</string>
-    <string name="medtronic_pump_frequency">Frequência da Bomba</string>
-    <string name="medtronic_pump_bolus_delay">Atraso antes que o Bólus seja iniciado (s)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolus na Bomba (U)</string>
-    <string name="medtronic_pump_max_basal">Máxima Basal na Bomba (U/h)</string>
-    <string name="medtronic_pump_encoding">Codificação Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Codificação de Software 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificação de Hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Acordar e Configurar</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Limpar Bloco de Bólus</string>
-    <string name="medtronic_custom_action_reset_rileylink">Redefinir configuração RileyLink</string>
-    <string name="medtronic_pump_battery_select">Tipo de Bateria (Visão Detalhada)</string>
-    <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
-    <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">PROCURAR</string>
-    <string name="rileylink_scanner_scan_stop">PARAR</string>
-    <string name="rileylink_scanner_selected_device">Seleccionado</string>
-    <string name="rileylink_scanner_title">Procura RileyLink</string>
-    <string name="location_yes">Ativar</string>
-    <string name="location_no">Não</string>
-    <string name="rileylink_scanner_scanning">A procurar</string>
-    <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
-    <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
-    <string name="common_never">Nunca</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Definições</string>
-    <string name="rileylink_settings_tab2">Histórico</string>
-    <string name="rileylink_status">Estado do RileyLink</string>
-    <string name="medtronic_pump_status">Estado da Bomba</string>
-    <string name="title_activity_rileylink_settings">Configurações do RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Endereço Configurado</string>
-    <string name="rileylink_connected_device">Dispositivo Ligado</string>
-    <string name="rileylink_connection_status">Estado de Ligação</string>
-    <string name="rileylink_connection_error">Erro de Ligação</string>
-    <string name="rileylink_device">Dispositivo</string>
-    <string name="rileylink_device_type">Tipo de dispositivo</string>
-    <string name="rileylink_device_model">Modelo do dispositivo</string>
-    <string name="rileylink_last_used_frequency">Frequência da última utilização</string>
-    <string name="rileylink_last_device_contact">Último contacto do dispositivo</string>
-    <string name="rileylink_firmware_version">Firmware RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">A iniciar o Bluetooth...</string>
-    <string name="rileylink_state_bt_error">Erro de Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Pronto</string>
-    <string name="rileylink_state_not_started">Não Iniciado</string>
-    <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
-    <string name="rileylink_state_rl_error">Erro no RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Configurando RileyLink e a Bomba</string>
-    <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
-    <string name="rileylink_state_connected">Ligado</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Dispositivo não é RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink inacessível</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth desactivado</string>
-    <string name="rileylink_error_no_bt_adapter">Nenhum Adaptador Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
-    <string name="rileylink_error_pump_unreachable">Bomba inacessível</string>
-    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Erros</string>
-    <string name="medtronic_error_serial_not_set">Núm. Série não definido.</string>
-    <string name="medtronic_error_serial_invalid">Núm. Série inválido.</string>
-    <string name="medtronic_error_pump_type_not_set">Tipo de Bomba não definido.</string>
-    <string name="medtronic_error_pump_type_invalid">Tipo de Bomba não suportado.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá ativada na bomba. Ative-a na bomba.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basais</string>
-    <string name="medtronic_history_group_configuration">Configurações</string>
-    <string name="medtronic_history_group_notification">Notificações</string>
-    <string name="medtronic_history_group_statistic">Estatísticas</string>
-    <string name="medtronic_history_group_unknown">Desconhecido</string>
-    <string name="medtronic_history_group_all">Tudo</string>
-    <string name="medtronic_pump_history">Histórico da Bomba Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nunca contatado</string>
-    <string name="medtronic_pump_status_waking_up">A acordar</string>
-    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
-    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
-    <string name="medtronic_pump_status_active">Ativo</string>
-    <string name="medtronic_pump_status_sleeping">A dormir</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a TBR actual.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a TBR atual. A parar a operação.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi entregue, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR não pode ser definida.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a TBR atual.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
-    <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Obter Histórico - Página %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Obter Hora da Bomba</string>
-    <string name="medtronic_cmd_desc_get_settings">Obter Definições</string>
-    <string name="medtronic_cmd_desc_get_model">Obter Modelo de Bomba</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Obter Perfil Basal</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Definir Perfil Basal</string>
-    <string name="medtronic_cmd_desc_get_tbr">Obter Basal temporário</string>
-    <string name="medtronic_cmd_desc_set_tbr">Definir Basal temporário</string>
-    <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
     <string name="profilename">Alterar perfil para</string>
     <string name="changengetoprofilename">Alterar perfil para %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Última ligação com a bomba</string>
@@ -1243,6 +1112,15 @@
     <string name="buttonson_description">Botões são sempre exibidos na parte inferior da tela</string>
     <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nunca contatado</string>
+    <string name="medtronic_pump_status_waking_up">A acordar</string>
+    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
+    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
+    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
+    <string name="medtronic_pump_status_active">Ativo</string>
+    <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 94e1553640..53d86619f7 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1047,137 +1047,6 @@
     <string name="triggers">Gatilhos:</string>
     <string name="remove_label">REMOVER</string>
     <string name="preconditions">Precondições:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integração de Bombas Medtronic, requer o dispositivo RileyLink e o Modelo de Bomba específico</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Número de série da Bomba</string>
-    <string name="medtronic_pump_type">Tipo de Bomba</string>
-    <string name="medtronic_pump_frequency">Frequência da Bomba</string>
-    <string name="medtronic_pump_bolus_delay">Atraso antes que o Bólus seja iniciado (s)</string>
-    <string name="medtronic_pump_max_bolus">Max Bolus na Bomba (U)</string>
-    <string name="medtronic_pump_max_basal">Máx Basal na Bomba (U/h)</string>
-    <string name="medtronic_pump_encoding">Codificação Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Codificação de Software 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificação de Hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Acordar e Configurar</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Limpar Bloco de Bólus</string>
-    <string name="medtronic_custom_action_reset_rileylink">Redefinir configuração RileyLink</string>
-    <string name="medtronic_pump_battery_select">Tipo de Bateria (Visão Detalhada)</string>
-    <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
-    <string name="medtronic_pump_battery_lithium">Lithium (Visão estendida)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
-    <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">PROCURAR</string>
-    <string name="rileylink_scanner_scan_stop">PARAR</string>
-    <string name="rileylink_scanner_selected_device">Seleccionado</string>
-    <string name="rileylink_scanner_title">Procura RileyLink</string>
-    <string name="location_yes">Activar</string>
-    <string name="location_no">Não</string>
-    <string name="rileylink_scanner_scanning">A procurar</string>
-    <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
-    <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
-    <string name="common_never">Nunca</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Definições</string>
-    <string name="rileylink_settings_tab2">Histórico</string>
-    <string name="rileylink_status">Estado do RileyLink</string>
-    <string name="medtronic_pump_status">Estado da Bomba</string>
-    <string name="title_activity_rileylink_settings">Definições do RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Endereço Configurado</string>
-    <string name="rileylink_connected_device">Dispositivo Ligado</string>
-    <string name="rileylink_connection_status">Estado de Ligação</string>
-    <string name="rileylink_connection_error">Erro de Ligação</string>
-    <string name="rileylink_device">Dispositivo</string>
-    <string name="rileylink_device_type">Tipo de dispositivo</string>
-    <string name="rileylink_device_model">Modelo do dispositivo</string>
-    <string name="rileylink_last_used_frequency">Frequência da última utilização</string>
-    <string name="rileylink_last_device_contact">Último contacto do dispositivo</string>
-    <string name="rileylink_firmware_version">Firmware RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">A iniciar o Bluetooth...</string>
-    <string name="rileylink_state_bt_error">Erro de Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth Pronto</string>
-    <string name="rileylink_state_not_started">Não Iniciado</string>
-    <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
-    <string name="rileylink_state_rl_error">Erro no RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">A ajustar RileyLink e a Bomba</string>
-    <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
-    <string name="rileylink_state_connected">Ligado</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Dispositivo não é RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink inacessível</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth desactivado</string>
-    <string name="rileylink_error_no_bt_adapter">Nenhum Adaptador Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
-    <string name="rileylink_error_pump_unreachable">Bomba inacessível</string>
-    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Erros</string>
-    <string name="medtronic_error_serial_not_set">Núm. Série não definido.</string>
-    <string name="medtronic_error_serial_invalid">Núm. Série inválido.</string>
-    <string name="medtronic_error_pump_type_not_set">Tipo de Bomba não definido.</string>
-    <string name="medtronic_error_pump_type_invalid">Tipo de Bomba não suportado.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá atcivada na bomba. Active-a na bomba.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basais</string>
-    <string name="medtronic_history_group_configuration">Configurações</string>
-    <string name="medtronic_history_group_notification">Notificações</string>
-    <string name="medtronic_history_group_statistic">Estatísticas</string>
-    <string name="medtronic_history_group_unknown">Desconhecido</string>
-    <string name="medtronic_history_group_all">Tudo</string>
-    <string name="medtronic_pump_history">Histórico da Bomba Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nunca contactado</string>
-    <string name="medtronic_pump_status_waking_up">A acordar</string>
-    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
-    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
-    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
-    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
-    <string name="medtronic_pump_status_active">Activo</string>
-    <string name="medtronic_pump_status_sleeping">A dormir</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar o DBT actual. A parar a operação.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser administrado.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi administado, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definido.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar o DBT actual.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
-    <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Obter Histórico - Página %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Obter Hora da Bomba</string>
-    <string name="medtronic_cmd_desc_get_settings">Obter Definições</string>
-    <string name="medtronic_cmd_desc_get_model">Obter Modelo de Bomba</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Obter Perfil Basal</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Definir Perfil Basal</string>
-    <string name="medtronic_cmd_desc_get_tbr">Obter Basal Temporária</string>
-    <string name="medtronic_cmd_desc_set_tbr">Definir Basal Temporária</string>
-    <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
     <string name="profilename">Alterar perfil para</string>
     <string name="changengetoprofilename">Alterar perfil para %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Última ligação à bomba</string>
@@ -1300,6 +1169,15 @@
     <string name="buttonson_description">Os botões são sempre exibidos na parte inferior do ecrã</string>
     <string name="largedisplay_description">Mostrador Grande</string>
     <string name="skin">Tema gráfico</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nunca contactado</string>
+    <string name="medtronic_pump_status_waking_up">A acordar</string>
+    <string name="medtronic_pump_status_error_comm">Erro com comunicação</string>
+    <string name="medtronic_pump_status_timeout_comm">Tempo limite para comunicação</string>
+    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="medtronic_pump_status_invalid_config">Configuração inválida</string>
+    <string name="medtronic_pump_status_active">Activo</string>
+    <string name="medtronic_pump_status_sleeping">A dormir</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integração de bomba para Omnipod, requer RileyLink (com pelo menos firmware 2.0) dispositivo.</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 7b45c672a3..c81aa82286 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -647,6 +647,7 @@
     <string name="enablesmbwithtemptarget">Activează SMB cu ținte temporare</string>
     <string name="enablesmbwithtemptarget_summary">Activează SMB chiar atunci când este o țintă temporară activă (mâncare in curând, exerciții fizice)</string>
     <string name="enablesmbwithhightemptarget">Activează SMB cu ținte temporare mari</string>
+    <string name="enablesmbwithhightemptarget_summary">Activați SMB atunci când există o țintă temporară activă (exerciții fizice, peste 100mg/dl sau 5.5mmol/l)</string>
     <string name="overview_insulin_label">Insulină</string>
     <string name="overview_carbs_label">Carbohidrați</string>
     <string name="overview_buttons_selection">Butoane</string>
@@ -1046,137 +1047,6 @@
     <string name="triggers">Declanșatori:</string>
     <string name="remove_label">ȘTERGE</string>
     <string name="preconditions">Condiții pre-existente:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operațiunea nu este suportată de către pompă și/sau driver.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operațiunea nu este ÎNCĂ suportată de către pompă.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Pentru asocierea cu pompa Medtronic este necesar un dispozitiv RileyLink și un anumit model de pompă</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Număr serial pompă</string>
-    <string name="medtronic_pump_type">Tip pompă</string>
-    <string name="medtronic_pump_frequency">Frecvență pompă</string>
-    <string name="medtronic_pump_bolus_delay">Întârziere până la pornirea bolusului (s)</string>
-    <string name="medtronic_pump_max_bolus">Bolusul maxim în pompă (U)</string>
-    <string name="medtronic_pump_max_basal">Bazală maximă în pompă (U/h)</string>
-    <string name="medtronic_pump_encoding">Criptare Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Globală (868 Mhz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Criptare software 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Criptare hardware 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Pornește și sincronizează</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Șterge blocajul de bolus</string>
-    <string name="medtronic_custom_action_reset_rileylink">Resetează configurația RileyLink</string>
-    <string name="medtronic_pump_battery_select">Tipul bateriei (Afișare avansată)</string>
-    <string name="medtronic_pump_battery_no">Fără selecție (Afișare simplificată)</string>
-    <string name="medtronic_pump_battery_alkaline">Alcalină (Afișare extinsă)</string>
-    <string name="medtronic_pump_battery_lithium">Litiu (Afișare extinsă)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Afișare extinsă)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Afișare extinsă)</string>
-    <string name="medtronic_bolus_debugging">Depanare Bolus/Tratamente</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
-    <string name="rileylink_scanner_selected_device">Selectat</string>
-    <string name="rileylink_scanner_title">Scanare RileyLink</string>
-    <string name="location_yes">Activează</string>
-    <string name="location_no">Nu</string>
-    <string name="rileylink_scanner_scanning">Scanează</string>
-    <string name="rileylink_scanner_scanning_finished">Scanare terminată</string>
-    <string name="rileylink_scanner_scanning_error">Eroare la scanare: %1$d</string>
-    <string name="common_never">Niciodată</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Setări</string>
-    <string name="rileylink_settings_tab2">Istoric</string>
-    <string name="rileylink_status">Stare RileyLink</string>
-    <string name="medtronic_pump_status">Stare pompă</string>
-    <string name="title_activity_rileylink_settings">Setări RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Adresă configurate</string>
-    <string name="rileylink_connected_device">Dispozitiv conectat</string>
-    <string name="rileylink_connection_status">Stare conexiune</string>
-    <string name="rileylink_connection_error">Eroare conexiune</string>
-    <string name="rileylink_device">Dispozitiv</string>
-    <string name="rileylink_device_type">Tip dispozitiv</string>
-    <string name="rileylink_device_model">Model dispozitiv</string>
-    <string name="rileylink_last_used_frequency">Ultima frecvență utilizată</string>
-    <string name="rileylink_last_device_contact">Ultima conexiune cu dispozitivul</string>
-    <string name="rileylink_firmware_version">Firmware RL</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Se inițializează conexiunea Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Eroare Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Conexiune Bluetooth pregătită</string>
-    <string name="rileylink_state_not_started">Nepornit</string>
-    <string name="rileylink_state_rl_init">Se inițializează RileyLink…</string>
-    <string name="rileylink_state_rl_error">Eroare RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Se îmbunătățește RileyLink și pompa</string>
-    <string name="rileylink_state_pc_error">Probleme la conectarea cu pompa</string>
-    <string name="rileylink_state_connected">Conectat</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Dispozitivul nu este RileyLink</string>
-    <string name="rileylink_error_unreachable">Nu se poate găsi RileyLink</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth dezactivat</string>
-    <string name="rileylink_error_no_bt_adapter">Nu există un adaptor Bluetooth</string>
-    <string name="rileylink_error_tuneup_failed">Conectare eșuată</string>
-    <string name="rileylink_error_pump_unreachable">Pompă indisponibilă</string>
-    <string name="rileylink_error_pod_unreachable">Nu se poate comunica cu pod-ul</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pompă Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Erori</string>
-    <string name="medtronic_error_serial_not_set">Număr serial nesetat.</string>
-    <string name="medtronic_error_serial_invalid">Număr serial invalid.</string>
-    <string name="medtronic_error_pump_type_not_set">Tipul pompei nesetat.</string>
-    <string name="medtronic_error_pump_type_invalid">Tip de pompă nesuportat.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Frecvența pompei nesetată.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Frecvența pompei nesuportată.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Adresa RileyLink invalidă.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Tipul de pompă detectat nu corespunde cu cel configurat.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Setările de profil/șablon bazale nu sunt activate în pompă. Vă rugăm să le activați din pompă.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Tipul de profil bazal setat în pompă este incorect (trebuie să fie STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Tip incorect de RBT setat în pompă (trebuie să fie Absolut).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Bolus maxim setat incorect în pompă (trebuie să fie %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Bazala maximă setată incorect în pompă (trebuie să fie %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operațiune imposibilă. \n\n Trebui să configurați mai întâi pompa Medtronic înainte de a face această operație.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">S-a solicitat o schimbare de oră mai mare de 24 de ore.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Bazale</string>
-    <string name="medtronic_history_group_configuration">Configurații</string>
-    <string name="medtronic_history_group_notification">Notificări</string>
-    <string name="medtronic_history_group_statistic">Statistici</string>
-    <string name="medtronic_history_group_unknown">Necunoscute</string>
-    <string name="medtronic_history_group_all">Toate</string>
-    <string name="medtronic_pump_history">Istoric pompă Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Niciodată contactată</string>
-    <string name="medtronic_pump_status_waking_up">Se pornește</string>
-    <string name="medtronic_pump_status_error_comm">Eroare de comunicație</string>
-    <string name="medtronic_pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pompă indisponibilă</string>
-    <string name="medtronic_pump_status_invalid_config">Configurație invalidă</string>
-    <string name="medtronic_pump_status_active">Activă</string>
-    <string name="medtronic_pump_status_sleeping">În repaus</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Ați anulat un bolus după ce a fost deja transmis către pompă. Deoarece pompa Medtronic nu permite o anulare de bolus, va trebui să faceți acest lucru în mod manual, din pompă. Puneți pompa în modul Suspend și apoi Repornire (dacă totuși doriți să anulați bolusul). Aplicația se va sincroniza automat cu pompa la următoarea contactare a acesteia (în mai puțin de 5 minute).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Nu a putut fi citită RBT.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nu a putut fi anulată RBT curentă. Se oprește operațiunea de anulare.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Stabilirea profilului a eșuat deoarece, pe baza modelelor, aveți o rată bazală prea mare: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolusul nu a putut fi livrat.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolusul nu a putut fi livrat deoarece cantitatea de insulină din rezervor (%1$.2f) este mai mică decât cea necesară (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">RBT nu a putut fi setată.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Nu a putut fi anulată RBT curentă.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Profilul bazal nu a putut fi stabilit.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Profilul bazal existent deja este existent, nu va fi reintrodus.</string>
-    <string name="medtronic_cmd_desc_get_history">Preia istoricul - Pagina %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Preia istoricul - Pagina %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Preia timpul din pompă</string>
-    <string name="medtronic_cmd_desc_get_settings">Preia setările</string>
-    <string name="medtronic_cmd_desc_get_model">Preia modelul de pompă</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Preia profilul bazalelor</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Setează profilul bazalelor</string>
-    <string name="medtronic_cmd_desc_get_tbr">Preia bazala temporară</string>
-    <string name="medtronic_cmd_desc_set_tbr">Setează bazala temporară</string>
-    <string name="medtronic_cmd_desc_set_bolus">Setează bolusul</string>
     <string name="profilename">Schimbă profilul în</string>
     <string name="changengetoprofilename">Schimbă profilul la %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Ultima conexiune la pompă</string>
@@ -1299,6 +1169,15 @@
     <string name="buttonson_description">Butoanele sunt afișate întotdeauna în partea de jos a ecranului</string>
     <string name="largedisplay_description">Display mare</string>
     <string name="skin">Tema</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Niciodată contactată</string>
+    <string name="medtronic_pump_status_waking_up">Se pornește</string>
+    <string name="medtronic_pump_status_error_comm">Eroare de comunicație</string>
+    <string name="medtronic_pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompă indisponibilă</string>
+    <string name="medtronic_pump_status_invalid_config">Configurație invalidă</string>
+    <string name="medtronic_pump_status_active">Activă</string>
+    <string name="medtronic_pump_status_sleeping">În repaus</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integrare pompa pentru Omnipod, necesită dispozitivul RileyLink (cu versiune firmware de cel puțin 2.0).</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 88a32efdae..8039238a2f 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1044,137 +1044,6 @@ Context | Edit Context</string>
     <string name="triggers">Триггеры:</string>
     <string name="remove_label">УДАЛИТЬ</string>
     <string name="preconditions">Предусловия:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Операция не поддерживается помпой и/или драйвером.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Интеграция с помпой Medtronic требует устройства RileyLink и специфическую модель помпы</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Серийный номер помы</string>
-    <string name="medtronic_pump_type">Тип помпы</string>
-    <string name="medtronic_pump_frequency">Частота помпы</string>
-    <string name="medtronic_pump_bolus_delay">Задержка перед подачей болюса (с) начата</string>
-    <string name="medtronic_pump_max_bolus">Макс. болюс на помпе (ед)</string>
-    <string name="medtronic_pump_max_basal">Макс. базал на помпе (ед/ч)</string>
-    <string name="medtronic_pump_encoding">Кодировка Medtronic</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Глобальн (868 Мгц)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Программное 4b6b кодирование</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Аппаратное кодирование 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Пробудить и настроить</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Очистить блок болюса</string>
-    <string name="medtronic_custom_action_reset_rileylink">Сбросить конфигурацию RileyLink</string>
-    <string name="medtronic_pump_battery_select">Тип батареи (по мощности)</string>
-    <string name="medtronic_pump_battery_no">Не выбрано (Простой вид)</string>
-    <string name="medtronic_pump_battery_alkaline">Щелочная (Подробный вид)</string>
-    <string name="medtronic_pump_battery_lithium">Литиевая (Подробный вид)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Подробный вид)</string>
-    <string name="medtronic_pump_battery_nimh">Никель-металлогидридная (подробно)</string>
-    <string name="medtronic_bolus_debugging">Отладка Болюс/Назначения</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">СКАН</string>
-    <string name="rileylink_scanner_scan_stop">СТОП</string>
-    <string name="rileylink_scanner_selected_device">Выбрано</string>
-    <string name="rileylink_scanner_title">Сканирование RileyLink</string>
-    <string name="location_yes">Включить</string>
-    <string name="location_no">Нет</string>
-    <string name="rileylink_scanner_scanning">Сканирование</string>
-    <string name="rileylink_scanner_scanning_finished">Сканирование завершено</string>
-    <string name="rileylink_scanner_scanning_error">Ошибка сканирования: %1$d</string>
-    <string name="common_never">Никогда</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Настройки</string>
-    <string name="rileylink_settings_tab2">История</string>
-    <string name="rileylink_status">Статус RileyLink</string>
-    <string name="medtronic_pump_status">Статус помпы</string>
-    <string name="title_activity_rileylink_settings">Настройки RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Настроенный адрес</string>
-    <string name="rileylink_connected_device">Подключенное устройство</string>
-    <string name="rileylink_connection_status">Статус подключения</string>
-    <string name="rileylink_connection_error">Ошибка подключения</string>
-    <string name="rileylink_device">Устройство</string>
-    <string name="rileylink_device_type">Тип устройства</string>
-    <string name="rileylink_device_model">Модель устройства</string>
-    <string name="rileylink_last_used_frequency">Последняя использованная частота</string>
-    <string name="rileylink_last_device_contact">Контакт последнего устройства</string>
-    <string name="rileylink_firmware_version">Прошивка RileyLink</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Инициализация Bluetooth…</string>
-    <string name="rileylink_state_bt_error">Ошибка Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth готов</string>
-    <string name="rileylink_state_not_started">Не запущено</string>
-    <string name="rileylink_state_rl_init">Инициализация RileyLink…</string>
-    <string name="rileylink_state_rl_error">Ошибка RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Настройка RileyLink и помпы</string>
-    <string name="rileylink_state_pc_error">Проблема подключения к помпе</string>
-    <string name="rileylink_state_connected">Соединение установлено</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Устройство не является RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink недоступен</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth выключен</string>
-    <string name="rileylink_error_no_bt_adapter">Нет Bluetooth-адаптера</string>
-    <string name="rileylink_error_tuneup_failed">Ошибка TuneUp</string>
-    <string name="rileylink_error_pump_unreachable">Помпа недоступна</string>
-    <string name="rileylink_error_pod_unreachable">POD недоступен</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Помпа Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Ошибки</string>
-    <string name="medtronic_error_serial_not_set">Серийный # не задан.</string>
-    <string name="medtronic_error_serial_invalid">Серийный # неверный.</string>
-    <string name="medtronic_error_pump_type_not_set">Тип помпы не задан.</string>
-    <string name="medtronic_error_pump_type_invalid">Тип помпы не поддерживается.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Частота помпы не задана.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Частота помпы не поддерживается.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Недопустимый адрес RileyLink.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Обнаруженный тип помпы не соответствует настроенному.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базальные профили/настройки шаблонов не включены в помпе. Включите их на помпе.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базовый профиль на помпе неверный (должен быть STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Неверный тип временной скорости базала TBR на помпе (должен быть Absolute).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">На помпе задан неверный макс болюс (должен быть %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">На помпе задан неверный макс базал (должен быть %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Операция невозможна.\n\n Сначала нужно настроить помпу Medtronic.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Запрошено изменение времени свыше 24 часов.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Базалы</string>
-    <string name="medtronic_history_group_configuration">Конфигурация</string>
-    <string name="medtronic_history_group_notification">Уведомления</string>
-    <string name="medtronic_history_group_statistic">Статистика</string>
-    <string name="medtronic_history_group_unknown">Неизвестно</string>
-    <string name="medtronic_history_group_all">Все</string>
-    <string name="medtronic_pump_history">История с помпы Medtronic</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Никогда не подключалось</string>
-    <string name="medtronic_pump_status_waking_up">Пробуждение</string>
-    <string name="medtronic_pump_status_error_comm">Ошибка связи</string>
-    <string name="medtronic_pump_status_timeout_comm">Таймаут связи</string>
-    <string name="medtronic_pump_status_pump_unreachable">Помпа недоступна</string>
-    <string name="medtronic_pump_status_invalid_config">Недопустимая конфигурация</string>
-    <string name="medtronic_pump_status_active">Активно</string>
-    <string name="medtronic_pump_status_sleeping">Сон</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Вы отменили болюс после того как он был задан на помпе. Поскольку помпа Medtronic не поддерживает отмену, нужно отменить его вручную. Переведите помпу в режим приостановки и затем сделайте Resume (если все еще хотите отменить). Приложение примет изменения при следующем обновлении (менее чем через 5 минут).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Не удалось прочитать текущий врем. базал TBR.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Не удалось отменить текущий врем базал TBR. Остановка операции.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Не удалось установить профиль потому что следующие шаблоны имеют слишком большой базал %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Болюс не подан.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Болюс не подан т.к. доступное количество инсулина (%1$.2f) меньше, чем требуемый болюс (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Врем базал TBR не задан.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Не удалось отменить текущий врем базал TBR.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Профиль базала не установлен.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Базовый профиль идентичен, он не будет задан повторно.</string>
-    <string name="medtronic_cmd_desc_get_history">Получить историю - страница %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Получить историю - страница %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Получить время с помпы</string>
-    <string name="medtronic_cmd_desc_get_settings">Получить настройки</string>
-    <string name="medtronic_cmd_desc_get_model">Получить модель помпы</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Получить профиль базала</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Установить профиль базала</string>
-    <string name="medtronic_cmd_desc_get_tbr">Получить временный базал</string>
-    <string name="medtronic_cmd_desc_set_tbr">Установить временный базал</string>
-    <string name="medtronic_cmd_desc_set_bolus">Настроить болюс</string>
     <string name="profilename">Изменить профиль на</string>
     <string name="changengetoprofilename">Изменить профиль на %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Последнее соединение с помпой</string>
@@ -1297,6 +1166,15 @@ Context | Edit Context</string>
     <string name="buttonson_description">Кнопки всегда отображаются в нижней части экрана</string>
     <string name="largedisplay_description">Большой дисплей</string>
     <string name="skin">Тема оформления</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Никогда не подключалось</string>
+    <string name="medtronic_pump_status_waking_up">Пробуждение</string>
+    <string name="medtronic_pump_status_error_comm">Ошибка связи</string>
+    <string name="medtronic_pump_status_timeout_comm">Таймаут связи</string>
+    <string name="medtronic_pump_status_pump_unreachable">Помпа недоступна</string>
+    <string name="medtronic_pump_status_invalid_config">Недопустимая конфигурация</string>
+    <string name="medtronic_pump_status_active">Активно</string>
+    <string name="medtronic_pump_status_sleeping">Сон</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Для интеграции с помпой Omnipod требуется устройство RileyLink (с прошивкой 2.0 и выше).</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index bbd36a5729..170a8051b7 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1047,137 +1047,6 @@
     <string name="triggers">Podmienky:</string>
     <string name="remove_label">VYMAZAŤ</string>
     <string name="preconditions">Predpoklady:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operácia nepodporovaná pumpou a/alebo ovládačom.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Integrácia pre pumpu Medtronic, požaduje sa RileyLink zariadenie a špecifický model pumpy.</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Sériové číslo pumpy</string>
-    <string name="medtronic_pump_type">Typ pumpy</string>
-    <string name="medtronic_pump_frequency">Frekvencia pumpy</string>
-    <string name="medtronic_pump_bolus_delay">Oneskorenie pred podaním bolusu (s)</string>
-    <string name="medtronic_pump_max_bolus">Max. bolus v pumpe (U)</string>
-    <string name="medtronic_pump_max_basal">Max. bazál v pumpe (U/h)</string>
-    <string name="medtronic_pump_encoding">Medtronic kódovanie</string>
-    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Celosvetovo (868 MHz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">Softvérové kódovanie 4b6b</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardvérové kódovanie 4b6b</string>
-    <string name="medtronic_custom_action_wake_and_tune">Prebudenie a prispôsobenie</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Odstránenie blokovania bolusu</string>
-    <string name="medtronic_custom_action_reset_rileylink">Resetovať konfiguráciu RileyLinku</string>
-    <string name="medtronic_pump_battery_select">Typ batérie (Zobrazenie napájania)</string>
-    <string name="medtronic_pump_battery_no">Nevybrané (jednoduché zobrazenie)</string>
-    <string name="medtronic_pump_battery_alkaline">Alkalické (rozšírené zobrazenie)</string>
-    <string name="medtronic_pump_battery_lithium">Líthiové (rozšírené zobrazenie)</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (Rozšírené)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (Rozšírené zobrazenie)</string>
-    <string name="medtronic_bolus_debugging">Bolus/Ošetrenia ladenie</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">VYHĽADAŤ</string>
-    <string name="rileylink_scanner_scan_stop">ZASTAVIŤ</string>
-    <string name="rileylink_scanner_selected_device">Vybrané</string>
-    <string name="rileylink_scanner_title">Vyhľadávanie RileyLinku</string>
-    <string name="location_yes">Aktivovať</string>
-    <string name="location_no">Nie</string>
-    <string name="rileylink_scanner_scanning">Vyhľadávanie</string>
-    <string name="rileylink_scanner_scanning_finished">Vyhľadávanie dokončené</string>
-    <string name="rileylink_scanner_scanning_error">Chyba vyhľadávania: %1$d</string>
-    <string name="common_never">Nikdy</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Nastavenia</string>
-    <string name="rileylink_settings_tab2">História</string>
-    <string name="rileylink_status">Stav RileyLinku</string>
-    <string name="medtronic_pump_status">Stav pumpy</string>
-    <string name="title_activity_rileylink_settings">Nastavenie RileyLink</string>
-    <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Nastavená adresa</string>
-    <string name="rileylink_connected_device">Pripojené zariadenie</string>
-    <string name="rileylink_connection_status">Stav pripojenia</string>
-    <string name="rileylink_connection_error">Chyba pripojenia</string>
-    <string name="rileylink_device">Zariadenie</string>
-    <string name="rileylink_device_type">Typ zariadenia</string>
-    <string name="rileylink_device_model">Model zariadenia</string>
-    <string name="rileylink_last_used_frequency">Posledná použitá frekvencia</string>
-    <string name="rileylink_last_device_contact">Posledné spojenie zo zariadením</string>
-    <string name="rileylink_firmware_version">RL Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Inicializácia Bluetooth...</string>
-    <string name="rileylink_state_bt_error">Chyba Bluetooth</string>
-    <string name="rileylink_state_bt_ready">Bluetooth pripravené</string>
-    <string name="rileylink_state_not_started">Nespustené</string>
-    <string name="rileylink_state_rl_init">Inicializácia RileyLink...</string>
-    <string name="rileylink_state_rl_error">Chyba RileyLink</string>
-    <string name="rileylink_state_pc_tune_up">Ladenie RileyLinku a pumpy</string>
-    <string name="rileylink_state_pc_error">Problém s pripojením k pumpe</string>
-    <string name="rileylink_state_connected">Pripojené</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Zariadenie nie je RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink nedostupný</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth je deaktivované</string>
-    <string name="rileylink_error_no_bt_adapter">Žiadny Bluetooth adaptér</string>
-    <string name="rileylink_error_tuneup_failed">Ladenie zlyhalo</string>
-    <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
-    <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Chyby</string>
-    <string name="medtronic_error_serial_not_set">Sériové číslo nenastavené.</string>
-    <string name="medtronic_error_serial_invalid">Sériové číslo neplatné.</string>
-    <string name="medtronic_error_pump_type_not_set">Nenastavený typ pumpy.</string>
-    <string name="medtronic_error_pump_type_invalid">Nepodporovaný typ pumpy.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Nenastavená frekvencia pumpy.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvencia pumpy.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Neplatná adresa RileyLinku.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Rozpoznaná pumpa je iného typu než nakonfigurovaná.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavenie bazálnych profilov/vzorov nie je na pumpe povolené. Povoľte ich na pumpe.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazálny profil na pumpe je chybný (musí byť STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpe (musí byť absolútny).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpe (musí byť %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Chybný max. bazál na pumpe (musí byť %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operácia nie je možná.\n\nNajskôr je nutné nakonfigurovať pumpu, než bude možné túto funkciu použiť.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Požadovaná zmena času väčšia ako 24h.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Bazály</string>
-    <string name="medtronic_history_group_configuration">Konfigurácie</string>
-    <string name="medtronic_history_group_notification">Notifikácie</string>
-    <string name="medtronic_history_group_statistic">Štatistiky</string>
-    <string name="medtronic_history_group_unknown">Neznáme</string>
-    <string name="medtronic_history_group_all">Všetko</string>
-    <string name="medtronic_pump_history">História Medtronic pumpy</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Nikdy nepripojené</string>
-    <string name="medtronic_pump_status_waking_up">Prebúdzanie</string>
-    <string name="medtronic_pump_status_error_comm">Chyba komunikácie</string>
-    <string name="medtronic_pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
-    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurácia</string>
-    <string name="medtronic_pump_status_active">Aktívna</string>
-    <string name="medtronic_pump_status_sleeping">Spiaca</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Zrušili ste bolus po tom, čo bol nastavený na pumpe. Pretože Medtronic nepodporuje zrušenie bolusu, musíte ho zrušiť ručne. Pozastavte pumpu a znovu spustite (pokiaľ naďalej trváte na zrušení). Aplikácia prevezme zmeny pri ďalšom pripojení (do 5 min).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Nie je možné načítať aktuálny dočasný bazál.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nie je možné zastaviť aktuálny dočasný bazál. Ukončujem operáciu.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Nastavenie profilu zlyhalo, pretože následujúce hodnoty bazálu, sú príliš vysoké: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus nemohol byť podaný.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nebolo možné podať, pretože dostupné množstvo inzulínu (%1$.2f) je menšie než požadovaný bolus (%2$.2f).</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Dočasný bazál nemohol byť nastavený.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Aktuálny dočasný bazál nemohol byť zrušený.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazálny profil nemohol byť nastavený.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazálny profil je rovnaký, takže nebude znovu nastavený.</string>
-    <string name="medtronic_cmd_desc_get_history">Načítanie histórie - Strana %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Načítanie histórie - Strana %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Načítanie času pumpy</string>
-    <string name="medtronic_cmd_desc_get_settings">Načítanie nastavení</string>
-    <string name="medtronic_cmd_desc_get_model">Načítanie modelu pumpy</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Načítanie bazálneho profilu</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Nastavovanie bazálneho profilu</string>
-    <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
-    <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
-    <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
     <string name="profilename">Zmeniť profil na</string>
     <string name="changengetoprofilename">Zmena profilu na %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Posledné spojenie s pumpou</string>
@@ -1300,6 +1169,15 @@
     <string name="buttonson_description">Tlačidlá sú vždy zobrazené v spodnej časti obrazovky</string>
     <string name="largedisplay_description">Veľký displej</string>
     <string name="skin">Vzhľad</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Nikdy nepripojené</string>
+    <string name="medtronic_pump_status_waking_up">Prebúdzanie</string>
+    <string name="medtronic_pump_status_error_comm">Chyba komunikácie</string>
+    <string name="medtronic_pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="medtronic_pump_status_invalid_config">Neplatná konfigurácia</string>
+    <string name="medtronic_pump_status_active">Aktívna</string>
+    <string name="medtronic_pump_status_sleeping">Spiaca</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Integrácia pumpy pre Omnipod, vyžaduje zariadenie RileyLink (s firmwarom aspoň 2.0).</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 70cc9c5d48..2578fce6a9 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -4,19 +4,8 @@
     <!--   <string name="he_lang" translatable="false">Hebrew</string> -->
     <!--    <string name="ga_lang" translatable="false">Irish</string> -->
     <!--    <string name="ja_lang" translatable="false">Japanese</string> -->
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9b80583bf0..a9da4b2f5f 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1043,137 +1043,6 @@ Eversense-appen.</string>
     <string name="triggers">Utlösare:</string>
     <string name="remove_label">TA BORT</string>
     <string name="preconditions">Förutsättningar:</string>
-    <!-- Pump Abstract -->
-    <string name="pump_operation_not_supported_by_pump_driver">Operation stöds inte av pumpen/pumpdrivrutinen.</string>
-    <string name="pump_operation_not_yet_supported_by_pump">Operationen stöds inte av pumpen ännu.</string>
-    <!-- Medtronic (MDT) - Base -->
-    <string name="description_pump_medtronic">Pumpintegration för Medtronic. Kräver Riley Link-enhet och fungerar bara mot vissa pumpmodeller</string>
-    <!-- MDT Configuration -->
-    <string name="medtronic_serial_number">Serienummer på pumpen</string>
-    <string name="medtronic_pump_type">Pumptyp</string>
-    <string name="medtronic_pump_frequency">Pumpfrekvens</string>
-    <string name="medtronic_pump_bolus_delay">Fördröjning innan bolus startas (s)</string>
-    <string name="medtronic_pump_max_bolus">Max bolus enligt pumpen (U)</string>
-    <string name="medtronic_pump_max_basal">Max basal på pumpen (U/h)</string>
-    <string name="medtronic_pump_encoding">Medtronickodning</string>
-    <string name="medtronic_pump_frequency_us_ca">USA &amp; Kanada (916 MHz)</string>
-    <string name="medtronic_pump_frequency_worldwide">Resten av världen (868 MHz)</string>
-    <string name="medtronic_pump_encoding_4b6b_local">4b6b Mjukvarukodning</string>
-    <string name="medtronic_pump_encoding_4b6b_rileylink">4b6b Hårdvarukodning</string>
-    <string name="medtronic_custom_action_wake_and_tune">Väck och finjustera frekvens</string>
-    <string name="medtronic_custom_action_clear_bolus_block">Ta bort bolusblockering</string>
-    <string name="medtronic_custom_action_reset_rileylink">Återställ Riley Link-konfiguration</string>
-    <string name="medtronic_pump_battery_select">Batterityp</string>
-    <string name="medtronic_pump_battery_no">Ej vald</string>
-    <string name="medtronic_pump_battery_alkaline">Alkaliskt</string>
-    <string name="medtronic_pump_battery_lithium">Litium</string>
-    <string name="medtronic_pump_battery_nizn">NiZn (utökad vy)</string>
-    <string name="medtronic_pump_battery_nimh">NiMH (utökad vy)</string>
-    <string name="medtronic_bolus_debugging">Avlusning av Bolus/Behandlingar</string>
-    <!-- RL BLE Scanning -->
-    <string name="rileylink_scanner_scan_scan">SÖK</string>
-    <string name="rileylink_scanner_scan_stop">AVBRYT</string>
-    <string name="rileylink_scanner_selected_device">Vald</string>
-    <string name="rileylink_scanner_title">Riley Link-sökning</string>
-    <string name="location_yes">Aktivera</string>
-    <string name="location_no">Nej</string>
-    <string name="rileylink_scanner_scanning">Söker</string>
-    <string name="rileylink_scanner_scanning_finished">Sökning avslutad</string>
-    <string name="rileylink_scanner_scanning_error">Fel vid sökning: %1$d</string>
-    <string name="common_never">Aldrig</string>
-    <!-- RL Status Page -->
-    <string name="rileylink_settings_tab1">Inställningar</string>
-    <string name="rileylink_settings_tab2">Historik</string>
-    <string name="rileylink_status">Riley Link Status</string>
-    <string name="medtronic_pump_status">Pumpstatus</string>
-    <string name="title_activity_rileylink_settings">Inställningar för Riley Link</string>
-    <string name="rileylink_title">Riley Link</string>
-    <string name="rileylink_configured_address">Konfigurerad adress</string>
-    <string name="rileylink_connected_device">Ansluten enhet</string>
-    <string name="rileylink_connection_status">Anslutningsstatus</string>
-    <string name="rileylink_connection_error">Anslutningsproblem</string>
-    <string name="rileylink_device">Enhet</string>
-    <string name="rileylink_device_type">Enhetstyp</string>
-    <string name="rileylink_device_model">Modell</string>
-    <string name="rileylink_last_used_frequency">Senast använda frekvens</string>
-    <string name="rileylink_last_device_contact">Senaste anslutning</string>
-    <string name="rileylink_firmware_version">Firmware</string>
-    <!-- RL State -->
-    <string name="rileylink_state_bt_init">Bluetooth initieras…</string>
-    <string name="rileylink_state_bt_error">Bluetoothfel</string>
-    <string name="rileylink_state_bt_ready">Bluetooth redo</string>
-    <string name="rileylink_state_not_started">Inte startad</string>
-    <string name="rileylink_state_rl_init">Riley Link initierar…</string>
-    <string name="rileylink_state_rl_error">Riley Link-fel</string>
-    <string name="rileylink_state_pc_tune_up">Justerar Riley Link mot pump</string>
-    <string name="rileylink_state_pc_error">Problem att ansluta till pumpen</string>
-    <string name="rileylink_state_connected">Ansluten</string>
-    <!-- RL Errors -->
-    <string name="rileylink_error_not_rl">Enheten är inte en Riley Link</string>
-    <string name="rileylink_error_unreachable">Riley Link kan inte nås</string>
-    <string name="rileylink_error_bt_disabled">Bluetooth avstängt</string>
-    <string name="rileylink_error_no_bt_adapter">Ingen bluetoothadapter</string>
-    <string name="rileylink_error_tuneup_failed">Frekvensjustering misslyckades</string>
-    <string name="rileylink_error_pump_unreachable">Pumpen kan inte nås</string>
-    <string name="rileylink_error_pod_unreachable">Podden kan inte nås</string>
-    <!-- RL Target Device -->
-    <string name="rileylink_target_device_medtronic">Medtronicpump</string>
-    <string name="rileylink_target_device_omnipod">Omnipod</string>
-    <!-- MDT Errors -->
-    <string name="medtronic_errors">Fel</string>
-    <string name="medtronic_error_serial_not_set">Serienummer ej angett.</string>
-    <string name="medtronic_error_serial_invalid">Serienummer felaktigt.</string>
-    <string name="medtronic_error_pump_type_not_set">Pumptyp ej vald.</string>
-    <string name="medtronic_error_pump_type_invalid">Pumptypen stöds inte.</string>
-    <string name="medtronic_error_pump_frequency_not_set">Pumpfrekvens ej vald.</string>
-    <string name="medtronic_error_pump_frequency_invalid">Pumpfrekvens stöds inte.</string>
-    <string name="medtronic_error_rileylink_address_invalid">Riley Link adress felaktig.</string>
-    <string name="medtronic_error_pump_type_set_differs_from_detected">Pumptypen verkar inte vara samma som den inställda.</string>
-    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basalprofiler är inte aktiverade på pumpen. Aktivera det i pumpens menyer.</string>
-    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Fel basalprofiltyp inställt på pumpen (måste vara STD).</string>
-    <string name="medtronic_error_pump_wrong_tbr_type_set">Fel typ av temp basal på pumpen (måste vara satt till Absolut).</string>
-    <string name="medtronic_error_pump_wrong_max_bolus_set">Fel max bolus i pumpen (måste vara %1$.2f).</string>
-    <string name="medtronic_error_pump_wrong_max_basal_set">Fel max basal i pumpen (måste vara %1$.2f).</string>
-    <string name="medtronic_error_operation_not_possible_no_configuration">Operationen inte möjlig. \n\n Du måste konfigurera Medtronicpump innan du kan använda denna funktion.</string>
-    <string name="medtronic_error_pump_24h_time_change_requested">Mer än 24 timmars tidsändring efterfrågades.</string>
-    <!-- MDT History -->
-    <string name="medtronic_history_group_basal">Basaldoser</string>
-    <string name="medtronic_history_group_configuration">Konfigurationer</string>
-    <string name="medtronic_history_group_notification">Notiser</string>
-    <string name="medtronic_history_group_statistic">Statistik</string>
-    <string name="medtronic_history_group_unknown">Okända</string>
-    <string name="medtronic_history_group_all">Alla</string>
-    <string name="medtronic_pump_history">Pumphistorik</string>
-    <!-- MDT Pump Status -->
-    <string name="medtronic_pump_status_never_contacted">Aldrig ansluten</string>
-    <string name="medtronic_pump_status_waking_up">Väcker</string>
-    <string name="medtronic_pump_status_error_comm">Kommunikationsfel</string>
-    <string name="medtronic_pump_status_timeout_comm">Kommunikationstimeout</string>
-    <string name="medtronic_pump_status_pump_unreachable">Pumpen kan inte nås</string>
-    <string name="medtronic_pump_status_invalid_config">Felaktig konfigureration</string>
-    <string name="medtronic_pump_status_active">Aktiv</string>
-    <string name="medtronic_pump_status_sleeping">Sover</string>
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
-    <string name="medtronic_cmd_cancel_bolus_not_supported">Du avbröt bolusen efter att kommandot skickats till pumpen. Detta stöds inte av Medtronicpumpar, så därför måste du avbryta på själva pumpen. Det kan man göra genom att pausa insulintillförseln tillfälligt och sedan starta den igen. Appen kommer att uppdatera bolusmängd vid nästa anslutning (inom 5 min).</string>
-    <string name="medtronic_cmd_cant_read_tbr">Kunde inte hämta nuvarande temp basal.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kunde inte avbryta nuvarande temp basal. Avbryter kommandot.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Misslyckades med att sätta basalprofilen. Följande timmar har för högt värde angivet: %1$s</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus misslyckades.</string>
-    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">En bolus om %2$.2f enheter kan inte levereras när reservoaren bara innehåller %1$.2f enheter.</string>
-    <string name="medtronic_cmd_tbr_could_not_be_delivered">Temp basal kunde inte anges.</string>
-    <string name="medtronic_cmd_cant_cancel_tbr">Kunde inte avbryta temp basal.</string>
-    <string name="medtronic_cmd_basal_profile_could_not_be_set">Kunde inte byta basalprofil.</string>
-    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basalprofilen är samma som nuvarande. Ingen ändring gjord.</string>
-    <string name="medtronic_cmd_desc_get_history">Hämta historik - Sida %1$d (%2$d/16)</string>
-    <string name="medtronic_cmd_desc_get_history_request">Hämta historik - Sida %1$d</string>
-    <string name="medtronic_cmd_desc_get_time">Hämta tid och datum från pumpen</string>
-    <string name="medtronic_cmd_desc_get_settings">Hämta inställningar</string>
-    <string name="medtronic_cmd_desc_get_model">Hämta pumpmodell</string>
-    <string name="medtronic_cmd_desc_get_basal_profile">Hämta basalprofil</string>
-    <string name="medtronic_cmd_desc_set_basal_profile">Sätt basalprofil</string>
-    <string name="medtronic_cmd_desc_get_tbr">Hämta temp basal</string>
-    <string name="medtronic_cmd_desc_set_tbr">Sätt temp basal</string>
-    <string name="medtronic_cmd_desc_set_bolus">Leverera bolus</string>
     <string name="profilename">Byt profil till</string>
     <string name="changengetoprofilename">Byt profil till %1$s</string>
     <string name="automation_trigger_pump_last_connection_label">Senaste anslutning till pump</string>
@@ -1294,6 +1163,15 @@ Eversense-appen.</string>
     <string name="buttonson_description">Knappar visas alltid längst ned på skärmen</string>
     <string name="largedisplay_description">Stor skärm</string>
     <string name="skin">Tema</string>
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
+    <string name="medtronic_pump_status_never_contacted">Aldrig ansluten</string>
+    <string name="medtronic_pump_status_waking_up">Väcker</string>
+    <string name="medtronic_pump_status_error_comm">Kommunikationsfel</string>
+    <string name="medtronic_pump_status_timeout_comm">Kommunikationstimeout</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpen kan inte nås</string>
+    <string name="medtronic_pump_status_invalid_config">Felaktig konfigureration</string>
+    <string name="medtronic_pump_status_active">Aktiv</string>
+    <string name="medtronic_pump_status_sleeping">Sover</string>
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <string name="description_pump_omnipod">Pumpintegrering för Omnipod. Kräver Riley Link med minst v2-firmware.</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index d4c4f01ee6..aa1332bb29 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -681,19 +681,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="profile_total">== ∑  %1$s U</string>
     <string name="tomato">Tomato (MiaoMiao)</string>
     <string name="tomato_short">Tomato</string>
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index de8e50b729..3c9c231856 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -806,19 +806,8 @@
     <string name="dexcom_app_patched">德康app（补丁版）</string>
     <string name="dexcom_short">DXCM</string>
     <string name="description_source_dexcom">从补丁版的德康APP收到血糖值</string>
-    <!-- Pump Abstract -->
-    <!-- Medtronic (MDT) - Base -->
-    <!-- MDT Configuration -->
-    <!-- RL BLE Scanning -->
-    <!-- RL Status Page -->
-    <!-- RL State -->
-    <!-- RL Errors -->
-    <!-- RL Target Device -->
-    <!-- MDT Errors -->
-    <!-- MDT History -->
-    <!-- MDT Pump Status -->
-    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <!-- SMS Communicator & OTP Authenticator -->
+    <!-- MDT Pump Status - removed when PodDeviceState is removed -->
     <!-- Omnipod -->
     <!-- Omnipod - Base -->
     <!-- Omnipod Configuration -->
diff --git a/core/src/main/res/values-af-rZA/strings.xml b/core/src/main/res/values-af-rZA/strings.xml
index accb96c26b..547b8d8642 100644
--- a/core/src/main/res/values-af-rZA/strings.xml
+++ b/core/src/main/res/values-af-rZA/strings.xml
@@ -18,4 +18,28 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operasie nog nie ondersteun deur pomp.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-ar-rSA/strings.xml b/core/src/main/res/values-ar-rSA/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-ar-rSA/strings.xml
+++ b/core/src/main/res/values-ar-rSA/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index cfc0c66552..6a58c9cca6 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -122,6 +122,8 @@
     <!--    Temptarget-->
     <string name="mins">%1$dмин</string>
     <!--    TDD-->
+    <string name="tddformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ(%5$.0f%%)</b>]]></string>
+    <string name="tddwithcarbsformat"><![CDATA[<b>%1$s:</b> ∑: <b>%2$.2fЕ</b> Бол: <b>%3$.2fЕ</b> Баз: <b>%4$.2fЕ(%5$.0f%%)</b> Въгл: <b>%6$.0fгр</b>]]></string>
     <!--    Translator-->
     <string name="careportal_bgcheck">Проверка на КЗ</string>
     <string name="careportal_announcement">Известие</string>
@@ -179,4 +181,28 @@
     <!--    Ntp-->
     <string name="timedetection">Засичане на времето</string>
     <string name="format_hour_minute">%1$dч:%2$dм</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 95f919a313..0f5b8ec002 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -181,4 +181,48 @@
     <!--    Ntp-->
     <string name="timedetection">Detekce času</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operace není podporována pumpou a/nebo ovladačem.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operace prozatím pumpou nepodporována.</string>
+    <string name="common_resultok">OK</string>
+    <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nikdy nekontaktováno</string>
+    <string name="pump_status_waking_up">Probouzení</string>
+    <string name="pump_status_error_comm">Chyba komunikace</string>
+    <string name="pump_status_timeout_comm">Vypršel časový limit komunikace</string>
+    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="pump_status_invalid_config">Neplatná konfigurace</string>
+    <string name="pump_status_active">Aktivní</string>
+    <string name="pump_status_sleeping">Spánek</string>
+    <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazály</string>
+    <string name="history_group_configuration">Konfigurace</string>
+    <string name="history_group_notification">Oznámení</string>
+    <string name="history_group_statistic">Statistika</string>
+    <string name="history_group_unknown">Neznámé</string>
+    <string name="history_group_all">Vše</string>
+    <string name="history_group_bolus">Bolusy</string>
+    <string name="history_group_prime">Doplňování</string>
+    <string name="history_group_alarm">Alarmy</string>
+    <string name="history_group_glucose">Glykémie</string>
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-cy-rGB/strings.xml b/core/src/main/res/values-cy-rGB/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-cy-rGB/strings.xml
+++ b/core/src/main/res/values-cy-rGB/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index dba64be545..3f56532fed 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -180,4 +180,28 @@
     <string name="tbb2">Tägl. Basalmenge * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Zeiterkennung</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-el-rGR/strings.xml b/core/src/main/res/values-el-rGR/strings.xml
index accb96c26b..4a4b06493f 100644
--- a/core/src/main/res/values-el-rGR/strings.xml
+++ b/core/src/main/res/values-el-rGR/strings.xml
@@ -18,4 +18,28 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Η λειτουργία δεν υποστηρίζεται ΑΚΟΜΑ από την αντλία.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 84c0484cdc..321d35aee2 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -178,4 +178,28 @@
     <string name="tbb2">Basal diaria *2</string>
     <!--    Ntp-->
     <string name="timedetection">Detección de tiempo</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operación no soportada todavía por la bomba.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-fi-rFI/strings.xml b/core/src/main/res/values-fi-rFI/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-fi-rFI/strings.xml
+++ b/core/src/main/res/values-fi-rFI/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 969fa4cf78..9818280fcf 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -180,4 +180,28 @@
     <string name="tbb2">DTB*2</string>
     <!--    Ntp-->
     <string name="timedetection">Détection de temps</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Opération non ENCORE supportée par la pompe.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-ga-rIE/strings.xml b/core/src/main/res/values-ga-rIE/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-ga-rIE/strings.xml
+++ b/core/src/main/res/values-ga-rIE/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-hr-rHR/strings.xml b/core/src/main/res/values-hr-rHR/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-hr-rHR/strings.xml
+++ b/core/src/main/res/values-hr-rHR/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index ec89044e9b..9d97f88981 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -181,4 +181,28 @@
     <!--    Ntp-->
     <string name="timedetection">Rilevamento tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index accb96c26b..b8ceea7c1f 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -18,4 +18,28 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">펌프에서 지원되지 않는 작동.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-lt-rLT/strings.xml b/core/src/main/res/values-lt-rLT/strings.xml
index 8ea2f2ec90..00cd2ef279 100644
--- a/core/src/main/res/values-lt-rLT/strings.xml
+++ b/core/src/main/res/values-lt-rLT/strings.xml
@@ -180,4 +180,28 @@
     <string name="tbb2">PB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Laiko nustatymas</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Pompa dar nepalaiko operacijos.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml
index ad245b7265..bdd382799c 100644
--- a/core/src/main/res/values-nl-rNL/strings.xml
+++ b/core/src/main/res/values-nl-rNL/strings.xml
@@ -178,4 +178,28 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Tijd detectie</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operatie NU nog niet ondersteund door pomp.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 1973c05caa..4e387f137c 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -178,4 +178,28 @@
     <string name="tbb2">TBB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Wykrywanie czasu</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operacja nie jest JESZCZE wspierana przez pompę.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index a124e98e4d..3d9a8ff084 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -170,4 +170,28 @@
     <string name="tbb2">Basal diária * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Detecção de tempo</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 8ac8977e20..92af7e1a0e 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -181,4 +181,28 @@
     <!--    Ntp-->
     <string name="timedetection">Detecção de tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index e5fc169564..883b79b98f 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -182,4 +182,48 @@
     <!--    Ntp-->
     <string name="timedetection">Detectare timp</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operațiunea nu este suportată de către pompă și/sau driver.</string>
+    <string name="pump_operation_not_yet_supported_by_pump">Operațiunea nu este ÎNCĂ suportată de către pompă.</string>
+    <string name="common_resultok">OK</string>
+    <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Niciodată contactată</string>
+    <string name="pump_status_waking_up">Se pornește</string>
+    <string name="pump_status_error_comm">Eroare de comunicație</string>
+    <string name="pump_status_timeout_comm">Comunicația nu a reușit la timp</string>
+    <string name="pump_status_pump_unreachable">Pompă indisponibilă</string>
+    <string name="pump_status_invalid_config">Configurație invalidă</string>
+    <string name="pump_status_active">Activă</string>
+    <string name="pump_status_sleeping">În repaus</string>
+    <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazale</string>
+    <string name="history_group_configuration">Configurații</string>
+    <string name="history_group_notification">Notificări</string>
+    <string name="history_group_statistic">Statistici</string>
+    <string name="history_group_unknown">Necunoscute</string>
+    <string name="history_group_all">Toate</string>
+    <string name="history_group_bolus">Bolusuri</string>
+    <string name="history_group_prime">Amorsare</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glicemie</string>
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 8f23ae951f..221c661cef 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -180,4 +180,28 @@
     <string name="tbb2">общий базал*2</string>
     <!--    Ntp-->
     <string name="timedetection">Определение времени</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index c6ddf0f746..1913c37aec 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -181,4 +181,28 @@
     <!--    Ntp-->
     <string name="timedetection">Detekcia času</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-sl-rSI/strings.xml b/core/src/main/res/values-sl-rSI/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-sl-rSI/strings.xml
+++ b/core/src/main/res/values-sl-rSI/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index f3e17082d4..933c64d88b 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -178,4 +178,28 @@
     <string name="tbb2">TDB * 2</string>
     <!--    Ntp-->
     <string name="timedetection">Tidsdetektering</string>
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">Operationen stöds inte av pumpen ännu.</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml
index accb96c26b..6cacb70673 100644
--- a/core/src/main/res/values-tr-rTR/strings.xml
+++ b/core/src/main/res/values-tr-rTR/strings.xml
@@ -18,4 +18,27 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index accb96c26b..3a1944bc64 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -18,4 +18,28 @@
     <!--    CarbsReq-->
     <!--    TDDStatsActivity-->
     <!--    Ntp-->
+    <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_yet_supported_by_pump">泵不支持操作 YYT 。</string>
+    <!-- PumoCommon - Pump Status -->
+    <!-- PumpCommon - History Group -->
+    <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
+    <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
+    <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
+    <!--    <string name="medtronic_pump_status_timeout_comm">Timeout on communication</string>-->
+    <!--    <string name="medtronic_pump_status_pump_unreachable">Pump unreachable</string>-->
+    <!--    <string name="medtronic_pump_status_invalid_config">Invalid configuration</string>-->
+    <!--    <string name="medtronic_pump_status_active">Active</string>-->
+    <!--    <string name="medtronic_pump_status_sleeping">Sleeping</string>-->
+    <!--    <string name="danar_history_alarm">Alarms</string>-->
+    <!--    <string name="danar_history_glucose">Glucose</string>-->
+    <!--    All(R.string.medtronic_history_group_all), //-->
+    <!--    Bolus(R.string.danar_history_bolus), //-->
+    <!--    Basal(R.string.medtronic_history_group_basal), //-->
+    <!--    Prime(R.string.danar_history_prime), //-->
+    <!--    Configuration(R.string.medtronic_history_group_configuration), //-->
+    <!--    Alarm(R.string.danar_history_alarm), //-->
+    <!--    Glucose(R.string.danar_history_glucose), //-->
+    <!--    Notification(R.string.medtronic_history_group_notification), //-->
+    <!--    Statistic(R.string.medtronic_history_group_statistic),-->
+    <!--    Unknown(R.string.medtronic_history_group_unknown), //-->
 </resources>
diff --git a/medtronic/src/main/res/values-af-rZA/strings.xml b/medtronic/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..db84b0191e
--- /dev/null
+++ b/medtronic/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pomp integrasie vir Medtronic vereis RileyLink en spesifieke modelle</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Pomp Reeks Nommer</string>
+    <string name="medtronic_pump_type">Pomp Tipe</string>
+    <string name="medtronic_pump_frequency">Pomp Frekwensie</string>
+    <string name="medtronic_pump_bolus_delay">Wagtyd voor Bolus begin (s)</string>
+    <string name="medtronic_pump_max_bolus">Maks Bolus op Pomp (U)</string>
+    <string name="medtronic_pump_max_basal">Maks Basale op Pomp (U/h)</string>
+    <string name="medtronic_pump_encoding">Medtronic Enkodering</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Wêreldwyd (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Sagteware 4b6b Enkodeerding</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardeware 4b6b Enkodeerding</string>
+    <string name="medtronic_custom_action_wake_and_tune">Wek en stel in</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Vee Bolus Blok</string>
+    <string name="medtronic_custom_action_reset_rileylink">Herstel RileyLink Konfig</string>
+    <string name="medtronic_pump_battery_select">Battery Tipe(Krag Oorsig)</string>
+    <string name="medtronic_pump_battery_no">Nie gekies (Eenvoudige oorsig)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaliese (Uitgebreide modus)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (Uitgebreide modus)</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Reeksno # nie gestel.</string>
+    <string name="medtronic_error_serial_invalid">Reeksno # is ongeldig.</string>
+    <string name="medtronic_error_pump_type_not_set">Pomp tipe nie gestel.</string>
+    <string name="medtronic_error_pump_type_invalid">Pomp tipe word nie ondersteun nie.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pomp frekwensie nie gestel.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pomp frekwensie word nie ondersteun.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adres ongeldig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Pomp tipe bespeur en is nie dieselfde as gestelde.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basale profiel is verkeerd op pomp (moet STD wees).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde TBR op pomp (Moet Absoluut wees).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Maks Bolus gestel op Pomp(moet %1$.2f wees).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Maks Basale op Pomp (moet %1$.2f %1$.2f wees),.</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operasie nie moontlik.\n\n Jy moet jou Medtronic pomp opstel voordat jy die operasie kan gebruik.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Oor 24h Tyd was versoek.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">U het Bolus gekanselleer nadat dit reeds gestel was op pomp. Aangesien Medtronic pomp nie kansellasie ondesteun sal jy dit self moet kanselleer. Sit pomp in Suspend en hervat(Resume) (as jy steeds wil kanselleer). Spplikasie sal die verandering sppor op volgende opdatering in minder as 5 minute.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Kon nie huidige TBR lees.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kon nie TBR kanselleer. Operasie is gestaak.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profiel stel gefaal want die patroon het \'n te groot basale koers: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus kon nie gelewer word nie.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus kon nie gelewer word nie, want beskikbare insulin (%1$.2f) is mider as bolus versoek(%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR Kon nie stel.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Kon nie huidige TBR staak.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basale profiel kon nie stel.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profiel is dieselfde, so dit is so gelos.</string>
+    <string name="medtronic_cmd_desc_get_history">Verkry Geskiedenis - Bladsy %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Verkry Geskiedenis - Bladsy %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Kry Pomp Tyd</string>
+    <string name="medtronic_cmd_desc_get_settings">Verkry Instellings</string>
+    <string name="medtronic_cmd_desc_get_model">Kry Pomp Model</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Kry Basale Profiel</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Stel Basale Profiel</string>
+    <string name="medtronic_cmd_desc_get_tbr">Verkry Tydelike Basale</string>
+    <string name="medtronic_cmd_desc_set_tbr">Stel Tydelike Basale</string>
+    <string name="medtronic_cmd_desc_set_bolus">Stel Bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pomp onbeskikbaar</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Pomp tyd opgedateer</string>
+</resources>
diff --git a/medtronic/src/main/res/values-ar-rSA/strings.xml b/medtronic/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/medtronic/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..03a6e2a300
--- /dev/null
+++ b/medtronic/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Поддръжка на помпи Медтроник (специфични модели), изисква RileyLink устройство</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Сериен номер на помпа</string>
+    <string name="medtronic_pump_type">Тип помпа</string>
+    <string name="medtronic_pump_frequency">Честота на помпата</string>
+    <string name="medtronic_pump_bolus_delay">Изчакване преди старт на болус (сек)</string>
+    <string name="medtronic_pump_max_bolus">Макс болус в помпата (Е)</string>
+    <string name="medtronic_pump_max_basal">Максимален базал в помпата (Е/ч)</string>
+    <string name="medtronic_pump_encoding">Медтроник коодиране</string>
+    <string name="medtronic_pump_frequency_us_ca">САЩ &amp; Канада (916 Mhz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Останалата част от света (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Софтуерно 4b6b кодиране</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Хардуерно 4b6b кодиране</string>
+    <string name="medtronic_custom_action_wake_and_tune">Събуди и настрой</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Изчисти Bolus Block</string>
+    <string name="medtronic_custom_action_reset_rileylink">Изчисти RileyLink конфигурацията</string>
+    <string name="medtronic_pump_battery_select">Тип батерия (напреднали)</string>
+    <string name="medtronic_pump_battery_no">Не е избрано (общ)</string>
+    <string name="medtronic_pump_battery_alkaline">Алкални</string>
+    <string name="medtronic_pump_battery_lithium">Литиева</string>
+    <string name="medtronic_pump_battery_nizn">NiZn батерия</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (батерия)</string>
+    <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Сериен номер не е зададен.</string>
+    <string name="medtronic_error_serial_invalid">Грешен сериен номер.</string>
+    <string name="medtronic_error_pump_type_not_set">Тип помпа не е зададен.</string>
+    <string name="medtronic_error_pump_type_invalid">Този тип помпа не се поддържа.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Честота на помпата не е зададена.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Честотата не се поддържа.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Грешен RileyLink адрес.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Откритата помпа не е идентична с кокнфигурираната.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базалните профили/настройки не са позволен в помпата. Включванете го от настройките на помпата.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базалния профил в помпата е грешен (трябва да е STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Грешен тип TBR в помпата ( трябва да е Absolute).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Грешен максимален болус в помпата ( трябвба да е %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Грешен макс мазал в помпата (трябва да е %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате поомпата, преди да използвате тази операция,.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Желаната промяна на времето е повече от 24ч.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Отказали сте болус след като е бил изпратен към помпата. Помпите Медтроник не го поддържат и ще трябва да го направите ръчно. Пуснете Suspend mode и след това Resume (ако оше искате да го откажете). Апликацията ще покаже промените след около 5 мин.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Не може да бъде прочетен вр. базал.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Не може да бъде изключен вр. базал. Операцията е спряна.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Смяната на профила е невъзможна, поради твърде голям размер: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Болус не може да бъде стартиран.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Болусът не може да бъде стартиран понеже в резервоара има %1$.2f Е, а желаният болус е %2$.2f Е.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Временен базал не може да бъде стартиран.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Не може да бъде изключен вр. базал.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Профилът не може да бъде приложен.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Профилът е идентичен.</string>
+    <string name="medtronic_cmd_desc_get_history">Вземи история - стр %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Вземи история - стр %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Вземи времето на помпата</string>
+    <string name="medtronic_cmd_desc_get_settings">Вземи настройките на помпата</string>
+    <string name="medtronic_cmd_desc_get_model">Вземи модел на помпата</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Вземи базален профил от помпата</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Приложи базалният профил</string>
+    <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
+    <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
+    <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Актуализирано време на помпата</string>
+</resources>
diff --git a/medtronic/src/main/res/values-cs-rCZ/strings.xml b/medtronic/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..d975426db8
--- /dev/null
+++ b/medtronic/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integrace pump Medtronic, vyžaduje zařízení RileyLink a konkrétní model pumpy</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Sériové číslo pumpy</string>
+    <string name="medtronic_pump_type">Typ pumpy</string>
+    <string name="medtronic_pump_frequency">Frekvence pumpy</string>
+    <string name="medtronic_pump_bolus_delay">Prodleva před spuštěním bolusu (s)</string>
+    <string name="medtronic_pump_max_bolus">Max. bolus na pumpě (U)</string>
+    <string name="medtronic_pump_max_basal">Max. bazál na pumpě (U)</string>
+    <string name="medtronic_pump_encoding">Kódováni Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Celosvětové (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Encoding</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Encoding</string>
+    <string name="medtronic_custom_action_wake_and_tune">Probuzení a spojování</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Vymazat blokování bolusu</string>
+    <string name="medtronic_custom_action_reset_rileylink">Resetovat konfiguraci RileyLinku</string>
+    <string name="medtronic_pump_battery_select">Typ baterie (Zobrazení napájení)</string>
+    <string name="medtronic_pump_battery_no">Nevybráno (Jednoduché)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkalické (Rozšířené)</string>
+    <string name="medtronic_pump_battery_lithium">Lithiové (Rozšířené)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Rozšířené)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Rozšířené)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Ošetření ladění</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_errors">Chyby</string>
+    <string name="medtronic_error_serial_not_set">Sériové číslo nenastaveno.</string>
+    <string name="medtronic_error_serial_invalid">Sériové číslo neplatné.</string>
+    <string name="medtronic_error_pump_type_not_set">Nenastaven typ pumpy.</string>
+    <string name="medtronic_error_pump_type_invalid">Nepodporovaný typ pumpy.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Nenastavená frekvence pumpy.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvence pumpy.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Chybná adresa RileyLinku.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Detekovaná pumpa je jiného typu než nakonfigurovaná.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavení bazálních profilů/vzorů není na pumpě povoleno. Povolte je na pumpě.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazální profil na pumpě je chybný (musí být STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpě (musí být absolutní).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpě (musí být %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Chybný max. bazál na pumpě (musí být %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operace není možná.\n\nNejdříve je nutné nakonfigurovat pumpu, než bude možné tuto funkci použít.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Požadována změna času větší než 24 h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Historie Medtronic pumpy</string>
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Zrušili jste bolus potom, co byl nastaven na pumpě. Protože Medtronic nepodporuje zrušení bolusu, musíte ho zrušit ručně. Pozastavte pumpu a znovu spusťte. Aplikace detekuje změnu při příštím připojení (do 5 min).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Nelze načíst současný dočasný bazál.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nelze zastavit současný dočasný bazál. Ukončuji operaci.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Nastavení profilu selhalo, protože následující vzorec má příliš velké bazály: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus nemohl být odeslán.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nebylo možné vydat, protože dostupné množství inzulinu (%1$.2f) je menší než požadovaný bolus (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Dočasný bazál nemohl být nastaven.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Současný dočasný bazál nemohl být zrušen.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazální profil nemohl být nastaven.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazální profil je stejný, takže nebude znovu nastaven.</string>
+    <string name="medtronic_cmd_desc_get_history">Načítání historie - Strana %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Načítání historie - Strana %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Načítání času pumpy</string>
+    <string name="medtronic_cmd_desc_get_settings">Načítání nastavení</string>
+    <string name="medtronic_cmd_desc_get_model">Načítání modelu</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Načítání profilu</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Nastavování profilu</string>
+    <string name="medtronic_cmd_desc_get_tbr">Načítání dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_set_tbr">Nastavování dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_set_bolus">Nastavování bolusu</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="medtronic_warning">Varování</string>
+    <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Teď</string>
+    <!-- combo_pump_connected_now -->
+    <string name="ago">zpět</string>
+    <string name="medtronic_notification_check_time_date">Je vyžadována aktualizace času na pumpě</string>
+    <!-- combo_notification_check_time_date -->
+    <string name="common_on">ZAP</string>
+    <string name="common_off">VYP</string>
+    <string name="pump_time_updated">Čas v pumpě aktualizován</string>
+</resources>
diff --git a/medtronic/src/main/res/values-cy-rGB/strings.xml b/medtronic/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/medtronic/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..1f69ba6e95
--- /dev/null
+++ b/medtronic/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pumpenintegration für Medtronic, benötigt RileyLink und ein spezielles Pumpenmodell</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Seriennummer der Pumpe</string>
+    <string name="medtronic_pump_type">Pumpentyp</string>
+    <string name="medtronic_pump_frequency">Pumpenfrequenz</string>
+    <string name="medtronic_pump_bolus_delay">Verzögerung vor dem Start des Bolus (sek.)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolus in der Pumpe (IE)</string>
+    <string name="medtronic_pump_max_basal">Max Basal in der Pumpe (IE/h)</string>
+    <string name="medtronic_pump_encoding">Medtronic Enkodierung</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Weltweit (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Codierung</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Codierung</string>
+    <string name="medtronic_custom_action_wake_and_tune">Aufwachen und anpassen</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Bolus Block löschen</string>
+    <string name="medtronic_custom_action_reset_rileylink">RileyLink-Konfiguration zurücksetzen</string>
+    <string name="medtronic_pump_battery_select">Akkutyp (Power View)</string>
+    <string name="medtronic_pump_battery_no">Nicht ausgewählt (Einfache Ansicht)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaline Batterie (erweiterte Ansicht)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium Batterie (erweiterte Ansicht)</string>
+    <string name="medtronic_pump_battery_nizn">Nickel-Zink-Akku (erweiterte Ansicht)</string>
+    <string name="medtronic_pump_battery_nimh">Nickel-Zink-Akku (erweiterte Ansicht)</string>
+    <string name="medtronic_bolus_debugging">Fehlersuche Bolus/Behandlungen</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Seriennummer nicht angegeben.</string>
+    <string name="medtronic_error_serial_invalid">Seriennummer ungültig.</string>
+    <string name="medtronic_error_pump_type_not_set">Pumpenart nicht angegeben.</string>
+    <string name="medtronic_error_pump_type_invalid">Pumptyp nicht unterstützt.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pumpen-Frequenz nicht angegeben.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pumpen-Frequenz nicht unterstützt.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink Adresse ungültig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Erkannter Pumpentyp entspricht nicht dem eingestellen Pumpentyp.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Einstellung für Basalprofile/-muster ist auf der Pumpe nicht aktiviert. Aktiviere es auf der Pumpe.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Das eingestellte Basalprofl der Pumpe ist falsch (muss STD sein).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Falscher TBR-Typ auf der Pumpe (muss \"Absolut\" sein).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Falscher Max-Bolus auf Pumpe eingestellt (muss %1$.2f sein).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Falsche Max-Basal auf Pumpe eingestellt (muss %1$.2f sein).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operation ist nicht möglich.\n\n Du musst zuerst die Medtronic Pumpe konfigurieren, bevor Du diese Operation verwenden kannst.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Mehr als 24h Zeitänderung wurde eingestellt.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Du hast den Bolus abgebrochen nachdem er bereits an die Pumpe übermittelt war. Da Medtronic-Pumpen den Abbrechen-Befehl nicht unterstützen, musst du den Bolus manuell abbrechen. Versetze die Pumpe in den Suspend-Modus und gehe dann auf Fortsetzen (wenn Du den Bolus nach wie vor abbrechen möchtest). Die App wird die Änderungen beim nächsten Update (weniger als 5 Minuten) anzeigen.</string>
+    <string name="medtronic_cmd_cant_read_tbr">Aktuelle TBR konnte nicht gelesen werden.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Aktuelle TBR konnte nicht gestoppt werden. Funktion unterbrochen.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Einstellen des Profils fehlgeschlagen weil folgende Basal-Raten zu hoch sind: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus konnte nicht abgegeben werden.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Der Bolus konnte nicht abgegeben werden, da weniger Insulin zur Verfügung steht (%1$.2f) als für den Bolus benötigt wird (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR konnte nicht eingestellt werden.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Konnte die aktuelle TBR nicht abbrechen.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basalprofil konnte nicht eingestellt werden.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basalprofil, unverändert wird nicht erneut eingestellt.</string>
+    <string name="medtronic_cmd_desc_get_history">Hole Verlauf - Seite %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Hole Verlauf - Seite %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Hole Pumpen-Zeit</string>
+    <string name="medtronic_cmd_desc_get_settings">Hole Einstellungen</string>
+    <string name="medtronic_cmd_desc_get_model">Hole Pumpenmodel</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Hole Basal-Profil</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Setzte Basal-Profil</string>
+    <string name="medtronic_cmd_desc_get_tbr">Hole Temporäre Basalraten</string>
+    <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
+    <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Pumpenzeit aktualisiert</string>
+</resources>
diff --git a/medtronic/src/main/res/values-el-rGR/strings.xml b/medtronic/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..c60c3c2565
--- /dev/null
+++ b/medtronic/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Η ολοκλήρωση της αντλίας για τη Medtronic, απαιτεί τη συσκευή RileyLink και το συγκεκριμένο μοντέλο αντλίας</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Σειριακός Αριθμός Αντλίας</string>
+    <string name="medtronic_pump_type">Τύπος Αντλίας</string>
+    <string name="medtronic_pump_frequency">Συχνότητα Αντλίας</string>
+    <string name="medtronic_pump_bolus_delay">Η καθυστέρηση πριν το bolus ξεκίνησε (s)</string>
+    <string name="medtronic_pump_max_bolus">Μέγιστο Bolus στην αντλία (U)</string>
+    <string name="medtronic_pump_max_basal">Μέγιστος Βασικός στην αντλία (U/h)</string>
+    <string name="medtronic_pump_encoding">Αποκωδικοποίηση Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Παγκοσμίως (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Κωδικοποίηση λογισμικού 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Κωδικοποίηση hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Wake and Tune Up</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Καθαρισμός Bolus Block</string>
+    <string name="medtronic_custom_action_reset_rileylink">Επαναφορά Ρυθμίσεων RileyLink</string>
+    <string name="medtronic_pump_battery_select">Τύπος Μπαταρίας (Power View)</string>
+    <string name="medtronic_pump_battery_no">Μη επιλεγμένη (Simple View)</string>
+    <string name="medtronic_pump_battery_alkaline">Αλκαλική (Extended view)</string>
+    <string name="medtronic_pump_battery_lithium">Λιθίου (Extended view)</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Δεν ορίστηκε # Serial.</string>
+    <string name="medtronic_error_serial_invalid">Serial # μη έγκυρο.</string>
+    <string name="medtronic_error_pump_type_not_set">Δεν ορίστηκε Τύπος Αντλίας.</string>
+    <string name="medtronic_error_pump_type_invalid">Τύπος Αντλίας δεν υποστηρίζεται.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Δεν ορίστηκε Συχνότητα Αντλίας.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Συχνότητα Αντλίας δεν υποστηρίζεται.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Διεύθυνση RileyLink μη έγκυρη.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Ο τύπος αντλίας που ανιχνεύτηκε δεν είναι ο ίδιος με αυτόν που ορίστηκε.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Το βασικό προφίλ που ορίστηκε στην αντλία είναι λάθoς (πρέπει να είναι STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Λάθος τύπος TBR ορίστηκε στην αντλία (πρέπει να είναι Absolute).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Λάθος μέγιστο bolus ορίστηκε στην αντλία (πρέπει να είναι %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Λάθος μέγιστο Βασικού ορίστηκε στην αντλία (πρέπει να είναι %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Λειτουργία δεν είναι δυνατή. \n\n Χρειάζεται να ρυθμίσετε την αντλία Medtronic πρώτα, προτού να μπορέσετε να χρησιμοποιήσετε αυτή την λειτουργία.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Απαιτήθηκε αλλαγή ώρας πάνω από 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Ακυρώσατε τον Bolus, αφού είχε ήδη σταλεί στην αντλία. Επειδή η αντλία Medtronic δεν υποστηρίζει ακύρωση, θα χρειαστεί να ακυρωθεί χειροκίνητα. Βάλτε την αντλία σε αναστολή λειτουργίας και μετά κάντε Συνέχιση (αν θέλετε να ακυρώσετε ακόμα). Η εφαρμογή θα πάρει τις αλλαγές, στην επόμενη ενημέρωση (σε λιγότερο από 5 λεπτά).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Αδυναμία ανάγνωσης τρέχοντος TBR.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Αδυναμία ακύρωσης τρέχοντος TBR. Αναστολή λειτουργίας.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Η δημιουργία προφίλ απέτυχε, επειδή ακολουθώντας πρότυπα, έχετε υπερβολικά μεγάλο βασικό ρυθμό: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Το Bolus δεν μπορεί να χορηγηθεί.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Το Bolus δεν μπορεί να παραδοθεί διότι η διαθέσιμη ποσότητα ινσουλίνης (%1$.2f) είναι μικρότερη από αυτήν που ζητείται (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR δεν μπορεί να μπει.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Αδυναμία ακύρωσης τρέχοντος TBR.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Το Βασικό Προφίλ δεν μπορεί να τοποθετηθεί.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Το Βασικό Προφίλ είναι ίδιο, οπότε δεν θα μπει ξανά.</string>
+    <string name="medtronic_cmd_desc_get_history">Βλέπε Ιστορικό - Σελίδα %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Βλέπε Ιστορικό - Σελίδα %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Πάρτε Ώρα Αντλίας</string>
+    <string name="medtronic_cmd_desc_get_settings">Λάβετε ρυθμίσεις</string>
+    <string name="medtronic_cmd_desc_get_model">Λάβετε Μοντέλο Αντλίας</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Λάβετε Βασικό Προφίλ</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Βάλτε Βασικό Προφίλ</string>
+    <string name="medtronic_cmd_desc_get_tbr">Λάβετε Προσωρινό Ρυθμό</string>
+    <string name="medtronic_cmd_desc_set_tbr">Βάλτε Προσωρινό Ρυθμό</string>
+    <string name="medtronic_cmd_desc_set_bolus">Βάλτε Bolus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Η ώρα στην αντλία άλλαξε</string>
+</resources>
diff --git a/medtronic/src/main/res/values-es-rES/strings.xml b/medtronic/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..f438320ae9
--- /dev/null
+++ b/medtronic/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integración de Bomba para Medtronic, requiere dispositivo RileyLink y modelo específico de Bomba</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Número de serie de la Infusora</string>
+    <string name="medtronic_pump_type">Tipo de Infusora</string>
+    <string name="medtronic_pump_frequency">Frecuencia de la Infusora Medtronic</string>
+    <string name="medtronic_pump_bolus_delay">Retraso antes de que el bolo se inicie (s)</string>
+    <string name="medtronic_pump_max_bolus">Bolo máximo en infusora (U)</string>
+    <string name="medtronic_pump_max_basal">Máxima Basal en Infusora (U/h)</string>
+    <string name="medtronic_pump_encoding">Codificación de Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">A nivel mundial (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Codificación de software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificación de hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Encender y ajustar</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Borrar el bloque de bolo</string>
+    <string name="medtronic_custom_action_reset_rileylink">Restablecer configuración de RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipo de batería (Vista de energía)</string>
+    <string name="medtronic_pump_battery_no">No seleccionado (Vista simple)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (vista extendida)</string>
+    <string name="medtronic_pump_battery_lithium">Litio (vista extendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (vista ampliada)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (vista extendida)</string>
+    <string name="medtronic_bolus_debugging">Bolos/Depuración de Tratamientos</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Nº serie no establecido.</string>
+    <string name="medtronic_error_serial_invalid">Número de serie no válido.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipo de infusora no establecido.</string>
+    <string name="medtronic_error_pump_type_invalid">Tipo de infusora no soportado.</string>
+    <string name="medtronic_error_pump_frequency_not_set">No se ha establecido la frecuencia de la infusora.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frecuencia de la infusora no soportada.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Dirección de RileyLink no válida.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">El tipo de infusora detectado no es el mismo que el tipo configurado.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Los perfiles de basal/valor de los patrones no están activados en la bomba. Actívalos en la bomba.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">El perfil basal establecido en la infusora es incorrecto (debe ser estándar).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo incorrecto de basal temporal en la infusora (debe ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Valor máximo incorrecto configurado en la infusora (debe ser %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Error en el valor máximo de basal configurado en la infusora (debe ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">La operación no es posible.\n\n Necesitas configurar primero la infusora Medtronic, antes de poder usar esta operación.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Se ha solicitado un cambio de hora de más de 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Has cancelado el bolo después de que ya estaba enviado a la infusora. Debido a que la infusora Medtronic no soporta comando cancelar, tendrás que cancelarlo manualmente. Pon la infusora en modo suspender y luego reinicia (si todavía quieres cancelar). La aplicación recogerá los cambios en la próxima actualización (en menos de 5 minutos).</string>
+    <string name="medtronic_cmd_cant_read_tbr">No se pudo leer la basal temporal actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">No se pudo cancelar la basal temporal actual. Detener la operación.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">El perfil no se pudo activar debido a que los siguientes patrones tienen una basal demasiado grande: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">No se pudo entregar el bolo.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">El bolo no pudo ser entregado porque la cantidad de insulina disponible (%1$.2f) es inferior al bolo solicitado (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">La basal temporal no se ha podido activar.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">No se pudo cancelar la basal temporal actual.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">No se pudo establecer el perfil de basal.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">El perfil basal es el mismo, por lo que no será establecido de nuevo.</string>
+    <string name="medtronic_cmd_desc_get_history">Recuperar el historial - Página %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Recuperar el historial - Página %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Obtener la hora de la infusora</string>
+    <string name="medtronic_cmd_desc_get_settings">Obtener la configuración</string>
+    <string name="medtronic_cmd_desc_get_model">Obtener el modelo de la infusora</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Obtener el perfil basal</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Establecer el perfil basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obtener la basal temporal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Establecer la basal temporal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Fijar Bolo</string>
+    <string name="medtronic_pump_status_pump_unreachable">Infusora no alcanzable</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Hora del infusor actualizada</string>
+</resources>
diff --git a/medtronic/src/main/res/values-fi-rFI/strings.xml b/medtronic/src/main/res/values-fi-rFI/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-fi-rFI/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-fr-rFR/strings.xml b/medtronic/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..be7ffe6d35
--- /dev/null
+++ b/medtronic/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">L\'intégration de la pompe Medtronic nécessite un appareil RileyLink et un modèle de pompe spécifique</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Numéro de série de pompe</string>
+    <string name="medtronic_pump_type">Type de pompe</string>
+    <string name="medtronic_pump_frequency">Fréquence de pompe</string>
+    <string name="medtronic_pump_bolus_delay">Délai avant le début du Bolus (s)</string>
+    <string name="medtronic_pump_max_bolus">Bolus Max sur Pompe (U)</string>
+    <string name="medtronic_pump_max_basal">Basal Max sur Pompe (U/h)</string>
+    <string name="medtronic_pump_encoding">Encodage Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Encodage logiciel 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Encodage matériel 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Réveil et Réglage</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Effacer le bloc Bolus</string>
+    <string name="medtronic_custom_action_reset_rileylink">Réinitialiser la config. RileyLink</string>
+    <string name="medtronic_pump_battery_select">Type de batterie (vue d\'alimentation)</string>
+    <string name="medtronic_pump_battery_no">Non sélectionné (vue simple)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcaline (vue étendue)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (vue étendue)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (vue étendue)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (vue Étendue)</string>
+    <string name="medtronic_bolus_debugging">Débogage de Bolus/Traitements</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Numéro de série non défini.</string>
+    <string name="medtronic_error_serial_invalid">Numéro de série invalide.</string>
+    <string name="medtronic_error_pump_type_not_set">Type de pompe non défini.</string>
+    <string name="medtronic_error_pump_type_invalid">Type de pompe non pris en charge.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Fréquence de pompe non définie.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Fréquence de pompe non pris en charge.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Adresse RileyLink invalide.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Le type de pompe détecté n\'est pas le même que le type configuré.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Le réglage des profils de basal n\'est pas activé sur la pompe. Activez-le sur la pompe.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Le profil Basal défini sur la pompe est incorrect (doit être STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Mauvais type DBT (TBR) réglé sur la pompe (doit être Absolu).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Mauvais paramètre Max Bolus sur la pompe (doit être %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">L\'opération n\'est pas possible.\n\n Vous devez d\'abord configurer la pompe Medtronic avant de pouvoir utiliser cette fonction.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Un changement de temps de plus de 24h a été demandé.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Vous avez annulé le Bolus, après avoir déjà été envoyé vers la pompe. Puisque la pompe Medtronic n\'accepte pas d\'annulation, vous devrez l\'annuler manuellement. Mettez la pompe en mode Suspendre et puis faites le Reprendre (si vous voulez encore annuler). L\'application va récupérer ces modifications à la prochaine mise à jour (en moins de 5 minutes).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Impossible de lire le DBT (TBR) actuel.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossible d\'annuler le DBT (TBR) actuel. Arrêt de l\'opération.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Le nouveau profil a échoué car le taux basal suivant est trop élevé : %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Le Bolus n\'a pas pu être délivré.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Le Bolus n\'a pas pu être délivré, car la quantité d\'insuline disponible (%1$.2f) est inférieure à celle requise (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT n\'a pas pu être défini.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Impossible d\'annuler le DBT actuel.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Le profil Basal n\'a pas pu être défini.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Le profil Basal est le même, donc il ne sera pas redéfini.</string>
+    <string name="medtronic_cmd_desc_get_history">Obtenir l\'historique - Page %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Obtenir l\'historique - Page %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Obtenir l\'heure de la pompe</string>
+    <string name="medtronic_cmd_desc_get_settings">Obtenir les paramètres</string>
+    <string name="medtronic_cmd_desc_get_model">Obtenir le modèle de pompe</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Obtenir le profil Basal</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Obtenir le profil Basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obtenir le Basal Temporaire</string>
+    <string name="medtronic_cmd_desc_set_tbr">Définir le Basal Temporaire</string>
+    <string name="medtronic_cmd_desc_set_bolus">Définir le Bolus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="common_off">Off</string>
+    <string name="pump_time_updated">Mise à jour de l\'heure de la pompe</string>
+</resources>
diff --git a/medtronic/src/main/res/values-ga-rIE/strings.xml b/medtronic/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-hr-rHR/strings.xml b/medtronic/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/medtronic/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..e7fb73eace
--- /dev/null
+++ b/medtronic/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integrazione del microinfusore Medtronic, richiede un dispositivo RileyLink e uno specifico modello di microinfusore</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Numero seriale micro</string>
+    <string name="medtronic_pump_type">Tipo micro</string>
+    <string name="medtronic_pump_frequency">Frequenza micro</string>
+    <string name="medtronic_pump_bolus_delay">Ritardo prima che il Bolo sia avviato (s)</string>
+    <string name="medtronic_pump_max_bolus">Max bolo su micro (U)</string>
+    <string name="medtronic_pump_max_basal">Max basale su micro (U/h)</string>
+    <string name="medtronic_pump_encoding">Codifica Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Globale (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Codifica Software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Codifica Hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Risveglio e Sintonizzazione</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Cancella blocco bolo</string>
+    <string name="medtronic_custom_action_reset_rileylink">Reset Configurazione RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipo batteria (Power view)</string>
+    <string name="medtronic_pump_battery_no">Non selezionato (Simple view)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (Extended view)</string>
+    <string name="medtronic_pump_battery_lithium">Litio (Extended view)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Extended view)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
+    <string name="medtronic_bolus_debugging">Debug Bolo/Trattamenti</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set"># seriale non impostato.</string>
+    <string name="medtronic_error_serial_invalid"># seriale non valido.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipo micro non impostato.</string>
+    <string name="medtronic_error_pump_type_invalid">Tipo micro non supportato.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Frequenza micro non impostata.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frequenza micro non supportata.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Indirizzo RileyLink non valido.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Il tipo di micro rilevato non è uguale al tipo configurato.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">L\'impostazione di modelli/profili basali non è abilitata sul micro. Abilitala sul micro.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Il profilo basale impostato sul micro non è corretto (deve essere STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo TBR errato impostato sul micro (deve essere Assoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Max bolo errato impostato sul micro (deve essere %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Max basale errata impostata sul micro (deve essere %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operazione non possibile.\n\n Devi prima configurare il micro Medtronic.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">È stata richiesta una modifica oraria di oltre 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Hai cancellato il bolo, dopo che era già stato impostato sul micro. Dal momento che il micro Medtronic non supporta la cancellazione, avrai bisogno di cancellare il bolo manualmente. Metti il micro in modalità sospensione e poi fallo ripartire (se vuoi ancora cancellare il bolo). L\'applicazione rileverà le modifiche al prossimo aggiornamento (in meno di 5 minuti).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Impossibile leggere il TBR corrente.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossibile cancellare il TBR corrente. Arresto dell\'operazione.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Impostazione del profilo fallita. A causa dei seguenti pattern, hai una velocità basale troppo grande: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Il bolo non può essere erogato.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Il bolo non può essere erogato perché la quantità di insulina disponibile (%1$.2f) è inferiore al bolo richiesto (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Il TBR non può essere impostato.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Impossibile cancellare il TBR corrente.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Il profilo basale non può essere impostato.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Il profilo basale è lo stesso, non sarà impostato di nuovo.</string>
+    <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
+    <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
+    <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Imposta profilo basale</string>
+    <string name="medtronic_cmd_desc_get_tbr">Ottieni basale temporanea</string>
+    <string name="medtronic_cmd_desc_set_tbr">Imposta basale temporanea</string>
+    <string name="medtronic_cmd_desc_set_bolus">Imposta bolo</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Ora del micro aggiornata</string>
+</resources>
diff --git a/medtronic/src/main/res/values-iw-rIL/strings.xml b/medtronic/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-ko-rKR/strings.xml b/medtronic/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..07de06ca45
--- /dev/null
+++ b/medtronic/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">메드트로닉 펌프 연동에는 RileyLink와 특정 펌프 모델이 필요합니다.</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">펌프 일련번호</string>
+    <string name="medtronic_pump_type">펌프 타입</string>
+    <string name="medtronic_pump_frequency">펌프 주파수</string>
+    <string name="medtronic_pump_bolus_delay">Bolus 시작전 지연시간(초)</string>
+    <string name="medtronic_pump_max_bolus">펌프의 최대 Bolus(U)</string>
+    <string name="medtronic_pump_max_basal">펌프의 최대 Basal(U/h)</string>
+    <string name="medtronic_pump_encoding">메드트로닉 인코딩</string>
+    <string name="medtronic_pump_frequency_us_ca">미국 &amp; 캐나다(916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">타국가(868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">소프트웨어 4b6b 인코딩</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">하드웨어 4b6b 인코딩</string>
+    <string name="medtronic_custom_action_wake_and_tune">켜기 및 튜닝</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Bolus 블록 삭제</string>
+    <string name="medtronic_custom_action_reset_rileylink">RileyLink 구성 재설정</string>
+    <string name="medtronic_pump_battery_select">배터리 타입(파워뷰)</string>
+    <string name="medtronic_pump_battery_no">선택되지 않음(심플뷰)</string>
+    <string name="medtronic_pump_battery_alkaline">알카라인(확장뷰)</string>
+    <string name="medtronic_pump_battery_lithium">리튬(확장뷰)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (확장 뷰)</string>
+    <string name="medtronic_bolus_debugging">Bolus/관리 디버깅</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">일련번호 # 설정되지 않음</string>
+    <string name="medtronic_error_serial_invalid">일련번호 # 유효하지않음.</string>
+    <string name="medtronic_error_pump_type_not_set">펌프 타입이 설정되지 않았습니다.</string>
+    <string name="medtronic_error_pump_type_invalid">지원되지 않는 펌프 타입입니다.</string>
+    <string name="medtronic_error_pump_frequency_not_set">펌프 주파수가 설정되지 않았습니다.</string>
+    <string name="medtronic_error_pump_frequency_invalid">지원되지 않는 펌프 주파수입니다.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink 주소가 유효하지 않습니다.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">감지된 펌프타입이 설정된 타입과 다릅니다.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basal 프로파일/패턴 설정이 펌프에서 활성화되지 않았습니다. 펌프에서 활성화해주세요.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">펌프에 설정된 Basal 프로파일이 올바르지 않습니다 (STD 이어야 합니다).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">펌프에 잘못된 TBR 유형이 설정되었습니다 (절대값이어야합니다).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">펌프에 잘못된 최대 Bolus가 설정되었습니다 (%1$.2f 이어야 합니다.).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">펌프에 잘못된 최대 Basal이 설정되었습니다 (%1$.2f 이어야 합니다).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">작업이 불가능합니다.\n\n이 작업을 사용하려면 우선 메드트로닉 펌프를 구성해야합니다.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">24시간 이상의 시간 변경이 요청되었습니다.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">펌프에서 이미 설정된 Bolus를 취소했습니다. 메드트로닉 펌프는 취소를 지원하지 않으므로 수동으로 취소해야합니다. (여전히 취소하길 원한다면) 펌프를 일시 중단 모드로 전환 한 다음 다시 시작하십시오. 다음 업데이트시 (5 분 이내에) 변경 사항을 적용합니다.</string>
+    <string name="medtronic_cmd_cant_read_tbr">현재 TBR을 읽을 수 없습니다.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">현재 TBR을 취소할 수 없습니다. 작동을 중지합니다.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Basal이 너무 높아서 프로파일 설정이 실패했습니다 : %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus가 주입되지 않았습니다.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">사용 가능한 인슐린양(%1$.2f)이 요청된 Bolus(%2$.2f)보다 작기 때문에 Bolus를 주입할 수 없습니다.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR 이 설정될 수 없습니다.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">현재 TBR을 취소할 수 없습니다.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basal 프로파일을 설정할 수 없습니다.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">동일한 Basal 프로파일이라 다시 설정하지 않습니다.</string>
+    <string name="medtronic_cmd_desc_get_history">이력 받기 - 페이지 %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">이력 받기 - 페이지 %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">펌프 시간 받기</string>
+    <string name="medtronic_cmd_desc_get_settings">설정 받기</string>
+    <string name="medtronic_cmd_desc_get_model">펌프 모델 받기</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Basal 프로파일 받기</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Basal 프로파일 설정</string>
+    <string name="medtronic_cmd_desc_get_tbr">임시 Basal 받기</string>
+    <string name="medtronic_cmd_desc_set_tbr">임시 Basal 설정</string>
+    <string name="medtronic_cmd_desc_set_bolus">Bolus 설정</string>
+    <string name="medtronic_pump_status_pump_unreachable">펌프에 연결할 수 없습니다</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="common_off">끄기</string>
+    <string name="pump_time_updated">펌프 시간 업데이트</string>
+</resources>
diff --git a/medtronic/src/main/res/values-lt-rLT/strings.xml b/medtronic/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..e95440b5ec
--- /dev/null
+++ b/medtronic/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integracija su Medronic pompa reikalauja RileyLink įrenginio ir specialaus pompos modelio</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Pompos serijos Nr.</string>
+    <string name="medtronic_pump_type">Pompos tipas</string>
+    <string name="medtronic_pump_frequency">Pompos dažnis</string>
+    <string name="medtronic_pump_bolus_delay">Užlaikymas prieš Boluso suleidimą (s)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolusas pompoje (vv)</string>
+    <string name="medtronic_pump_max_basal">Maks val. bazė pompoje (vv/val)</string>
+    <string name="medtronic_pump_encoding">Medronic kodavimas</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Pasaulinis (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Programinis kodavimas 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Įrangos kodavimas 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Pažadinti ir nustatyti</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Išvalyti Boluso bloką</string>
+    <string name="medtronic_custom_action_reset_rileylink">Išvalyti RileyLink nustatymus</string>
+    <string name="medtronic_pump_battery_select">Baterijos tipas (pagal galią)</string>
+    <string name="medtronic_pump_battery_no">Nepasirinkta (paprastas vaizdas)</string>
+    <string name="medtronic_pump_battery_alkaline">Šarminė (išplėstinis vaizdas)</string>
+    <string name="medtronic_pump_battery_lithium">Ličio (išplėstinis vaizdas)</string>
+    <string name="medtronic_pump_battery_nizn">Šarminė (išplėstinis vaizdas)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (išplėstinis vaizdas)</string>
+    <string name="medtronic_bolus_debugging">Boluso/Terapijos Derinimas</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Serijos Nr. nenustatytas.</string>
+    <string name="medtronic_error_serial_invalid">Serijos Nr. neteisingas.</string>
+    <string name="medtronic_error_pump_type_not_set">Nenustatytas pompos tipas.</string>
+    <string name="medtronic_error_pump_type_invalid">Nepalaikomas pompos tipas.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Nenustatytas pompos dažnis.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Nepalaikomas pompos dažnis.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink adresas neteisingas.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Aptiktas pompos tipas neatitinka nustatymų.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Bazės profilis / nustatymas pompoje nėra įgalintas. Įgalinkite jį pompoje.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Pompoje nustatytas neteisingas bazės profilis (turi būti STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Pompoje nustatytas neteisingas laikinos bazės tipas (turi būti absoliutus).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Pompoje nustatytas neteisingas Max Bolusas (turi būti %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Pompoje nustatyta neteisinga Maks val. bazė (turi būti %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operacija negalima. \n\n Pirmiausia turite sukonfigūruoti Medronic pompą prieš atliekant šią operaciją.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Laiko pokytis didesnis nei 24 val.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Atšaukėte bolusą, kuris jau buvo nustatytas pompoje. Medronic pompa nepalaiko šio atšaukimo, todėl turite jį atšaukti rankiniu būdu. Sustabdykite pompą ir vėl ją paleiskite (jei vis dar norite atšaukti bolusą). Aplikacija perims pokyčius su kitu atnaujinimu (per mažiau nei 5 minutes).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Negalima sužinoti dabartinės laikinos bazės.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Negalima atšaukti dabartinės laikinos bazės. Operacija stabdoma.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profilio nustatymas nepavyko dėl per didelės nustatytos bazės: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolusas nesuleistas.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolusas nesuleistas, nes turimas insulino kiekis (%1$.2f) yra mažesnis, nei nustatytas Bolusas (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Laikina bazė nenustatyta.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Negalima atšaukti dabartinės laikinos bazės.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazės profilis nenustatytas.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazės profilis toks pat, todėl nenustatomas pakartotinai.</string>
+    <string name="medtronic_cmd_desc_get_history">Gauti istoriją - Lapas %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Gauti istoriją - Lapas %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Gauti pompos laiką</string>
+    <string name="medtronic_cmd_desc_get_settings">Gauti parametrus</string>
+    <string name="medtronic_cmd_desc_get_model">Gauti pompos modelį</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Gauti bazės profilį</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Nustatyti bazės profilį</string>
+    <string name="medtronic_cmd_desc_get_tbr">Gauti laikiną bazę</string>
+    <string name="medtronic_cmd_desc_set_tbr">Nustatyti laikiną bazę</string>
+    <string name="medtronic_cmd_desc_set_bolus">Nustatyti bolusą</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="common_off">Išjungta</string>
+    <string name="pump_time_updated">Pompos laikas pakeistas</string>
+</resources>
diff --git a/medtronic/src/main/res/values-nl-rNL/strings.xml b/medtronic/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..91bda05ab4
--- /dev/null
+++ b/medtronic/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pomp integratie voor Medtronic, vereist RileyLink-apparaatje en geschikte versie en model pomp</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Serienummer van de pomp</string>
+    <string name="medtronic_pump_type">Pomp Type</string>
+    <string name="medtronic_pump_frequency">Pomp Frequentie</string>
+    <string name="medtronic_pump_bolus_delay">Vertraging voordat Bolus wordt gestart (s)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolus op Pomp (E)</string>
+    <string name="medtronic_pump_max_basal">Max Basaal op Pomp (E/u)</string>
+    <string name="medtronic_pump_encoding">Medtronic Codering</string>
+    <string name="medtronic_pump_frequency_us_ca">VS &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Wereldwijd (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Software 4b6b Codering</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardware 4b6b Codering</string>
+    <string name="medtronic_custom_action_wake_and_tune">Ontwaak en maak verbinding</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Bolus Blok wissen</string>
+    <string name="medtronic_custom_action_reset_rileylink">Reset RileyLink Configuratie</string>
+    <string name="medtronic_pump_battery_select">Batterij type (batterij weergave)</string>
+    <string name="medtronic_pump_battery_no">Niet geselecteerd (Eenvoudige weergave)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaline (uitgebreide weergave)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (uitgebreide weergave)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (uitgebreide weergave)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Uitgebreide weergave)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Behandelingen Debuggen</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_errors">Foutmeldingen</string>
+    <string name="medtronic_error_serial_not_set">Serie# niet ingesteld.</string>
+    <string name="medtronic_error_serial_invalid">Serie# ongeldig.</string>
+    <string name="medtronic_error_pump_type_not_set">Pomp type niet ingesteld.</string>
+    <string name="medtronic_error_pump_type_invalid">Pomp type niet ondersteund.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pomp frequentie niet ingesteld.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pomp frequentie niet ondersteund.</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink adres ongeldig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Gedetecteerde pomp type komt niet overeen met ingestelde pomp type.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">De instelling voor basaalprofielen/patronen is niet ingeschakeld op de pomp. Schakel het in op de pomp.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Basaalprofiel ingesteld op pomp is onjuist (moet STD zijn).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Verkeerde Tijdelijk Basaal-type ingesteld op pomp (moet Insulinesnelh (E/H) zijn).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Verkeerde Max Bolus ingesteld op pomp (moet %1$.2f zijn).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Verkeerde Max Basaal ingesteld op pomp (moet %1$.2f zijn).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Bewerking is niet mogelijk.\n\n Je moet eerst Medtronic Pomp ingesteld hebben, voordat je deze bewerking kunt gebruiken.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Meer dan 24u tijd gevraagd.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">U heeft de Bolus geannuleerd nadat deze werd ingesteld op de Pomp. Aangezien de Medtronic Pump geen ondersteuning biedt voor automatische annulering moet u dit handmatig doen. Zet de Pump daartoe in de Suspend modus en kies vervolgens voor Hervatten (als u nog wilt annuleren). De applicatie zal de wijzigingen oppakken bij de volgende update (in minder dan 5 minuten).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Kan huidige TBR niet lezen.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kan huidige TBR niet annuleren. Bewerking wordt gestopt.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Profiel instellen mislukt omdat de volgende patronen een te groot basaal hebben: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus kon niet worden afgeleverd.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus kon niet worden uitgevoerd omdat de hoeveelheid beschikbare insuline (%1$.2f) niet voldoende is voor de bolus (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR kon niet worden ingesteld.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Kan huidige TBR niet annuleren.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Basaal profiel kon niet worden ingesteld.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basal profiel is hetzelfde, dus het zal niet opnieuw worden ingesteld.</string>
+    <string name="medtronic_cmd_desc_get_history">Ophalen Geschiedenis - Pagina %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Ophalen Geschiedenis - Pagina %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Haal Pomp Tijd op</string>
+    <string name="medtronic_cmd_desc_get_settings">Ophalen Instellingen</string>
+    <string name="medtronic_cmd_desc_get_model">Ophalen Pomp Model</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Ophalen Basaal Profiel</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Instellen Basaal Profiel</string>
+    <string name="medtronic_cmd_desc_get_tbr">Ophalen Tijdelijke Basaal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Instellen Tijdelijke Basaal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Instellen Bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pomp niet bereikbaar</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Pomp tijd bijgewerkt</string>
+</resources>
diff --git a/medtronic/src/main/res/values-pl-rPL/strings.xml b/medtronic/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..045f9fb5df
--- /dev/null
+++ b/medtronic/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integracja pompy Medtronic wymaga urządzenia RileyLink i odpowiedniego modelu pompy</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Numer seryjny pompy</string>
+    <string name="medtronic_pump_type">Typ pompy</string>
+    <string name="medtronic_pump_frequency">Częstotliwość pompy</string>
+    <string name="medtronic_pump_bolus_delay">Opóźnienie przed rozpoczęciem bolusa(s)</string>
+    <string name="medtronic_pump_max_bolus">Max bolus w pompie (U)</string>
+    <string name="medtronic_pump_max_basal">Max dawka bazowa w pompie (U/h)</string>
+    <string name="medtronic_pump_encoding">Kodowanie Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Reszta świata (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Kodowanie oprogramowania 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Kodowanie urządzenia 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Wzbudź i dostrój</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Wyczyść blok bolusa</string>
+    <string name="medtronic_custom_action_reset_rileylink">Przywróć konfigurację RileyLink</string>
+    <string name="medtronic_pump_battery_select">Typ baterii (podgląd mocy)</string>
+    <string name="medtronic_pump_battery_no">Nie wybrany (widok prosty)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaliczne (widok rozszerzony)</string>
+    <string name="medtronic_pump_battery_lithium">Litowe (widok rozszerzony)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (widok rozszerzony)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (widok rozszerzony)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Leczenie - debugowanie</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Numer seryjny # nie ustawiony.</string>
+    <string name="medtronic_error_serial_invalid">Numer seryjny # nieprawidłowy.</string>
+    <string name="medtronic_error_pump_type_not_set">Tyo pompy nie ustawiony.</string>
+    <string name="medtronic_error_pump_type_invalid">Typ pompy nie obsługiwany.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Częstotliwość pompy nie ustawiona.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Częstotliwość pompy nie wspierana.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Adres RileyLink niewłaściwy.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Wykryty typ pompy jest inny niż ustawiony.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Ustawienia bazy/ wzorców nie są włączone w pompie. Włącz je na pompie.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Profil bazowy ustawiony na pompie nie jest właściwy (musi być STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Ustawiony na pompie typ dawki tymczasowej jest niewłaściwy (musi być całkowity - Absolute).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Ustawiony na pompie typ Bolus Maksymalny jest niewłaściwy (musi być %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Ustawiony na pompie typ Bolus Maksymalny jest niewłaściwy (musi być %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">To działanie nie jest możliwe.\n\n Musisz skonfigurować pompę Medtronic Pump, przed uruchomieniem tego działania.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Wymagana jest zmiana ustawień czasu na 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Anulowałeś bolus po jego ustawieniu na pompie. Ponieważ pompa Medtronic nie wspiera polecenia anuluj, musisz wprowadzić zmianę ręcznie. Wprowadź pompę w stan zawieszenia, a następnie przywróć jej działanie (jeżeli wciąż chcesz anulować). Aplikacja pobierze zmiany przy następnym uaktualnieniu (poniżej 5 minut).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Nie udało się odczytać aktualnej dawki tymczasowej (TBR).</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nie udało się anulować aktualnej dawki tymczasowej (TBR). Operacja zatrzymania.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Ustawienia Profilu nie powiodły się ponieważ następująca wartość jest za duża: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Nie udało się dostarczyć bolusa.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nie mógł być dostarczony ponieważ Ilość dostępnej insuliny (%1$.2f) jest mniejsza niż wymagany bolus (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Nie udało się ustawić dawki tymczasowej (TBR).</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Nie udało się anulować bazy tymczasowej (TBR).</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Profil bazy nie został ustawiony.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Profil bazy jest taki sam, więc nie ustawiono ponownie.</string>
+    <string name="medtronic_cmd_desc_get_history">Pobierz historię - strona %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Pobierz historię - strona %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Pobierz czas pompy</string>
+    <string name="medtronic_cmd_desc_get_settings">Pobierz ustawienia</string>
+    <string name="medtronic_cmd_desc_get_model">Pobierz model pompy</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Pobierz profil dawki bazowej</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Ustaw profil dawki bazowej</string>
+    <string name="medtronic_cmd_desc_get_tbr">Pobierz tymczasową dawkę bazową</string>
+    <string name="medtronic_cmd_desc_set_tbr">Ustaw tymczasową dawkę bazową</string>
+    <string name="medtronic_cmd_desc_set_bolus">Ustaw bolus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Czas pompy uaktualniony</string>
+</resources>
diff --git a/medtronic/src/main/res/values-pt-rBR/strings.xml b/medtronic/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..f7ac8fdbb1
--- /dev/null
+++ b/medtronic/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integração de Bombas Medtronic, requer o dispositivo RileyLink e o Modelo de Bomba específico</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Número de série da Bomba</string>
+    <string name="medtronic_pump_type">Tipo de Bomba</string>
+    <string name="medtronic_pump_frequency">Frequência da Bomba</string>
+    <string name="medtronic_pump_bolus_delay">Atraso antes que o Bólus seja iniciado (s)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolus na Bomba (U)</string>
+    <string name="medtronic_pump_max_basal">Máxima Basal na Bomba (U/h)</string>
+    <string name="medtronic_pump_encoding">Codificação Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Codificação de Software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificação de Hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Acordar e Configurar</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Limpar Bloco de Bólus</string>
+    <string name="medtronic_custom_action_reset_rileylink">Redefinir configuração RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipo de Bateria (Visão Detalhada)</string>
+    <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (visão estendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
+    <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Núm. Série não definido.</string>
+    <string name="medtronic_error_serial_invalid">Núm. Série inválido.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipo de Bomba não definido.</string>
+    <string name="medtronic_error_pump_type_invalid">Tipo de Bomba não suportado.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá ativada na bomba. Ative-a na bomba.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler a TBR actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar a TBR atual. A parar a operação.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser entregue.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi entregue, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">TBR não pode ser definida.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar a TBR atual.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
+    <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Obter Histórico - Página %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Obter Hora da Bomba</string>
+    <string name="medtronic_cmd_desc_get_settings">Obter Definições</string>
+    <string name="medtronic_cmd_desc_get_model">Obter Modelo de Bomba</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Obter Perfil Basal</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Definir Perfil Basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obter Basal temporário</string>
+    <string name="medtronic_cmd_desc_set_tbr">Definir Basal temporário</string>
+    <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Hora da bomba actualizada</string>
+</resources>
diff --git a/medtronic/src/main/res/values-pt-rPT/strings.xml b/medtronic/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..34d0748abd
--- /dev/null
+++ b/medtronic/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integração de Bombas Medtronic, requer o dispositivo RileyLink e o Modelo de Bomba específico</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Número de série da Bomba</string>
+    <string name="medtronic_pump_type">Tipo de Bomba</string>
+    <string name="medtronic_pump_frequency">Frequência da Bomba</string>
+    <string name="medtronic_pump_bolus_delay">Atraso antes que o Bólus seja iniciado (s)</string>
+    <string name="medtronic_pump_max_bolus">Max Bolus na Bomba (U)</string>
+    <string name="medtronic_pump_max_basal">Máx Basal na Bomba (U/h)</string>
+    <string name="medtronic_pump_encoding">Codificação Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Codificação de Software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Codificação de Hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Acordar e Configurar</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Limpar Bloco de Bólus</string>
+    <string name="medtronic_custom_action_reset_rileylink">Redefinir configuração RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipo de Bateria (Visão Detalhada)</string>
+    <string name="medtronic_pump_battery_no">Não seleccionado (Visão simples)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalina (Visão estendida)</string>
+    <string name="medtronic_pump_battery_lithium">Lithium (Visão estendida)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Vista Estendida)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
+    <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Núm. Série não definido.</string>
+    <string name="medtronic_error_serial_invalid">Núm. Série inválido.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipo de Bomba não definido.</string>
+    <string name="medtronic_error_pump_type_invalid">Tipo de Bomba não suportado.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Frequência de Bomba não definida.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frequência da Bomba não suportada.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Endereço RileyLink inválido.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">A bomba detectada não é a mesma que a bomba configurada.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">A configuração de perfis/padrões da basal não éstá atcivada na bomba. Active-a na bomba.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Perfil Basal definido na Bomba está incorrecto (deve ser STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tipo de DBT errado definido na bomba (deve ser Absoluto).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Máx. Basal definida na Bomba está incorreta (deve ser %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Máx. Basal definido errado na Bomba (deve ser %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operação não é possível.\n\n Você precisa configurar a Bomba Medtronic antes de poder usar esta operação.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Solicitada uma alteração de tempo de mais de 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Não foi possível cancelar o DBT actual. A parar a operação.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Falhou Definir Perfil devido aos seguintes padrões, tem uma taxa de basal muito grande: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">O bólus não pôde ser administrado.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bólus não foi administado, porque o quantidade de insulina disponível (%1$.2f) é menor que o bólus necessário (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">DBT não pode ser definido.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Não foi possível cancelar o DBT actual.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Perfil Basal não pôde ser definido.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Perfil Basal é o mesmo, então não será definido novamente.</string>
+    <string name="medtronic_cmd_desc_get_history">Obter Histórico - Página %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Obter Histórico - Página %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Obter Hora da Bomba</string>
+    <string name="medtronic_cmd_desc_get_settings">Obter Definições</string>
+    <string name="medtronic_cmd_desc_get_model">Obter Modelo de Bomba</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Obter Perfil Basal</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Definir Perfil Basal</string>
+    <string name="medtronic_cmd_desc_get_tbr">Obter Basal Temporária</string>
+    <string name="medtronic_cmd_desc_set_tbr">Definir Basal Temporária</string>
+    <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Hora da bomba actualizada</string>
+</resources>
diff --git a/medtronic/src/main/res/values-ro-rRO/strings.xml b/medtronic/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..0aede41421
--- /dev/null
+++ b/medtronic/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pentru asocierea cu pompa Medtronic este necesar un dispozitiv RileyLink și un anumit model de pompă</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Număr serial pompă</string>
+    <string name="medtronic_pump_type">Tip pompă</string>
+    <string name="medtronic_pump_frequency">Frecvență pompă</string>
+    <string name="medtronic_pump_bolus_delay">Întârziere până la pornirea bolusului (s)</string>
+    <string name="medtronic_pump_max_bolus">Bolusul maxim în pompă (U)</string>
+    <string name="medtronic_pump_max_basal">Bazală maximă în pompă (U/h)</string>
+    <string name="medtronic_pump_encoding">Criptare Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Globală (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Criptare software 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Criptare hardware 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Pornește și sincronizează</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Șterge blocajul de bolus</string>
+    <string name="medtronic_custom_action_reset_rileylink">Resetează configurația RileyLink</string>
+    <string name="medtronic_pump_battery_select">Tipul bateriei (Afișare avansată)</string>
+    <string name="medtronic_pump_battery_no">Fără selecție (Afișare simplificată)</string>
+    <string name="medtronic_pump_battery_alkaline">Alcalină (Afișare extinsă)</string>
+    <string name="medtronic_pump_battery_lithium">Litiu (Afișare extinsă)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Afișare extinsă)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Afișare extinsă)</string>
+    <string name="medtronic_bolus_debugging">Depanare Bolus/Tratamente</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_errors">Erori</string>
+    <string name="medtronic_error_serial_not_set">Număr serial nesetat.</string>
+    <string name="medtronic_error_serial_invalid">Număr serial invalid.</string>
+    <string name="medtronic_error_pump_type_not_set">Tipul pompei nesetat.</string>
+    <string name="medtronic_error_pump_type_invalid">Tip de pompă nesuportat.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Frecvența pompei nesetată.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Frecvența pompei nesuportată.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Adresa RileyLink invalidă.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Tipul de pompă detectat nu corespunde cu cel configurat.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Setările de profil/șablon bazale nu sunt activate în pompă. Vă rugăm să le activați din pompă.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Tipul de profil bazal setat în pompă este incorect (trebuie să fie STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Tip incorect de RBT setat în pompă (trebuie să fie Absolut).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Bolus maxim setat incorect în pompă (trebuie să fie %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Bazala maximă setată incorect în pompă (trebuie să fie %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operațiune imposibilă. \n\n Trebui să configurați mai întâi pompa Medtronic înainte de a face această operație.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">S-a solicitat o schimbare de oră mai mare de 24 de ore.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Istoric pompă Medtronic</string>
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Ați anulat un bolus după ce a fost deja transmis către pompă. Deoarece pompa Medtronic nu permite o anulare de bolus, va trebui să faceți acest lucru în mod manual, din pompă. Puneți pompa în modul Suspend și apoi Repornire (dacă totuși doriți să anulați bolusul). Aplicația se va sincroniza automat cu pompa la următoarea contactare a acesteia (în mai puțin de 5 minute).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Nu a putut fi citită RBT.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nu a putut fi anulată RBT curentă. Se oprește operațiunea de anulare.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Stabilirea profilului a eșuat deoarece, pe baza modelelor, aveți o rată bazală prea mare: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolusul nu a putut fi livrat.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolusul nu a putut fi livrat deoarece cantitatea de insulină din rezervor (%1$.2f) este mai mică decât cea necesară (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">RBT nu a putut fi setată.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Nu a putut fi anulată RBT curentă.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Profilul bazal nu a putut fi stabilit.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Profilul bazal existent deja este existent, nu va fi reintrodus.</string>
+    <string name="medtronic_cmd_desc_get_history">Preia istoricul - Pagina %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Preia istoricul - Pagina %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Preia timpul din pompă</string>
+    <string name="medtronic_cmd_desc_get_settings">Preia setările</string>
+    <string name="medtronic_cmd_desc_get_model">Preia modelul de pompă</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Preia profilul bazalelor</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Setează profilul bazalelor</string>
+    <string name="medtronic_cmd_desc_get_tbr">Preia bazala temporară</string>
+    <string name="medtronic_cmd_desc_set_tbr">Setează bazala temporară</string>
+    <string name="medtronic_cmd_desc_set_bolus">Setează bolusul</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompă indisponibilă</string>
+    <string name="medtronic_warning">Atenție</string>
+    <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Acum</string>
+    <!-- combo_pump_connected_now -->
+    <string name="ago">în trecut</string>
+    <string name="medtronic_notification_check_time_date">Ceasul pompei trebuie ajustat</string>
+    <!-- combo_notification_check_time_date -->
+    <string name="common_on">Pornit</string>
+    <string name="common_off">Oprit</string>
+    <string name="pump_time_updated">Timpul din pompă a fost actualizat</string>
+</resources>
diff --git a/medtronic/src/main/res/values-ru-rRU/strings.xml b/medtronic/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..853ba13e07
--- /dev/null
+++ b/medtronic/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Интеграция с помпой Medtronic требует устройства RileyLink и специфическую модель помпы</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Серийный номер помы</string>
+    <string name="medtronic_pump_type">Тип помпы</string>
+    <string name="medtronic_pump_frequency">Частота помпы</string>
+    <string name="medtronic_pump_bolus_delay">Задержка перед подачей болюса (с) начата</string>
+    <string name="medtronic_pump_max_bolus">Макс. болюс на помпе (ед)</string>
+    <string name="medtronic_pump_max_basal">Макс. базал на помпе (ед/ч)</string>
+    <string name="medtronic_pump_encoding">Кодировка Medtronic</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Глобальн (868 Мгц)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Программное 4b6b кодирование</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Аппаратное кодирование 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Пробудить и настроить</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Очистить блок болюса</string>
+    <string name="medtronic_custom_action_reset_rileylink">Сбросить конфигурацию RileyLink</string>
+    <string name="medtronic_pump_battery_select">Тип батареи (по мощности)</string>
+    <string name="medtronic_pump_battery_no">Не выбрано (Простой вид)</string>
+    <string name="medtronic_pump_battery_alkaline">Щелочная (Подробный вид)</string>
+    <string name="medtronic_pump_battery_lithium">Литиевая (Подробный вид)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Подробный вид)</string>
+    <string name="medtronic_pump_battery_nimh">Никель-металлогидридная (подробно)</string>
+    <string name="medtronic_bolus_debugging">Отладка Болюс/Назначения</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_errors">Ошибки</string>
+    <string name="medtronic_error_serial_not_set">Серийный # не задан.</string>
+    <string name="medtronic_error_serial_invalid">Серийный # неверный.</string>
+    <string name="medtronic_error_pump_type_not_set">Тип помпы не задан.</string>
+    <string name="medtronic_error_pump_type_invalid">Тип помпы не поддерживается.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Частота помпы не задана.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Частота помпы не поддерживается.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Недопустимый адрес RileyLink.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Обнаруженный тип помпы не соответствует настроенному.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Базальные профили/настройки шаблонов не включены в помпе. Включите их на помпе.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Базовый профиль на помпе неверный (должен быть STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Неверный тип временной скорости базала TBR на помпе (должен быть Absolute).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">На помпе задан неверный макс болюс (должен быть %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">На помпе задан неверный макс базал (должен быть %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Операция невозможна.\n\n Сначала нужно настроить помпу Medtronic.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Запрошено изменение времени свыше 24 часов.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Вы отменили болюс после того как он был задан на помпе. Поскольку помпа Medtronic не поддерживает отмену, нужно отменить его вручную. Переведите помпу в режим приостановки и затем сделайте Resume (если все еще хотите отменить). Приложение примет изменения при следующем обновлении (менее чем через 5 минут).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Не удалось прочитать текущий врем. базал TBR.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Не удалось отменить текущий врем базал TBR. Остановка операции.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Не удалось установить профиль потому что следующие шаблоны имеют слишком большой базал %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Болюс не подан.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Болюс не подан т.к. доступное количество инсулина (%1$.2f) меньше, чем требуемый болюс (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Врем базал TBR не задан.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Не удалось отменить текущий врем базал TBR.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Профиль базала не установлен.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Базовый профиль идентичен, он не будет задан повторно.</string>
+    <string name="medtronic_cmd_desc_get_history">Получить историю - страница %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Получить историю - страница %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Получить время с помпы</string>
+    <string name="medtronic_cmd_desc_get_settings">Получить настройки</string>
+    <string name="medtronic_cmd_desc_get_model">Получить модель помпы</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Получить профиль базала</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Установить профиль базала</string>
+    <string name="medtronic_cmd_desc_get_tbr">Получить временный базал</string>
+    <string name="medtronic_cmd_desc_set_tbr">Установить временный базал</string>
+    <string name="medtronic_cmd_desc_set_bolus">Настроить болюс</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Время на помпе обновлено</string>
+</resources>
diff --git a/medtronic/src/main/res/values-sk-rSK/strings.xml b/medtronic/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..d98995ac13
--- /dev/null
+++ b/medtronic/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Integrácia pre pumpu Medtronic, požaduje sa RileyLink zariadenie a špecifický model pumpy.</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Sériové číslo pumpy</string>
+    <string name="medtronic_pump_type">Typ pumpy</string>
+    <string name="medtronic_pump_frequency">Frekvencia pumpy</string>
+    <string name="medtronic_pump_bolus_delay">Oneskorenie pred podaním bolusu (s)</string>
+    <string name="medtronic_pump_max_bolus">Max. bolus v pumpe (U)</string>
+    <string name="medtronic_pump_max_basal">Max. bazál v pumpe (U/h)</string>
+    <string name="medtronic_pump_encoding">Medtronic kódovanie</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Celosvetovo (868 MHz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">Softvérové kódovanie 4b6b</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">Hardvérové kódovanie 4b6b</string>
+    <string name="medtronic_custom_action_wake_and_tune">Prebudenie a prispôsobenie</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Odstránenie blokovania bolusu</string>
+    <string name="medtronic_custom_action_reset_rileylink">Resetovať konfiguráciu RileyLinku</string>
+    <string name="medtronic_pump_battery_select">Typ batérie (Zobrazenie napájania)</string>
+    <string name="medtronic_pump_battery_no">Nevybrané (jednoduché zobrazenie)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkalické (rozšírené zobrazenie)</string>
+    <string name="medtronic_pump_battery_lithium">Líthiové (rozšírené zobrazenie)</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (Rozšírené)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (Rozšírené zobrazenie)</string>
+    <string name="medtronic_bolus_debugging">Bolus/Ošetrenia ladenie</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Sériové číslo nenastavené.</string>
+    <string name="medtronic_error_serial_invalid">Sériové číslo neplatné.</string>
+    <string name="medtronic_error_pump_type_not_set">Nenastavený typ pumpy.</string>
+    <string name="medtronic_error_pump_type_invalid">Nepodporovaný typ pumpy.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Nenastavená frekvencia pumpy.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Nepodporovaná frekvencia pumpy.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Neplatná adresa RileyLinku.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Rozpoznaná pumpa je iného typu než nakonfigurovaná.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Nastavenie bazálnych profilov/vzorov nie je na pumpe povolené. Povoľte ich na pumpe.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Bazálny profil na pumpe je chybný (musí byť STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Chybný typ dočasného bazálu na pumpe (musí byť absolútny).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Chybný max. bolus na pumpe (musí byť %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Chybný max. bazál na pumpe (musí byť %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operácia nie je možná.\n\nNajskôr je nutné nakonfigurovať pumpu, než bude možné túto funkciu použiť.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Požadovaná zmena času väčšia ako 24h.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Zrušili ste bolus po tom, čo bol nastavený na pumpe. Pretože Medtronic nepodporuje zrušenie bolusu, musíte ho zrušiť ručne. Pozastavte pumpu a znovu spustite (pokiaľ naďalej trváte na zrušení). Aplikácia prevezme zmeny pri ďalšom pripojení (do 5 min).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Nie je možné načítať aktuálny dočasný bazál.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Nie je možné zastaviť aktuálny dočasný bazál. Ukončujem operáciu.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Nastavenie profilu zlyhalo, pretože následujúce hodnoty bazálu, sú príliš vysoké: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus nemohol byť podaný.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Bolus nebolo možné podať, pretože dostupné množstvo inzulínu (%1$.2f) je menšie než požadovaný bolus (%2$.2f).</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Dočasný bazál nemohol byť nastavený.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Aktuálny dočasný bazál nemohol byť zrušený.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Bazálny profil nemohol byť nastavený.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Bazálny profil je rovnaký, takže nebude znovu nastavený.</string>
+    <string name="medtronic_cmd_desc_get_history">Načítanie histórie - Strana %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Načítanie histórie - Strana %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Načítanie času pumpy</string>
+    <string name="medtronic_cmd_desc_get_settings">Načítanie nastavení</string>
+    <string name="medtronic_cmd_desc_get_model">Načítanie modelu pumpy</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Načítanie bazálneho profilu</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Nastavovanie bazálneho profilu</string>
+    <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
+</resources>
diff --git a/medtronic/src/main/res/values-sl-rSI/strings.xml b/medtronic/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..e370c4a256
--- /dev/null
+++ b/medtronic/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+</resources>
diff --git a/medtronic/src/main/res/values-sv-rSE/strings.xml b/medtronic/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..c87bb96889
--- /dev/null
+++ b/medtronic/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Pumpintegration för Medtronic. Kräver Riley Link-enhet och fungerar bara mot vissa pumpmodeller</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">Serienummer på pumpen</string>
+    <string name="medtronic_pump_type">Pumptyp</string>
+    <string name="medtronic_pump_frequency">Pumpfrekvens</string>
+    <string name="medtronic_pump_bolus_delay">Fördröjning innan bolus startas (s)</string>
+    <string name="medtronic_pump_max_bolus">Max bolus enligt pumpen (U)</string>
+    <string name="medtronic_pump_max_basal">Max basal på pumpen (U/h)</string>
+    <string name="medtronic_pump_encoding">Medtronickodning</string>
+    <string name="medtronic_pump_frequency_us_ca">USA &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Resten av världen (868 MHz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">4b6b Mjukvarukodning</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">4b6b Hårdvarukodning</string>
+    <string name="medtronic_custom_action_wake_and_tune">Väck och finjustera frekvens</string>
+    <string name="medtronic_custom_action_clear_bolus_block">Ta bort bolusblockering</string>
+    <string name="medtronic_custom_action_reset_rileylink">Återställ Riley Link-konfiguration</string>
+    <string name="medtronic_pump_battery_select">Batterityp</string>
+    <string name="medtronic_pump_battery_no">Ej vald</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaliskt</string>
+    <string name="medtronic_pump_battery_lithium">Litium</string>
+    <string name="medtronic_pump_battery_nizn">NiZn (utökad vy)</string>
+    <string name="medtronic_pump_battery_nimh">NiMH (utökad vy)</string>
+    <string name="medtronic_bolus_debugging">Avlusning av Bolus/Behandlingar</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">Serienummer ej angett.</string>
+    <string name="medtronic_error_serial_invalid">Serienummer felaktigt.</string>
+    <string name="medtronic_error_pump_type_not_set">Pumptyp ej vald.</string>
+    <string name="medtronic_error_pump_type_invalid">Pumptypen stöds inte.</string>
+    <string name="medtronic_error_pump_frequency_not_set">Pumpfrekvens ej vald.</string>
+    <string name="medtronic_error_pump_frequency_invalid">Pumpfrekvens stöds inte.</string>
+    <string name="medtronic_error_rileylink_address_invalid">Riley Link adress felaktig.</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">Pumptypen verkar inte vara samma som den inställda.</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">Basalprofiler är inte aktiverade på pumpen. Aktivera det i pumpens menyer.</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">Fel basalprofiltyp inställt på pumpen (måste vara STD).</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">Fel typ av temp basal på pumpen (måste vara satt till Absolut).</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Fel max bolus i pumpen (måste vara %1$.2f).</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">Fel max basal i pumpen (måste vara %1$.2f).</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">Operationen inte möjlig. \n\n Du måste konfigurera Medtronicpump innan du kan använda denna funktion.</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">Mer än 24 timmars tidsändring efterfrågades.</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">Du avbröt bolusen efter att kommandot skickats till pumpen. Detta stöds inte av Medtronicpumpar, så därför måste du avbryta på själva pumpen. Det kan man göra genom att pausa insulintillförseln tillfälligt och sedan starta den igen. Appen kommer att uppdatera bolusmängd vid nästa anslutning (inom 5 min).</string>
+    <string name="medtronic_cmd_cant_read_tbr">Kunde inte hämta nuvarande temp basal.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Kunde inte avbryta nuvarande temp basal. Avbryter kommandot.</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Misslyckades med att sätta basalprofilen. Följande timmar har för högt värde angivet: %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">Bolus misslyckades.</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">En bolus om %2$.2f enheter kan inte levereras när reservoaren bara innehåller %1$.2f enheter.</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">Temp basal kunde inte anges.</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">Kunde inte avbryta temp basal.</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">Kunde inte byta basalprofil.</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">Basalprofilen är samma som nuvarande. Ingen ändring gjord.</string>
+    <string name="medtronic_cmd_desc_get_history">Hämta historik - Sida %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">Hämta historik - Sida %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">Hämta tid och datum från pumpen</string>
+    <string name="medtronic_cmd_desc_get_settings">Hämta inställningar</string>
+    <string name="medtronic_cmd_desc_get_model">Hämta pumpmodell</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">Hämta basalprofil</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">Sätt basalprofil</string>
+    <string name="medtronic_cmd_desc_get_tbr">Hämta temp basal</string>
+    <string name="medtronic_cmd_desc_set_tbr">Sätt temp basal</string>
+    <string name="medtronic_cmd_desc_set_bolus">Leverera bolus</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Tiden uppdaterad i pumpen</string>
+</resources>
diff --git a/medtronic/src/main/res/values-tr-rTR/strings.xml b/medtronic/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..1dd4998375
--- /dev/null
+++ b/medtronic/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <!-- MDT Configuration -->
+    <!-- MDT Errors -->
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">Pompa zamanı güncellendi</string>
+</resources>
diff --git a/medtronic/src/main/res/values-zh-rCN/strings.xml b/medtronic/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..733d0974a0
--- /dev/null
+++ b/medtronic/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Medtronic (MDT) - Base -->
+    <string name="description_pump_medtronic">Medtronic 泵的集成，需要 RileyLink 设备和特定泵模型</string>
+    <!-- MDT Configuration -->
+    <string name="medtronic_serial_number">泵序列号</string>
+    <string name="medtronic_pump_type">泵类型</string>
+    <string name="medtronic_pump_frequency">泵频率</string>
+    <string name="medtronic_pump_bolus_delay">启动大剂量之前的延迟。</string>
+    <string name="medtronic_pump_max_bolus">泵上的最大大剂量（U）</string>
+    <string name="medtronic_pump_max_basal">泵上的最大基础率(U/h)</string>
+    <string name="medtronic_pump_encoding">Medtronic公司的编码</string>
+    <string name="medtronic_pump_frequency_us_ca">美国 &amp; 加拿大 (916MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">全球 (868 Mhz)</string>
+    <string name="medtronic_pump_encoding_4b6b_local">软件 4b6b 编码</string>
+    <string name="medtronic_pump_encoding_4b6b_rileylink">硬件 4b6b 编码</string>
+    <string name="medtronic_custom_action_wake_and_tune">唤醒和调整</string>
+    <string name="medtronic_custom_action_clear_bolus_block">清除大剂量锁定</string>
+    <string name="medtronic_custom_action_reset_rileylink">重置 RileyLink 配置</string>
+    <string name="medtronic_pump_battery_select">电池类型 (电源视图)</string>
+    <string name="medtronic_pump_battery_no">未选择 (简单视图)</string>
+    <string name="medtronic_pump_battery_alkaline">Alkaline (扩展视图)</string>
+    <string name="medtronic_pump_battery_lithium">锂(扩展视图)</string>
+    <string name="medtronic_pump_battery_nizn">锂(扩展视图)</string>
+    <string name="medtronic_bolus_debugging">大剂量/治疗调试</string>
+    <!-- MDT Errors -->
+    <string name="medtronic_error_serial_not_set">未设置序列号。</string>
+    <string name="medtronic_error_serial_invalid">序列号无效。</string>
+    <string name="medtronic_error_pump_type_not_set">未设置泵类型。</string>
+    <string name="medtronic_error_pump_type_invalid">不支持该泵类型。</string>
+    <string name="medtronic_error_pump_frequency_not_set">未设置泵频率。</string>
+    <string name="medtronic_error_pump_frequency_invalid">不支持该泵类型。</string>
+    <string name="medtronic_error_rileylink_address_invalid">RileyLink 地址无效。</string>
+    <string name="medtronic_error_pump_type_set_differs_from_detected">检测到的泵类型与配置的类型不同。</string>
+    <string name="medtronic_error_pump_basal_profiles_not_enabled">在泵上未启用 基础率配置文件/模式设置。 请在泵上启用。</string>
+    <string name="medtronic_error_pump_incorrect_basal_profile_selected">泵上设置的基础率配置文件不正确 (必须为 STD)。</string>
+    <string name="medtronic_error_pump_wrong_tbr_type_set">在泵上设置了错误的 TBR 类型 (必须是绝对 ) 。</string>
+    <string name="medtronic_error_pump_wrong_max_bolus_set">Pump 上设置的错误的最大大剂量数 (必须为 %1$.2f)。</string>
+    <string name="medtronic_error_pump_wrong_max_basal_set">泵上设置的错误的最大大剂量数 (必须为 %1$.2f)。</string>
+    <string name="medtronic_error_operation_not_possible_no_configuration">操作是不可能的。\n\n 您首先需要配置美敦力泵 ，然后才能使用此操作。</string>
+    <string name="medtronic_error_pump_24h_time_change_requested">请求了超过 24 小时的时间更改。</string>
+    <!-- MDT History -->
+    <!--    <string name="medtronic_history_group_basal">Basals</string>-->
+    <!--    <string name="medtronic_history_group_configuration">Configurations</string>-->
+    <!--    <string name="medtronic_history_group_notification">Notifications</string>-->
+    <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
+    <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
+    <!--    <string name="medtronic_history_group_all">All</string>-->
+    <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
+    <string name="medtronic_cmd_cancel_bolus_not_supported">大剂量在泵上设置之后，取消大剂量。由于 美敦力泵 不支持取消，因此您需要手动将其取消。 将泵置于暂停状态，然后执行恢复 (如果仍要取消)。 应用程序将在下次更新 ( 不到 5 分钟) 中提取更改。</string>
+    <string name="medtronic_cmd_cant_read_tbr">无法读取当前 TBR。</string>
+    <string name="medtronic_cmd_cant_cancel_tbr_stop_op">无法取消当前 TBR。 停止操作。</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">配置文件设置失败，因为如下的设置，有太大的基础率： %1$s</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered">大剂量无法输注</string>
+    <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">无法输注大剂量，因为可用胰岛素量 (%1$.2f) 小于所需胰岛素 (%2$.2f)。</string>
+    <string name="medtronic_cmd_tbr_could_not_be_delivered">无法设置 TBR。</string>
+    <string name="medtronic_cmd_cant_cancel_tbr">无法取消当前 TBR。</string>
+    <string name="medtronic_cmd_basal_profile_could_not_be_set">基础率配置文件无法设置。</string>
+    <string name="medtronic_cmd_basal_profile_not_set_is_same">基础率配置文件是相同的，所以它不会被再次设置。</string>
+    <string name="medtronic_cmd_desc_get_history">获取历史记录 - 页面 %1$d (%2$d/16)</string>
+    <string name="medtronic_cmd_desc_get_history_request">获取历史记录 - 页面 %1$d</string>
+    <string name="medtronic_cmd_desc_get_time">获取泵时间</string>
+    <string name="medtronic_cmd_desc_get_settings">获取设置</string>
+    <string name="medtronic_cmd_desc_get_model">获取泵模式</string>
+    <string name="medtronic_cmd_desc_get_basal_profile">获得基础率</string>
+    <string name="medtronic_cmd_desc_set_basal_profile">获得基础率配置文件</string>
+    <string name="medtronic_cmd_desc_get_tbr">获取临时基础率</string>
+    <string name="medtronic_cmd_desc_set_tbr">设置临时基础率</string>
+    <string name="medtronic_cmd_desc_set_bolus">设置大剂量</string>
+    <!-- medtronic_warning -->
+    <!-- combo_pump_connected_now -->
+    <!-- combo_notification_check_time_date -->
+    <string name="pump_time_updated">泵时间已经更新</string>
+</resources>
diff --git a/rileylink/src/main/res/values-af-rZA/strings.xml b/rileylink/src/main/res/values-af-rZA/strings.xml
new file mode 100644
index 0000000000..e6112f8f89
--- /dev/null
+++ b/rileylink/src/main/res/values-af-rZA/strings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SKAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Verkose</string>
+    <string name="rileylink_scanner_title">RileyLink Skan</string>
+    <string name="location_yes">Aktiveer</string>
+    <string name="rileylink_scanner_scanning">Skandeer</string>
+    <string name="rileylink_scanner_scanning_finished">Skandering voltooi</string>
+    <string name="rileylink_scanner_scanning_error">Skaderings fout: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Instellings</string>
+    <string name="rileylink_settings_tab2">Geskiedenis</string>
+    <string name="rileylink_status">RileyLink Status</string>
+    <string name="medtronic_pump_status">Pomp Status</string>
+    <string name="title_activity_rileylink_settings">RileyLink Instellings</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Adres opgestel</string>
+    <string name="rileylink_connected_device">Gekoppelde toestel</string>
+    <string name="rileylink_connection_status">Verbindingstatus</string>
+    <string name="rileylink_connection_error">Verbindingsfout</string>
+    <string name="rileylink_device">Toestel</string>
+    <string name="rileylink_device_type">Toestel Tipe</string>
+    <string name="rileylink_device_model">Toestel Model</string>
+    <string name="rileylink_last_used_frequency">Laaste gebruik frekwensie</string>
+    <string name="rileylink_last_device_contact">Laaste toestel verbinding</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth Inisiasie…</string>
+    <string name="rileylink_state_bt_error">Bluetooth Fout</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Gereed</string>
+    <string name="rileylink_state_not_started">Nie Begin</string>
+    <string name="rileylink_state_rl_init">RileyLink inisiasie…</string>
+    <string name="rileylink_state_rl_error">RileyLink Fout</string>
+    <string name="rileylink_state_pc_error">Probleel om met pomp te praat</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Toestel is nie RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink onverkry</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth afgeskakel</string>
+    <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Toestel</string>
+    <string name="rileylink_error_tuneup_failed">Opstel het gefaal</string>
+    <string name="rileylink_error_pod_unreachable">Pod onbereikbaar</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Wêreldwyd (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-ar-rSA/strings.xml b/rileylink/src/main/res/values-ar-rSA/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-ar-rSA/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-bg-rBG/strings.xml b/rileylink/src/main/res/values-bg-rBG/strings.xml
new file mode 100644
index 0000000000..ef23a7a9fe
--- /dev/null
+++ b/rileylink/src/main/res/values-bg-rBG/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">СКАНИРАЙ</string>
+    <string name="rileylink_scanner_scan_stop">СТОП</string>
+    <string name="rileylink_scanner_selected_device">Избрано</string>
+    <string name="rileylink_scanner_title">RileyLink скенер</string>
+    <string name="location_yes">Разреши</string>
+    <string name="rileylink_scanner_scanning">Сканиране</string>
+    <string name="rileylink_scanner_scanning_finished">Завършено сканиране</string>
+    <string name="rileylink_scanner_scanning_error">Грешка при сканиране: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Настройки</string>
+    <string name="rileylink_settings_tab2">История</string>
+    <string name="rileylink_status">RileyLink статус</string>
+    <string name="medtronic_pump_status">Статус на помпата</string>
+    <string name="title_activity_rileylink_settings">RileyLink настройки</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Конфигуриран адрес</string>
+    <string name="rileylink_connected_device">Свързано устройство</string>
+    <string name="rileylink_connection_status">Състояние на връзката</string>
+    <string name="rileylink_connection_error">Грешка при свързване</string>
+    <string name="rileylink_device">Устройство</string>
+    <string name="rileylink_device_type">Тип на устройството</string>
+    <string name="rileylink_device_model">Модел</string>
+    <string name="rileylink_last_used_frequency">Последна честота</string>
+    <string name="rileylink_last_device_contact">Последно устройство</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth стартиране…</string>
+    <string name="rileylink_state_bt_error">Bluetooth грешка</string>
+    <string name="rileylink_state_bt_ready">Bluetooth готов</string>
+    <string name="rileylink_state_not_started">Не е стартиран</string>
+    <string name="rileylink_state_rl_init">RileyLink стартиране…</string>
+    <string name="rileylink_state_rl_error">RileyLink грешка</string>
+    <string name="rileylink_state_pc_tune_up">Настройка на RileyLink и помпа</string>
+    <string name="rileylink_state_pc_error">Проблем при връзка с помпата</string>
+    <string name="rileylink_state_connected">Свързан</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Устройството не е RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink недостъпен</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth е изключен</string>
+    <string name="rileylink_error_no_bt_adapter">Няма Bluetooth адаптер</string>
+    <string name="rileylink_error_tuneup_failed">Настройката се провали</string>
+    <string name="rileylink_error_pod_unreachable">Pod е недостъпen</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic помпа</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">САЩ &amp; Канада (916 Mhz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Останалата част от света (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-cs-rCZ/strings.xml b/rileylink/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000000..c783684d10
--- /dev/null
+++ b/rileylink/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">VYHLEDAT</string>
+    <string name="rileylink_scanner_scan_stop">ZASTAVIT</string>
+    <string name="rileylink_scanner_selected_device">Vybráno</string>
+    <string name="rileylink_scanner_title">Vyhledávání RileyLinku</string>
+    <string name="location_yes">Povolit</string>
+    <string name="location_no">Ne</string>
+    <string name="rileylink_scanner_scanning">Vyhledávání</string>
+    <string name="rileylink_scanner_scanning_finished">Vyhledávání dokončeno</string>
+    <string name="rileylink_scanner_scanning_error">Chyba při vyhledávání: %1$d</string>
+    <string name="common_never">Nikdy</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Nastavení</string>
+    <string name="rileylink_settings_tab2">Historie</string>
+    <string name="rileylink_status">Status RileyLink</string>
+    <string name="medtronic_pump_status">Stav pumpy</string>
+    <string name="title_activity_rileylink_settings">Nastavení RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Nastavená adresa</string>
+    <string name="rileylink_connected_device">Připojené zařízení</string>
+    <string name="rileylink_connection_status">Stav připojení</string>
+    <string name="rileylink_connection_error">Chyba spojení</string>
+    <string name="rileylink_device">Zařízení</string>
+    <string name="rileylink_device_type">Typ zařízení</string>
+    <string name="rileylink_device_model">Model zařízení</string>
+    <string name="rileylink_last_used_frequency">Poslední použitá frekvence</string>
+    <string name="rileylink_last_device_contact">Poslední spojení se zařízením</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth se incializuje…</string>
+    <string name="rileylink_state_bt_error">Chyba Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth připraven</string>
+    <string name="rileylink_state_not_started">Nezahájeno</string>
+    <string name="rileylink_state_rl_init">RileyLink inicializace…</string>
+    <string name="rileylink_state_rl_error">Chyba RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Spojování RileyLinku a pumpy</string>
+    <string name="rileylink_state_pc_error">Problém připojení k pumpě</string>
+    <string name="rileylink_state_connected">Připojeno</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Zařízení není RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink nedostupný</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth je zakázáno</string>
+    <string name="rileylink_error_no_bt_adapter">Žádný Bluetooth adaptér</string>
+    <string name="rileylink_error_tuneup_failed">Spojování selhalo</string>
+    <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
+    <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omipod</string>
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Celosvětové (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d den</item>
+        <item quantity="few">%1$d dnů</item>
+        <item quantity="many">%1$d dnů</item>
+        <item quantity="other">%1$d dnů</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hodina</item>
+        <item quantity="few">%1$d hodin</item>
+        <item quantity="many">%1$d hodin</item>
+        <item quantity="other">%1$d hodin</item>
+    </plurals>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-cy-rGB/strings.xml b/rileylink/src/main/res/values-cy-rGB/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-cy-rGB/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-de-rDE/strings.xml b/rileylink/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 0000000000..f286f3c0e6
--- /dev/null
+++ b/rileylink/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCANNEN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Ausgewählt</string>
+    <string name="rileylink_scanner_title">RileyLink Scan</string>
+    <string name="location_yes">Aktivieren</string>
+    <string name="rileylink_scanner_scanning">Scannt</string>
+    <string name="rileylink_scanner_scanning_finished">Scannen abgeschlossen</string>
+    <string name="rileylink_scanner_scanning_error">Scanfehler: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Einstellungen</string>
+    <string name="rileylink_settings_tab2">Verlauf</string>
+    <string name="rileylink_status">RileyLink Status</string>
+    <string name="medtronic_pump_status">Pumpen-Status</string>
+    <string name="title_activity_rileylink_settings">RileyLink Einstellungen</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Konfigurierte Adresse</string>
+    <string name="rileylink_connected_device">Verbundenes Gerät</string>
+    <string name="rileylink_connection_status">Verbindungsstatus</string>
+    <string name="rileylink_connection_error">Verbindungsfehler</string>
+    <string name="rileylink_device">Gerät</string>
+    <string name="rileylink_device_type">Geräte-Typ</string>
+    <string name="rileylink_device_model">Gerätemodell</string>
+    <string name="rileylink_last_used_frequency">Zuletzt verwendete Frequenz</string>
+    <string name="rileylink_last_device_contact">Letzter Gerätekontakt</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Initialisiere Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Bluetooth-Fehler</string>
+    <string name="rileylink_state_bt_ready">Bluetooth bereit</string>
+    <string name="rileylink_state_not_started">Nicht gestartet</string>
+    <string name="rileylink_state_rl_init">RileyLink Initialisierung…</string>
+    <string name="rileylink_state_rl_error">RileyLink Fehler</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink und Pumpe einstellen</string>
+    <string name="rileylink_state_pc_error">Problem beim Verbinden mit Pumpe</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Gerät ist kein RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink nicht erreichbar</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth ist deaktiviert</string>
+    <string name="rileylink_error_no_bt_adapter">Kein Bluetooth-Adapter</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp fehlgeschlagen</string>
+    <string name="rileylink_error_pod_unreachable">Pod nicht erreichbar</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic Pumpe</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Weltweit (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-el-rGR/strings.xml b/rileylink/src/main/res/values-el-rGR/strings.xml
new file mode 100644
index 0000000000..e21fe991ef
--- /dev/null
+++ b/rileylink/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Επιλεγμένο</string>
+    <string name="rileylink_scanner_title">RileyLink Scan</string>
+    <string name="location_yes">Ενεργοποίηση</string>
+    <string name="rileylink_scanner_scanning">Σάρωση</string>
+    <string name="rileylink_scanner_scanning_finished">Η σάρωση ολοκληρώθηκε</string>
+    <string name="rileylink_scanner_scanning_error">Λάθος σάρωσης: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Ρυθμίσεις</string>
+    <string name="rileylink_settings_tab2">Ιστορικό</string>
+    <string name="rileylink_status">Κατάσταση RileyLink</string>
+    <string name="medtronic_pump_status">Κατάσταση Αντλίας</string>
+    <string name="title_activity_rileylink_settings">Ρυθμίσεις RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Διαμορφωμένη Διεύθυνση</string>
+    <string name="rileylink_connected_device">Συνδεδεμένες συσκευές</string>
+    <string name="rileylink_connection_status">Κατάσταση Σύνδεσης</string>
+    <string name="rileylink_connection_error">Σφάλμα σύνδεσης</string>
+    <string name="rileylink_device">Συσκευή</string>
+    <string name="rileylink_device_type">Τύπος Συσκευής</string>
+    <string name="rileylink_device_model">Μοντέλο συσκευής</string>
+    <string name="rileylink_last_used_frequency">Τελευταία χρησιμοποιημένη συχνότητα</string>
+    <string name="rileylink_last_device_contact">Τελευταία επαφή συσκευής</string>
+    <string name="rileylink_firmware_version">Έκδοση RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Επαναφορά Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Σφάλμα Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Έτοιμο</string>
+    <string name="rileylink_state_not_started">Δεν ξεκίνησε</string>
+    <string name="rileylink_state_rl_init">Αρχικοποίηση του RileyLink…</string>
+    <string name="rileylink_state_rl_error">RileyLink Σφάλμα</string>
+    <string name="rileylink_state_pc_tune_up">Συντονισμός RileyLink και Αντλίας</string>
+    <string name="rileylink_state_pc_error">Πρόβλημα σύνδεσης με την Αντλία</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Η συσκευή δεν είναι RileyLink</string>
+    <string name="rileylink_error_unreachable">Το RileyLink μη προσπελάσιμο</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth απενεργοποιημένο</string>
+    <string name="rileylink_error_no_bt_adapter">Δεν υπάρχει προσαρμογέας Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp απέτυχε</string>
+    <string name="rileylink_error_pod_unreachable">Το Pod δεν είναι διαθέσιμο</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Αντλία Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Παγκοσμίως (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-es-rES/strings.xml b/rileylink/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 0000000000..7828f8e36e
--- /dev/null
+++ b/rileylink/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">ESCANEAR</string>
+    <string name="rileylink_scanner_scan_stop">DETENER</string>
+    <string name="rileylink_scanner_selected_device">Seleccionado</string>
+    <string name="rileylink_scanner_title">Escaneo de RileyLink</string>
+    <string name="location_yes">Habilitar</string>
+    <string name="rileylink_scanner_scanning">Buscando</string>
+    <string name="rileylink_scanner_scanning_finished">Búsqueda Finalizada</string>
+    <string name="rileylink_scanner_scanning_error">Error de escaneo: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Configuración</string>
+    <string name="rileylink_settings_tab2">Historico</string>
+    <string name="rileylink_status">Estado RileyLink</string>
+    <string name="medtronic_pump_status">Estado de Infusora</string>
+    <string name="title_activity_rileylink_settings">Ajustes de RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Dirección configurada</string>
+    <string name="rileylink_connected_device">Dispositivo conectado</string>
+    <string name="rileylink_connection_status">Estado de la conexión</string>
+    <string name="rileylink_connection_error">Error de conexión</string>
+    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo de dispositivo</string>
+    <string name="rileylink_device_model">Modelo del dispositivo</string>
+    <string name="rileylink_last_used_frequency">Última frecuencia usada</string>
+    <string name="rileylink_last_device_contact">Último contacto del dispositivo</string>
+    <string name="rileylink_firmware_version">Firmware RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Inicializando Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Error Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth listo</string>
+    <string name="rileylink_state_not_started">No iniciado</string>
+    <string name="rileylink_state_rl_init">Inicialización de RileyLink…</string>
+    <string name="rileylink_state_rl_error">Error de RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Configurando RileyLink y la bomba</string>
+    <string name="rileylink_state_pc_error">Problema al conectar con la infusora</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">El dispositivo no es un RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink no accesible</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth está desactivado</string>
+    <string name="rileylink_error_no_bt_adapter">No hay adaptador Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Error al configurar</string>
+    <string name="rileylink_error_pod_unreachable">Infusora no alcanzable</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Infusora Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">A nivel mundial (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-fi-rFI/strings.xml b/rileylink/src/main/res/values-fi-rFI/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-fi-rFI/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-fr-rFR/strings.xml b/rileylink/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000000..3bcfa7ca8a
--- /dev/null
+++ b/rileylink/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCANNER</string>
+    <string name="rileylink_scanner_scan_stop">ARRÊT</string>
+    <string name="rileylink_scanner_selected_device">Sélectionné</string>
+    <string name="rileylink_scanner_title">Scanner RileyLink</string>
+    <string name="location_yes">Activer</string>
+    <string name="rileylink_scanner_scanning">Recherche en cours</string>
+    <string name="rileylink_scanner_scanning_finished">Recherche finie</string>
+    <string name="rileylink_scanner_scanning_error">Erreur de recherche : %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Paramètres</string>
+    <string name="rileylink_settings_tab2">Historique</string>
+    <string name="rileylink_status">État du RileyLink</string>
+    <string name="medtronic_pump_status">État de la pompe</string>
+    <string name="title_activity_rileylink_settings">Paramètres RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Adresse configurée</string>
+    <string name="rileylink_connected_device">Appareil connecté</string>
+    <string name="rileylink_connection_status">État de la connexion</string>
+    <string name="rileylink_connection_error">Erreur de Connexion</string>
+    <string name="rileylink_device">Appareil</string>
+    <string name="rileylink_device_type">Type d\'appareil</string>
+    <string name="rileylink_device_model">Modèle d’appareil</string>
+    <string name="rileylink_last_used_frequency">Dernière fréquence utilisée</string>
+    <string name="rileylink_last_device_contact">Dernier contact appareil</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Initialisation Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Erreur Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Prêt</string>
+    <string name="rileylink_state_not_started">Non démarré</string>
+    <string name="rileylink_state_rl_init">Initialisation du RileyLink…</string>
+    <string name="rileylink_state_rl_error">Erreur RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Association du RileyLink et de la Pompe</string>
+    <string name="rileylink_state_pc_error">Problème communication avec la pompe</string>
+    <string name="rileylink_state_connected">Connecté</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">L\'appareil n\'est pas RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink non accessible</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth est désactivé</string>
+    <string name="rileylink_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
+    <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pompe Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-ga-rIE/strings.xml b/rileylink/src/main/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-ga-rIE/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-hr-rHR/strings.xml b/rileylink/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/rileylink/src/main/res/values-it-rIT/strings.xml
new file mode 100644
index 0000000000..f56a5332fb
--- /dev/null
+++ b/rileylink/src/main/res/values-it-rIT/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Selezionato</string>
+    <string name="rileylink_scanner_title">Scansione RileyLink</string>
+    <string name="location_yes">Abilita</string>
+    <string name="rileylink_scanner_scanning">Scansione</string>
+    <string name="rileylink_scanner_scanning_finished">Scansione terminata</string>
+    <string name="rileylink_scanner_scanning_error">Errore scansione: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Impostazioni</string>
+    <string name="rileylink_settings_tab2">Storico</string>
+    <string name="rileylink_status">Stato RileyLink</string>
+    <string name="medtronic_pump_status">Stato micro</string>
+    <string name="title_activity_rileylink_settings">Impostazioni RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Indirizzo configurato</string>
+    <string name="rileylink_connected_device">Dispositivo connesso</string>
+    <string name="rileylink_connection_status">Stato connessione</string>
+    <string name="rileylink_connection_error">Errore connessione</string>
+    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo dispositivo</string>
+    <string name="rileylink_device_model">Modello dispositivo</string>
+    <string name="rileylink_last_used_frequency">Ultima frequenza utilizzata</string>
+    <string name="rileylink_last_device_contact">Ultimo contatto dispositivo</string>
+    <string name="rileylink_firmware_version">RL firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Inizializzazione bluetooth…</string>
+    <string name="rileylink_state_bt_error">Errore bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth pronto</string>
+    <string name="rileylink_state_not_started">Non avviato</string>
+    <string name="rileylink_state_rl_init">Inializzazione RileyLink…</string>
+    <string name="rileylink_state_rl_error">Errore RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Sintonizzazione RileyLink e micro</string>
+    <string name="rileylink_state_pc_error">Problema di connessione al micro</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Il dispositivo non è RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink non raggiungibile</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth disabilitato</string>
+    <string name="rileylink_error_no_bt_adapter">Nessun adattatore bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Sintonizzazione fallita</string>
+    <string name="rileylink_error_pod_unreachable">Pod irraggiungibile</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Micro Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Globale (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-iw-rIL/strings.xml b/rileylink/src/main/res/values-iw-rIL/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-iw-rIL/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-ko-rKR/strings.xml b/rileylink/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..386a7f4c15
--- /dev/null
+++ b/rileylink/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">스캔</string>
+    <string name="rileylink_scanner_scan_stop">중지</string>
+    <string name="rileylink_scanner_selected_device">선택됨</string>
+    <string name="rileylink_scanner_title">RileyLink 스캔</string>
+    <string name="location_yes">활성화</string>
+    <string name="rileylink_scanner_scanning">스캔중</string>
+    <string name="rileylink_scanner_scanning_finished">스캔 완료</string>
+    <string name="rileylink_scanner_scanning_error">스캔 에러: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">설정</string>
+    <string name="rileylink_settings_tab2">이력</string>
+    <string name="rileylink_status">RileyLink 상태</string>
+    <string name="medtronic_pump_status">펌프 상태</string>
+    <string name="title_activity_rileylink_settings">RileyLink 설정</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">구성된 주소</string>
+    <string name="rileylink_connected_device">연결된 장치</string>
+    <string name="rileylink_connection_status">연결상태</string>
+    <string name="rileylink_connection_error">연결에러</string>
+    <string name="rileylink_device">장치</string>
+    <string name="rileylink_device_type">장치타입</string>
+    <string name="rileylink_device_model">장치모델</string>
+    <string name="rileylink_last_used_frequency">최근사용 주파수</string>
+    <string name="rileylink_last_device_contact">최근장치연결</string>
+    <string name="rileylink_firmware_version">RL 펌웨어</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">블루투스 초기화중...</string>
+    <string name="rileylink_state_bt_error">블루투스 에러</string>
+    <string name="rileylink_state_bt_ready">블루투스 준비</string>
+    <string name="rileylink_state_not_started">시작되지 않았습니다.</string>
+    <string name="rileylink_state_rl_init">RileyLink 초기화…</string>
+    <string name="rileylink_state_rl_error">RileyLink 에러</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink 와 펌프 튜닝</string>
+    <string name="rileylink_state_pc_error">펌프 연결 문제</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">장치가 RileyLink가 아닙니다.</string>
+    <string name="rileylink_error_unreachable">RileyLink에 연결할 수 없음</string>
+    <string name="rileylink_error_bt_disabled">블루투스 비활성</string>
+    <string name="rileylink_error_no_bt_adapter">블루투스 어댑터 없음</string>
+    <string name="rileylink_error_tuneup_failed">튜닝 실패</string>
+    <string name="rileylink_error_pod_unreachable">포드에 연결할 수 없습니다.</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">메드트로닉 펌프</string>
+    <string name="rileylink_target_device_omnipod">옴니포드</string>
+    <string name="medtronic_pump_frequency_us_ca">미국 &amp; 캐나다(916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">타국가(868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-lt-rLT/strings.xml b/rileylink/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000000..5732fe3862
--- /dev/null
+++ b/rileylink/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SKENAVIMAS</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Parinkta</string>
+    <string name="rileylink_scanner_title">RileyLink skanavimas</string>
+    <string name="location_yes">Įjungti</string>
+    <string name="rileylink_scanner_scanning">Skanuojama</string>
+    <string name="rileylink_scanner_scanning_finished">Skanavimas baigtas</string>
+    <string name="rileylink_scanner_scanning_error">Skanavimo klaida: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Parametrai</string>
+    <string name="rileylink_settings_tab2">Istorija</string>
+    <string name="rileylink_status">RileyLink statusas</string>
+    <string name="medtronic_pump_status">Pompos statusas</string>
+    <string name="title_activity_rileylink_settings">RileyLink parametrai</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Nustatytas adresas</string>
+    <string name="rileylink_connected_device">Prijungtas įrenginys</string>
+    <string name="rileylink_connection_status">Ryšio būsena</string>
+    <string name="rileylink_connection_error">Prisijungimo klaida</string>
+    <string name="rileylink_device">Įrenginys</string>
+    <string name="rileylink_device_type">Įrenginio tipas</string>
+    <string name="rileylink_device_model">Įrenginio modelis</string>
+    <string name="rileylink_last_used_frequency">Paskutinis naudotas dažnis</string>
+    <string name="rileylink_last_device_contact">Paskutinis įrenginio kontaktas</string>
+    <string name="rileylink_firmware_version">RL Programinė įranga</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Inicijuojamas Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Bluetooth klaida</string>
+    <string name="rileylink_state_bt_ready">Bluetooth paruošta</string>
+    <string name="rileylink_state_not_started">Nepradėta</string>
+    <string name="rileylink_state_rl_init">RileyLink inicijavimas…</string>
+    <string name="rileylink_state_rl_error">RileyLink klaida</string>
+    <string name="rileylink_state_pc_tune_up">RileyLink ir Pompos suderinimas</string>
+    <string name="rileylink_state_pc_error">Sujungimo su pompa problema</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Įrenginys nėra RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink nepasiekiama</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth išjungtas</string>
+    <string name="rileylink_error_no_bt_adapter">Nėra Bluetooth adapterio</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp klaida</string>
+    <string name="rileylink_error_pod_unreachable">Pod nepasiekiamas</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Pasaulinis (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-nl-rNL/strings.xml b/rileylink/src/main/res/values-nl-rNL/strings.xml
new file mode 100644
index 0000000000..5bed2a08e8
--- /dev/null
+++ b/rileylink/src/main/res/values-nl-rNL/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Geselecteerd</string>
+    <string name="rileylink_scanner_title">RileyLink Scan</string>
+    <string name="location_yes">Inschakelen</string>
+    <string name="rileylink_scanner_scanning">Scannen</string>
+    <string name="rileylink_scanner_scanning_finished">Scannen voltooid</string>
+    <string name="rileylink_scanner_scanning_error">Scanfout: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Instellingen</string>
+    <string name="rileylink_settings_tab2">Geschiedenis</string>
+    <string name="rileylink_status">RileyLink Status</string>
+    <string name="medtronic_pump_status">Pompstatus</string>
+    <string name="title_activity_rileylink_settings">RileyLink Instellingen</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Geconfigureerd Adres</string>
+    <string name="rileylink_connected_device">Aangesloten Apparaat</string>
+    <string name="rileylink_connection_status">Verbinding Status</string>
+    <string name="rileylink_connection_error">Verbindingsfout</string>
+    <string name="rileylink_device">Apparaat</string>
+    <string name="rileylink_device_type">Apparaat type</string>
+    <string name="rileylink_device_model">Apparaat model</string>
+    <string name="rileylink_last_used_frequency">Laatst gebruikte frequentie</string>
+    <string name="rileylink_last_device_contact">Laatste contact met apparaat</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth initialiseren…</string>
+    <string name="rileylink_state_bt_error">Bluetooth fout</string>
+    <string name="rileylink_state_bt_ready">Bluetooth gekoppeld</string>
+    <string name="rileylink_state_not_started">Niet gestart</string>
+    <string name="rileylink_state_rl_init">RileyLink initialiseren…</string>
+    <string name="rileylink_state_rl_error">RileyLink fout</string>
+    <string name="rileylink_state_pc_tune_up">Tuning van RileyLink en Pomp</string>
+    <string name="rileylink_state_pc_error">Probleem tijdens verbinden met de pomp</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Apparaat is geen RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink onbereikbaar</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth is uitgeschakeld</string>
+    <string name="rileylink_error_no_bt_adapter">Geen Bluetooth Adapter</string>
+    <string name="rileylink_error_tuneup_failed">Verbinding maken mislukt</string>
+    <string name="rileylink_error_pod_unreachable">Pod niet bereikbaar</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronic Pomp</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">VS &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Wereldwijd (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-pl-rPL/strings.xml b/rileylink/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 0000000000..f3425b5b3e
--- /dev/null
+++ b/rileylink/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SKANUJ</string>
+    <string name="rileylink_scanner_scan_stop">ZATRZYMAJ</string>
+    <string name="rileylink_scanner_selected_device">Wybrany</string>
+    <string name="rileylink_scanner_title">Skan RileyLink</string>
+    <string name="location_yes">Uruchom</string>
+    <string name="rileylink_scanner_scanning">Skanowanie</string>
+    <string name="rileylink_scanner_scanning_finished">Skanowanie zakończono</string>
+    <string name="rileylink_scanner_scanning_error">Błąd skanowania: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Ustawienia</string>
+    <string name="rileylink_settings_tab2">Historia</string>
+    <string name="rileylink_status">Stan RileyLink</string>
+    <string name="medtronic_pump_status">Stan pompy</string>
+    <string name="title_activity_rileylink_settings">Ustawienia RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Ustawiony adres</string>
+    <string name="rileylink_connected_device">Połączone urządzenie</string>
+    <string name="rileylink_connection_status">Status połączenia</string>
+    <string name="rileylink_connection_error">Błąd połączenia</string>
+    <string name="rileylink_device">Urządzenie</string>
+    <string name="rileylink_device_type">Typ urządzenia</string>
+    <string name="rileylink_device_model">Model urządzenia</string>
+    <string name="rileylink_last_used_frequency">Ostatnio używana częstotliwość</string>
+    <string name="rileylink_last_device_contact">Ostatnie połączenie z urządzeniem</string>
+    <string name="rileylink_firmware_version">Oprogramowanie RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Uruchamianie Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Błąd Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth gotowy</string>
+    <string name="rileylink_state_not_started">Nie rozpoczęto</string>
+    <string name="rileylink_state_rl_init">Uruchamianie RileyLink…</string>
+    <string name="rileylink_state_rl_error">Błąd RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Dostrojenie RileyLink i pompy</string>
+    <string name="rileylink_state_pc_error">Problem z połączeniem z pompą</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Urządzenie to nie RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink nie osiągalny</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth wyłączony</string>
+    <string name="rileylink_error_no_bt_adapter">Brak modułu Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Dostrojenie nie powiodło się</string>
+    <string name="rileylink_error_pod_unreachable">Pod nieosiągalny</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pompa Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Reszta świata (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-pt-rBR/strings.xml b/rileylink/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000000..af6835dcb4
--- /dev/null
+++ b/rileylink/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">PROCURAR</string>
+    <string name="rileylink_scanner_scan_stop">PARAR</string>
+    <string name="rileylink_scanner_selected_device">Seleccionado</string>
+    <string name="rileylink_scanner_title">Procura RileyLink</string>
+    <string name="location_yes">Ativar</string>
+    <string name="rileylink_scanner_scanning">A procurar</string>
+    <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
+    <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Definições</string>
+    <string name="rileylink_settings_tab2">Histórico</string>
+    <string name="rileylink_status">Estado do RileyLink</string>
+    <string name="medtronic_pump_status">Estado da Bomba</string>
+    <string name="title_activity_rileylink_settings">Configurações do RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Endereço Configurado</string>
+    <string name="rileylink_connected_device">Dispositivo Ligado</string>
+    <string name="rileylink_connection_status">Estado de Ligação</string>
+    <string name="rileylink_connection_error">Erro de Ligação</string>
+    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo de dispositivo</string>
+    <string name="rileylink_device_model">Modelo do dispositivo</string>
+    <string name="rileylink_last_used_frequency">Frequência da última utilização</string>
+    <string name="rileylink_last_device_contact">Último contacto do dispositivo</string>
+    <string name="rileylink_firmware_version">Firmware RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">A iniciar o Bluetooth...</string>
+    <string name="rileylink_state_bt_error">Erro de Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Pronto</string>
+    <string name="rileylink_state_not_started">Não Iniciado</string>
+    <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
+    <string name="rileylink_state_rl_error">Erro no RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Configurando RileyLink e a Bomba</string>
+    <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
+    <string name="rileylink_state_connected">Ligado</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Dispositivo não é RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink inacessível</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth desactivado</string>
+    <string name="rileylink_error_no_bt_adapter">Nenhum Adaptador Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
+    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-pt-rPT/strings.xml b/rileylink/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000000..03b123f0dd
--- /dev/null
+++ b/rileylink/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">PROCURAR</string>
+    <string name="rileylink_scanner_scan_stop">PARAR</string>
+    <string name="rileylink_scanner_selected_device">Seleccionado</string>
+    <string name="rileylink_scanner_title">Procura RileyLink</string>
+    <string name="location_yes">Activar</string>
+    <string name="rileylink_scanner_scanning">A procurar</string>
+    <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
+    <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Definições</string>
+    <string name="rileylink_settings_tab2">Histórico</string>
+    <string name="rileylink_status">Estado do RileyLink</string>
+    <string name="medtronic_pump_status">Estado da Bomba</string>
+    <string name="title_activity_rileylink_settings">Definições do RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Endereço Configurado</string>
+    <string name="rileylink_connected_device">Dispositivo Ligado</string>
+    <string name="rileylink_connection_status">Estado de Ligação</string>
+    <string name="rileylink_connection_error">Erro de Ligação</string>
+    <string name="rileylink_device">Dispositivo</string>
+    <string name="rileylink_device_type">Tipo de dispositivo</string>
+    <string name="rileylink_device_model">Modelo do dispositivo</string>
+    <string name="rileylink_last_used_frequency">Frequência da última utilização</string>
+    <string name="rileylink_last_device_contact">Último contacto do dispositivo</string>
+    <string name="rileylink_firmware_version">Firmware RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">A iniciar o Bluetooth...</string>
+    <string name="rileylink_state_bt_error">Erro de Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth Pronto</string>
+    <string name="rileylink_state_not_started">Não Iniciado</string>
+    <string name="rileylink_state_rl_init">Inicialização do RileyLink…</string>
+    <string name="rileylink_state_rl_error">Erro no RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">A ajustar RileyLink e a Bomba</string>
+    <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Dispositivo não é RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink inacessível</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth desactivado</string>
+    <string name="rileylink_error_no_bt_adapter">Nenhum Adaptador Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
+    <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-ro-rRO/strings.xml b/rileylink/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000000..a5d5d51f31
--- /dev/null
+++ b/rileylink/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="rileylink_scanner_selected_device">Selectat</string>
+    <string name="rileylink_scanner_title">Scanare RileyLink</string>
+    <string name="location_yes">Activează</string>
+    <string name="location_no">Nu</string>
+    <string name="rileylink_scanner_scanning">Scanează</string>
+    <string name="rileylink_scanner_scanning_finished">Scanare terminată</string>
+    <string name="rileylink_scanner_scanning_error">Eroare la scanare: %1$d</string>
+    <string name="common_never">Niciodată</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Setări</string>
+    <string name="rileylink_settings_tab2">Istoric</string>
+    <string name="rileylink_status">Stare RileyLink</string>
+    <string name="medtronic_pump_status">Stare pompă</string>
+    <string name="title_activity_rileylink_settings">Setări RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Adresă configurate</string>
+    <string name="rileylink_connected_device">Dispozitiv conectat</string>
+    <string name="rileylink_connection_status">Stare conexiune</string>
+    <string name="rileylink_connection_error">Eroare conexiune</string>
+    <string name="rileylink_device">Dispozitiv</string>
+    <string name="rileylink_device_type">Tip dispozitiv</string>
+    <string name="rileylink_device_model">Model dispozitiv</string>
+    <string name="rileylink_last_used_frequency">Ultima frecvență utilizată</string>
+    <string name="rileylink_last_device_contact">Ultima conexiune cu dispozitivul</string>
+    <string name="rileylink_firmware_version">Firmware RL</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Se inițializează conexiunea Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Eroare Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Conexiune Bluetooth pregătită</string>
+    <string name="rileylink_state_not_started">Nepornit</string>
+    <string name="rileylink_state_rl_init">Se inițializează RileyLink…</string>
+    <string name="rileylink_state_rl_error">Eroare RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Se îmbunătățește RileyLink și pompa</string>
+    <string name="rileylink_state_pc_error">Probleme la conectarea cu pompa</string>
+    <string name="rileylink_state_connected">Conectat</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Dispozitivul nu este RileyLink</string>
+    <string name="rileylink_error_unreachable">Nu se poate găsi RileyLink</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth dezactivat</string>
+    <string name="rileylink_error_no_bt_adapter">Nu există un adaptor Bluetooth</string>
+    <string name="rileylink_error_tuneup_failed">Conectare eșuată</string>
+    <string name="rileylink_error_pump_unreachable">Pompă indisponibilă</string>
+    <string name="rileylink_error_pod_unreachable">Nu se poate comunica cu pod-ul</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pompă Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Globală (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d zi</item>
+        <item quantity="few">%1$d zile</item>
+        <item quantity="other">%1$d zile</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d oră</item>
+        <item quantity="few">%1$d ore</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-ru-rRU/strings.xml b/rileylink/src/main/res/values-ru-rRU/strings.xml
new file mode 100644
index 0000000000..ea9fef9b25
--- /dev/null
+++ b/rileylink/src/main/res/values-ru-rRU/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">СКАН</string>
+    <string name="rileylink_scanner_scan_stop">СТОП</string>
+    <string name="rileylink_scanner_selected_device">Выбрано</string>
+    <string name="rileylink_scanner_title">Сканирование RileyLink</string>
+    <string name="location_yes">Включить</string>
+    <string name="rileylink_scanner_scanning">Сканирование</string>
+    <string name="rileylink_scanner_scanning_finished">Сканирование завершено</string>
+    <string name="rileylink_scanner_scanning_error">Ошибка сканирования: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Настройки</string>
+    <string name="rileylink_settings_tab2">История</string>
+    <string name="rileylink_status">Статус RileyLink</string>
+    <string name="medtronic_pump_status">Статус помпы</string>
+    <string name="title_activity_rileylink_settings">Настройки RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Настроенный адрес</string>
+    <string name="rileylink_connected_device">Подключенное устройство</string>
+    <string name="rileylink_connection_status">Статус подключения</string>
+    <string name="rileylink_connection_error">Ошибка подключения</string>
+    <string name="rileylink_device">Устройство</string>
+    <string name="rileylink_device_type">Тип устройства</string>
+    <string name="rileylink_device_model">Модель устройства</string>
+    <string name="rileylink_last_used_frequency">Последняя использованная частота</string>
+    <string name="rileylink_last_device_contact">Контакт последнего устройства</string>
+    <string name="rileylink_firmware_version">Прошивка RileyLink</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Инициализация Bluetooth…</string>
+    <string name="rileylink_state_bt_error">Ошибка Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth готов</string>
+    <string name="rileylink_state_not_started">Не запущено</string>
+    <string name="rileylink_state_rl_init">Инициализация RileyLink…</string>
+    <string name="rileylink_state_rl_error">Ошибка RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Настройка RileyLink и помпы</string>
+    <string name="rileylink_state_pc_error">Проблема подключения к помпе</string>
+    <string name="rileylink_state_connected">Соединение установлено</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Устройство не является RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink недоступен</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth выключен</string>
+    <string name="rileylink_error_no_bt_adapter">Нет Bluetooth-адаптера</string>
+    <string name="rileylink_error_tuneup_failed">Ошибка TuneUp</string>
+    <string name="rileylink_error_pod_unreachable">POD недоступен</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Помпа Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Глобальн (868 Мгц)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-sk-rSK/strings.xml b/rileylink/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000000..86379e62f2
--- /dev/null
+++ b/rileylink/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">VYHĽADAŤ</string>
+    <string name="rileylink_scanner_scan_stop">ZASTAVIŤ</string>
+    <string name="rileylink_scanner_selected_device">Vybrané</string>
+    <string name="rileylink_scanner_title">Vyhľadávanie RileyLinku</string>
+    <string name="location_yes">Aktivovať</string>
+    <string name="rileylink_scanner_scanning">Vyhľadávanie</string>
+    <string name="rileylink_scanner_scanning_finished">Vyhľadávanie dokončené</string>
+    <string name="rileylink_scanner_scanning_error">Chyba vyhľadávania: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Nastavenia</string>
+    <string name="rileylink_settings_tab2">História</string>
+    <string name="rileylink_status">Stav RileyLinku</string>
+    <string name="medtronic_pump_status">Stav pumpy</string>
+    <string name="title_activity_rileylink_settings">Nastavenie RileyLink</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">Nastavená adresa</string>
+    <string name="rileylink_connected_device">Pripojené zariadenie</string>
+    <string name="rileylink_connection_status">Stav pripojenia</string>
+    <string name="rileylink_connection_error">Chyba pripojenia</string>
+    <string name="rileylink_device">Zariadenie</string>
+    <string name="rileylink_device_type">Typ zariadenia</string>
+    <string name="rileylink_device_model">Model zariadenia</string>
+    <string name="rileylink_last_used_frequency">Posledná použitá frekvencia</string>
+    <string name="rileylink_last_device_contact">Posledné spojenie zo zariadením</string>
+    <string name="rileylink_firmware_version">RL Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Inicializácia Bluetooth...</string>
+    <string name="rileylink_state_bt_error">Chyba Bluetooth</string>
+    <string name="rileylink_state_bt_ready">Bluetooth pripravené</string>
+    <string name="rileylink_state_not_started">Nespustené</string>
+    <string name="rileylink_state_rl_init">Inicializácia RileyLink...</string>
+    <string name="rileylink_state_rl_error">Chyba RileyLink</string>
+    <string name="rileylink_state_pc_tune_up">Ladenie RileyLinku a pumpy</string>
+    <string name="rileylink_state_pc_error">Problém s pripojením k pumpe</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Zariadenie nie je RileyLink</string>
+    <string name="rileylink_error_unreachable">RileyLink nedostupný</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth je deaktivované</string>
+    <string name="rileylink_error_no_bt_adapter">Žiadny Bluetooth adaptér</string>
+    <string name="rileylink_error_tuneup_failed">Ladenie zlyhalo</string>
+    <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Celosvetovo (868 MHz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-sl-rSI/strings.xml b/rileylink/src/main/res/values-sl-rSI/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-sv-rSE/strings.xml b/rileylink/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 0000000000..ef2aafebaa
--- /dev/null
+++ b/rileylink/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">SÖK</string>
+    <string name="rileylink_scanner_scan_stop">AVBRYT</string>
+    <string name="rileylink_scanner_selected_device">Vald</string>
+    <string name="rileylink_scanner_title">Riley Link-sökning</string>
+    <string name="location_yes">Aktivera</string>
+    <string name="rileylink_scanner_scanning">Söker</string>
+    <string name="rileylink_scanner_scanning_finished">Sökning avslutad</string>
+    <string name="rileylink_scanner_scanning_error">Fel vid sökning: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">Inställningar</string>
+    <string name="rileylink_settings_tab2">Historik</string>
+    <string name="rileylink_status">Riley Link Status</string>
+    <string name="medtronic_pump_status">Pumpstatus</string>
+    <string name="title_activity_rileylink_settings">Inställningar för Riley Link</string>
+    <string name="rileylink_title">Riley Link</string>
+    <string name="rileylink_configured_address">Konfigurerad adress</string>
+    <string name="rileylink_connected_device">Ansluten enhet</string>
+    <string name="rileylink_connection_status">Anslutningsstatus</string>
+    <string name="rileylink_connection_error">Anslutningsproblem</string>
+    <string name="rileylink_device">Enhet</string>
+    <string name="rileylink_device_type">Enhetstyp</string>
+    <string name="rileylink_device_model">Modell</string>
+    <string name="rileylink_last_used_frequency">Senast använda frekvens</string>
+    <string name="rileylink_last_device_contact">Senaste anslutning</string>
+    <string name="rileylink_firmware_version">Firmware</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">Bluetooth initieras…</string>
+    <string name="rileylink_state_bt_error">Bluetoothfel</string>
+    <string name="rileylink_state_bt_ready">Bluetooth redo</string>
+    <string name="rileylink_state_not_started">Inte startad</string>
+    <string name="rileylink_state_rl_init">Riley Link initierar…</string>
+    <string name="rileylink_state_rl_error">Riley Link-fel</string>
+    <string name="rileylink_state_pc_tune_up">Justerar Riley Link mot pump</string>
+    <string name="rileylink_state_pc_error">Problem att ansluta till pumpen</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">Enheten är inte en Riley Link</string>
+    <string name="rileylink_error_unreachable">Riley Link kan inte nås</string>
+    <string name="rileylink_error_bt_disabled">Bluetooth avstängt</string>
+    <string name="rileylink_error_no_bt_adapter">Ingen bluetoothadapter</string>
+    <string name="rileylink_error_tuneup_failed">Frekvensjustering misslyckades</string>
+    <string name="rileylink_error_pod_unreachable">Podden kan inte nås</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">Medtronicpump</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">USA &amp; Kanada (916 MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">Resten av världen (868 MHz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-tr-rTR/strings.xml b/rileylink/src/main/res/values-tr-rTR/strings.xml
new file mode 100644
index 0000000000..cd28fb925a
--- /dev/null
+++ b/rileylink/src/main/res/values-tr-rTR/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <!-- RL Status Page -->
+    <!-- RL State -->
+    <!-- RL Errors -->
+    <!-- RL Target Device -->
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>
diff --git a/rileylink/src/main/res/values-zh-rCN/strings.xml b/rileylink/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000000..05fcb2f739
--- /dev/null
+++ b/rileylink/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- RL BLE Scanning -->
+    <string name="rileylink_scanner_scan_scan">扫描</string>
+    <string name="rileylink_scanner_scan_stop">停止</string>
+    <string name="rileylink_scanner_selected_device">已选择</string>
+    <string name="rileylink_scanner_title">RileyLink 扫描</string>
+    <string name="location_yes">启用</string>
+    <string name="rileylink_scanner_scanning">扫描中</string>
+    <string name="rileylink_scanner_scanning_finished">扫描完成</string>
+    <string name="rileylink_scanner_scanning_error">扫描错误: %1$d</string>
+    <!-- RL Status Page -->
+    <string name="rileylink_settings_tab1">设置</string>
+    <string name="rileylink_settings_tab2">历史</string>
+    <string name="rileylink_status">RileyLink 状态</string>
+    <string name="medtronic_pump_status">泵状态</string>
+    <string name="title_activity_rileylink_settings">RileyLink 设置</string>
+    <string name="rileylink_title">RileyLink</string>
+    <string name="rileylink_configured_address">已配置地址</string>
+    <string name="rileylink_connected_device">已连接的设备</string>
+    <string name="rileylink_connection_status">连接状态</string>
+    <string name="rileylink_connection_error">连接错误</string>
+    <string name="rileylink_device">设备</string>
+    <string name="rileylink_device_type">设备类型</string>
+    <string name="rileylink_device_model">设备型号</string>
+    <string name="rileylink_last_used_frequency">上次使用频率</string>
+    <string name="rileylink_last_device_contact">最后一个设备联系人</string>
+    <string name="rileylink_firmware_version">固件</string>
+    <!-- RL State -->
+    <string name="rileylink_state_bt_init">蓝牙初始化…</string>
+    <string name="rileylink_state_bt_error">蓝牙错误</string>
+    <string name="rileylink_state_bt_ready">Bluetooth 已配对</string>
+    <string name="rileylink_state_not_started">尚未提交</string>
+    <string name="rileylink_state_rl_init">RileyLink 初始化…</string>
+    <string name="rileylink_state_rl_error">RileyLink 错误</string>
+    <string name="rileylink_state_pc_tune_up">调整 RileyLink 和泵</string>
+    <string name="rileylink_state_pc_error">连接至泵时出现问题</string>
+    <!-- RL Errors -->
+    <string name="rileylink_error_not_rl">设备不是 RileyLink</string>
+    <string name="rileylink_error_unreachable">无法访问 RileyLink</string>
+    <string name="rileylink_error_bt_disabled">蓝牙已禁用</string>
+    <string name="rileylink_error_no_bt_adapter">未找到蓝牙适配器</string>
+    <string name="rileylink_error_tuneup_failed">调整失败</string>
+    <string name="rileylink_error_pod_unreachable">无法连接主机</string>
+    <!-- RL Target Device -->
+    <string name="rileylink_target_device_medtronic">美敦力泵</string>
+    <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="medtronic_pump_frequency_us_ca">美国 &amp; 加拿大 (916MHz)</string>
+    <string name="medtronic_pump_frequency_worldwide">全球 (868 Mhz)</string>
+    <!--    <plurals name="objective_minutes">-->
+    <!--        <item quantity="one">%1$d minute</item>-->
+    <!--        <item quantity="other">%1$d minutes</item>-->
+    <!--    </plurals>-->
+</resources>

From 4bf1e886a4fe0b56eaa6ed6273c0b595fa4e7d96 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 1 Aug 2020 19:14:38 +0200
Subject: [PATCH 372/400] Fix Plugin Preference enable for Overview

---
 app/src/main/java/info/nightscout/androidaps/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
index 83ce050554..ff35d585ee 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@@ -147,7 +147,7 @@ class MainActivity : NoSplashAppCompatActivity() {
     }
 
     private fun checkPluginPreferences(viewPager: ViewPager2) {
-        if (viewPager.currentItem > 0) pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
+        if (viewPager.currentItem >= 0) pluginPreferencesMenuItem?.isEnabled = (viewPager.adapter as TabPageAdapter).getPluginAt(viewPager.currentItem).preferencesId != -1
     }
 
     override fun onPostCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {

From cb674fb4168aaf0260ca86d1bf8e43e84a0d72f1 Mon Sep 17 00:00:00 2001
From: Andy Rozman <andy.rozman@gmail.com>
Date: Mon, 3 Aug 2020 16:57:50 +0100
Subject: [PATCH 373/400] - fix to ChangeSensorSetup2 it has now two lengths
 for different models: 37, 41

---
 .../medtronic/comm/history/pump/PumpHistoryEntryType.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
index cf3067c4ab..ddbe5f03cb 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryEntryType.java
@@ -214,12 +214,10 @@ public enum PumpHistoryEntryType // implements CodeEnum
         Bolus.addSpecialRuleHead(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 8));
         // BolusWizardChange.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_522andHigher, 143));
         //ChangeBolusWizardSetup.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 137)); // V5:
-        // 522
-        // has
-        // old
-        // form
+        // 522 has old form
         BolusWizard.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 15));
         BolusReminder.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 2));
+        ChangeSensorSetup2.addSpecialRuleBody(new SpecialRule(MedtronicDeviceType.Medtronic_523andHigher, 34));
     }
 
 

From 029eeec9642b8961f1d35143f3b30d4ccb59a060 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 3 Aug 2020 21:38:35 +0200
Subject: [PATCH 374/400] New Crowdin updates (#2870)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Italian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)
---
 app/src/main/res/values-fr-rFR/strings.xml    |  2 +-
 app/src/main/res/values-it-rIT/strings.xml    |  2 +-
 app/src/main/res/values-ru-rRU/strings.xml    |  5 +++++
 core/src/main/res/values-de-rDE/strings.xml   | 20 ++++++++++++++++++
 core/src/main/res/values-fr-rFR/strings.xml   | 21 +++++++++++++++++++
 core/src/main/res/values-it-rIT/strings.xml   | 20 ++++++++++++++++++
 core/src/main/res/values-pt-rPT/strings.xml   | 20 ++++++++++++++++++
 core/src/main/res/values-ru-rRU/strings.xml   | 21 +++++++++++++++++++
 .../src/main/res/values-de-rDE/strings.xml    |  9 ++++++++
 .../src/main/res/values-fr-rFR/strings.xml    |  8 +++++++
 .../src/main/res/values-it-rIT/strings.xml    | 15 ++++++++++---
 .../src/main/res/values-pt-rPT/strings.xml    |  9 ++++++++
 .../src/main/res/values-ru-rRU/strings.xml    |  8 +++++++
 .../src/main/res/values-de-rDE/strings.xml    | 13 ++++++++++++
 .../src/main/res/values-fr-rFR/strings.xml    | 12 +++++++++++
 .../src/main/res/values-it-rIT/strings.xml    | 17 +++++++++++++--
 .../src/main/res/values-pt-rPT/strings.xml    | 13 ++++++++++++
 .../src/main/res/values-ru-rRU/strings.xml    | 16 ++++++++++++++
 18 files changed, 224 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 32c5712945..7f43be9166 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -805,7 +805,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="exit">Quitter</string>
     <string name="open_navigation">Ouvrir navigation</string>
     <string name="close_navigation">Fermer navigation</string>
-    <string name="nav_plugin_preferences">Préférences des plugins</string>
+    <string name="nav_plugin_preferences">Préférences du plugin</string>
     <string name="completed_well_done">Terminé, félicitations !</string>
     <string name="not_completed_yet">Pas encore terminé</string>
     <string name="time_elapsed">Temps écoulé</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 9774baeb2d..3b53b7f31b 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -626,7 +626,7 @@
     <string name="combo_reservoir_empty">Vuoto</string>
     <string name="combo_reservoir_normal">Normale</string>
     <string name="combo_notification_check_time_date">Necessario aggiornare orologio micro</string>
-    <string name="combo_warning">Attenzione</string>
+    <string name="combo_warning">Avviso</string>
     <string name="combo_pump_tbr_cancelled_warrning">Avviso TBR CANCELLATO: confermato</string>
     <string name="combo_error_no_connection_no_bolus_delivered">Il micro potrebbe non essere raggiungibile. Nessun bolo erogato</string>
     <string name="combo_error_no_bolus_delivered">Erogazione bolo fallita. Sembra che nessun bolo sia stato erogato. Per sicurezza, controlla il micro per evitare un doppio bolo e se è tutto ok, erogalo di nuovo. Come protezione da eventuali \"bug\", i boli non vengono ripetuti automaticamente.</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 8039238a2f..2926425650 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -172,6 +172,8 @@
     <string name="password_preferences_decrypt_prompt">Вам будет предложено ввести главный пароль, необходимый для расшифровки импортированных настроек.</string>
     <string name="preferences_export_canceled">Экспорт отменен! Настройки НЕ экспортированы!</string>
     <string name="preferences_import_canceled">Импорт отменен! Настройки не импортированы!</string>
+    <string name="preferences_import_impossible">Не удается импортировать настройки!</string>
+    <string name="goto_main_try_again">Вернитесь на главный экран и повторите попытку.</string>
     <string name="preferences_import_list_title">Выберите файл для импорта</string>
     <string name="check_preferences_before_import">Проверьте настройки перед импортом:</string>
     <string name="check_preferences_cannot_import">Не удается импортировать настройки!</string>
@@ -645,6 +647,7 @@
     <string name="enablesmbwithtemptarget">Включить супер микро болюс SMB с временными целями</string>
     <string name="enablesmbwithtemptarget_summary">Включить супер микро болюс SMB при активной временной цели (близкий прием пищи, нагрузка)</string>
     <string name="enablesmbwithhightemptarget">Включить супер микро болюс SMB с высокими значениями временных целей</string>
+    <string name="enablesmbwithhightemptarget_summary">Включить микроболюс SMB, когда активна высока временная цель (нагрузка, выше 100 мг/дл или 5,5 ммоль/л)</string>
     <string name="overview_insulin_label">Инсулин</string>
     <string name="overview_carbs_label">Кол-во углеводов</string>
     <string name="overview_buttons_selection">Кнопки</string>
@@ -678,6 +681,7 @@
     <string name="do_not_bolus_record_only">Не подавать болюс, только внести запись</string>
     <string name="category">Категория</string>
     <string name="subcategory">Подкатегория</string>
+    <string name="bolusrecordedonly">Болюс будет только протоколироваться (не подаваться помпой)</string>
     <string name="ns_autobackfill_summary">Заполнять пропущенные данные из NS</string>
     <string name="loop_smbsetbypump_label">Супер микро болюс SMB задан помпой</string>
     <string name="overview_show_activity">Нагрузка</string>
@@ -796,6 +800,7 @@ Context | Edit Context</string>
     <string name="askforpermission">Запросить права доступа</string>
     <string name="needsystemwindowpermission">Приложению требуется разрешение системного окна для уведомлений</string>
     <string name="needlocationpermission">Приложению требуется разрешение на доступ к местоположению для сканирования BT и идентификации WiFi</string>
+    <string name="needstoragepermission">Приложение требует разрешения на доступ к записи в память, чтобы хранить файлы журналов и настройки экспорта</string>
     <string name="request">Запрос</string>
     <string name="insulinsourcesetup">Настроить плагин инсулина</string>
     <string name="exit">Выход</string>
diff --git a/core/src/main/res/values-de-rDE/strings.xml b/core/src/main/res/values-de-rDE/strings.xml
index 3f56532fed..b26b0f6032 100644
--- a/core/src/main/res/values-de-rDE/strings.xml
+++ b/core/src/main/res/values-de-rDE/strings.xml
@@ -181,9 +181,29 @@
     <!--    Ntp-->
     <string name="timedetection">Zeiterkennung</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Aktion von Pumpe und/oder Treiber nicht unterstützt.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operation NOCH NICHT von Pumpe unterstützt.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nie verbunden</string>
+    <string name="pump_status_waking_up">Aufwecken</string>
+    <string name="pump_status_error_comm">Fehler bei der Kommunikation</string>
+    <string name="pump_status_timeout_comm">Zeitüberschreitung bei Kommunikation</string>
+    <string name="pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
+    <string name="pump_status_invalid_config">Ungültige Einstellung</string>
+    <string name="pump_status_active">Aktiv</string>
+    <string name="pump_status_sleeping">Schlafen</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basal</string>
+    <string name="history_group_configuration">Konfigurationen</string>
+    <string name="history_group_notification">Benachrichtigungen</string>
+    <string name="history_group_statistic">Statistiken</string>
+    <string name="history_group_unknown">Unbekannte</string>
+    <string name="history_group_all">Alle</string>
+    <string name="history_group_bolus">Boli</string>
+    <string name="history_group_prime">Füllen</string>
+    <string name="history_group_alarm">Alarme</string>
+    <string name="history_group_glucose">Glukose</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 9818280fcf..b9f44d9d35 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -180,10 +180,31 @@
     <string name="tbb2">DTB*2</string>
     <!--    Ntp-->
     <string name="timedetection">Détection de temps</string>
+    <string name="format_hour_minute">%1$dh %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Opération non prise en charge par la pompe et/ou le pilote.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Opération non ENCORE supportée par la pompe.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Jamais contacté</string>
+    <string name="pump_status_waking_up">Réveil en cours</string>
+    <string name="pump_status_error_comm">Erreur de communication</string>
+    <string name="pump_status_timeout_comm">Expiration du délai d\'attente en communication</string>
+    <string name="pump_status_pump_unreachable">Pompe hors de portée</string>
+    <string name="pump_status_invalid_config">Configuration non valable</string>
+    <string name="pump_status_active">Activé</string>
+    <string name="pump_status_sleeping">En veille</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basals</string>
+    <string name="history_group_configuration">Configurations</string>
+    <string name="history_group_notification">Notifications</string>
+    <string name="history_group_statistic">Statistiques</string>
+    <string name="history_group_unknown">Inconnus</string>
+    <string name="history_group_all">Tous</string>
+    <string name="history_group_bolus">Bolus</string>
+    <string name="history_group_prime">Amorcer</string>
+    <string name="history_group_alarm">Alarmes</string>
+    <string name="history_group_glucose">Glucose</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 9d97f88981..cfa8421b84 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -182,9 +182,29 @@
     <string name="timedetection">Rilevamento tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operazione non supportata dal micro e/o dal driver.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operazione NON ANCORA supportata dal micro.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Mai connesso</string>
+    <string name="pump_status_waking_up">Risveglio</string>
+    <string name="pump_status_error_comm">Errore nella comunicazione</string>
+    <string name="pump_status_timeout_comm">Timeout della comunicazione</string>
+    <string name="pump_status_pump_unreachable">Micro irraggiungibile</string>
+    <string name="pump_status_invalid_config">Configurazione non valida</string>
+    <string name="pump_status_active">Attivo</string>
+    <string name="pump_status_sleeping">In sospensione</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basali</string>
+    <string name="history_group_configuration">Configurazioni</string>
+    <string name="history_group_notification">Notifiche</string>
+    <string name="history_group_statistic">Statistiche</string>
+    <string name="history_group_unknown">Sconosciuti</string>
+    <string name="history_group_all">Tutto</string>
+    <string name="history_group_bolus">Boli</string>
+    <string name="history_group_prime">Caricamento</string>
+    <string name="history_group_alarm">Allarmi</string>
+    <string name="history_group_glucose">Glicemia</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-pt-rPT/strings.xml b/core/src/main/res/values-pt-rPT/strings.xml
index 92af7e1a0e..009755726b 100644
--- a/core/src/main/res/values-pt-rPT/strings.xml
+++ b/core/src/main/res/values-pt-rPT/strings.xml
@@ -182,9 +182,29 @@
     <string name="timedetection">Detecção de tempo</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operação não suportada pela Bomba e/ou Controlador.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operação não suportada ainda pela Bomba.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nunca contactado</string>
+    <string name="pump_status_waking_up">A acordar</string>
+    <string name="pump_status_error_comm">Erro com comunicação</string>
+    <string name="pump_status_timeout_comm">Tempo limite para comunicação</string>
+    <string name="pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="pump_status_invalid_config">Configuração inválida</string>
+    <string name="pump_status_active">Activo</string>
+    <string name="pump_status_sleeping">A dormir</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Basais</string>
+    <string name="history_group_configuration">Configurações</string>
+    <string name="history_group_notification">Notificações</string>
+    <string name="history_group_statistic">Estatísticas</string>
+    <string name="history_group_unknown">Desconhecido</string>
+    <string name="history_group_all">Tudo</string>
+    <string name="history_group_bolus">Bólus</string>
+    <string name="history_group_prime">Purgar</string>
+    <string name="history_group_alarm">Alarmes</string>
+    <string name="history_group_glucose">Glucose</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml
index 221c661cef..317fe218d4 100644
--- a/core/src/main/res/values-ru-rRU/strings.xml
+++ b/core/src/main/res/values-ru-rRU/strings.xml
@@ -180,10 +180,31 @@
     <string name="tbb2">общий базал*2</string>
     <!--    Ntp-->
     <string name="timedetection">Определение времени</string>
+    <string name="format_hour_minute">%1$dч %2$dмин</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Операция не поддерживается помпой и/или драйвером.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Операция ЕЩЕ не поддерживается помпой.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Никогда не подключалась</string>
+    <string name="pump_status_waking_up">Пробуждение</string>
+    <string name="pump_status_error_comm">Ошибка связи</string>
+    <string name="pump_status_timeout_comm">Таймаут связи</string>
+    <string name="pump_status_pump_unreachable">Помпа недоступна</string>
+    <string name="pump_status_invalid_config">Недопустимая конфигурация</string>
+    <string name="pump_status_active">Активно</string>
+    <string name="pump_status_sleeping">Сон</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Базал</string>
+    <string name="history_group_configuration">Конфигурация</string>
+    <string name="history_group_notification">Уведомления</string>
+    <string name="history_group_statistic">Статистика</string>
+    <string name="history_group_unknown">Неизвестные</string>
+    <string name="history_group_all">Все</string>
+    <string name="history_group_bolus">Болюсы</string>
+    <string name="history_group_prime">Заполнение инфузионной системы</string>
+    <string name="history_group_alarm">Оповещения об опасности</string>
+    <string name="history_group_glucose">Гликемия</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/medtronic/src/main/res/values-de-rDE/strings.xml
index 1f69ba6e95..2072943176 100644
--- a/medtronic/src/main/res/values-de-rDE/strings.xml
+++ b/medtronic/src/main/res/values-de-rDE/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">Nickel-Zink-Akku (erweiterte Ansicht)</string>
     <string name="medtronic_bolus_debugging">Fehlersuche Bolus/Behandlungen</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Fehler</string>
     <string name="medtronic_error_serial_not_set">Seriennummer nicht angegeben.</string>
     <string name="medtronic_error_serial_invalid">Seriennummer ungültig.</string>
     <string name="medtronic_error_pump_type_not_set">Pumpenart nicht angegeben.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Medtronic Pumpenverlauf</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Du hast den Bolus abgebrochen nachdem er bereits an die Pumpe übermittelt war. Da Medtronic-Pumpen den Abbrechen-Befehl nicht unterstützen, musst du den Bolus manuell abbrechen. Versetze die Pumpe in den Suspend-Modus und gehe dann auf Fortsetzen (wenn Du den Bolus nach wie vor abbrechen möchtest). Die App wird die Änderungen beim nächsten Update (weniger als 5 Minuten) anzeigen.</string>
     <string name="medtronic_cmd_cant_read_tbr">Aktuelle TBR konnte nicht gelesen werden.</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Hole Temporäre Basalraten</string>
     <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
     <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
+    <string name="medtronic_warning">Warnung</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Jetzt</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">her</string>
+    <string name="medtronic_notification_check_time_date">Bitte stelle die Uhrzeit der Pumpe ein</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Ein</string>
+    <string name="common_off">Aus</string>
     <string name="pump_time_updated">Pumpenzeit aktualisiert</string>
 </resources>
diff --git a/medtronic/src/main/res/values-fr-rFR/strings.xml b/medtronic/src/main/res/values-fr-rFR/strings.xml
index be7ffe6d35..c224b55dde 100644
--- a/medtronic/src/main/res/values-fr-rFR/strings.xml
+++ b/medtronic/src/main/res/values-fr-rFR/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (vue Étendue)</string>
     <string name="medtronic_bolus_debugging">Débogage de Bolus/Traitements</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Erreurs</string>
     <string name="medtronic_error_serial_not_set">Numéro de série non défini.</string>
     <string name="medtronic_error_serial_invalid">Numéro de série invalide.</string>
     <string name="medtronic_error_pump_type_not_set">Type de pompe non défini.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Historique de la pompe Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Vous avez annulé le Bolus, après avoir déjà été envoyé vers la pompe. Puisque la pompe Medtronic n\'accepte pas d\'annulation, vous devrez l\'annuler manuellement. Mettez la pompe en mode Suspendre et puis faites le Reprendre (si vous voulez encore annuler). L\'application va récupérer ces modifications à la prochaine mise à jour (en moins de 5 minutes).</string>
     <string name="medtronic_cmd_cant_read_tbr">Impossible de lire le DBT (TBR) actuel.</string>
@@ -68,9 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Obtenir le Basal Temporaire</string>
     <string name="medtronic_cmd_desc_set_tbr">Définir le Basal Temporaire</string>
     <string name="medtronic_cmd_desc_set_bolus">Définir le Bolus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pompe hors de portée</string>
+    <string name="medtronic_warning">Attention</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Maintenant</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">passé(e)s</string>
+    <string name="medtronic_notification_check_time_date">Mise à jour nécessaire de l\'heure de la pompe</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Activé</string>
     <string name="common_off">Off</string>
     <string name="pump_time_updated">Mise à jour de l\'heure de la pompe</string>
 </resources>
diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/medtronic/src/main/res/values-it-rIT/strings.xml
index e7fb73eace..2b07e16861 100644
--- a/medtronic/src/main/res/values-it-rIT/strings.xml
+++ b/medtronic/src/main/res/values-it-rIT/strings.xml
@@ -6,7 +6,7 @@
     <string name="medtronic_serial_number">Numero seriale micro</string>
     <string name="medtronic_pump_type">Tipo micro</string>
     <string name="medtronic_pump_frequency">Frequenza micro</string>
-    <string name="medtronic_pump_bolus_delay">Ritardo prima che il Bolo sia avviato (s)</string>
+    <string name="medtronic_pump_bolus_delay">Ritardo prima che il bolo sia avviato (s)</string>
     <string name="medtronic_pump_max_bolus">Max bolo su micro (U)</string>
     <string name="medtronic_pump_max_basal">Max basale su micro (U/h)</string>
     <string name="medtronic_pump_encoding">Codifica Medtronic</string>
@@ -16,7 +16,7 @@
     <string name="medtronic_pump_encoding_4b6b_rileylink">Codifica Hardware 4b6b</string>
     <string name="medtronic_custom_action_wake_and_tune">Risveglio e Sintonizzazione</string>
     <string name="medtronic_custom_action_clear_bolus_block">Cancella blocco bolo</string>
-    <string name="medtronic_custom_action_reset_rileylink">Reset Configurazione RileyLink</string>
+    <string name="medtronic_custom_action_reset_rileylink">Reset configurazione RileyLink</string>
     <string name="medtronic_pump_battery_select">Tipo batteria (Power view)</string>
     <string name="medtronic_pump_battery_no">Non selezionato (Simple view)</string>
     <string name="medtronic_pump_battery_alkaline">Alcalina (Extended view)</string>
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (Extended view)</string>
     <string name="medtronic_bolus_debugging">Debug Bolo/Trattamenti</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Errori</string>
     <string name="medtronic_error_serial_not_set"># seriale non impostato.</string>
     <string name="medtronic_error_serial_invalid"># seriale non valido.</string>
     <string name="medtronic_error_pump_type_not_set">Tipo micro non impostato.</string>
@@ -47,11 +48,12 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Storico micro Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Hai cancellato il bolo, dopo che era già stato impostato sul micro. Dal momento che il micro Medtronic non supporta la cancellazione, avrai bisogno di cancellare il bolo manualmente. Metti il micro in modalità sospensione e poi fallo ripartire (se vuoi ancora cancellare il bolo). L\'applicazione rileverà le modifiche al prossimo aggiornamento (in meno di 5 minuti).</string>
     <string name="medtronic_cmd_cant_read_tbr">Impossibile leggere il TBR corrente.</string>
     <string name="medtronic_cmd_cant_cancel_tbr_stop_op">Impossibile cancellare il TBR corrente. Arresto dell\'operazione.</string>
-    <string name="medtronic_cmd_set_profile_pattern_overflow">Impostazione del profilo fallita. A causa dei seguenti pattern, hai una velocità basale troppo grande: %1$s</string>
+    <string name="medtronic_cmd_set_profile_pattern_overflow">Impostazione del profilo fallita. A causa dei seguenti modelli, hai una velocità basale troppo grande: %1$s</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered">Il bolo non può essere erogato.</string>
     <string name="medtronic_cmd_bolus_could_not_be_delivered_no_insulin">Il bolo non può essere erogato perché la quantità di insulina disponibile (%1$.2f) è inferiore al bolo richiesto (%2$.2f).</string>
     <string name="medtronic_cmd_tbr_could_not_be_delivered">Il TBR non può essere impostato.</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Ottieni basale temporanea</string>
     <string name="medtronic_cmd_desc_set_tbr">Imposta basale temporanea</string>
     <string name="medtronic_cmd_desc_set_bolus">Imposta bolo</string>
+    <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
+    <string name="medtronic_warning">Avviso</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Adesso</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">fa</string>
+    <string name="medtronic_notification_check_time_date">Necessario aggiornare orologio micro</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">On</string>
+    <string name="common_off">Off</string>
     <string name="pump_time_updated">Ora del micro aggiornata</string>
 </resources>
diff --git a/medtronic/src/main/res/values-pt-rPT/strings.xml b/medtronic/src/main/res/values-pt-rPT/strings.xml
index 34d0748abd..4a47d027f5 100644
--- a/medtronic/src/main/res/values-pt-rPT/strings.xml
+++ b/medtronic/src/main/res/values-pt-rPT/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (Visualização estendida)</string>
     <string name="medtronic_bolus_debugging">Depuração de Bólus/Tratamentos</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Erros</string>
     <string name="medtronic_error_serial_not_set">Núm. Série não definido.</string>
     <string name="medtronic_error_serial_invalid">Núm. Série inválido.</string>
     <string name="medtronic_error_pump_type_not_set">Tipo de Bomba não definido.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Histórico da Bomba Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Cancelou o Bolus, depois de ele já ter sido definido na Bomba. Uma vez que a Bomba Medtronic não suporta cancelamento, precisará de cancelar manualmente. Coloque a Bomba no modo de Suspender e depois Retome (se ainda quiser cancelar). A aplicação irá obter as alterações, na próxima actualização (em menos de 5 minutos).</string>
     <string name="medtronic_cmd_cant_read_tbr">Não foi possível ler o DBT actual.</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Obter Basal Temporária</string>
     <string name="medtronic_cmd_desc_set_tbr">Definir Basal Temporária</string>
     <string name="medtronic_cmd_desc_set_bolus">Definir Bólus</string>
+    <string name="medtronic_pump_status_pump_unreachable">Bomba inacessível</string>
+    <string name="medtronic_warning">Aviso</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Agora</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">atrás</string>
+    <string name="medtronic_notification_check_time_date">Necesário actualizar relógio da bomba</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Ligado</string>
+    <string name="common_off">Desligado</string>
     <string name="pump_time_updated">Hora da bomba actualizada</string>
 </resources>
diff --git a/medtronic/src/main/res/values-ru-rRU/strings.xml b/medtronic/src/main/res/values-ru-rRU/strings.xml
index 853ba13e07..39bdb64c5a 100644
--- a/medtronic/src/main/res/values-ru-rRU/strings.xml
+++ b/medtronic/src/main/res/values-ru-rRU/strings.xml
@@ -48,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">Журнал событий помпы Medtronic</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Вы отменили болюс после того как он был задан на помпе. Поскольку помпа Medtronic не поддерживает отмену, нужно отменить его вручную. Переведите помпу в режим приостановки и затем сделайте Resume (если все еще хотите отменить). Приложение примет изменения при следующем обновлении (менее чем через 5 минут).</string>
     <string name="medtronic_cmd_cant_read_tbr">Не удалось прочитать текущий врем. базал TBR.</string>
@@ -69,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Получить временный базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Установить временный базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Настроить болюс</string>
+    <string name="medtronic_pump_status_pump_unreachable">Помпа недоступна</string>
+    <string name="medtronic_warning">Внимание</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Сейчас</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">тому назад</string>
+    <string name="medtronic_notification_check_time_date">Необходимо обновить часы помпы</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Вкл.</string>
+    <string name="common_off">Выкл.</string>
     <string name="pump_time_updated">Время на помпе обновлено</string>
 </resources>
diff --git a/rileylink/src/main/res/values-de-rDE/strings.xml b/rileylink/src/main/res/values-de-rDE/strings.xml
index f286f3c0e6..d5d5b4f9b3 100644
--- a/rileylink/src/main/res/values-de-rDE/strings.xml
+++ b/rileylink/src/main/res/values-de-rDE/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Ausgewählt</string>
     <string name="rileylink_scanner_title">RileyLink Scan</string>
     <string name="location_yes">Aktivieren</string>
+    <string name="location_no">Nein</string>
     <string name="rileylink_scanner_scanning">Scannt</string>
     <string name="rileylink_scanner_scanning_finished">Scannen abgeschlossen</string>
     <string name="rileylink_scanner_scanning_error">Scanfehler: %1$d</string>
+    <string name="common_never">Nie</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Einstellungen</string>
     <string name="rileylink_settings_tab2">Verlauf</string>
@@ -35,18 +37,29 @@
     <string name="rileylink_state_rl_error">RileyLink Fehler</string>
     <string name="rileylink_state_pc_tune_up">RileyLink und Pumpe einstellen</string>
     <string name="rileylink_state_pc_error">Problem beim Verbinden mit Pumpe</string>
+    <string name="rileylink_state_connected">Verbunden</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Gerät ist kein RileyLink</string>
     <string name="rileylink_error_unreachable">RileyLink nicht erreichbar</string>
     <string name="rileylink_error_bt_disabled">Bluetooth ist deaktiviert</string>
     <string name="rileylink_error_no_bt_adapter">Kein Bluetooth-Adapter</string>
     <string name="rileylink_error_tuneup_failed">TuneUp fehlgeschlagen</string>
+    <string name="rileylink_error_pump_unreachable">Pumpe nicht erreichbar</string>
     <string name="rileylink_error_pod_unreachable">Pod nicht erreichbar</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic Pumpe</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Kanada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Weltweit (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d Tag</item>
+        <item quantity="other">%1$d Tage</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d Stunde</item>
+        <item quantity="other">%1$d Stunden</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->
diff --git a/rileylink/src/main/res/values-fr-rFR/strings.xml b/rileylink/src/main/res/values-fr-rFR/strings.xml
index 3bcfa7ca8a..590a06408e 100644
--- a/rileylink/src/main/res/values-fr-rFR/strings.xml
+++ b/rileylink/src/main/res/values-fr-rFR/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Sélectionné</string>
     <string name="rileylink_scanner_title">Scanner RileyLink</string>
     <string name="location_yes">Activer</string>
+    <string name="location_no">Non</string>
     <string name="rileylink_scanner_scanning">Recherche en cours</string>
     <string name="rileylink_scanner_scanning_finished">Recherche finie</string>
     <string name="rileylink_scanner_scanning_error">Erreur de recherche : %1$d</string>
+    <string name="common_never">Jamais</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Paramètres</string>
     <string name="rileylink_settings_tab2">Historique</string>
@@ -42,12 +44,22 @@
     <string name="rileylink_error_bt_disabled">Bluetooth est désactivé</string>
     <string name="rileylink_error_no_bt_adapter">Aucun adaptateur Bluetooth</string>
     <string name="rileylink_error_tuneup_failed">Échec du réglage</string>
+    <string name="rileylink_error_pump_unreachable">Pompe hors de portée</string>
     <string name="rileylink_error_pod_unreachable">Pod inaccessible</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pompe Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Mondial (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d jour</item>
+        <item quantity="other">%1$d jours</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d heure</item>
+        <item quantity="other">%1$d heures</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->
diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/rileylink/src/main/res/values-it-rIT/strings.xml
index f56a5332fb..db034c4f67 100644
--- a/rileylink/src/main/res/values-it-rIT/strings.xml
+++ b/rileylink/src/main/res/values-it-rIT/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Selezionato</string>
     <string name="rileylink_scanner_title">Scansione RileyLink</string>
     <string name="location_yes">Abilita</string>
+    <string name="location_no">No</string>
     <string name="rileylink_scanner_scanning">Scansione</string>
     <string name="rileylink_scanner_scanning_finished">Scansione terminata</string>
     <string name="rileylink_scanner_scanning_error">Errore scansione: %1$d</string>
+    <string name="common_never">Mai</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Impostazioni</string>
     <string name="rileylink_settings_tab2">Storico</string>
@@ -31,22 +33,33 @@
     <string name="rileylink_state_bt_error">Errore bluetooth</string>
     <string name="rileylink_state_bt_ready">Bluetooth pronto</string>
     <string name="rileylink_state_not_started">Non avviato</string>
-    <string name="rileylink_state_rl_init">Inializzazione RileyLink…</string>
+    <string name="rileylink_state_rl_init">Inizializzazione RileyLink…</string>
     <string name="rileylink_state_rl_error">Errore RileyLink</string>
     <string name="rileylink_state_pc_tune_up">Sintonizzazione RileyLink e micro</string>
     <string name="rileylink_state_pc_error">Problema di connessione al micro</string>
+    <string name="rileylink_state_connected">Connesso</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Il dispositivo non è RileyLink</string>
-    <string name="rileylink_error_unreachable">RileyLink non raggiungibile</string>
+    <string name="rileylink_error_unreachable">RileyLink irraggiungibile</string>
     <string name="rileylink_error_bt_disabled">Bluetooth disabilitato</string>
     <string name="rileylink_error_no_bt_adapter">Nessun adattatore bluetooth</string>
     <string name="rileylink_error_tuneup_failed">Sintonizzazione fallita</string>
+    <string name="rileylink_error_pump_unreachable">Micro irraggiungibile</string>
     <string name="rileylink_error_pod_unreachable">Pod irraggiungibile</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Micro Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Globale (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d giorno</item>
+        <item quantity="other">%1$d giorni</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d ora</item>
+        <item quantity="other">%1$d ore</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->
diff --git a/rileylink/src/main/res/values-pt-rPT/strings.xml b/rileylink/src/main/res/values-pt-rPT/strings.xml
index 03b123f0dd..45e3cf8e45 100644
--- a/rileylink/src/main/res/values-pt-rPT/strings.xml
+++ b/rileylink/src/main/res/values-pt-rPT/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Seleccionado</string>
     <string name="rileylink_scanner_title">Procura RileyLink</string>
     <string name="location_yes">Activar</string>
+    <string name="location_no">Não</string>
     <string name="rileylink_scanner_scanning">A procurar</string>
     <string name="rileylink_scanner_scanning_finished">Procura terminada</string>
     <string name="rileylink_scanner_scanning_error">Erro de Procura: %1$d</string>
+    <string name="common_never">Nunca</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Definições</string>
     <string name="rileylink_settings_tab2">Histórico</string>
@@ -35,18 +37,29 @@
     <string name="rileylink_state_rl_error">Erro no RileyLink</string>
     <string name="rileylink_state_pc_tune_up">A ajustar RileyLink e a Bomba</string>
     <string name="rileylink_state_pc_error">Problema ao ligar à Bomba</string>
+    <string name="rileylink_state_connected">Ligado</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Dispositivo não é RileyLink</string>
     <string name="rileylink_error_unreachable">RileyLink inacessível</string>
     <string name="rileylink_error_bt_disabled">Bluetooth desactivado</string>
     <string name="rileylink_error_no_bt_adapter">Nenhum Adaptador Bluetooth</string>
     <string name="rileylink_error_tuneup_failed">TuneUp Falhou</string>
+    <string name="rileylink_error_pump_unreachable">Bomba inacessível</string>
     <string name="rileylink_error_pod_unreachable">Pod inacessível</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Bomba Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">EUA &amp; Canadá (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Em todo o Mundo (868 Mhz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d dia</item>
+        <item quantity="other">%1$d dias</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hora</item>
+        <item quantity="other">%1$d horas</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->
diff --git a/rileylink/src/main/res/values-ru-rRU/strings.xml b/rileylink/src/main/res/values-ru-rRU/strings.xml
index ea9fef9b25..946769e149 100644
--- a/rileylink/src/main/res/values-ru-rRU/strings.xml
+++ b/rileylink/src/main/res/values-ru-rRU/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Выбрано</string>
     <string name="rileylink_scanner_title">Сканирование RileyLink</string>
     <string name="location_yes">Включить</string>
+    <string name="location_no">Нет</string>
     <string name="rileylink_scanner_scanning">Сканирование</string>
     <string name="rileylink_scanner_scanning_finished">Сканирование завершено</string>
     <string name="rileylink_scanner_scanning_error">Ошибка сканирования: %1$d</string>
+    <string name="common_never">Никогда</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Настройки</string>
     <string name="rileylink_settings_tab2">История</string>
@@ -42,12 +44,26 @@
     <string name="rileylink_error_bt_disabled">Bluetooth выключен</string>
     <string name="rileylink_error_no_bt_adapter">Нет Bluetooth-адаптера</string>
     <string name="rileylink_error_tuneup_failed">Ошибка TuneUp</string>
+    <string name="rileylink_error_pump_unreachable">Помпа недоступна</string>
     <string name="rileylink_error_pod_unreachable">POD недоступен</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Помпа Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 МГц)</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Глобальн (868 Мгц)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d день</item>
+        <item quantity="few">%1$d дня</item>
+        <item quantity="many">%1$d дней</item>
+        <item quantity="other">%1$d дн</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="few">%1$d ч</item>
+        <item quantity="many">%1$d ч</item>
+        <item quantity="other">%1$d ч</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->

From 6d63bdca07a5419271f5e40dff780ed70bd65a10 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 8 Aug 2020 17:53:28 +0200
Subject: [PATCH 375/400] Add 7 trend arrows icons to replace text

---
 app/src/main/res/drawable/ic_doubledown.xml    | 12 ++++++++++++
 app/src/main/res/drawable/ic_doubleup.xml      | 12 ++++++++++++
 app/src/main/res/drawable/ic_flat.xml          |  9 +++++++++
 app/src/main/res/drawable/ic_fortyfivedown.xml |  9 +++++++++
 app/src/main/res/drawable/ic_fortyfiveup.xml   |  9 +++++++++
 app/src/main/res/drawable/ic_invalid.xml       | 18 ++++++++++++++++++
 app/src/main/res/drawable/ic_singledown.xml    |  9 +++++++++
 app/src/main/res/drawable/ic_singleup.xml      |  9 +++++++++
 icons/ic_DoubleDown.svg                        | 12 ++++++++++++
 icons/ic_DoubleUp.svg                          | 12 ++++++++++++
 icons/ic_Flat.svg                              |  9 +++++++++
 icons/ic_FortyFiveDown.svg                     |  9 +++++++++
 icons/ic_FortyFiveUp.svg                       |  9 +++++++++
 icons/ic_Invalid.svg                           | 18 ++++++++++++++++++
 icons/ic_SingleDown.svg                        |  9 +++++++++
 icons/ic_SingleUp.svg                          |  9 +++++++++
 16 files changed, 174 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_doubledown.xml
 create mode 100644 app/src/main/res/drawable/ic_doubleup.xml
 create mode 100644 app/src/main/res/drawable/ic_flat.xml
 create mode 100644 app/src/main/res/drawable/ic_fortyfivedown.xml
 create mode 100644 app/src/main/res/drawable/ic_fortyfiveup.xml
 create mode 100644 app/src/main/res/drawable/ic_invalid.xml
 create mode 100644 app/src/main/res/drawable/ic_singledown.xml
 create mode 100644 app/src/main/res/drawable/ic_singleup.xml
 create mode 100644 icons/ic_DoubleDown.svg
 create mode 100644 icons/ic_DoubleUp.svg
 create mode 100644 icons/ic_Flat.svg
 create mode 100644 icons/ic_FortyFiveDown.svg
 create mode 100644 icons/ic_FortyFiveUp.svg
 create mode 100644 icons/ic_Invalid.svg
 create mode 100644 icons/ic_SingleDown.svg
 create mode 100644 icons/ic_SingleUp.svg

diff --git a/app/src/main/res/drawable/ic_doubledown.xml b/app/src/main/res/drawable/ic_doubledown.xml
new file mode 100644
index 0000000000..1b6174f3d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_doubledown.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.702,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063H6.961l0,15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L2.702,16.281z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M10.676,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063h-2.104v15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L10.676,16.281z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_doubleup.xml b/app/src/main/res/drawable/ic_doubleup.xml
new file mode 100644
index 0000000000..32e541163a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_doubleup.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2.702,7.719c1.952,-1.81 4.279,-4.076 5.31,-5.654V2.063c0,0 0.001,0.001 0.001,0.001c0,0 0.001,-0.001 0.001,-0.001v0.002c1.032,1.578 3.359,3.844 5.31,5.654L11.999,9.54c0,0 -1.578,-1.408 -2.934,-2.728v15.125H6.961l0,-15.125C5.605,8.132 4.027,9.54 4.027,9.54L2.702,7.719z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M10.676,7.719c1.952,-1.81 4.279,-4.076 5.31,-5.654V2.063c0,0 0.001,0.001 0.001,0.001c0,0 0.001,-0.001 0.001,-0.001v0.002c1.032,1.578 3.359,3.844 5.31,5.654L19.973,9.54c0,0 -1.578,-1.408 -2.934,-2.728v15.125h-2.104V6.813c-1.356,1.319 -2.934,2.728 -2.934,2.728L10.676,7.719z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_flat.xml b/app/src/main/res/drawable/ic_flat.xml
new file mode 100644
index 0000000000..ed4986a65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flat.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.281,17.311c1.81,-1.952 4.076,-4.279 5.654,-5.31h0.002c0,0 -0.001,-0.001 -0.001,-0.001c0,0 0.001,-0.001 0.001,-0.001h-0.002c-1.578,-1.032 -3.844,-3.359 -5.654,-5.31L14.46,8.014c0,0 1.408,1.578 2.728,2.934H2.063v2.104h15.125c-1.319,1.356 -2.728,2.934 -2.728,2.934L16.281,17.311z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fortyfivedown.xml b/app/src/main/res/drawable/ic_fortyfivedown.xml
new file mode 100644
index 0000000000..199b8f4984
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fortyfivedown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.272,18.783c2.66,-0.1 5.908,-0.143 7.753,0.243l0.001,0.001c0,0 0,-0.001 0,-0.001c0,0 0.001,0 0.001,0l-0.001,-0.001c-0.386,-1.845 -0.343,-5.093 -0.243,-7.753l-2.225,-0.351c0,0 -0.12,2.111 -0.146,4.003L5.717,4.229L4.229,5.717l10.695,10.695c-1.892,0.026 -4.003,0.146 -4.003,0.146L11.272,18.783z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fortyfiveup.xml b/app/src/main/res/drawable/ic_fortyfiveup.xml
new file mode 100644
index 0000000000..24814d6714
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fortyfiveup.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.783,12.728c-0.1,-2.66 -0.143,-5.908 0.243,-7.753l0.001,-0.001c0,0 -0.001,0 -0.001,0c0,0 0,-0.001 0,-0.001l-0.001,0.001c-1.845,0.386 -5.093,0.343 -7.753,0.243l-0.351,2.225c0,0 2.111,0.12 4.003,0.146L4.229,18.283l1.488,1.488L16.412,9.076c0.026,1.892 0.146,4.003 0.146,4.003L18.783,12.728z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_invalid.xml b/app/src/main/res/drawable/ic_invalid.xml
new file mode 100644
index 0000000000..ab59d070b2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_invalid.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.35,19.561m-1.147,0a1.147,1.147 0,1 1,2.294 0a1.147,1.147 0,1 1,-2.294 0"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M17.301,16.804c-0.459,0 -0.83,-0.372 -0.83,-0.831c0,-2.985 1.391,-4.027 2.51,-4.864c0.937,-0.702 1.614,-1.209 1.614,-2.849c0,-2.262 -2.173,-2.965 -2.964,-2.965c-1.705,0 -3.083,1.022 -3.778,2.804c-0.167,0.427 -0.65,0.64 -1.075,0.471c-0.427,-0.167 -0.638,-0.648 -0.471,-1.075c0.944,-2.417 2.935,-3.86 5.325,-3.86c1.865,0 4.626,1.47 4.626,4.626c0,2.472 -1.264,3.418 -2.28,4.178c-1.031,0.772 -1.844,1.38 -1.844,3.535C18.131,16.432 17.76,16.804 17.301,16.804z"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M6.846,19.561m-1.147,0a1.147,1.147 0,1 1,2.294 0a1.147,1.147 0,1 1,-2.294 0"
+      android:fillColor="#36FF00"/>
+  <path
+      android:pathData="M6.797,16.804c-0.459,0 -0.83,-0.372 -0.83,-0.831c0,-2.985 1.391,-4.027 2.51,-4.864c0.937,-0.702 1.614,-1.209 1.614,-2.849c0,-2.262 -2.173,-2.965 -2.964,-2.965c-1.705,0 -3.083,1.022 -3.778,2.804c-0.167,0.427 -0.65,0.64 -1.075,0.471C1.845,8.403 1.635,7.922 1.801,7.495c0.944,-2.417 2.935,-3.86 5.325,-3.86c1.865,0 4.626,1.47 4.626,4.626c0,2.472 -1.264,3.418 -2.28,4.178c-1.031,0.772 -1.844,1.38 -1.844,3.535C7.627,16.432 7.256,16.804 6.797,16.804z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_singledown.xml b/app/src/main/res/drawable/ic_singledown.xml
new file mode 100644
index 0000000000..ec4c30af82
--- /dev/null
+++ b/app/src/main/res/drawable/ic_singledown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.689,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063h-2.104v15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L6.689,16.281z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_singleup.xml b/app/src/main/res/drawable/ic_singleup.xml
new file mode 100644
index 0000000000..9ec675864b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_singleup.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.102,7.719c-1.952,-1.81 -4.279,-4.076 -5.31,-5.654V2.063c0,0 -0.001,0.001 -0.001,0.001c0,0 -0.001,-0.001 -0.001,-0.001v0.002c-1.032,1.578 -3.359,3.844 -5.31,5.654L7.805,9.54c0,0 1.578,-1.408 2.934,-2.728v15.125h2.104V6.813c1.356,1.319 2.934,2.728 2.934,2.728L17.102,7.719z"
+      android:fillColor="#36FF00"/>
+</vector>
diff --git a/icons/ic_DoubleDown.svg b/icons/ic_DoubleDown.svg
new file mode 100644
index 0000000000..59a49688fd
--- /dev/null
+++ b/icons/ic_DoubleDown.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_DoubleDown">
+    <path fill="#36FF00" d="M2.702,16.281c1.952,1.81,4.279,4.076,5.31,5.654v0.002c0,0,0.001-0.001,0.001-0.001
+        c0,0,0.001,0.001,0.001,0.001v-0.002c1.032-1.578,3.359-3.844,5.31-5.654l-1.325-1.821c0,0-1.578,1.408-2.934,2.728V2.063H6.961
+        l0,15.125c-1.356-1.319-2.934-2.728-2.934-2.728L2.702,16.281z"/>
+    <path fill="#36FF00" d="M10.676,16.281c1.952,1.81,4.279,4.076,5.31,5.654v0.002c0,0,0.001-0.001,0.001-0.001
+        c0,0,0.001,0.001,0.001,0.001v-0.002c1.032-1.578,3.359-3.844,5.31-5.654l-1.325-1.821c0,0-1.578,1.408-2.934,2.728V2.063h-2.104
+        v15.125c-1.356-1.319-2.934-2.728-2.934-2.728L10.676,16.281z"/>
+</g>
+</svg>
diff --git a/icons/ic_DoubleUp.svg b/icons/ic_DoubleUp.svg
new file mode 100644
index 0000000000..ffe05f5740
--- /dev/null
+++ b/icons/ic_DoubleUp.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_DoubleUp">
+    <path fill="#36FF00" d="M2.702,7.719c1.952-1.81,4.279-4.076,5.31-5.654V2.063c0,0,0.001,0.001,0.001,0.001
+        c0,0,0.001-0.001,0.001-0.001v0.002c1.032,1.578,3.359,3.844,5.31,5.654L11.999,9.54c0,0-1.578-1.408-2.934-2.728v15.125H6.961
+        l0-15.125C5.605,8.132,4.027,9.54,4.027,9.54L2.702,7.719z"/>
+    <path fill="#36FF00" d="M10.676,7.719c1.952-1.81,4.279-4.076,5.31-5.654V2.063c0,0,0.001,0.001,0.001,0.001
+        c0,0,0.001-0.001,0.001-0.001v0.002c1.032,1.578,3.359,3.844,5.31,5.654L19.973,9.54c0,0-1.578-1.408-2.934-2.728v15.125h-2.104
+        V6.813c-1.356,1.319-2.934,2.728-2.934,2.728L10.676,7.719z"/>
+</g>
+</svg>
diff --git a/icons/ic_Flat.svg b/icons/ic_Flat.svg
new file mode 100644
index 0000000000..1ec4fa8e6c
--- /dev/null
+++ b/icons/ic_Flat.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_Flat">
+	<path fill="#36FF00" d="M16.281,17.311c1.81-1.952,4.076-4.279,5.654-5.31h0.002c0,0-0.001-0.001-0.001-0.001
+		c0,0,0.001-0.001,0.001-0.001h-0.002c-1.578-1.032-3.844-3.359-5.654-5.31L14.46,8.014c0,0,1.408,1.578,2.728,2.934H2.063v2.104
+		h15.125c-1.319,1.356-2.728,2.934-2.728,2.934L16.281,17.311z"/>
+</g>
+</svg>
diff --git a/icons/ic_FortyFiveDown.svg b/icons/ic_FortyFiveDown.svg
new file mode 100644
index 0000000000..5ea545a3a4
--- /dev/null
+++ b/icons/ic_FortyFiveDown.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_FortyFiveDown">
+	<path fill="#36FF00" d="M11.272,18.783c2.66-0.1,5.908-0.143,7.753,0.243l0.001,0.001c0,0,0-0.001,0-0.001c0,0,0.001,0,0.001,0
+		l-0.001-0.001c-0.386-1.845-0.343-5.093-0.243-7.753l-2.225-0.351c0,0-0.12,2.111-0.146,4.003L5.717,4.229L4.229,5.717
+		l10.695,10.695c-1.892,0.026-4.003,0.146-4.003,0.146L11.272,18.783z"/>
+</g>
+</svg>
diff --git a/icons/ic_FortyFiveUp.svg b/icons/ic_FortyFiveUp.svg
new file mode 100644
index 0000000000..91d223b371
--- /dev/null
+++ b/icons/ic_FortyFiveUp.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_FortyFiveUp">
+	<path fill="#36FF00" d="M18.783,12.728c-0.1-2.66-0.143-5.908,0.243-7.753l0.001-0.001c0,0-0.001,0-0.001,0c0,0,0-0.001,0-0.001
+		l-0.001,0.001c-1.845,0.386-5.093,0.343-7.753,0.243l-0.351,2.225c0,0,2.111,0.12,4.003,0.146L4.229,18.283l1.488,1.488
+		L16.412,9.076c0.026,1.892,0.146,4.003,0.146,4.003L18.783,12.728z"/>
+</g>
+</svg>
diff --git a/icons/ic_Invalid.svg b/icons/ic_Invalid.svg
new file mode 100644
index 0000000000..79de4c9ad7
--- /dev/null
+++ b/icons/ic_Invalid.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_Invalid">
+    <circle fill="#36FF00" cx="17.35" cy="19.561" r="1.147"/>
+    <path fill="#36FF00" d="M17.301,16.804c-0.459,0-0.83-0.372-0.83-0.831c0-2.985,1.391-4.027,2.51-4.864
+        c0.937-0.702,1.614-1.209,1.614-2.849c0-2.262-2.173-2.965-2.964-2.965c-1.705,0-3.083,1.022-3.778,2.804
+        c-0.167,0.427-0.65,0.64-1.075,0.471c-0.427-0.167-0.638-0.648-0.471-1.075c0.944-2.417,2.935-3.86,5.325-3.86
+        c1.865,0,4.626,1.47,4.626,4.626c0,2.472-1.264,3.418-2.28,4.178c-1.031,0.772-1.844,1.38-1.844,3.535
+        C18.131,16.432,17.76,16.804,17.301,16.804z"/>
+    <circle fill="#36FF00" cx="6.846" cy="19.561" r="1.147"/>
+    <path fill="#36FF00" d="M6.797,16.804c-0.459,0-0.83-0.372-0.83-0.831c0-2.985,1.391-4.027,2.51-4.864
+        c0.937-0.702,1.614-1.209,1.614-2.849c0-2.262-2.173-2.965-2.964-2.965c-1.705,0-3.083,1.022-3.778,2.804
+        c-0.167,0.427-0.65,0.64-1.075,0.471C1.845,8.403,1.635,7.922,1.801,7.495c0.944-2.417,2.935-3.86,5.325-3.86
+        c1.865,0,4.626,1.47,4.626,4.626c0,2.472-1.264,3.418-2.28,4.178c-1.031,0.772-1.844,1.38-1.844,3.535
+        C7.627,16.432,7.256,16.804,6.797,16.804z"/>
+</g>
+</svg>
diff --git a/icons/ic_SingleDown.svg b/icons/ic_SingleDown.svg
new file mode 100644
index 0000000000..ca673aee12
--- /dev/null
+++ b/icons/ic_SingleDown.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_SingleDown">
+	<path fill="#36FF00" d="M6.689,16.281c1.952,1.81,4.279,4.076,5.31,5.654v0.002c0,0,0.001-0.001,0.001-0.001
+		c0,0,0.001,0.001,0.001,0.001v-0.002c1.032-1.578,3.359-3.844,5.31-5.654l-1.325-1.821c0,0-1.578,1.408-2.934,2.728V2.063h-2.104
+		v15.125c-1.356-1.319-2.934-2.728-2.934-2.728L6.689,16.281z"/>
+</g>
+</svg>
diff --git a/icons/ic_SingleUp.svg b/icons/ic_SingleUp.svg
new file mode 100644
index 0000000000..b508a6fc93
--- /dev/null
+++ b/icons/ic_SingleUp.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_SingleUp">
+	<path fill="#36FF00" d="M17.102,7.719c-1.952-1.81-4.279-4.076-5.31-5.654V2.063c0,0-0.001,0.001-0.001,0.001
+		c0,0-0.001-0.001-0.001-0.001v0.002c-1.032,1.578-3.359,3.844-5.31,5.654L7.805,9.54c0,0,1.578-1.408,2.934-2.728v15.125h2.104
+		V6.813c1.356,1.319,2.934,2.728,2.934,2.728L17.102,7.719z"/>
+</g>
+</svg>

From adc71aae08f6e15eab6690e0f8f79b00882bad04 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sat, 8 Aug 2020 19:09:21 +0200
Subject: [PATCH 376/400] Update Overview Layout for Arrow icons Add a
 directionToIcon function in BGReading Move arrow icons to core

---
 .../general/overview/OverviewFragment.kt      |  5 ++--
 .../main/res/layout/overview_info_layout.xml  | 15 +++++------
 .../nightscout/androidaps/db/BgReading.java   | 26 +++++++++++++++++++
 .../src/main/res/drawable/ic_doubledown.xml   |  0
 .../src/main/res/drawable/ic_doubleup.xml     |  0
 .../src/main/res/drawable/ic_flat.xml         |  0
 .../main/res/drawable/ic_fortyfivedown.xml    |  0
 .../src/main/res/drawable/ic_fortyfiveup.xml  |  0
 .../src/main/res/drawable/ic_invalid.xml      |  0
 .../src/main/res/drawable/ic_singledown.xml   |  0
 .../src/main/res/drawable/ic_singleup.xml     |  0
 11 files changed, 34 insertions(+), 12 deletions(-)
 rename {app => core}/src/main/res/drawable/ic_doubledown.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_doubleup.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_flat.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_fortyfivedown.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_fortyfiveup.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_invalid.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_singledown.xml (100%)
 rename {app => core}/src/main/res/drawable/ic_singleup.xml (100%)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 240a396d92..595be6943f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -179,7 +179,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if (smallWidth) overview_arrow?.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 35f)
         overview_pumpstatus?.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
 
         overview_notifications?.setHasFixedSize(false)
@@ -567,8 +566,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             overview_bg?.text = lastBG.valueToUnitsToString(units)
             overview_bg?.setTextColor(color)
-            overview_arrow?.text = lastBG.directionToSymbol(databaseHelper)
-            overview_arrow?.setTextColor(color)
+            overview_arrow?.setImageResource(lastBG.directionToIcon(databaseHelper))
+            overview_arrow?.setColorFilter(color)
 
             val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
             if (glucoseStatus != null) {
diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml
index 46b9ab16f4..193563ee09 100644
--- a/app/src/main/res/layout/overview_info_layout.xml
+++ b/app/src/main/res/layout/overview_info_layout.xml
@@ -17,21 +17,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+
+    <ImageView
         android:id="@+id/overview_arrow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:paddingStart="-2dp"
-        android:paddingEnd="0dp"
-        android:text="→"
-        android:textSize="42sp"
-        android:textStyle="bold"
+        android:layout_gravity="center_vertical"
         app:layout_constraintEnd_toStartOf="@+id/overview_deltas_llayout"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/overview_bg"
-        app:layout_constraintTop_toTopOf="@+id/overview_bg" />
-
+        app:layout_constraintTop_toTopOf="@+id/overview_bg"
+        android:paddingTop="18dp"
+        android:src="@drawable/ic_flat" />
 
     <LinearLayout
         android:id="@+id/overview_deltas_llayout"
diff --git a/core/src/main/java/info/nightscout/androidaps/db/BgReading.java b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
index 89ef6b473a..5046aed701 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/BgReading.java
@@ -113,6 +113,32 @@ public class BgReading implements DataPointWithLabelInterface {
         return symbol;
     }
 
+
+    public int directionToIcon(DatabaseHelperInterface databaseHelper) {
+        int symbol = 0;
+        if (direction == null)
+            direction = calculateDirection(databaseHelper);
+
+        if (direction.compareTo("DoubleDown") == 0) {
+            symbol = R.drawable.ic_doubledown;
+        } else if (direction.compareTo("SingleDown") == 0) {
+            symbol = R.drawable.ic_singledown;
+        } else if (direction.compareTo("FortyFiveDown") == 0) {
+            symbol = R.drawable.ic_fortyfivedown;;
+        } else if (direction.compareTo("Flat") == 0) {
+            symbol = R.drawable.ic_flat;;
+        } else if (direction.compareTo("FortyFiveUp") == 0) {
+            symbol = R.drawable.ic_fortyfiveup;
+        } else if (direction.compareTo("SingleUp") == 0) {
+            symbol = R.drawable.ic_singleup;
+        } else if (direction.compareTo("DoubleUp") == 0) {
+            symbol = R.drawable.ic_doubleup;
+        } else if (isSlopeNameInvalid(direction)) {
+            symbol = R.drawable.ic_invalid;
+        }
+        return symbol;
+    }
+
     private static boolean isSlopeNameInvalid(String direction) {
         return direction.compareTo("NOT_COMPUTABLE") == 0 ||
                 direction.compareTo("NOT COMPUTABLE") == 0 ||
diff --git a/app/src/main/res/drawable/ic_doubledown.xml b/core/src/main/res/drawable/ic_doubledown.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_doubledown.xml
rename to core/src/main/res/drawable/ic_doubledown.xml
diff --git a/app/src/main/res/drawable/ic_doubleup.xml b/core/src/main/res/drawable/ic_doubleup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_doubleup.xml
rename to core/src/main/res/drawable/ic_doubleup.xml
diff --git a/app/src/main/res/drawable/ic_flat.xml b/core/src/main/res/drawable/ic_flat.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_flat.xml
rename to core/src/main/res/drawable/ic_flat.xml
diff --git a/app/src/main/res/drawable/ic_fortyfivedown.xml b/core/src/main/res/drawable/ic_fortyfivedown.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fortyfivedown.xml
rename to core/src/main/res/drawable/ic_fortyfivedown.xml
diff --git a/app/src/main/res/drawable/ic_fortyfiveup.xml b/core/src/main/res/drawable/ic_fortyfiveup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fortyfiveup.xml
rename to core/src/main/res/drawable/ic_fortyfiveup.xml
diff --git a/app/src/main/res/drawable/ic_invalid.xml b/core/src/main/res/drawable/ic_invalid.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_invalid.xml
rename to core/src/main/res/drawable/ic_invalid.xml
diff --git a/app/src/main/res/drawable/ic_singledown.xml b/core/src/main/res/drawable/ic_singledown.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_singledown.xml
rename to core/src/main/res/drawable/ic_singledown.xml
diff --git a/app/src/main/res/drawable/ic_singleup.xml b/core/src/main/res/drawable/ic_singleup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_singleup.xml
rename to core/src/main/res/drawable/ic_singleup.xml

From b70c6c9f1b293290e6dce7847dd45360ba0eddcf Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 9 Aug 2020 10:49:54 +0200
Subject: [PATCH 377/400] Update BGSourceFragment Arrow color a little bit
 lighter than text (don't find exact text color) Default color for arrows
 swtiched to white

---
 .../plugins/source/BGSourceFragment.kt        |  5 ++--
 app/src/main/res/layout/bgsource_item.xml     |  9 +++++++-
 .../nightscout/androidaps/db/BgReadingTest.kt | 23 +++++++++++++++++++
 core/src/main/res/drawable/ic_doubledown.xml  |  4 ++--
 core/src/main/res/drawable/ic_doubleup.xml    |  4 ++--
 core/src/main/res/drawable/ic_flat.xml        |  2 +-
 .../main/res/drawable/ic_fortyfivedown.xml    |  2 +-
 core/src/main/res/drawable/ic_fortyfiveup.xml |  2 +-
 core/src/main/res/drawable/ic_invalid.xml     |  8 +++----
 core/src/main/res/drawable/ic_singledown.xml  |  2 +-
 core/src/main/res/drawable/ic_singleup.xml    |  2 +-
 11 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
index b01ba8d470..2b0d38fab8 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -86,7 +87,7 @@ class BGSourceFragment : DaggerFragment() {
             holder.invalid.visibility = if (!bgReading.isValid) View.VISIBLE else View.GONE
             holder.date.text = dateUtil.dateAndTimeString(bgReading.date)
             holder.value.text = bgReading.valueToUnitsToString(profileFunction.getUnits())
-            holder.direction.text = bgReading.directionToSymbol(databaseHelper)
+            holder.direction.setImageResource(bgReading.directionToIcon(databaseHelper))
             holder.remove.tag = bgReading
         }
 
@@ -97,7 +98,7 @@ class BGSourceFragment : DaggerFragment() {
         inner class BgReadingsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             var date: TextView = itemView.findViewById(R.id.bgsource_date)
             var value: TextView = itemView.findViewById(R.id.bgsource_value)
-            var direction: TextView = itemView.findViewById(R.id.bgsource_direction)
+            var direction: ImageView = itemView.findViewById(R.id.bgsource_direction)
             var invalid: TextView = itemView.findViewById(R.id.invalid_sign)
             var ns: TextView = itemView.findViewById(R.id.ns_sign)
             var remove: TextView = itemView.findViewById(R.id.bgsource_remove)
diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index 5d1842b8c6..f7d5d54d57 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -34,7 +34,7 @@
                 android:paddingStart="10dp"
                 android:text="Name"
                 android:textStyle="bold" />
-
+<!--
             <TextView
                 android:id="@+id/bgsource_direction"
                 android:layout_width="wrap_content"
@@ -42,6 +42,13 @@
                 android:layout_weight="1"
                 android:paddingStart="10dp"
                 android:text="-" />
+-->
+            <ImageView
+                android:id="@+id/bgsource_direction"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/ic_flat" />
 
             <TextView
                 android:id="@+id/ns_sign"
diff --git a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
index 4b930d4947..47417786de 100644
--- a/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/db/BgReadingTest.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
 import info.nightscout.androidaps.logging.L
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
+import info.nightscout.androidaps.core.R
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
@@ -76,6 +77,28 @@ class BgReadingTest : TestBase() {
         Assert.assertEquals("??", bgReading.directionToSymbol(databaseHelper))
     }
 
+    @Test
+    fun directionToIcon() {
+        val bgReading = BgReading(injector)
+        bgReading.direction = "DoubleDown"
+        Assert.assertEquals(R.drawable.ic_doubledown, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "SingleDown"
+        Assert.assertEquals(R.drawable.ic_singledown, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "FortyFiveDown"
+        Assert.assertEquals(R.drawable.ic_fortyfivedown, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "Flat"
+        Assert.assertEquals(R.drawable.ic_flat, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "FortyFiveUp"
+        Assert.assertEquals(R.drawable.ic_fortyfiveup, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "SingleUp"
+        Assert.assertEquals(R.drawable.ic_singleup, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "DoubleUp"
+        Assert.assertEquals(R.drawable.ic_doubleup, bgReading.directionToIcon(databaseHelper))
+        bgReading.direction = "OUT OF RANGE"
+        Assert.assertEquals(R.drawable.ic_invalid, bgReading.directionToIcon(databaseHelper))
+    }
+
+
     @Test fun dateTest() {
         val bgReading = BgReading(injector)
         val now = System.currentTimeMillis()
diff --git a/core/src/main/res/drawable/ic_doubledown.xml b/core/src/main/res/drawable/ic_doubledown.xml
index 1b6174f3d0..6bccc9cb47 100644
--- a/core/src/main/res/drawable/ic_doubledown.xml
+++ b/core/src/main/res/drawable/ic_doubledown.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M2.702,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063H6.961l0,15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L2.702,16.281z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M10.676,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063h-2.104v15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L10.676,16.281z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_doubleup.xml b/core/src/main/res/drawable/ic_doubleup.xml
index 32e541163a..9c56d4cf85 100644
--- a/core/src/main/res/drawable/ic_doubleup.xml
+++ b/core/src/main/res/drawable/ic_doubleup.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="24">
   <path
       android:pathData="M2.702,7.719c1.952,-1.81 4.279,-4.076 5.31,-5.654V2.063c0,0 0.001,0.001 0.001,0.001c0,0 0.001,-0.001 0.001,-0.001v0.002c1.032,1.578 3.359,3.844 5.31,5.654L11.999,9.54c0,0 -1.578,-1.408 -2.934,-2.728v15.125H6.961l0,-15.125C5.605,8.132 4.027,9.54 4.027,9.54L2.702,7.719z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M10.676,7.719c1.952,-1.81 4.279,-4.076 5.31,-5.654V2.063c0,0 0.001,0.001 0.001,0.001c0,0 0.001,-0.001 0.001,-0.001v0.002c1.032,1.578 3.359,3.844 5.31,5.654L19.973,9.54c0,0 -1.578,-1.408 -2.934,-2.728v15.125h-2.104V6.813c-1.356,1.319 -2.934,2.728 -2.934,2.728L10.676,7.719z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_flat.xml b/core/src/main/res/drawable/ic_flat.xml
index ed4986a65d..487a647f10 100644
--- a/core/src/main/res/drawable/ic_flat.xml
+++ b/core/src/main/res/drawable/ic_flat.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.281,17.311c1.81,-1.952 4.076,-4.279 5.654,-5.31h0.002c0,0 -0.001,-0.001 -0.001,-0.001c0,0 0.001,-0.001 0.001,-0.001h-0.002c-1.578,-1.032 -3.844,-3.359 -5.654,-5.31L14.46,8.014c0,0 1.408,1.578 2.728,2.934H2.063v2.104h15.125c-1.319,1.356 -2.728,2.934 -2.728,2.934L16.281,17.311z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_fortyfivedown.xml b/core/src/main/res/drawable/ic_fortyfivedown.xml
index 199b8f4984..673a965fe4 100644
--- a/core/src/main/res/drawable/ic_fortyfivedown.xml
+++ b/core/src/main/res/drawable/ic_fortyfivedown.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.272,18.783c2.66,-0.1 5.908,-0.143 7.753,0.243l0.001,0.001c0,0 0,-0.001 0,-0.001c0,0 0.001,0 0.001,0l-0.001,-0.001c-0.386,-1.845 -0.343,-5.093 -0.243,-7.753l-2.225,-0.351c0,0 -0.12,2.111 -0.146,4.003L5.717,4.229L4.229,5.717l10.695,10.695c-1.892,0.026 -4.003,0.146 -4.003,0.146L11.272,18.783z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_fortyfiveup.xml b/core/src/main/res/drawable/ic_fortyfiveup.xml
index 24814d6714..930857ec66 100644
--- a/core/src/main/res/drawable/ic_fortyfiveup.xml
+++ b/core/src/main/res/drawable/ic_fortyfiveup.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.783,12.728c-0.1,-2.66 -0.143,-5.908 0.243,-7.753l0.001,-0.001c0,0 -0.001,0 -0.001,0c0,0 0,-0.001 0,-0.001l-0.001,0.001c-1.845,0.386 -5.093,0.343 -7.753,0.243l-0.351,2.225c0,0 2.111,0.12 4.003,0.146L4.229,18.283l1.488,1.488L16.412,9.076c0.026,1.892 0.146,4.003 0.146,4.003L18.783,12.728z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_invalid.xml b/core/src/main/res/drawable/ic_invalid.xml
index ab59d070b2..bdda131e7d 100644
--- a/core/src/main/res/drawable/ic_invalid.xml
+++ b/core/src/main/res/drawable/ic_invalid.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.35,19.561m-1.147,0a1.147,1.147 0,1 1,2.294 0a1.147,1.147 0,1 1,-2.294 0"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M17.301,16.804c-0.459,0 -0.83,-0.372 -0.83,-0.831c0,-2.985 1.391,-4.027 2.51,-4.864c0.937,-0.702 1.614,-1.209 1.614,-2.849c0,-2.262 -2.173,-2.965 -2.964,-2.965c-1.705,0 -3.083,1.022 -3.778,2.804c-0.167,0.427 -0.65,0.64 -1.075,0.471c-0.427,-0.167 -0.638,-0.648 -0.471,-1.075c0.944,-2.417 2.935,-3.86 5.325,-3.86c1.865,0 4.626,1.47 4.626,4.626c0,2.472 -1.264,3.418 -2.28,4.178c-1.031,0.772 -1.844,1.38 -1.844,3.535C18.131,16.432 17.76,16.804 17.301,16.804z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M6.846,19.561m-1.147,0a1.147,1.147 0,1 1,2.294 0a1.147,1.147 0,1 1,-2.294 0"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M6.797,16.804c-0.459,0 -0.83,-0.372 -0.83,-0.831c0,-2.985 1.391,-4.027 2.51,-4.864c0.937,-0.702 1.614,-1.209 1.614,-2.849c0,-2.262 -2.173,-2.965 -2.964,-2.965c-1.705,0 -3.083,1.022 -3.778,2.804c-0.167,0.427 -0.65,0.64 -1.075,0.471C1.845,8.403 1.635,7.922 1.801,7.495c0.944,-2.417 2.935,-3.86 5.325,-3.86c1.865,0 4.626,1.47 4.626,4.626c0,2.472 -1.264,3.418 -2.28,4.178c-1.031,0.772 -1.844,1.38 -1.844,3.535C7.627,16.432 7.256,16.804 6.797,16.804z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_singledown.xml b/core/src/main/res/drawable/ic_singledown.xml
index ec4c30af82..bc3a0e7501 100644
--- a/core/src/main/res/drawable/ic_singledown.xml
+++ b/core/src/main/res/drawable/ic_singledown.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.689,16.281c1.952,1.81 4.279,4.076 5.31,5.654v0.002c0,0 0.001,-0.001 0.001,-0.001c0,0 0.001,0.001 0.001,0.001v-0.002c1.032,-1.578 3.359,-3.844 5.31,-5.654l-1.325,-1.821c0,0 -1.578,1.408 -2.934,2.728V2.063h-2.104v15.125c-1.356,-1.319 -2.934,-2.728 -2.934,-2.728L6.689,16.281z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core/src/main/res/drawable/ic_singleup.xml b/core/src/main/res/drawable/ic_singleup.xml
index 9ec675864b..6dda71fc74 100644
--- a/core/src/main/res/drawable/ic_singleup.xml
+++ b/core/src/main/res/drawable/ic_singleup.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M17.102,7.719c-1.952,-1.81 -4.279,-4.076 -5.31,-5.654V2.063c0,0 -0.001,0.001 -0.001,0.001c0,0 -0.001,-0.001 -0.001,-0.001v0.002c-1.032,1.578 -3.359,3.844 -5.31,5.654L7.805,9.54c0,0 1.578,-1.408 2.934,-2.728v15.125h2.104V6.813c1.356,1.319 2.934,2.728 2.934,2.728L17.102,7.719z"
-      android:fillColor="#36FF00"/>
+      android:fillColor="@color/white"/>
 </vector>

From d89d760a5e30f5c5f09f339327b96d1cfdf35abd Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Sun, 9 Aug 2020 10:59:56 +0200
Subject: [PATCH 378/400] Remove old TextView

---
 app/src/main/res/layout/bgsource_item.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/bgsource_item.xml b/app/src/main/res/layout/bgsource_item.xml
index f7d5d54d57..ff84837cba 100644
--- a/app/src/main/res/layout/bgsource_item.xml
+++ b/app/src/main/res/layout/bgsource_item.xml
@@ -34,15 +34,7 @@
                 android:paddingStart="10dp"
                 android:text="Name"
                 android:textStyle="bold" />
-<!--
-            <TextView
-                android:id="@+id/bgsource_direction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingStart="10dp"
-                android:text="-" />
--->
+
             <ImageView
                 android:id="@+id/bgsource_direction"
                 android:layout_width="wrap_content"

From 817ec086a16711a60a28ffac7096806447ced3c6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 9 Aug 2020 17:43:51 +0200
Subject: [PATCH 379/400] prevent IndexOutOfBoundsException

---
 .../androidaps/plugins/general/overview/OverviewFragment.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index 595be6943f..d478d4f5fa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -853,7 +853,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 graphData.addNowLine(now)
 
                 // ------------------ 2nd graph
-                for (g in 0 until secondaryGraphs.size) {
+                for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) {
                     val secondGraphData = GraphData(injector, secondaryGraphs[g], iobCobCalculatorPlugin, treatmentsPlugin)
                     var useABSForScale = false
                     var useIobForScale = false
@@ -888,7 +888,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             }
             // finally enforce drawing of graphs in UI thread
             graphData.performUpdate()
-            for (g in 0 until secondaryGraphsData.size) {
+            for (g in 0 until min(secondaryGraphs.size, overviewMenus.setting.size + 1)) {
                 secondaryGraphsLabel[g].text = overviewMenus.enabledTypes(g + 1)
                 secondaryGraphs[g].visibility = (
                     overviewMenus.setting[g + 1][OverviewMenus.CharType.ABS.ordinal] ||

From 1172aa753e3bb1f999771f385c03d3c9c9de5005 Mon Sep 17 00:00:00 2001
From: Bart Sopers <bart@sopers.nl>
Date: Sun, 9 Aug 2020 19:37:01 +0200
Subject: [PATCH 380/400] Inject dependencies in SetPreamble RL command

---
 .../androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java | 2 +-
 .../pump/common/hw/rileylink/ble/command/SetPreamble.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
index 7971b6a7aa..a74a14e4a6 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
@@ -388,7 +388,7 @@ public class RFSpy {
         try {
             resp = writeToData(new SetPreamble(injector, preamble), EXPECTED_MAX_BLUETOOTH_LATENCY_MS);
         } catch (Exception e) {
-            e.toString();
+            aapsLogger.error("Failed to set preamble", e);
         }
         return resp;
     }
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
index b3f32727c3..0d551204af 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/command/SetPreamble.java
@@ -17,10 +17,11 @@ public class SetPreamble extends RileyLinkCommand {
 
     private int preamble;
 
-
     public SetPreamble(HasAndroidInjector injector, int preamble) throws Exception {
         super();
 
+        injector.androidInjector().inject(this);
+
         // this command was not supported before 2.0
         if (!rileyLinkServiceData.firmwareVersion.isSameVersion(RileyLinkFirmwareVersion.Version2AndHigher)) {
             throw new NotImplementedException("Old firmware does not support SetPreamble command");

From 1bbca2787b1dff2895778d06dc34fce463883427 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 10 Aug 2020 12:35:59 +0200
Subject: [PATCH 381/400] BolusWizard typographic

---
 .../info/nightscout/androidaps/utils/wizard/BolusWizard.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
index 2b0fb46022..13fede251e 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
@@ -280,9 +280,9 @@ class BolusWizard @Inject constructor(
         if (carbs > 0) {
             var timeShift = ""
             if (carbTime > 0) {
-                timeShift += " ( +" + resourceHelper.gs(R.string.mins, carbTime) + " )"
+                timeShift += " (+" + resourceHelper.gs(R.string.mins, carbTime) + ")"
             } else if (carbTime < 0) {
-                timeShift += " ( -" + resourceHelper.gs(R.string.mins, carbTime) + " )"
+                timeShift += " (-" + resourceHelper.gs(R.string.mins, carbTime) + ")"
             }
             actions.add(resourceHelper.gs(R.string.carbs) + ": " + "<font color='" + resourceHelper.gc(R.color.carbs) + "'>" + carbs + "g" + timeShift + "</font>")
         }

From 4bacfad0db1d574dc8bbdaed662daaf19419443b Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Mon, 10 Aug 2020 13:06:27 +0200
Subject: [PATCH 382/400] fix empty mgdl local profile

---
 .../activities/ProfileHelperActivity.kt       |   4 +-
 .../profile/local/LocalProfileFragment.kt     |  40 +++--
 .../profile/local/LocalProfilePlugin.kt       | 162 +++++-------------
 .../TreatmentsProfileSwitchFragment.kt        |   8 +-
 .../androidaps/interfaces/ProfileStore.kt     |   4 +-
 5 files changed, 68 insertions(+), 150 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
index 749913c9a1..efb7e57b19 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
@@ -136,7 +136,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
             else defaultProfileDPV.profile(age, tdd, pct / 100.0, profileFunction.getUnits())
             profile?.let {
                 OKDialog.showConfirmation(this, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile), Runnable {
-                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, it, "DefaultProfile" + dateUtil.dateAndTimeAndSecondsString(dateUtil._now())))
+                    localProfilePlugin.addProfile(localProfilePlugin.copyFrom(it, "DefaultProfile" + dateUtil.dateAndTimeAndSecondsString(dateUtil._now())))
                     rxBus.send(EventLocalProfileChanged())
                 })
             }
@@ -252,7 +252,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
 
         tabSelected = tab
         typeSelected[tabSelected] = newContent
-        profilehelper_profiletype_title.setDefaultHintTextColor(ColorStateList.valueOf(resourceHelper.gc(if (tab == 0) R.color.tabBgColorSelected else R.color.examinedProfile)))
+        profilehelper_profiletype_title.defaultHintTextColor = ColorStateList.valueOf(resourceHelper.gc(if (tab == 0) R.color.tabBgColorSelected else R.color.examinedProfile))
 
         // show new content
         profilehelper_profiletype.setText(
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index db134ed413..77d8187056 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -52,8 +52,8 @@ class LocalProfileFragment : DaggerFragment() {
         override fun afterTextChanged(s: Editable) {}
         override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
         override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-            localProfilePlugin.currentProfile().dia = SafeParse.stringToDouble(localprofile_dia.text.toString())
-            localProfilePlugin.currentProfile().name = localprofile_name.text.toString()
+            localProfilePlugin.currentProfile()?.dia = SafeParse.stringToDouble(localprofile_dia.text.toString())
+            localProfilePlugin.currentProfile()?.name = localprofile_name.text.toString()
             doEdit()
         }
     }
@@ -99,21 +99,23 @@ class LocalProfileFragment : DaggerFragment() {
 
     fun build() {
         val pumpDescription = activePlugin.activePump.pumpDescription
-        val units = if (localProfilePlugin.currentProfile().mgdl) Constants.MGDL else Constants.MMOL
+        if (localProfilePlugin.numOfProfiles == 0) localProfilePlugin.addNewProfile()
+        val currentProfile = localProfilePlugin.currentProfile() ?: return
+        val units = if (currentProfile.mgdl) Constants.MGDL else Constants.MMOL
 
         localprofile_name.removeTextChangedListener(textWatch)
-        localprofile_name.setText(localProfilePlugin.currentProfile().name)
+        localprofile_name.setText(currentProfile.name)
         localprofile_name.addTextChangedListener(textWatch)
-        localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, hardLimits.MINDIA, hardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
+        localprofile_dia.setParams(currentProfile.dia, hardLimits.MINDIA, hardLimits.MAXDIA, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
         localprofile_dia.tag = "LP_DIA"
-        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label), localProfilePlugin.currentProfile().ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label), currentProfile.ic, null, hardLimits.MINIC, hardLimits.MAXIC, 0.1, DecimalFormat("0.0"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), localProfilePlugin.currentProfile().isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, hardLimits.MINISF, hardLimits.MAXISF, 1.0, DecimalFormat("0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
         } else {
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), localProfilePlugin.currentProfile().isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, Profile.fromMgdlToUnits(hardLimits.MINISF, Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.MAXISF, Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), Constants.MMOL), Profile.fromMgdlToUnits(hardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), Constants.MMOL), 0.1, DecimalFormat("0.0"), save)
         }
 
         // Spinner
@@ -177,24 +179,24 @@ class LocalProfileFragment : DaggerFragment() {
         // if (!pumpDescription.isTempBasalCapable) localprofile_basal.visibility = View.GONE
 
         @Suppress("SetTextI18n")
-        localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
+        localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
 
         localprofile_profileswitch.setOnClickListener {
             ProfileSwitchDialog()
-                .also { it.arguments = Bundle().also { bundle -> bundle.putInt("profileIndex", localProfilePlugin.currentProfileIndex) }}
+                .also { it.arguments = Bundle().also { bundle -> bundle.putInt("profileIndex", localProfilePlugin.currentProfileIndex) } }
                 .show(childFragmentManager, "NewNSTreatmentDialog")
         }
 
         localprofile_reset.setOnClickListener {
             localProfilePlugin.loadSettings()
             @Suppress("SetTextI18n")
-            localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (localProfilePlugin.currentProfile().mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
-            localprofile_dia.setParams(localProfilePlugin.currentProfile().dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
+            localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
+            localprofile_dia.setParams(currentProfile.dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
             localprofile_dia.tag = "LP_DIA"
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label) + ":", localProfilePlugin.currentProfile().ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label) + ":", localProfilePlugin.currentProfile().isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
-            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), localProfilePlugin.currentProfile().basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label) + ":", localProfilePlugin.currentProfile().targetLow, localProfilePlugin.currentProfile().targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label) + ":", currentProfile.ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label) + ":", currentProfile.isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
+            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label) + ":", currentProfile.targetLow, currentProfile.targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
             updateGUI()
         }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
index 7944707e57..8a26b43fbf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt
@@ -5,16 +5,11 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.data.Profile
-import info.nightscout.androidaps.interfaces.ProfileStore
 import info.nightscout.androidaps.events.EventProfileStoreChanged
-import info.nightscout.androidaps.interfaces.PluginBase
-import info.nightscout.androidaps.interfaces.PluginDescription
-import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.interfaces.ProfileInterface
+import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
@@ -28,7 +23,6 @@ import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.collections.ArrayList
-import kotlin.math.max
 
 @Singleton
 class LocalProfilePlugin @Inject constructor(
@@ -50,7 +44,7 @@ class LocalProfilePlugin @Inject constructor(
     aapsLogger, resourceHelper, injector
 ), ProfileInterface {
 
-    var rawProfile: ProfileStore? = null
+    private var rawProfile: ProfileStore? = null
 
     private val defaultArray = "[{\"time\":\"00:00\",\"timeAsSeconds\":0,\"value\":0}]"
 
@@ -82,22 +76,6 @@ class LocalProfilePlugin @Inject constructor(
             return sp
         }
 
-        fun copyFrom(rawProfile: ProfileStore?, profile: Profile, newName: String): SingleProfile {
-            var verifiedName = newName
-            if (rawProfile?.getSpecificProfile(newName) != null) {
-                verifiedName += " " + DateUtil.now().toString()
-            }
-            val sp = SingleProfile()
-            sp.name = verifiedName
-            sp.mgdl = profile.units == Constants.MGDL
-            sp.dia = profile.dia
-            sp.ic = JSONArray(profile.data.getJSONArray("carbratio").toString())
-            sp.isf = JSONArray(profile.data.getJSONArray("sens").toString())
-            sp.basal = JSONArray(profile.data.getJSONArray("basal").toString())
-            sp.targetLow = JSONArray(profile.data.getJSONArray("target_low").toString())
-            sp.targetHigh = JSONArray(profile.data.getJSONArray("target_high").toString())
-            return sp
-        }
     }
 
     var isEdited: Boolean = false
@@ -106,7 +84,7 @@ class LocalProfilePlugin @Inject constructor(
     var numOfProfiles = 0
     internal var currentProfileIndex = 0
 
-    fun currentProfile() = profiles[currentProfileIndex]
+    fun currentProfile(): SingleProfile? = if (numOfProfiles > 0) profiles[currentProfileIndex] else null
 
     @Synchronized
     fun isValidEditState(): Boolean {
@@ -118,15 +96,15 @@ class LocalProfilePlugin @Inject constructor(
     fun storeSettings(activity: Activity? = null) {
         for (i in 0 until numOfProfiles) {
             profiles[i].run {
-                val LOCAL_PROFILE_NUMBERED = Constants.LOCAL_PROFILE + "_" + i + "_"
-                sp.putString(LOCAL_PROFILE_NUMBERED + "name", name!!)
-                sp.putBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", mgdl)
-                sp.putDouble(LOCAL_PROFILE_NUMBERED + "dia", dia)
-                sp.putString(LOCAL_PROFILE_NUMBERED + "ic", ic.toString())
-                sp.putString(LOCAL_PROFILE_NUMBERED + "isf", isf.toString())
-                sp.putString(LOCAL_PROFILE_NUMBERED + "basal", basal.toString())
-                sp.putString(LOCAL_PROFILE_NUMBERED + "targetlow", targetLow.toString())
-                sp.putString(LOCAL_PROFILE_NUMBERED + "targethigh", targetHigh.toString())
+                val localProfileNumbered = Constants.LOCAL_PROFILE + "_" + i + "_"
+                sp.putString(localProfileNumbered + "name", name!!)
+                sp.putBoolean(localProfileNumbered + "mgdl", mgdl)
+                sp.putDouble(localProfileNumbered + "dia", dia)
+                sp.putString(localProfileNumbered + "ic", ic.toString())
+                sp.putString(localProfileNumbered + "isf", isf.toString())
+                sp.putString(localProfileNumbered + "basal", basal.toString())
+                sp.putString(localProfileNumbered + "targetlow", targetLow.toString())
+                sp.putString(localProfileNumbered + "targethigh", targetHigh.toString())
             }
         }
         sp.putInt(Constants.LOCAL_PROFILE + "_profiles", numOfProfiles)
@@ -150,25 +128,20 @@ class LocalProfilePlugin @Inject constructor(
 
     @Synchronized
     fun loadSettings() {
-        if (sp.contains(Constants.LOCAL_PROFILE + "mgdl")) {
-            doConversion()
-            return
-        }
-
         numOfProfiles = sp.getInt(Constants.LOCAL_PROFILE + "_profiles", 0)
         profiles.clear()
-        numOfProfiles = max(numOfProfiles, 1) // create at least one default profile if none exists
+//        numOfProfiles = max(numOfProfiles, 1) // create at least one default profile if none exists
 
         for (i in 0 until numOfProfiles) {
             val p = SingleProfile()
-            val LOCAL_PROFILE_NUMBERED = Constants.LOCAL_PROFILE + "_" + i + "_"
+            val localProfileNumbered = Constants.LOCAL_PROFILE + "_" + i + "_"
 
-            p.name = sp.getString(LOCAL_PROFILE_NUMBERED + "name", Constants.LOCAL_PROFILE + i)
+            p.name = sp.getString(localProfileNumbered + "name", Constants.LOCAL_PROFILE + i)
             if (isExistingName(p.name)) continue
-            p.mgdl = sp.getBoolean(LOCAL_PROFILE_NUMBERED + "mgdl", false)
-            p.dia = sp.getDouble(LOCAL_PROFILE_NUMBERED + "dia", Constants.defaultDIA)
+            p.mgdl = sp.getBoolean(localProfileNumbered + "mgdl", false)
+            p.dia = sp.getDouble(localProfileNumbered + "dia", Constants.defaultDIA)
             try {
-                p.ic = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "ic", defaultArray))
+                p.ic = JSONArray(sp.getString(localProfileNumbered + "ic", defaultArray))
             } catch (e1: JSONException) {
                 try {
                     p.ic = JSONArray(defaultArray)
@@ -178,7 +151,7 @@ class LocalProfilePlugin @Inject constructor(
             }
 
             try {
-                p.isf = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "isf", defaultArray))
+                p.isf = JSONArray(sp.getString(localProfileNumbered + "isf", defaultArray))
             } catch (e1: JSONException) {
                 try {
                     p.isf = JSONArray(defaultArray)
@@ -188,7 +161,7 @@ class LocalProfilePlugin @Inject constructor(
             }
 
             try {
-                p.basal = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "basal", defaultArray))
+                p.basal = JSONArray(sp.getString(localProfileNumbered + "basal", defaultArray))
             } catch (e1: JSONException) {
                 try {
                     p.basal = JSONArray(defaultArray)
@@ -198,7 +171,7 @@ class LocalProfilePlugin @Inject constructor(
             }
 
             try {
-                p.targetLow = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "targetlow", defaultArray))
+                p.targetLow = JSONArray(sp.getString(localProfileNumbered + "targetlow", defaultArray))
             } catch (e1: JSONException) {
                 try {
                     p.targetLow = JSONArray(defaultArray)
@@ -208,7 +181,7 @@ class LocalProfilePlugin @Inject constructor(
             }
 
             try {
-                p.targetHigh = JSONArray(sp.getString(LOCAL_PROFILE_NUMBERED + "targethigh", defaultArray))
+                p.targetHigh = JSONArray(sp.getString(localProfileNumbered + "targethigh", defaultArray))
             } catch (e1: JSONException) {
                 try {
                     p.targetHigh = JSONArray(defaultArray)
@@ -224,6 +197,23 @@ class LocalProfilePlugin @Inject constructor(
         createAndStoreConvertedProfile()
     }
 
+    fun copyFrom(profile: Profile, newName: String): SingleProfile {
+        var verifiedName = newName
+        if (rawProfile?.getSpecificProfile(newName) != null) {
+            verifiedName += " " + DateUtil.now().toString()
+        }
+        val sp = SingleProfile()
+        sp.name = verifiedName
+        sp.mgdl = profile.units == Constants.MGDL
+        sp.dia = profile.dia
+        sp.ic = JSONArray(profile.data.getJSONArray("carbratio").toString())
+        sp.isf = JSONArray(profile.data.getJSONArray("sens").toString())
+        sp.basal = JSONArray(profile.data.getJSONArray("basal").toString())
+        sp.targetLow = JSONArray(profile.data.getJSONArray("target_low").toString())
+        sp.targetHigh = JSONArray(profile.data.getJSONArray("target_high").toString())
+        return sp
+    }
+
     private fun isExistingName(name: String?): Boolean {
         for (p in profiles) {
             if (p.name == name) return true
@@ -231,78 +221,6 @@ class LocalProfilePlugin @Inject constructor(
         return false
     }
 
-    @Synchronized
-    private fun doConversion() { // conversion from 2.3 to 2.4 format
-        aapsLogger.debug(LTag.PROFILE, "Loading stored settings")
-        val p = SingleProfile()
-
-        p.mgdl = sp.getBoolean(Constants.LOCAL_PROFILE + "mgdl", profileFunction.getUnits() == Constants.MGDL)
-        p.dia = sp.getDouble(Constants.LOCAL_PROFILE + "dia", Constants.defaultDIA)
-        try {
-            p.ic = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "ic", defaultArray))
-        } catch (e1: JSONException) {
-            try {
-                p.ic = JSONArray(defaultArray)
-            } catch (ignored: JSONException) {
-            }
-        }
-
-        try {
-            p.isf = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "isf", defaultArray))
-        } catch (e1: JSONException) {
-            try {
-                p.isf = JSONArray(defaultArray)
-            } catch (ignored: JSONException) {
-            }
-        }
-
-        try {
-            p.basal = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "basal", defaultArray))
-        } catch (e1: JSONException) {
-            try {
-                p.basal = JSONArray(defaultArray)
-            } catch (ignored: JSONException) {
-            }
-        }
-
-        try {
-            p.targetLow = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "targetlow", defaultArray))
-        } catch (e1: JSONException) {
-            try {
-                p.targetLow = JSONArray(defaultArray)
-            } catch (ignored: JSONException) {
-            }
-        }
-
-        try {
-            p.targetHigh = JSONArray(sp.getString(Constants.LOCAL_PROFILE + "targethigh", defaultArray))
-        } catch (e1: JSONException) {
-            try {
-                p.targetHigh = JSONArray(defaultArray)
-            } catch (ignored: JSONException) {
-            }
-        }
-        p.name = Constants.LOCAL_PROFILE
-
-        sp.remove(Constants.LOCAL_PROFILE + "mgdl")
-        sp.remove(Constants.LOCAL_PROFILE + "mmol")
-        sp.remove(Constants.LOCAL_PROFILE + "dia")
-        sp.remove(Constants.LOCAL_PROFILE + "ic")
-        sp.remove(Constants.LOCAL_PROFILE + "isf")
-        sp.remove(Constants.LOCAL_PROFILE + "basal")
-        sp.remove(Constants.LOCAL_PROFILE + "targetlow")
-        sp.remove(Constants.LOCAL_PROFILE + "targethigh")
-
-        currentProfileIndex = 0
-        numOfProfiles = 1
-        profiles.clear()
-        profiles.add(p)
-        storeSettings()
-
-        isEdited = false
-        createAndStoreConvertedProfile()
-    }
-
     /*
         {
             "_id": "576264a12771b7500d7ad184",
@@ -418,7 +336,7 @@ class LocalProfilePlugin @Inject constructor(
                     store.put(name, profile)
                 }
             }
-            json.put("defaultProfile", currentProfile().name)
+            if (numOfProfiles > 0) json.put("defaultProfile", currentProfile()?.name)
             json.put("startDate", DateUtil.toISOAsUTC(DateUtil.now()))
             json.put("store", store)
         } catch (e: JSONException) {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
index 9f76f7f79c..29e31e544d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
@@ -6,7 +6,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.cardview.widget.CardView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
@@ -25,11 +24,11 @@ import info.nightscout.androidaps.plugins.profile.local.events.EventLocalProfile
 import info.nightscout.androidaps.plugins.treatments.fragments.TreatmentsProfileSwitchFragment.RecyclerProfileViewAdapter.ProfileSwitchViewHolder
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.androidaps.utils.extensions.toVisibility
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import info.nightscout.androidaps.utils.extensions.toVisibility
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.treatments_profileswitch_fragment.*
@@ -118,7 +117,6 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
         }
 
         inner class ProfileSwitchViewHolder internal constructor(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-            var cv: CardView = itemView.findViewById<View>(R.id.profileswitch_cardview) as CardView
             var date: TextView = itemView.findViewById<View>(R.id.profileswitch_date) as TextView
             var duration: TextView = itemView.findViewById<View>(R.id.profileswitch_duration) as TextView
             var name: TextView = itemView.findViewById<View>(R.id.profileswitch_name) as TextView
@@ -147,7 +145,7 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
                             OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), resourceHelper.gs(R.string.copytolocalprofile) + "\n" + profileSwitch.customizedName + "\n" + dateUtil.dateAndTimeString(profileSwitch.date), Runnable {
                                 profileSwitch.profileObject?.let {
                                     val nonCustomized = it.convertToNonCustomizedProfile()
-                                    localProfilePlugin.addProfile(LocalProfilePlugin.SingleProfile().copyFrom(localProfilePlugin.rawProfile, nonCustomized, profileSwitch.customizedName + " " + dateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
+                                    localProfilePlugin.addProfile(localProfilePlugin.copyFrom(nonCustomized, profileSwitch.customizedName + " " + dateUtil.dateAndTimeString(profileSwitch.date).replace(".", "_")))
                                     rxBus.send(EventLocalProfileChanged())
                                 }
                             })
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
index 5840dfabf0..792e7e4cf5 100644
--- a/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/ProfileStore.kt
@@ -31,8 +31,8 @@ class ProfileStore(val injector: HasAndroidInjector, val data: JSONObject) {
     fun getDefaultProfile(): Profile? = getDefaultProfileName()?.let { getSpecificProfile(it) }
 
     fun getDefaultProfileName(): String? {
-        val defaultProfileName = data.getString("defaultProfile")
-        return getStore()?.has(defaultProfileName)?.let { defaultProfileName }
+        val defaultProfileName = data.optString("defaultProfile")
+        return if (defaultProfileName.isNotEmpty()) getStore()?.has(defaultProfileName)?.let { defaultProfileName } else null
     }
 
     fun getProfileList(): ArrayList<CharSequence> {

From 5015383f2aa8c7ecb1cc94d86123368307a8d475 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 13:39:03 +0200
Subject: [PATCH 383/400] Remove unused icons

---
 app/src/main/res/drawable-hdpi/bad.png     | Bin 4227 -> 0 bytes
 app/src/main/res/drawable-hdpi/good.png    | Bin 4607 -> 0 bytes
 app/src/main/res/drawable-hdpi/soso.png    | Bin 3934 -> 0 bytes
 app/src/main/res/drawable-mdpi/bad.png     | Bin 2556 -> 0 bytes
 app/src/main/res/drawable-mdpi/good.png    | Bin 2782 -> 0 bytes
 app/src/main/res/drawable-mdpi/soso.png    | Bin 2317 -> 0 bytes
 app/src/main/res/drawable-xhdpi/bad.png    | Bin 5622 -> 0 bytes
 app/src/main/res/drawable-xhdpi/good.png   | Bin 6202 -> 0 bytes
 app/src/main/res/drawable-xhdpi/soso.png   | Bin 5252 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/bad.png   | Bin 8668 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/good.png  | Bin 9588 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/soso.png  | Bin 8040 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/bad.png  | Bin 11370 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/good.png | Bin 12629 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/soso.png | Bin 10567 -> 0 bytes
 app/src/main/res/drawable/circle.xml       |  11 -----------
 16 files changed, 11 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/bad.png
 delete mode 100644 app/src/main/res/drawable-hdpi/good.png
 delete mode 100644 app/src/main/res/drawable-hdpi/soso.png
 delete mode 100644 app/src/main/res/drawable-mdpi/bad.png
 delete mode 100644 app/src/main/res/drawable-mdpi/good.png
 delete mode 100644 app/src/main/res/drawable-mdpi/soso.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/bad.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/good.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/soso.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/bad.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/good.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/soso.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/bad.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/good.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/soso.png
 delete mode 100644 app/src/main/res/drawable/circle.xml

diff --git a/app/src/main/res/drawable-hdpi/bad.png b/app/src/main/res/drawable-hdpi/bad.png
deleted file mode 100644
index 139bf1ddee761172a390e3f85dd8a25080399180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4227
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
Z{69nWZ0-5hQk(z)002ovPDHLkV1gO2Lk9o=

diff --git a/app/src/main/res/drawable-hdpi/good.png b/app/src/main/res/drawable-hdpi/good.png
deleted file mode 100644
index 05723ff4ea7c1d7f4b32aab32452cb89c81219d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4607
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

diff --git a/app/src/main/res/drawable-hdpi/soso.png b/app/src/main/res/drawable-hdpi/soso.png
deleted file mode 100644
index f7a9be577e46be1e67698595147a3f9ddb97ebca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3934
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

diff --git a/app/src/main/res/drawable-mdpi/bad.png b/app/src/main/res/drawable-mdpi/bad.png
deleted file mode 100644
index 921015419523b53a760c1c50798ddb7739100dfb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2556
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
SdPCs=0000<MNUMnLSTXy(&cIZ

diff --git a/app/src/main/res/drawable-mdpi/good.png b/app/src/main/res/drawable-mdpi/good.png
deleted file mode 100644
index a15f82c2b2f748e0f3b898cde697722a7af3911b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2782
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

diff --git a/app/src/main/res/drawable-mdpi/soso.png b/app/src/main/res/drawable-mdpi/soso.png
deleted file mode 100644
index 91d9bd7ddf3643d4c6563d96c0bdee0ba0a1740d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2317
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

diff --git a/app/src/main/res/drawable-xhdpi/bad.png b/app/src/main/res/drawable-xhdpi/bad.png
deleted file mode 100644
index 46dca7155f402f35439909276c1539e2e5efcbbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5622
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
Q3;+NC07*qoM6N<$f-3baTL1t6

diff --git a/app/src/main/res/drawable-xhdpi/good.png b/app/src/main/res/drawable-xhdpi/good.png
deleted file mode 100644
index 08946fed3e77cc8a66c02ef493dd457a64feeb98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6202
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
Y0Q2YQG&~Iu(*OVf07*qoM6N<$g7|sWnE(I)

diff --git a/app/src/main/res/drawable-xhdpi/soso.png b/app/src/main/res/drawable-xhdpi/soso.png
deleted file mode 100644
index 8e19db274bb4df98bcbeaafc6235a5833192b530..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5252
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
KMNUMnLSTZ4f<90H

diff --git a/app/src/main/res/drawable-xxhdpi/bad.png b/app/src/main/res/drawable-xxhdpi/bad.png
deleted file mode 100644
index b7a3201d60823deeb7b73a5f889cc2eca0122cfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8668
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
QpV|O4RrOSAm2BSrKYMOU_W%F@

diff --git a/app/src/main/res/drawable-xxhdpi/good.png b/app/src/main/res/drawable-xxhdpi/good.png
deleted file mode 100644
index 9f5c243b041bcde6ed0a5a01803ec6b355979749..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9588
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

diff --git a/app/src/main/res/drawable-xxhdpi/soso.png b/app/src/main/res/drawable-xxhdpi/soso.png
deleted file mode 100644
index 6caac0cc054550ab51692cb8db9fa9de60e33b90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8040
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

diff --git a/app/src/main/res/drawable-xxxhdpi/bad.png b/app/src/main/res/drawable-xxxhdpi/bad.png
deleted file mode 100644
index 484bd8fd0b2169979a69fad0b8fa290e2ac1db03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11370
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

diff --git a/app/src/main/res/drawable-xxxhdpi/good.png b/app/src/main/res/drawable-xxxhdpi/good.png
deleted file mode 100644
index eb81a2b9784eda0eefa52f16401702bb3ae4aaae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12629
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
ImNW_dKj#VKPyhe`

diff --git a/app/src/main/res/drawable-xxxhdpi/soso.png b/app/src/main/res/drawable-xxxhdpi/soso.png
deleted file mode 100644
index 50b8f3fa5c71c45ba9e78bfe461f1dc3726a7d8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10567
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

diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml
deleted file mode 100644
index 9f5b7f5fab..0000000000
--- a/app/src/main/res/drawable/circle.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:gravity="center"
-    android:shape="oval">
-    <solid android:color="@android:color/transparent"/>
-    <stroke
-        android:width="2dip"
-        android:color="@color/cardObjectiveText"
-        />
-
-</shape>
\ No newline at end of file

From 8edb5c15dbf3d4a695d203e76e2344374cf7dac1 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 14:18:29 +0200
Subject: [PATCH 384/400] removed icon_home_loop (unused) svg file created so
 easy to add again a vector version if necessary

---
 .../main/res/drawable-hdpi/icon_home_loop.png    | Bin 1502 -> 0 bytes
 .../main/res/drawable-mdpi/icon_home_loop.png    | Bin 931 -> 0 bytes
 .../main/res/drawable-xhdpi/icon_home_loop.png   | Bin 2027 -> 0 bytes
 .../main/res/drawable-xxhdpi/icon_home_loop.png  | Bin 3095 -> 0 bytes
 .../main/res/drawable-xxxhdpi/icon_home_loop.png | Bin 4103 -> 0 bytes
 app/src/main/res/drawable/icon_home_loop.png     | Bin 931 -> 0 bytes
 icons/ic_home_loop.svg                           |  15 +++++++++++++++
 7 files changed, 15 insertions(+)
 delete mode 100644 app/src/main/res/drawable-hdpi/icon_home_loop.png
 delete mode 100644 app/src/main/res/drawable-mdpi/icon_home_loop.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/icon_home_loop.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_home_loop.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_home_loop.png
 delete mode 100644 app/src/main/res/drawable/icon_home_loop.png
 create mode 100644 icons/ic_home_loop.svg

diff --git a/app/src/main/res/drawable-hdpi/icon_home_loop.png b/app/src/main/res/drawable-hdpi/icon_home_loop.png
deleted file mode 100644
index b0f9f6ea2923a19dacb71380aaaed47d64d0da9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1502
zcmY*ZX;70_6io=5K@bYEwU+b)jWUppH7Ow?VTs5`zyP7j5+FiMAR!4RvIebG9F##>
z6^fOz1S5+IIIbxQR)MOBELJ24itLP{AOvV)9jASB-*WD|@0>aJ$IGFDKKgJ=I0ORG
zr}&bCRJ)&g>T0W2S1@G~0)hImXmlane-9ysn}A}(a-*3jaRN_u4}rLm#5_g}n<+#@
zGvio^L}2d59RR_KB?6&N{uqCrCo`Vqo5E-AO#x{!DeM@0EI@LHyNL-Zf&`|Jfe<Hf
z5(NY?5%|nYP@UCjG=TVAB4iT*549kI?oUN{a`{Yz6Ux~>2J7I8aKWRnPIy<Gqa6Z=
z!8)Tccr@109)l%d@B|DN@nrz+aD*E__5dM>?EOVdg@{1BP{<>o(ISxuC2~M<`Eh70
z9*;+3aA+LPUR7Z)IGiYCi0u;v)@q7>Imk>w44=glvbc!|H76sQn=B*(09q}A{-UC?
zhyLnM1-^EOnW$<DU*#V`sV6`nnjnSjK@*qFoDDx79Bgtwb8-K;ZHR3cV>l?Q=e}Pg
znn>Q{MbX}B^pWcOLzszHp$Cn2f<d-AMKcZb2-7{5Zu#EOD=^3~u=nWLnTg!&N>JbR
zBzv)uo8%^#8)R3c{#EKHvzq>;^w!7cQ_8tDdfXf=n_>R{pm}(*-;(Qctvff%t>sm6
z>>yPVAYpe-%JOY&Z&)ys=|C$K4eLgI(65Hm^$3)yn9cL>p<@~Y2KyreTz#GfL=Wk4
zY%*C(@M~~asvp^6*-NIA75BhwQlL1fpxPTHpMR+34mH)Nfn0gMzG5^`+>~lgH=b{{
zqC<1X2Xdj-a#R#<8+Aq_vW0#h)|pi$XUdzT*U^%#->u5o^U;M5=r<Z3Nn8SR$(QH{
z%X}lk6l7;YeiHH(p`aX$O|0%-Mzt`DJi#$MlD{iLS#{>=ARLLa)J+Ml?uI$(7NRP_
zvA&4*Nv2X?(fX-hav1t|g+u0WkLMk)5}li1#+vExwRC$$xZ+UNYFpQEq}g<9XvnKk
zlwHY*uE*&+_?8?I&`nzz1Y`Gg@5P4yTF36bE{&2j5b|wa$5k7D;+?(s4f3*Gh-{#j
zfog=g20qnXGF{THSW#+m+Q)aT_h>l7Tr|^G4P;uUgi<avPNNuRR+(CF6lKI~tm_@w
z@EW~%+c>OXDEWGU1sHp!ZG2y;^u;B+L%_a*B=?YKj%5?%k2|s#!*}QRR85dyQr%vd
zB71_C_fL?w!PdOXd@sVAiVkK<k8Di>&Y7fhP8xEW+lEiu-g|ENb|G}Uh8Ebw1N4!&
zTCrSIuyz(4E0#2jH(TD5am=(Pb#l_OW+bp#?O7dzHv{Dj3nEQ1HcIeYPiSxAwPI!X
zJSVEAui^+);i&Ay%QZ86h#RN1)<Tx?c~Y(+%iEH2dFSYMZ`lSVOepJ!YX_$qybp|e
z&324<pYD1nUC%3FnO_dpi*y*>8If_m58*8%@h2_iVMezn$70`A2xwEP$6K<N*+AMe
z%66wEe>I+ieOP>)?tc!YEm_fU9%hxdA9pgTCFzK9ZIN4K?Q_|O(|$^6nE6>i&&Rm;
zf~Zsqm};+&d{+zf4S{6hx6$5xHjN&PR)ZzoYlt>cX_+1e_I>Dp!G%Zt7xLoYKuFNI
z?dMh{q-u)}<eA`nNDZu5kr(ec-C^}a8TLAOpm2#@ozZ>KQFpEFknTb#!wbBXEir>%
zokI2*y=<(eE}U-8A&uO`w%m1(GUg$rd;4vDOlM9N8D~_^x%9zAk5|QnVqE<kw<DnQ
zlb1$qPPjPVeU=vX;m_Ugog2-?+Uw;WB&@dE$$&jS!Z&*kT4i@Zi=h1@q>WErXcTs5
zDEt&K1@YY`qpXRQ6Wcl|a;ZFNX{xTSM4oqn5f#80?P+M+co*~ESZh_n{>VMrqGfpX
Qk@{Pvc!A{lT~SB=0b~w_r2qf`

diff --git a/app/src/main/res/drawable-mdpi/icon_home_loop.png b/app/src/main/res/drawable-mdpi/icon_home_loop.png
deleted file mode 100644
index 5240cc85dba134c10ec48e96acd974b57890cfb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8VNVywkc`H+(`>WF90iWoZ+Gj}?-dMD$x0N+5pfCWh+z4{vQI=T^A7`;
z*sadkGwlI_EhaB7bv7j|>=dZx)wrmXCDPf|`tSIoFx&p>c`4JMTh9J@@W8pd=iZ#T
z`^MmbMc-pE`dqIO#Org)@;So>^L6&j#j7Pn6rar5T;}67HCyeZO1IH&vEBP7&p6WS
z#gul*cyimXi5~i1*#Z{4GK|}pt~cf%U@6$Tt(@xzOAWgj)BDEC2X$M1N=I}rHBGoA
zI@vB{-;bw1@)mtl51ah-MfQTXmu}@;@^N-Z{`j~1h)dn+9?#}nwW8h53j98|5-urD
zo@O+8=hZN!<x+h6voCd4Omz17w!kxAyE^5P>f~*%l149=cn0(SbGz;FB<}5n*|EFM
zcX+PXuCAX|vN7>~%Gu|0uk0w=bxp}Y=Bj9d_}0GQWO)P5H~qh~ALQhoS3AYGP4!iN
zm%z6rN2X5h2)z>dpkh@&-x)^t$5E~vuY-DuXMH_>s>)naesLqyjmV4PL9$O&KJD2g
z$969L$BJUM71J(VmizIh&-3xt?w_W1+_8GK>YQq^1~0wOKCj4%u`Exq{m@dRvhovO
zginE}hWewoTc3YEuu-W+UbFD&xhUlW$^X{Aj@!V}!^FLEbJ)9-Z<97f+n(Bz|0wax
z&I!qPx?h&_Sg^~mm8txSS*Eiz^AzU~|Lpg_zr2RU(`Ds4#=_0Q=J9%cp`g6w>FVdQ
I&MBb@0JRKubN~PV

diff --git a/app/src/main/res/drawable-xhdpi/icon_home_loop.png b/app/src/main/res/drawable-xhdpi/icon_home_loop.png
deleted file mode 100644
index 09ebbed57f1b3af3e299a77219b3bb6d789b70af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2027
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
MPyn4$@5hk-2im@Qng9R*

diff --git a/app/src/main/res/drawable-xxhdpi/icon_home_loop.png b/app/src/main/res/drawable-xxhdpi/icon_home_loop.png
deleted file mode 100644
index c33f0903116599df12240d08c4f39e76e2377271..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3095
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
Mpx=Rd7vkyv0J6=C9RL6T

diff --git a/app/src/main/res/drawable-xxxhdpi/icon_home_loop.png b/app/src/main/res/drawable-xxxhdpi/icon_home_loop.png
deleted file mode 100644
index a59d73e2b4a9bb90ec21b75ae784ac53d449f7e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4103
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
SLh0xK9cgZJz5c3q!hZlB;Ap@A

diff --git a/app/src/main/res/drawable/icon_home_loop.png b/app/src/main/res/drawable/icon_home_loop.png
deleted file mode 100644
index 5240cc85dba134c10ec48e96acd974b57890cfb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 931
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fFnVW(M3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~as*kZ5aAo3
z;GAESs$i;TrkiYNY@uLosb^?vX<=ldqhMrUXr^yqsc&eaYhY+)U}<Gwr~m~@c3cWJ
zMJZ`kK`w4k%YZyvrHqo20xNy}^73-Ma$~*xqI7*jOG`_A10#JSBVC{h-Qvo;lEez#
zykcdL5fC$6Qj3#|G7CyF^YauyW+o=(mzLNnDd~eO(TCas^qxN4e?SgAgi`Z>!BPbD
zzk=sFD+UH8VNVywkc`H+(`>WF90iWoZ+Gj}?-dMD$x0N+5pfCWh+z4{vQI=T^A7`;
z*sadkGwlI_EhaB7bv7j|>=dZx)wrmXCDPf|`tSIoFx&p>c`4JMTh9J@@W8pd=iZ#T
z`^MmbMc-pE`dqIO#Org)@;So>^L6&j#j7Pn6rar5T;}67HCyeZO1IH&vEBP7&p6WS
z#gul*cyimXi5~i1*#Z{4GK|}pt~cf%U@6$Tt(@xzOAWgj)BDEC2X$M1N=I}rHBGoA
zI@vB{-;bw1@)mtl51ah-MfQTXmu}@;@^N-Z{`j~1h)dn+9?#}nwW8h53j98|5-urD
zo@O+8=hZN!<x+h6voCd4Omz17w!kxAyE^5P>f~*%l149=cn0(SbGz;FB<}5n*|EFM
zcX+PXuCAX|vN7>~%Gu|0uk0w=bxp}Y=Bj9d_}0GQWO)P5H~qh~ALQhoS3AYGP4!iN
zm%z6rN2X5h2)z>dpkh@&-x)^t$5E~vuY-DuXMH_>s>)naesLqyjmV4PL9$O&KJD2g
z$969L$BJUM71J(VmizIh&-3xt?w_W1+_8GK>YQq^1~0wOKCj4%u`Exq{m@dRvhovO
zginE}hWewoTc3YEuu-W+UbFD&xhUlW$^X{Aj@!V}!^FLEbJ)9-Z<97f+n(Bz|0wax
z&I!qPx?h&_Sg^~mm8txSS*Eiz^AzU~|Lpg_zr2RU(`Ds4#=_0Q=J9%cp`g6w>FVdQ
I&MBb@0JRKubN~PV

diff --git a/icons/ic_home_loop.svg b/icons/ic_home_loop.svg
new file mode 100644
index 0000000000..5524013992
--- /dev/null
+++ b/icons/ic_home_loop.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_home_loop">
+	<path fill="#FFFFFF" d="M16.78,7.263h-2.953l1.399-1.398c0.21-0.21,0.291-0.342,0.212-0.533S15.219,4.99,14.863,4.99H12.6
+		c-0.241,0-0.462,0.149-0.663,0.35L8.78,8.497c-0.2,0.2-0.2,0.524,0,0.724l3.157,3.157c0.194,0.194,0.422,0.35,0.663,0.35h2.263
+		c0.371,0,0.495-0.1,0.574-0.291c0.079-0.191,0.014-0.357-0.212-0.583l-1.489-1.489h3.044c1.646,0,2.985,1.339,2.985,2.985
+		c0,1.646-1.339,2.985-2.985,2.985H7.277c-1.646,0-2.985-1.339-2.985-2.985c0-1.646,1.339-2.985,2.985-2.985h0.404
+		c0.105,0,0.195-0.067,0.234-0.164C7.597,9.942,7.389,9.571,7.316,9.15c-0.012-0.046-0.015-0.093-0.022-0.14
+		C7.29,8.958,7.27,8.912,7.27,8.859c0-0.007,0.003-0.013,0.003-0.02c0-0.009-0.003-0.017-0.003-0.026
+		c0-0.139,0.029-0.272,0.07-0.402c0.097-0.362,0.3-0.677,0.583-0.906c-0.001-0.023,0.007-0.044,0-0.067
+		C7.89,7.334,7.792,7.263,7.681,7.263H7.277c-3.357,0-6.088,2.731-6.088,6.088c0,3.357,2.731,6.088,6.088,6.088h9.504
+		c3.357,0,6.088-2.731,6.088-6.088C22.868,9.994,20.137,7.263,16.78,7.263z"/>
+</g>
+</svg>

From 7829db334783972190049512c351ceac7a9c625e Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 13:41:22 +0200
Subject: [PATCH 385/400] Replace Settings icon Icons are not identical
 according to resolution

---
 .../main/res/drawable-hdpi-v11/ic_settings.png   | Bin 526 -> 0 bytes
 .../main/res/drawable-hdpi-v9/ic_settings.png    | Bin 580 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_settings.png   | Bin 980 -> 0 bytes
 .../main/res/drawable-mdpi-v11/ic_settings.png   | Bin 357 -> 0 bytes
 .../main/res/drawable-mdpi-v9/ic_settings.png    | Bin 395 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_settings.png   | Bin 669 -> 0 bytes
 .../main/res/drawable-xhdpi-v11/ic_settings.png  | Bin 688 -> 0 bytes
 .../main/res/drawable-xhdpi-v9/ic_settings.png   | Bin 756 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_settings.png  | Bin 1328 -> 0 bytes
 .../main/res/drawable-xxhdpi-v11/ic_settings.png | Bin 1075 -> 0 bytes
 .../main/res/drawable-xxhdpi-v9/ic_settings.png  | Bin 1113 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_settings.png | Bin 862 -> 0 bytes
 app/src/main/res/drawable/ic_settings.xml        |  11 +++++++++++
 13 files changed, 11 insertions(+)
 delete mode 100644 app/src/main/res/drawable-hdpi-v11/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-hdpi-v9/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-mdpi-v11/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-mdpi-v9/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xhdpi-v11/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xhdpi-v9/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi-v11/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi-v9/ic_settings.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings.png
 create mode 100644 app/src/main/res/drawable/ic_settings.xml

diff --git a/app/src/main/res/drawable-hdpi-v11/ic_settings.png b/app/src/main/res/drawable-hdpi-v11/ic_settings.png
deleted file mode 100644
index 8a55c0221f8074631b8ede47067cd19e4fe8a116..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0005iNkl<Zc-rll
zyGjE=6o!-FeI=b2v^H!Ah=`R%3SU7)EJQ`0LPR2hpy1nB1WAaxUJ(*VS~X&8yf$hP
z$A4f7S<dXt?7E3)4t&k9|IDAAGiT2v5@|&%ni!0+1V|H%G{Z~`JTf}&LA23^hQO!9
z5Fa0Cw4pTfj>)hV?v;!$D-112bXE{E<KP`QU><Y}Ho&vO&=bgr=X<z8a01@Is2?*?
zaOhg32CkS{@aG>~V|nAGhhUb48`CCc_$$5*+0ZrU(lxYhFfl*kWsn6Gk5WLzs;;36
z%?S@c(xpv-BTfCWuAxD(m{$})heY40VJdG_Jn?Wl*p+NS9oPze%0s)u=l5HS&WK4%
zn%WAXb%Ivv5;5tXrZ!7xFM}F7B_=IuYRf<Nh9GPM+hWhDJV+??Nsk=b;`5uB=?6K*
zDapwalb=3~Q@RiOf+VucRKlgTMM=;JN7qospxW{+DDp%X2cT}CUDGvWfxD2uWmVpq
znB>u1$cAS8^g|BObX5%(z9E{qg0D*eL=)gcB>9rqN=qEuSA~%muqj#@OSHV_q5~ZZ
zQW)dZuff=g!qB4Rt;he?t;566@Nc`9#YB=*QET|k_1pJqiokCD^YL%u3z5o~R5(CG
Qf&c&j07*qoM6N<$f~chLrT_o{

diff --git a/app/src/main/res/drawable-hdpi-v9/ic_settings.png b/app/src/main/res/drawable-hdpi-v9/ic_settings.png
deleted file mode 100644
index 23b7ef35297c27367440607f77cbe6d56143f754..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000;O001Tk1^@s6-UnMH0006DNkl<Zc-rli
z-%1-%5XNJxy=r{`(YGk#YZOJ0iqdDWRPice{wJGkl4g@!v;_q(@&t+s;*HY2fSQ}8
z_~#K!G41g;Lf~XQXSHQPFLvN#lR4kaH)r;o*;p*H$Rc|lrj#0LHk%_l#21=Cy<Y#+
zXf%H7Kx8R2fl8&aRVWmcj&ixY`QPpE`&`%k?iav!^qANIi^t<HXvYEA2JfoX>X_$w
zUyH?JFQ3mV9r$kGd=U=MX?Qz4_a%o_fW9sgD8Y(ARjbwhP^t1K??cvvBiw!*Li5Jt
z*=+U=y}q<1dn^z;NA&eQ0hE(M$mMc2oB>w=uWjQ=4sxx<3@>s4Le~=L(c59|T@B-F
zTDaX(sr25~rYZ0XC=I82a$SVAwvXEZlYu9R3Rd+Xw(JCOU7x`6gZF?|4G6GZs{p5F
zK!E=%4~>LL5_U3~jOv4+lUA$s($pd@+?mdG9Ooye=&dn13-et6u2iB2$&34p=^~OG
zmnUmFS7JHp*I@3R0F|fG>9jIIMgs{?fFq!oQ}NmO?0Vfa&_-FjvIR+XwBQc%+r|SI
z#)~GFN~J#d$bSP889B6VA#m6satL<8Od^q(;JE>MK>5%k;Wu_Oo=hfZ`M(Da0*9S#
z<P!M9AaMN8<Jx9axkZ&q2d8E;v@e?6P?Fy0pw}Nm{pi!%S2{xd=tmaW)7mXgExqBC
S^S>tm0000<MNUMnLSTZK3KQu7

diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
deleted file mode 100644
index 20d9681376f15e7626617dff45049b474c46fc79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 980
zcmV;_11tQAP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf000A<Nkl<Zc-rll
z%PVwo7{{&NrCb_B<W7`@+;S<`K}eCATq3!xT$`2kWG?kCDA`GqjY|p}{s5(HT!)&K
zj3%}cvUuM4{>n6S&hI&|Q)BeLdFs3PP0#Q7d_8`bb52y$PyCP3)6?^-sHn)Aot^FV
ziy|a1m|(NU8XFsJ4Gj&{+uKWHV`DTiG4Z7W11vDX*6P?}e}6xXkB>)GV1msW>+9>I
z;o)H#85xPFzyzB$hPEQ<I|Mds%xpH(;NYMx?eFi?-Q8V?_V)I4*8y8=jnTlsfG)v^
zGH!2gb=Lu#HP+SDC0hDfq2TN5tIF8R%ZpghdTN2q8td%rB$LS`)$Hsnxm+%>#W6<f
zmzI`@i^au7k%L^!!QAQTX|_Jttg-g?cHvy9?(S~7yu1{^_xE=?Iy$0@iwpW&oS&bI
zT+I0xqn3;THfyZ4wN*G*%IS1cxWaC?OBrCZ#*9Xza2_oDg%1x8VKe6Q`2rmZ7TBz@
z`ucimX=w@3%F2o+=<V%|wzs!wetuqPXJ<$JrWMP}%PJ1otg+hKT54))3K34^>+5SN
z06TJKW=1s!8-+7>b#*0np>ht`tg-6qYO1TNQ>nSRSsbLw*x1;R=0jUsTdMrs-Cgl7
zljVcW8mp+NpqiQ*sjx1Tf$h)bqif2*BIokKW{s7WmQrP9rBo=YjLFGKHXo*y(b3Vt
z=7Y@|D=sdkva&Lj&}J-fW#G`1<wNW1>#F?C%}uJRs*>h|%^LGRNs5GEVaJ@Eok<rm
zuAZTxA=Ml_Ey%7a#Odj&ShLDGV6(;w3JOF*upADD=GKR~)zwuR9UT=~TU%pIeT2<s
zQ*pp%jpgU(Q(<9Yh)POI=>GmbYzM5@>lGbRa=>Pd;pHGNFHfbpxw)_zo0^)EGQehy
zWn^SX-(+%fa_HpbByfoz92^A3T5)`QOoxYuflC}?)RHm4W{st#rHKTYa5`gcl$V!_
zaaL9qSu7UT6mEpf%uJDsIk>$2Z$fN+uvud%DJhhin)+#>;Pdmd%GA@-6Q!r8>#7Ad
zYb+@#iIS6(b?N5jMrF+HcI&PKHfzjaFi>J*qAuY{!Q=6S2v4?p>wwJ~i;s^N3Ev^G
zS!1!Wv6PUIKyh(#5fzwVYjx}qXG%;=OhlENn~RR|p9uUHtgWrBO`O7LZFF?>mkJE9
z!1S}7nxCQkXVY)1)#_VVSfEG<EHE`cL;b|R9De|@&>^WpklzXb0000<MNUMnLSTXn
CRP;^&

diff --git a/app/src/main/res/drawable-mdpi-v11/ic_settings.png b/app/src/main/res/drawable-mdpi-v11/ic_settings.png
deleted file mode 100644
index 90532632390bca569fea8b2aba133124f820d6a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003jNkl<Zc-muN
z7!lzA|NksNtO>+gPz+)-Q`3T=|Cqp^nif=Gv7nTa;P3}xE-0T9h&N-gU?UK7K-F+V
z^)M4-K_=9I_dq-Yi0}T#4emnKyod7B2pKL2#IOI84_*SX06q&Q;L-dKh;IY&9Vi<Y
z=)-5h4m?3&jHJ#4i0|W2yA_`WY(P8-&4nPg5f-&3Sk!?+fR&htzKx{uCLVQnh*3w0
z1-D7E0OUO&?#JSF11xHdv8e0C8$>|KZ8#$C4zeYnIKh)YHsiBk5`koT6N>RA(|&vw
z2m$dM3NqR&P-Z0*4_Q#fAAoo^5I?|U;613Ck5GOFv4tI|c;<ofxqx^J7Q;7z3PPwF
z9;hB>a!c4sEEbeevpxvMVnG14t4tjvtPK(y84U&i!L^fq<=Hxy00000NkvXXu0mjf
DeEN<x

diff --git a/app/src/main/res/drawable-mdpi-v9/ic_settings.png b/app/src/main/res/drawable-mdpi-v9/ic_settings.png
deleted file mode 100644
index 3c39ceb3901857b7545832939c67376f2fb901ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000mG000>X1^@s6IQ*`u0003}Nkl<Zc-rlh
zNlpS$5Qe#d-ay$X?Ij#yh&zXKh?nT}-06AV^xB}_fMH2Ef_MwqLHqp6^dmhi2n!Pz
zyyOcn^;iAXRnT-ghx3n5k|cvTj$es1O`rER@H}tsI1VFx-=FO)KvEZ7)hx@-(DA{t
ztd(h+jIeEc3GF_LqI1d#g5acO0P&r=g<<#&GiDe@4T_Og<_v4a2wbB}v#0<QFfH#}
zjdIcOvO4dDuIpcbl@y@Qb=>dD*sl(g1x$q6Qy_4xX<7jo7&k{mY+7n-%5Ci+&-1MT
z7C36^SmuNqsH%F@+<}12E+8-h$s3GyTN$xWd*C`2`U!f~ukeOu;|YZ8x*M2|z!>+U
zs!=X#u4+%AD9Q(5Rru1Haq!mKfhdYyS(Y`>15aQDSjiGakC<P;rw&ec{xXp?=LWdX
p_I?*o_##Qtkigu7!{5svo*yJGJQfL(U9$iH002ovPDHLkV1mMrvO@p>

diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index 60b53e614e51173e08b49bd6f327e498602303dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&0007HNkl<Zc-q~T
zJ!>jK7=`l_L{XvyK@Fmy5RqsIS{OtFH-R92VhS}NB7*px+QM3`wDT{-I$hG-Ul6dq
zDvCA+L{ReHdj?!~85M5q^1?yf_snx<XJ=MVPJUduT&`QA(fIrP{G5&zIN)(1cXxN=
zhldABCX<v-r@t+X2M0VZBo>P?!_(8#(E<lNE+iU_QX-Mqt4gIpudlCy@cob<JT4>{
z3{pHE->Yu7OXBKuItTsWaUod8NF*W%GikM2luD)O@$r$~-`^!6Z*OnxI{NUzFCGux
zt_M$nKtNEt-Da@WYDLrOly()aqmODfo09S1aUp)cpYHGPnZn^P&F6FapPJ2P6bgj|
z26$YE$KzoQs9Y}7X0wq%CX)%(YBjbD&(F`?-N9cfl>`QOT!`E4rkk4^L4`trK0iMN
z2ms<fCbF%?V!{04K6qS+)9Ivtr&OZBV89?>Uti?)dL=!d&nJX@e0*?Y!Q(>gb~|fq
zmC0n-47ZidW+nYxE+@GY_{DwjxDcz=N;aE~38!|wUQ5<|G#atj#`X0z`y7wQl0N)6
z>01VPT!`6hCX2<wgqiHywphAdg^l5GI0OcGT!_J7z}r(0b`Wa0T+(nj+zG~Y^ikDn
zRWcqtE<~%<l1`@+1XDhrr;CdVHmiQWF9~>gc_EX@#QN~TFCGsb7oyQ<=<MuluZqQ@
zBm`UbkRLoQM5R*E>FMcSU0q#Kuh$cV=XS^s9v32)%So+PlR}|5THt`kh3NJAKbM!6
zq*N+NCX;<z7!MA3yMDBO)$8?fqtT#a1rB&W@1M|LcQ^6XnsPf;00000NkvXXu0mjf
Dk+nDL

diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_settings.png b/app/src/main/res/drawable-xhdpi-v11/ic_settings.png
deleted file mode 100644
index e4336097167e13d6941769b05844e3ad940eb331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007aNkl<Zc-rlm
z&r4KM6vq`DNhq^W+C@4eQwSxqa4kg8GKhq55p9AXXw$}xg+B-jMTpieoH3~ehDxkN
z0;3sa28p1B5J`VTztr*ey>N}k<IR2Np7-X>72X#<tHE>5mwWHI_Z^#>V#SIT>p((?
z<KPOoS_Ao8yUhk>gukY2Ht>#M;El}&z7q^=*;@P&utPBL2PAAXa8}T?50X(A*A5C`
z8k_^ouHSpWf}m?2bh~0SgFY||^5AHg1|B++SHTBx9UKD>z;9u$Utm<l7zS%<bq+KZ
zR`I=>0(V4k)r#@cy-HjI1<^P?4_f>s*Rn<}nR}31d;)wCjn^h<;TX6RAn6_`gDl8_
ziaPvU-QpP7U?yAi>hr1@ykN%s$T2Vgei$Yiao-Uhy?)d%<~GQ1&%r6MLQJ%vE8b;-
zx)N_eSI|x*5A&4T*SbA_#_(>b`ox=H9bQe+*P4VSM!bq9UcMghp;b-7IYzvkZtENd
z1KFqzywW5rGUAmr@m_{mcncW!ImEl*v_Z@yA>RGKhZq4m!Lq>{pV~$ji7{p4ILR$O
zL;S{d>K@@D8!?Re4P4+DSZ7}Q^IqFY-V=sjZBDIm4BQRy_>z0LD7%xQ<g@4fbem(K
z6@0beIsKV^nDK{~E%>0hSkEU!y_FB+9!RTURINu>Q0-}^7Rj(Kv&XJw{RD1+6Kdr0
zmr=N!bd0GOH`PIRZr8~$Z{rR*lm$<~d5^(X+VE@Z8Ay5D5&ht)+P2Y-;nl>BdN5Nq
z&PLl*|ECOhTWy_CZy(z6x-#&dU|`8+1G5AJk8Cy|TjG$KTzhd%cC`54p|N7c`mcY}
WK=WM)F)tnf0000<MNUMnLSTa3b3XzA

diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_settings.png b/app/src/main/res/drawable-xhdpi-v9/ic_settings.png
deleted file mode 100644
index 8caf4ecbddb89802c11ee0c39defd92117c73e31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 756
zcmV<Q0t@|#P)<h;3K|Lk000e1NJLTq001BW001%w1^@s6J!IKr0008JNkl<Zc-rlk
z+iFum6ow;Kt*>B<rKRs6YO&%ID6~>Vp%=OKq8EaQO=xpIpHH*~TWlfEAtK%=7K*pl
z!wc9nt*ITqB?*Mh-g|aJ_uXFbGs(>Q*ZOD8tV!$hdFGjCo_Xfkkk)KA#~Y2tgIcY&
zFo=4+eqYvH7eKNn<#Jh>0bxt73n&(gYpGO9nW0oFt-3CtP$=wJ31DsOT#|5}m#Wq3
z?N+OG(UAN~Hk<uoB_Nl}eG;ERj>M2y64S8&2(KuoV*JLLuQE<lDwRdX@9A_}C6h^0
z$QphJaw!oqiGKhbNG#@GI4$ucJ2{kqva5VPFXU6s{{MHY<b8;b_zFk3eGZ?0Gk;Ah
z0ODI+l2JkIH@3-Xqg(9$%q;;Do4atsQUGW5A(2QZ2RMqy;~R|r9yUS8372DdXDNV7
zwBsPiel!}LF>;xkW$mkupUGsbTU9A_0jKBS)FMEeQchd(2|jC6i7wm~$)UZ7?B*UN
zJ^^YF1gYz|u~=-=$OFf4=ZAWXAa#v_c!ZX9Jbe5n0y;y#hGqhIBeVkOcfU#Hj)zK4
zH{79=CqNB?Hmd2k_-q(?pu?}_oHnss5R$L3i>^r!xxsDLr)<hULnj@XajD)PxX*Mu
z-y(=I3(yCByk{nY`Dw6k$CcP{Ut0>`-Tr77K+t<kq!KmCx-8&{t;?LO>G)Lfy<H2<
z(Sm0{=^#HcvLk_fcEXX^kx1mG?J?l6>oC|T*!DSiNUr19HW2@gkj%(A4241yj@l6C
z0F_YSM>rf_6H$zh`TnanZwKK#B-s?7*TGMjC+17X??5mZybNicam?`6UuAyJCi!PL
z<AzvcB)>b<pJbXN+O-lu7i|07HUz9wVr2%N-GJ)?Xt}3W0;s?v*9FKu;DRlZaA^=6
m!Gf%L|GawUnP;92YySWxFO-iYrxPmx0000<MNUMnLSTYV!eS2q

diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index 58099b4ce7d375e11f97a3b60e5209d089dd090c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1328
zcmV-01<(44P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&000E{Nkl<Zc-rln
z*(+{c9LLWeAhRTy$()(UJWm-ij~OFFxllx+L@77!NnD8xnW7A#gd`M+$Z)Psoia;d
zz0Y^`zHd2auit*o**WLA@T*U1+iR`Q_gQ=Iwf58V<;!P%)@S{4`TP5u+S%ES*x1;7
zQ^7QdZ}5VjY>2S1F#CXjfbX%fv8=GLkd>F0vx<s}zYaX$126c&lMIrWm^hM>lEO+$
zOL=2W177fhCmAFoBjdWDpn#Q?m1!*SQ+eKzL2`0(SaESND=8__Sm2kNo6E=`+1c5w
zsHjNefhQRxD=UlNR7$|7*3i(v8XFtmfn)fe(*6NF<?a!dpP#RYiHQj&s?pI=#r*?#
zl0nka()jhKgzfEZVUW$uO~w5Kc#=U<Q&ai%r-ZAkD`AlH^K-@h19*}_l9Q8JW@hGZ
zgF&93pM^o5o}T#itz--UPq_t=Pa6ef_xJbN%E}6BZf<7j>FNA<Wo0E>T3TXqwYa#*
zS8KFE+m@CVwz|5?c6WDqNV)L=Jjoyl2?>1KDEj;R--%sZT(HT>N&ac8TaS;Ayv^n1
z<-6m3eSNay19*}_;^N}?w28no{Qmx)eN^4u-SL&1ascoogG5J1^Jx<?KR?etx@Ko*
zNe2K=GDt*31WzkPZEY=keSQ5UskgT`&ac$V%L}Wnt`>R#c*<?#SxiifB<t(zYRl~H
z?XlL@*8iXTZEbD*0ikZKt*r??06fVcAt50wGBQ$<rlux-4a?Qg&=8A?iu$QNj*X0r
z$hN<|z2#dPkq3Y$86+quh=qrT3&B3;^z>9Hv9q(or(M(@|HEvF>g42v-|UnFfF~J5
z_4dWnQebK!ELGST%C*PLN)@&?=v%HmfF~Km&(Dtq1_sJ9H8mx9V<#mg$+pECp40;X
zn@x4b2Jj?<`1ttnv~q}oV4;$0i?C8b#>dCi8XLfq4C3YG#nVz?YPYtwBrlJ;x;okR
z_4W0VZ8tVHSa5K#Y<mDtGKjmoJM;GT7J|#-=;(;trsLBRwfFV)CAay9hlhN|C<g#f
zGKj0IEA#O1kff@rid|n{%RWAPdwZFur{_=Y@hSeePm?N)feon01Hh9E;_U3q+}zwG
zSzcaNdqKlxg4G!d7ao^2H8p&;)UAbu1)&FkCmF=i(UG~hxJZKS`=8jNU<|y<iaY>3
z$sqRj_RPu2NyymP*oSW#hlhtr2LMkph^?(HKS>0h;n+faRNdU%@W(6V0N_amv9hw_
zCsA~Db-f!LTb9AWLH@F&Zaq9auz`UAc6N65?s#Wsr|kFuo@5XU3kzm#ZB63f;J|NO
zEQ;9KqGKEn4Gkr~3i_{bd1Adl8??>K%VX2i)BFK}Pg`z$08cWAnVA{0w6y$f@by3S
z%8QwRh>|e?Jjo!Yrl$NPB^)0g3xgaS94PJ|z>^GOVq(HiQo`KaoG{4D%#7mx0X)ed
z#>U3{Bqj9p^az7=cXuo9AHb6gVq|2*Pf~)pxjDb_e*~LNToy|E2k<0=7#JAvlQbQ8
zl0o$K_4!Gf4m`;qy1Kf|(9n?S>FH@K@Pj8AL`O&G8jFqUug3DP-!&OTwOEbd#RyZU
zt*xzbzzcrxl>5rmO0`}89v>giS7|iV($f0tzym(;f*(9(e>6~7SZLbb-agdP(eYIU
m(;&XW3x1!!Px-7rRQ~{QA{srMDg1~40000<MNUMnLSTZ*rm4ID

diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_settings.png b/app/src/main/res/drawable-xxhdpi-v11/ic_settings.png
deleted file mode 100644
index 4130b7aa9f9e9dc3912dfd98119a843bcefb1b86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1075
zcmV-31kC%1P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000B}Nkl<Zc-rlo
zTS!$w6o!v!MUhl?0l|v$5{mlLOAp<kD-=CMP(jfJAGCVVpopL_wJepwUV5t_3QB{B
zq|Bf!A&H23=%x=*bSKI#YWL}1I8ns$oIQKi?Cm~#e)tgN=$ieX*)wacJv$Pyva+(W
zva+(W@=QXADPSAe>5#2pQkV>C7wWna7ITJx&n^sl50b-RP!{;^!k}+pLKqC1FWhTp
z7z`@WFlc=k3_74;(B3c@bWX#d(?Pq~F(3mZIsAMwc&K5}9j7}PJ~xOKbuh{=b0&iq
za(8J4%fYZ1#w-SH;FpF$^tY{G5gE`=tl?lKxGZ<er}QQIVbIAa7w{ZZgUmm(3O}>K
z1;Hyas)^#r7)c-p)PR>!K7Yh(b7sfMWqyE*U^n<E%&7~MgBI{JP7XEQD{}^en<98>
z^CS~TkRr`>#4pj9SDQ9xv|N~jswW`Tq(QYJ_^LEz&Q#Ew00wnaio$IUC0%Dl;^>sq
z<kqP{3k@#JUuE(~IZP=ileco4+@4K{Qi3_02AwxB$R1D!(qqJ>GNvAUF%Z9j)1WQP
zGpG|3D#V`#9y8CNjhqHiD!&$dVi;UUtXUIhHgTBr0jy$OgZ}#_J2ZEY0?qh3x7&S{
znd^3t<77|A%`LZ|A%4BfEV>b-d0CH@%N@w6D2E!)5IaM0ccU4%1El!T@~Bf7XbWT9
zHifuVes&a9rh6r0+*&VhYn_1}RTyXqW85-@xQG2T=$OJliy7mV2F0L53InZRj9a4+
zx5iI{R0i727`N4rFGgj6DPX%|(nj0-Sccf?is?m<ER~YIGAE4+J(r1M6+`?wmx<yD
zFw(R+1>l}Ws!z3Cu15SqIV0Tau1@@T#p()K=;`VKl`Af9txksc@4zzdhS}yg&z;<u
zl&d&%I~e2BwG<8Xh8f*%Rk0Rss@*6PmR$gDHF6rX#9+&{S3cXXpkz{>AF7m3OHDl_
zplg}O-L!8?pr-v9_J$e$VV+|CF;GRjV3w(E{$K(aRBbX3q61T}0&LDRFOtP#5!}NI
z<`032zJuVm187jYXKhymnk)JaNySRUuF7h^+u%jh;jDe&dYoBJhrMQaUC}p08OR&C
zkmrfNNAU6$+Y?T83FQ1!3gyfG)Y~YZJ?=-#gU%tomNSVASOZ4HXphh#&sz-Z$PKWx
zzxD-wp9<E=#y*XW&NKP*rjRTJ=+&k{3VozUn$>uU!&r2(HjCp?lh>x|)O8J!M3-i=
zSsez0Hfb2NAq)mB&@gCL7!1melSB0<dLBP93<eDq?q1345@C2HQ<~)Fr2e%?SS0#h
tJlO^IID}pe&x}}ESy@?GSy@?mrr%zrLuwhuW`qC$002ovPDHLkV1i<k@4Ns2

diff --git a/app/src/main/res/drawable-xxhdpi-v9/ic_settings.png b/app/src/main/res/drawable-xxhdpi-v9/ic_settings.png
deleted file mode 100644
index 4f61e7d059eeef7963ce64348072351b2c037b5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq001xm002t}1^@s6Hs=I|000CaNkl<Zc-rlm
zYfDs76o#dHQF$vB=_iPhC`Dosg&+hGL{uNDe-IQxBBhd-8E@ltyn<LErGDsRL}5k!
zf<me<VTC3dDN<VMoSqdkAcLOS`^-TPwHLe`XU^X5TJPR#?TeF;V9b~?W5$dbGiJ<~
zF=NL50UI0~+}zdGwaX6D#<Rh9cXy9;c6QFiz?1Uw@=cx-(9_eC-qh5z+|bZq*?~4o
z{r&x^o)gf~(UD(YUvH_Py}dopa{}7h+OB8_xadUzcQgdtTK58t)uyGT<$<aI+TL};
zr;;&Rg{&N(!F_NndIjn2?M>nP3W{@9RX`vRm|;mR3kHM9t1QDO;2YpMCV$5jd|zMR
z4pQS?*r`l?2=ce!ngmYao+pU$=H_OruC7iQ!Y6&CFI?vcbRW;_@QvaxB)+6gYisKp
zL~U~{00+gg^sRI*pGg66{tE|x9q9xgEkrnkO9ZXvO9snP@DOK0`rT=8Zh^s?W@gfy
z<bH2Fqw5wV24*OzJNmig;qpcYAA#)Nq|!m<B@+QJYinyQ7qA>g+*}m*Q>8N$O3z5~
z#Nlj;Q7hw_)7aRUBJlhDxqPkw(@uHe36V)fF$GY#C+V=@(9tldm$VjlO-)TQZ5}z~
zo~NJ-l+uXC1>lR014ey_Dc%x`TiQ4f@yX}&9n~siracq9P;@YfgG5#C@Jy(t(=(9a
zXfI%g+)7}L2nhjeEin3}y4>(q*l_|We!t4Bs?5f;oimoXY+X)@GB<{R3D-`evJ~1l
zTGUCO6#`^+T9a3b)-?fkj=*nLhrPO-au|#uV8KlRwkgC}CCkADD94Ty0r97h6cC$-
zPl}i{vDN~?lsGsnmf3O2?8q(8@x_M2T!w7l<f>)oNI;tj9PZJ$XC%>QN`Y4f=dt!_
zlu<vz2#v`>DwdP*Xvt+~KxMRKR^c9&J}TT210p`M(&ecJf1KmQPgMsIgfHs@b~C}g
zl1MN^(pHCCVqu~9f$)5lv(Q-`@@NqRIKd#4z>_7blLXD@Y{ZrFZc;b+6(U0PKdp3}
zW~+Y<EGLNMu3QlrF<D|4BiBWF=ad&bSN@k|b#?V&IxNTG%xx@zLt2GQhd!?eVCK5D
zmr<tv0G($xI(V|-o8!|cg;QcfzUX40c3d|c@5B`2P6$3Q3f2m|ud1plW_?cMc^OPa
zz1P84`d<L){CzXp7vGPP3ESg3PLO{^kd1>u9Gr^YtoVLEj(j}lGy<QcPbJUP=uHkE
zg}fW)-Guma<uIpmsleewRRIjjJ(bJUy8Z{7dZ|<uKvCZI-0uSfbyZaW^>fK{0s?_R
zKDleDK>1*{o+ig{f(t1KSmI3My&w6c&<XApn70EdG~(IcibVw2Z3oW=Z_Jo6W5$db
fGiJ=#|7U*ykV*wpCrwru00000NkvXXu0mjfod^x~

diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
deleted file mode 100644
index 8f3d91a45afc14d08278ac9bb66e419ccde75e79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%0009eNkl<Zc-rln
zNoW*76oz{oqqs$*xIt7T35q0wSG~x@AxaR>hA6~9j4O(QDCoh1c<?R=LcF+uK}7Ko
z<3T-%C@#1nA_jtrL0pK*Xl(z7B{X5^ysBx)>#6s_hljM)Q$Jl@uc|r-6h%=KMNt$*
zQ4~c{6h&bZhT#@?6W)rE{=V7wpfd1f$m5CcVNHkMm|=Z^Q+y7qHstdMF7`RB^`RX(
zpTpW?8CFL*hOiW_hS`{Fvhb{BSf}BHm^LTEHK`e{_@OglpXuBSco5DXH3R11{m_kj
za2>T1X>%bw1YenJ-oY7Z2<v2#4i3WeunBg-k+3vI%u`A4yo>N>k!y}i530@tBY_|E
zI*?poUI}G!DLPywg_Sq8kR)ihu9X(lBwCJyGI>C=q@=KRC)~l`3AfiFC8$dHIf3EQ
z1KVIdtcDG+9rh+Ldwzh^B!o2&el4LR{idYI#7rE`@M8)0phfs>DNolb_}Ve3TIM~L
zI|fFD@k(hg`8n{a<<QGp-lN%aNOr?2skIiZ&5prejE>x}t%1yt>}9lFfQRGOrjkP2
z&*)IAW83YFws)mz*P)Zqp=FM3H!#}XmZq@wF^0(k$F{2(b=VGlvi`MQUv5v<UPgyn
z9NTVVwB4D8kg{eIuE6Nfb;sGThtc*hJP^05I^IFef|o7Ve>uy0G+EYJv@uvIEhw6y
zo;y_6ecTN?b8Ob{aF3^Og_NM?nzffJ6j*MIwPD^dsQ(OzsN~H7#XtgEGV~5>p;?m3
z3iEHPsq{<Tb@)W5-)X6<Y$+t%-cCvHtjX}1(4EpputM5PeuKb0c=|n!QcriT2@9)R
z<mpaigKkJjP=nl!#qkX6RFNM(WD3@e@InH^mHz)ZxXGMV4i~xRL>iVnRgs$L4Lm|S
z1*3*5h4$DnsE6j*KKiZ0B6t+OHP^fsSGmUoRzruIakG%wRqe72>dY8l=2Vyhw<ahz
zn7b2Ewg<jq$_*PDeGaS6GOQ&&hecm2f44X&o$7N~naJ0AV{WwszC-)v@D98i<88P#
oP!vT`6h%=KMNt$*Q51#EUuU~p{($=$lmGw#07*qoM6N<$g7#*ccK`qY

diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..8b7d553260
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,11 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:tint="@color/white"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>

From 374e95460df21de3504f41f0f860d6d243647f86 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 14:09:15 +0200
Subject: [PATCH 386/400] Replace 4 alerts icons (not tested) These icons are
 used in pump/insight/utils/AlertUtils.kt file => I don't know how to test
 them so can't verify if size is ok ic_error ic_maintenance ic_warning
 ic_reminder

---
 app/src/main/res/drawable-hdpi/ic_error.png      | Bin 543 -> 0 bytes
 .../main/res/drawable-hdpi/ic_maintenance.png    | Bin 509 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_reminder.png   | Bin 1112 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_warning.png    | Bin 483 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_error.png      | Bin 374 -> 0 bytes
 .../main/res/drawable-mdpi/ic_maintenance.png    | Bin 413 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_reminder.png   | Bin 733 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_warning.png    | Bin 336 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_error.png     | Bin 725 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_maintenance.png   | Bin 670 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_reminder.png  | Bin 1473 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_warning.png   | Bin 543 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_error.png    | Bin 1099 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_maintenance.png  | Bin 946 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_reminder.png | Bin 2238 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_warning.png  | Bin 776 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/ic_error.png   | Bin 1477 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_maintenance.png | Bin 1260 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_reminder.png    | Bin 3012 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/ic_warning.png | Bin 977 -> 0 bytes
 app/src/main/res/drawable/ic_error.xml           |   9 +++++++++
 app/src/main/res/drawable/ic_maintenance.xml     |   9 +++++++++
 .../{ic_reminder2.xml => ic_reminder.xml}        |   2 +-
 app/src/main/res/drawable/ic_warning.xml         |   9 +++++++++
 icons/ic_error.svg                               |   8 ++++++++
 icons/ic_maintenance.svg                         |   9 +++++++++
 icons/ic_warning.svg                             |   8 ++++++++
 27 files changed, 53 insertions(+), 1 deletion(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_error.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_maintenance.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_reminder.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_warning.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_error.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_maintenance.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_reminder.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_warning.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_error.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_maintenance.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_reminder.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_warning.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_error.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_maintenance.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_reminder.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_warning.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_error.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_maintenance.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_reminder.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_warning.png
 create mode 100644 app/src/main/res/drawable/ic_error.xml
 create mode 100644 app/src/main/res/drawable/ic_maintenance.xml
 rename app/src/main/res/drawable/{ic_reminder2.xml => ic_reminder.xml} (92%)
 create mode 100644 app/src/main/res/drawable/ic_warning.xml
 create mode 100644 icons/ic_error.svg
 create mode 100644 icons/ic_maintenance.svg
 create mode 100644 icons/ic_warning.svg

diff --git a/app/src/main/res/drawable-hdpi/ic_error.png b/app/src/main/res/drawable-hdpi/ic_error.png
deleted file mode 100644
index 5b57c7458fe6e0232f0b1d39c727dc0d713b0d69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0005zNkl<ZcmeI&
zJxBs!7{GC<B@kS4G29`jo!TUcAlf0@+UIMZ(%Q%JcA6t?ERW~|YzVqQ($=u12qpi`
z4UhNvzK_KHcj3o@$NN6d<z}_4tSrjxbA-zUx4iPr7k%zH$K{xP$~Gyh)bR=GnFh<I
zDf8@dPn7PcF=vWXqeq;2)Y8WkI3r1C6w>5W7?899m9(BsleB6keoid%NSbw7Ou{Mg
zLfZK(#pUFA#6(^4aX53dF;$D`?<Nj0*<n=9Hm2K&!YT5B>4p@;gIsLnhUKggsXxDs
z)_OS5jWv)LhO+_IK(G-EYFP!fgE&h}tb!&1hg}Z9DhLjygF4u*GmW#r7~73mkU^Vh
zv?+reG;(CnDH@&1AP<c^8Po&oe|zZ3pm!C}y9}DBfPQ4qNCh;KK|>YLPzDWDKm!?c
ztpd7|K_@Dp6B*>FfE*cARRL8K9X}F)<l~1No^?=X){d~wbWqv$AwO_hMB6IpG8Yt8
zrHi5*p2}5Pj&-GBgB(q4)SRt>)hESV_}Egqjmc5RWc4^>;g-r+SdKhTDuZ)5O8BIm
zPbt~*rE6jNqPCuLDWtW)dn0LYRQ}D1Q(gl1iBq4Nxi$G74@BvnJ?3*}V}%AjLHRUT
hp8ZcPva+(&`vtH<Llz2Y&fx$6002ovPDHLkV1j?L{1*TK

diff --git a/app/src/main/res/drawable-hdpi/ic_maintenance.png b/app/src/main/res/drawable-hdpi/ic_maintenance.png
deleted file mode 100644
index 60f34eb2015ec8be55cb74fa10c86b5fdfdc313b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 509
zcmV<Z0RsMsP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0005RNkl<ZcmeI#
z1B@O~6hPry+ig(Waq75s8*WhBwr$&vQ@agoyHRc1I<<G^*UjwR%{#HbnP*9YxyVB;
z`Y@d}>|z}Y7)DLfCk&++Be+6*y<<0xNES4xCH`HcRlq1Z5UP_@u||TC_DJhVYmKy%
z6hV@@6S}1$)<~_bksgyHSW<sNwMw+2HFXt8A1R~-I>&n&E0E^vaLNPlAuQ4`{CYzg
z4bTAiL5h=*F%G|KYk=1Cvroju_>ZP*fNsJcq^9B%z432v?3`o(exwLEa65KT4)~AM
z#+Tz?+E_vPh_5zLav)2rpwz@)=cqW4Sz?VB{-lUFDC|U>$E)5Eb1q5ju^7Bb5piIn
z2B;Z&_0xF_enP7<q7fU=>4E4(HME+gMLJ-NL|NWjBMk>rB$Bh+8Yv4Gt&s|I#TqFW
zXRVPkF`rM?R$O^bpw&XriTWJJt2bPah@=%I>A_ac@__H%XEzh5Lpm~ZLV=`N;w3rK
zVQZv}!IK=xksQg99LbToStDH*u|+y3VvE#C#1d(u=%qlKBtb_;_Tkk~Nr*`2LFz4f
zDUdpgUJ9f(qLl*alLAL0(lDQgoTIk5l185a;qb$sq~JPT00000NkvXXu0mjfdy3>L

diff --git a/app/src/main/res/drawable-hdpi/ic_reminder.png b/app/src/main/res/drawable-hdpi/ic_reminder.png
deleted file mode 100644
index b45924d4eb9018306d8a8b8995031d2ce57d7028..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000CZNkl<ZcmeI%
zQ@E=~6vpwjS=+X4+qP}n?p^KnShuxp+c?}RkIm>`C3&Ck+fUM&+0*tQzw6*lGFVy5
z=1?^?Y)g}M0ZnXc@o*wJ23Qv`fE*`U4AgNue>>X(aUp-ZojU6p=H^*SGHhu9*q$6E
z&oZ}#V<|pEU?j_!Cst()AfK_6g<(T}A!!EtnkNn+OVTfFX#UuXDI|?%i@+T^mZT}{
z<-ZK`Bz?;Ysl~ntSJREh`G6LtGnp3N<q5iRC7W0RD>IO!92c4^>gh$=^UP~S%)^27
zV>s0erw<1*j}<XLuaee_dY3r!^Ac&dm9{JMat#x3HI8daAA|<(A?+pRx9V7q?@5}$
zapjjho#FTz&Kad|f>X$n^gYX2Wo*XqN(-6I_<>MAuvx_gKAg?05?&%{U}+(95Yy<2
zX&h8u;6q7z*(zZXh9b|Geqk<0q`=qQ%V8{LMJ&Og+{;%K5V_3$!h*bt3}q3kjFlP7
z-|j3g<Xh>ijT>0H%1XSRHd1t#(ZId@Z7eHWb!<b1EXP?9-AMb8eW`OeJoe>7(z=;x
zfis<L?4NO@Y8M_PX(A_kRSG9Fk)#K8f^&rV;aHNsXBG3rDtu4Uu@;79m;lH(ENTH*
zly3l;z%mwsrvPcuZc3u$W~+e3XaVFY^T$4b{KkqVj)8;~`3=OojG>;PNJjU!Um#&q
zGRRQs%?Bp~a*0`JAmL&_PVy`4TaZCCL<!WuK%~Xou@fMBn*;<B_6B4pb46d|bCbY8
z!skd|bH#Y%)Tn_@MaG#MHbyecA2rYd%s@6aaoi1Wn#Bktyyduih2F?b(F5Ix^fDK`
zgB%n+&_T#M=7Kh4?dXBlLfXv*qmjj;2U-jnZ7wJv^F$9c50W<*WRPZ$KzEq~nvsmT
zU@YQLk|B?<yhFJrW6cHa$XZ^3U@A9PZ%MHx(qS%m%X8cBPa6Uq)rxlxc06{4Uf{V<
z=i&yYA@CmSnTc={(#!wqc-tJY5>FtI;~^HRe(Z8_*yZYsy%>hT7|x|W)$GY6FIWG4
zcDi|>nX8$Cz<21!GfodEKT_B0$L5LUc?6lrGFHaN9xF)LF<rv?Vpj&K=TV`A-66Ed
z|C)xN>Bi+uVxXQ&1A~wj^T8<yTxvmBnvJZCOA$EPe9%ZMqM<@Cwj_hJ(rA9z-}SGw
zc>I;##r*NSTeCr&n+;FT+U*$O1d@J;(y%(t!qGjXr6-kJdV#2;A88*rHa+*@L(=-i
z7;!#8XKh^1a#b#m>u9I52P_V*L!`i0+?{BgFUg_Y$Cnfkxx(V%&{(5|XxNg0g!+L^
zEj}7Ji{beCjWemYxP<w*o(Z@b&$Y~B|2F33AO<*$I1dUB6M#B4<!ZX|L~#f_MMGdV
ewVIlmnbz;1>C}?9xWrum0000<MNUMnLSTZ5929T>

diff --git a/app/src/main/res/drawable-hdpi/ic_warning.png b/app/src/main/res/drawable-hdpi/ic_warning.png
deleted file mode 100644
index d7aa344bcad6ae43f5675e9b252bcf013e90e5b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj00051Nkl<ZcmeI0
zA!tHT07cJ`Aq*B4S5}rxHj~k|Xti3cMyu6owHockW-^&pEJlMMh=_NF4McqC*Zco-
z@XzUR%PohTe?m^q*TDzkneT(oJPd7wX!9Vvvqp$D?>qzp^y`55P(eplh|CjHbmWvL
zqS8bsHi^h9OLXFrSEA8FXY3J)5<7Ip9VMbLMghk}ppFPzCu54t5n<;P$&?PdV22F(
zV1q8W;e*T=qAMJd5mj`hRWhK!3|;Ar0;$tN32c!vZ>&%PSG<ubeU#8XDN<&S61t~M
zYD~}#PDqIc3iyWtHt@p>i<<{6c)?B=-8@KiG4sjxu0dNqu`)t;4H6@a)X?37M9r8I
z9D{s0qKzzrMB9`S9D{s0Vt{Oe#K4detb;_wkP-}oOgW;7?1MzpkP-}o3^}5QQnKev
z2@ZFZoGHQK*qag@)}1NA;hdr~B{=LjQi9?3$#cXIWim(%4JpAoNK_3e!8&M0!I=^q
zwwx&;tSLwIQ3U(Wl;AL!BPJ-4lR!#{Xd{pkA{fXKT@=}FASGmMAV-W)d>N6Glamu4
ZegJZ!Wb&e5Z_NMz002ovPDHLkV1l&*$%p^|

diff --git a/app/src/main/res/drawable-mdpi/ic_error.png b/app/src/main/res/drawable-mdpi/ic_error.png
deleted file mode 100644
index 68a4b0e48c18f3f79cf1a71b0a8acb55b921e17e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0003!Nkl<ZcmeFv
zJq`g;6oz4$0wqExu?{T3F0csn^n?W%CF`Kjq0x@e5QU0KcvUoK{_kld-g@#qb8~O%
zH~L4J7B&YyIm~EM)|jp^Vvk>YhE$S|XX$e%tUG<ON#+|kM9rZQ_up;eW=B2;dDbLp
zO(DvBniWY~k_iWFOqzzxw=k_8G@s*!X*crzz?i_k-vu}En=kTE0UngRfdQxhFz}kU
zxTpbVED6-mtSW&Xnsp_xK(o07c4)R0fVg6lONNUCUaG)T0<J3HO5myrTqUqk1vVki
z)EHPupsNaWBv4lcY7($GssX3>PzpP^wpJPy*Klp3RI6}A=v`$Znp{+?^y%MhL0GYr
zBIB14ZrQQ_KSrCTBf<(H${WA*Z@yFB0ikghidLP#TcA!LZMw0GfFd#sLjsHf0ModJ
UWiB+#xc~qF07*qoM6N<$f=t$#-v9sr

diff --git a/app/src/main/res/drawable-mdpi/ic_maintenance.png b/app/src/main/res/drawable-mdpi/ic_maintenance.png
deleted file mode 100644
index 728313d9e724f3dc2c1711b6eed8cff32d1b287f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004GNkl<Zcmdtb
z0YpP#7)Iew1w{~PD25>@NB{!`MHGk#F_ZyD0TmFS0tiBgk!AoSq6D&57K3RR!zv9V
zJ3&(0y{=dP4?6%jk9B8Euul<yCJ*E}V2NIH6-iojR%PBDu@XqYA$`7y8%BH+1^QhP
zYazt3nQvmw)R>frJJVu}4;Dj-pr$oo6ZmA=0%M)db~GRdK#Nrih!ic_yU>6#gb}0(
zs;U7E_#sl!d*Dq2-uYeHz9U0eFB(wcZ<&ZaJZZosv=eLt;hkx~9%>sJkVI|9w0K0T
z&bS6FfNvtN6C@O1kRoa|jfhe3O$>0N6U0r4S+3El5;rZT*yV~E0I%G#MS_w}NHH8i
zjQS=jZiupPA{If!d=q6iM8!8T8bJ)ZAgY8{azVr+h#}v^y&IxNc<1*2NQ4tK&HNHa
zX0C`jon`4US25l}Wa%{_fspqC(EtE)%3g>Go`F;PtgHG06Zz6r>lN2600000NkvXX
Hu0mjfn(~|&

diff --git a/app/src/main/res/drawable-mdpi/ic_reminder.png b/app/src/main/res/drawable-mdpi/ic_reminder.png
deleted file mode 100644
index 2c269d553030af91e807bd6d2b3f3260463158ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 733
zcmV<30wVp1P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0007{Nkl<ZcmeI#
z1FU6N6adiuG4_1awr$&PV;4bf+ih$#tjD%(dnTxD>#a^+dW!e|#nf7HE{@OMJO1|@
z==H1LET*#|=IatA=wiMhI!Ae0Eds;UMFI7OgGE}S9D93Ra(fhTm*jPOM=@vmOfpYX
z6wqXz<TGbRJ~ygJ`so-|T3ln2<zDlpFT7^C39i;Bs&q6&@|_zai$>2#xHqbtW|(iZ
z=W9b8A64#?@Qj9NOCK{OUpOx|a=Q77Om|9b<Pu*=rsx^9Op?6ifCwG+Q`R#YBOKyg
z$)u=dU!Q~Jwyaq?zBJDDj<BQ7y4k@|t~btCNM`C2VH>N#r}mAuob5X!b&b%=1|<F3
z-{Cgb56ODHB6K(2cTS1+IZj=KdJ`mXIV*BF%UhE1>Lb)UKJs}&GFEdG&}^*a(J1Bs
z$>iFL0*D&wOp+WJMa%)bswpDBfkcy60ka~XizLTJ8$ibDB^N{<lK}%G$~BM}1ehGz
z^i=`uyvYsh1gL0=EG`2qiYVVeViDkq$l`gx1HY<)2LLZb7SjNy{Hg{{226`AHUM`2
zRSoP8SRYw@1L*Oq8t4J|I<okrOal%rXyB8`Vm)Aw+y*M1(iCmj1F*h$kxz|wIor#C
z4_u`_e!(e#X}@BdCc1dgSAeCC+|+G)Ibd<*u#<_BXKWrnuo!SzWYMGo*eP<k#A|@r
zQDsL!Mc>F~x^&qU(A|^1B~6n7fXR`^d6HwJkUiZNRgRII7x~P}3OGq_z?l<894MKj
zE=o{mvgCj$=CNNL^dE^b)Ei$qZ8@_xZ7D@B>yh-gMMmQFVr}A8nr3s5d}+KJ9AQV@
zb+cne>bPli^t`hAX^dZ?T>3u4sqtGl&CtvO<VB~&??H=eGfJp`fd73D!N&o*1nEY7
P00000NkvXXu0mjflm=13

diff --git a/app/src/main/res/drawable-mdpi/ic_warning.png b/app/src/main/res/drawable-mdpi/ic_warning.png
deleted file mode 100644
index 1ff44a152ac45753c5f547079feb7eb3fe7b9396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 336
zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0003ONkl<ZcmeH|
zA&3G26a~j1CZoY_$F@CKu7e%4gB`Yq?XW#;hwXWjo$CgpNesR-Y&gaHe7=9f!OnCh
z4*!mkuZIIN<@@23!8jnqfq__XL5K?r2BAj1HRQAAj(YE`NvA`<>_}#dUfhz%j1zkC
z#Edjb^v04TmR!*ruPjNSL4VkgK!FSkK4iiX86KJN5qo6Io;b`oBU{eQ2~(jbd(e{=
zK~~&cfg3AAw8#|@Ede&j9T1zy9OVy~BQ@se4~Ro#j{bl>Qe%$(fT$yL^y?of9SYic
z=NNbEnqyeUNK0hcgA7aG9OD6VqzwuO93w4IN<b9$9OIfJ-JwKx)*Ry+Bdt)fl`+Sl
i#z<R~FD)Y@Df|H78W9jEw@vr}0000<MNUMnLSTXgfr%^t

diff --git a/app/src/main/res/drawable-xhdpi/ic_error.png b/app/src/main/res/drawable-xhdpi/ic_error.png
deleted file mode 100644
index dee2d5af82dfaa9aa0d3a80b86a0b48739c79147..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0007<Nkl<ZcmeI(
z1B@PF6h`5<w%xEc;@WMD+K!57W3|yXPHMZc>&C2Y+s2xwQH^grceC@v&iOICSD8#E
zlgUJfZcHMFwH)9yw|GT4#k}S=r#Zk{a+pLHSwv%Iv4h8W@ra$wpoy$t0GlYluROLe
zQ0bx$GdV#RCzwSYrGXZ#;5AWr$x2!%Nz`Bw?}^e|7E?pXpf9J1!)f{|eoUf}xD+x;
zaiS)<#BEh<KPBpOkR%+UzM@AP&XSa~v{ba{%p;O?kIsq?9e6_0p3pJ6AI}}qaGSQ#
z{B<vqmW$L^Sga>a>lF^;NZSMjM{C}awl}m^Q0&8ky$Xg=STS1uQJV*Zpx+S2ed@?B
zmV%i8SnB`te_<-%A+_ZP3&B(XERY}EHWzSP-Z2u)1;7Y-#a@#Ed*uy{C^i{TL?d~@
zWUQJjFIb0F>*NJjvFfVaXo+Pl<-%Aj8!H!<V%bu;um;Q4$c1BAc1$i@0Wf(Y1Gpj=
z9+?h!Bo{uI4)`D!DoqDe$b}Nq0VQ(bo#}vga^a!rfQQxKFnY{%z)`ud)^xxcxv<=H
zz%sco!F0fQxzNgVKx4Ua*=)dNdBIw<0c+(2lg$Q9mKQXl$Yek<jpPlxO$O|iSBx+j
zFuWQ(Ubp;$W1;+@HqT83yr8!HVY#V*<?@R<+%gkzi`w#!Ay_e3!LSz#_9`e^^M<s&
zrL}@%0%;ppy$7Bo>T`j#T%f+fqZPMF!);nA8g#Tac4>d`^$}gF_ULh&syzICkoxg$
zZsZcTTxuvzOr^l|0)!jAV_QM#oh<=*M+;UOU&C^v4zoE)7$=!c9i@wbY#~3;Dq=rb
zK@(=N-TpGD_jTNZ-`8<Vc+G9jaFBK6Fo|x8OeT}bWHMg?eY~IL<?sI(00000NkvXX
Hu0mjf@cK`z

diff --git a/app/src/main/res/drawable-xhdpi/ic_maintenance.png b/app/src/main/res/drawable-xhdpi/ic_maintenance.png
deleted file mode 100644
index 303e1780f9ac93893d1e92c46efbb36c649dd2ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0007INkl<ZcmeI!
z1I!&k7)If#ZQHhO+jbk&wr$(CZQHhO8~4Abw)STGr8~)-*zdC(WwM^hgm02jgJEps
zFjsiO8}4$3J<OpNag?(o2_tyMpSs2{VmkH8ug7YeDUCPh5i;@&>m4M66A3Tzq&Y-z
z8X>!fgqtMRo$!o2x)Z#pqC3Gw7UvOO;Yp8(<upQG4+&@Rr#qpyQhF0yB+{L*P02?9
zj|p$EUN(8ad`c>hqOb>qg-SL;;)P3);6)@^KvMuwLMK_kArL0)R&o&tzy`s^-*Xd6
z4p0ETBNP_72NmQ1-T1yY6c%_3y2=3-g9U=U`7limuoWy2?9GQAa)4uCfne`n4435q
z*WovWycSMF4glQccfBI-Kbj90<p8I_0>R#VI4=j-4i*UZ=EHW;&!`20z4<Uv4loe@
zO2}?=KD3epl;H2ZB)hHoP+SfW0xP|+HQz;GB^M`<ZiAAHE=bo<77z|MvUO0hu^j2@
z$^r_3?u4zH6NrmTcftVBnm`~<=}w5wJwU#ua)gYybSG5COLsyZp6E`9&o$i%!5EEO
zYl2dw<+$zyACzJ{@&wsP$xyEFr%uy>!SV!K5toLHVLg{{0{{=%$1FONN_~hS!UXvY
z;s0j{9rY*laR#A}lL&@j2!>z?hF}PWU<gAD;on3D{RvHN5PIrQ$e=r6ol<%eo+_m`
z;gnK(6FMoSGhqWhmC~260e?y?dBO(#D6!-Tt0m{l6ISC(i6u{1iZA8-sQcUbf?pna
z!hFg3@`M@qP<lmU+<a~--jsfkjlDeMEbW!aWcovI0a8$Wk2Lwx4FCWD07*qoM6N<$
Eg5B08-T(jq

diff --git a/app/src/main/res/drawable-xhdpi/ic_reminder.png b/app/src/main/res/drawable-xhdpi/ic_reminder.png
deleted file mode 100644
index 904a60828516085ee93a977901b220a1322ecaea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000GuNkl<ZcmeI(
zb719I6vy#XjBT%N+qP}nw(T9;wr$(?ys<rPQ+(IEJxSU$$$eS9&;P|Qx+f>+O2iTp
z5)u+f<y?sa&Lu_Sk8+H|;(RfT^RXC7X^Ah6U<Cj>IaCbdP<8^agaaggxP;yOVFeY%
z5Gt~QKWyVHi4R^Oo7|>QL=2z^Q^+loyTvpL(-x<$5*kT##pz3u#2hLx8Fv>-NL+}!
zeiRooIEEN*GPqR?;8rqlGl%LD9#^p!H(NMW4B=F^;ASHyN;tep4sI4uOI(n`soc%`
zv|$W$Sw}kiSj${S(VF+Ti<8|KD{8R-H)&iiK~a>>xEn%Am!tSKV@b!$UPkko^T<+?
zk+{j>O$ma^OvhavlJzalE6l^MS-eO&efDUMyUwJFKb*)q++^{f<U)16WgkK9;!CPX
zE<8;(ZpP`b9=M(~-0b9hwKjZ(MOf*4N+H+PUR%K-1zlJ^0PkPH$t=W_xg4+Rt(fQG
z%Nw1*>m-uG`($HMCU23f7EbRA*d6!drY)(t9(faphcQ&kb$NEiO>ObU4`?~OrRw$_
z<R^pSyw77?#~B<*QA%(iXK@{m@*%^p$j?^Jlt1w{c7sV4ZzMA`ucd^$vB*m{{kSpz
z3Wnm`Okc7Ayvh^D!(<jEq+lq+GPlK?m&i*R-&0cxh?;y)I(d0kJ<c}*0PCqL1;^p+
zwwF^pfV)iUQcZlK8V$(A-2-Z+nFH+MIPr%o>6`m<;AXOM(~E;8AP%M%ZnC*XU3PuA
zRKnpnES$1<SwiAPvT;h|crk~Pti)*tmx=*g$}XH%P)bap8%}FDTnyo8*5K4x%-}|x
zR#8LpMK0or8mz+US_zM0#IW1W!6KmpC>+do>|zv=u=oT!i_=An1W-5~3%d^`97?eZ
zyZc3q1yFbpyImn~W!}QBgNV@p3LUU}D_lEk6Iwde;~Jm_X=s}$EJ1NEcAtwF51{Zl
zc6Uoq3`5&ViMR(S!w$3|5)9SJL3>@qbO0ybK+B=J1i?#a7NsHyP>Kw+7bOV#qV*Js
zTL6WgXuX5Az4xHq6<L5g(RPy@q~WUNP$sefWywK1Rs7;%v<V_{4WKXq?IH1tuhG7W
zG{BcZ{<=aRv_~Qh@JQ&}nAvC-L>k}%v^nAzE71;)G{8Y<E5$FiqE(DEKt;5z;ukq+
zMIsGQ1T9<q!um%Au*5I6p;ZbVfWCewAgF}4P5dH;c8K_bmd+;>_0_Y}V&WHbO*}@G
z7`Fs|jLr+ckUb{8a1Ak>h83(G#$#xG#4o-<`zAm~>0>gmv-pORz6+Ue#4jF2n-H-7
zJPfCG+~c#Ddo<c|TH#jK;xvxqBoCA^QBEhb8||(T-R-Z*!Y+$Clr{T8qtFknmxRDk
zjKgUY50m8iO4(O};APjB`VhF6O*jp3oG%OQWeI|s<e<GKAyI}pWas~;!E0gKDhfl<
zc2Gt_<2a`Am#L13JJE)iY%P8!29U&~YzH8RV?EpX_k?NgZgg+%hDQaOl0zL)s7`vw
z=B~y&?(KCmID=B6&<?vd!cI!>!|r~G6Ye+ifkWeC>@3cbIN($)>^_jNC_)UoEgUR{
zaWGqqedN=)!Rs??cvNQ<PS=SUbj4{6M~fjG#af&?iz$?11x~xTSPbAIcAFkGaNu~{
zhdrK?ka&(PoGgwPv*I*v)7^XACOq$fr+R?~p6YlHJQ>Ez<Ry*osNv&l@VBIsm*>R1
z$cFwbZk71re755~cKPV<W0xh=*yT{qvCH!%&LS9mjX)emk1gIOSt4V8`1@#y9)<bN
z{P=ye!f$~1iYoHA2)_kow%&sBx8pRvW-J+a*~b_@=VbY3BGs`CD@|>~I)xNTNJvOX
bNHFFn1F+K)LM65q00000NkvXXu0mjf)EBin

diff --git a/app/src/main/res/drawable-xhdpi/ic_warning.png b/app/src/main/res/drawable-xhdpi/ic_warning.png
deleted file mode 100644
index 652a1bb1d99edcf08613d38f5e64fed241e8060d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!1&D5#WAFU@y$U&o|XiO;}7pU
zb{|qWKmBRdzNZuNe@=4-QoHj5_kC9AiMsH=>A|&Km)_sq_xvEkZkzL;_k6#%q2avU
zfi+xjwR^f|UaV6)wnR)en&;Gw3x&#u=g9qiW4O#=Icr->&x;b3BRx{FYYdeV9mU0k
zd|q6bFU$7iMOxqEIGz{J4sb7@`XaIOu#(!B0;NNdypJlI7YBtM`8-ubz4rF{WUZD)
zjgCcytxP5f3S0&a{31sflon}yaXvgR`iz*h|H1YDcFuqMYx8-thwpBiUZ{1miDUlj
zw7LKI!Fk4y3YWB`$@d@Ln||c62j^Kkxpr&ygUVlKF!fJxzWlLc@2iR<GPC;J-@JGn
zxch9!@f$T4?ritw>-hHbg9LNNG)jrG4=*mfd34b_t3t;?_(O-FiEO`|<K>SpP#FJC
zZ~$Fk->~3i#TRDmOomwv?iLJIqWyp68jhzi`W{H$A1>R^=X*GLzw^f%@57EScE0@K
xM*jQ97Z<*)cmwp<jrL`a1BElzt%ZVG#*f@CuC)z6Hv%J`!PC{xWt~$(697BU1mXYy

diff --git a/app/src/main/res/drawable-xxhdpi/ic_error.png b/app/src/main/res/drawable-xxhdpi/ic_error.png
deleted file mode 100644
index cf389b5d96628b1b592c6a07919cd2e6ad412bdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1099
zcmV-R1ho5!P)<h;3K|Lk000e1NJLTq0058x0058(1ONa4O;0K_000CMNkl<ZcmeI*
z1GXhe7)9ap(6(*cwr$%QL>tR(+hyDKLfN(++PamyM^IUnycrSyH-vqSj3W~gV~jDz
z7-NiKJ5J+4-k=xbnZ^QE(N2y3XlFGGn8tW|@)i$qI@>8E9L5uLU>=*;S~ceL6Hjrd
ze8$e)$LB00i$#3Sz3eQ%(8LY=#9!p)Pk!bGn&bmc;T<+mgmt{jDRLPX(ubn;<9xY@
z>ljH{MslrO!nsVLY*RQ>E?`eSBcdK6K4W)P84Wx|3-z>-r)W?$aS&svg0UQ=>fvfy
zsEQV@R+Z4i>qJyZ#2YlK8rYYSRMANGRsC@sOR1`*9Hsi=0@|sv7A{cza2x+nb^mai
z>Vp@Ea6!bgDj#<d;fjcRR4y*(KV0%3SE@Xm#vi!mcg|2bIGT;PXd_3fcx=loTs4zz
zRWv@rWgn_o+=%OLQgJw#HeA=r{wfNi@WCh*gNO0OL&_h!umN9eU>D_$_wdQP$`_|l
zqcGYGic{lM<%!YYRUjCx{BS9F7YHs@UKr$Mph3z9XM&f3;B4iAp56xPsq8qB$lE{>
zCn+o51#bhvyUK<})_Waj9ZkxDTfpl;aEr2_tM`GrC_Q%PU+)9`%N|OLM+m{AN{ep^
z!M93_b%bDz(&1=AakSFlSwiuw(x4-u=%_SUNGKL6IkqJv+bJndB_yXRDefaA_bDk}
zAtbLTDLN3xUdI?rX|x%XXRwlDLQsJwC@E$J6=;T%Vrfu;mMSS)f(q24q=<qFv`I<v
zPf&sWv4>dh53yxI1zM)0m=#o@SxSmYK?Rzmq!<=dpkYdipMwh2K}qpaP=Q`jQrr_%
zpnH@Qrvw$~6eY!WK?T}Y$+0k)Kns-y9fAqeL22-8FoB*?8XO%=pre%zYk~;0PHFL7
z5P`l^T09y=pvROJI|uP6&YhGVoxBg!Nm+1{_knIw7BsQW>p<&iw2N8dyrWolIn;@E
zL0z04$^&P68|X~sgTY<~8mzo<xtD=1Q+^ofU7%6Q6UTdZG{tes7w_Pcca)wTk7EZc
zJ*;9d0w0V}QP`hWT-V0_Dh@Z{x*Jt2KE`DqsAz1@JX|%4ZB;yu!4A8P#~J*NYyRLg
zm4_>xJ8=7Qm5Y0vI<oyPm5=8fNfhzC(y`eH8y;!r0>!ZDn&TA1#*g+>HPFPHm7C9c
zi$=w;0k-PlAjVS#W8x<KYy|Qd8dPQM#TRv(5&a@=M%0FA&y`EKj!~3l6xYc`Ttq*L
z)}Qm`GETKQ^(~^A8|jeiAb$sLq)C2ZXYS=Q7Lvt6KIdL`md`khC+NUDHnFv8%;P7X
z;!uTz?Kq7Gd6Qm@XBrDwMLRYAqn*_(WEvCb$(uaLX>2EBj4{R-V~jBY`5*E5Ek0ea
RJ^%m!002ovPDHLkV1gVD_UQls

diff --git a/app/src/main/res/drawable-xxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxhdpi/ic_maintenance.png
deleted file mode 100644
index 952e7b9ef35c47475220653d491440b752f007ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq0058x0058(1ONa4O;0K_000AdNkl<ZcmeI*
z1FU696h`41d!n&D6O3)!wr$&1+jh{lZQHi(=ha5ElY3vC?%n78t77L1%Rwonlu{hP
z`8>vtRH6wz=(Tfnqztcf4M&t*nhW@hcC5p$h?z9wJ<cylG{^EeBgnML{KT2*$2pg(
z<dA(Gxh>s5_mfX?8^+BdvV&HfB_g|ZyelF*=)#F2vRlC;=_Se|PJgGB=+0<F6-8tR
z)kS0nKZ?i>UJ#L80r!Z=ZX=h9$Ziq`ipcKg5YkJOL-EV!{PYst5`}0$uoDrliO6nz
z@E4bIi6f%h{Q)&%wIia|-gu5DA6U(mPKb&))fdoL0Ki%|M5TQJje-P-HjsUDJ@H%s
zkO0wj#UeV_56~yzkmw^nK&`+bQ3pRjYaupK1fU!a@xgNrfI*ZbkKN@yfS!W*L=kx4
zNgqIefI)O!(mY0A`2ebq)dqtoSstkB1E?EBAd1feoqYg}gSbT85`_oG`v95&F^RZ^
z97q$;0*F8qp9jYH09pbOh~o3WNFPA6Ap%i+9vJ2WXd+}lbW3a=qrpCa29ZfQ+!B|^
zsI3p6CXfYD@;p$=2he|z1yS-m@P-edHy|6L#ChOGA3#??c0>vDz;Ql+4x%tyqC|O?
z1TQg!?ApjilB<p%px^M=!+wCS#b3D`><4H+7UHee!BdpQTOarWx(078<Q!i_6GUXj
zD_Dt$16e2{GhV_@L<|;@85dI|A~Pz2Q=&6`03F3bd^Xn$(Y54>$c*Q(6A`~4B0I_<
zB0DM}B0D~#NJM5lz<LpxaS@9|WX6fKLqv8w!dwxVaU|s^6p<Mh(U3e5nQ<b2uuMc|
z9KxG)Acss^KwX|=YTAg5IF!36&3Noq(~WPqBy5cn5+ph$_>7~ulqdL_8g!-C&e4n?
zd5F`(u97C2WfS>NL?RNAh(xrH5zP{j8K;OyL?RNAh(uJ}L?ogUL}WKrL?RNAh(si!
zJxVlJL}r{JA`yv5M0-0CiAY2u5|N0ebGV4?J`QFg8Wzk%lo!lIv?iE|sCNiyBU(tz
z-U(@ob0QM8vAzxzQEQ7wM4c=i5p}ZON)wUEBO;SWMBObO5q0O#uqzQ|!Xu)-7LSPf
zT8m>MGI>Na$l?*vAdU=bJJAyHm~l3f*cJ5U=&*Z=gLq>*(o|mJfKVb*N-3o_0c77-
UK6?sHV*mgE07*qoM6N<$f=#%SKmY&$

diff --git a/app/src/main/res/drawable-xxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxhdpi/ic_reminder.png
deleted file mode 100644
index e918305ba092c40e2d95a761f82324aeb2f5b997..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2238
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
M07*qoM6N<$g1a_53IG5A

diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning.png b/app/src/main/res/drawable-xxhdpi/ic_warning.png
deleted file mode 100644
index 7ab70f77c20c5a17d48442b1c1f79e3b3fbc8333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 776
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFrD{waSW+od~;BdrzwEJ^<s8`
z+Tw$G^Uub;oo#!={I?tbmtMIS(t9tx*eu+k;`YEZ!B3Lm@BZQq4`zbF-QQ-}=XdWv
zp0+38|4|j|z{PcEJ2|H<NNnmYT<UzdPupzL;`x@}o;SM5-?-i=)H_XPgJX-D8v|Rq
zl*z`2J&c;OW+vUaa7eoGcHn|mR_ms3F52^1-gvZzg~@P+^_cZ=UTGD}y-}p-A$iN<
zcZLdEzxLsJ2FtR5H5?)=jsap^7aABv5*Sz|92nWIF>eYx_*+m^=F^2>zF%gNyYwDq
zNpLu<Iezs<GGDkeLz3;fZ})<CNHGh%F5LP(_VCqvxlG~C5+LDu%sZqWfrTT1!l^9b
z&ddVU@16f#tQ8FRmP_JXH!ZGvN7N?)?}Dvg@`b~_ue-*)6|in!z4W-!y0VVBhp%3$
z77VvOa_(W)%iW!;m)-`6${xJR*ztBpl@<R+x$xf(GD(c<=ACl}y2ehRJ)&Xt^3Ndq
z_>U-xJ$Uuf=15h{Tjs(JR!Wr1@j2)m2sH?30Ggh#fMFw3_(6xI-N!@i1KK0{SC=i|
z1G>Xe7U<nsadP3cAjT^zpuMHBw(EY`9QoI?dQ<!H(E05*<O{EU`?llNYoPl=uPR=9
zyy|^gp{UJj*(AkvO^sFl-9W?nHVOa@-^+g#Xx;myLQ$S8ieitnBvzEO@8Du%63{OA
zS^y62Mv%vBWgsrPAo}1H!x5_(R$GR3d=6_4hhC6|3e;XN*jm1M2iGfs*@dNRmLClb
zXur|2y1ABVU0>Nokg#+?>89Oa;fB?d_v)-`vO2;RGxs%n$KU&MG919P%)sz-zgg2N
ZAkexNJafUL1AnqWf}XB^F6*2UngBx>S`q*N

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_error.png b/app/src/main/res/drawable-xxxhdpi/ic_error.png
deleted file mode 100644
index b8743474f785c4c966d093b1c1a43bb494b38ecb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1477
zcmV;$1v>hPP)<h;3K|Lk000e1NJLTq006)M006)U1ONa4_|>G0000GyNkl<ZcmeI*
z1DhmQ7>40*GZTC5us61C+qP}n=6GUWjP0y##x~aD?I&1!yH9nU!h8ROddm39L_|bH
zL_|bHL_|bHqJmaz!4X_d8E-Ly8s;>K5xhk?S8^m<(#FIc8P1`Uw-`wcxth#K-lB}N
z$XITK_ME~q{6tWG;2BP&tu2^P#IBSwhC&&`BkV?z%}v;ea{eL=zf-}EHl45{7chpf
zjpjmD(86y=IW_oFLpkj%t>{cS4fs}1IUOx+=;(Xl&lRCVnsz%S)Dtyzl%!yHL<{bv
zmZ+-XUYc7{QN*=OB<dz|HATt1t<aCS=*Q}oESyCxaWa{+lC<A{hd6qZmKJ~P#_z<{
zZ|rGtMlpAhCC;+k9os`Poftq8^rn-=58LxMN%1$^TfA^I4J1heM_YVw14(p)#RDZI
z)k7A2RO62lP(sp`T6A$AX>gxK6StBUw^;OW8EJBvMGMD}Hpg3ZuqREVO%r=tG>~C3
zX*8MD%s-Z3BxyB>CCoP-Ce0o;zu2F&+u!`517k_Mv2^tJysIA|eJM5{xEY!1W(yzd
z(uhpeNXEiNGln2D^`V)CiSv=!U0~s%B@>a^O`xTPg(vXF76N~suyC*`D8M{zW?|q1
z1(=Wbt?<|q6kxu#wnC$u0xZC%R#<EY3a~)iSt0SN0xZO<RycGas{jj;Wi6j?y(s`x
zTVb#)bqcTuCb6s)0;hojERs{L5a_7@i>QYMkJUi|7TFpWG_F^G99(ZfW0(TuV3-Aq
zH9-M#lCdChEs~pSElBi0a??H7v3gk~H(6G+pl}qDyCe1GV^Z!3F$T%q7z+l?k^Ho<
zAaE#>pTjH&+=k@mRto~JAwC~Z@(q%ougx9HBKcd+T(JR?zxB-(2O{}9z+7<=lD`Yh
z6%Qdk2R!jS`OpKIsh&4iyrTdP-Z5A7Qve73%oSfLfP*j16~8HfgI~=R;}pQbSaU_K
z0ywBKSGZ6B%oS4<z`+#lg8ZsASBzHx2jk5Ze<*;1Kg<<hDu9D8Vt*?_w<6wE00-}y
zD_&Fp2QQi{9#jAa51K13Q~<Ao%s5a1{63W5PyrllV6IqN0URuC?)X9hJY9xO#mfqi
zr<W}V+@b(p|F*=z3XrFREeNzwfIKy~U@%$%@-WKpXQ~QN?e{}%1vt{@r~(DZvZ4it
zUJ8(-o)#poQvk0sv&bkwj@H!3GM|Q8(6|AwG_-FGe9_oS4`a(TxK*Qz9h_FE;oY?g
zun6i{)(V3v{LuLNsaTDy0xU$9RjqJ%4L|e?ld0HN0TyCgD=a=#fCc!_3XQE5U;(zY
z!sC4fn2+}?3~WwT0p=mgW)=<}SAcnV%)&w|CNMjhz)BV#&SQ3Ro`s2K^uiDQ)PE}0
zq7j*@k&K0pn~<q)HXkUaF9Q8o%>1AuV@bQQbTEH3SC<3LFCHPy9x>lof)S+ENR}}F
z=t3=NR7=L9fxT%WZJOBAqJ!f}n`10mxPmmf!lH*;bmi+AC8WW9=8+PVShP{DA9N~#
z|Fz#QZXk(nu=wC;8c31`j<$GVd;TUV{$hKJA3D&FB<M{$izkY?mw3x^4@DMd?80xv
z)o<)#@kdMEBaYsqr6mPtQA?cEa+W0v83qv-gUDF&P|USVB<dz|Eyb2pH0NIGh^iXy
zqq!v=?J1$2sHvlbc9s@&qKXEhqJc^}SlZB;iU>rgr;?7AR<xsv8hojtiguQEtjL9Y
zPT0n95i6KX$4*r67h(9FN_I4v8%69+DWfTr(LBoT6qzg-Z8?QX`cX$Pe&R_^q^(JA
zC}JZ{<RLy~Jh__8NZz89v*}{)gw|}ykz7d`Z!&@!<}`_syhRyTa3ovO+9E<kL_|bH
fL_|bHL`38tTKa~?5Xsv800000NkvXXu0mjfR34g{

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png b/app/src/main/res/drawable-xxxhdpi/ic_maintenance.png
deleted file mode 100644
index 1046459dc3930cad6acf3f7ffee88c4536133936..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfn~F&i(^Oy<J&vU+n6~;TrOH~
z%e{?^!X_C%bH3tv_Ux*;_A7+V4@Dh50|GDRXGTtxwd|DM`8U3QwncAjWUHivMps(T
zakn`qgQu)mcjoh)<7zzeXN}lWT+cnQl?r?qw=Lz$2Dc0PrwbJCU)=NiX4k~UWyd7m
zoOc&lc_`IKaI1ma6XU4IZfU)*dQSdq3ftLi>2!+of!#7rO?8bzg}?0+gb#T8NUQmN
zU_RaADSW^#@ezyo<@gyU2lw)b0Yz<;+dYN%9QH`O#B$!y1t?tm1*o{7ZidCdX+W{m
zG~UT-KROZ*E#b`L5LUmT<TL95`!T-NvmOLTJ)gB9YsQMDoX<EXt5wXiJG_K*TBqNE
zluTh8(VvFQ_YF4dG}^OUi2rDNIZ17YQc<!+9n*u=OE^#U2+Z6l>+p)j+AYn7@1*b^
znMy-7hhHp{-NW86#tQk&)H@hAQMCWU)#opTY=kWhB}89zupD-G({T>B6ka1ES!lCD
z$iQ<UqhDW71&;|Q*F5=o{WUMz<rjK2c`jm=*#F??LYMf7yukr?mmgJ6sIgm8A?$9p
zhAG$kLTR16WCD9ebkn-ezvUJC+M0x3Ja1pDEUnjUCDgNi-u^CcW$AZI<>Za_mHpFt
z=lxTA!2*_FKOcTP(e`|SEvLlpr=JgRp2)l2(OSsB?ES^5{HH&diA-^@x8Eao^MjJf
zjD(!Of1cQ@9Y{8LWqT~_{QaZM6M4&>9XY>zKCC;D_qr39bu^RzxX1*cCK;id8*EMH
zCVY9pw)nH$+ijUChd-ITU%QS|V(#{g{YRCgm$iW1XJ{lhNk@FDgWZ4giGuzPft*V|
zAC8?UxZF9B(@pFgzq^ZDjzeLb_&NS=7q=d-bPdCRCr7+Xnyi(y`<zaG?@b8%wAvsh
z#Z`XKOLGOyZ>qZ&D;cXP?B-hSmUib2OOTFFo#?fbe;ogC{hVldaF>Q9W9`Q#VULXp
zNqz;Zg*^<#?prpBNGm;K*$$)+e{KW{*{Z5fNGd)u=RuCu$zv0F{}!|Z1vSnC<&{77
z0hwy~){P>IKe8p&DOVlgT=JrS@mz<Vr9ba*E|F;cJ;$MI-;Jr0fXWo7TQ^EvE>xeJ
z`1(ZG&&o5LM<S-p)&Oc%-o)E~anJl6leOn8aP&E`Z;xN{y{976(l&7XdcdQe!IZp7
zroBM@en7YR&X%<^P5wP&Il4e!Esgiv(+a%@YI*;!Klb8FReqK_<Aqpl!6M-f%SPcD
z!WNA{>V(C?cZ$zg*jvFufBXxk0L5p(WM>FJ@t^STTZ3PM-vgFojzA&_%zVb;x8OO8
zmR~^<)R-IZZ=B^ka^n`~9ET&EeY}S1H*}WFd7#b4uc>}R56GG~p{S|f`4ndzho*Xk
zE>PeLP(X6A^|51f|Nkj(Vt=8ZGUtIK8?U5##e~MgESxs`6&jz5t9<y=#4;~_!hz4+
zLKStPOy~9eAN)KT(e8HV@z1H8?-CmX3V>oB4}P)&HK;W{pRWGl&nKXU9@C$l>+&*h
z|2f8EbJTvS#gw{5wLNwbEuSlA=2x~bOX!0Oo-?mL8L!`QYlYdC><z$DjKR~@&t;uc
GLK6T&e>Q6X

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_reminder.png b/app/src/main/res/drawable-xxxhdpi/ic_reminder.png
deleted file mode 100644
index 6aa4e934d0290ca196fdf74742fa9cd689b4b4f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3012
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
GLSTZ8M7BBr

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_warning.png b/app/src/main/res/drawable-xxxhdpi/ic_warning.png
deleted file mode 100644
index 607e14b7d2e15196c2921be938cd9d000314cd1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE1xWt5x}=AJfq90fi(^Oy<C}wuJdBAF4G+T&
zJVi=sXUU1wUT)s^a<<$TU;baq!hPrKbxh*46K64gckbE$^UrGKR6Hj^P~Dv+D~@fs
zDSmr}V(}si_udzUN?qzzD;TvO)wOPtE>eBBo+mIZ`q4wNR8!S?et~APd`B)b%T77j
zR8iQt=|!<xoXur-$u*tk*HxAa1{S#lWo=aUdY3VALYm7_$&)KiPh3&4#9Jv!$W+hM
ziCNF3SDZ~{0dL@Ew%WThemt15zdZRopN9flg92Mv&fn-4-W6heOa`4jJC7gFmk7D{
z`0*FpkVD5GR<CI3zx+LbQ-1mTg+g}k?mMg2++m-({KpP{t^SXN@*(pcJ+@n6bL@C+
zKxJG1?**S2<i9&Ub$tI>_MhGJgU3??c0PVwz%unip=3zj4~rNl)tVllG0TAFB?ArC
z1lk~>^)Q)h>IcJCuOAXX!+n6#O{XN}gVChhynf6;(hZU}1nL$6>gECJ21?%m>V5;%
z{S9dNe^#yfH@6LWfsxg0@PD0pV|RAKV#j0dC)!SZ5ZtuTsAfr%m!!O+wANvSP)p7V
z9=t*mxwKLt8doj|I_9pmV#-IL(9_QoU#*yO-hI{LAUpY$eO^CnmRJ!h*kYyi_VYw5
zd#&T=WJMJ@8XN_}cwL!{0~%OF7Bq-0U=Ulty!MOGk7H}hH*aPX`FA{@ui)p4MM4pF
zOlS4vV?!35cHejP>Edp$lAkBazdTN^PPVuE^fBP%<K#kbIO}~~O-}xc<L-8HT9q|A
zd9PrscUSxSZBBd$@O+s3pYc-Pqs8nV{9^L94hw{ixbsg)LomY-Og<5y0;$NFFAR-d
z0zhU|1dzGh`DxkDiiY{Q8g^9;CL4adU}T#5Ncpyk-KPLeyG45=YPLA2cK2^H{*j^X
z@N{qePY%bYbC0^uj<x&L?Ij|gTl({azE)t(mgZyb(lD{YpC_DEyZX0X{E^Xo+FefT
zsQZ?cEb^_Vo_p3GnD@WG-)ZTO7t7=KzdfkP2#n!|1^?H}Cb9xqV9=n>`cKg6|LRRM
OL0nH)KbLh*2~7Ye^0Hk3

diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..fe665ee185
--- /dev/null
+++ b/app/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.028,2.042c-5.523,0 -10,4.477 -10,10c0,5.523 4.477,10 10,10s10,-4.477 10,-10C22.028,6.519 17.551,2.042 12.028,2.042zM13.007,16.958h-1.958V11h1.958V16.958zM13.007,8.958h-1.958V7h1.958V8.958z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_maintenance.xml b/app/src/main/res/drawable/ic_maintenance.xml
new file mode 100644
index 0000000000..7f606d8b44
--- /dev/null
+++ b/app/src/main/res/drawable/ic_maintenance.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.064,2.891c-2.006,-2.006 -4.997,-2.417 -7.414,-1.246l4.398,4.398L6.044,9.049L1.645,4.651c-1.171,2.417 -0.76,5.408 1.246,7.414c1.86,1.86 4.568,2.349 6.879,1.477l9.17,9.17c0.391,0.391 1.024,0.391 1.414,0l2.357,-2.357c0.391,-0.391 0.391,-1.024 0,-1.414l-9.17,-9.17C14.413,7.459 13.925,4.751 12.064,2.891z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reminder2.xml b/app/src/main/res/drawable/ic_reminder.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_reminder2.xml
rename to app/src/main/res/drawable/ic_reminder.xml
index 35c3148df5..b2d8e7ee7a 100644
--- a/app/src/main/res/drawable/ic_reminder2.xml
+++ b/app/src/main/res/drawable/ic_reminder.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/white"
         android:pathData="M22,5.72l-4.6,-3.86 -1.29,1.53 4.6,3.86L22,5.72zM7.88,3.39L6.6,1.86 2,5.71l1.29,1.53 4.59,-3.85zM12.5,8L11,8v6l4.75,2.85 0.75,-1.23 -4,-2.37L12.5,8zM12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 0000000000..484c065ece
--- /dev/null
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2.411L0.927,21.589h22.146L12,2.411zM13.042,18.446h-1.958v-1.958h1.958V18.446zM11.083,14.488v-4h1.958v4H11.083z"
+      android:fillColor="#231F20"/>
+</vector>
diff --git a/icons/ic_error.svg b/icons/ic_error.svg
new file mode 100644
index 0000000000..ce9df53b43
--- /dev/null
+++ b/icons/ic_error.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_error">
+	<path fill="#FFFFFF" d="M12.028,2.042c-5.523,0-10,4.477-10,10c0,5.523,4.477,10,10,10s10-4.477,10-10
+		C22.028,6.519,17.551,2.042,12.028,2.042z M13.007,16.958h-1.958V11h1.958V16.958z M13.007,8.958h-1.958V7h1.958V8.958z"/>
+</g>
+</svg>
diff --git a/icons/ic_maintenance.svg b/icons/ic_maintenance.svg
new file mode 100644
index 0000000000..cc3d228360
--- /dev/null
+++ b/icons/ic_maintenance.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_maintenance">
+	<path fill="#FFFFFF" d="M12.064,2.891c-2.006-2.006-4.997-2.417-7.414-1.246l4.398,4.398L6.044,9.049L1.645,4.651
+		c-1.171,2.417-0.76,5.408,1.246,7.414c1.86,1.86,4.568,2.349,6.879,1.477l9.17,9.17c0.391,0.391,1.024,0.391,1.414,0l2.357-2.357
+		c0.391-0.391,0.391-1.024,0-1.414l-9.17-9.17C14.413,7.459,13.925,4.751,12.064,2.891z"/>
+</g>
+</svg>
diff --git a/icons/ic_warning.svg b/icons/ic_warning.svg
new file mode 100644
index 0000000000..6ec4720d84
--- /dev/null
+++ b/icons/ic_warning.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_warning">
+	<path fill="#231F20" d="M12,2.411L0.927,21.589h22.146L12,2.411z M13.042,18.446h-1.958v-1.958h1.958V18.446z M11.083,14.488v-4
+		h1.958v4H11.083z"/>
+</g>
+</svg>

From 4cb7f45ad1ca3f55e313fe388d3d504a4cffd4e5 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 14:19:15 +0200
Subject: [PATCH 387/400] Replace ic_exit_to_app icon

---
 .../main/res/drawable-hdpi/ic_exit_to_app.png    | Bin 602 -> 0 bytes
 .../main/res/drawable-mdpi/ic_exit_to_app.png    | Bin 295 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_exit_to_app.png   | Bin 499 -> 0 bytes
 .../main/res/drawable-xxhdpi/ic_exit_to_app.png  | Bin 965 -> 0 bytes
 .../main/res/drawable-xxxhdpi/ic_exit_to_app.png | Bin 1121 -> 0 bytes
 app/src/main/res/drawable/ic_exit_to_app.xml     |  12 ++++++++++++
 icons/ic_exit_to_app.svg                         |  11 +++++++++++
 7 files changed, 23 insertions(+)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_exit_to_app.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_exit_to_app.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_exit_to_app.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png
 delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png
 create mode 100644 app/src/main/res/drawable/ic_exit_to_app.xml
 create mode 100644 icons/ic_exit_to_app.svg

diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app.png b/app/src/main/res/drawable-hdpi/ic_exit_to_app.png
deleted file mode 100644
index f028ac5539190cb1b08a05921af761f68478d30a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmV-g0;T<lP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0006ZNkl<ZSV!%c
zy^l>n7{-4O3WeoAAR0EiYIGDf6oh6AwM50rE(*OyMC@ioLLxqrl^`Ke5UQ>1|FD%(
zh0x%USLVpsy~jOf_Uz^qJI(z#Gjo6QJoC=`&J{gt>KPB4Ky8jRDr9>na0=K9Y;Bt)
z^Z8F;8F($}>*}!sK(==P_kfc?yx)@fgKgb^0Ri$3I49{#eLxe?Y2XPEDy?Vx224qM
z&<1n?m`lnm0q+5KNOl-Fmgc-A>1rF$C15snx&y@Lu7JXk8Q^A`b57E94$yo6N$Ld1
zb^u*YK*2HFIgsr=5si`-+iYETpmaP$L>`TmOL{sCY9oMd09R4~d<M<~FC;~1542LC
zL%@kN+XqQ+|Fvq{qrhF@NP_wpfRdhd2Gq6>>d(`P4*<`BfQ$Ai1;T)RMGEBrRef!b
z0dIia@F!t6+E)Z*`yen;05%Rx0^8Eq0sBgUrhwZ8KrtlLsi&hA_LTy~$y^FlK~?LC
z#2E+c!}y{Us9%<qSY>-Z@Cu06C|5$6i@<`UAGOV&pE`1ZZ0`eJ0<o#1t+1)#n8?m$
z{W=(J*UOKg+1~bb;My>ox=<(wXczD(CD)lMnuesB{5_PTPzvS#lph5Fux5q2E@5L0
zRg^^)`d=k%?~430z~c?N22D%4U$?&LUN(~MWygW-tCD5zwrQ->fbT%m;AbU8sq(k=
o|0>;u1Z$aN^Y558^?Ik!Z}(|HG$4MD%K!iX07*qoM6N<$f}1E1aR2}S

diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app.png b/app/src/main/res/drawable-mdpi/ic_exit_to_app.png
deleted file mode 100644
index d2531b3e4622775748150a62b95aedf44bf100f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002)Nkl<ZNK4I?
zJBmU<5Jk_`888t;2Pbq7f|(02H!^Tv!lbhWU5zHX1wrLX5Ay_{pMD=(thBrOblv)i
z#HPgW^ICxIF)#<Z6(idMGf9ig{~`k0;lfwN$1}H$r0;tG{~xq~V@XgG*a4Q*hygw&
z9m)V~e*pX7Bk8P6UZO05D}e1j@B>UGt@H3_0Dgf9umVPTNFl%@No==)P#wctklKI%
zx7`7jz#tDP1hD;=q=<#Qg^CGwmg_wLv9H&bD0z}?Kk9?}Wf}pbZL|XUDK#pR4ZCNI
t>#d~Ty=j_u;ly;Va{k(#T;+!`pA+lBtQp)9@i_nh002ovPDHLkV1k8KeGC8q

diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xhdpi/ic_exit_to_app.png
deleted file mode 100644
index d35a1f0d4e7bafa08134853aa1525f89d7826eaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0005HNkl<ZXhZFp
zJ4ysW5Qe`}M8$XD1;i65ih^L`4Gi=e24)6|q2N6fQy-`Y@E(G(?gnb~%Stbd<IFO%
zJv%)OGjaD+ef?K=S5+I4e-^p_v;d(MY!zs<0+LpN3t$hJt=ZWwa0eWl*=wHd+z^tq
z0=xjrH9MX*_Xcd`K@0-80rmqs-#33{W`|k63<Br?a}5FLnAt*E0Hr1@0^c<OO#<%;
zTQajTUw~;d`>F##(iHHSv}I<Q(K0B6(h9TyMb&GB0+KF)4>LO}>Ue)#Z~*80k#p#@
zEJRQMN$0>xYSl|Yga%j#o`9ucAu0hV8@I{vk~V=yAbt51QX)7&4@S~9@Bqx0RiY69
z4q^wm&&Xs4D$y7K2eAv>0y9OGs02XLpR3$wPXH6Zc*Z|6m8c3Jol1Bz<WBzw(E_;G
zjXQ*@iWf;?HgOdIlHxr^qrS)_ZMb|WTq+@HsESO|8t@!EnezaMJDqk%aIYGRv!F?o
zh4Ge@zDMw=Qi-;$QdF5yDG*(2u}RI{u9>Av(_cYjX|G?K*+JRnZrl$X?m~+9iK*y`
p5qezv%-Sm8xdLqnc`l&$^dF?kPC)8cFIE5m002ovPDHLkV1ji?%>@7e

diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app.png
deleted file mode 100644
index 884eb3b24215fdb3d71e5edd6f82df775e31450f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 965
zcmV;$13LVPP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000AwNkl<ZcwX(B
zOUO-86vuxHdA|lsn8-wuflN%4Fj0z3Fu=gbV<6-)VMO|*D8)dLiHO2TQp!LSiGi3I
zF_Jt!BP^}jH=mqy_P+O=d+t5Q+M`={-+j*c-T!~Bz4qB#@K#7boKG<U2NY3=19Cv+
zf`}`~732ykN5B<Sj$c<XNL6P7Yk^(B3SfG<%h&enQQ!%14tOXc-%_uf3`kWM0VBYA
zU|i}2hOFNY;0|z1L|&)dTM{5uodH|~HUr~R1|H%*KY_czP7(POyU$cWrkdL=fYae&
zO4=eKx2gj409X?ntYP0<ELt7A=TrrK0nBD?YF|afl1}+*UR5<`l=(n%Mu^=^pT3_4
zyw4b0MI@SRQWca3XqJeWx`wue1e1A>A`*T6Xa{@p0tGoB2b5qAS5O3!0~#=(P{tgx
zQbt7HCWtz@OXGvIs;&ag151Esz+Mq~noJ=6=i2<OnORI#ZAIV;V1;m}y$N;F<0>FE
zRza$|5V#2}%K-5L*jk0%nha<Ia0!@`qm)YQ)?`2v!@}DMz{-KFR@!d00IDJuWR0P!
z6M$0|n1M+-*C}PUMgt17bc1vdI1J3L+HQ>p6d+9o_SsS>Fr`YnwE|FpWHITirFg(T
zXSJ^F)*3(olEtB;!2W^-x~{TYs{jQ^QvoYGjuZs$<m^@pAXWX`uS}LRuC4SLsG=3W
zB)ioGC~rlvW^VsnE^4>`9gq<#w3`Ehcfbx2d6Y959cVT077LlB?l%_}oNdBb6r^7P
z+ePGM(Z5uS#p;xas@h!0=0V2`(tM$<#@=tM00lTcQOpUZR$iP0_5fC!Wwj(*wN62*
zYH)T3KzYS#vaMPLD69$jaz~D>Y%`Vx;{&0zsKi#aE2tkY4uf)RY2!@6l50=4Y6~D=
zw2w^S76aFTr5XLY&Q^KXs%0M34~vBv`byv`uwcvsmbO(ZEY^7lfAySDr>LsEUA0Vh
zI#ydH4EI-;Mq8}ghwY`m1By^{Kn|!EWBvJ!D`?0SG_N5W$v<RptaKx}?WWJ$qEgNS
zgZuTUh(yo3rEVnm!z_`yX%ldxMaQA+%-A*&xfT;}s)FoP%w=F>gHIcFSo{L+g*PG}
zD*+S=OFxnsqp7NMfpuXI&+-NZ?(e{J-~w=8M54;+ut>643|yPPcR-PU*8w@8asj{<
n<O*^Hl_TH^D#y=bP=w!a&vF`P1DD-F00000NkvXXu0mjfjXSF*

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app.png
deleted file mode 100644
index 903a7230fda761c1f34121581e72b8f54d72c86a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1121
zcmV-n1fKheP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000CiNkl<ZcwX(D
z$*L4F6o$X!JfU6`x8h0^L=Xf)P;htwAHj{T)P*3rQ5T8`f-XeFH*o1JP7k5(6o(g3
z+}!KxNU$3FUT=3N=?vXBr`9LuRQ+F0DwU)X!LF(bNY&^T90O3f5*PpjP+5V>;VlCU
zKxG9ghqnwc0F@P}9Nsd(0900>a(K&tX$PRHdw^5GQD6tKy7DvS4nGHc0-gi+MC8jj
z0i!cORaXEvfOEj|ac*LY%Q_gBMdW7eGeiMURVVmE;6!ZTC06dfh@6gjrdR;ifJ-p}
zmvEU2F_{nyKvj1F?}3#|Sj?D5bIs8%5&0TYI0nFN;A}{chHP(%$oY`xjREix*c}q2
zA=?ik;(CSNR}6qzV2yW#whU)QWL?N3#{kd~0k#9bLT+M;Y&QbmhTN};$g+^<$pK(S
zM1F?c#I)F|>So}_u=^E}AWegeU0_uml>r7Iphg*h0I@6s0>sK;Y5;Pm8sO6a1c;Tx
z)Btp<s=D5ujOq*|XJ7#S_QG60`vLG>M6M=Rc~~dE^=@dN_$ND^u9Sq(bOtOUey^?;
zgU~F1A>tQ>&?Ep4@ryxd6~Gzbj_1oZYje~p05|mg7&ulNLX!Zx0l>Au6W~Zq2onLo
zQ-I`Vs=6L{1|0Hqp1e6~8bFr`8-N$U!5R>n2hc%qvr;dC1EnDtfPZ5_n}Aoq{*n+3
zK%d&GIs?20_LYKQ02U~%s#}0Jz}^xN48S5PtLj$ZE#SKzC%SiJ00vZZRow=>3s^7~
z1z{opsOr#V8J<l+4zpE2$fBrV2$KS!_)Js|S~2qp1|Sa!?@TZNc>p-CUJwj`0q|Oy
zm`|oWp1o>+Hw-crYeVzMl*g;L_>%;{x}ifVL-y6tc`D*~UYq(58&9hArEMr8y{6tC
zZ7|MTs`Q379GzZMZ;z^K6EfavB{o!5o03edskb{-wMltzwGtb4%Tk^Khdo^fePsFg
zoR+bm<bO%3sx8dw)sWJ^sj8}5n)nDf?o&&BM>aiu%`<B<160)(=k`~F3K`J*C8_sU
z%%IAfyv<)2sL2fIMj=N*$S(dQjfRez6HfjT9s!|<_{{?t0HK)p2B2$@?Kjm4*e%6=
z)E?f6&hie3>9?mY(`+v&wUDv?3_z@MiOLy(L_)^8F#xg3B`RkC5(ydWW?BH)wv_>d
zV>a!xjavr`JSQS<?!x<u0bpAf50<yc*2Qk)3^zt^*Z&F>*}U7fuV1|C{qDA}4?5B$
zxC!b;1+N1aEd}N&Q04%K4uBnDGQakfJ;J1eV2AiXokM*3;djSaxdUw6hDz=mV5uKt
z<=Xns-7!{os~uxy?SC2tqF%yjLYo(-fB~pn4-9|-sH{Nc@Rk7vpt1s$!&?RzfXWI~
n4sRJ?04gg`IlN^+WdMHwyDFxC)>=5B00000NkvXXu0mjfe3j?~

diff --git a/app/src/main/res/drawable/ic_exit_to_app.xml b/app/src/main/res/drawable/ic_exit_to_app.xml
new file mode 100644
index 0000000000..37a6c7d058
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exit_to_app.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.495,12.092l-4.921,-4.92l-1.444,1.444l2.468,2.467l-9.765,0l0,2.042l9.765,0l-2.468,2.467l1.444,1.444l4.921,-4.92l-0.012,-0.012z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M18.682,2.975H5.152c-1.272,0 -2.307,1.035 -2.307,2.307v3.801h2.126V5.282c0,-0.1 0.081,-0.181 0.181,-0.181h13.53c0.1,0 0.181,0.081 0.181,0.181v13.436c0,0.1 -0.081,0.181 -0.181,0.181H5.152c-0.1,0 -0.181,-0.081 -0.181,-0.181v-3.593H2.845v3.593c0,1.272 1.035,2.307 2.307,2.307h13.53c1.272,0 2.308,-1.034 2.308,-2.307V5.282C20.989,4.01 19.954,2.975 18.682,2.975z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/icons/ic_exit_to_app.svg b/icons/ic_exit_to_app.svg
new file mode 100644
index 0000000000..c834b1afed
--- /dev/null
+++ b/icons/ic_exit_to_app.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_exit_to_app">
+    <polygon fill="#FFFFFF" points="16.495,12.092 11.574,7.172 10.13,8.616 12.598,11.083 2.833,11.083 2.833,13.125 12.598,13.125
+        10.13,15.592 11.574,17.036 16.495,12.116 16.483,12.104 		"/>
+    <path fill="#FFFFFF" d="M18.682,2.975H5.152c-1.272,0-2.307,1.035-2.307,2.307v3.801h2.126V5.282c0-0.1,0.081-0.181,0.181-0.181
+        h13.53c0.1,0,0.181,0.081,0.181,0.181v13.436c0,0.1-0.081,0.181-0.181,0.181H5.152c-0.1,0-0.181-0.081-0.181-0.181v-3.593H2.845
+        v3.593c0,1.272,1.035,2.307,2.307,2.307h13.53c1.272,0,2.308-1.034,2.308-2.307V5.282C20.989,4.01,19.954,2.975,18.682,2.975z"/>
+</g>
+</svg>

From d20115cc1194a7bbc7f3d676c19ef77d4263f419 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 16:33:54 +0200
Subject: [PATCH 388/400] move 4 icons from drawable-anydpi to drawable

---
 .../res/{drawable-anydpi => drawable}/ic_keyboard_capslock.xml    | 0
 .../main/res/{drawable-anydpi => drawable}/ic_keyboard_tab.xml    | 0
 app/src/main/res/{drawable-anydpi => drawable}/ic_location_on.xml | 0
 .../main/res/{drawable-anydpi => drawable}/ic_network_wifi.xml    | 0
 .../main/res/{drawable-anydpi => drawable}/ic_notifications.xml   | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/res/{drawable-anydpi => drawable}/ic_keyboard_capslock.xml (100%)
 rename app/src/main/res/{drawable-anydpi => drawable}/ic_keyboard_tab.xml (100%)
 rename app/src/main/res/{drawable-anydpi => drawable}/ic_location_on.xml (100%)
 rename app/src/main/res/{drawable-anydpi => drawable}/ic_network_wifi.xml (100%)
 rename app/src/main/res/{drawable-anydpi => drawable}/ic_notifications.xml (100%)

diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml b/app/src/main/res/drawable/ic_keyboard_capslock.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml
rename to app/src/main/res/drawable/ic_keyboard_capslock.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml b/app/src/main/res/drawable/ic_keyboard_tab.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml
rename to app/src/main/res/drawable/ic_keyboard_tab.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_location_on.xml b/app/src/main/res/drawable/ic_location_on.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_location_on.xml
rename to app/src/main/res/drawable/ic_location_on.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_network_wifi.xml b/app/src/main/res/drawable/ic_network_wifi.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_network_wifi.xml
rename to app/src/main/res/drawable/ic_network_wifi.xml
diff --git a/app/src/main/res/drawable-anydpi/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
similarity index 100%
rename from app/src/main/res/drawable-anydpi/ic_notifications.xml
rename to app/src/main/res/drawable/ic_notifications.xml

From 22fc0ca6ffc2d523425814695c77210a1fe884a4 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 16:34:19 +0200
Subject: [PATCH 389/400] remove a forgotten unused icon (refresh.xml)

---
 app/src/main/res/drawable-mdpi-v11/refresh.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 app/src/main/res/drawable-mdpi-v11/refresh.xml

diff --git a/app/src/main/res/drawable-mdpi-v11/refresh.xml b/app/src/main/res/drawable-mdpi-v11/refresh.xml
deleted file mode 100644
index 677809a8c2..0000000000
--- a/app/src/main/res/drawable-mdpi-v11/refresh.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/refresh.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20C15.73,20 18.84,17.45 19.73,14H17.65C16.83,16.33 14.61,18 12,18A6,6 0 0,1 6,12A6,6 0 0,1 12,6C13.66,6 15.14,6.69 16.22,7.78L13,11H20V4L17.65,6.35Z" />
-</vector>
\ No newline at end of file

From 8c0271df2b00794c807157d1d9e0a4ab85f81091 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 19:07:02 +0200
Subject: [PATCH 390/400] Replace 3 notification icons Note Blue notif_icon.png
 file not replaced because can't have blue nitofication icon with vector ???
 remove a forgotten unused icon (refresh.xml)

---
 .../main/res/drawable-hdpi/ic_notif_aaps.png  | Bin 1001 -> 0 bytes
 .../res/drawable-hdpi/ic_notif_nsclient.png   | Bin 968 -> 0 bytes
 .../drawable-hdpi/ic_notif_pumpcontrol.png    | Bin 309 -> 0 bytes
 .../main/res/drawable-mdpi/ic_notif_aaps.png  | Bin 663 -> 0 bytes
 .../res/drawable-mdpi/ic_notif_nsclient.png   | Bin 571 -> 0 bytes
 .../drawable-mdpi/ic_notif_pumpcontrol.png    | Bin 240 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_notif_aaps.png | Bin 1392 -> 0 bytes
 .../res/drawable-xhdpi/ic_notif_nsclient.png  | Bin 1348 -> 0 bytes
 .../drawable-xhdpi/ic_notif_pumpcontrol.png   | Bin 369 -> 0 bytes
 .../res/drawable-xxhdpi/ic_notif_aaps.png     | Bin 2048 -> 0 bytes
 .../res/drawable-xxhdpi/ic_notif_nsclient.png | Bin 2075 -> 0 bytes
 .../drawable-xxhdpi/ic_notif_pumpcontrol.png  | Bin 511 -> 0 bytes
 app/src/main/res/drawable/ic_notif_aaps.png   | Bin 1001 -> 0 bytes
 app/src/main/res/drawable/ic_notif_aaps.xml   |  12 +++++
 .../main/res/drawable/ic_notif_nsclient.xml   |  27 ++++++++++
 .../res/drawable/ic_notif_pumpcontrol.png     | Bin 309 -> 0 bytes
 .../res/drawable/ic_notif_pumpcontrol.xml     |  27 ++++++++++
 .../main/res/drawable/ic_notifications.xml    |   8 +--
 app/src/main/res/drawable/ic_refresh.xml      |   9 ----
 icons/ic_notif_aaps.svg                       |  27 ++++++++++
 icons/ic_notif_nsclient.svg                   |  50 ++++++++++++++++++
 icons/ic_notif_pumpcontrol.svg                |  38 +++++++++++++
 22 files changed, 185 insertions(+), 13 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_notif_aaps.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_notif_nsclient.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_notif_aaps.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_notif_nsclient.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notif_aaps.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png
 delete mode 100644 app/src/main/res/drawable/ic_notif_aaps.png
 create mode 100644 app/src/main/res/drawable/ic_notif_aaps.xml
 create mode 100644 app/src/main/res/drawable/ic_notif_nsclient.xml
 delete mode 100644 app/src/main/res/drawable/ic_notif_pumpcontrol.png
 create mode 100644 app/src/main/res/drawable/ic_notif_pumpcontrol.xml
 delete mode 100644 app/src/main/res/drawable/ic_refresh.xml
 create mode 100644 icons/ic_notif_aaps.svg
 create mode 100644 icons/ic_notif_nsclient.svg
 create mode 100644 icons/ic_notif_pumpcontrol.svg

diff --git a/app/src/main/res/drawable-hdpi/ic_notif_aaps.png b/app/src/main/res/drawable-hdpi/ic_notif_aaps.png
deleted file mode 100644
index 453ed7b38231969381e834cee7f51d97a6611bb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000B9Nkl<Zc-rk)
zO-NNy5LVI>izKL^q$G)`7LP;|5=^tA7e&|uF>qms3ll<$BuaDPB9ep_QB>e22_&LS
z5~2(-T&Q6MDK7d!rGys!Scck<uNnAGOv5?v-uHMef(AaGXU@#I-#K^A%v=)^{>wZ_
zI2>L^C?PZxItYD)0sOWTng}66+I$l!!~<u;{$z%5laLp0A{z-^j)#6C4B>Q!36l=H
zPC{lp$W#%g#lmwSS4miBu}>tdhhGoujeI4P$4Z13zMyt_pO7VNmhkH!tc|cvE}>hk
z(-;dON#+~jF!T!v71;d`%<~BbFn@~h9>Km38)H->rlKc><2Le<cM1J&!fQv2)WBv+
z>3a#AFjs)rW~9t-08fjP$rU^Q72!r5hh3{>j!71an`&<97ea;?A$gn3YpPQZ_)fTp
z)BB4M?6)C3Ncl<FkNKlQf5$7&{0U&__NbE?HGxgP6E;F(y;7XAk<WZH5mUY5)@Hj1
zwF{#xLJHxHSn#bpVlP6lDZ+^wxd(l|(6zeCfqA!Gmf&WR1<J>h5bVyV*S8h=ei37-
z+Nnf1R6_Se=x$pc<d;wiPS?m4=#L3qP&+k?Nq)~ORhA9LN(i=Rh3y!00ikQq4jra8
zVH{MqD#h}USHh;kgHVxrZ7T>#B1~>*hdxXUVO%MkUpgLgfG|S1%VoraP`V<t1^O|J
zA8LmIO!Q%VL^uz|p-3-QgmR!C#`uxzgogc|kn#_pti0oVW|?2@AT*Bg16K~3MB>`(
z6+_DZlCZyJnctxa5t2oYYSj)+!kGJ+Rce8t2cc`iw!`C=8A4fNT(2EMVzLUlXOZ%d
zUqUoqr1Fp<R4c~2^nz)kU+ICaMmTUi+a4pKI!gzTBQ`u~4GA>lrcC7GX2_j!0IrFK
zkfoLxIVt{baqTis7<D7K52}nkYOBsRLiBq`ReLEP#O4E$VxdzwRYP~)(hprGY<3WO
zuGV3>?jY9Yl}|E7n>mBFGf~w#*#XpA2x&P-*kI9fgO~0ntCp)zmqO7IOsGX4WA3Wu
zf!yquijC^cgrZ6Hjly{rZD%3^op0YDvU0KLEKQ+&K{!EJin#@Z(~3}SEcK_+@&%C}
z!G1X>RHfUg`l`8@$cP2Y@O2=iAI%lluOwxkj10_4@2MqbLJ4uG)EWGBpsv4sonxrl
z<Bpueer>)2I7(vK`0kqW`QH!Dz%3E;Oq__NqN8l!PLG=_?q|4#0O5MBO<o<sKOw&X
XreNOSA7!&y00000NkvXXu0mjfEa%8(

diff --git a/app/src/main/res/drawable-hdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-hdpi/ic_notif_nsclient.png
deleted file mode 100644
index e6d52996a65f01c94b8ee1915359ac22ea0ef39a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 968
zcmV;(12_DMP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000AzNkl<Zc-rll
zTS!$w6o$2<L3Xh+Es}buL`%zVYLY}GMU+Z!qFux&$~4IydWo<UiXIZ`Sw!s~J(v^(
zy;MR(MAF?TBj~DKNQ?4<p4OsoVA`Cb_SwfETJSS7Yu3#Cd(YZy*6gsb{}KZ6`~AZN
zD+P6e2ZCPzcj=|A`c-N-6l9hQ?)iU|uY%Wt&kp^4!HQ76l|zC-7P})T6-*O^V-rrh
zM9_+z+SdqtUXwY-0$qY)vmH`K2^O%03$<;LE5=^sxMy1^6YXPC-Iio@vjnHuF6Z{0
zw(MpKp3_(D1(|fg0RAxtU8&{BKNIaQ!#+juiFwk4C3J-aN-Z+)1)VGqNCxRwyK=^D
zqwi`kWacu-Bjc1(PO<vq1iN^8Kc%+gESss6K0zCH^W73Uzyv!TB-RNw2@=qy3ZCf$
z(4H>XASe*TT4O7i@1R>k*O(xYc8*|=AYL$5u-TB6a<sLjsvjqqEZ8krP2UXWyY80I
z2b@_y;qihh^jeRnzE+S$JyYA%m2?dCy;^4;4Fg?n38}PGFBBvRCJ5dM`UQ*ejY@1P
z1rZSI!>MES4O>LjAN^hsDichClo7MYen(ko*(Bk2+v#fyhR_$mTk3g&_0)^_nj#2%
z4d@#*Afng)BJ}zZ<WcVs^tdJTn3yt(SO3ZcNBSoUZU`D_Hwtd5-m=l4_=52xiCs_J
z5<1UoPov$8Z(I^I3A*XG37PY*2|KlKraz7T3&EaYJFIxq7a%g96^sy^3DBqZsf;g2
zSLK$_Qs)z?bNc^G$^*RdWo`)#Cl>W+Ahh(qbGY`IH_Mo4GJ%geZ!qUs9SfA0Gl?>p
zE$Ru7eyBdhVZVj``e0A{EGD{3q+LWt=(7^E3_&)jN|be&mJlSv8LzU$i=5~dljT||
z$wLmy1k27xT&f`1Z$Y2S_*Snn#(Xm&i)L84Pz5$eI8N-GD3kQp<k$IL=G5jbZA4c~
zq8~}{>v#B49d^am!+3WsA_SOBFoyJE9{zFJLFOeHK@3NQN_Hr&LPweWgr(c+ATwa@
zV%#)TPKN4krceCFane^h2vwsmpxtSww4orC!$RHUIqF~M&^6=qiPn8=%}`vYYpkns
zG^cni<rqGBmBT~zvmw&D9$nP@2Ym!>m6o862p6O@m2Ef20VL~bKMkqh{DM@X^;w%M
qb%(j7{H=dQv#m&c+s-Ke3Hb)Xk3%nB4EIg|0000<MNUMnLSTaUsK+z_

diff --git a/app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-hdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 5562fef378d4f945f5a8b8b0962a41bf6c056b20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|n3?%2|6>tM7&H$ef*A#~TK<5Ad{{>P)y?`vn
zk|4ie28U-i(m<RfZ+91l4pvzYkn#eL$YP*z*Fl)kNn>^eP>{XE)7O>#F*6g7yg)|O
zG*6(=QcoAh5Q)pV6TG>Y4SAef!<+pLOGInDE~ok@?&7jaeY%7>I78u~>NI<<g7{;5
z9-Q=D=&gHc=Ef$@+1I?{HD%=_j!EejD?Mur3qEwMVU?Tk%@EGCLu*|Wt!%_YCx5c>
z4>bQ|W%$VN%>C_)jm<0L@)xl$+BI+6irv01H7@CJJdU0c_^{^tlDLE6)^>`YcFLS=
uyIv-_^H1EeatYyTz8~LjHwpj0&c3z6;-=A6rB6TyGkCiCxvX<aXaWH9Rcv4Y

diff --git a/app/src/main/res/drawable-mdpi/ic_notif_aaps.png b/app/src/main/res/drawable-mdpi/ic_notif_aaps.png
deleted file mode 100644
index c483ada1787a538e8ed0786d69da5ee0fc0b3fe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0007BNkl<Zc-qC5
zPe@fk6vowOiAqn(MIeM^`w$7mKnOuX1Xs~UOt3aV3vuI0K?FDcp-2-!ZIy@%4JlN#
zRiZxPh3LvucpyY>w7~zUx9`Ar>1()8FK#^WgF7?d%$YfJ=De4Za+T(J-ZfAS`oKI`
zBXgh^RDtx%ESw5nfKBh89fAZol74H~*_^P8-vm>fybE4~65T0JRtnyNeQGB_G|b}P
zIpGt?1NT7}h?z6$UV=7I0PcWk&WR;;!m#)|e+O=WL2xGF*rWCj+sB|CWPl;|eGCj2
zWA5)f3KrNt1&jRNr?w1y7RO`YI+$U*CMa7r8FLHEdkSr*k3fYwka@K{g;_Jm2M1ss
zL{wN!kzHsJ!(vo&JkSBh8vQYF8}zeXp`t!^TDJ7?ds4>FbC3=;INrz;n{}&bo_TKK
zWeVzL+@G|QBtbglf-}Jh_@V-Poe6$#Q~c1`Wea$c#KCjU`NsAy+h}M9&SFiVRZ~$M
z#M$0*9nA6hTQ;q@Arf7Vq-K6Vh~glNsXeO`dnqWD3!e;da7!HAWnV-t*&LMfyHh7t
zvD0cxF~2QMABS+zAboMZezS5n)e_8Qt1ZJ6{Z^sl!0OO5d1z)o8R}J#<{rO}qG>L)
zB&EU}7CH`MQgJ_c|J&1K#cqNED_pr?L?$h<+N%8k55Ozw8$GXFM`dR-tSxpYZ|n_l
z6P5(y438DKd(1+!uOR!P--IY%q{qV5&zGDjnk;6^fc(0RUbwgut{PTF-%j{Kw|FnU
xtp>(Cq@xH6UANU1)+uAw@|>qgyV8Fqe*wn>_9u)$pa}o~002ovPDHLkV1lUBDIEX+

diff --git a/app/src/main/res/drawable-mdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-mdpi/ic_notif_nsclient.png
deleted file mode 100644
index 0e55ac39eb2b24c1360901954820a4f7fa1ce1bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00064Nkl<Zc-qC4
zOGuSb5XUV_4axEvC8(g0wDbXD(L+!ZAB&c1B8e{Yxl#llDYTFF;Ue;Z8yBt=_dZb3
z%7r_{KtV8cV`-M3zoGvJ*A{WU>y-}tIA_kxH*@bfGjn2M{^#&K?=sZDH0*nS#=hhi
zrazDKRG5Ju@Db{uRPzVz&q7)x&hNlF%t5Aty@EH;Bso)hvr7pYU=o(#I`qPkcXpWE
z2MMqMQ$d^;!%w&m6)>oP$8vrw+4d`CXZFRe0ft~q>qIDmbjXG;kfS3iw0|hOF&K6Y
zun8~Wt}-P-&YnT60zTD#jqL2=zq$ta4UeD-LQ2UeP%XXfKh}P-<OlYhYk(7Y2(`+T
z1Fh?&uh&02klxk>b~&yAcHud6=))^;%TiMMdC9h)FFUjU<{H3?r$=Y|9Tru+d(!Vo
zUXb4Gy8R#E65y?$*UYcOa{m`hX!b{cSlzsH4N#&&N`g!OD71d*Z^EHvnQH($+bw8^
zdm;^*|7sP!&g{1ByCBs(pdJ$k%P<NVkOd7e0xJ+NyMds+D5T45g)&%!YpP^_ltYUy
zJQPVs?X=W`+d87QFz2J%x0LRR^gXx=pI}__XF1<c0*u3|wU6^WIyuUaX03N1SF&YN
zUNoM~7CE#2b3?PqZP9$2-|M^^H4jGn@weI-R;L{al=BxoP5~n+k^C=&S`q*N002ov
JPDHLkV1iO02x0&L

diff --git a/app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-mdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 3feb5d6248054e4024cc823e527343cd26cba5f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaP3?%1DUd;wloB=)|t_%z_fXx5@|HuFO-U(ze
zmIV0)GdMiEkp|)<dAqwXbg;^LfRq<_L>2>$yAHyPP8zc-fP(BLp1!W^kC~Zx6cza0
z_JYhx@N{tu;kfR5?jYv@2M(44sqx1{AAa6&N_DD7+(E6y;zCM~6gs%}OuSjj6ew{`
zqs4~7D2*eTZFcGo9x>C;4;CMA`%^CeDQepa6Q1Wc&nO2g%vfg?qF$AvuCZ$V$Jf8#
ZvCWW@(qx-cw-sm?gQu&X%Q~loCIFhsOtt_3

diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_aaps.png b/app/src/main/res/drawable-xhdpi/ic_notif_aaps.png
deleted file mode 100644
index 56c4049e84920d499f6f82dfa11baf787fda3d75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1392
zcmV-$1&{iPP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FyNkl<Zc-rk*
zduWbP82`+SY38yC;SaeqvPdo)xy3(dMMCn&QpoL(Q8KZT6sARUNlnUi7Aco$ieiyl
zxho=>+-BsuA(zkZ)brNU({s-EzVG*KE_v$L_jR6go^yWZ@|@>9ZzS?x{t<~rqnSV+
zuoBn>R05|6CxD$mAus`G|ECPPBd`Rx2>gipmv2Bdu<*B#L8sk;?ZD?~{PGDX0XjFu
zz*B%CpusVqpTJY#3UCsr0<HqjNoSJ}z*3-jV-3DHaLv;BGoTch=-LwOoa_KzS!|s*
zE1c-Tj|bi=o!tUv0LdX&GatCG*sTR}6E*lrz!%YhAu|_95(64bTdV>o2GWJCzQ6#W
z87oT$3g|3w`3Q_k#LUaVUjVwXI=z5xz#C;I53+izSotGh1<+R5xvr4NiD%EtZF2}{
zMfx;gGr2^Yyr8<xfOm@iH896p5&X8HL(k<U&^65dyrv93ne^Gf10OE(4YPU2QSZ37
z8fJnN5@-2#^+TXY**4zHkG9NaECK__!`NKuZJ-NViCaRyD99z%AP#IdHVAF-^}t#R
z7gPewet+Pwg@jr4G^&@Sj3dJjf$hTRTq;kuY#Y;QAF8t<76I1JRN%d0Z$GQET<F&N
ziETa$Kc7Uptx9JXxT_38fa(vVgDhn-JByFSDx|p#E)j-iP<cPa+nCj8C)x)hKyA$3
z@m;ig2(%#me4)#C8M`RL1JCR15=MS#{y7W*YFDhR!c5Y&7U%AyD^B4daVhf%@|G;O
z*a%C&oUc03_6*bSW#wjzr)oy>gn@}vK1G?GoJ10^tipFMFvRaHp&OwYSSdncukj|)
z_=#f>@emlIOw=UO^$_I?Gy{B}KV{{oZEjAnA>H1M00f#V?~FpyC5dfZq8X@U6|S)I
zd%|duV-W3G2x2<S3mC%4+jk4o@jGar*7%fm((%7W7+vgRCbM{?8GwLX?J}mj<a8o}
zKvh@*id_?l<^p44J$zyixEzbX30C21m@Q-()E?IMoQni>Hys2XvhqDzV;+b-XXR)7
z9%992SH-gocWk{+8UfPPv+|9afkNR%GpW4PuNzft_EZRrv(z1|)GcF=D=zai0~180
zJSv~A7#`XP1d1I5@<sVDn+xOt+YTykrzEh-6G?!=l{yE33XuqFY3s0>RWx~<6e>TU
zT=PQ{NMOC?fm23t65szvT^%meLRb6_Ql5hMV)=SM1n7zS%|W0*i&9-TDfa~TSxCKG
z>7ZKXeu5BiJZL=GOJThyb>7?DMWRF)DWLKUVayZbyR(84!0$B5hq^?by;Xh=UT0z0
ztVl1?jZhL@UPtR>hS@@38F0*!6RmNOsdcTkB(YR9HW{-vq?-(Ub>#gIdD#OC0b5F?
zqquFQ%#H*MZO;n>RV+6&(q!Enooxv~z{EctlyHGdCC{e@$q&^kB)paAWWowdqUwm{
zAtFC)Ea%??@c*t-uf~fC!sJJDDZwgJ>RGIgak1s>z?nzMShkWkMEh5C>vmC6EOJ#%
z!Z<tL4D~35L<7xUig=itkhzm+-+?mGtI6lL5c*VLjdHHc;0Gn@8$k|biKRTIyiMy6
zHq+^ndS=-+*^xvFg~n$s`}rMRI<sisCs`arZwkyRl+c+U*vv>{2tBSBSw1((1NwlT
zftSg<)W>LJ9LDUx-X<iG49Z5ojm9r^^z|k^($qp<Y4YiFYLIWnW`&NLz$|8L(}ZMF
yDb!d%@zg$YujTYE-e_J@<}qT8=l{!JD8B%bs0)OT-~>|u0000<MNUMnLSTZau#j;8

diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-xhdpi/ic_notif_nsclient.png
deleted file mode 100644
index 0ec8b219b6d51c5bbd830b313f082749d8eb0403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1348
zcmV-K1-tr*P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000FGNkl<Zc-rk*
zeQ1_d6o20~NmJJfjp?-7R<b#rx{<Qwq(~V<nv4-;S|H;07c3>H5h(o;wVBmcL4IL`
zQ?^8#Gw~0NrA$-=LHhtdz>mq$+N@RcV^8PM@5YbI^R#z(pZ8tjfgjKFoO|xM=iHBT
z&%IA1a-Z%I@;q;nV6EVQ;Ig2{`-gh)eE{Y8{mt+S!7;CIbVBe_q7Ba!9P}}+P0%d(
zRPce|6G4;Us*mg;K~^G+FBNo<A%DW)X9UrJI#EG^pjPlZ)m1$+<7xcMf?H%jgCIS?
z;Gu#fpR$ptXXv)-jfe5ilkxgoWR*`9d@eYRQBmp^`~ZHjCBMMZHzQ2rwb!os^_aZp
zVm`-0-wDQ3-4~(HgZ`0WInYQ(tRntw!5@8$LOMFLNyl<3+ZBfK#neEPS*Y@Sg?g{A
zr1j>~dTFAvX|5e;qWPQ!UW(ui!F0i7Z4}?f0}R%^qEhf2<h9;v!Nbt^B=jpayEJ|j
z_41Y&<f9mw8>sUerdc$Gx|>nwj$pJa2bNMVPPNK1(5veOZwm6LO!tKAf+@tyL9f3n
zSRr`a()TR2wcM2hJE8D8$8;F76`Ru_!5BfcpiYnsnKT-eYV6F}kk1!v(rHIJ9}u*o
zy+&6K{0N2niKkO!U4Z;tyG*{T1g{0iueCyQGur#vl>;V3eoVY?&1lH8NKhjvqw-z4
z3*&t-hepKx^=3M%9>G2;|Ih>sR}L6jhwmq}5xft>A~k9AB=8rTT~(ehnE5Qv30R;?
zU4r4@t3w%hf7>(|mIFF>-=Q6tX%_gensiy8`i=Klmi%~{Vg-1A%e4b0gjVBwgy3sh
zoMwkUqSFQZ_bdnA$NNK&^H9%hhz%x%P+2pgt{iBC!Y_$;MSGvVQ^}ZNh$QTQMzF`o
z=~SvaR`t>MHnexul><jj4-;>@;G8yY$)*bqL!KQ_YPHjDgw&r@AMwlx9e3rxHad8i
zUM>OeCejQY_IfN#FTep02bp@ve}no;B{Vu6_K4rD1C?aJSZb)Xmt@V)0Y7S`j>#r|
zr7H&}lhUQc&+8?P){&d1`BN`xHK!kosjSGA1G>@tVp3_VYz|$Y^p$!{I!*d^qwH6c
zj<|B-D=7YpBgkDIXkNGUq|h<6-t~E)oEl%?Q=W^XVl336JF<_C`6N@}+JOh@Jbc2s
z8;a7m9%{ZoXuL_0>I@F`)2wqtCVd~Htao4-$I2S&p<?g~5Joct*3N){YZY~TFQpHB
zWc?_tLwyD%Vw^oT;3&8SBarkT!JrstfNm>8-A5;}r^38i*+D&3NU^({_~-S&g0dMn
zCLW?lX6}G;AX7;E9bsQ=<<ck|rVWUv*GljPBHi$#4YUqgsP}W@aXYt>44DJo5Wz*<
zNF>{7u|+DELTR_5&GEV$O%rs|O>`>dM-ynhbOkstlQP&VbaRm&&kNpFWYAWhYnA;0
z#(zd~n~1+A-q-6%l+0;LP)=p@0*pUJi@S_ckdqp26Y-BAhqiv*<VJy?Wknp5ia$*k
zW$l!j<R$Vi%?dK|ds@IH*0p&l_{kJ?lvXGDH<QlyJ!DX=Pio95cpb^^jpe#A9!@+W
zI7@~t;@pVd7m~~c!K3}@PvtneANqI7SpU>+(Xn!3q`#5IciN?IP^wW#H`RAIV)aKS
zmeDlnM6B<0e&Zan6IB8GKvm@bLRhdDVfZD%lE{6!N9k`apvzjpw#5_x0000<MNUMn
GLSTaWZJ5yj

diff --git a/app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-xhdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index e5eb24b9dab1f0927e39069a82cf5f90749103a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDD3?#L31Vw-pXMj(LD+9w-AoKtK|5a*_K`Iza
zg8YIR9G=}s196hP-CY<uSY<sx$_qRqi-E>n2Vq7hjoB4ILG}_)Usv|W%uGC@8oRb1
ziv<cj^mK6y(KtVKlH;nw20SjUVUFsCmP=o*I&Ki#Y58>i#Hq`=gMKI~)?G}o*_8Y3
zvsGhhuk7USp$`sh=KgADekA1L_PiI>x2~=IG<#{XEr)kj-zlrt%N2R&PvU1*G)UbN
z^MH3^mjnCEx!wh4XPQcy7EW@z*0Q36_vTI3yPb#kG0KO}YZ8=CFw2irnS3kvE`wA6
z-?_yWWi~hGIvDoX91ddTn0ZR8mie|Cd%+bcrJI%p--2HLUcIejBTGMTmhg?+M{ja&
zSs4;Jx3s_dd`<11MdcE@_txsHeOD^L@TAs-;rH>c>=&P8B`%N=1O^5JgQu&X%Q~lo
FCIIV+jL`r9

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png b/app/src/main/res/drawable-xxhdpi/ic_notif_aaps.png
deleted file mode 100644
index 6ef4df1823ac81205abdff1cb5a98bec695f2ff3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
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

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png b/app/src/main/res/drawable-xxhdpi/ic_notif_nsclient.png
deleted file mode 100644
index ce7eb909ff7b92d115822bc9229c1dfd42936b55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2075
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
FV1mhs>`wpy

diff --git a/app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png b/app/src/main/res/drawable-xxhdpi/ic_notif_pumpcontrol.png
deleted file mode 100644
index 12bf9fd364243371cf2ec29554266d078c11437e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 511
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xb3?wz0qptud&H$ef*A#{dAoKtK|FKsa&44V%
zk|4ie28U-i(m<RfZ+91l4pv!^Ud{rK$YP*z*Fl)kNn<uhBYTObuPggwW+om{j>enM
zrULckd%8G=Se#xv#XIk)0f(!uo9O8m8c9=EXglVoY&`X8>tvI)Q7h#_-c>%4I(#(w
zPv*-#i~-TxCE}-Bgh)0|Iq&$W{-sFUR{PekV$bc?{f}=?(weF8b^1<4Z>9PzQ@NI?
zMJ6fqzBxVV(Sa8)mA8xhNc}VIud7$Jgm_njWcl<f`7?W#I!)n_zNr|hy*gR0Gw1o!
zR$qI8o9icayz(&O-M8p)S*Ye3on_)b`nF8Gf7<-f*&8o9e0Z<kH3}EF(fiZX$@x#m
zF=MXD6`Ep3o;zI`t0#q5&WK(;$>DDk--)t&L9rUSFQZ!B7Mh<}CmS2;yq^2h;d|=t
zyVJKY$NsO#bur~Q@K9{!wR3M4E?i;Z_E>gjW5aE=I=0=7hlF41JImYUM*M4X5L-NX
zn;~=OIg@>EsWOHAnp10aLW&Je|9cp|)~a!hV3czFy;;krEAD-Fe?p8~iGSMn)t`Ts
z-I*`fT4nX&&#RW)fTz#XU%cE{RdMNGYAsWv{U_79efK^9V}rrd)z4*}Q$iB}uO8a5

diff --git a/app/src/main/res/drawable/ic_notif_aaps.png b/app/src/main/res/drawable/ic_notif_aaps.png
deleted file mode 100644
index 453ed7b38231969381e834cee7f51d97a6611bb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000B9Nkl<Zc-rk)
zO-NNy5LVI>izKL^q$G)`7LP;|5=^tA7e&|uF>qms3ll<$BuaDPB9ep_QB>e22_&LS
z5~2(-T&Q6MDK7d!rGys!Scck<uNnAGOv5?v-uHMef(AaGXU@#I-#K^A%v=)^{>wZ_
zI2>L^C?PZxItYD)0sOWTng}66+I$l!!~<u;{$z%5laLp0A{z-^j)#6C4B>Q!36l=H
zPC{lp$W#%g#lmwSS4miBu}>tdhhGoujeI4P$4Z13zMyt_pO7VNmhkH!tc|cvE}>hk
z(-;dON#+~jF!T!v71;d`%<~BbFn@~h9>Km38)H->rlKc><2Le<cM1J&!fQv2)WBv+
z>3a#AFjs)rW~9t-08fjP$rU^Q72!r5hh3{>j!71an`&<97ea;?A$gn3YpPQZ_)fTp
z)BB4M?6)C3Ncl<FkNKlQf5$7&{0U&__NbE?HGxgP6E;F(y;7XAk<WZH5mUY5)@Hj1
zwF{#xLJHxHSn#bpVlP6lDZ+^wxd(l|(6zeCfqA!Gmf&WR1<J>h5bVyV*S8h=ei37-
z+Nnf1R6_Se=x$pc<d;wiPS?m4=#L3qP&+k?Nq)~ORhA9LN(i=Rh3y!00ikQq4jra8
zVH{MqD#h}USHh;kgHVxrZ7T>#B1~>*hdxXUVO%MkUpgLgfG|S1%VoraP`V<t1^O|J
zA8LmIO!Q%VL^uz|p-3-QgmR!C#`uxzgogc|kn#_pti0oVW|?2@AT*Bg16K~3MB>`(
z6+_DZlCZyJnctxa5t2oYYSj)+!kGJ+Rce8t2cc`iw!`C=8A4fNT(2EMVzLUlXOZ%d
zUqUoqr1Fp<R4c~2^nz)kU+ICaMmTUi+a4pKI!gzTBQ`u~4GA>lrcC7GX2_j!0IrFK
zkfoLxIVt{baqTis7<D7K52}nkYOBsRLiBq`ReLEP#O4E$VxdzwRYP~)(hprGY<3WO
zuGV3>?jY9Yl}|E7n>mBFGf~w#*#XpA2x&P-*kI9fgO~0ntCp)zmqO7IOsGX4WA3Wu
zf!yquijC^cgrZ6Hjly{rZD%3^op0YDvU0KLEKQ+&K{!EJin#@Z(~3}SEcK_+@&%C}
z!G1X>RHfUg`l`8@$cP2Y@O2=iAI%lluOwxkj10_4@2MqbLJ4uG)EWGBpsv4sonxrl
z<Bpueer>)2I7(vK`0kqW`QH!Dz%3E;Oq__NqN8l!PLG=_?q|4#0O5MBO<o<sKOw&X
XreNOSA7!&y00000NkvXXu0mjfEa%8(

diff --git a/app/src/main/res/drawable/ic_notif_aaps.xml b/app/src/main/res/drawable/ic_notif_aaps.xml
new file mode 100644
index 0000000000..a9b241c1f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_aaps.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.107,7.852c-1.11,-2.694 -3.265,-4.849 -5.959,-5.959C14.869,1.365 13.468,1.074 12,1.074c-1.468,0 -2.869,0.292 -4.148,0.819c-2.694,1.11 -4.849,3.265 -5.959,5.959C1.365,9.131 1.074,10.532 1.074,12c0,1.468 0.292,2.869 0.819,4.148c1.11,2.694 3.265,4.849 5.959,5.959c1.28,0.527 2.681,0.819 4.148,0.819c1.468,0 2.869,-0.292 4.148,-0.819c2.694,-1.11 4.849,-3.265 5.959,-5.959c0.527,-1.28 0.819,-2.681 0.819,-4.148C22.926,10.532 22.635,9.131 22.107,7.852zM18.837,7.97c-0.694,-1.216 -1.645,-2.172 -2.852,-2.866c-0.527,-0.303 -1.079,-0.539 -1.658,-0.71c-0.638,-0.188 -1.274,0.312 -1.274,0.977v0c0,0.449 0.3,0.831 0.727,0.969c0.386,0.125 0.755,0.293 1.108,0.503c0.874,0.523 1.564,1.236 2.068,2.139c0.504,0.904 0.756,1.916 0.756,3.037c0,1.122 -0.252,2.134 -0.756,3.037c-0.504,0.903 -1.193,1.611 -2.068,2.125c-0.236,0.138 -0.481,0.253 -0.732,0.354v-4.045c0,-0.32 -0.104,-0.584 -0.311,-0.791c-0.208,-0.207 -0.471,-0.311 -0.792,-0.311c-0.302,0 -0.561,0.104 -0.778,0.311c-0.217,0.208 -0.325,0.471 -0.325,0.791v5.246c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.171,0 0.325,-0.033 0.464,-0.096c0.558,-0.131 1.091,-0.322 1.598,-0.581c1.027,-0.523 1.872,-1.24 2.538,-2.153v1.711c0,0.174 0.031,0.33 0.092,0.468c-1.576,1.262 -3.574,2.018 -5.745,2.018c-5.077,0 -9.208,-4.131 -9.208,-9.208S6.923,2.792 12,2.792S21.208,6.923 21.208,12c0,1.742 -0.486,3.372 -1.33,4.762V12.02C19.878,10.537 19.531,9.187 18.837,7.97z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M10.847,4.131c-0.135,0 -0.26,0.024 -0.378,0.066C9.559,4.353 8.705,4.649 7.914,5.104C6.707,5.798 5.756,6.754 5.062,7.97c-0.694,1.217 -1.041,2.567 -1.041,4.05c0,1.483 0.337,2.829 1.012,4.035c0.675,1.208 1.597,2.158 2.766,2.852c0.545,0.324 1.12,0.571 1.725,0.742c0.661,0.188 1.321,-0.302 1.321,-0.989c0,-0.459 -0.309,-0.849 -0.746,-0.989c-0.383,-0.122 -0.751,-0.285 -1.103,-0.489c-0.884,-0.514 -1.578,-1.222 -2.082,-2.125C6.412,14.154 6.16,13.142 6.16,12.02c0,-1.122 0.252,-2.134 0.756,-3.037C7.42,8.08 8.114,7.367 8.998,6.844c0.241,-0.142 0.491,-0.26 0.746,-0.363v3.999c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.32,0 0.584,-0.108 0.792,-0.325c0.207,-0.216 0.311,-0.475 0.311,-0.778V5.233c0,-0.32 -0.104,-0.584 -0.311,-0.791C11.431,4.235 11.167,4.131 10.847,4.131z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notif_nsclient.xml b/app/src/main/res/drawable/ic_notif_nsclient.xml
new file mode 100644
index 0000000000..e51e9152c8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_nsclient.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.937,8.998c0,0.712 -0.092,1.6 -0.132,1.889c-0.115,0.816 -0.32,1.61 -0.578,2.391c-0.335,1.015 -0.758,1.992 -1.27,2.931c-0.314,0.576 -0.643,1.144 -1.002,1.692c-0.388,0.592 -0.799,1.166 -1.236,1.723c-0.415,0.529 -0.837,1.05 -1.282,1.555c-0.145,0.164 -0.298,0.322 -0.444,0.485c-0.283,0.316 -0.531,0.575 -0.858,0.849c-0.712,0.67 -1.759,0.616 -2.378,-0.081c-0.469,-0.458 -0.911,-0.94 -1.341,-1.436c-0.531,-0.613 -1.037,-1.245 -1.521,-1.896c-0.718,-0.966 -1.362,-1.978 -1.933,-3.036c-0.41,-0.758 -0.755,-1.549 -1.041,-2.362c-0.386,-1.097 -0.69,-2.215 -0.799,-3.381c-0.013,-0.143 -0.059,-0.71 -0.059,-1.319c0,-0.647 0.067,-1.158 0.096,-1.358C4.27,6.89 4.52,6.182 4.846,5.499C5.113,4.94 5.45,4.426 5.845,3.944C6.226,3.479 6.65,3.061 7.12,2.693C7.636,2.288 8.198,1.95 8.805,1.69c0.667,-0.285 1.353,-0.494 2.075,-0.586c0.127,-0.016 0.598,-0.062 1.166,-0.062c0.728,0 1.44,0.108 1.764,0.184c0.732,0.172 1.428,0.44 2.086,0.812c0.93,0.526 1.725,1.21 2.383,2.046c0.473,0.601 0.853,1.26 1.128,1.976c0.193,0.503 0.347,1.016 0.434,1.551C19.871,7.8 19.937,8.371 19.937,8.998zM12.052,2.302c-0.311,-0.005 -0.618,0.035 -0.926,0.068C10.484,2.439 9.876,2.628 9.29,2.888c-1.007,0.447 -1.839,1.12 -2.525,1.983c-0.477,0.6 -0.832,1.261 -1.083,1.98C5.545,7.245 5.455,7.654 5.399,8.066C5.354,8.405 5.324,8.752 5.336,9.091c0.014,0.41 0.027,0.796 0.086,1.192c0.058,0.386 0.103,0.775 0.19,1.154c0.247,1.084 0.608,2.131 1.076,3.14c0.409,0.88 0.883,1.723 1.413,2.535c0.534,0.817 1.113,1.601 1.734,2.355c0.563,0.683 1.143,1.349 1.772,1.972c0.234,0.232 0.548,0.228 0.784,0c0.628,-0.608 1.529,-1.669 1.956,-2.191c0.395,-0.484 0.769,-0.983 1.125,-1.497c0.456,-0.659 0.881,-1.336 1.263,-2.041c0.43,-0.793 0.818,-1.604 1.123,-2.454c0.27,-0.754 0.479,-1.521 0.62,-2.311c0.105,-0.586 0.16,-1.175 0.194,-1.767c0.02,-0.349 -0.023,-0.696 -0.063,-1.044c-0.074,-0.652 -0.247,-1.277 -0.519,-1.87c-0.386,-0.841 -0.91,-1.583 -1.602,-2.208c-0.514,-0.464 -1.077,-0.844 -1.703,-1.136C13.919,2.516 13.006,2.318 12.052,2.302z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M11.403,10.462c0,0.495 0.002,0.99 -0.001,1.485c-0.001,0.242 0.102,0.353 0.33,0.33c0.175,-0.017 0.352,-0.003 0.529,-0.003c0.287,0 0.337,-0.049 0.337,-0.329c0,-0.967 -0.024,-1.935 0.007,-2.901c0.027,-0.853 0.404,-1.541 1.159,-1.975c0.782,-0.449 1.606,-0.458 2.409,-0.08c0.674,0.317 1.073,0.88 1.242,1.612c0.145,0.629 0.02,1.233 -0.129,1.837c-0.184,0.747 -0.541,1.413 -1.022,2.005c-0.729,0.896 -1.653,1.5 -2.772,1.819c-0.644,0.184 -1.296,0.239 -1.952,0.191c-1.02,-0.075 -1.944,-0.434 -2.775,-1.04c-0.64,-0.467 -1.149,-1.049 -1.544,-1.727c-0.295,-0.506 -0.493,-1.056 -0.597,-1.636c-0.056,-0.315 -0.111,-0.63 -0.102,-0.951c0.028,-1.103 0.777,-2.126 1.932,-2.325c0.66,-0.114 1.28,-0.031 1.85,0.314c0.551,0.334 0.885,0.834 1.031,1.461c0.048,0.208 0.073,0.418 0.07,0.633C11.398,9.608 11.403,10.035 11.403,10.462zM15.047,7.016c-1.149,-0.005 -2.089,0.928 -2.103,2.061c-0.015,1.185 0.931,2.132 2.085,2.129c1.187,-0.004 2.088,-0.909 2.101,-2.077C17.145,7.951 16.2,7.034 15.047,7.016zM11.061,9.097c-0.006,-1.146 -0.964,-2.049 -2.002,-2.079C7.781,6.982 6.872,7.985 6.87,9.095c-0.002,1.185 0.922,2.103 2.085,2.11C10.098,11.211 11.045,10.32 11.061,9.097z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M16.472,5.843c-0.192,-0.021 -0.365,-0.097 -0.549,-0.135c-1.148,-0.239 -2.208,-0.059 -3.16,0.649c-0.259,0.193 -0.482,0.425 -0.656,0.695c-0.099,0.154 -0.155,0.074 -0.213,-0.009c-0.116,-0.167 -0.248,-0.32 -0.396,-0.458c-0.558,-0.521 -1.215,-0.832 -1.972,-0.934C8.936,5.572 8.353,5.602 7.782,5.786C7.714,5.808 7.647,5.834 7.579,5.855C7.564,5.859 7.545,5.852 7.504,5.847c1.186,-1.6 2.768,-2.406 4.734,-2.334C14.013,3.579 15.429,4.395 16.472,5.843z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M12.002,20.169c-0.383,-0.408 -0.749,-0.812 -1.096,-1.233c-0.146,-0.177 -0.292,-0.353 -0.434,-0.533c-0.05,-0.063 -0.058,-0.094 -0.006,-0.167c0.466,-0.65 0.907,-1.317 1.304,-2.013c0.088,-0.154 0.179,-0.307 0.259,-0.466c0.038,-0.076 0.083,-0.102 0.168,-0.106c1.054,-0.05 2.056,-0.298 2.982,-0.816c0.329,-0.184 0.647,-0.385 0.959,-0.607C15.124,16.459 13.679,18.388 12.002,20.169z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M7.861,14.231c0.421,0.291 0.845,0.562 1.303,0.779c0.483,0.229 0.985,0.403 1.51,0.5c0.144,0.027 0.126,0.072 0.075,0.155c-0.277,0.449 -0.546,0.903 -0.848,1.336c-0.076,0.109 -0.152,0.217 -0.238,0.34C8.965,16.352 8.354,15.329 7.861,14.231z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M15.032,8.211c0.475,-0.065 0.935,0.407 0.92,0.924c-0.013,0.432 -0.413,0.897 -0.925,0.891c-0.474,-0.005 -0.915,-0.445 -0.903,-0.948C14.134,8.626 14.579,8.147 15.032,8.211z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M9.866,9.095c0.053,0.502 -0.439,0.935 -0.908,0.931c-0.483,-0.005 -0.915,-0.417 -0.908,-0.94c0.006,-0.404 0.373,-0.92 0.985,-0.884C9.424,8.224 9.917,8.615 9.866,9.095z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notif_pumpcontrol.png b/app/src/main/res/drawable/ic_notif_pumpcontrol.png
deleted file mode 100644
index 5562fef378d4f945f5a8b8b0962a41bf6c056b20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|n3?%2|6>tM7&H$ef*A#~TK<5Ad{{>P)y?`vn
zk|4ie28U-i(m<RfZ+91l4pvzYkn#eL$YP*z*Fl)kNn>^eP>{XE)7O>#F*6g7yg)|O
zG*6(=QcoAh5Q)pV6TG>Y4SAef!<+pLOGInDE~ok@?&7jaeY%7>I78u~>NI<<g7{;5
z9-Q=D=&gHc=Ef$@+1I?{HD%=_j!EejD?Mur3qEwMVU?Tk%@EGCLu*|Wt!%_YCx5c>
z4>bQ|W%$VN%>C_)jm<0L@)xl$+BI+6irv01H7@CJJdU0c_^{^tlDLE6)^>`YcFLS=
uyIv-_^H1EeatYyTz8~LjHwpj0&c3z6;-=A6rB6TyGkCiCxvX<aXaWH9Rcv4Y

diff --git a/app/src/main/res/drawable/ic_notif_pumpcontrol.xml b/app/src/main/res/drawable/ic_notif_pumpcontrol.xml
new file mode 100644
index 0000000000..db51861565
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notif_pumpcontrol.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.969,9.711c0.189,0.189 0.415,0.284 0.678,0.284c0.279,0 0.509,-0.094 0.69,-0.284c0.181,-0.188 0.271,-0.414 0.271,-0.678V6.026c0,-0.279 -0.091,-0.509 -0.271,-0.69c-0.181,-0.181 -0.411,-0.271 -0.69,-0.271c-0.118,0 -0.227,0.021 -0.33,0.057C8.524,5.258 7.78,5.517 7.09,5.913C6.038,6.518 5.209,7.351 4.605,8.411C4,9.472 3.697,10.649 3.697,11.941s0.294,2.465 0.882,3.517c0.588,1.053 1.392,1.881 2.411,2.486c0.475,0.282 0.976,0.497 1.504,0.647c0.576,0.163 1.152,-0.263 1.152,-0.862c0,-0.4 -0.269,-0.74 -0.651,-0.862c-0.334,-0.107 -0.655,-0.249 -0.961,-0.427c-0.77,-0.448 -1.376,-1.065 -1.815,-1.852c-0.439,-0.787 -0.659,-1.669 -0.659,-2.648c0,-0.978 0.219,-1.86 0.659,-2.648c0.439,-0.787 1.044,-1.408 1.815,-1.864c0.21,-0.124 0.428,-0.227 0.65,-0.317v1.921C8.685,9.297 8.78,9.523 8.969,9.711z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M13.023,15.193c0,0.297 -0.241,0.538 -0.538,0.538l0,0c-0.297,0 -0.538,-0.241 -0.538,-0.538l0,0c0,-0.297 0.241,-0.538 0.538,-0.538l0,0C12.782,14.655 13.023,14.896 13.023,15.193L13.023,15.193z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M12.753,14.028c-0.094,-0.02 -0.182,-0.051 -0.287,-0.051c-0.091,0 -0.17,0.03 -0.254,0.047l0.272,0.272L12.753,14.028z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M18.849,7.116c-0.766,-1.342 -1.815,-2.397 -3.147,-3.163c-0.581,-0.334 -1.191,-0.595 -1.829,-0.783c-0.704,-0.208 -1.406,0.344 -1.406,1.078v0c0,0.495 0.331,0.916 0.802,1.069c0.426,0.138 0.834,0.323 1.222,0.555c0.965,0.578 1.725,1.364 2.281,2.36c0.556,0.997 0.834,2.114 0.834,3.351c0,1.238 -0.278,2.355 -0.834,3.351c-0.556,0.996 -1.317,1.777 -2.281,2.344c-0.26,0.153 -0.531,0.279 -0.808,0.39v-2.476c0,-0.353 -0.115,-0.644 -0.343,-0.873c-0.161,-0.161 -0.364,-0.245 -0.587,-0.293l-0.268,0.268c0.496,0 0.897,0.402 0.897,0.897s-0.402,0.897 -0.897,0.897s-0.897,-0.402 -0.897,-0.897s0.402,-0.897 0.897,-0.897l-0.272,-0.272c-0.223,0.046 -0.431,0.13 -0.604,0.296c-0.239,0.229 -0.359,0.52 -0.359,0.873v3.802c0,0.333 0.119,0.619 0.359,0.858c0.239,0.24 0.525,0.359 0.858,0.359c0.189,0 0.359,-0.037 0.512,-0.105c0.616,-0.144 1.204,-0.356 1.764,-0.641c1.133,-0.577 2.066,-1.369 2.801,-2.376v1.888c0,0.357 0.115,0.645 0.346,0.865c0.231,0.22 0.524,0.331 0.881,0.331c0.357,0 0.65,-0.115 0.881,-0.346c0.231,-0.231 0.346,-0.513 0.346,-0.849v-7.395C19.998,9.947 19.615,8.458 18.849,7.116z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M12.009,1.074c-6.039,0 -10.935,4.896 -10.935,10.935c0,6.039 4.896,10.935 10.935,10.935c6.039,0 10.935,-4.896 10.935,-10.935C22.944,5.969 18.048,1.074 12.009,1.074zM12.009,22.125c-5.587,0 -10.116,-4.529 -10.116,-10.116c0,-5.587 4.529,-10.116 10.116,-10.116c5.587,0 10.116,4.529 10.116,10.116C22.125,17.596 17.595,22.125 12.009,22.125z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M13.424,13.601c-0.061,0 -0.122,-0.022 -0.169,-0.067c-0.423,-0.406 -1.118,-0.406 -1.541,0c-0.096,0.093 -0.251,0.091 -0.345,-0.007c-0.093,-0.098 -0.09,-0.252 0.008,-0.346c0.606,-0.581 1.61,-0.581 2.216,0c0.097,0.094 0.101,0.248 0.008,0.346C13.553,13.576 13.488,13.601 13.424,13.601z"
+      android:fillColor="@color/white"/>
+  <path
+      android:pathData="M14.322,12.703c-0.062,0 -0.123,-0.022 -0.17,-0.069c-0.901,-0.877 -2.431,-0.877 -3.333,0c-0.096,0.096 -0.251,0.092 -0.345,-0.004c-0.094,-0.096 -0.092,-0.251 0.005,-0.345c0.542,-0.529 1.255,-0.82 2.007,-0.82s1.465,0.291 2.007,0.82c0.097,0.094 0.099,0.249 0.005,0.345C14.449,12.679 14.385,12.703 14.322,12.703z"
+      android:fillColor="@color/white"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index b655d741e6..5c8da5df78 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
deleted file mode 100644
index 8229a9a64c..0000000000
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
diff --git a/icons/ic_notif_aaps.svg b/icons/ic_notif_aaps.svg
new file mode 100644
index 0000000000..fcc139f344
--- /dev/null
+++ b/icons/ic_notif_aaps.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_aaps">
+    <path fill="#FFFFFF" d="M22.107,7.852c-1.11-2.694-3.265-4.849-5.959-5.959C14.869,1.365,13.468,1.074,12,1.074
+        c-1.468,0-2.869,0.292-4.148,0.819c-2.694,1.11-4.849,3.265-5.959,5.959C1.365,9.131,1.074,10.532,1.074,12
+        c0,1.468,0.292,2.869,0.819,4.148c1.11,2.694,3.265,4.849,5.959,5.959c1.28,0.527,2.681,0.819,4.148,0.819
+        c1.468,0,2.869-0.292,4.148-0.819c2.694-1.11,4.849-3.265,5.959-5.959c0.527-1.28,0.819-2.681,0.819-4.148
+        C22.926,10.532,22.635,9.131,22.107,7.852z M18.837,7.97c-0.694-1.216-1.645-2.172-2.852-2.866
+        c-0.527-0.303-1.079-0.539-1.658-0.71c-0.638-0.188-1.274,0.312-1.274,0.977v0c0,0.449,0.3,0.831,0.727,0.969
+        c0.386,0.125,0.755,0.293,1.108,0.503c0.874,0.523,1.564,1.236,2.068,2.139c0.504,0.904,0.756,1.916,0.756,3.037
+        c0,1.122-0.252,2.134-0.756,3.037c-0.504,0.903-1.193,1.611-2.068,2.125c-0.236,0.138-0.481,0.253-0.732,0.354v-4.045
+        c0-0.32-0.104-0.584-0.311-0.791c-0.208-0.207-0.471-0.311-0.792-0.311c-0.302,0-0.561,0.104-0.778,0.311
+        c-0.217,0.208-0.325,0.471-0.325,0.791v5.246c0,0.302,0.108,0.561,0.325,0.778c0.217,0.217,0.476,0.325,0.778,0.325
+        c0.171,0,0.325-0.033,0.464-0.096c0.558-0.131,1.091-0.322,1.598-0.581c1.027-0.523,1.872-1.24,2.538-2.153v1.711
+        c0,0.174,0.031,0.33,0.092,0.468c-1.576,1.262-3.574,2.018-5.745,2.018c-5.077,0-9.208-4.131-9.208-9.208S6.923,2.792,12,2.792
+        S21.208,6.923,21.208,12c0,1.742-0.486,3.372-1.33,4.762V12.02C19.878,10.537,19.531,9.187,18.837,7.97z"/>
+    <path fill="#FFFFFF" d="M10.847,4.131c-0.135,0-0.26,0.024-0.378,0.066C9.559,4.353,8.705,4.649,7.914,5.104
+        C6.707,5.798,5.756,6.754,5.062,7.97c-0.694,1.217-1.041,2.567-1.041,4.05c0,1.483,0.337,2.829,1.012,4.035
+        c0.675,1.208,1.597,2.158,2.766,2.852c0.545,0.324,1.12,0.571,1.725,0.742c0.661,0.188,1.321-0.302,1.321-0.989
+        c0-0.459-0.309-0.849-0.746-0.989c-0.383-0.122-0.751-0.285-1.103-0.489c-0.884-0.514-1.578-1.222-2.082-2.125
+        C6.412,14.154,6.16,13.142,6.16,12.02c0-1.122,0.252-2.134,0.756-3.037C7.42,8.08,8.114,7.367,8.998,6.844
+        c0.241-0.142,0.491-0.26,0.746-0.363v3.999c0,0.302,0.108,0.561,0.325,0.778c0.217,0.217,0.476,0.325,0.778,0.325
+        c0.32,0,0.584-0.108,0.792-0.325c0.207-0.216,0.311-0.475,0.311-0.778V5.233c0-0.32-0.104-0.584-0.311-0.791
+        C11.431,4.235,11.167,4.131,10.847,4.131z"/>
+</g>
+</svg>
diff --git a/icons/ic_notif_nsclient.svg b/icons/ic_notif_nsclient.svg
new file mode 100644
index 0000000000..808d4e233b
--- /dev/null
+++ b/icons/ic_notif_nsclient.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_nsclient">
+    <path fill="#FFFFFF" d="M19.937,8.998c0,0.712-0.092,1.6-0.132,1.889c-0.115,0.816-0.32,1.61-0.578,2.391
+        c-0.335,1.015-0.758,1.992-1.27,2.931c-0.314,0.576-0.643,1.144-1.002,1.692c-0.388,0.592-0.799,1.166-1.236,1.723
+        c-0.415,0.529-0.837,1.05-1.282,1.555c-0.145,0.164-0.298,0.322-0.444,0.485c-0.283,0.316-0.531,0.575-0.858,0.849
+        c-0.712,0.67-1.759,0.616-2.378-0.081c-0.469-0.458-0.911-0.94-1.341-1.436c-0.531-0.613-1.037-1.245-1.521-1.896
+        c-0.718-0.966-1.362-1.978-1.933-3.036c-0.41-0.758-0.755-1.549-1.041-2.362c-0.386-1.097-0.69-2.215-0.799-3.381
+        c-0.013-0.143-0.059-0.71-0.059-1.319c0-0.647,0.067-1.158,0.096-1.358C4.27,6.89,4.52,6.182,4.846,5.499
+        C5.113,4.94,5.45,4.426,5.845,3.944C6.226,3.479,6.65,3.061,7.12,2.693C7.636,2.288,8.198,1.95,8.805,1.69
+        c0.667-0.285,1.353-0.494,2.075-0.586c0.127-0.016,0.598-0.062,1.166-0.062c0.728,0,1.44,0.108,1.764,0.184
+        c0.732,0.172,1.428,0.44,2.086,0.812c0.93,0.526,1.725,1.21,2.383,2.046c0.473,0.601,0.853,1.26,1.128,1.976
+        c0.193,0.503,0.347,1.016,0.434,1.551C19.871,7.8,19.937,8.371,19.937,8.998z M12.052,2.302c-0.311-0.005-0.618,0.035-0.926,0.068
+        C10.484,2.439,9.876,2.628,9.29,2.888c-1.007,0.447-1.839,1.12-2.525,1.983c-0.477,0.6-0.832,1.261-1.083,1.98
+        C5.545,7.245,5.455,7.654,5.399,8.066C5.354,8.405,5.324,8.752,5.336,9.091c0.014,0.41,0.027,0.796,0.086,1.192
+        c0.058,0.386,0.103,0.775,0.19,1.154c0.247,1.084,0.608,2.131,1.076,3.14c0.409,0.88,0.883,1.723,1.413,2.535
+        c0.534,0.817,1.113,1.601,1.734,2.355c0.563,0.683,1.143,1.349,1.772,1.972c0.234,0.232,0.548,0.228,0.784,0
+        c0.628-0.608,1.529-1.669,1.956-2.191c0.395-0.484,0.769-0.983,1.125-1.497c0.456-0.659,0.881-1.336,1.263-2.041
+        c0.43-0.793,0.818-1.604,1.123-2.454c0.27-0.754,0.479-1.521,0.62-2.311c0.105-0.586,0.16-1.175,0.194-1.767
+        c0.02-0.349-0.023-0.696-0.063-1.044c-0.074-0.652-0.247-1.277-0.519-1.87c-0.386-0.841-0.91-1.583-1.602-2.208
+        c-0.514-0.464-1.077-0.844-1.703-1.136C13.919,2.516,13.006,2.318,12.052,2.302z"/>
+    <path fill="#FFFFFF" d="M11.403,10.462c0,0.495,0.002,0.99-0.001,1.485c-0.001,0.242,0.102,0.353,0.33,0.33
+        c0.175-0.017,0.352-0.003,0.529-0.003c0.287,0,0.337-0.049,0.337-0.329c0-0.967-0.024-1.935,0.007-2.901
+        c0.027-0.853,0.404-1.541,1.159-1.975c0.782-0.449,1.606-0.458,2.409-0.08c0.674,0.317,1.073,0.88,1.242,1.612
+        c0.145,0.629,0.02,1.233-0.129,1.837c-0.184,0.747-0.541,1.413-1.022,2.005c-0.729,0.896-1.653,1.5-2.772,1.819
+        c-0.644,0.184-1.296,0.239-1.952,0.191c-1.02-0.075-1.944-0.434-2.775-1.04c-0.64-0.467-1.149-1.049-1.544-1.727
+        c-0.295-0.506-0.493-1.056-0.597-1.636c-0.056-0.315-0.111-0.63-0.102-0.951c0.028-1.103,0.777-2.126,1.932-2.325
+        c0.66-0.114,1.28-0.031,1.85,0.314c0.551,0.334,0.885,0.834,1.031,1.461c0.048,0.208,0.073,0.418,0.07,0.633
+        C11.398,9.608,11.403,10.035,11.403,10.462z M15.047,7.016c-1.149-0.005-2.089,0.928-2.103,2.061
+        c-0.015,1.185,0.931,2.132,2.085,2.129c1.187-0.004,2.088-0.909,2.101-2.077C17.145,7.951,16.2,7.034,15.047,7.016z M11.061,9.097
+        c-0.006-1.146-0.964-2.049-2.002-2.079C7.781,6.982,6.872,7.985,6.87,9.095c-0.002,1.185,0.922,2.103,2.085,2.11
+        C10.098,11.211,11.045,10.32,11.061,9.097z"/>
+    <path fill="#FFFFFF" d="M16.472,5.843c-0.192-0.021-0.365-0.097-0.549-0.135c-1.148-0.239-2.208-0.059-3.16,0.649
+        c-0.259,0.193-0.482,0.425-0.656,0.695c-0.099,0.154-0.155,0.074-0.213-0.009c-0.116-0.167-0.248-0.32-0.396-0.458
+        c-0.558-0.521-1.215-0.832-1.972-0.934C8.936,5.572,8.353,5.602,7.782,5.786C7.714,5.808,7.647,5.834,7.579,5.855
+        C7.564,5.859,7.545,5.852,7.504,5.847c1.186-1.6,2.768-2.406,4.734-2.334C14.013,3.579,15.429,4.395,16.472,5.843z"/>
+    <path fill="#FFFFFF" d="M12.002,20.169c-0.383-0.408-0.749-0.812-1.096-1.233c-0.146-0.177-0.292-0.353-0.434-0.533
+        c-0.05-0.063-0.058-0.094-0.006-0.167c0.466-0.65,0.907-1.317,1.304-2.013c0.088-0.154,0.179-0.307,0.259-0.466
+        c0.038-0.076,0.083-0.102,0.168-0.106c1.054-0.05,2.056-0.298,2.982-0.816c0.329-0.184,0.647-0.385,0.959-0.607
+        C15.124,16.459,13.679,18.388,12.002,20.169z"/>
+    <path fill="#FFFFFF" d="M7.861,14.231c0.421,0.291,0.845,0.562,1.303,0.779c0.483,0.229,0.985,0.403,1.51,0.5
+        c0.144,0.027,0.126,0.072,0.075,0.155c-0.277,0.449-0.546,0.903-0.848,1.336c-0.076,0.109-0.152,0.217-0.238,0.34
+        C8.965,16.352,8.354,15.329,7.861,14.231z"/>
+    <path fill="#FFFFFF" d="M15.032,8.211c0.475-0.065,0.935,0.407,0.92,0.924c-0.013,0.432-0.413,0.897-0.925,0.891
+        c-0.474-0.005-0.915-0.445-0.903-0.948C14.134,8.626,14.579,8.147,15.032,8.211z"/>
+    <path fill="#FFFFFF" d="M9.866,9.095c0.053,0.502-0.439,0.935-0.908,0.931c-0.483-0.005-0.915-0.417-0.908-0.94
+        c0.006-0.404,0.373-0.92,0.985-0.884C9.424,8.224,9.917,8.615,9.866,9.095z"/>
+</g>
+</svg>
diff --git a/icons/ic_notif_pumpcontrol.svg b/icons/ic_notif_pumpcontrol.svg
new file mode 100644
index 0000000000..ae63c364eb
--- /dev/null
+++ b/icons/ic_notif_pumpcontrol.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px"
+	 height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g id="ic_notif_pumpcontrol">
+    <path fill="#FFFFFF" d="M8.969,9.711c0.189,0.189,0.415,0.284,0.678,0.284c0.279,0,0.509-0.094,0.69-0.284
+        c0.181-0.188,0.271-0.414,0.271-0.678V6.026c0-0.279-0.091-0.509-0.271-0.69c-0.181-0.181-0.411-0.271-0.69-0.271
+        c-0.118,0-0.227,0.021-0.33,0.057C8.524,5.258,7.78,5.517,7.09,5.913C6.038,6.518,5.209,7.351,4.605,8.411
+        C4,9.472,3.697,10.649,3.697,11.941s0.294,2.465,0.882,3.517c0.588,1.053,1.392,1.881,2.411,2.486
+        c0.475,0.282,0.976,0.497,1.504,0.647c0.576,0.163,1.152-0.263,1.152-0.862c0-0.4-0.269-0.74-0.651-0.862
+        c-0.334-0.107-0.655-0.249-0.961-0.427c-0.77-0.448-1.376-1.065-1.815-1.852c-0.439-0.787-0.659-1.669-0.659-2.648
+        c0-0.978,0.219-1.86,0.659-2.648c0.439-0.787,1.044-1.408,1.815-1.864c0.21-0.124,0.428-0.227,0.65-0.317v1.921
+        C8.685,9.297,8.78,9.523,8.969,9.711z"/>
+    <path fill="#FFFFFF" d="M13.023,15.193c0,0.297-0.241,0.538-0.538,0.538l0,0c-0.297,0-0.538-0.241-0.538-0.538l0,0
+        c0-0.297,0.241-0.538,0.538-0.538l0,0C12.782,14.655,13.023,14.896,13.023,15.193L13.023,15.193z"/>
+    <path fill="#FFFFFF" d="M12.753,14.028c-0.094-0.02-0.182-0.051-0.287-0.051c-0.091,0-0.17,0.03-0.254,0.047l0.272,0.272
+        L12.753,14.028z"/>
+    <path fill="#FFFFFF" d="M18.849,7.116c-0.766-1.342-1.815-2.397-3.147-3.163c-0.581-0.334-1.191-0.595-1.829-0.783
+        c-0.704-0.208-1.406,0.344-1.406,1.078v0c0,0.495,0.331,0.916,0.802,1.069c0.426,0.138,0.834,0.323,1.222,0.555
+        c0.965,0.578,1.725,1.364,2.281,2.36c0.556,0.997,0.834,2.114,0.834,3.351c0,1.238-0.278,2.355-0.834,3.351
+        c-0.556,0.996-1.317,1.777-2.281,2.344c-0.26,0.153-0.531,0.279-0.808,0.39v-2.476c0-0.353-0.115-0.644-0.343-0.873
+        c-0.161-0.161-0.364-0.245-0.587-0.293l-0.268,0.268c0.496,0,0.897,0.402,0.897,0.897s-0.402,0.897-0.897,0.897
+        s-0.897-0.402-0.897-0.897s0.402-0.897,0.897-0.897l-0.272-0.272c-0.223,0.046-0.431,0.13-0.604,0.296
+        c-0.239,0.229-0.359,0.52-0.359,0.873v3.802c0,0.333,0.119,0.619,0.359,0.858c0.239,0.24,0.525,0.359,0.858,0.359
+        c0.189,0,0.359-0.037,0.512-0.105c0.616-0.144,1.204-0.356,1.764-0.641c1.133-0.577,2.066-1.369,2.801-2.376v1.888
+        c0,0.357,0.115,0.645,0.346,0.865c0.231,0.22,0.524,0.331,0.881,0.331c0.357,0,0.65-0.115,0.881-0.346
+        c0.231-0.231,0.346-0.513,0.346-0.849v-7.395C19.998,9.947,19.615,8.458,18.849,7.116z"/>
+    <path fill="#FFFFFF" d="M12.009,1.074c-6.039,0-10.935,4.896-10.935,10.935c0,6.039,4.896,10.935,10.935,10.935
+        c6.039,0,10.935-4.896,10.935-10.935C22.944,5.969,18.048,1.074,12.009,1.074z M12.009,22.125
+        c-5.587,0-10.116-4.529-10.116-10.116c0-5.587,4.529-10.116,10.116-10.116c5.587,0,10.116,4.529,10.116,10.116
+        C22.125,17.596,17.595,22.125,12.009,22.125z"/>
+    <path fill="#FFFFFF" d="M13.424,13.601c-0.061,0-0.122-0.022-0.169-0.067c-0.423-0.406-1.118-0.406-1.541,0
+        c-0.096,0.093-0.251,0.091-0.345-0.007c-0.093-0.098-0.09-0.252,0.008-0.346c0.606-0.581,1.61-0.581,2.216,0
+        c0.097,0.094,0.101,0.248,0.008,0.346C13.553,13.576,13.488,13.601,13.424,13.601z"/>
+    <path fill="#FFFFFF" d="M14.322,12.703c-0.062,0-0.123-0.022-0.17-0.069c-0.901-0.877-2.431-0.877-3.333,0
+        c-0.096,0.096-0.251,0.092-0.345-0.004c-0.094-0.096-0.092-0.251,0.005-0.345c0.542-0.529,1.255-0.82,2.007-0.82
+        s1.465,0.291,2.007,0.82c0.097,0.094,0.099,0.249,0.005,0.345C14.449,12.679,14.385,12.703,14.322,12.703z"/>
+</g>
+</svg>

From 89a678f238f05a2c0db8e79c0556008851124b28 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Mon, 10 Aug 2020 19:59:09 +0200
Subject: [PATCH 391/400] Restore refresh file

---
 app/src/main/res/drawable/ic_refresh.xml  |  9 +++++++++
 app/src/main/res/drawable/notif_icon2.xml | 13 +++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_refresh.xml
 create mode 100644 app/src/main/res/drawable/notif_icon2.xml

diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 0000000000..8229a9a64c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/notif_icon2.xml b/app/src/main/res/drawable/notif_icon2.xml
new file mode 100644
index 0000000000..c36ee9e75c
--- /dev/null
+++ b/app/src/main/res/drawable/notif_icon2.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/basal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.107,7.852c-1.11,-2.694 -3.265,-4.849 -5.959,-5.959C14.869,1.365 13.468,1.074 12,1.074c-1.468,0 -2.869,0.292 -4.148,0.819c-2.694,1.11 -4.849,3.265 -5.959,5.959C1.365,9.131 1.074,10.532 1.074,12c0,1.468 0.292,2.869 0.819,4.148c1.11,2.694 3.265,4.849 5.959,5.959c1.28,0.527 2.681,0.819 4.148,0.819c1.468,0 2.869,-0.292 4.148,-0.819c2.694,-1.11 4.849,-3.265 5.959,-5.959c0.527,-1.28 0.819,-2.681 0.819,-4.148C22.926,10.532 22.635,9.131 22.107,7.852zM18.837,7.97c-0.694,-1.216 -1.645,-2.172 -2.852,-2.866c-0.527,-0.303 -1.079,-0.539 -1.658,-0.71c-0.638,-0.188 -1.274,0.312 -1.274,0.977v0c0,0.449 0.3,0.831 0.727,0.969c0.386,0.125 0.755,0.293 1.108,0.503c0.874,0.523 1.564,1.236 2.068,2.139c0.504,0.904 0.756,1.916 0.756,3.037c0,1.122 -0.252,2.134 -0.756,3.037c-0.504,0.903 -1.193,1.611 -2.068,2.125c-0.236,0.138 -0.481,0.253 -0.732,0.354v-4.045c0,-0.32 -0.104,-0.584 -0.311,-0.791c-0.208,-0.207 -0.471,-0.311 -0.792,-0.311c-0.302,0 -0.561,0.104 -0.778,0.311c-0.217,0.208 -0.325,0.471 -0.325,0.791v5.246c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.171,0 0.325,-0.033 0.464,-0.096c0.558,-0.131 1.091,-0.322 1.598,-0.581c1.027,-0.523 1.872,-1.24 2.538,-2.153v1.711c0,0.174 0.031,0.33 0.092,0.468c-1.576,1.262 -3.574,2.018 -5.745,2.018c-5.077,0 -9.208,-4.131 -9.208,-9.208S6.923,2.792 12,2.792S21.208,6.923 21.208,12c0,1.742 -0.486,3.372 -1.33,4.762V12.02C19.878,10.537 19.531,9.187 18.837,7.97z"
+      android:fillColor="@color/basal"/>
+  <path
+      android:pathData="M10.847,4.131c-0.135,0 -0.26,0.024 -0.378,0.066C9.559,4.353 8.705,4.649 7.914,5.104C6.707,5.798 5.756,6.754 5.062,7.97c-0.694,1.217 -1.041,2.567 -1.041,4.05c0,1.483 0.337,2.829 1.012,4.035c0.675,1.208 1.597,2.158 2.766,2.852c0.545,0.324 1.12,0.571 1.725,0.742c0.661,0.188 1.321,-0.302 1.321,-0.989c0,-0.459 -0.309,-0.849 -0.746,-0.989c-0.383,-0.122 -0.751,-0.285 -1.103,-0.489c-0.884,-0.514 -1.578,-1.222 -2.082,-2.125C6.412,14.154 6.16,13.142 6.16,12.02c0,-1.122 0.252,-2.134 0.756,-3.037C7.42,8.08 8.114,7.367 8.998,6.844c0.241,-0.142 0.491,-0.26 0.746,-0.363v3.999c0,0.302 0.108,0.561 0.325,0.778c0.217,0.217 0.476,0.325 0.778,0.325c0.32,0 0.584,-0.108 0.792,-0.325c0.207,-0.216 0.311,-0.475 0.311,-0.778V5.233c0,-0.32 -0.104,-0.584 -0.311,-0.791C11.431,4.235 11.167,4.131 10.847,4.131z"
+      android:fillColor="@color/basal"/>
+</vector>

From 272f91d90b9be89ef66c5442594ecbcebe4bda3d Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 11 Aug 2020 00:21:03 +0200
Subject: [PATCH 392/400] better check for RS v3 failed encryption

---
 .../androidaps/danars/services/BLEComm.kt     |  5 ++++
 .../danars/services/DanaRSService.kt          | 25 ++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
index 1e0e5f088b..cc24cf5c22 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/BLEComm.kt
@@ -21,6 +21,7 @@ import info.nightscout.androidaps.danars.activities.EnterPinActivity
 import info.nightscout.androidaps.danars.activities.PairingHelperActivity
 import info.nightscout.androidaps.danars.comm.DanaRSMessageHashTable
 import info.nightscout.androidaps.danars.comm.DanaRS_Packet
+import info.nightscout.androidaps.danars.comm.DanaRS_Packet_Etc_Keep_Connection
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.danars.events.EventDanaRSPairingSuccess
 import info.nightscout.androidaps.utils.T
@@ -131,6 +132,7 @@ class BLEComm @Inject internal constructor(
         if (!encryptedDataRead && encryptedCommandSent && v3Encryption) {
             // there was no response from pump after started encryption
             // assume pairing keys are invalid
+            aapsLogger.error("Clearing pairing keys !!!")
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_randompairingkey) + danaRSPlugin.mDeviceName)
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_pairingkey) + danaRSPlugin.mDeviceName)
             sp.remove(resourceHelper.gs(R.string.key_danars_v3_randomsynckey) + danaRSPlugin.mDeviceName)
@@ -705,6 +707,9 @@ class BLEComm @Inject internal constructor(
             aapsLogger.warn(LTag.PUMPBTCOMM, "Reply not received " + message.friendlyName)
             message.handleMessageNotReceived()
         }
+        // verify encryption for v3
+        if (message is DanaRS_Packet_Etc_Keep_Connection)
+            if (!message.isReceived) disconnect("KeepAlive not received")
     }
 
     // process common packet response
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
index abe5f6333d..d4b14b1c5e 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
@@ -116,19 +116,17 @@ class DanaRSService : DaggerService() {
         try {
             val now = System.currentTimeMillis()
             val pump = activePlugin.activePump
-            if (danaPump.lastSettingsRead + 60 * 60 * 1000L < now || !pump.isInitialized) {
-                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
-                sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
-                sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
-                sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
-                sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
-                sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
-                sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
-                if (danaPump.profile24) sendMessage(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
-                else sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
-                sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
-                danaPump.lastSettingsRead = now
-            }
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+            sendMessage(DanaRS_Packet_Etc_Keep_Connection(injector)) // test encryption for v3
+            sendMessage(DanaRS_Packet_General_Get_Shipping_Information(injector)) // serial no
+            sendMessage(DanaRS_Packet_General_Get_Pump_Check(injector)) // firmware
+            sendMessage(DanaRS_Packet_Basal_Get_Profile_Number(injector))
+            sendMessage(DanaRS_Packet_Bolus_Get_Bolus_Option(injector)) // isExtendedEnabled
+            sendMessage(DanaRS_Packet_Basal_Get_Basal_Rate(injector)) // basal profile, basalStep, maxBasal
+            sendMessage(DanaRS_Packet_Bolus_Get_Calculation_Information(injector)) // target
+            if (danaPump.profile24) sendMessage(DanaRS_Packet_Bolus_Get_24_CIR_CF_Array(injector))
+            else sendMessage(DanaRS_Packet_Bolus_Get_CIR_CF_Array(injector))
+            sendMessage(DanaRS_Packet_Option_Get_User_Option(injector)) // Getting user options
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)))
             sendMessage(DanaRS_Packet_General_Initial_Screen_Information(injector))
             rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingextendedbolusstatus)))
@@ -414,7 +412,6 @@ class DanaRSService : DaggerService() {
         sendMessage(msgSet)
         val msgActivate = DanaRS_Packet_Basal_Set_Profile_Number(injector, 0)
         sendMessage(msgActivate)
-        danaPump.lastSettingsRead = 0 // force read full settings
         readPumpStatus()
         rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
         return true

From b8327f6b3a7dc0bc09db858c677456d17c581630 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 11 Aug 2020 14:32:48 +0200
Subject: [PATCH 393/400] fix ABS IOB calculation

---
 .../androidaps/plugins/treatments/TreatmentsPlugin.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index 3b49779bd3..bab14b9f66 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -470,8 +470,8 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             Treatment treatment = new Treatment(getInjector());
             treatment.date = i;
             treatment.insulin = running * 5.0 / 60.0; // 5 min chunk
-            Iob iob = treatment.iobCalc(i, profile.getDia());
-            total.iob += iob.iobContrib;
+            Iob iob = treatment.iobCalc(time, profile.getDia());
+            total.basaliob += iob.iobContrib;
             total.activity += iob.activityContrib;
         }
         return total;

From f546fdf837619d7ef8f86d4ff5d97491821ac3e3 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 13 Aug 2020 13:55:39 +0200
Subject: [PATCH 394/400] ignore Can not perform this action after
 onSaveInstanceState

---
 .../general/overview/OverviewFragment.kt      | 104 +++++++++---------
 1 file changed, 54 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
index d478d4f5fa..ecacb42b6d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@@ -11,7 +11,6 @@ import android.graphics.drawable.AnimationDrawable
 import android.os.Bundle
 import android.os.Handler
 import android.util.DisplayMetrics
-import android.util.TypedValue
 import android.view.ContextMenu
 import android.view.ContextMenu.ContextMenuInfo
 import android.view.LayoutInflater
@@ -314,58 +313,62 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         // try to fix  https://fabric.io/nightscout3/android/apps/info.nightscout.androidaps/issues/5aca7a1536c7b23527eb4be7?time=last-seven-days
         // https://stackoverflow.com/questions/14860239/checking-if-state-is-saved-before-committing-a-fragmenttransaction
         if (childFragmentManager.isStateSaved) return
-        activity?.let { activity ->
-            when (v.id) {
-                R.id.overview_treatmentbutton   -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { TreatmentDialog().show(childFragmentManager, "Overview") }))
-                R.id.overview_wizardbutton      -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { WizardDialog().show(childFragmentManager, "Overview") }))
-                R.id.overview_insulinbutton     -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { InsulinDialog().show(childFragmentManager, "Overview") }))
-                R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { onClickQuickWizard() }))
-                R.id.overview_carbsbutton       -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { CarbsDialog().show(childFragmentManager, "Overview") }))
+        try {
+            activity?.let { activity ->
+                when (v.id) {
+                    R.id.overview_treatmentbutton   -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { TreatmentDialog().show(childFragmentManager, "Overview") }))
+                    R.id.overview_wizardbutton      -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { WizardDialog().show(childFragmentManager, "Overview") }))
+                    R.id.overview_insulinbutton     -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { InsulinDialog().show(childFragmentManager, "Overview") }))
+                    R.id.overview_quickwizardbutton -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { onClickQuickWizard() }))
+                    R.id.overview_carbsbutton       -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable(Runnable { CarbsDialog().show(childFragmentManager, "Overview") }))
 
-                R.id.overview_cgmbutton         -> {
-                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
-                        openCgmApp("com.eveningoutpost.dexdrip")
-                    else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
-                        dexcomPlugin.findDexcomPackageName()?.let {
-                            openCgmApp(it)
-                        }
-                            ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
-                    }
-                }
-
-                R.id.overview_calibrationbutton -> {
-                    if (xdripPlugin.isEnabled(PluginType.BGSOURCE)) {
-                        CalibrationDialog().show(childFragmentManager, "CalibrationDialog")
-                    } else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
-                        try {
+                    R.id.overview_cgmbutton         -> {
+                        if (xdripPlugin.isEnabled(PluginType.BGSOURCE))
+                            openCgmApp("com.eveningoutpost.dexdrip")
+                        else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
                             dexcomPlugin.findDexcomPackageName()?.let {
-                                startActivity(Intent("com.dexcom.cgm.activities.MeterEntryActivity").setPackage(it))
+                                openCgmApp(it)
                             }
                                 ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
-                        } catch (e: ActivityNotFoundException) {
-                            ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.g5appnotdetected))
                         }
                     }
-                }
 
-                R.id.overview_accepttempbutton  -> {
-                    profileFunction.getProfile() ?: return
-                    if (loopPlugin.isEnabled(PluginType.LOOP)) {
-                        val lastRun = loopPlugin.lastRun
-                        loopPlugin.invoke("Accept temp button", false)
-                        if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
-                            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
-                                ?: "".toSpanned(), Runnable {
-                                aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
-                                overview_accepttempbutton?.visibility = View.GONE
-                                (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
-                                actionStringHandler.handleInitiate("cancelChangeRequest")
-                                loopPlugin.acceptChangeRequest()
-                            })
+                    R.id.overview_calibrationbutton -> {
+                        if (xdripPlugin.isEnabled(PluginType.BGSOURCE)) {
+                            CalibrationDialog().show(childFragmentManager, "CalibrationDialog")
+                        } else if (dexcomPlugin.isEnabled(PluginType.BGSOURCE)) {
+                            try {
+                                dexcomPlugin.findDexcomPackageName()?.let {
+                                    startActivity(Intent("com.dexcom.cgm.activities.MeterEntryActivity").setPackage(it))
+                                }
+                                    ?: ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.dexcom_app_not_installed))
+                            } catch (e: ActivityNotFoundException) {
+                                ToastUtils.showToastInUiThread(activity, resourceHelper.gs(R.string.g5appnotdetected))
+                            }
+                        }
+                    }
+
+                    R.id.overview_accepttempbutton  -> {
+                        profileFunction.getProfile() ?: return
+                        if (loopPlugin.isEnabled(PluginType.LOOP)) {
+                            val lastRun = loopPlugin.lastRun
+                            loopPlugin.invoke("Accept temp button", false)
+                            if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) {
+                                OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned()
+                                    ?: "".toSpanned(), Runnable {
+                                    aapsLogger.debug("USER ENTRY: ACCEPT TEMP BASAL")
+                                    overview_accepttempbutton?.visibility = View.GONE
+                                    (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancel(Constants.notificationID)
+                                    actionStringHandler.handleInitiate("cancelChangeRequest")
+                                    loopPlugin.acceptChangeRequest()
+                                })
+                            }
                         }
                     }
                 }
             }
+        } catch (ignored: IllegalStateException) {
+            // ignore Can not perform this action after onSaveInstanceState
         }
     }
 
@@ -571,7 +574,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
             val glucoseStatus = GlucoseStatus(injector).glucoseStatusData
             if (glucoseStatus != null) {
-                overview_delta?.text = "${Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)}"
+                overview_delta?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
                 overview_deltashort?.text = Profile.toSignedUnitsString(glucoseStatus.delta, glucoseStatus.delta * Constants.MGDL_TO_MMOLL, units)
                 overview_avgdelta?.text = "${Profile.toSignedUnitsString(glucoseStatus.short_avgdelta, glucoseStatus.short_avgdelta * Constants.MGDL_TO_MMOLL, units)}\n${Profile.toSignedUnitsString(glucoseStatus.long_avgdelta, glucoseStatus.long_avgdelta * Constants.MGDL_TO_MMOLL, units)}"
             } else {
@@ -683,7 +686,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             ?: resourceHelper.gc(R.color.defaulttextcolor))
 
         overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_no_tbr)
-        val percentRate = activeTemp?.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) ?:100
+        val percentRate = activeTemp?.tempBasalConvertedToPercent(System.currentTimeMillis(), profile)
+            ?: 100
         if (percentRate > 100) overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_tbr_high)
         if (percentRate < 100) overview_basebasal_icon?.setImageResource(R.drawable.ic_cp_basal_tbr_low)
 
@@ -750,7 +754,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
 
         if (config.APS && lastRun?.constraintsProcessed != null) {
             if (lastRun.constraintsProcessed!!.carbsReq > 0) {
-                //only display carbsreq when carbs havnt been entered recently
+                //only display carbsreq when carbs have not been entered recently
                 if (treatmentsPlugin.lastCarbTime < lastRun.lastAPSRun) {
                     cobText = cobText + " | " + lastRun.constraintsProcessed!!.carbsReq + " " + resourceHelper.gs(R.string.required)
                 }
@@ -809,13 +813,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
                 val endTime: Long
                 val apsResult = if (config.APS) lastRun?.constraintsProcessed else NSDeviceStatus.getAPSResult(injector)
                 if (predictionsAvailable && apsResult != null && overviewMenus.setting[0][OverviewMenus.CharType.PRE.ordinal]) {
-                    var predHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
-                    predHours = min(2, predHours)
-                    predHours = max(0, predHours)
-                    hoursToFetch = rangeToDisplay - predHours
+                    var predictionHours = (ceil(apsResult.latestPredictionsTime - System.currentTimeMillis().toDouble()) / (60 * 60 * 1000)).toInt()
+                    predictionHours = min(2, predictionHours)
+                    predictionHours = max(0, predictionHours)
+                    hoursToFetch = rangeToDisplay - predictionHours
                     toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific
                     fromTime = toTime - T.hours(hoursToFetch.toLong()).msecs()
-                    endTime = toTime + T.hours(predHours.toLong()).msecs()
+                    endTime = toTime + T.hours(predictionHours.toLong()).msecs()
                 } else {
                     hoursToFetch = rangeToDisplay
                     toTime = calendar.timeInMillis + 100000 // little bit more to avoid wrong rounding - GraphView specific

From 5c7d0a8516cb0a3d2f9a6cbaf50981d4f6b27f18 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 14 Aug 2020 10:00:53 +0200
Subject: [PATCH 395/400] Replace Default Dia by profile Dia in extendedBolus
 Iob calculation

---
 .../androidaps/plugins/treatments/TreatmentsPlugin.java   | 6 +++---
 .../fragments/TreatmentsExtendedBolusesFragment.kt        | 8 +++++---
 .../java/info/nightscout/androidaps/db/ExtendedBolus.java | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
index bab14b9f66..01ae2f9dcd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java
@@ -273,7 +273,7 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                 for (int pos = 0; pos < extendedBoluses.size(); pos++) {
                     ExtendedBolus e = extendedBoluses.get(pos);
                     if (e.date > time) continue;
-                    IobTotal calc = e.iobCalc(time);
+                    IobTotal calc = e.iobCalc(time, profile);
                     total.plus(calc);
                 }
             }
@@ -439,9 +439,9 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                         ExtendedBolus dummyExt = new ExtendedBolus(getInjector());
                         dummyExt.copyFrom(e);
                         dummyExt.cutEndTo(truncateTime);
-                        calc = dummyExt.iobCalc(time);
+                        calc = dummyExt.iobCalc(time, profile);
                     } else {
-                        calc = e.iobCalc(time);
+                        calc = e.iobCalc(time, profile);
                     }
                     totalExt.plus(calc);
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
index 91e3b098fc..f502d0f317 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsExtendedBolusesFragment.kt
@@ -19,6 +19,7 @@ import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
@@ -42,6 +43,7 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var nsUpload: NSUpload
     @Inject lateinit var uploadQueue: UploadQueue
+    @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var dateUtil: DateUtil
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
@@ -77,16 +79,16 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() {
                 @SuppressLint("SetTextI18n")
                 if (extendedBolus.isInProgress) holder.date.text = dateUtil.dateAndTimeString(extendedBolus.date)
                 else holder.date.text = dateUtil.dateAndTimeString(extendedBolus.date) + " - " + dateUtil.timeString(extendedBolus.end())
-
+                val profile = profileFunction.getProfile(extendedBolus.date)
                 holder.duration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.durationInMinutes)
                 holder.insulin.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulin)
                 holder.realDuration.text = resourceHelper.gs(R.string.format_mins, extendedBolus.realDuration)
-                val iob = extendedBolus.iobCalc(System.currentTimeMillis())
+                val iob = extendedBolus.iobCalc(System.currentTimeMillis(), profile)
                 holder.iob.text = resourceHelper.gs(R.string.formatinsulinunits, iob.iob)
                 holder.insulinSoFar.text = resourceHelper.gs(R.string.formatinsulinunits, extendedBolus.insulinSoFar())
                 holder.ratio.text = resourceHelper.gs(R.string.pump_basebasalrate, extendedBolus.absoluteRate())
                 if (extendedBolus.isInProgress) holder.date.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.date.setTextColor(holder.insulin.currentTextColor)
-                if (extendedBolus.iobCalc(System.currentTimeMillis()).iob != 0.0) holder.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.iob.setTextColor(holder.insulin.currentTextColor)
+                if (iob.iob != 0.0) holder.iob.setTextColor(resourceHelper.gc(R.color.colorActive)) else holder.iob.setTextColor(holder.insulin.currentTextColor)
             }
             holder.remove.tag = extendedBolus
         }
diff --git a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index e1f96431cb..3994cf2eb5 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -64,8 +64,6 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
     @DatabaseField
     public int insulinInterfaceID = InsulinInterface.OREF_RAPID_ACTING;
-    @DatabaseField
-    public double dia = Constants.defaultDIA;
 
     @Deprecated
     public ExtendedBolus() {
@@ -229,13 +227,14 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
         return absoluteRate() * getRealDuration() / 60d;
     }
 
-    public IobTotal iobCalc(long time) {
+    public IobTotal iobCalc(long time, Profile profile) {
         IobTotal result = new IobTotal(time);
         InsulinInterface insulinInterface = activePlugin.getActiveInsulin();
 
         double realDuration = getDurationToTime(time);
 
         if (realDuration > 0) {
+            double dia = profile.getDia();
             double dia_ago = time - dia * 60 * 60 * 1000;
             int aboutFiveMinIntervals = (int) Math.ceil(realDuration / 5d);
             double spacing = realDuration / aboutFiveMinIntervals;
@@ -280,6 +279,7 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
 
         if (realDuration > 0) {
             double netBasalRate;
+            double dia = profile.getDia();
             double dia_ago = time - dia * 60 * 60 * 1000;
             int aboutFiveMinIntervals = (int) Math.ceil(realDuration / 5d);
             double spacing = realDuration / aboutFiveMinIntervals;

From 3dfa066cf5eb8542a61f2f61ee9ab6fcb7ac9fb8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 14 Aug 2020 11:25:30 +0200
Subject: [PATCH 396/400] MINDIA = 5.0

---
 .../main/java/info/nightscout/androidaps/utils/HardLimits.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
index bec9c0fa16..37b0c0beb6 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt
@@ -36,7 +36,7 @@ class HardLimits @Inject constructor(
     val VERY_HARD_LIMIT_TEMP_MIN_BG = intArrayOf(72, 180)
     val VERY_HARD_LIMIT_TEMP_MAX_BG = intArrayOf(72, 270)
     val VERY_HARD_LIMIT_TEMP_TARGET_BG = intArrayOf(72, 200)
-    val MINDIA = 2.0
+    val MINDIA = 5.0
     val MAXDIA = 7.0
     val MINIC = 2.0
     val MAXIC = 100.0

From 8ff88e85a0fc6b28e3520e0023dc1bccce2773a3 Mon Sep 17 00:00:00 2001
From: Philoul <legoupil.jp@free.fr>
Date: Fri, 14 Aug 2020 13:40:53 +0200
Subject: [PATCH 397/400] Restore Database field

---
 .../main/java/info/nightscout/androidaps/db/ExtendedBolus.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
index 3994cf2eb5..cfee68be27 100644
--- a/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
+++ b/core/src/main/java/info/nightscout/androidaps/db/ExtendedBolus.java
@@ -65,6 +65,9 @@ public class ExtendedBolus implements Interval, DataPointWithLabelInterface {
     @DatabaseField
     public int insulinInterfaceID = InsulinInterface.OREF_RAPID_ACTING;
 
+    @DatabaseField
+    public double dia = Constants.defaultDIA;
+
     @Deprecated
     public ExtendedBolus() {
         injector = StaticInjector.Companion.getInstance();

From 242e8d2150db96d0e840446c2f7929c7287631ad Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 14 Aug 2020 17:05:29 +0200
Subject: [PATCH 398/400] fix tests

---
 .../androidaps/plugins/treatments/TreatmentsPluginTest.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
index e0d17cc4ac..a5a6e81bfb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt
@@ -85,7 +85,7 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
         tbrs.add(TemporaryBasal(injector).date(now - T.hours(30).msecs()).duration(10000).percent(90))
         sot.initializeData(T.hours(30).msecs())
         val iob90pct = sot.getAbsoluteIOBTempBasals(now)
-        Assert.assertTrue(iob100pct.iob > iob90pct.iob)
+        Assert.assertTrue(iob100pct.basaliob > iob90pct.basaliob)
     }
 
     @Test
@@ -99,6 +99,6 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
         tbrs.add(TemporaryBasal(injector).date(now - T.hours(30).msecs()).duration(10000).percent(110))
         sot.initializeData(T.hours(30).msecs())
         val iob110pct = sot.getAbsoluteIOBTempBasals(now)
-        Assert.assertEquals(1.1, iob110pct.iob / iob100pct.iob, 0.0001)
+        Assert.assertEquals(1.1, iob110pct.basaliob / iob100pct.basaliob, 0.0001)
     }
 }
\ No newline at end of file

From d7f9208acf76154cff3ed2e0e15e26d084abb918 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 14 Aug 2020 17:22:06 +0200
Subject: [PATCH 399/400] fix LP reset button

---
 .../plugins/profile/local/LocalProfileFragment.kt      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 77d8187056..b0a1203170 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -189,15 +189,7 @@ class LocalProfileFragment : DaggerFragment() {
 
         localprofile_reset.setOnClickListener {
             localProfilePlugin.loadSettings()
-            @Suppress("SetTextI18n")
-            localprofile_units.text = resourceHelper.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) resourceHelper.gs(R.string.mgdl) else resourceHelper.gs(R.string.mmol))
-            localprofile_dia.setParams(currentProfile.dia, MIN_DIA, 12.0, 0.1, DecimalFormat("0.0"), false, localprofile_save, textWatch)
-            localprofile_dia.tag = "LP_DIA"
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_ic, "IC", resourceHelper.gs(R.string.ic_label) + ":", currentProfile.ic, null, 0.5, 50.0, 0.1, DecimalFormat("0.0"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_isf, "ISF", resourceHelper.gs(R.string.isf_label) + ":", currentProfile.isf, null, 0.5, 500.0, 0.1, DecimalFormat("0.0"), save)
-            basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_basal, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
-            TimeListEdit(context, aapsLogger, dateUtil, view, R.id.localprofile_target, "TARGET", resourceHelper.gs(R.string.target_label) + ":", currentProfile.targetLow, currentProfile.targetHigh, 3.0, 200.0, 0.1, DecimalFormat("0.0"), save)
-            updateGUI()
+            build()
         }
 
         localprofile_save.setOnClickListener {

From 65c8cc98804cfc366239ad2bedb2dd98e3e4f3c2 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 16 Aug 2020 11:10:37 +0200
Subject: [PATCH 400/400] New Crowdin updates (#2878)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations strings.xml (Slovak)

* New translations protection.xml (German)
---
 app/src/main/res/values-cs-rCZ/strings.xml    | 16 +++++++--------
 app/src/main/res/values-de-rDE/protection.xml |  2 +-
 app/src/main/res/values-sv-rSE/strings.xml    | 17 ++++++++++++++++
 core/src/main/res/values-bg-rBG/strings.xml   | 20 +++++++++++++++++++
 core/src/main/res/values-cs-rCZ/strings.xml   |  2 +-
 core/src/main/res/values-sk-rSK/strings.xml   | 20 +++++++++++++++++++
 .../src/main/res/values-bg-rBG/strings.xml    |  9 +++++++++
 .../src/main/res/values-sk-rSK/strings.xml    |  9 +++++++++
 .../src/main/res/values-bg-rBG/strings.xml    |  4 ++++
 .../src/main/res/values-sk-rSK/strings.xml    | 17 ++++++++++++++++
 10 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 02dcce8bae..d9dac2ee95 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -156,7 +156,7 @@
     <string name="overview_tempbasal_button">Dočasný bazál</string>
     <string name="overview_extendedbolus_button">Prodloužený bolus</string>
     <string name="configbuilder_nightscoutversion_label">Verze Nightscoutu:</string>
-    <string name="missing_carbs">Chybí %1$dg</string>
+    <string name="missing_carbs">Chybí %1$d g</string>
     <string name="exported">Nastavení exportováno</string>
     <string name="export_to">Exportovat nastavení do</string>
     <string name="import_from">Importovat nastavení z</string>
@@ -235,10 +235,10 @@
     <string name="smscommunicator_remotebolusmindistance_summary">Minimální počet minut, které musí uplynout mezi dvěma bolusy podanými přes vzdálené řízení</string>
     <string name="smscommunicator_remotebolusmindistance">Kolik minut (minimálně) musí uplynout mezi dvěma bolusy</string>
     <string name="smscommunicator_remotebolusmindistance_caveat">Úprava tohoto nastavení v zájmu vaší bezpečnosti vyžaduje, abyste zadali alespoň 2 telefonní čísla.</string>
-    <string name="bolusdelivered">Bolus %1$.2fU aplikován úspěšně</string>
-    <string name="bolusrequested">Podávání %1$.2fU inzulínu</string>
-    <string name="smscommunicator_bolusdelivered">Bolus %1$.2fU aplikován úspěšně</string>
-    <string name="smscommunicator_mealbolusdelivered">Bolus na jídlo %1$.2fU byl úspěšně aplikován</string>
+    <string name="bolusdelivered">Bolus %1$.2f U aplikován úspěšně</string>
+    <string name="bolusrequested">Podávání %1$.2f U inzulínu</string>
+    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f U aplikován úspěšně</string>
+    <string name="smscommunicator_mealbolusdelivered">Bolus na jídlo %1$.2f U byl úspěšně aplikován</string>
     <string name="smscommunicator_mealbolusdelivered_tt">Cíl %1$s na %2$d minut</string>
     <string name="smscommunicator_tt_set">Cíl %1$s na %2$d minut byl úspěšně nastaven</string>
     <string name="smscommunicator_tt_canceled">Dočasný cíl byl úspěšně zrušen</string>
@@ -273,8 +273,8 @@
     <string name="smscommunicator_loopdisablereplywithcode">Chcete-li zakázat smyčku, odpovězte SMS s kódem %1$s</string>
     <string name="smscommunicator_tempbasalset">Dočasný bazál %1$.2fU/h na %2$d minut spuštěn</string>
     <string name="smscommunicator_extendedset">Prodloužený bolus %1$.2fU na %2$d min úspěšně spuštěn</string>
-    <string name="smscommunicator_carbsset">Sacharidy %1$dg byly úspěšně zadány</string>
-    <string name="smscommunicator_carbsfailed">Zadání %1$dg sacharidů se nezdařilo</string>
+    <string name="smscommunicator_carbsset">Sacharidy %1$d g byly úspěšně zadány</string>
+    <string name="smscommunicator_carbsfailed">Zadání %1$d g sacharidů se nezdařilo</string>
     <string name="smscommunicator_tempbasalset_percent">Dočasný bazál %1$d%% na %2$d minut úspěšně spuštěn</string>
     <string name="smscommunicator_tempbasalfailed">Spuštění dočasného bazálu selhalo</string>
     <string name="smscommunicator_extendedfailed">Spuštění prodlouženého bolusu selhalo</string>
@@ -1077,7 +1077,7 @@
     <string name="selected_profile">Vybráno:</string>
     <string name="unitsnosemicolon">Jednotky</string>
     <string name="doyouwantswitchprofile">Chcete přepnout profil a zahodit změny provedené v aktuálním profilu?</string>
-    <string name="format_carbs">%1$dg</string>
+    <string name="format_carbs">%1$d g</string>
     <string name="common_on">ZAP</string>
     <string name="common_off">VYP</string>
     <string name="objectives_button_unfinish">Vymazat dokončeno</string>
diff --git a/app/src/main/res/values-de-rDE/protection.xml b/app/src/main/res/values-de-rDE/protection.xml
index 2655bd08d8..086457e3be 100644
--- a/app/src/main/res/values-de-rDE/protection.xml
+++ b/app/src/main/res/values-de-rDE/protection.xml
@@ -8,7 +8,7 @@
     <string name="master_password">Master-Passwort</string>
     <string name="settings_password">Passwort für Einstellungen</string>
     <string name="application_password">Anwendungspasswort</string>
-    <string name="bolus_password">Passwort für Boli</string>
+    <string name="bolus_password">Passwort für Bolus</string>
     <string name="unlock_settings">Einstellungen freischalten</string>
     <string name="biometric">Biometrisch</string>
     <string name="custom_password">Benutzerdefiniertes Passwort</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index a9da4b2f5f..d1203af347 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -173,6 +173,8 @@ Eversense-appen.</string>
     <string name="password_preferences_decrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att avkryptera importerade inställningar.</string>
     <string name="preferences_export_canceled">Exporten avbröts. Inställningarna har INTE exporterats!</string>
     <string name="preferences_import_canceled">Importen avbröts. Inställningarna har inte importerats!</string>
+    <string name="preferences_import_impossible">Kan inte importera inställningar!</string>
+    <string name="goto_main_try_again">Vänligen gå tillbaka till huvudskärmen och försök igen.</string>
     <string name="preferences_import_list_title">Välj fil att importera</string>
     <string name="check_preferences_before_import">Vänligen kontrollera inställningarna innan du importerar:</string>
     <string name="check_preferences_cannot_import">Inställningarna kan inte importeras!</string>
@@ -646,6 +648,7 @@ Eversense-appen.</string>
     <string name="enablesmbwithtemptarget">Använd SMB vid temp målvärde</string>
     <string name="enablesmbwithtemptarget_summary">Använd SMB när temp mål är satt, t ex Äta snart eller Träning</string>
     <string name="enablesmbwithhightemptarget">Använd SMB vid högt målvärde</string>
+    <string name="enablesmbwithhightemptarget_summary">Aktivera SMB när det finns högt temp mål aktivt (träning, över 100 mg/dl eller 5,5 mmol/l)</string>
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_carbs_label">Kolhydrater</string>
     <string name="overview_buttons_selection">Knappar</string>
@@ -679,6 +682,7 @@ Eversense-appen.</string>
     <string name="do_not_bolus_record_only">Ge ingen bolus, logga bara</string>
     <string name="category">Kategori</string>
     <string name="subcategory">Underkategori</string>
+    <string name="bolusrecordedonly">Bolus kommer bara att loggas. Inte levereras av pumpen</string>
     <string name="ns_autobackfill_summary">Hämta saknad BG-data från Nightscout</string>
     <string name="loop_smbsetbypump_label">SMB satt i pump</string>
     <string name="overview_show_activity">Insulinaktivitet (5m)</string>
@@ -795,6 +799,7 @@ Eversense-appen.</string>
     <string name="askforpermission">Be om behörighet</string>
     <string name="needsystemwindowpermission">Applikationen behöver förhöjd behörighet för aviseringar</string>
     <string name="needlocationpermission">Appen behöver platsåtkomst för bluetooth- och WiFi-identifiering</string>
+    <string name="needstoragepermission">Applikationen behöver lagringsbehörighet för att kunna lagra loggfiler och exportinställningar</string>
     <string name="request">Begäran</string>
     <string name="insulinsourcesetup">Konfigurera insticksprogram för insulin</string>
     <string name="exit">Avsluta</string>
@@ -1090,6 +1095,7 @@ Eversense-appen.</string>
     <string name="clone_label">Kopiera</string>
     <string name="saveorresetchangesfirst">Spara eller återställa aktuella ändringar först</string>
     <string name="deletecurrentprofile">Ta bort aktuell profil?</string>
+    <string name="copytolocalprofile">Skapa ny lokal profil av denna?</string>
     <string name="profilenamecontainsdot">Profilnamnet innehåller punkter.\nDetta stöds inte av NS.\nProfil överförs inte till NS.</string>
     <string name="low_mark_comment">Nedre värdet för målområde (endast visning)</string>
     <string name="high_mark_comment">Övre värdet för målområde (endast visning)</string>
@@ -1103,6 +1109,7 @@ Eversense-appen.</string>
     <string name="nav_survey">Enkät</string>
     <string name="invalidage">Ogiltig inmatning (ålder)</string>
     <string name="invalidweight">Ogiltig inmatning (vikt)</string>
+    <string name="invalidpct">Ogiltig %-inmatning</string>
     <string name="tirformat"><![CDATA[<b>%1$s:</b> Låg: <b>%2$02d%%</b> Mål: <b>%3$02d%%</b> Hög: <b>%4$02d%%</b>]]></string>
     <string name="average">Medel</string>
     <string name="tir">TIR</string>
@@ -1280,5 +1287,15 @@ Eversense-appen.</string>
     <string name="omnipod_bolus_failed_uncertain">Det går inte att verifiera om bolusen är slutförd. Verifiera att din pod leverarar bolus eller avsluta bolus.</string>
     <string name="omnipod_rl_stats">RL-statistik</string>
     <string name="omnipod_read_pulse_log_short">Pulslogg</string>
+    <string name="comapareprofile">Jämför profiler</string>
     <string name="nav_profilehelper">Profilguide</string>
+    <string name="motoldefaultprofile">Standardprofil</string>
+    <string name="currentprofile">Nuvarande profil</string>
+    <string name="availableprofile">Tillgänglig profil</string>
+    <string name="profiletype">Profiltyp</string>
+    <string name="formatwithtdd">Ålder: %1$.0f TDD: %2$.0f U</string>
+    <string name="formatwittddandpct">Ålder: %1$.0f TDD: %2$.0f U %3$d%%</string>
+    <string name="formatwithweight">Ålder: %1$.0f Vikt: %2$.0f kg</string>
+    <string name="basalpctfromtdd_label">% av basal</string>
+    <string name="dpvdefaultprofile">DPV-standardprofil</string>
 </resources>
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index 6a58c9cca6..d2fc002a47 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -182,9 +182,29 @@
     <string name="timedetection">Засичане на времето</string>
     <string name="format_hour_minute">%1$dч:%2$dм</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Помпата не поддържа тази операция.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Операцията не се поддържа от помпата (ВСЕ ОЩЕ).</string>
+    <string name="common_resultok">ОК</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Никога не сме се свързвали</string>
+    <string name="pump_status_waking_up">Събуждане</string>
+    <string name="pump_status_error_comm">Грешка в комуникацията</string>
+    <string name="pump_status_timeout_comm">Изтече времето за връзка</string>
+    <string name="pump_status_pump_unreachable">Помпата е недостъпна</string>
+    <string name="pump_status_invalid_config">Грешна конфигурация</string>
+    <string name="pump_status_active">Активна</string>
+    <string name="pump_status_sleeping">Спинка си</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Базали</string>
+    <string name="history_group_configuration">Конфигурации</string>
+    <string name="history_group_notification">Известия</string>
+    <string name="history_group_statistic">Статистика</string>
+    <string name="history_group_unknown">Неизвестни</string>
+    <string name="history_group_all">Всички</string>
+    <string name="history_group_bolus">Болуси</string>
+    <string name="history_group_prime">Пълнене</string>
+    <string name="history_group_alarm">Аларми</string>
+    <string name="history_group_glucose">Кръвна захар</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 0f5b8ec002..1ca72eba96 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -23,7 +23,7 @@
     <string name="pump_basebasalrate">%1$.2fU/h</string>
     <string name="format_hours">%1$.2f h</string>
     <string name="format_mins">%1$d min</string>
-    <string name="format_mins_short">%1$dm</string>
+    <string name="format_mins_short">%1$d m</string>
     <string name="pumpbusy">Pumpa je zaneprázdněna</string>
     <string name="connectionerror">Chyba připojování pumpy</string>
     <string name="youareonallowedlimit">Dosaženo limitu</string>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index 1913c37aec..f510501ac7 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -182,9 +182,29 @@
     <string name="timedetection">Detekcia času</string>
     <string name="format_hour_minute">%1$dh %2$dm</string>
     <!-- PumoCommon - Pump Abstract -->
+    <string name="pump_operation_not_supported_by_pump_driver">Operácia nie je podporovaná pumpou a/alebo ovladačom.</string>
     <string name="pump_operation_not_yet_supported_by_pump">Operácia zatiaľ nepodporovaná pumpou.</string>
+    <string name="common_resultok">OK</string>
     <!-- PumoCommon - Pump Status -->
+    <string name="pump_status_never_contacted">Nikdy nepripojené</string>
+    <string name="pump_status_waking_up">Prebúdzanie</string>
+    <string name="pump_status_error_comm">Chyba komunikácie</string>
+    <string name="pump_status_timeout_comm">Uplynul časový limit komunikácie</string>
+    <string name="pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="pump_status_invalid_config">Neplatná konfigurácia</string>
+    <string name="pump_status_active">Aktívna</string>
+    <string name="pump_status_sleeping">Spiaca</string>
     <!-- PumpCommon - History Group -->
+    <string name="history_group_basal">Bazály</string>
+    <string name="history_group_configuration">Konfigurácie</string>
+    <string name="history_group_notification">Notifikácie</string>
+    <string name="history_group_statistic">Štatistika</string>
+    <string name="history_group_unknown">Neznáme</string>
+    <string name="history_group_all">Všetko</string>
+    <string name="history_group_bolus">Bolusy</string>
+    <string name="history_group_prime">Plnenie</string>
+    <string name="history_group_alarm">Alarmy</string>
+    <string name="history_group_glucose">Glykémia</string>
     <!--    <string name="medtronic_pump_status_never_contacted">Never contacted</string>-->
     <!--    <string name="medtronic_pump_status_waking_up">Waking up</string>-->
     <!--    <string name="medtronic_pump_status_error_comm">Error with communication</string>-->
diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/medtronic/src/main/res/values-bg-rBG/strings.xml
index 03a6e2a300..d67cd0abd4 100644
--- a/medtronic/src/main/res/values-bg-rBG/strings.xml
+++ b/medtronic/src/main/res/values-bg-rBG/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (батерия)</string>
     <string name="medtronic_bolus_debugging">Болус/Корекция подробно</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Грешки</string>
     <string name="medtronic_error_serial_not_set">Сериен номер не е зададен.</string>
     <string name="medtronic_error_serial_invalid">Грешен сериен номер.</string>
     <string name="medtronic_error_pump_type_not_set">Тип помпа не е зададен.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">История на помпата</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Отказали сте болус след като е бил изпратен към помпата. Помпите Медтроник не го поддържат и ще трябва да го направите ръчно. Пуснете Suspend mode и след това Resume (ако оше искате да го откажете). Апликацията ще покаже промените след около 5 мин.</string>
     <string name="medtronic_cmd_cant_read_tbr">Не може да бъде прочетен вр. базал.</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
+    <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
+    <string name="medtronic_warning">Внимание</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Сега</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">преди</string>
+    <string name="medtronic_notification_check_time_date">Необходимо е сверяване на часа в помпата</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">Вкл</string>
+    <string name="common_off">Изкл</string>
     <string name="pump_time_updated">Актуализирано време на помпата</string>
 </resources>
diff --git a/medtronic/src/main/res/values-sk-rSK/strings.xml b/medtronic/src/main/res/values-sk-rSK/strings.xml
index d98995ac13..110e031c00 100644
--- a/medtronic/src/main/res/values-sk-rSK/strings.xml
+++ b/medtronic/src/main/res/values-sk-rSK/strings.xml
@@ -25,6 +25,7 @@
     <string name="medtronic_pump_battery_nimh">NiMH (Rozšírené zobrazenie)</string>
     <string name="medtronic_bolus_debugging">Bolus/Ošetrenia ladenie</string>
     <!-- MDT Errors -->
+    <string name="medtronic_errors">Chyby</string>
     <string name="medtronic_error_serial_not_set">Sériové číslo nenastavené.</string>
     <string name="medtronic_error_serial_invalid">Sériové číslo neplatné.</string>
     <string name="medtronic_error_pump_type_not_set">Nenastavený typ pumpy.</string>
@@ -47,6 +48,7 @@
     <!--    <string name="medtronic_history_group_statistic">Statistics</string>-->
     <!--    <string name="medtronic_history_group_unknown">Unknowns</string>-->
     <!--    <string name="medtronic_history_group_all">All</string>-->
+    <string name="medtronic_pump_history">História Medtronic pumpy</string>
     <!-- <string name="medtronic_cmd_profile_not_set">Remote Basal profile setting is not supported. Please modify Basal profile on your pump manually.</string> -->
     <string name="medtronic_cmd_cancel_bolus_not_supported">Zrušili ste bolus po tom, čo bol nastavený na pumpe. Pretože Medtronic nepodporuje zrušenie bolusu, musíte ho zrušiť ručne. Pozastavte pumpu a znovu spustite (pokiaľ naďalej trváte na zrušení). Aplikácia prevezme zmeny pri ďalšom pripojení (do 5 min).</string>
     <string name="medtronic_cmd_cant_read_tbr">Nie je možné načítať aktuálny dočasný bazál.</string>
@@ -68,8 +70,15 @@
     <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
+    <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
+    <string name="medtronic_warning">Upozornenie</string>
     <!-- medtronic_warning -->
+    <string name="medtronic_pump_connected_now">Teraz</string>
     <!-- combo_pump_connected_now -->
+    <string name="ago">pred</string>
+    <string name="medtronic_notification_check_time_date">Je vyžadovaná aktualizácia času v pumpe</string>
     <!-- combo_notification_check_time_date -->
+    <string name="common_on">ZAP</string>
+    <string name="common_off">VYP</string>
     <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
 </resources>
diff --git a/rileylink/src/main/res/values-bg-rBG/strings.xml b/rileylink/src/main/res/values-bg-rBG/strings.xml
index ef23a7a9fe..fd1523dc6e 100644
--- a/rileylink/src/main/res/values-bg-rBG/strings.xml
+++ b/rileylink/src/main/res/values-bg-rBG/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Избрано</string>
     <string name="rileylink_scanner_title">RileyLink скенер</string>
     <string name="location_yes">Разреши</string>
+    <string name="location_no">Не</string>
     <string name="rileylink_scanner_scanning">Сканиране</string>
     <string name="rileylink_scanner_scanning_finished">Завършено сканиране</string>
     <string name="rileylink_scanner_scanning_error">Грешка при сканиране: %1$d</string>
+    <string name="common_never">Никога</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Настройки</string>
     <string name="rileylink_settings_tab2">История</string>
@@ -42,10 +44,12 @@
     <string name="rileylink_error_bt_disabled">Bluetooth е изключен</string>
     <string name="rileylink_error_no_bt_adapter">Няма Bluetooth адаптер</string>
     <string name="rileylink_error_tuneup_failed">Настройката се провали</string>
+    <string name="rileylink_error_pump_unreachable">Помпата е недостъпна</string>
     <string name="rileylink_error_pod_unreachable">Pod е недостъпen</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Medtronic помпа</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433.91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">САЩ &amp; Канада (916 Mhz)</string>
     <string name="medtronic_pump_frequency_worldwide">Останалата част от света (868 Mhz)</string>
     <!--    <plurals name="objective_minutes">-->
diff --git a/rileylink/src/main/res/values-sk-rSK/strings.xml b/rileylink/src/main/res/values-sk-rSK/strings.xml
index 86379e62f2..2ba7d2863f 100644
--- a/rileylink/src/main/res/values-sk-rSK/strings.xml
+++ b/rileylink/src/main/res/values-sk-rSK/strings.xml
@@ -6,9 +6,11 @@
     <string name="rileylink_scanner_selected_device">Vybrané</string>
     <string name="rileylink_scanner_title">Vyhľadávanie RileyLinku</string>
     <string name="location_yes">Aktivovať</string>
+    <string name="location_no">Nie</string>
     <string name="rileylink_scanner_scanning">Vyhľadávanie</string>
     <string name="rileylink_scanner_scanning_finished">Vyhľadávanie dokončené</string>
     <string name="rileylink_scanner_scanning_error">Chyba vyhľadávania: %1$d</string>
+    <string name="common_never">Nikdy</string>
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Nastavenia</string>
     <string name="rileylink_settings_tab2">História</string>
@@ -35,18 +37,33 @@
     <string name="rileylink_state_rl_error">Chyba RileyLink</string>
     <string name="rileylink_state_pc_tune_up">Ladenie RileyLinku a pumpy</string>
     <string name="rileylink_state_pc_error">Problém s pripojením k pumpe</string>
+    <string name="rileylink_state_connected">Pripojené</string>
     <!-- RL Errors -->
     <string name="rileylink_error_not_rl">Zariadenie nie je RileyLink</string>
     <string name="rileylink_error_unreachable">RileyLink nedostupný</string>
     <string name="rileylink_error_bt_disabled">Bluetooth je deaktivované</string>
     <string name="rileylink_error_no_bt_adapter">Žiadny Bluetooth adaptér</string>
     <string name="rileylink_error_tuneup_failed">Ladenie zlyhalo</string>
+    <string name="rileylink_error_pump_unreachable">Pumpa nedostupná</string>
     <string name="rileylink_error_pod_unreachable">Pod nedostupný</string>
     <!-- RL Target Device -->
     <string name="rileylink_target_device_medtronic">Pumpa Medtronic</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
+    <string name="omnipod_frequency">Omnipod (433,91 MHz)</string>
     <string name="medtronic_pump_frequency_us_ca">US &amp; Canada (916 MHz)</string>
     <string name="medtronic_pump_frequency_worldwide">Celosvetovo (868 MHz)</string>
+    <plurals name="duration_days">
+        <item quantity="one">%1$d deň</item>
+        <item quantity="few">%1$d dní</item>
+        <item quantity="many">%1$d dní</item>
+        <item quantity="other">%1$d dní</item>
+    </plurals>
+    <plurals name="duration_hours">
+        <item quantity="one">%1$d hodina</item>
+        <item quantity="few">%1$d hodín</item>
+        <item quantity="many">%1$d hodín</item>
+        <item quantity="other">%1$d hodín</item>
+    </plurals>
     <!--    <plurals name="objective_minutes">-->
     <!--        <item quantity="one">%1$d minute</item>-->
     <!--        <item quantity="other">%1$d minutes</item>-->